diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts index 89458b1deeeda..0ecc656136e15 100644 --- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts @@ -4004,6 +4004,37 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => { }), ); + it.effect("keeps a background child's question open past its parent's turn end", () => + Effect.gen(function* () { + const form = { ...colorForm, sessionID: CHILD }; + const { runtime, thread } = yield* resumed([ + ...launchedAndRunning, + event("form.created", { form }), + event("session.execution.succeeded", { sessionID: SESSION }), + ]); + const requested = yield* requestOf(runtime).pipe(Effect.forkScoped); + const ended = yield* runtime.events.pipe( + Stream.filter( + (event) => + event.type === "turn.terminal" || + (event.type === "provider_turn.updated" && event.providerTurn.status === "completed"), + ), + Stream.take(2), + Stream.runCollect, + Effect.forkScoped, + ); + yield* runtime.startTurn(withLineage(thread)); + const request = yield* Fiber.join(requested); + assert.equal(request?.nativeRequestRef?.nativeId, form.id); + for (const terminal of yield* Fiber.join(ended)) { + assert.deepEqual( + "retainedRuntimeRequestIds" in terminal ? terminal.retainedRuntimeRequestIds : undefined, + [request!.id], + ); + } + }), + ); + it.effect("keeps a background child's requests when its parent stops during reconciliation", () => Effect.gen(function* () { const reading = yield* Deferred.make(); diff --git a/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts b/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts index a751b0bb462d1..7aa18f0956e39 100644 --- a/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts +++ b/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts @@ -1247,6 +1247,7 @@ layer("ProviderEventIngestorV2", (it) => { { key: "answered", responseCapability: { type: "live", providerSessionId } }, { key: "other-turn", responseCapability: { type: "live", providerSessionId } }, { key: "approval", responseCapability: { type: "live", providerSessionId } }, + { key: "retained", responseCapability: { type: "live", providerSessionId } }, ] as const; const fixtures = specs.map((spec, ordinal) => { const nodeId = NodeId.make(`${threadId}:${spec.key}`); @@ -1321,6 +1322,7 @@ layer("ProviderEventIngestorV2", (it) => { } } yield* eventSink.write({ events: seedEvents }); + const retainedRuntimeRequestIds = [RuntimeRequestId.make(`${threadId}:retained`)]; const input = { providerSessionId, providerInstanceId: modelSelection.instanceId, @@ -1336,10 +1338,12 @@ layer("ProviderEventIngestorV2", (it) => { status: "completed" as const, failure: null, threadDisposition: "reusable" as const, + retainedRuntimeRequestIds, } : { type: "provider_turn.updated" as const, driver: CODEX_DRIVER, + retainedRuntimeRequestIds, providerTurn: { id: providerTurnId, providerThreadId, @@ -1379,9 +1383,12 @@ layer("ProviderEventIngestorV2", (it) => { stored.filter((entry) => entry.event.type === "runtime-request.updated").length, 2, ); - assert.isEmpty( - (yield* projectionStore.getPendingNativeUserInputs(threadId, providerTurnId)) - .runtimeRequests, + assert.deepEqual( + (yield* projectionStore.getPendingNativeUserInputs( + threadId, + providerTurnId, + )).runtimeRequests.map((request) => request.id), + retainedRuntimeRequestIds, ); const replayed = yield* eventStore.read({ threadId }).pipe(Stream.runCollect); assert.equal( diff --git a/apps/server/src/orchestration-v2/ProviderEventIngestor.ts b/apps/server/src/orchestration-v2/ProviderEventIngestor.ts index 7b71e58fb6089..45ed0d1c78180 100644 --- a/apps/server/src/orchestration-v2/ProviderEventIngestor.ts +++ b/apps/server/src/orchestration-v2/ProviderEventIngestor.ts @@ -15,6 +15,7 @@ import { RawEventId, RunAttemptId, RunId, + type RuntimeRequestId, ThreadId, } from "@t3tools/contracts"; import * as Context from "effect/Context"; @@ -300,11 +301,14 @@ export const layer: Layer.Layer< input: ProviderEventIngestInput, providerTurnId: ProviderTurnId, threadId = input.threadId, + retained: ReadonlyArray = [], ) { const pending = yield* projections.getPendingNativeUserInputs(threadId, providerTurnId); const now = yield* DateTime.now; const events: Array = []; + const kept = new Set(retained); for (const request of pending.runtimeRequests) { + if (kept.has(request.id)) continue; events.push( yield* makeDomainEvent(input, { type: "runtime-request.updated", @@ -315,6 +319,7 @@ export const layer: Layer.Layer< ); } for (const node of pending.nodes) { + if (node.runtimeRequestId !== null && kept.has(node.runtimeRequestId)) continue; events.push( yield* makeDomainEvent(input, { type: "node.updated", @@ -326,6 +331,7 @@ export const layer: Layer.Layer< ); } for (const item of pending.turnItems) { + if (item.type === "user_input_request" && kept.has(item.requestId)) continue; events.push( yield* makeDomainEvent(input, { type: "turn-item.updated", @@ -529,6 +535,7 @@ export const layer: Layer.Layer< input, input.event.providerTurn.id, input.event.threadId, + input.event.retainedRuntimeRequestIds, ) : []), yield* makeDomainEvent(input, { @@ -654,7 +661,12 @@ export const layer: Layer.Layer< // The session manager serves these to clients before ingestion. return []; case "turn.terminal": - const dismissed = yield* dismissNativeUserInputs(input, input.event.providerTurnId); + const dismissed = yield* dismissNativeUserInputs( + input, + input.event.providerTurnId, + undefined, + input.event.retainedRuntimeRequestIds, + ); if (input.event.status !== "failed") { return dismissed; } diff --git a/apps/server/src/orchestration-v2/ProviderSessionManager.ts b/apps/server/src/orchestration-v2/ProviderSessionManager.ts index 2e9adb9c8a54c..0528eb471ebae 100644 --- a/apps/server/src/orchestration-v2/ProviderSessionManager.ts +++ b/apps/server/src/orchestration-v2/ProviderSessionManager.ts @@ -2710,6 +2710,9 @@ export const layerWithOptions = ( retry: stalled.retry, ...(stalled.startedAt === null ? {} : { retryStartedAt: stalled.startedAt }), threadDisposition: event.threadDisposition, + ...(event.retainedRuntimeRequestIds === undefined + ? {} + : { retainedRuntimeRequestIds: event.retainedRuntimeRequestIds }), }, }; }; diff --git a/packages/provider-core/src/server/ProviderAdapter.ts b/packages/provider-core/src/server/ProviderAdapter.ts index 80d3ef8a5285a..f2649d5ad6f98 100644 --- a/packages/provider-core/src/server/ProviderAdapter.ts +++ b/packages/provider-core/src/server/ProviderAdapter.ts @@ -107,6 +107,8 @@ export const ProviderAdapterV2Event = Schema.Union([ driver: ProviderDriverKind, threadId: Schema.optional(ThreadId), providerTurn: OrchestrationV2ProviderTurn, + /** Questions the adapter keeps open after this turn ends; the rest of the turn's are dismissed. */ + retainedRuntimeRequestIds: Schema.optional(Schema.Array(RuntimeRequestId)), }), Schema.Struct({ type: Schema.Literal("node.updated"), @@ -184,6 +186,7 @@ export const ProviderAdapterV2Event = Schema.Union([ failure: Schema.Null, reason: Schema.optional(Schema.String), threadDisposition: Schema.Literals(["reusable", "broken"]), + retainedRuntimeRequestIds: Schema.optional(Schema.Array(RuntimeRequestId)), }), Schema.Struct({ type: Schema.Literal("turn.terminal"), @@ -199,6 +202,7 @@ export const ProviderAdapterV2Event = Schema.Union([ threadDisposition: Schema.Literals(["reusable", "broken"]), /** Child turns outlive root failure and report their own terminals; otherwise open children settle. */ childTurnsContinue: Schema.optional(Schema.Literal(true)), + retainedRuntimeRequestIds: Schema.optional(Schema.Array(RuntimeRequestId)), }), ]); export type ProviderAdapterV2Event = typeof ProviderAdapterV2Event.Type; diff --git a/packages/provider-opencode/src/server/v2/adapter.ts b/packages/provider-opencode/src/server/v2/adapter.ts index 3a83c81557d5a..89ee334af5b5e 100644 --- a/packages/provider-opencode/src/server/v2/adapter.ts +++ b/packages/provider-opencode/src/server/v2/adapter.ts @@ -1516,6 +1516,14 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr yield* emitRetry(state, turn, "running"); }); + // A background child's question outlives its parent's turn; keep the ingestor from dismissing it. + const retainedRequestsOf = (turn: ActiveTurn) => { + const ids = [...pending.values()].flatMap((entry) => + entry.turn === turn ? [entry.request.id] : [], + ); + return ids.length === 0 ? {} : { retainedRuntimeRequestIds: ids }; + }; + const emitProviderTurn = ( state: ThreadState, turn: ActiveTurn, @@ -1527,6 +1535,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr driver, threadId: turn.input.threadId, providerTurn, + ...(providerTurn.completedAt === null ? {} : retainedRequestsOf(turn)), }); }; @@ -2337,6 +2346,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr providerTurnId: turn.providerTurn.id, runOrdinal: turn.input.runOrdinal, threadDisposition, + ...retainedRequestsOf(turn), }; yield* emit( terminal.status === "failed"