Skip to content

fix(desktop): keep draining the worker queue past a pre-aborted task #9482

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

Open
Bruno-rose wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(desktop): keep draining the worker queue past a pre-aborted task #9482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ddf9a5
test(desktop): a pre-aborted queued worker task strands the task behi…
Bruno-rose Nov 7, 2026
d8647ea
fix(desktop): keep draining the worker queue past a pre-aborted task
Bruno-rose Nov 7, 2026
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
30 changes: 30 additions & 0 deletions apps/desktop/src/lib/trpc/workers/WorkerTaskRunner.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,4 +262,34 @@ describe("WorkerTaskRunner failure handling", () => {
expect(workers[0]?.terminated).toBe(true);
await runner.dispose();
});

test("a pre-aborted queued task does not strand the task behind it", async () => {
const runner = new WorkerTaskRunner({
workerScriptPath: "/mock/worker.js",
concurrency: 1,
createWorker,
});

const first = runner.runTask("status", { id: "first" });
const aborted = runner.runTask(
"status",
{ id: "aborted" },
{ signal: AbortSignal.abort() },
);
let third: unknown = "pending";
void runner.runTask("status", { id: "third" }).then(
(result) => {
third = result;
},
(error) => {
third = error;
},
);

await first;
await expect(aborted).rejects.toThrow();
await flushMicrotasks(10);
expect(third).toEqual({ workerId: 1 });
await runner.dispose();
});
});
46 changes: 24 additions & 22 deletions apps/desktop/src/lib/trpc/workers/WorkerTaskRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,29 +256,31 @@ export class WorkerTaskRunner {
}
if (this.queue.length === 0) break;

const nextTaskId = this.queue.shift();
if (!nextTaskId) continue;
const task = this.tasks.get(nextTaskId);
if (!task) continue;

if (task.abortSignal?.aborted) {
this.rejectTask(task.taskId, new WorkerTaskAbortedError("cancelled"));
continue;
while (this.queue.length > 0 && !slot.activeTaskId) {
const nextTaskId = this.queue.shift();
if (!nextTaskId) continue;
const task = this.tasks.get(nextTaskId);
if (!task) continue;

if (task.abortSignal?.aborted) {
this.rejectTask(task.taskId, new WorkerTaskAbortedError("cancelled"));
continue;
}

slot.activeTaskId = task.taskId;
task.slotId = slot.id;
task.timeoutHandle = setTimeout(() => {
this.handleTaskTimeout(task.taskId);
}, task.timeoutMs);

const request: WorkerTaskRequestMessage = {
kind: "task",
taskId: task.taskId,
taskType: task.taskType,
payload: task.payload,
};
slot.worker.postMessage(request);

@cubic-dev-ai cubic-dev-ai Bot Nov 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1: This new loop can reach an uncloneable payload after skipping a pre-aborted task, but postMessage throws synchronously and can crash the desktop process. Catch the dispatch error, clear activeTaskId, and reject the task so draining can continue.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. When an issue isn't valid or won't be fixed in this PR, reply in its thread with the reason and then resolve the thread. At apps/desktop/src/lib/trpc/workers/WorkerTaskRunner.ts, line 282:

<comment>This new loop can reach an uncloneable payload after skipping a pre-aborted task, but `postMessage` throws synchronously and can crash the desktop process. Catch the dispatch error, clear `activeTaskId`, and reject the task so draining can continue.</comment>

<file context>
@@ -256,29 +256,31 @@ export class WorkerTaskRunner {
+					taskType: task.taskType,
+					payload: task.payload,
+				};
+				slot.worker.postMessage(request);
 			}
-
</file context>
Suggested change
slot.worker.postMessage(request);
try {
slot.worker.postMessage(request);
} catch (error) {
slot.activeTaskId = null;
this.rejectTask(
task.taskId,
new WorkerTaskError(
`postMessage failed for task "${task.taskType}": ${(error as Error).message}`,
),
);
}

}

slot.activeTaskId = task.taskId;
task.slotId = slot.id;
task.timeoutHandle = setTimeout(() => {
this.handleTaskTimeout(task.taskId);
}, task.timeoutMs);

const request: WorkerTaskRequestMessage = {
kind: "task",
taskId: task.taskId,
taskType: task.taskType,
payload: task.payload,
};
slot.worker.postMessage(request);
}
}

Expand Down
Loading