Skip to content

🤖 refactor: move task waiter state into TaskWaiters #7668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasK33 merged 1 commit into from
Oct 27, 2026
Merged

🤖 refactor: move task waiter state into TaskWaiters #7668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/node/services/taskService.agentReports.waits.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,15 @@ describe("TaskService", () => {
const hasQueuedMessages = mock(() => true);
const { workspaceService } = createWorkspaceServiceMocks({ hasQueuedMessages });
const { taskService } = createTaskServiceHarness(config, { workspaceService });
const internal = taskService as unknown as {
backgroundableForegroundWaitersByWorkspaceId: Map<string, Set<unknown>>;
pendingStartWaitersByTaskId: Map<string, unknown[]>;
pendingWaitersByTaskId: Map<string, unknown[]>;
};
const internal = (
taskService as unknown as {
waiters: {
backgroundableForegroundWaitersByWorkspaceId: Map<string, Set<unknown>>;
pendingStartWaitersByTaskId: Map<string, unknown[]>;
pendingWaitersByTaskId: Map<string, unknown[]>;
};
}
).waiters;

const waitError = await taskService
.waitForAgentReport(childId, {
Expand Down Expand Up @@ -754,8 +758,8 @@ describe("TaskService", () => {

// Simulate process restart / eviction.
(
taskService as unknown as { completedReportsByTaskId: Map<string, unknown> }
).completedReportsByTaskId.clear();
taskService as unknown as { waiters: { completedReportsByTaskId: Map<string, unknown> } }
).waiters.completedReportsByTaskId.clear();

const report = await taskService.waitForAgentReport(childId, {
timeoutMs: 10,
Expand Down
4 changes: 2 additions & 2 deletions src/node/services/taskService.agentReports.wakes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ describe("TaskService", () => {
});

const internal = taskService as unknown as {
completedReportsByTaskId: Map<string, unknown>;
waiters: { completedReportsByTaskId: Map<string, unknown> };
};

await streamEnd(taskService, {
Expand Down Expand Up @@ -644,7 +644,7 @@ describe("TaskService", () => {
expect(ws?.taskStatus).toBe("reported");

// Validate report persistence path (not just in-memory cache).
internal.completedReportsByTaskId.clear();
internal.waiters.completedReportsByTaskId.clear();
const persisted = await taskService.waitForAgentReport(childId, {
timeoutMs: 10_000,
requestingWorkspaceId: parentId,
Expand Down
4 changes: 2 additions & 2 deletions src/node/services/taskService.settlement.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2220,7 +2220,7 @@ describe("TaskService", () => {
interface AttemptLedgerInternals {
ownedAttemptByTaskId: Map<string, { generation: number }>;
attemptSettlementByTaskId: Map<string, { attempt: { generation: number } }>;
completedReportsByTaskId: Map<string, unknown>;
waiters: { completedReportsByTaskId: Map<string, unknown> };
shouldAllowLegacyInvalidWorkflowOutputSchema: (...args: unknown[]) => Promise<boolean>;
}
const ledgerInternals = (taskService: TaskService) =>
Expand Down Expand Up @@ -2276,7 +2276,7 @@ describe("TaskService", () => {
const reported = { kind: "reported", report: { reportMarkdown: "final answer" } };
expect(await taskService.readAttemptOutcome(taskId, requesting)).toMatchObject(reported);
// Not just the in-memory cache: the persisted artifact answers, here and in a fresh process.
internals.completedReportsByTaskId.clear();
internals.waiters.completedReportsByTaskId.clear();
expect(await taskService.readAttemptOutcome(taskId, requesting)).toMatchObject(reported);
const { taskService: freshService } = createTaskServiceHarness(config);
expect(await freshService.readAttemptOutcome(taskId, requesting)).toMatchObject(reported);
Expand Down
4 changes: 2 additions & 2 deletions src/node/services/taskService.settlementReceipts.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,8 @@ describe("TaskService settlement receipt producers (G2)", () => {
await ownEligibleAttempt(config, taskService, taskId);
const pendingWaiters = () =>
(
svc as unknown as { pendingWaitersByTaskId: Map<string, unknown[]> }
).pendingWaitersByTaskId.get(taskId)?.length ?? 0;
svc as unknown as { waiters: { pendingWaitersByTaskId: Map<string, unknown[]> } }
).waiters.pendingWaitersByTaskId.get(taskId)?.length ?? 0;
const settledOf = (promise: Promise<unknown>) => {
const state: { settled?: "resolved" | "rejected"; error?: unknown } = {};
promise.then(
Expand Down
Loading
Loading