@@ -4453,6 +4453,9 @@ interface ActiveClaudeTurnContext {
44534453 compactionFailure: { readonly message: string | undefined } | null;
44544454 // Steers end segments whose usage is excluded from the final result; bill them too, oldest first.
44554455 readonly steeredSegmentUsage: Array<SDKResultMessage["usage"]>;
4456+ // Set as finalization starts: a steer admitted later would stay pending
4457+ // forever, so it fails and the orchestrator follows up instead.
4458+ steersClosed: boolean;
44564459 // Ledger growth of the steered segments; undefined once any segment's growth is unknown.
44574460 steeredLedgerUsage: ClaudeLedgerUsage | undefined;
44584461 readonly rootModels: Set<string>;
@@ -4465,8 +4468,16 @@ interface ActiveClaudeTurnContext {
44654468 gatedFramesBeforeEcho: number;
44664469 readonly heldRootFrames: Array<SDKMessage>;
44674470 // Steers Claude has not started or echoed yet, by prompt uuid. Claude holds
4468- // a steer behind a running foreground tool call without saying so.
4469- readonly pendingSteers: Map<string, MessageId>;
4471+ // a steer behind a running foreground tool call without saying so, and Stop
4472+ // drops it unread.
4473+ readonly pendingSteers: Map<
4474+ string,
4475+ {
4476+ readonly messageId: MessageId;
4477+ readonly text: string;
4478+ readonly liveQuery: ClaudeLiveQueryContext;
4479+ }
4480+ >;
44704481 // Claude may settle a turn with a result that echoes only a steer's uuid.
44714482 readonly steerUuids: Set<string>;
44724483 // Claude can run another model than requested, such as when an organization disallows it.
@@ -8124,10 +8135,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
81248135 ? [lifecycle.uuid]
81258136 : [];
81268137 for (const uuid of accepted) {
8127- const messageId = context.pendingSteers.get(uuid);
8128- if (messageId === undefined) continue;
8138+ const steer = context.pendingSteers.get(uuid);
8139+ if (steer === undefined) continue;
81298140 context.pendingSteers.delete(uuid);
8130- yield* emitSteerStatus(context, messageId, "completed");
8141+ yield* emitSteerStatus(context, steer. messageId, "completed");
81318142 }
81328143 });
81338144
@@ -8142,16 +8153,18 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
81428153 readonly threadDisposition?: "reusable" | "broken";
81438154 readonly result?: SDKResultMessage;
81448155 }) {
8156+ input.context.steersClosed = true;
81458157 yield* reasoningDeltas.flushTurn(input.context.nativeTurnId);
81468158 // A turn that completes has taken in every steer; one that stops drops them unread.
8147- for (const messageId of input.context.pendingSteers.values()) {
8159+ const droppedSteers = [...input.context.pendingSteers];
8160+ input.context.pendingSteers.clear();
8161+ for (const [, { messageId }] of droppedSteers) {
81488162 yield* emitSteerStatus(
81498163 input.context,
81508164 messageId,
81518165 input.status === "completed" ? "completed" : "cancelled",
81528166 );
81538167 }
8154- input.context.pendingSteers.clear();
81558168 if (input.context.compaction?.status === "running") {
81568169 const reason = input.result?.subtype === "success" ? input.result.result.trim() : "";
81578170 yield* emitProviderEvent({
@@ -8289,6 +8302,49 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
82898302 });
82908303 }
82918304
8305+ if (input.status === "interrupted") {
8306+ for (const [uuid, { text, liveQuery }] of droppedSteers) {
8307+ // Only a CLI proven to echo prompt uuids can leave a steer unconfirmed.
8308+ if (
8309+ liveQuery.promptEchoMode !== "early" &&
8310+ liveQuery.promptEchoMode !== "result_only"
8311+ ) {
8312+ continue;
8313+ }
8314+ const nativeItemId = `unread-steer:${uuid}`;
8315+ const notice = `Claude did not confirm reading your steer before Stop. It may not have been delivered. Resend it if needed: "${text}"`;
8316+ yield* emitProviderEvent({
8317+ type: "turn_item.updated",
8318+ driver: CLAUDE_PROVIDER,
8319+ turnItem: {
8320+ id: idAllocator.derive.turnItemFromProviderItem({
8321+ driver: CLAUDE_PROVIDER,
8322+ nativeItemId,
8323+ }),
8324+ threadId: input.context.input.threadId,
8325+ runId: input.context.input.runId,
8326+ nodeId: input.context.input.rootNodeId,
8327+ providerThreadId: input.context.input.providerThread.id,
8328+ providerTurnId: input.context.providerTurnId,
8329+ nativeItemRef: {
8330+ driver: CLAUDE_PROVIDER,
8331+ nativeId: nativeItemId,
8332+ strength: "weak",
8333+ },
8334+ parentItemId: null,
8335+ ordinal: yield* resolveItemOrdinal(input.context, nativeItemId),
8336+ type: "system_notice",
8337+ status: "completed",
8338+ title: "Steer delivery not confirmed",
8339+ message: notice,
8340+ startedAt: input.completedAt,
8341+ completedAt: input.completedAt,
8342+ updatedAt: input.completedAt,
8343+ },
8344+ });
8345+ }
8346+ }
8347+
82928348 const threadDisposition = input.threadDisposition ?? "reusable";
82938349 const terminalEvent: ProviderAdapter.ProviderAdapterV2Event =
82948350 input.status === "failed"
@@ -11538,6 +11594,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1153811594 latestAssistantRateLimit: null,
1153911595 compactionFailure: null,
1154011596 steeredSegmentUsage: [],
11597+ steersClosed: false,
1154111598 steeredLedgerUsage: { inputTokens: 0, outputTokens: 0 },
1154211599 rootModels: new Set(),
1154311600 subagentsByTaskId: new Map(),
@@ -11978,22 +12035,28 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1197812035 // the steer fails and the orchestrator starts the follow-up turn.
1197912036 if (
1198012037 (yield* Ref.get(activeTurn))?.providerTurnId !== turnInput.providerTurnId ||
11981- (yield* Ref.get(queryContext)) !== existing
12038+ (yield* Ref.get(queryContext)) !== existing ||
12039+ // No yield between this check and the set below.
12040+ currentTurn.steersClosed
1198212041 ) {
1198312042 return yield* new ProviderAdapter.ProviderAdapterProtocolError({
1198412043 driver: CLAUDE_PROVIDER,
1198512044 detail: `Claude provider turn ${turnInput.providerTurnId} ended before the steer was sent.`,
1198612045 });
1198712046 }
12047+ // Register before offering: Claude can start the steer and end the turn before offer returns.
12048+ const messageId = turnInput.message.messageId;
12049+ currentTurn.steerUuids.add(steerUuid);
12050+ currentTurn.pendingSteers.set(steerUuid, {
12051+ messageId,
12052+ text: turnInput.message.text,
12053+ liveQuery: existing,
12054+ });
1198812055 yield* Ref.update(steeredTurns, (current) => {
1198912056 const next = new Set(current);
1199012057 next.add(turnInput.providerTurnId);
1199112058 return next;
1199212059 });
11993- // Register before offering: Claude can start the steer and end the turn before offer returns.
11994- const messageId = turnInput.message.messageId;
11995- currentTurn.steerUuids.add(steerUuid);
11996- currentTurn.pendingSteers.set(steerUuid, messageId);
1199712060 yield* emitSteerStatus(currentTurn, messageId, "pending");
1199812061 yield* Effect.uninterruptibleMask((restore) =>
1199912062 restore(
0 commit comments