Skip to content

fix(kernel): route the last abort linker through the one cascade #952

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
drewstone merged 1 commit into from
Aug 21, 2026
Merged

fix(kernel): route the last abort linker through the one cascade #952

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: 2 additions & 16 deletions src/runtime/supervise/worktree-cli-executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
type WorktreeProfileMaterializationReceipt,
worktreeProfileExecutionPlan,
} from '../../mcp/worktree-harness'
import { linkAbort } from './abortable'
import { executableAgentProfileSnapshot } from './executable-spec'
import { attestRuntimeOwnedExecutor, newExecutionAttemptId } from './materialization'
import { concreteProfileModel } from './model-policy'
Expand Down Expand Up @@ -164,7 +165,7 @@ export function createWorktreeCliExecutor(
runtime: 'cli',
budgetExempt,
async execute(task, signal): Promise<ExecutorResult<WorktreePatchArtifact>> {
const linked = linkSignals(signal, controller.signal)
const linked = linkAbort(signal, controller.signal).signal
const started = Date.now()
const taskPrompt = executionTaskPrompt(task, options.taskPrompt)

Expand Down Expand Up @@ -310,18 +311,3 @@ function executionTaskPrompt(task: unknown, configuredPrompt: string | undefined
}
throw new ValidationError('createWorktreeCliExecutor: execute task must be JSON-serializable')
}

/** Link two abort signals into one that fires when either does. Returns `undefined` when neither
* is present so the harness runner gets no signal at all. */
function linkSignals(a: AbortSignal, b: AbortSignal): AbortSignal | undefined {
if (a.aborted || b.aborted) {
const c = new AbortController()
c.abort()
return c.signal
}
const c = new AbortController()
const onAbort = () => c.abort()
a.addEventListener('abort', onAbort, { once: true })
b.addEventListener('abort', onAbort, { once: true })
return c.signal
}