Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/opencode/src/dag/runtime/spawn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ export function spawnNode(
return true
}),
),
Effect.onError(() => promptSvc.cancel(childSession.id).pipe(Effect.ignore)),
)
if (terminalized) return

Expand Down
38 changes: 38 additions & 0 deletions packages/opencode/test/dag/spawn-completion.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,42 @@ describe("spawnNode terminalization during spawn window", () => {
expect(events.filter((e) => e.type === "nodeCompleted")).toEqual([])
expect(cancelCalled).toBe(true)
})

it("cancels the child session when nodeStarted fails after session creation", async () => {
const events: TrackedEvent[] = []
let cancelCalled = false
let promptCalled = false
const dagLayer = Layer.mock(Dag.Service, {
store: {} as DagStore.Interface,
nodeQueued: () => Effect.void,
nodeStarted: () => Effect.fail(new Error("nodeStarted write failed")),
nodeCompleted: Effect.fn("stub.nodeCompleted")((dagID: string, nodeID: string) =>
Effect.sync(() => events.push({ type: "nodeCompleted", dagID, nodeID })),
),
nodeFailed: Effect.fn("stub.nodeFailed")((dagID: string, nodeID: string, reason: string) =>
Effect.sync(() => events.push({ type: "nodeFailed", dagID, nodeID, reason })),
),
})
const promptLayer = Layer.mock(SessionPrompt.Service, {
prompt: () =>
Effect.sync(() => {
promptCalled = true
return reply("unexpected")
}),
cancel: () => Effect.sync(() => { cancelCalled = true }),
})

await Effect.runPromise(
Effect.scoped(
Effect.gen(function* () {
const result = yield* spawnNode(Semaphore.makeUnsafe(1), makeSpawnInput())
yield* Fiber.await(result.fiber)
}),
).pipe(Effect.provide(Layer.mergeAll(dagLayer, agentLayer, sessionLayer, promptLayer))) as Effect.Effect<never>,
)

expect(promptCalled).toBe(false)
expect(findEvent(events, "nodeFailed")?.reason).toContain("nodeStarted write failed")
expect(cancelCalled).toBe(true)
})
})
Loading