@p4code/cli 0.8.24 → 0.8.25

package/dist/{binCli-DNod5652.mjs → binCli-DxnOvHXE.mjs}

@@ -71186,7 +71186,7 @@ const writeFileStringAtomically = (input) => scoped(gen$1(function* () {
 }));
 //#endregion
 //#region package.json
-var version$1 = "0.8.24";
+var version$1 = "0.8.25";
 //#endregion
 //#region ../../packages/shared/src/qrCode.ts
 var QrCode = class QrCode {
@@ -96922,6 +96922,8 @@ const makeGitVcsDriverCore = fn("makeGitVcsDriverCore")(function* () {
 		], { env });
 		yield* executeGit("GitVcsDriver.readUnifiedWorkingTreeReviewDiff.addUntracked", cwd, [
 			...tempIndexConfig,
+			"-c",
+			"core.preloadIndex=false",
 			"--literal-pathspecs",
 			"add",
 			"--intent-to-add",
@@ -97532,7 +97534,7 @@ const makeGitVcsDriverCore = fn("makeGitVcsDriverCore")(function* () {
 				"config",
 				`branch.${input.newRefName}.gh-merge-base`,
 				baseBranch
-			]);
+			]).pipe(catchTags({ GitCommandError: () => logWarning$1("worktree base-ref configuration failed; using base-branch fallback") }));
 		}
 		return { worktree: {
 			path: worktreePath,
@@ -97922,10 +97924,47 @@ const classifyNonZeroExit = (command, stderr) => {
 	return "command-failed";
 };
 const isTransientGitExit = (stderr) => /unable to create [^\n]*\.lock['"]?: file exists/i.test(stderr) || /(?:unable to stat|lstat\(|error: open\()[^\n]+: no such file or directory/i.test(stderr);
+const FULL_FSYNC_ARG = "core.fsyncMethod=fsync";
+const WRITEOUT_ONLY_FSYNC_ARG = "core.fsyncMethod=writeout-only";
+const canRetryFullFsync = (stderr) => /fsync error on [^\r\n]+: operation not supported\r?$/im.test(stderr) || /cannot update ref [^\r\n]+: couldn't write '[^\r\n]+\.lock'\r?$/im.test(stderr);
 const make$163 = gen$1(function* () {
 	const processRunner = yield* ProcessRunner;
+	const hostPlatform = yield* Platform;
 	const vcsProcesses = yield* make$255(VCS_PROCESS_CONCURRENCY);
 	const githubProcesses = yield* make$255(GITHUB_PROCESS_CONCURRENCY);
+	const spawn = (input, baseError) => processRunner.run({
+		command: input.command,
+		args: input.args,
+		cwd: input.cwd,
+		...input.spawnCwd !== void 0 ? { spawnCwd: input.spawnCwd } : {},
+		...input.stdin !== void 0 ? { stdin: input.stdin } : {},
+		...input.onStdoutChunk !== void 0 ? { onStdoutChunk: input.onStdoutChunk } : {},
+		...input.env !== void 0 ? { env: input.env } : {},
+		timeout: input.timeoutMs ?? DEFAULT_TIMEOUT_MS$3,
+		maxOutputBytes: input.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES,
+		outputMode: input.outputMode ?? "truncate",
+		truncatedMarker: input.appendTruncationMarker ? OUTPUT_TRUNCATED_MARKER : "",
+		timeoutBehavior: "error"
+	}).pipe(mapError(valueTags({
+		ProcessSpawnError: (error) => VcsProcessSpawnError.fromProcessSpawnError(baseError, error),
+		ProcessOutputLimitError: (error) => new VcsProcessOutputLimitError({
+			...baseError,
+			stream: error.stream,
+			maxBytes: error.maxBytes,
+			observedBytes: error.observedBytes
+		}),
+		ProcessTimeoutError: (error) => VcsProcessTimeoutError.fromProcessTimeoutError(baseError, error),
+		ProcessStdinError: (error) => new VcsProcessStdinWriteError({
+			...baseError,
+			stdinBytes: error.stdinBytes,
+			cause: error.cause
+		}),
+		ProcessReadError: (error) => new VcsProcessOutputReadError({
+			...baseError,
+			stream: error.stream,
+			cause: error.cause
+		})
+	})));
 	const runUnbounded = fn("VcsProcess.runUnbounded")(function* (input) {
 		const baseError = {
 			operation: input.operation,
@@ -97933,39 +97972,11 @@ const make$163 = gen$1(function* () {
 			cwd: input.cwd,
 			argumentCount: input.args.length
 		};
-		const result = yield* processRunner.run({
-			command: input.command,
-			args: input.args,
-			cwd: input.cwd,
-			...input.spawnCwd !== void 0 ? { spawnCwd: input.spawnCwd } : {},
-			...input.stdin !== void 0 ? { stdin: input.stdin } : {},
-			...input.onStdoutChunk !== void 0 ? { onStdoutChunk: input.onStdoutChunk } : {},
-			...input.env !== void 0 ? { env: input.env } : {},
-			timeout: input.timeoutMs ?? DEFAULT_TIMEOUT_MS$3,
-			maxOutputBytes: input.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES,
-			outputMode: input.outputMode ?? "truncate",
-			truncatedMarker: input.appendTruncationMarker ? OUTPUT_TRUNCATED_MARKER : "",
-			timeoutBehavior: "error"
-		}).pipe(mapError(valueTags({
-			ProcessSpawnError: (error) => VcsProcessSpawnError.fromProcessSpawnError(baseError, error),
-			ProcessOutputLimitError: (error) => new VcsProcessOutputLimitError({
-				...baseError,
-				stream: error.stream,
-				maxBytes: error.maxBytes,
-				observedBytes: error.observedBytes
-			}),
-			ProcessTimeoutError: (error) => VcsProcessTimeoutError.fromProcessTimeoutError(baseError, error),
-			ProcessStdinError: (error) => new VcsProcessStdinWriteError({
-				...baseError,
-				stdinBytes: error.stdinBytes,
-				cause: error.cause
-			}),
-			ProcessReadError: (error) => new VcsProcessOutputReadError({
-				...baseError,
-				stream: error.stream,
-				cause: error.cause
-			})
-		})));
+		let result = yield* spawn(input, baseError);
+		if (hostPlatform === "darwin" && input.operation === "GitVcsDriver.checkpoints.captureCheckpoint" && !input.allowNonZeroExit && result.code !== null && result.code !== 0 && input.command === "git" && input.args.includes(FULL_FSYNC_ARG) && canRetryFullFsync(result.stderr)) result = yield* spawn({
+			...input,
+			args: input.args.map((arg) => arg === FULL_FSYNC_ARG ? WRITEOUT_ONLY_FSYNC_ARG : arg)
+		}, baseError);
 		if (result.code === null) return yield* new VcsProcessMissingExitCodeError(baseError);
 		if (!input.allowNonZeroExit && result.code !== 0) {
 			const failureKind = classifyNonZeroExit(input.command, result.stderr);
@@ -134486,23 +134497,45 @@ function decodeTerminalOutputChunk(pending, encoded) {
 		pendingOutputBytes: Uint8Array.from(bytes.subarray(completeEnd))
 	};
 }
-function truncateTerminalOutput(output) {
-	const bytes = Buffer.from(output, "utf8");
-	if (bytes.length <= MAX_ACP_TERMINAL_OUTPUT_BYTES) return output;
-	let start = bytes.length - MAX_ACP_TERMINAL_OUTPUT_BYTES;
-	while (start < bytes.length && (bytes[start] & 192) === 128) start += 1;
-	return bytes.subarray(start).toString("utf8");
+/**
+* Appends decoded text to terminal output and keeps the newest
+* `MAX_ACP_TERMINAL_OUTPUT_BYTES`, dropping whole leading characters. Only the
+* appended text and the dropped prefix are measured, so per-chunk cost does not
+* grow with the retained output.
+*/
+function appendTerminalOutput(output, outputBytes, text) {
+	const combined = `${output}${text}`;
+	const combinedBytes = outputBytes + Buffer.byteLength(text, "utf8");
+	const excess = combinedBytes - MAX_ACP_TERMINAL_OUTPUT_BYTES;
+	if (excess <= 0) return {
+		output: combined,
+		outputBytes: combinedBytes
+	};
+	let start = 0;
+	let dropped = 0;
+	while (dropped < excess) {
+		const codePoint = combined.codePointAt(start);
+		dropped += codePoint < 128 ? 1 : codePoint < 2048 ? 2 : codePoint < 65536 ? 3 : 4;
+		start += codePoint < 65536 ? 1 : 2;
+	}
+	return {
+		output: combined.slice(start),
+		outputBytes: combinedBytes - dropped
+	};
 }
 /** Applies an ACP v2 agent-owned terminal snapshot or chunk to display state. */
 function applyAcpAgentTerminalUpdate(previous, update) {
-	const current = previous ?? { output: "" };
+	const current = previous ?? {
+		output: "",
+		outputBytes: 0
+	};
 	if (update.sessionUpdate === "terminal_output_chunk") {
 		const decoded = decodeTerminalOutputChunk(current.pendingOutputBytes, update.data);
 		if (decoded === void 0) return current;
 		const { pendingOutputBytes: _pendingOutputBytes, ...withoutPendingOutputBytes } = current;
 		return {
 			...withoutPendingOutputBytes,
-			output: truncateTerminalOutput(`${current.output}${decoded.text}`),
+			...appendTerminalOutput(current.output, current.outputBytes, decoded.text),
 			...decoded.pendingOutputBytes === void 0 ? {} : { pendingOutputBytes: decoded.pendingOutputBytes }
 		};
 	}
@@ -134527,7 +134560,7 @@ function applyAcpAgentTerminalUpdate(previous, update) {
 			const { pendingOutputBytes: _pendingOutputBytes, ...withoutPendingOutputBytes } = next;
 			next = {
 				...withoutPendingOutputBytes,
-				output: truncateTerminalOutput(decoded.text),
+				...appendTerminalOutput("", 0, decoded.text),
 				...decoded.pendingOutputBytes === void 0 ? {} : { pendingOutputBytes: decoded.pendingOutputBytes }
 			};
 		}
@@ -134540,7 +134573,7 @@ function applyAcpAgentTerminalUpdate(previous, update) {
 		const { pendingOutputBytes: _pendingOutputBytes, ...withoutPendingOutputBytes } = next;
 		next = {
 			...withoutPendingOutputBytes,
-			output: truncateTerminalOutput(`${next.output}${pendingText}`),
+			...appendTerminalOutput(next.output, next.outputBytes, pendingText),
 			exitStatus: update.exitStatus
 		};
 	}
@@ -141950,6 +141983,14 @@ const ACP_PROTOCOL = "acp.ndjson-jsonrpc";
 * wake. Longer floors (4–20s) only prolonged Working. No per-model carveouts.
 */
 const ACP_DEFERRED_FINALIZE_DEBOUNCE = "3000 millis";
+/**
+* Coalescing window for streamed text. A text segment's first chunk and its
+* close emit at once; a later chunk schedules one full-text snapshot this long
+* after it, and the chunks inside the window share it instead of each emitting
+* the whole reply, which grew with the square of the reply length. The flush
+* is scheduled, not a hard deadline, so it can land later under host load.
+*/
+const ACP_TEXT_FLUSH_INTERVAL = "50 millis";
 /** Whether image attachment blocks may be included in session/prompt. */
 function acpSupportsImagePrompts(input) {
 	return input.flavorSupportsImagePrompts === true || input.negotiatedImage === true;
@@ -143034,7 +143075,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					markdown,
 					planId
 				});
-				const now$135 = yield* now;
+				const now$138 = yield* now;
 				const nodeId = idAllocator.derive.nodeFromProviderItem({
 					driver,
 					nativeItemId
@@ -143067,7 +143108,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequestId: null,
 						checkpointScopeId: null,
 						startedAt: context.startedAt,
-						completedAt: now$135
+						completedAt: now$138
 					}
 				});
 				yield* emitProviderEvent({
@@ -143099,8 +143140,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						status: "completed",
 						title: null,
 						startedAt: context.startedAt,
-						completedAt: now$135,
-						updatedAt: now$135,
+						completedAt: now$138,
+						updatedAt: now$138,
 						type: "proposed_plan",
 						planId,
 						markdown,
@@ -143125,10 +143166,22 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				};
 			});
 			const textStreamFor = (context, kind) => kind === "user" ? context.user : kind === "assistant" ? context.assistant : context.reasoning;
-			const emitTextSegment = fnUntraced(function* (context, kind, completed) {
+			const textEmissionPermit = yield* make$255(1);
+			/**
+			* Emits the stream's current segment. A `flushOf` call is a delayed
+			* flush: it emits only while that segment is still current and has
+			* unsent text. The permit keeps a flush from landing after the
+			* segment's completed snapshot.
+			*/
+			const emitTextSegment = fnUntraced(function* (context, kind, completed, flushOf) {
 				const segment = textStreamFor(context, kind).current;
 				if (segment === null) return;
-				const now$123 = yield* now;
+				if (flushOf !== void 0 && (segment !== flushOf || !segment.dirty)) return;
+				const emitsNode = completed || !segment.emitted;
+				segment.emitted = true;
+				segment.dirty = false;
+				const text = segment.text;
+				const now$132 = yield* now;
 				const ordinal = yield* resolveItemOrdinal(context, segment.nativeItemId);
 				const nodeId = providerNodeId(segment.nativeItemId);
 				const turnItemId = providerTurnItemId(segment.nativeItemId);
@@ -143137,7 +143190,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					nativeId: segment.nativeItemId,
 					strength: "weak"
 				};
-				if (kind !== "user") yield* emitProviderEvent({
+				if (kind !== "user" && emitsNode) yield* emitProviderEvent({
 					type: "node.updated",
 					driver,
 					node: {
@@ -143155,7 +143208,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequestId: null,
 						checkpointScopeId: null,
 						startedAt: segment.startedAt,
-						completedAt: completed ? now$123 : null
+						completedAt: completed ? now$132 : null
 					}
 				});
 				if (kind !== "reasoning") {
@@ -143169,11 +143222,11 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runId: context.input.runId,
 						nodeId: messageNodeId,
 						role: kind,
-						text: segment.text,
+						text,
 						attachments: [],
 						streaming: !completed,
 						createdAt: segment.startedAt,
-						updatedAt: now$123
+						updatedAt: now$132
 					};
 					yield* emitProviderEvent({
 						type: "message.updated",
@@ -143198,12 +143251,12 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							status: completed ? "completed" : "running",
 							title: null,
 							startedAt: segment.startedAt,
-							completedAt: completed ? now$123 : null,
-							updatedAt: now$123,
+							completedAt: completed ? now$132 : null,
+							updatedAt: now$132,
 							type: "user_message",
 							messageId,
 							inputIntent: "turn_start",
-							text: segment.text,
+							text,
 							attachments: []
 						}
 					} : {
@@ -143222,11 +143275,11 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							status: completed ? "completed" : "running",
 							title: null,
 							startedAt: segment.startedAt,
-							completedAt: completed ? now$123 : null,
-							updatedAt: now$123,
+							completedAt: completed ? now$132 : null,
+							updatedAt: now$132,
 							type: "assistant_message",
 							messageId,
-							text: segment.text,
+							text,
 							streaming: !completed
 						}
 					});
@@ -143249,13 +143302,27 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						status: completed ? "completed" : "running",
 						title: null,
 						startedAt: segment.startedAt,
-						completedAt: completed ? now$123 : null,
-						updatedAt: now$123,
+						completedAt: completed ? now$132 : null,
+						updatedAt: now$132,
 						type: "reasoning",
-						text: segment.text,
+						text,
 						streaming: !completed
 					}
 				});
+			}, textEmissionPermit.withPermit);
+			/**
+			* Publishes a text change. A segment's first text emits at once so
+			* live output starts immediately; later changes coalesce into one
+			* snapshot per ACP_TEXT_FLUSH_INTERVAL. Closing the segment emits its
+			* final text and makes a pending flush a no-op.
+			*/
+			const publishTextSegment = fnUntraced(function* (context, kind) {
+				const segment = textStreamFor(context, kind).current;
+				if (segment === null) return;
+				if (!segment.emitted) return yield* emitTextSegment(context, kind, false);
+				if (segment.dirty) return;
+				segment.dirty = true;
+				yield* emitTextSegment(context, kind, false, segment).pipe(delay(ACP_TEXT_FLUSH_INTERVAL), forkIn(sessionScope));
 			});
 			const closeTextStream = fnUntraced(function* (context, kind) {
 				const stream = textStreamFor(context, kind);
@@ -143279,17 +143346,19 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const sourceMessageId = messageId?.trim() || null;
 				if (stream.current !== null && sourceMessageId !== null && stream.current.sourceMessageId !== null && stream.current.sourceMessageId !== sourceMessageId) yield* closeTextStream(context, kind);
 				if (stream.current === null) {
-					const now$127 = yield* now;
+					const now$135 = yield* now;
 					stream.current = {
 						nativeItemId: sourceMessageId === null ? `${context.nativeTurnId}:${kind}:${stream.nextSegment}` : `${context.nativeTurnId}:${kind}:message:${sourceMessageId}`,
-						startedAt: now$127,
+						startedAt: now$135,
 						sourceMessageId,
-						text: ""
+						text: "",
+						emitted: false,
+						dirty: false
 					};
 					stream.nextSegment += 1;
 				} else if (stream.current.sourceMessageId === null && sourceMessageId !== null) stream.current.sourceMessageId = sourceMessageId;
 				stream.current.text += text;
-				yield* emitTextSegment(context, kind, false);
+				yield* publishTextSegment(context, kind);
 			});
 			const replaceText = fnUntraced(function* (context, kind, text, messageId) {
 				for (const other of [
@@ -143300,16 +143369,18 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const stream = textStreamFor(context, kind);
 				if (stream.current?.sourceMessageId !== messageId) {
 					yield* closeTextStream(context, kind);
-					const now$125 = yield* now;
+					const now$126 = yield* now;
 					stream.current = {
 						nativeItemId: `${context.nativeTurnId}:${kind}:message:${messageId}`,
-						startedAt: now$125,
+						startedAt: now$126,
 						sourceMessageId: messageId,
-						text
+						text,
+						emitted: false,
+						dirty: false
 					};
 					stream.nextSegment += 1;
 				} else stream.current.text = text;
-				yield* emitTextSegment(context, kind, false);
+				yield* publishTextSegment(context, kind);
 			});
 			const emitSubagentAssistant = fnUntraced(function* (subagent, text, mode = "append", messageId) {
 				if (text.length === 0 && mode === "append") return;
@@ -143318,7 +143389,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const messageText = mode === "replace" ? text : `${previous}${text}`;
 				subagent.assistantMessages.set(nativeItemId, messageText);
 				subagent.assistantText = messageText;
-				const now$124 = yield* now;
+				const now$118 = yield* now;
 				const ordinal = resolveSubagentChildOrdinal(subagent, nativeItemId);
 				const artifacts = makeSubagentConversationArtifacts({
 					messageId: providerMessageId(nativeItemId),
@@ -143335,7 +143406,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					role: "assistant",
 					text: subagent.assistantText,
 					ordinal,
-					now: now$124
+					now: now$118
 				});
 				yield* emitProviderEvent({
 					type: "message.updated",
@@ -143370,7 +143441,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				if (existing === void 0) {
 					if (update.prompt === "" && update.title === null || update.suppressNormalTool === false) return;
 				}
-				const now$128 = yield* now;
+				const now$120 = yield* now;
 				const nativeTaskId = existing?.task.nativeTaskRef?.nativeId ?? update.nativeTaskId;
 				const nativeItemRef = {
 					driver,
@@ -143403,13 +143474,13 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						prompt: update.prompt,
 						title: update.title,
 						result: null,
-						startedAt: now$128
+						startedAt: now$120
 					},
 					model: update.model?.trim() || existing?.task.model || null,
 					status: taskStatus,
 					result: update.result ?? existing?.task.result ?? null,
-					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$128 : null,
-					updatedAt: now$128
+					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$120 : null,
+					updatedAt: now$120
 				};
 				const subagent = existing ?? {
 					task,
@@ -143448,7 +143519,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 								prompt: update.prompt,
 								ordinal: context.subagents.size
 							}),
-							now: now$128,
+							now: now$120,
 							createdBy: "agent",
 							creationSource: "provider"
 						})
@@ -143470,7 +143541,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						role: "user",
 						text: update.prompt,
 						ordinal: 100,
-						now: now$128
+						now: now$120
 					});
 					yield* emitProviderEvent({
 						type: "message.updated",
@@ -143499,7 +143570,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							providerThreadId: context.input.providerThread.id,
 							providerTurnId: context.providerTurnId
 						},
-						now: now$128
+						now: now$120
 					});
 					subagent.task = {
 						...subagent.task,
@@ -143527,8 +143598,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					...subagent.task,
 					status: taskStatus,
 					result,
-					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$128 : null,
-					updatedAt: now$128
+					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$120 : null,
+					updatedAt: now$120
 				};
 				const providerThreadId = subagent.task.providerThreadId;
 				yield* emitProviderEvent({
@@ -143595,7 +143666,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						title: subagent.task.title,
 						startedAt: subagent.task.startedAt,
 						completedAt: subagent.task.completedAt,
-						updatedAt: now$128,
+						updatedAt: now$120,
 						type: "subagent",
 						subagentId: subagent.task.id,
 						origin: "provider_native",
@@ -143756,7 +143827,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					return;
 				}
 				const status = projectedStatus ?? toolStatus$1(toolCall.status);
-				const now$134 = yield* now;
+				const now$127 = yield* now;
 				const nativeItemId = `${context.nativeThreadId}:tool:${toolCall.toolCallId}`;
 				const ordinal = yield* resolveItemOrdinal(context, nativeItemId);
 				const nodeId = providerNodeId(nativeItemId);
@@ -143766,9 +143837,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					nativeId: toolCall.toolCallId,
 					strength: "strong"
 				};
-				const startedAt = context.toolStartedAt.get(toolCall.toolCallId) ?? now$134;
+				const startedAt = context.toolStartedAt.get(toolCall.toolCallId) ?? now$127;
 				context.toolStartedAt.set(toolCall.toolCallId, startedAt);
-				const completedAt = completedAtForStatus(status, now$134);
+				const completedAt = completedAtForStatus(status, now$127);
 				const title = toolCall.title ?? null;
 				yield* emitProviderEvent({
 					type: "node.updated",
@@ -143805,7 +143876,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					title,
 					startedAt,
 					completedAt,
-					updatedAt: now$134
+					updatedAt: now$127
 				};
 				const rawInput = toolCall.data.rawInput;
 				const rawOutput = toolCall.data.rawOutput ?? toolCall.data.content;
@@ -143977,7 +144048,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				if (update.kind === "removed" && existing === void 0) return;
 				const nativeItemId = `${context.nativeTurnId}:plan:${encodeURIComponent(update.nativePlanId)}`;
 				const ordinal = yield* resolveItemOrdinal(context, nativeItemId);
-				const now$133 = yield* now;
+				const now$125 = yield* now;
 				const nodeId = providerNodeId(nativeItemId);
 				const turnItemId = providerTurnItemId(nativeItemId);
 				const planState = existing ?? {
@@ -143986,7 +144057,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runId: context.input.runId,
 						driver
 					}),
-					startedAt: now$133,
+					startedAt: now$125,
 					latest: null
 				};
 				const planId = planState.id;
@@ -144053,7 +144124,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequestId: null,
 						checkpointScopeId: null,
 						startedAt: planState.startedAt,
-						completedAt: completed ? now$133 : null
+						completedAt: completed ? now$125 : null
 					}
 				});
 				yield* emitProviderEvent({
@@ -144077,8 +144148,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						status: completed ? "completed" : "running",
 						title: null,
 						startedAt: planState.startedAt,
-						completedAt: completed ? now$133 : null,
-						updatedAt: now$133,
+						completedAt: completed ? now$125 : null,
+						updatedAt: now$125,
 						...plan.kind === "todo_list" ? {
 							type: "todo_list",
 							planId,
@@ -144095,7 +144166,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 			});
 			const appendLoadedHistory = (notification, role, text, replace = false) => gen$1(function* () {
 				if (text.length === 0 && !replace) return;
-				const now$130 = yield* now;
+				const now$123 = yield* now;
 				yield* update$4(snapshot, (current) => {
 					const update = notification.update;
 					const sourceMessageId = (update.sessionUpdate === "user_message_chunk" || update.sessionUpdate === "agent_message_chunk" || update.sessionUpdate === "agent_thought_chunk" || update.sessionUpdate === "user_message" || update.sessionUpdate === "agent_message" || update.sessionUpdate === "agent_thought") && update.messageId ? update.messageId : null;
@@ -144117,8 +144188,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						text: replace ? text : `${previous?.text ?? ""}${text}`,
 						attachments: [],
 						streaming: false,
-						createdAt: previous?.createdAt ?? now$130,
-						updatedAt: now$130
+						createdAt: previous?.createdAt ?? now$123,
+						updatedAt: now$123
 					});
 					return {
 						order: current.order.includes(key) ? current.order : [...current.order, key],
@@ -144344,12 +144415,12 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					}
 					const knownProviderThread = (yield* get$6(providerThreadByNativeSessionId)).get(notification.sessionId);
 					if (knownProviderThread !== void 0) {
-						const now$126 = yield* now;
+						const now$119 = yield* now;
 						const providerThread = {
 							...knownProviderThread,
 							contextUsage: (yield* get$6(contextUsageBySessionId)).get(notification.sessionId) ?? knownProviderThread.contextUsage ?? null,
 							nativeMetadata: (yield* get$6(nativeMetadataBySessionId)).get(notification.sessionId) ?? knownProviderThread.nativeMetadata ?? null,
-							updatedAt: now$126
+							updatedAt: now$119
 						};
 						yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(notification.sessionId, providerThread));
 						yield* emitProviderEvent({
@@ -144447,9 +144518,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							context.tools.set(key, merged);
 							if (!shouldPersistToolUpdate(context, key, previous, merged, merged.status)) continue;
 							const mcpIdentity = extractMcpToolCallIdentity(merged, { embeddedTerminalCommands: [...embeddedTerminalCommands(notification.sessionId, toolCall.toolCallId), ...rootSessionId === null ? [] : embeddedTerminalCommands(rootSessionId, toolCall.toolCallId)] });
-							const now$136 = yield* now;
+							const now$128 = yield* now;
 							const status = toolStatus$1(merged.status);
-							const startedAt = context.toolStartedAt.get(key) ?? now$136;
+							const startedAt = context.toolStartedAt.get(key) ?? now$128;
 							context.toolStartedAt.set(key, startedAt);
 							const ordinal = resolveSubagentChildOrdinal(subagent, key);
 							yield* emitProviderEvent({
@@ -144472,8 +144543,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 									status,
 									title: merged.title ?? merged.kind ?? "Tool",
 									startedAt,
-									completedAt: completedAtForStatus(status, now$136),
-									updatedAt: now$136,
+									completedAt: completedAtForStatus(status, now$128),
+									updatedAt: now$128,
 									type: "dynamic_tool",
 									...mcpIdentity === void 0 ? {} : mcpToolPresentation$1({
 										serverName: mcpIdentity.server,
@@ -144664,7 +144735,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const decision = yield* make$236();
 				const nativeResponseAcknowledgement = yield* make$236();
 				yield* registerNativeResponseAcknowledgement(generation, transportRequestId, nativeResponseAcknowledgement);
-				const now$122 = yield* now;
+				const now$137 = yield* now;
 				const nodeId = idAllocator.derive.approvalNode({ requestId });
 				const requestKind = providerRequestKind(parsed.kind);
 				const nativeItemRef = {
@@ -144684,7 +144755,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						type: "live",
 						providerSessionId: input.providerSessionId
 					},
-					createdAt: now$122,
+					createdAt: now$137,
 					resolvedAt: null
 				};
 				const node = {
@@ -144701,7 +144772,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					nativeItemRef,
 					runtimeRequestId: requestId,
 					checkpointScopeId: null,
-					startedAt: now$122,
+					startedAt: now$137,
 					completedAt: null
 				};
 				const turnItem = {
@@ -144716,9 +144787,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					ordinal,
 					status: "waiting",
 					title: null,
-					startedAt: now$122,
+					startedAt: now$137,
 					completedAt: null,
-					updatedAt: now$122,
+					updatedAt: now$137,
 					type: "approval_request",
 					requestId,
 					requestKind,
@@ -144775,7 +144846,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const answers = yield* make$236();
 				const nativeResponseAcknowledgement = yield* make$236();
 				yield* registerNativeResponseAcknowledgement(generation, transportRequestId, nativeResponseAcknowledgement);
-				const now$118 = yield* now;
+				const now$131 = yield* now;
 				const nodeId = providerNodeId(request.nativeItemId);
 				const turnItemId = providerTurnItemId(request.nativeItemId);
 				const nativeItemRef = {
@@ -144799,7 +144870,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						type: "live",
 						providerSessionId: input.providerSessionId
 					},
-					createdAt: now$118,
+					createdAt: now$131,
 					resolvedAt: null
 				};
 				const node = {
@@ -144816,7 +144887,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					nativeItemRef,
 					runtimeRequestId: requestId,
 					checkpointScopeId: null,
-					startedAt: now$118,
+					startedAt: now$131,
 					completedAt: null
 				};
 				const turnItem = {
@@ -144831,9 +144902,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					ordinal,
 					status: "waiting",
 					title: null,
-					startedAt: now$118,
+					startedAt: now$131,
 					completedAt: null,
-					updatedAt: now$118,
+					updatedAt: now$131,
 					type: "user_input_request",
 					requestId,
 					questions: [...request.questions]
@@ -144897,7 +144968,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 			const cancelPendingRuntimeRequests = fnUntraced(function* () {
 				const requests = yield* modify$3(pendingRuntimeRequests, (current) => [[...current.values()], /* @__PURE__ */ new Map()]);
 				if (requests.length === 0) return;
-				const now$129 = yield* now;
+				const now$121 = yield* now;
 				yield* forEach(requests, (request) => gen$1(function* () {
 					if (!(yield* request.type === "approval" ? succeed$5(request.decision, "cancel") : succeed$5(request.answers, null))) return;
 					yield* emitProviderEvent({
@@ -144907,7 +144978,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequest: {
 							...request.runtimeRequest,
 							status: "cancelled",
-							resolvedAt: now$129
+							resolvedAt: now$121
 						}
 					});
 					yield* emitProviderEvent({
@@ -144916,7 +144987,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						node: {
 							...request.node,
 							status: "cancelled",
-							completedAt: now$129
+							completedAt: now$121
 						}
 					});
 					yield* emitProviderEvent({
@@ -144925,8 +144996,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						turnItem: {
 							...request.turnItem,
 							status: "cancelled",
-							completedAt: now$129,
-							updatedAt: now$129
+							completedAt: now$121,
+							updatedAt: now$121
 						}
 					});
 				}), {
@@ -144940,15 +145011,15 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 			* longer guaranteed to ingest the terminal event.
 			*/
 			const mutateCarryoverSubagentStatus = fnUntraced(function* (subagent, status, resultOverride) {
-				const now$132 = yield* now;
+				const now$124 = yield* now;
 				const result = resultOverride !== void 0 && resultOverride !== null && resultOverride.length > 0 ? resultOverride : subagent.task.result ?? (subagent.assistantText || null);
-				const completedAt = acpSubagentStatusIsTerminal(status) ? now$132 : null;
+				const completedAt = acpSubagentStatusIsTerminal(status) ? now$124 : null;
 				subagent.task = {
 					...subagent.task,
 					status,
 					result,
 					completedAt,
-					updatedAt: now$132
+					updatedAt: now$124
 				};
 			});
 			/**
@@ -145728,7 +145799,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				else if (settledStatus === "interrupted") yield* terminalizeOpenRunOwnedItems(context, { terminalizeSubagents: directStopQuarantine });
 				yield* closeTextStreams(context);
 				if (settledStatus !== "failed") yield* emitProviderRetry(context, settledStatus);
-				const now$119 = yield* now;
+				const now$133 = yield* now;
 				if (flavor.supportsCompaction === true && context.input.message.text.trim() === "/compact" && context.input.message.attachments.length === 0 && settledStatus === "completed") {
 					const nativeItemId = `${context.nativeTurnId}:compaction`;
 					yield* emitProviderEvent({
@@ -145756,12 +145827,12 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							status: "completed",
 							title: "Context compacted",
 							startedAt: context.startedAt,
-							completedAt: now$119,
-							updatedAt: now$119
+							completedAt: now$133,
+							updatedAt: now$133
 						}
 					});
 				}
-				const turn = providerTurnPayload(context, settledStatus, now$119);
+				const turn = providerTurnPayload(context, settledStatus, now$133);
 				yield* update$4(providerTurns, (current) => {
 					const updated = new Map(current);
 					updated.set(String(turn.id), turn);
@@ -145781,7 +145852,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					firstRunOrdinal: context.input.providerThread.firstRunOrdinal ?? context.input.runOrdinal,
 					contextUsage: context.contextUsage,
 					nativeMetadata: context.nativeMetadata,
-					updatedAt: now$119
+					updatedAt: now$133
 				};
 				yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(context.nativeThreadId, updatedProviderThread));
 				yield* emitProviderEvent({
@@ -146194,7 +146265,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					return false;
 				}) } : {},
 				ensureThread: fn("AcpAdapterV2.ensureThread")(function* (threadInput) {
-					const now$120 = yield* now;
+					const now$134 = yield* now;
 					const sessionId = yield* get$6(activeSessionId);
 					if (sessionId === null) return yield* new ProviderAdapterProtocolError({
 						driver,
@@ -146208,7 +146279,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						providerSessionId: input.providerSessionId,
 						nativeThreadId: sessionId,
 						...itemIdentityVersion === void 0 ? {} : { itemIdentityVersion },
-						now: now$120
+						now: now$134
 					});
 					yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(sessionId, providerThread));
 					return providerThread;
@@ -146244,12 +146315,12 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							yield* set$5(activeSelection, nextSelection);
 							yield* set$5(activeInteractionMode, nextRuntimePolicy.interactionMode);
 						}
-						const now$137 = yield* now;
+						const now$129 = yield* now;
 						return {
 							...threadInput.providerThread,
 							providerSessionId: input.providerSessionId,
 							status: "idle",
-							updatedAt: now$137
+							updatedAt: now$129
 						};
 					}));
 				}, (effect, threadInput) => effect.pipe(mapError((cause) => new ProviderAdapterResumeThreadError({
@@ -146482,13 +146553,13 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							yield* set$5(activeInteractionMode, null);
 						}
 						const state = yield* get$6(snapshot);
-						const now$131 = yield* now;
+						const now$122 = yield* now;
 						return {
 							providerThread: {
 								...snapshotInput.providerThread,
 								providerSessionId: input.providerSessionId,
 								status: "idle",
-								updatedAt: now$131
+								updatedAt: now$122
 							},
 							providerTurns: [...(yield* get$6(providerTurns)).values()],
 							messages: state.order.flatMap((key) => {
@@ -146547,7 +146618,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							yield* set$5(lastTurnRoute, null);
 						}));
 					})).pipe(retry$1({ times: 1 }));
-					const now$138 = yield* now;
+					const now$130 = yield* now;
 					return {
 						providerThread: {
 							...rollbackInput.providerThread,
@@ -146562,7 +146633,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 								itemIdentityVersion: 2
 							},
 							status: "idle",
-							updatedAt: now$138
+							updatedAt: now$130
 						},
 						providerTurns: [],
 						messages: [],
@@ -146597,7 +146668,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						yield* set$5(activeSelection, null);
 						yield* set$5(activeInteractionMode, null);
 						itemIdentityVersion = 2;
-						const now$121 = yield* now;
+						const now$136 = yield* now;
 						const providerThread = makeProviderThread$3({
 							driver,
 							providerInstanceId: options.instanceId,
@@ -146611,7 +146682,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 								providerThreadId: forkInput.sourceProviderThread.id,
 								...forkInput.providerTurnId === void 0 ? {} : { providerTurnId: forkInput.providerTurnId }
 							},
-							now: now$121
+							now: now$136
 						});
 						yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(forked.sessionId, providerThread));
 						return providerThread;
@@ -147017,7 +147088,9 @@ const makeManagedServerProvider = fn("makeManagedServerProvider")(function* (inp
 		return yield* applySnapshot(nextSettings, { forceRefresh: true });
 	});
 	const hasProviderStatusDemand = gen$1(function* () {
-		const instanceId = (yield* get$6(snapshotStateRef)).snapshot.instanceId;
+		const state = yield* get$6(snapshotStateRef);
+		if (!state.snapshot.enabled) return false;
+		const instanceId = state.snapshot.instanceId;
 		const [genericDemand, instanceDemand] = yield* all$5([host.shouldRunBackgroundWork({ type: "provider-status" }), host.shouldRunBackgroundWork({
 			type: "provider-status",
 			instanceId
@@ -164583,16 +164656,22 @@ function permissionModeForClaudeRuntimePolicy(runtimePolicy) {
 		case "full-access": return "bypassPermissions";
 	}
 }
-function claudeRuntimeQueryPolicyForRuntimePolicy(runtimePolicy) {
-	const permissionMode = permissionModeForClaudeRuntimePolicy(runtimePolicy);
+const CLAUDE_BYPASS_FULLY_AVAILABLE = {
+	bypassDisabled: false,
+	autoDisabled: false
+};
+function claudeRuntimeQueryPolicyForRuntimePolicy(runtimePolicy, availability = CLAUDE_BYPASS_FULLY_AVAILABLE) {
+	const requestedMode = permissionModeForClaudeRuntimePolicy(runtimePolicy);
+	const downgraded = requestedMode === "bypassPermissions" && availability.bypassDisabled;
+	const permissionMode = downgraded ? availability.autoDisabled ? "default" : "auto" : requestedMode;
 	const readOnlyTools = sandboxPolicyKindForClaudeRuntimePolicy(runtimePolicy) === "readOnly" ? CLAUDE_READ_ONLY_ALLOWED_TOOLS : void 0;
 	const allowedTools = readOnlyTools !== void 0 && readOnlyPolicyAllowsGlobalReads(runtimePolicy) ? readOnlyTools : void 0;
-	const installPermissionCallback = runtimePolicy.approvalPolicy === void 0 ? runtimePolicy.runtimeMode === "approval-required" || runtimePolicy.runtimeMode === "auto-accept-edits" : runtimePolicy.approvalPolicy !== "never";
+	const installPermissionCallback = downgraded || (runtimePolicy.approvalPolicy === void 0 ? runtimePolicy.runtimeMode === "approval-required" || runtimePolicy.runtimeMode === "auto-accept-edits" : runtimePolicy.approvalPolicy !== "never");
 	if (permissionMode === "plan") return {
 		permissionMode,
 		...readOnlyTools === void 0 ? {} : { tools: readOnlyTools },
 		...allowedTools === void 0 ? {} : { allowedTools },
-		installPermissionCallback
+		installPermissionCallback: true
 	};
 	return {
 		permissionMode,
@@ -165389,7 +165468,7 @@ function claudeUserInputQuestions(input) {
 				if (label.length === 0) return [];
 				return [{
 					label,
-					description: typeof optionRecord.description === "string" ? optionRecord.description.trim() : ""
+					description: (typeof optionRecord.description === "string" ? optionRecord.description.trim() : "") || label
 				}];
 			}) : [],
 			multiSelect: record.multiSelect === true
@@ -165747,14 +165826,14 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 			const clearOpaqueBackgroundTaskReplayTombstone = (nativeThreadId, taskId) => clearTaskIdFromNativeThreadSet(opaqueBackgroundTaskReplayTombstonesByNativeThread, nativeThreadId, taskId);
 			const emitProviderThreadRoster = fnUntraced(function* (input) {
 				const roster = rosterForNativeThread(yield* get$6(pendingBackgroundTasksByNativeThread), input.nativeThreadId);
-				const now$114 = yield* now;
+				const now$103 = yield* now;
 				const providerThread = {
 					...input.providerThread,
 					providerSessionId: session.id,
 					...input.status === void 0 ? {} : { status: input.status },
 					pendingBackgroundTasks: claudePendingBackgroundTasksFromRoster(roster),
 					...goalsByNativeThread.has(input.nativeThreadId) ? { goal: goalsByNativeThread.get(input.nativeThreadId) ?? null } : {},
-					updatedAt: now$114
+					updatedAt: now$103
 				};
 				yield* rememberProviderThread(providerThread);
 				yield* emitProviderEvent({
@@ -166032,7 +166111,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				}).pipe(catch_(() => logWarning$1("orchestration-v2.claude-subagent-launch-lookup-failed", { taskId: resume.taskId }).pipe(as(null))));
 				if (launchToolUseId === null || launchToolUseId === resume.toolUseId) return;
 				const ids = claudeSubagentIds(resume.context, resume.taskId);
-				const now$103 = yield* now;
+				const now$109 = yield* now;
 				const subagent = {
 					confirmedOutcome: void 0,
 					childThread: null,
@@ -166057,9 +166136,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						model: null,
 						result: null,
 						status: "completed",
-						startedAt: now$103,
-						completedAt: now$103,
-						updatedAt: now$103
+						startedAt: now$109,
+						completedAt: now$109,
+						updatedAt: now$109
 					},
 					rootNodeId: resume.context.input.rootNodeId,
 					childThreadId: ids.childThreadId,
@@ -166144,7 +166223,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				const parentThread = input.coordinator.childThread;
 				const taskId = input.coordinator.task.nativeTaskRef?.nativeId;
 				if (parentThread === null || taskId === void 0 || taskId === null) return;
-				const now$112 = yield* now;
+				const now$101 = yield* now;
 				const seen = yield* get$6(workflowMemberStates);
 				const transcriptDir = input.workflow.runHandles?.transcriptDir;
 				for (const member of input.workflow.agents) {
@@ -166157,9 +166236,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					const model = member.model ?? parentThread.modelSelection.model;
 					const attempt = member.attempt ?? previous?.attempt ?? 1;
 					const restarted = previous !== void 0 && attempt > previous.attempt;
-					const createdAt = previous?.createdAt ?? now$112;
-					const startedAt = status === "pending" ? null : member.startedAt !== void 0 ? makeUnsafe$11(member.startedAt) : (restarted ? null : previous?.startedAt) ?? (status === "running" ? now$112 : null);
-					const completedAt = settled ? (restarted ? null : previous?.completedAt) ?? now$112 : null;
+					const createdAt = previous?.createdAt ?? now$101;
+					const startedAt = status === "pending" ? null : member.startedAt !== void 0 ? makeUnsafe$11(member.startedAt) : (restarted ? null : previous?.startedAt) ?? (status === "running" ? now$101 : null);
+					const completedAt = settled ? (restarted ? null : previous?.completedAt) ?? now$101 : null;
 					const changed = restarted || previous?.status !== status || !equals(previous?.startedAt, startedAt) || previous?.result !== member.result || previous?.label !== member.label || previous?.prompt !== prompt || previous?.model !== model;
 					const agentId = member.agentId;
 					const readTranscript = settled && transcriptDir !== void 0 && agentId !== void 0 && (input.coordinator.task.status === "running" ? (restarted ? 0 : previous?.transcriptReadAttempts ?? 0) < 3 : restarted || previous?.finalTranscriptRead !== true);
@@ -166200,7 +166279,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "user",
 						text: prompt,
 						ordinal: 100,
-						now: now$112
+						now: now$101
 					});
 					if (restarted && !settled) yield* emitSubagentConversationMessage({
 						nativeItemId: `${memberKey}:answer:200`,
@@ -166209,7 +166288,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "assistant",
 						text: "Retry in progress.",
 						ordinal: 200,
-						now: now$112
+						now: now$101
 					});
 					const task = {
 						id: nodeId,
@@ -166234,7 +166313,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						result: member.result ?? null,
 						startedAt,
 						completedAt,
-						updatedAt: now$112
+						updatedAt: now$101
 					};
 					const nodeBase = {
 						runId: null,
@@ -166295,7 +166374,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							role: "assistant",
 							text: answer,
 							ordinal: 200,
-							now: now$112
+							now: now$101
 						});
 					}
 					yield* update$4(workflowMemberStates, (current) => new Map(current).set(memberKey, {
@@ -166341,7 +166420,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				if (existingSubagent !== void 0 && existingSubagent.task.status !== "running" && input.status === "running" && !isReopen) return;
 				const resumeToolUseId = input.reopen === true && existingSubagent !== void 0 && input.toolUseId !== void 0 && input.toolUseId !== existingSubagent.runToolUseId && input.prompt !== void 0 ? input.toolUseId : null;
 				const lifecycleChanged = existingSubagent === void 0 || existingSubagent.task.status !== input.status || input.reopen === true && input.status === "running";
-				const now$113 = yield* now;
+				const now$102 = yield* now;
 				const nativeItemId = `task:${input.taskId}`;
 				const derivedIds = claudeSubagentIds(input.context, input.taskId);
 				const nodeId = existingSubagent?.task.id ?? derivedIds.nodeId;
@@ -166383,7 +166462,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						title: input.title ?? null,
 						model: input.model ?? null,
 						result: null,
-						startedAt: now$113
+						startedAt: now$102
 					},
 					status: input.status,
 					...input.reopen === true && input.status === "running" && existingSubagent !== void 0 ? { runId: input.context.input.runId } : {},
@@ -166394,9 +166473,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					...input.progress === void 0 ? {} : { progress: input.progress },
 					...workflowWithThreads === void 0 ? {} : { workflow: workflowWithThreads },
 					...input.result === void 0 ? {} : { result: input.result },
-					...isReopen ? { startedAt: now$113 } : {},
-					completedAt: input.status === "running" ? null : priorTask?.completedAt ?? now$113,
-					updatedAt: now$113
+					...isReopen ? { startedAt: now$102 } : {},
+					completedAt: input.status === "running" ? null : priorTask?.completedAt ?? now$102,
+					updatedAt: now$102
 				};
 				const subagent = {
 					task,
@@ -166450,7 +166529,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							title: workflowWithThreads === void 0 ? task.title : `Workflow · ${workflowWithThreads.name ?? task.title ?? "Untitled"}`,
 							ordinal: input.context.subagentsByTaskId.size
 						}),
-						now: now$113,
+						now: now$102,
 						createdBy: "agent",
 						creationSource: "provider"
 					});
@@ -166521,7 +166600,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					role: "user",
 					text: task.prompt,
 					ordinal: existingSubagent === void 0 ? 100 : ++subagent.nextChildItemOrdinal,
-					now: now$113
+					now: now$102
 				});
 				if (workflowWithThreads !== void 0) {
 					yield* projectClaudeWorkflowMembers({
@@ -166575,7 +166654,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "assistant",
 						text: input.result,
 						ordinal: resultItemOrdinal,
-						now: now$113
+						now: now$102
 					});
 				}
 			});
@@ -166881,7 +166960,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					const block = context.reasoning.blocks.get(update.itemId);
 					if (block === void 0 || update.text.length === 0) return;
 					block.text = update.text;
-					const now$110 = yield* now;
+					const now$116 = yield* now;
 					yield* emitProviderEvent({
 						type: "turn_item.updated",
 						driver: CLAUDE_PROVIDER,
@@ -166908,8 +166987,8 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							streaming: !update.completed,
 							status: update.completed ? "completed" : "running",
 							startedAt: block.startedAt,
-							completedAt: update.completed ? now$110 : null,
-							updatedAt: now$110
+							completedAt: update.completed ? now$116 : null,
+							updatedAt: now$116
 						}
 					});
 				})
@@ -167114,7 +167193,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 			const emitAssistantTextArtifacts = fnUntraced(function* (input) {
 				if (input.context.assistant.emittedNativeItemIds.has(input.nativeItemId)) return;
 				input.context.assistant.emittedNativeItemIds.add(input.nativeItemId);
-				const now$108 = yield* now;
+				const now$114 = yield* now;
 				const ordinal = yield* resolveItemOrdinal(input.context, input.nativeItemId);
 				const artifacts = buildAssistantArtifacts({
 					idAllocator,
@@ -167123,8 +167202,8 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					nativeItemId: input.nativeItemId,
 					text: input.text,
 					ordinal,
-					startedAt: now$108,
-					completedAt: now$108
+					startedAt: now$114,
+					completedAt: now$114
 				});
 				yield* all$5([
 					emitProviderEvent({
@@ -167209,14 +167288,14 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					message
 				});
 				if (workflow === void 0) return;
-				const now$116 = yield* now;
+				const now$106 = yield* now;
 				const progress = text$3(message.description);
 				const workflowWithThreads = withWorkflowMemberThreadIds(workflow, registered.childThreadId);
 				const task = {
 					...registered.task,
 					...progress === void 0 ? {} : { progress },
 					workflow: workflowWithThreads,
-					updatedAt: now$116
+					updatedAt: now$106
 				};
 				const coordinator = {
 					...registered,
@@ -167247,7 +167326,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				const isNewSubagentTaskStarted = message.type === "system" && message.subtype === "task_started" && !isClaudeNonSubagentTask(message);
 				const isKnownSubagentTaskStarted = message.type === "system" && message.subtype === "task_started" && (yield* get$6(sessionSubagentsByTaskId)).has(message.task_id);
 				if (isKnownSubagentTaskStarted && message.type === "system" && message.subtype === "task_started") {
-					const now$101 = yield* now;
+					const now$107 = yield* now;
 					yield* update$4(sessionSubagentsByTaskId, (current) => {
 						const registered = current.get(message.task_id);
 						if (registered === void 0 || registered.task.status === "running") return current;
@@ -167259,9 +167338,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 								...priorTask,
 								status: "running",
 								result: null,
-								startedAt: now$101,
+								startedAt: now$107,
 								completedAt: null,
-								updatedAt: now$101
+								updatedAt: now$107
 							}
 						});
 					});
@@ -167395,10 +167474,10 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					if (!rateLimitInfo) return;
 					const names = adapterOptions.scopedLimitNames ? yield* get$6(adapterOptions.scopedLimitNames) : { overageIncluded: void 0 };
 					const update = claudeRateLimitEventToUpdate(rateLimitInfo, names);
-					const now$102 = yield* now;
+					const now$108 = yield* now;
 					if (update && adapterOptions.onUsageLimits) yield* adapterOptions.onUsageLimits({
 						...update,
-						checkedAt: formatIso(now$102)
+						checkedAt: formatIso(now$108)
 					});
 					const context = yield* get$6(activeTurn);
 					if (context === null) {
@@ -167424,7 +167503,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						if (!context.announcedUsageLimits.has(limitKey)) {
 							context.announcedUsageLimits.add(limitKey);
 							const nativeItemId = `usage-limit:${context.providerTurnId}:${limitKey}`;
-							const notice = describeClaudeUsageLimit(rateLimitInfo, toEpochMillis(now$102), names);
+							const notice = describeClaudeUsageLimit(rateLimitInfo, toEpochMillis(now$108), names);
 							yield* emitProviderEvent({
 								type: "turn_item.updated",
 								driver: CLAUDE_PROVIDER,
@@ -167449,9 +167528,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 									status: "completed",
 									title: notice,
 									message: notice,
-									startedAt: now$102,
-									completedAt: now$102,
-									updatedAt: now$102
+									startedAt: now$108,
+									completedAt: now$108,
+									updatedAt: now$108
 								}
 							});
 						}
@@ -167587,7 +167666,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					}
 				}
 				if (message.type === "system" && message.subtype === "compact_boundary") {
-					const now$107 = yield* now;
+					const now$113 = yield* now;
 					const nativeItemId = message.uuid;
 					const postTokens = message.compact_metadata.post_tokens;
 					const afterTokenCount = typeof postTokens === "number" && Number.isFinite(postTokens) && postTokens > 0 ? Math.round(postTokens) : void 0;
@@ -167612,7 +167691,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							tokenUsage: {
 								usedTokens: afterTokenCount,
 								maxTokens: claudeContextWindow(context.input.modelSelection),
-								updatedAt: formatIso(now$107)
+								updatedAt: formatIso(now$113)
 							}
 						}
 					});
@@ -167640,9 +167719,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							driver: CLAUDE_PROVIDER,
 							status: "completed",
 							title: "Context compacted",
-							startedAt: now$107,
-							completedAt: now$107,
-							updatedAt: now$107,
+							startedAt: now$113,
+							completedAt: now$113,
+							updatedAt: now$113,
 							...message.compact_metadata.pre_tokens === void 0 ? {} : { beforeTokenCount: message.compact_metadata.pre_tokens },
 							...afterTokenCount === void 0 ? {} : { afterTokenCount }
 						}
@@ -167650,7 +167729,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					return;
 				}
 				if (message.type === "system" && message.subtype === "model_refusal_fallback") {
-					const now$115 = yield* now;
+					const now$104 = yield* now;
 					const nativeItemId = message.uuid;
 					yield* emitProviderEvent({
 						type: "turn_item.updated",
@@ -167676,9 +167755,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							status: "completed",
 							title: message.content,
 							message: message.content,
-							startedAt: now$115,
-							completedAt: now$115,
-							updatedAt: now$115
+							startedAt: now$104,
+							completedAt: now$104,
+							updatedAt: now$104
 						}
 					});
 					return;
@@ -167725,8 +167804,8 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					return;
 				}
 				if (message.type === "assistant" && input.replayed !== true) {
-					const now$105 = yield* now;
-					yield* completeProviderRetry(context, now$105);
+					const now$110 = yield* now;
+					yield* completeProviderRetry(context, now$110);
 					if (message.parent_tool_use_id === null && message.message.usage !== void 0 && message.message.model !== "<synthetic>") yield* emitProviderEvent({
 						type: "provider_turn.updated",
 						driver: CLAUDE_PROVIDER,
@@ -167745,7 +167824,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							status: "running",
 							startedAt: context.startedAt,
 							completedAt: null,
-							tokenUsage: claudeProviderTurnTokenUsage(message.message.usage, context.input.modelSelection, formatIso(now$105))
+							tokenUsage: claudeProviderTurnTokenUsage(message.message.usage, context.input.modelSelection, formatIso(now$110))
 						}
 					});
 					const parentToolUseId = message.parent_tool_use_id;
@@ -167995,7 +168074,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					const thinking = message.message.content.flatMap((block) => block.type === "thinking" && block.thinking.trim().length > 0 ? [block.thinking] : []);
 					const subagent = thinking.length === 0 ? void 0 : yield* resolveSubagentByToolUseId(context, assistantParentToolUseId);
 					if (subagent !== void 0) {
-						const now$109 = yield* now;
+						const now$115 = yield* now;
 						for (const [index, text] of thinking.entries()) {
 							const nativeItemId = `${message.uuid}:thinking:${index}`;
 							yield* emitProviderEvent({
@@ -168023,9 +168102,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 									text,
 									streaming: false,
 									status: "completed",
-									startedAt: now$109,
-									completedAt: now$109,
-									updatedAt: now$109
+									startedAt: now$115,
+									completedAt: now$115,
+									updatedAt: now$115
 								}
 							});
 						}
@@ -168035,7 +168114,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				if (assistantText !== null && assistantText.text.length > 0 && assistantParentToolUseId !== null) {
 					const subagent = yield* resolveSubagentByToolUseId(context, assistantParentToolUseId);
 					if (subagent === void 0) return;
-					const now$106 = yield* now;
+					const now$112 = yield* now;
 					const nativeMessageId = message.type === "assistant" && typeof message.message.id === "string" ? message.message.id : null;
 					subagent.lastAssistantText = nativeMessageId !== null && nativeMessageId === subagent.lastAssistantMessageId ? `${subagent.lastAssistantText ?? ""}\n${assistantText.text}` : assistantText.text;
 					subagent.lastAssistantMessageId = nativeMessageId;
@@ -168046,7 +168125,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "assistant",
 						text: assistantText.text,
 						ordinal: ++subagent.nextChildItemOrdinal,
-						now: now$106
+						now: now$112
 					});
 					return;
 				}
@@ -168345,6 +168424,11 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						toolUseID: callbackOptions.toolUseID
 					};
 				}
+				if (context.input.runtimePolicy.interactionMode === "plan" && context.input.runtimePolicy.approvalPolicy === "never") return {
+					behavior: "deny",
+					message: "This tool requires approval in Plan mode, but approvals are disabled for this thread.",
+					toolUseID: callbackOptions.toolUseID
+				};
 				if (!requiresClaudeApproval(context)) return {
 					behavior: "allow",
 					updatedInput: toolInput,
@@ -168980,7 +169064,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					});
 					const nativeThreadId = yield* getNativeThreadId$1(rollbackInput.providerThread);
 					yield* closeLiveQueryForNativeThread(nativeThreadId);
-					const now$111 = yield* now;
+					const now$105 = yield* now;
 					if (rollbackInput.target.type === "thread_start") {
 						const resetNativeThreadId = yield* queryRunner.allocateSessionId;
 						return {
@@ -168993,7 +169077,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 									providerSessionId: input.providerSessionId,
 									nativeThreadId: resetNativeThreadId,
 									...rollbackInput.providerThread.forkedFrom === null ? {} : { forkedFrom: rollbackInput.providerThread.forkedFrom },
-									now: now$111
+									now: now$105
 								}),
 								handoffIds: rollbackInput.providerThread.handoffIds
 							},
@@ -169014,7 +169098,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							},
 							status: "idle",
 							lastRunOrdinal: rollbackInput.target.appRunOrdinal,
-							updatedAt: now$111
+							updatedAt: now$105
 						},
 						providerTurns: [],
 						messages: [],
@@ -169049,7 +169133,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						updated.add(forked.sessionId);
 						return updated;
 					});
-					const now$104 = yield* now;
+					const now$111 = yield* now;
 					return makeProviderThread$2({
 						idAllocator,
 						providerInstanceId: adapterOptions.instanceId,
@@ -169061,7 +169145,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							providerThreadId: forkInput.sourceProviderThread.id,
 							...forkInput.providerTurnId === void 0 ? {} : { providerTurnId: forkInput.providerTurnId }
 						},
-						now: now$104
+						now: now$111
 					});
 				}, (effect, forkInput) => effect.pipe(mapError((cause) => new ProviderAdapterForkThreadError({
 					driver: CLAUDE_PROVIDER,
@@ -169518,6 +169602,7 @@ function claudeAuthStatus(capabilities) {
 	return Boolean(capabilities.apiKeySource) && capabilities.apiKeySource !== "none" || capabilities.email || capabilities.subscriptionType ? "authenticated" : "unauthenticated";
 }
 const CAPABILITIES_PROBE_TIMEOUT_MS = 25e3;
+const CLAUDE_VERSION_CHECK_TIMEOUT_MS = 2e4;
 /**
 * Keep workspace-scoped command discovery intact while isolating the periodic
 * health check from configured MCP servers.
@@ -169690,7 +169775,7 @@ const checkClaudeProviderStatus = fn("checkClaudeProviderStatus")(function* (cla
 			message: "Claude is disabled in P4 Code settings."
 		}
 	});
-	const versionProbe = yield* runClaudeCommand(claudeSettings, ["--version"], resolvedEnvironment, cwd).pipe(timeoutOption(DEFAULT_TIMEOUT_MS$5), result$1);
+	const versionProbe = yield* runClaudeCommand(claudeSettings, ["--version"], resolvedEnvironment, cwd).pipe(timeoutOption(CLAUDE_VERSION_CHECK_TIMEOUT_MS), result$1);
 	if (isFailure$1(versionProbe)) {
 		const error = versionProbe.failure;
 		yield* logWarning$1("Claude Agent CLI health check failed.", { errorTag: error._tag });
@@ -192468,6 +192553,7 @@ const isJsonRpcId = is$2(JsonRpcId);
 const isJsonRpcResponseEnvelope = is$2(JsonRpcResponseEnvelope);
 const isCodexAppServerError = is$2(CodexAppServerError);
 const MAX_BUFFERED_RAW_MESSAGES = 32;
+const MAX_INCOMING_MESSAGE_BYTES = 134217728;
 function isObject$2(value) {
 	return typeof value === "object" && value !== null;
 }
@@ -192509,7 +192595,9 @@ const makeCodexAppServerPatchedProtocol = fn("makeCodexAppServerPatchedProtocol"
 	const incomingRequests = yield* sliding(MAX_BUFFERED_RAW_MESSAGES);
 	const pending = yield* make$226(/* @__PURE__ */ new Map());
 	const nextRequestId = yield* make$226(1);
+	const maxIncomingMessageBytes = options.maxIncomingMessageBytes ?? MAX_INCOMING_MESSAGE_BYTES;
 	const remainder = [];
+	let remainderBytes = 0;
 	const terminationHandled = yield* make$226(false);
 	const terminationFailure = yield* make$226(none$2());
 	const terminationSignal = yield* make$236();
@@ -192614,18 +192702,28 @@ const makeCodexAppServerPatchedProtocol = fn("makeCodexAppServerPatchedProtocol"
 			}
 		})), flatMap$1(routeMessage));
 	};
-	yield* options.stdio.stdin.pipe(interruptWhen(_await(terminationSignal)), decodeText$1(), runForEach((chunk) => sync$1(() => {
-		const lines = [];
+	yield* options.stdio.stdin.pipe(interruptWhen(_await(terminationSignal)), decodeText$1(), runForEach(fnUntraced(function* (chunk) {
 		let start = 0;
-		for (let newline = chunk.indexOf("\n"); newline !== -1; newline = chunk.indexOf("\n", start)) {
-			remainder.push(chunk.slice(start, newline));
-			lines.push(remainder.join("").replace(/\r$/, ""));
+		while (start < chunk.length) {
+			const newline = chunk.indexOf("\n", start);
+			const fragment = chunk.slice(start, newline === -1 ? chunk.length : newline);
+			remainderBytes += Buffer.byteLength(fragment, "utf8");
+			if (remainderBytes > maxIncomingMessageBytes) {
+				remainder.length = 0;
+				return yield* new CodexAppServerTransportError({
+					operation: "read-input-stream",
+					cause: /* @__PURE__ */ new Error(`Incoming message exceeded ${maxIncomingMessageBytes} bytes.`)
+				});
+			}
+			remainder.push(fragment);
+			if (newline === -1) break;
+			const line = remainder.join("").replace(/\r$/, "");
 			remainder.length = 0;
+			remainderBytes = 0;
+			yield* handleLine(line);
 			start = newline + 1;
 		}
-		if (start < chunk.length) remainder.push(chunk.slice(start));
-		return lines;
-	}).pipe(flatMap$1((lines) => forEach(lines, handleLine, { discard: true })))), matchEffect({
+	})), matchEffect({
 		onFailure: (error) => handleTermination(() => succeed$1(normalizeIncomingError(error, "read-input-stream"))),
 		onSuccess: () => sync$1(() => {
 			const line = remainder.join("");
@@ -194367,6 +194465,17 @@ function codexErrorInfoCode(value) {
 	if (typeof value !== "object" || value === null) return null;
 	return Object.keys(value)[0] ?? null;
 }
+/**
+* Retry exhaustion only says why it failed through the last attempt's HTTP
+* status. Exhaustion on 429 is a usage or rate limit, so it keeps the Limited
+* state and resume controls; other statuses stay provider or transport errors.
+*/
+function codexExhaustionHttpStatus(errorInfo) {
+	return typeof errorInfo === "object" && errorInfo !== null && "responseTooManyFailedAttempts" in errorInfo ? errorInfo.responseTooManyFailedAttempts.httpStatusCode ?? null : null;
+}
+function codexUsageLimitError(code, errorInfo) {
+	return code === "usageLimitExceeded" || code === "rateLimitExceeded" || codexExhaustionHttpStatus(errorInfo) === 429;
+}
 function isPersistentCodexDynamicTool(item) {
 	const input = item.arguments;
 	if (input === null || typeof input !== "object" || Array.isArray(input)) return false;
@@ -195135,12 +195244,12 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 				return [next, updated];
 			});
 			const emitSubagentTaskUpdate = (input) => gen$1(function* () {
-				const now$95 = yield* now;
+				const now$96 = yield* now;
 				const prior = input.subagent.task;
 				const settled = !isOrchestrationV2WorkActive(prior.status);
 				if (settled && isOrchestrationV2WorkActive(input.status) && !input.reopen) return;
 				const status = settled && !input.reopen ? prior.status : input.status;
-				const completedAt = isOrchestrationV2WorkActive(status) ? null : prior.completedAt ?? input.completedAt ?? now$95;
+				const completedAt = isOrchestrationV2WorkActive(status) ? null : prior.completedAt ?? input.completedAt ?? now$96;
 				const task = {
 					...prior,
 					status,
@@ -195151,7 +195260,7 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 					startedAt: input.startedAt ?? prior.startedAt,
 					result: input.result === void 0 ? input.subagent.task.result : input.result,
 					completedAt,
-					updatedAt: now$95
+					updatedAt: now$96
 				};
 				input.subagent.task = task;
 				if (input.startedAt !== void 0) input.subagent.startedAt = input.startedAt;
@@ -195259,14 +195368,14 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 						result: null
 					} : {}
 				});
-				const now$94 = yield* now;
+				const now$95 = yield* now;
 				yield* emitProviderEvent({
 					type: "provider_thread.updated",
 					driver: CODEX_PROVIDER,
 					providerThread: {
 						...subagent.providerThread,
 						status: "active",
-						updatedAt: now$94
+						updatedAt: now$95
 					}
 				});
 				yield* emitProviderEvent({
@@ -196739,7 +196848,7 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 						failure: makeProviderFailure({
 							message: payload.error.additionalDetails?.trim() || payload.error.message,
 							code: notificationCode,
-							class: notificationCode === "usageLimitExceeded" || notificationCode === "rateLimitExceeded" ? "usage_limit" : "provider_error"
+							class: codexUsageLimitError(notificationCode, payload.error.codexErrorInfo) ? "usage_limit" : "provider_error"
 						})
 					};
 					return;
@@ -196757,7 +196866,7 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 				const failure = makeProviderFailure({
 					message: additionalDetails === void 0 || additionalDetails.length === 0 ? payload.error.message : additionalDetails,
 					code,
-					class: code === "usageLimitExceeded" || code === "rateLimitExceeded" ? "usage_limit" : code?.startsWith("http") === true || code?.startsWith("responseStream") === true ? "transport_error" : "provider_error",
+					class: codexUsageLimitError(code, payload.error.codexErrorInfo) ? "usage_limit" : code?.startsWith("http") === true || code?.startsWith("responseStream") === true ? "transport_error" : "provider_error",
 					retryable: true
 				});
 				const itemOrdinal = previous?.itemOrdinal ?? (yield* resolveItemOrdinal(context, `terminal-failure:${context.providerTurnId}`));
@@ -197465,10 +197574,13 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 				const terminalStatus = providerTurnStatusToTerminal(input.status);
 				if (terminalStatus === "failed") {
 					const previousFailure = input.context.latestProviderFailure ?? input.providerRetry;
-					const failure = previousFailure !== void 0 && (input.failureMessage === void 0 || input.failureMessage === previousFailure.nativeMessage) && (input.failureCode === void 0 || input.failureCode === previousFailure.failure.code) ? previousFailure.failure : makeProviderFailure({
+					const failureCode = input.failureErrorInfo === void 0 ? void 0 : codexErrorInfoCode(input.failureErrorInfo);
+					const failureClass = codexUsageLimitError(failureCode ?? null, input.failureErrorInfo) ? "usage_limit" : "provider_error";
+					const exhaustionStatus = codexExhaustionHttpStatus(input.failureErrorInfo);
+					const failure = previousFailure !== void 0 && (input.failureMessage === void 0 || input.failureMessage === previousFailure.nativeMessage) && (failureCode === void 0 || failureCode === previousFailure.failure.code) && (exhaustionStatus === null || previousFailure.failure.class === failureClass) ? previousFailure.failure : makeProviderFailure({
 						message: input.failureMessage,
-						code: input.failureCode,
-						class: input.failureCode === "usageLimitExceeded" || input.failureCode === "rateLimitExceeded" ? "usage_limit" : "provider_error"
+						code: failureCode,
+						class: failureClass
 					});
 					return {
 						type: "turn.terminal",
@@ -197794,7 +197906,7 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 					completedAt: codexTimestamp(payload.turn.completedAt),
 					...payload.turn.error?.message === void 0 ? {} : {
 						failureMessage: payload.turn.error.message,
-						...payload.turn.error.codexErrorInfo == null ? {} : { failureCode: codexErrorInfoCode(payload.turn.error.codexErrorInfo) }
+						...payload.turn.error.codexErrorInfo == null ? {} : { failureErrorInfo: payload.turn.error.codexErrorInfo }
 					}
 				});
 			}));
@@ -197803,7 +197915,7 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 			* assistant text, as Claude's own `/goal` output is.
 			*/
 			const completeGoalCommandTurn = fnUntraced(function* (turnInput, reply) {
-				const now$96 = yield* now;
+				const now$94 = yield* now;
 				const nativeId = `goal-command:${turnInput.attemptId}`;
 				const context = {
 					input: turnInput,
@@ -197819,11 +197931,11 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 					providerTurnOrdinal: turnInput.providerTurnOrdinal,
 					providerNodeId: turnInput.rootNodeId,
 					providerNodeKind: "root_turn",
-					providerNodeStartedAt: now$96,
+					providerNodeStartedAt: now$94,
 					itemParentNodeId: turnInput.rootNodeId,
 					rootNodeId: turnInput.rootNodeId,
 					subagent: null,
-					startedAt: now$96,
+					startedAt: now$94,
 					itemPositions: /* @__PURE__ */ new Map()
 				};
 				const providerTurn = {
@@ -197834,7 +197946,7 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 					nativeTurnRef: null,
 					ordinal: turnInput.providerTurnOrdinal,
 					status: "running",
-					startedAt: now$96,
+					startedAt: now$94,
 					completedAt: null
 				};
 				yield* emitProviderEvent({
@@ -197870,7 +197982,7 @@ const makeCodexAdapterV2 = fn("makeCodexAdapterV2")(function* (adapterOptions) {
 					providerTurn: {
 						...providerTurn,
 						status: "completed",
-						completedAt: now$96
+						completedAt: now$94
 					}
 				});
 				yield* emitRootTerminal(context, {
@@ -238208,7 +238320,7 @@ function piThreadSnapshot(providerThread) {
 function piQuestion(questionId, method, title, event) {
 	const options = method === "select" && Array.isArray(event["options"]) ? event["options"].filter((option) => typeof option === "string").map((option) => ({
 		label: option || "Empty value",
-		description: option,
+		description: option || "Empty value",
 		value: option
 	})) : method === "editor" ? [] : [{
 		label: "Submit empty value",
@@ -240208,7 +240320,14 @@ const DEFAULT_OPEN_ROWS = 30;
 const TERMINAL_ENV_BLOCKLIST = /* @__PURE__ */ new Set([
 	"PORT",
 	"ELECTRON_RENDERER_PORT",
-	"ELECTRON_RUN_AS_NODE"
+	"ELECTRON_RUN_AS_NODE",
+	"TMUX",
+	"TMUX_PANE",
+	"STY",
+	"WINDOW",
+	"ZELLIJ",
+	"ZELLIJ_SESSION_NAME",
+	"ZELLIJ_PANE_ID"
 ]);
 const nowIso$4 = map$9(now, formatIso);
 const MAX_TERMINAL_LABEL_LENGTH = 128;
@@ -240934,6 +241053,9 @@ function createTerminalSpawnEnv(baseEnv, runtimeEnv, platform, home) {
 		spawnEnv[existingKey ?? key] = key === "CODEX_HOME" || key === "CLAUDE_CONFIG_DIR" ? expandHomePath(value, home) : value;
 	}
 	if (!spawnEnv.COLORTERM && runtimeEnv?.COLORTERM === void 0) spawnEnv.COLORTERM = "truecolor";
+	const fishFeaturesKey = platform === "win32" ? Object.keys(spawnEnv).find((candidate) => candidate.toLowerCase() === "fish_features") ?? "fish_features" : "fish_features";
+	const fishFeatures = spawnEnv[fishFeaturesKey];
+	if (!fishFeatures?.includes("query-term")) spawnEnv[fishFeaturesKey] = fishFeatures ? `${fishFeatures},no-query-term` : "no-query-term";
 	return stripAppImageRuntimeEnv(spawnEnv);
 }
 function normalizedRuntimeEnv(env) {
@@ -261735,7 +261857,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			cause: `Queued run ${queuedRun.id} is missing projection state.`
 		});
 		const commandId = CommandId.make(`command:system:start-queued:${queuedRun.id}`);
-		const now$22 = yield* now;
+		const now$21 = yield* now;
 		const selectionChanged = !modelSelectionsEqual(projection.thread.modelSelection, queuedRun.modelSelection);
 		const switchPlan = selectionChanged ? yield* providerSwitchService.plan({
 			projection,
@@ -261800,7 +261922,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runs: projection.runs,
 			strategy: handoffStrategy,
 			items: [...needsFullContext && latestCompletedRun !== void 0 ? legacyImportItems : [], ...yield* readHandoffItems(threadId, coveredRuns.map((run) => run.id))],
-			createdAt: now$22
+			createdAt: now$21
 		}).pipe(mapError((cause) => new OrchestratorDispatchError({
 			commandId,
 			commandType: "message.dispatch",
@@ -261812,7 +261934,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			toProviderThreadId: queuedProviderThread.id,
 			toProviderInstanceId: queuedRun.providerInstanceId,
 			items: legacyImportItems,
-			createdAt: now$22
+			createdAt: now$21
 		}).pipe(mapError((cause) => new OrchestratorDispatchError({
 			commandId,
 			commandType: "message.dispatch",
@@ -261828,7 +261950,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			rootNodeId: rootNode.id,
 			providerThreadId: queuedProviderThread.id,
 			cwd: resolvedRuntimePolicy.cwd ?? projection.thread.worktreePath ?? process.cwd(),
-			createdAt: now$22
+			createdAt: now$21
 		})), mapError((cause) => new OrchestratorDispatchError({
 			commandId,
 			commandType: "message.dispatch",
@@ -261850,7 +261972,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			firstRunOrdinal: queuedProviderThread.firstRunOrdinal ?? queuedRun.ordinal,
 			lastRunOrdinal: queuedRun.ordinal,
 			handoffIds: appendContextHandoffId(appendContextHandoffId(queuedProviderThread.handoffIds, handoff?.id ?? null), legacyImportRecoveryHandoff?.id ?? null),
-			updatedAt: now$22
+			updatedAt: now$21
 		};
 		const startingRun = {
 			...queuedRun,
@@ -261888,9 +262010,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				...queuedMessage.senderThreadId === void 0 ? {} : { senderThreadId: queuedMessage.senderThreadId }
 			},
 			inputIntent: "queued_turn",
-			startedAt: now$22,
-			completedAt: now$22,
-			updatedAt: now$22
+			startedAt: now$21,
+			completedAt: now$21,
+			updatedAt: now$21
 		};
 		const handoffTurnItem = activeHandoff === null ? null : {
 			id: idAllocator.derive.runSignalTurnItem({
@@ -261907,9 +262029,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			ordinal: queuedRun.ordinal * 100 - 1,
 			status: "completed",
 			title: handoff === null ? "Imported context" : "Provider handoff",
-			startedAt: now$22,
-			completedAt: now$22,
-			updatedAt: now$22,
+			startedAt: now$21,
+			completedAt: now$21,
+			updatedAt: now$21,
 			type: "handoff",
 			contextHandoffId: activeHandoff.id,
 			fromProviderThreadIds: activeHandoff.fromProviderThreadIds,
@@ -261927,7 +262049,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: queuedRun.id,
 			nodeId: rootNode.id,
 			providerInstanceId: queuedRun.providerInstanceId,
-			occurredAt: now$22,
+			occurredAt: now$21,
 			payload: checkpointScope
 		}, {
 			type: "node.updated",
@@ -261935,7 +262057,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: queuedRun.id,
 			nodeId: rootNode.id,
 			providerInstanceId: queuedRun.providerInstanceId,
-			occurredAt: now$22,
+			occurredAt: now$21,
 			payload: {
 				...rootNode,
 				checkpointScopeId: checkpointScope.id
@@ -261947,12 +262069,12 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				type: queuedRun.providerInstanceId === projection.thread.providerInstanceId ? "thread.model-selection-updated" : "thread.provider-switched",
 				threadId,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: {
 					...projection.thread,
 					providerInstanceId: queuedRun.providerInstanceId,
 					modelSelection: queuedRun.modelSelection,
-					updatedAt: now$22
+					updatedAt: now$21
 				}
 			}] : [],
 			...handoff === null || transferId === null || latestHandoffRun === void 0 ? [] : [{
@@ -261960,7 +262082,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				threadId,
 				runId: queuedRun.id,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: {
 					id: transferId,
 					type: "provider_handoff",
@@ -261978,16 +262100,16 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					},
 					createdBy: queuedMessage.createdBy,
 					error: null,
-					createdAt: now$22,
-					updatedAt: now$22,
-					consumedAt: now$22
+					createdAt: now$21,
+					updatedAt: now$21,
+					consumedAt: now$21
 				}
 			}, {
 				type: "context-handoff.updated",
 				threadId,
 				runId: queuedRun.id,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: handoff
 			}],
 			...legacyImportRecoveryHandoff === null ? [] : [{
@@ -261995,7 +262117,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				threadId,
 				runId: queuedRun.id,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: legacyImportRecoveryHandoff
 			}],
 			...handoffTurnItem === null ? [] : [{
@@ -262004,7 +262126,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: queuedRun.id,
 				nodeId: rootNodeId,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: handoffTurnItem
 			}],
 			...sessionsToDetach.map((session) => ({
@@ -262012,10 +262134,10 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				threadId,
 				driver: session.driver,
 				providerInstanceId: session.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: {
 					providerSessionId: session.id,
-					detachedAt: now$22,
+					detachedAt: now$21,
 					reason: "Provider or model selection changed."
 				}
 			})),
@@ -262024,7 +262146,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				type: "provider-thread.updated",
 				threadId,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: providerThread
 			},
 			{
@@ -262033,7 +262155,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: queuedRun.id,
 				nodeId: rootNodeId,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: notificationTurnItem(userTurnItem, queuedMessage, projection.subagents)
 			},
 			{
@@ -262042,7 +262164,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: queuedRun.id,
 				nodeId: rootNodeId,
 				providerInstanceId: queuedRun.providerInstanceId,
-				occurredAt: now$22,
+				occurredAt: now$21,
 				payload: startingRun
 			}
 		], [...sessionsToDetach.map((session) => ({
@@ -262103,7 +262225,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			cause: `Delegated task ${command.taskId} is not an app-owned task of thread ${command.parentThreadId}.`
 		});
 		const state = command.type === "delegated_task.completion-delivery.acknowledge" ? "acknowledged" : "disposed";
-		const now$36 = yield* now;
+		const now$33 = yield* now;
 		const emitEvent = emit(events, command);
 		if (task.completionDelivery?.state === state || command.type === "delegated_task.completion-delivery.acknowledge" && task.completionDelivery?.state === "disposed") {
 			yield* emitEvent({
@@ -262113,7 +262235,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				nodeId: task.id,
 				driver: task.driver,
 				providerInstanceId: task.providerInstanceId,
-				occurredAt: now$36,
+				occurredAt: now$33,
 				payload: task
 			});
 			return;
@@ -262124,7 +262246,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				state,
 				observedByRunId: command.type === "delegated_task.completion-delivery.acknowledge" ? command.observedByRunId : null
 			},
-			updatedAt: now$36
+			updatedAt: now$33
 		};
 		yield* emitEvent({
 			type: "subagent.updated",
@@ -262133,7 +262255,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			nodeId: task.id,
 			driver: task.driver,
 			providerInstanceId: task.providerInstanceId,
-			occurredAt: now$36,
+			occurredAt: now$33,
 			payload: updatedTask
 		});
 		const parentRun = task.runId === null ? void 0 : projection.runs.find((candidate) => candidate.id === task.runId);
@@ -262157,7 +262279,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: parentRun.id,
 			...parentRun.rootNodeId === null ? {} : { nodeId: parentRun.rootNodeId },
 			providerInstanceId: parentRun.providerInstanceId,
-			occurredAt: now$36,
+			occurredAt: now$33,
 			payload: {
 				...parentRun,
 				delegatedCompletion: updatedCohort
@@ -262170,7 +262292,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					events,
 					projection,
 					run: deliveryRun,
-					now: now$36
+					now: now$33
 				});
 				return;
 			}
@@ -262181,7 +262303,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: deliveryRun.id,
 				...deliveryRun.rootNodeId === null ? {} : { nodeId: deliveryRun.rootNodeId },
 				providerInstanceId: deliveryRun.providerInstanceId,
-				occurredAt: now$36,
+				occurredAt: now$33,
 				payload: {
 					...message,
 					text: delegatedCompletionWakeDetail(remainingTaskIds),
@@ -262190,7 +262312,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						generation: delivery.generation,
 						taskIds: remainingTaskIds
 					},
-					updatedAt: now$36
+					updatedAt: now$33
 				}
 			});
 		}
@@ -262557,7 +262679,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				targetModelSelection: command.modelSelection
 			}).pipe(mapDispatchError(command));
 		}) : null;
-		const now$50 = yield* now;
+		const now$51 = yield* now;
 		if (command.type === "thread.metadata.update" && command.limitRecovery != null) {
 			const projection = yield* loadProjectionForCommand(command, [
 				"runs",
@@ -262567,7 +262689,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			const run = usageLimitBlockedRun(projection.runs, projection.turnItems, null);
 			const failure = latestRootProviderFailure(run, projection.turnItems);
 			const resetMs = Date.parse(command.limitRecovery.resetAt);
-			if (command.limitRecovery.snooze === true && resetMs <= toEpochMillis(now$50)) return yield* new OrchestratorDispatchError({
+			if (command.limitRecovery.snooze === true && resetMs <= toEpochMillis(now$51)) return yield* new OrchestratorDispatchError({
 				commandId: command.commandId,
 				commandType: command.type,
 				cause: "The reset time has passed. Retry the thread manually."
@@ -262582,7 +262704,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 		if (command.type === "thread.snooze") {
 			const projection = yield* loadProjectionForCommand(command, ["runs", "runtimeRequests"], { turnItemTypes: [] });
 			const parsedSnoozedUntil = make$240(command.snoozedUntil);
-			if (isNone(parsedSnoozedUntil) || toEpochMillis(parsedSnoozedUntil.value) <= toEpochMillis(now$50)) return yield* new OrchestratorDispatchError({
+			if (isNone(parsedSnoozedUntil) || toEpochMillis(parsedSnoozedUntil.value) <= toEpochMillis(now$51)) return yield* new OrchestratorDispatchError({
 				commandId: command.commandId,
 				commandType: command.type,
 				cause: `Thread ${command.threadId} snooze wake time ${command.snoozedUntil} is not in the future.`
@@ -262616,15 +262738,15 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			switch (command.type) {
 				case "thread.archive": return {
 					...thread,
-					archivedAt: now$50,
+					archivedAt: now$51,
 					titleRegeneration: null,
 					pullRequests: thread.pullRequests?.map((link) => withPullRequestWatch(link, void 0)),
-					updatedAt: now$50
+					updatedAt: now$51
 				};
 				case "thread.unarchive": return {
 					...thread,
 					archivedAt: null,
-					updatedAt: now$50
+					updatedAt: now$51
 				};
 				case "thread.settle": {
 					const wasPinned = thread.pinnedAt != null;
@@ -262632,13 +262754,13 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					return {
 						...thread,
 						settledOverride: "settled",
-						settledAt: alreadySettled ? thread.settledAt : command.settledAt ?? now$50,
+						settledAt: alreadySettled ? thread.settledAt : command.settledAt ?? now$51,
 						pullRequests: thread.pullRequests?.map((link) => withPullRequestWatch(link, void 0)),
 						unsettledAt: null,
 						pinnedAt: null,
 						pinOrderKey: null,
 						activeOrderKey: null,
-						updatedAt: alreadySettled ? thread.updatedAt : now$50
+						updatedAt: alreadySettled ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.unsettle": {
@@ -262647,8 +262769,8 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						...thread,
 						settledOverride: "active",
 						settledAt: null,
-						unsettledAt: alreadyPinnedActive ? thread.unsettledAt ?? null : now$50,
-						updatedAt: alreadyPinnedActive ? thread.updatedAt : now$50
+						unsettledAt: alreadyPinnedActive ? thread.unsettledAt ?? null : now$51,
+						updatedAt: alreadyPinnedActive ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.snooze": {
@@ -262660,8 +262782,8 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 							...thread.limitRecovery,
 							snooze: false
 						} : null,
-						snoozedAt: existingSnoozedAt ?? now$50,
-						updatedAt: existingSnoozedAt === null ? now$50 : thread.updatedAt
+						snoozedAt: existingSnoozedAt ?? now$51,
+						updatedAt: existingSnoozedAt === null ? now$51 : thread.updatedAt
 					};
 				}
 				case "thread.unsnooze": {
@@ -262670,16 +262792,16 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						...thread,
 						snoozedUntil: null,
 						snoozedAt: null,
-						lastSnoozeWakeAt: alreadyAwake ? thread.lastSnoozeWakeAt : now$50,
-						updatedAt: alreadyAwake ? thread.updatedAt : now$50
+						lastSnoozeWakeAt: alreadyAwake ? thread.lastSnoozeWakeAt : now$51,
+						updatedAt: alreadyAwake ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.auto-settle.set": {
 					const unchanged = command.enabled === (thread.autoSettleDisabledAt == null);
 					return {
 						...thread,
-						autoSettleDisabledAt: command.enabled ? null : thread.autoSettleDisabledAt ?? now$50,
-						updatedAt: unchanged ? thread.updatedAt : now$50
+						autoSettleDisabledAt: command.enabled ? null : thread.autoSettleDisabledAt ?? now$51,
+						updatedAt: unchanged ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.pin": {
@@ -262687,14 +262809,14 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					const promotes = thread.settledOverride === "settled" || thread.snoozedUntil != null;
 					return {
 						...thread,
-						pinnedAt: alreadyPinned ? thread.pinnedAt : now$50,
+						pinnedAt: alreadyPinned ? thread.pinnedAt : now$51,
 						...alreadyPinned || command.orderKey === void 0 ? {} : { pinOrderKey: command.orderKey },
 						settledOverride: thread.settledOverride === "settled" ? "active" : thread.settledOverride,
 						settledAt: thread.settledOverride === "settled" ? null : thread.settledAt,
 						snoozedUntil: null,
 						snoozedAt: null,
-						lastSnoozeWakeAt: thread.snoozedUntil == null ? thread.lastSnoozeWakeAt : now$50,
-						updatedAt: alreadyPinned && !promotes ? thread.updatedAt : now$50
+						lastSnoozeWakeAt: thread.snoozedUntil == null ? thread.lastSnoozeWakeAt : now$51,
+						updatedAt: alreadyPinned && !promotes ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.unpin": {
@@ -262703,7 +262825,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						...thread,
 						pinnedAt: null,
 						pinOrderKey: null,
-						updatedAt: alreadyUnpinned ? thread.updatedAt : now$50
+						updatedAt: alreadyUnpinned ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.pin.reorder": {
@@ -262711,7 +262833,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					return {
 						...thread,
 						pinOrderKey: command.orderKey,
-						updatedAt: keyUnchanged ? thread.updatedAt : now$50
+						updatedAt: keyUnchanged ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.active.reorder": return {
@@ -262736,23 +262858,23 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						...command.title === void 0 ? {} : { title: command.title },
 						...command.sideChat === void 0 ? {} : { sideChat: command.sideChat },
 						...command.limitRecovery === void 0 ? {} : { limitRecovery },
-						...command.limitRecovery !== void 0 && limitRecovery?.snooze === true && Date.parse(limitRecovery.resetAt) > toEpochMillis(now$50) ? {
+						...command.limitRecovery !== void 0 && limitRecovery?.snooze === true && Date.parse(limitRecovery.resetAt) > toEpochMillis(now$51) ? {
 							snoozedUntil: makeUnsafe$11(limitRecovery.resetAt),
-							snoozedAt: now$50
+							snoozedAt: now$51
 						} : command.limitRecovery !== void 0 && thread.limitRecovery?.snooze && thread.snoozedUntil != null && toEpochMillis(thread.snoozedUntil) === Date.parse(thread.limitRecovery.resetAt) ? {
 							snoozedUntil: null,
 							snoozedAt: null,
-							lastSnoozeWakeAt: now$50
+							lastSnoozeWakeAt: now$51
 						} : {},
 						...command.branch === void 0 ? {} : { branch: command.branch },
 						...command.worktreePath === void 0 ? {} : { worktreePath: command.worktreePath },
 						...command.linkedPullRequest === void 0 ? {} : {
 							linkedPullRequest: command.linkedPullRequest,
-							pullRequests: [...threadPullRequestsOf(thread).filter((link) => !(thread.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(thread.linkedPullRequest))) && !(command.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(command.linkedPullRequest)))), ...command.linkedPullRequest ? [legacyPullRequestLink(thread, command.linkedPullRequest, now$50)] : []]
+							pullRequests: [...threadPullRequestsOf(thread).filter((link) => !(thread.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(thread.linkedPullRequest))) && !(command.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(command.linkedPullRequest)))), ...command.linkedPullRequest ? [legacyPullRequestLink(thread, command.linkedPullRequest, now$51)] : []]
 						},
 						...command.regenerateTitle === true ? { titleRegeneration: {
 							requestId: command.commandId,
-							startedAt: now$50
+							startedAt: now$51
 						} } : command.regenerateTitle === false || command.title !== void 0 ? { titleRegeneration: null } : {},
 						...movingProject ? {
 							projectId: command.projectId,
@@ -262764,7 +262886,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 							pullRequests: [],
 							limitRecovery: null
 						} : {},
-						updatedAt: now$50
+						updatedAt: now$51
 					};
 				}
 				case "thread.design.link":
@@ -262776,7 +262898,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						return {
 							...thread,
 							designs: links.filter((link) => link !== existing),
-							updatedAt: now$50
+							updatedAt: now$51
 						};
 					}
 					if (existing && (existing.source === "manual" || command.source === "agent")) return thread;
@@ -262788,9 +262910,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						} : link) : [...links, {
 							path: command.path,
 							source: command.source,
-							linkedAt: formatIso(now$50)
+							linkedAt: formatIso(now$51)
 						}],
-						updatedAt: now$50
+						updatedAt: now$51
 					};
 				}
 				case "thread.pull-request.link":
@@ -262811,7 +262933,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 							...key,
 							url: command.url,
 							source: command.source,
-							linkedAt: formatIso(now$50),
+							linkedAt: formatIso(now$51),
 							snapshot: null,
 							stack: null
 						};
@@ -262822,7 +262944,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 								...branchKey,
 								url: branch.url,
 								source: "manual",
-								linkedAt: formatIso(now$50),
+								linkedAt: formatIso(now$51),
 								snapshot: null,
 								stack: null
 							}] : [],
@@ -262847,13 +262969,13 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						...thread,
 						pullRequests,
 						linkedPullRequest: thread.linkedPullRequest && pullRequests.some((link) => link.source !== "stack-dismissed" && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(thread.linkedPullRequest))) ? thread.linkedPullRequest : null,
-						updatedAt: command.type === "thread.pull-request-link.sync" ? thread.updatedAt : now$50
+						updatedAt: command.type === "thread.pull-request-link.sync" ? thread.updatedAt : now$51
 					};
 				}
 				case "thread.pull-request.watch":
 				case "thread.pull-request-watch.sync": {
 					const key = normalizeThreadPullRequestKey(command);
-					const startedAt = formatIso(now$50);
+					const startedAt = formatIso(now$51);
 					const linked = threadPullRequestsOf(thread);
 					const visible = (link) => link.source !== "stack-dismissed" && threadPullRequestKeysEqual(link, key);
 					const links = command.type === "thread.pull-request.watch" && command.watching && command.link !== void 0 && !linked.some(visible) ? [...linked.filter((link) => !threadPullRequestKeysEqual(link, key)), {
@@ -262881,7 +263003,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					return {
 						...thread,
 						pullRequests: links.map((link) => link === existing ? withPullRequestWatch(link, watch) : link),
-						updatedAt: command.type === "thread.pull-request.watch" ? now$50 : thread.updatedAt
+						updatedAt: command.type === "thread.pull-request.watch" ? now$51 : thread.updatedAt
 					};
 				}
 				case "thread.pull-request.sync": return {
@@ -262889,7 +263011,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					branchPullRequest: command.branchPullRequest,
 					...command.linkedPullRequest === void 0 ? {} : {
 						linkedPullRequest: command.linkedPullRequest,
-						pullRequests: [...threadPullRequestsOf(thread).filter((link) => !(thread.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(thread.linkedPullRequest))) && !(command.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(command.linkedPullRequest)))), ...command.linkedPullRequest ? [legacyPullRequestLink(thread, command.linkedPullRequest, now$50)] : []]
+						pullRequests: [...threadPullRequestsOf(thread).filter((link) => !(thread.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(thread.linkedPullRequest))) && !(command.linkedPullRequest && threadPullRequestKeysEqual(link, legacyThreadPullRequestKey(command.linkedPullRequest)))), ...command.linkedPullRequest ? [legacyPullRequestLink(thread, command.linkedPullRequest, now$51)] : []]
 					},
 					updatedAt: thread.updatedAt
 				};
@@ -262897,24 +263019,24 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					...thread,
 					...command.title === void 0 ? {} : { title: command.title },
 					titleRegeneration: null,
-					updatedAt: now$50
+					updatedAt: now$51
 				} : thread;
 				case "thread.runtime-mode.set": return {
 					...thread,
 					runtimeMode: command.runtimeMode,
-					updatedAt: now$50
+					updatedAt: now$51
 				};
 				case "thread.interaction-mode.set": return {
 					...thread,
 					interactionMode: command.interactionMode,
-					updatedAt: now$50
+					updatedAt: now$51
 				};
 				case "thread.model-selection.set":
 				case "provider.switch": return {
 					...thread,
 					providerInstanceId: command.modelSelection.instanceId,
 					modelSelection: command.modelSelection,
-					updatedAt: now$50
+					updatedAt: now$51
 				};
 			}
 		})();
@@ -262926,7 +263048,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				type: "thread.pull-request-link-updated",
 				threadId: command.threadId,
 				providerInstanceId: updatedThread.providerInstanceId,
-				occurredAt: now$50,
+				occurredAt: now$51,
 				payload: link
 			});
 			return;
@@ -262964,7 +263086,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			type: eventType,
 			threadId: command.threadId,
 			providerInstanceId: updatedThread.providerInstanceId,
-			occurredAt: now$50,
+			occurredAt: now$51,
 			payload: updatedThread
 		});
 		if (command.type === "thread.metadata.update" && command.regenerateTitle === true) yield* update$4(effects, (existing) => [...existing, pendingThreadTitleGenerationEffect(command.commandId, command.threadId, { type: "regenerate" })]);
@@ -262991,12 +263113,12 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				threadId: command.threadId,
 				runId: run.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$50,
+				occurredAt: now$51,
 				payload: {
 					...run,
 					status: "cancelled",
 					queuePosition: null,
-					completedAt: now$50
+					completedAt: now$51
 				}
 			});
 			for (const run of preparingRuns) {
@@ -263008,13 +263130,13 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					runId: run.id,
 					nodeId: preparationItem.nodeId ?? void 0,
 					providerInstanceId: run.providerInstanceId,
-					occurredAt: now$50,
+					occurredAt: now$51,
 					payload: {
 						...preparationItem,
 						status: "cancelled",
 						title: "Workspace preparation cancelled",
-						completedAt: now$50,
-						updatedAt: now$50
+						completedAt: now$51,
+						updatedAt: now$51
 					}
 				});
 			}
@@ -263026,11 +263148,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					runId: attempt.runId,
 					nodeId: attempt.rootNodeId,
 					providerInstanceId: run.providerInstanceId,
-					occurredAt: now$50,
+					occurredAt: now$51,
 					payload: {
 						...attempt,
 						status: "cancelled",
-						completedAt: now$50
+						completedAt: now$51
 					}
 				});
 			}
@@ -263046,11 +263168,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					runId: run.id,
 					nodeId: node.id,
 					providerInstanceId: run.providerInstanceId,
-					occurredAt: now$50,
+					occurredAt: now$51,
 					payload: {
 						...node,
 						status: "cancelled",
-						completedAt: now$50
+						completedAt: now$51
 					}
 				});
 			}
@@ -263058,7 +263180,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				command,
 				events,
 				projection: yield* getProjectionWithPendingEvents(command.threadId, events),
-				now: now$50,
+				now: now$51,
 				cancelQueuedDelivery: false
 			});
 		}
@@ -263071,10 +263193,10 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					threadId: command.threadId,
 					driver: session.driver,
 					providerInstanceId: session.providerInstanceId,
-					occurredAt: now$50,
+					occurredAt: now$51,
 					payload: {
 						providerSessionId: session.id,
-						detachedAt: now$50,
+						detachedAt: now$51,
 						reason: command.type === "thread.archive" ? "Thread archived." : command.type === "thread.settle" ? "Thread settled." : command.type === "thread.metadata.update" ? "Workspace changed." : command.type === "thread.runtime-mode.set" ? "Runtime mode changed." : "Provider or model selection changed."
 					}
 				});
@@ -263186,7 +263308,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			cause: forkableSourceRunStatusError(sourceRun)
 		});
 		const sourceProviderThread = providerThreadForRun(sourceProjection, sourceRun);
-		const now$48 = command.createdAt ?? (yield* now);
+		const now$47 = command.createdAt ?? (yield* now);
 		const emitEvent = emit(events, command);
 		const transferId = yield* mapDispatchError(command)(idAllocator.allocate.contextTransfer({
 			sourceThreadId: sourceProjection.thread.id,
@@ -263205,20 +263327,20 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			...command.runtimeMode === void 0 ? {} : { runtimeMode: command.runtimeMode },
 			createdBy: command.createdBy,
 			creationSource: command.creationSource,
-			createdAt: now$48
+			createdAt: now$47
 		}).pipe(mapDispatchError(command));
 		yield* emitEvent({
 			type: "thread.created",
 			threadId: command.targetThreadId,
 			providerInstanceId: targetThread.providerInstanceId,
-			occurredAt: now$48,
+			occurredAt: now$47,
 			payload: targetThread
 		});
 		yield* emitEvent({
 			type: "context-transfer.created",
 			threadId: command.targetThreadId,
 			providerInstanceId: sourceRun.providerInstanceId,
-			occurredAt: now$48,
+			occurredAt: now$47,
 			payload: transfer
 		});
 	});
@@ -263914,21 +264036,21 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 		const userMessages = projection.messages.filter((message) => message.role === "user");
 		const onlyMaintenanceHistory = userMessages.length > 0 && userMessages.every(isNativeMaintenanceCommand);
 		if (!isNativeMaintenanceCommand(command) && (command.titleSeed !== void 0 && (yield* projectionStore.getMessageCount(command.threadId).pipe(mapDispatchError(command))) === 0 || command.createdBy === "user" && onlyMaintenanceHistory)) {
-			const now$47 = yield* now;
+			const now$46 = yield* now;
 			const thread = {
 				...projection.thread,
 				title: command.titleSeed ?? projection.thread.title,
 				titleRegeneration: {
 					requestId: command.commandId,
-					startedAt: now$47
+					startedAt: now$46
 				},
-				updatedAt: now$47
+				updatedAt: now$46
 			};
 			yield* emit(events, command)({
 				type: "thread.metadata-updated",
 				threadId: command.threadId,
 				providerInstanceId: thread.providerInstanceId,
-				occurredAt: now$47,
+				occurredAt: now$46,
 				payload: thread
 			});
 			yield* update$4(effects, (existing) => [...existing, pendingThreadTitleGenerationEffect(command.commandId, command.threadId, {
@@ -264053,7 +264175,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				commandType: command.type,
 				cause: `Active run ${queueBehindRun.id} has no provider thread for queued dispatch.`
 			});
-			const now$21 = yield* now;
+			const now$20 = yield* now;
 			const ordinal = nextRunOrdinal(projection);
 			const runId = idAllocator.derive.run({
 				threadId: command.threadId,
@@ -264086,8 +264208,8 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				lastRunOrdinal: null,
 				handoffIds: [],
 				forkedFrom: null,
-				createdAt: now$21,
-				updatedAt: now$21
+				createdAt: now$20,
+				updatedAt: now$20
 			};
 			const attemptId = idAllocator.derive.runAttempt({
 				runId,
@@ -264103,7 +264225,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				rootNodeId,
 				providerThreadId: queuedProviderThread.id,
 				cwd: resolvedRuntimePolicy.cwd ?? selectedProviderSession?.cwd ?? projection.thread.worktreePath ?? process.cwd(),
-				createdAt: now$21
+				createdAt: now$20
 			})), mapError((cause) => new OrchestratorDispatchError({
 				commandId: command.commandId,
 				commandType: command.type,
@@ -264122,7 +264244,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				status: "queued",
 				...worktreeMissingRun !== void 0 || projection.runs.some((candidate) => candidate.status === "queued" && candidate.queueHeld === true) ? { queueHeld: true } : {},
 				queuePosition: Math.max(0, ...projection.runs.filter((candidate) => candidate.status === "queued").map((candidate) => candidate.queuePosition ?? candidate.ordinal)) + 1,
-				requestedAt: now$21,
+				requestedAt: now$20,
 				startedAt: null,
 				completedAt: null,
 				checkpointId: null,
@@ -264175,8 +264297,8 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				...command.context ? { context: command.context } : {},
 				attachments: command.attachments,
 				streaming: false,
-				createdAt: now$21,
-				updatedAt: now$21,
+				createdAt: now$20,
+				updatedAt: now$20,
 				...delegatedCompletion === void 0 ? {} : { delegatedCompletion },
 				...command.notification === void 0 ? {} : { notification: command.notification }
 			};
@@ -264185,7 +264307,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				type: "provider-thread.updated",
 				threadId: command.threadId,
 				providerInstanceId: modelSelection.instanceId,
-				occurredAt: now$21,
+				occurredAt: now$20,
 				payload: queuedProviderThread
 			});
 			yield* emitEvent({
@@ -264194,17 +264316,17 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId,
 				nodeId: rootNodeId,
 				providerInstanceId: modelSelection.instanceId,
-				occurredAt: now$21,
+				occurredAt: now$20,
 				payload: run
 			});
-			yield* completeSourcePlan(now$21);
+			yield* completeSourcePlan(now$20);
 			yield* emitEvent({
 				type: "run-attempt.created",
 				threadId: command.threadId,
 				runId,
 				nodeId: rootNodeId,
 				providerInstanceId: modelSelection.instanceId,
-				occurredAt: now$21,
+				occurredAt: now$20,
 				payload: attempt
 			});
 			yield* emitEvent({
@@ -264213,7 +264335,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId,
 				nodeId: rootNodeId,
 				providerInstanceId: modelSelection.instanceId,
-				occurredAt: now$21,
+				occurredAt: now$20,
 				payload: rootNode
 			});
 			if (checkpointScope !== null) yield* emitEvent({
@@ -264222,7 +264344,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId,
 				nodeId: rootNodeId,
 				providerInstanceId: modelSelection.instanceId,
-				occurredAt: now$21,
+				occurredAt: now$20,
 				payload: yield* checkpointService.ensureScope(checkpointScope).pipe(mapError((cause) => new OrchestratorDispatchError({
 					commandId: command.commandId,
 					commandType: command.type,
@@ -264235,7 +264357,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId,
 				nodeId: rootNodeId,
 				providerInstanceId: modelSelection.instanceId,
-				occurredAt: now$21,
+				occurredAt: now$20,
 				payload: message
 			});
 			const existingItem = projection.turnItems.find((item) => item.type === "user_message" && item.messageId === command.messageId);
@@ -264245,7 +264367,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId,
 				nodeId: rootNodeId,
 				providerInstanceId: modelSelection.instanceId,
-				occurredAt: now$21,
+				occurredAt: now$20,
 				payload: {
 					...existingItem,
 					runId,
@@ -264253,7 +264375,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					providerThreadId: queuedProviderThread.id,
 					providerTurnId: null,
 					inputIntent: "queued_turn",
-					updatedAt: now$21
+					updatedAt: now$20
 				}
 			});
 			return;
@@ -265275,7 +265397,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			providerInstanceId: command.modelSelection.instanceId,
 			cause
 		})));
-		const now$46 = command.createdAt ?? (yield* now);
+		const now$45 = command.createdAt ?? (yield* now);
 		const taskNodeId = idAllocator.derive.delegatedTaskNode({ commandId: command.commandId });
 		const childThreadId = idAllocator.derive.delegatedTaskThread({ commandId: command.commandId });
 		const childMessageId = idAllocator.derive.delegatedTaskMessage({ commandId: command.commandId });
@@ -265295,7 +265417,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				providerInstanceId: command.modelSelection.instanceId,
 				modelSelection: command.modelSelection,
 				title: taskTitle,
-				now: now$46,
+				now: now$45,
 				createdBy: command.createdBy,
 				creationSource: command.creationSource
 			}),
@@ -265324,9 +265446,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			...command.completionWake === void 0 ? {} : { completionWake: command.completionWake },
 			status: "running",
 			result: null,
-			startedAt: now$46,
+			startedAt: now$45,
 			completedAt: null,
-			updatedAt: now$46
+			updatedAt: now$45
 		};
 		const taskNode = {
 			id: taskNodeId,
@@ -265342,7 +265464,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			nativeItemRef: null,
 			runtimeRequestId: null,
 			checkpointScopeId: null,
-			startedAt: now$46,
+			startedAt: now$45,
 			completedAt: null
 		};
 		const parentProviderTurn = providerTurnForRun(parentProjection, parentRun);
@@ -265358,9 +265480,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			ordinal: yield* nextTurnItemOrdinal(parentProjection),
 			status: "running",
 			title: command.title ?? taskTitle,
-			startedAt: now$46,
+			startedAt: now$45,
 			completedAt: null,
-			updatedAt: now$46,
+			updatedAt: now$45,
 			type: "subagent",
 			subagentId: taskNodeId,
 			origin: "app_owned",
@@ -265376,7 +265498,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			threadId: childThreadId,
 			driver: targetAdapter.driver,
 			providerInstanceId: command.modelSelection.instanceId,
-			occurredAt: now$46,
+			occurredAt: now$45,
 			payload: childThread
 		});
 		yield* emitEvent({
@@ -265386,7 +265508,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			nodeId: taskNodeId,
 			driver: targetAdapter.driver,
 			providerInstanceId: command.modelSelection.instanceId,
-			occurredAt: now$46,
+			occurredAt: now$45,
 			payload: taskNode
 		});
 		yield* emitEvent({
@@ -265396,7 +265518,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			nodeId: taskNodeId,
 			driver: targetAdapter.driver,
 			providerInstanceId: command.modelSelection.instanceId,
-			occurredAt: now$46,
+			occurredAt: now$45,
 			payload: task
 		});
 		yield* emitEvent({
@@ -265406,7 +265528,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			nodeId: taskNodeId,
 			driver: targetAdapter.driver,
 			providerInstanceId: command.modelSelection.instanceId,
-			occurredAt: now$46,
+			occurredAt: now$45,
 			payload: taskTurnItem
 		});
 		const childMessageCommand = {
@@ -265453,16 +265575,16 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			resolution: null,
 			createdBy: command.createdBy,
 			error: null,
-			createdAt: now$46,
-			updatedAt: now$46,
-			consumedAt: now$46
+			createdAt: now$45,
+			updatedAt: now$45,
+			consumedAt: now$45
 		};
 		yield* emitEvent({
 			type: "context-transfer.created",
 			threadId: childThreadId,
 			runId: childRun.id,
 			providerInstanceId: command.modelSelection.instanceId,
-			occurredAt: now$46,
+			occurredAt: now$45,
 			payload: spawnTransfer
 		});
 	});
@@ -265701,7 +265823,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			commandType: command.type,
 			cause: `Target run ${command.targetRunId} does not belong to thread ${command.targetThreadId}.`
 		});
-		const now$42 = yield* now;
+		const now$41 = yield* now;
 		const parentProviderTurn = providerTurnForRun(parentProjection, parentRun);
 		const turnItem = {
 			id: idAllocator.derive.createdThreadTurnItem({ commandId: command.commandId }),
@@ -265715,9 +265837,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			ordinal: yield* nextTurnItemOrdinal(parentProjection),
 			status: "completed",
 			title: targetProjection.thread.title,
-			startedAt: now$42,
-			completedAt: now$42,
-			updatedAt: now$42,
+			startedAt: now$41,
+			completedAt: now$41,
+			updatedAt: now$41,
 			type: "thread_created",
 			targetThreadId: command.targetThreadId,
 			targetRunId: command.targetRunId,
@@ -265730,7 +265852,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: command.parentRunId,
 			nodeId: command.parentNodeId,
 			providerInstanceId: parentRun.providerInstanceId,
-			occurredAt: now$42,
+			occurredAt: now$41,
 			payload: turnItem
 		});
 	});
@@ -265770,7 +265892,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			commandType: command.type,
 			cause: `Secret request ${command.turnItemId} belongs to another run.`
 		});
-		const now$23 = yield* now;
+		const now$22 = yield* now;
 		const unchanged = existing !== void 0 && (existing.secretStatus !== "pending" || command.secretStatus === "pending");
 		const pending = command.secretStatus === "pending";
 		const turnItem = unchanged ? existing : {
@@ -265785,9 +265907,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			ordinal: existing?.ordinal ?? (yield* nextTurnItemOrdinal(projection)),
 			status: pending ? "waiting" : command.secretStatus === "saved" ? "completed" : "cancelled",
 			title: command.label,
-			startedAt: existing?.startedAt ?? now$23,
-			completedAt: pending ? null : now$23,
-			updatedAt: now$23,
+			startedAt: existing?.startedAt ?? now$22,
+			completedAt: pending ? null : now$22,
+			updatedAt: now$22,
 			type: "secret_request",
 			label: command.label,
 			reason: command.reason,
@@ -265800,7 +265922,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: command.runId,
 			nodeId: command.nodeId,
 			providerInstanceId: run.providerInstanceId,
-			occurredAt: now$23,
+			occurredAt: now$22,
 			payload: turnItem
 		});
 	});
@@ -266016,7 +266138,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			commandType: command.type,
 			cause: "Automatic completion deliveries cannot be promoted to Steer."
 		});
-		const now$20 = yield* now;
+		const now$19 = yield* now;
 		const emitEvent = emit(events, command);
 		yield* emitEvent({
 			type: "run.updated",
@@ -266024,12 +266146,12 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: queuedRun.id,
 			nodeId: queuedRootNode.id,
 			providerInstanceId: queuedRun.providerInstanceId,
-			occurredAt: now$20,
+			occurredAt: now$19,
 			payload: {
 				...queuedRun,
 				status: "cancelled",
 				queuePosition: null,
-				completedAt: now$20
+				completedAt: now$19
 			}
 		});
 		yield* emitEvent({
@@ -266038,11 +266160,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: queuedRun.id,
 			nodeId: queuedRootNode.id,
 			providerInstanceId: queuedRun.providerInstanceId,
-			occurredAt: now$20,
+			occurredAt: now$19,
 			payload: {
 				...queuedAttempt,
 				status: "cancelled",
-				completedAt: now$20
+				completedAt: now$19
 			}
 		});
 		yield* emitEvent({
@@ -266051,11 +266173,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: queuedRun.id,
 			nodeId: queuedRootNode.id,
 			providerInstanceId: queuedRun.providerInstanceId,
-			occurredAt: now$20,
+			occurredAt: now$19,
 			payload: {
 				...queuedRootNode,
 				status: "cancelled",
-				completedAt: now$20
+				completedAt: now$19
 			}
 		});
 		yield* dispatchSteerIntoRun({
@@ -266110,7 +266232,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			moving,
 			...withoutMoving.slice(beforeIndex)
 		];
-		const now$41 = yield* now;
+		const now$39 = yield* now;
 		const emitEvent = emit(events, command);
 		yield* forEach(reordered, (run, index) => gen$1(function* () {
 			const queuePosition = index + 1;
@@ -266121,7 +266243,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				...run.rootNodeId === null ? {} : { nodeId: run.rootNodeId },
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$41,
+				occurredAt: now$39,
 				payload: {
 					...run,
 					queuePosition
@@ -266149,14 +266271,14 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 		});
 		const queuedMessage = projection.messages.find((candidate) => candidate.id === queuedRun.userMessageId);
 		if (queuedMessage?.delegatedCompletion !== void 0) {
-			const now$51 = yield* now;
+			const now$52 = yield* now;
 			yield* disposeDelegatedCompletionCohort({
 				command,
 				events,
 				projection,
 				parentRunId: queuedMessage.delegatedCompletion.parentRunId,
 				disposition: "disposed",
-				now: now$51
+				now: now$52
 			});
 			return;
 		}
@@ -266237,7 +266359,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			cause: "Automatic completion deliveries cannot be edited."
 		});
 		const queuedTurnItem = projection.turnItems.find((candidate) => candidate.type === "user_message" && candidate.messageId === queuedMessage.id);
-		const now$38 = yield* now;
+		const now$36 = yield* now;
 		const emitEvent = emit(events, command);
 		const editedAttachments = command.attachments === void 0 ? {} : { attachments: command.attachments };
 		yield* emitEvent({
@@ -266246,13 +266368,13 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: queuedRun.id,
 			...queuedRun.rootNodeId === null ? {} : { nodeId: queuedRun.rootNodeId },
 			providerInstanceId: queuedRun.providerInstanceId,
-			occurredAt: now$38,
+			occurredAt: now$36,
 			payload: {
 				...queuedMessage,
 				text: command.text,
 				...editedAttachments,
 				...command.context ? { context: command.context } : {},
-				updatedAt: now$38
+				updatedAt: now$36
 			}
 		});
 		if (queuedTurnItem !== void 0 && queuedTurnItem.type === "user_message") yield* emitEvent({
@@ -266261,13 +266383,13 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: queuedRun.id,
 			...queuedRun.rootNodeId === null ? {} : { nodeId: queuedRun.rootNodeId },
 			providerInstanceId: queuedRun.providerInstanceId,
-			occurredAt: now$38,
+			occurredAt: now$36,
 			payload: {
 				...queuedTurnItem,
 				text: command.text,
 				...editedAttachments,
 				...command.context ? { context: command.context } : {},
-				updatedAt: now$38
+				updatedAt: now$36
 			}
 		});
 	});
@@ -266336,7 +266458,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			commandType: command.type,
 			cause: `Run ${command.runId} is not awaiting workspace preparation.`
 		});
-		const now$40 = yield* now;
+		const now$38 = yield* now;
 		const resolvedRuntimePolicy = yield* runtimePolicy.resolve({
 			thread: projection.thread,
 			modelSelection: state.run.modelSelection
@@ -266347,7 +266469,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			rootNodeId: state.rootNode.id,
 			providerThreadId: state.providerThread.id,
 			cwd: resolvedRuntimePolicy.cwd ?? projection.thread.worktreePath ?? process.cwd(),
-			createdAt: now$40
+			createdAt: now$38
 		}).pipe(mapDispatchError(command));
 		const emitEvent = emit(events, command);
 		yield* emitEvent({
@@ -266356,7 +266478,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: state.run.id,
 			nodeId: state.rootNode.id,
 			providerInstanceId: state.run.providerInstanceId,
-			occurredAt: now$40,
+			occurredAt: now$38,
 			payload: checkpointScope
 		});
 		yield* emitEvent({
@@ -266365,7 +266487,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: state.run.id,
 			nodeId: state.rootNode.id,
 			providerInstanceId: state.run.providerInstanceId,
-			occurredAt: now$40,
+			occurredAt: now$38,
 			payload: {
 				...state.rootNode,
 				checkpointScopeId: checkpointScope.id
@@ -266377,15 +266499,15 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: state.run.id,
 			nodeId: state.rootNode.id,
 			providerInstanceId: state.run.providerInstanceId,
-			occurredAt: now$40,
+			occurredAt: now$38,
 			payload: {
 				...state.preparationItem,
 				status: "completed",
 				title: "Workspace ready",
 				output: "Workspace preparation completed.",
 				exitCode: 0,
-				completedAt: now$40,
-				updatedAt: now$40
+				completedAt: now$38,
+				updatedAt: now$38
 			}
 		});
 		yield* emitEvent({
@@ -266394,7 +266516,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: state.run.id,
 			nodeId: state.rootNode.id,
 			providerInstanceId: state.run.providerInstanceId,
-			occurredAt: now$40,
+			occurredAt: now$38,
 			payload: {
 				...state.run,
 				status: "starting"
@@ -267016,7 +267138,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				"running",
 				"waiting"
 			].includes(subagent.status) || subagent.startedAt !== null && toEpochMillis(subagent.startedAt) > toEpochMillis(command.subagent.stoppedAt)) return;
-			const now$34 = yield* now;
+			const now$31 = yield* now;
 			const allocateEventId = () => idAllocator.allocate.event({
 				threadId: command.threadId,
 				commandId: command.commandId
@@ -267027,7 +267149,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				result: outcome.result,
 				status: outcome.status,
 				completedAt: outcome.completedAt,
-				now: now$34,
+				now: now$31,
 				emitted: yield* get$6(events),
 				allocateEventId
 			}).pipe(mapDispatchError(command));
@@ -267048,7 +267170,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						projection: child,
 						status: outcome.status,
 						completedAt: outcome.completedAt,
-						now: now$34,
+						now: now$31,
 						emitted: yield* get$6(events),
 						allocateEventId
 					}).pipe(mapDispatchError(command));
@@ -267064,7 +267186,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			"starting",
 			"running"
 		].includes(stoppedRun.status) && stoppedRun.activeAttemptId !== stopped.providerTurn?.runAttemptId) return;
-		const now$35 = yield* now;
+		const now$32 = yield* now;
 		if (stopped.providerTurn !== void 0 && stoppedRun.status === "running") {
 			const output = yield* projectionStore.getThreadRecords(command.threadId, ["messages"], {
 				messageRunIds: [stoppedRun.id],
@@ -267079,7 +267201,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				providerTurn: stopped.providerTurn,
 				events,
 				effects,
-				now: now$35
+				now: now$32
 			});
 		}
 		if (projection.runs.some((run) => run.id !== stoppedRun.id && (run.status === "preparing" || run.status === "starting" || run.status === "running"))) return;
@@ -267089,7 +267211,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			projection,
 			stoppedProviderThreadId: command.providerThreadId,
 			throughRunOrdinal: stoppedRun.ordinal,
-			now: now$35
+			now: now$32
 		});
 	});
 	const dispatchSubagentStop = (command, events, effects) => gen$1(function* () {
@@ -267120,17 +267242,17 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 		});
 		const providerSessionId = providerThread.providerSessionId;
 		const nativeTaskId = subagent.nativeTaskRef.nativeId;
-		const now$39 = yield* now;
+		const now$37 = yield* now;
 		yield* emit(events, command)({
 			type: "subagent.updated",
 			threadId: command.threadId,
 			runId: command.runId,
 			nodeId: subagent.id,
 			providerInstanceId: subagent.providerInstanceId,
-			occurredAt: now$39,
+			occurredAt: now$37,
 			payload: {
 				...subagent,
-				updatedAt: now$39
+				updatedAt: now$37
 			}
 		});
 		yield* update$4(effects, (existing) => [...existing, {
@@ -267190,22 +267312,22 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			commandType: command.type,
 			cause: `Run ${command.runId} is not interruptible.`
 		});
-		const now$37 = yield* now;
+		const now$35 = yield* now;
 		const completionCohortRunId = projection.messages.find((candidate) => candidate.id === run.userMessageId)?.delegatedCompletion?.parentRunId ?? run.id;
 		const stopRemainingWork = () => command.holdQueue === true ? holdStoppedThread({
 			command,
 			events,
 			projection,
 			cohortRunIds: [completionCohortRunId],
-			now: now$37
+			now: now$35
 		}) : gen$1(function* () {
-			yield* disposeDelegatedCompletionCohort({
+			for (const parentRunId of /* @__PURE__ */ new Set([completionCohortRunId, run.id])) yield* disposeDelegatedCompletionCohort({
 				command,
 				events,
 				projection: yield* getProjectionWithPendingEvents(command.threadId, events),
-				parentRunId: completionCohortRunId,
+				parentRunId,
 				disposition: "stopped",
-				now: now$37
+				now: now$35
 			});
 		});
 		const emitEvent = emit(events, command);
@@ -267224,9 +267346,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			ordinal: yield* nextTurnItemOrdinal(projection),
 			status: "completed",
 			title: "Interrupt requested",
-			startedAt: now$37,
-			completedAt: now$37,
-			updatedAt: now$37,
+			startedAt: now$35,
+			completedAt: now$35,
+			updatedAt: now$35,
 			type: "run_interrupt_request",
 			message: command.reason ?? "Interrupt requested"
 		};
@@ -267288,9 +267410,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				ordinal: interruptRequestItem.ordinal + 1,
 				status: "interrupted",
 				title: "Interrupted",
-				startedAt: now$37,
-				completedAt: now$37,
-				updatedAt: now$37,
+				startedAt: now$35,
+				completedAt: now$35,
+				updatedAt: now$35,
 				type: "run_interrupt_result",
 				message: "Run interrupted before provider start"
 			};
@@ -267300,7 +267422,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				nodeId: rootNode.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$37,
+				occurredAt: now$35,
 				payload: interruptRequestItem
 			});
 			yield* emitEvent({
@@ -267309,7 +267431,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				nodeId: rootNode.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$37,
+				occurredAt: now$35,
 				payload: interruptResultItem
 			});
 			const preparationItem = projection.turnItems.find((candidate) => candidate.runId === run.id && candidate.type === "command_execution" && candidate.input === WORKSPACE_PREPARATION_INPUT && candidate.status === "running");
@@ -267319,14 +267441,14 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				nodeId: rootNode.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$37,
+				occurredAt: now$35,
 				payload: {
 					...preparationItem,
 					status: "interrupted",
 					title: "Workspace preparation interrupted",
 					output: command.reason ?? "Interrupted before provider start",
-					completedAt: now$37,
-					updatedAt: now$37
+					completedAt: now$35,
+					updatedAt: now$35
 				}
 			});
 			yield* emitEvent({
@@ -267335,11 +267457,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				nodeId: rootNode.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$37,
+				occurredAt: now$35,
 				payload: {
 					...attempt,
 					status: "interrupted",
-					completedAt: now$37
+					completedAt: now$35
 				}
 			});
 			yield* emitEvent({
@@ -267348,11 +267470,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				nodeId: rootNode.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$37,
+				occurredAt: now$35,
 				payload: {
 					...rootNode,
 					status: "interrupted",
-					completedAt: now$37
+					completedAt: now$35
 				}
 			});
 			yield* emitEvent({
@@ -267361,11 +267483,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				nodeId: rootNode.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$37,
+				occurredAt: now$35,
 				payload: {
 					...run,
 					status: "interrupted",
-					completedAt: now$37
+					completedAt: now$35
 				}
 			});
 			yield* stopRemainingWork();
@@ -267392,7 +267514,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: run.id,
 				nodeId: rootNode.id,
 				providerInstanceId: run.providerInstanceId,
-				occurredAt: now$37,
+				occurredAt: now$35,
 				payload: interruptRequestItem
 			});
 			yield* stopRemainingWork();
@@ -267402,7 +267524,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				providerTurn,
 				events,
 				effects,
-				now: now$37
+				now: now$35
 			});
 			yield* settleBackgroundWork({
 				command,
@@ -267410,7 +267532,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				projection,
 				stoppedProviderThreadId: providerThread.id,
 				throughRunOrdinal: run.ordinal,
-				now: now$37
+				now: now$35
 			});
 			yield* update$4(effects, (existing) => [...existing, ...otherProviderInterrupts]);
 			return;
@@ -267433,7 +267555,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: run.id,
 			nodeId: rootNode.id,
 			providerInstanceId: run.providerInstanceId,
-			occurredAt: now$37,
+			occurredAt: now$35,
 			payload: interruptRequestItem
 		});
 		yield* stopRemainingWork();
@@ -267517,18 +267639,18 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				const idle = idleChildren.get(task.childThreadId) ?? (!child.runs.some((run) => run.status === "queued" || isBlockingRun(run)) && !child.providerThreads.some((thread) => thread.status === "active" || (thread.pendingBackgroundTasks?.length ?? 0) > 0) && !child.runtimeRequests.some((request) => request.status === "pending") && child.turnItems.length === 0 && isNone(yield* findFirst$1(child.runs, awaitsRestartContinuation)));
 				idleChildren.set(task.childThreadId, idle);
 				if (!idle) continue;
-				const now$32 = yield* now;
+				const now$24 = yield* now;
 				const emitEvent = emit(events, command);
 				yield* emitEvent({
 					type: "subagent.updated",
 					threadId: command.threadId,
 					nodeId: task.id,
-					occurredAt: now$32,
+					occurredAt: now$24,
 					payload: {
 						...task,
 						status: "cancelled",
-						completedAt: now$32,
-						updatedAt: now$32,
+						completedAt: now$24,
+						updatedAt: now$24,
 						completionDelivery: {
 							state: "disposed",
 							observedByRunId: null
@@ -267541,11 +267663,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					type: "node.updated",
 					threadId: command.threadId,
 					nodeId: node.id,
-					occurredAt: now$32,
+					occurredAt: now$24,
 					payload: {
 						...node,
 						status: "cancelled",
-						completedAt: now$32
+						completedAt: now$24
 					}
 				});
 				for (const item of projection.turnItems) {
@@ -267554,12 +267676,12 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 						type: "turn-item.updated",
 						threadId: command.threadId,
 						nodeId: task.id,
-						occurredAt: now$32,
+						occurredAt: now$24,
 						payload: {
 							...item,
 							status: "cancelled",
-							completedAt: now$32,
-							updatedAt: now$32
+							completedAt: now$24,
+							updatedAt: now$24
 						}
 					});
 				}
@@ -267601,7 +267723,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				cause: interrupted.cause
 			});
 		}
-		const now$33 = yield* now;
+		const now$25 = yield* now;
 		const executed = latestExecutedRun(projection.runs);
 		const reached = /* @__PURE__ */ new Map();
 		if (target !== void 0) reached.set(target.id, target);
@@ -267611,14 +267733,14 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			events,
 			thread: projection.thread,
 			run,
-			now: now$33
+			now: now$25
 		});
 		yield* holdStoppedThread({
 			command,
 			events,
 			projection,
 			cohortRunIds: [],
-			now: now$33
+			now: now$25
 		});
 		yield* cancelIdleOrphans;
 	});
@@ -267710,28 +267832,28 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				cause: `Cannot roll back provider thread ${providerThread.id} to checkpoint ${targetCheckpoint.id}: target provider turn ${targetProviderTurn.id} belongs to provider thread ${targetProviderTurn.providerThreadId}.`
 			});
 		}
-		const now$52 = yield* now;
+		const now$40 = yield* now;
 		yield* emit(events, command)({
 			type: "thread.metadata-updated",
 			threadId: command.threadId,
 			providerInstanceId: projection.thread.providerInstanceId,
-			occurredAt: now$52,
+			occurredAt: now$40,
 			payload: {
 				...projection.thread,
 				rollbackRequestId: command.commandId,
 				rollbackFailure: null,
-				updatedAt: now$52
+				updatedAt: now$40
 			}
 		});
 		yield* emit(events, command)({
 			type: "checkpoint.rollback-requested",
 			threadId: command.threadId,
 			providerInstanceId: modelSelection.instanceId,
-			occurredAt: now$52,
+			occurredAt: now$40,
 			payload: {
 				scopeId: targetScope.id,
 				checkpointId: targetCheckpoint.id,
-				requestedAt: now$52
+				requestedAt: now$40
 			}
 		});
 		yield* update$4(effects, (existing) => [...existing, {
@@ -267760,19 +267882,19 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			commandType: command.type,
 			cause: `Rollback ${command.requestId} is no longer the thread's current rollback.`
 		});
-		const now$24 = yield* now;
+		const now$48 = yield* now;
 		yield* emit(events, command)({
 			type: "thread.metadata-updated",
 			threadId: command.threadId,
 			providerInstanceId: thread.providerInstanceId,
-			occurredAt: now$24,
+			occurredAt: now$48,
 			payload: {
 				...thread,
 				rollbackFailure: {
 					requestId: command.requestId,
 					message: command.message
 				},
-				updatedAt: now$24
+				updatedAt: now$48
 			}
 		});
 	});
@@ -267990,7 +268112,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 		const task = parentProjection.subagents.find((candidate) => candidate.id === options.taskId && candidate.origin === "app_owned" && candidate.childThreadId === childThreadId);
 		if (task === void 0) return;
 		if (parentProjection.contextTransfers.find((transfer) => transfer.type === "subagent_result" && transfer.sourceThreadId === childThreadId && transfer.targetThreadId === parentThreadId && (transfer.sourcePoint.runId === childRun.id || options.taskId === forkedFrom.nodeId && transfer.sourcePoint.runId === void 0)) !== void 0) return;
-		const now$25 = yield* now;
+		const now$50 = yield* now;
 		const result = subagentResultForRun(childProjection, {
 			...childRun,
 			status: outcome
@@ -268003,15 +268125,15 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			providerThreadId: childRun.providerThreadId,
 			status: terminalStatus,
 			result: result.text,
-			completedAt: now$25,
-			updatedAt: now$25
+			completedAt: now$50,
+			updatedAt: now$50
 		};
 		const completionPlan = yield* planDelegatedCompletionDelivery({
 			parentProjection,
 			parentRun,
 			task,
 			updatedTask,
-			now: now$25
+			now: now$50
 		});
 		const resultTransferId = yield* idAllocator.allocate.contextTransfer({
 			sourceThreadId: childThreadId,
@@ -268040,8 +268162,8 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			summaryMessageId: result.messageId,
 			summaryText: result.text,
 			createdByProviderInstanceId: childRun.providerInstanceId,
-			createdAt: now$25,
-			updatedAt: now$25
+			createdAt: now$50,
+			updatedAt: now$50
 		};
 		const resultTransfer = {
 			id: resultTransferId,
@@ -268063,9 +268185,9 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			},
 			createdBy: "system",
 			error: null,
-			createdAt: now$25,
-			updatedAt: now$25,
-			consumedAt: now$25
+			createdAt: now$50,
+			updatedAt: now$50,
+			consumedAt: now$50
 		};
 		yield* writeSystemEvents([
 			{
@@ -268074,7 +268196,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				...task.runId === null ? {} : { runId: task.runId },
 				nodeId: task.id,
 				driver: task.driver,
-				occurredAt: now$25,
+				occurredAt: now$50,
 				payload: completionPlan.task
 			},
 			...completionPlan.parentRun === void 0 ? [] : [{
@@ -268083,7 +268205,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				runId: completionPlan.parentRun.id,
 				...completionPlan.parentRun.rootNodeId === null ? {} : { nodeId: completionPlan.parentRun.rootNodeId },
 				providerInstanceId: completionPlan.parentRun.providerInstanceId,
-				occurredAt: now$25,
+				occurredAt: now$50,
 				payload: completionPlan.parentRun
 			}],
 			...completionPlan.message === void 0 ? [] : [{
@@ -268092,7 +268214,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				...completionPlan.message.runId === null ? {} : { runId: completionPlan.message.runId },
 				...completionPlan.message.nodeId === null ? {} : { nodeId: completionPlan.message.nodeId },
 				providerInstanceId: completionPlan.parentRun?.providerInstanceId ?? parentProjection.thread.providerInstanceId,
-				occurredAt: now$25,
+				occurredAt: now$50,
 				payload: completionPlan.message
 			}],
 			...parentNode === void 0 ? [] : [{
@@ -268101,12 +268223,12 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				...parentNode.runId === null ? {} : { runId: parentNode.runId },
 				nodeId: parentNode.id,
 				driver: task.driver,
-				occurredAt: now$25,
+				occurredAt: now$50,
 				payload: {
 					...parentNode,
 					status: terminalStatus,
 					providerThreadId: childRun.providerThreadId,
-					completedAt: now$25
+					completedAt: now$50
 				}
 			}],
 			...parentTurnItem === void 0 ? [] : [{
@@ -268115,13 +268237,13 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				...parentTurnItem.runId === null ? {} : { runId: parentTurnItem.runId },
 				...parentTurnItem.nodeId === null ? {} : { nodeId: parentTurnItem.nodeId },
 				driver: task.driver,
-				occurredAt: now$25,
+				occurredAt: now$50,
 				payload: {
 					...parentTurnItem,
 					status: terminalStatus,
 					result: result.text,
-					completedAt: now$25,
-					updatedAt: now$25
+					completedAt: now$50,
+					updatedAt: now$50
 				}
 			}],
 			...resultHandoff === null ? [] : [{
@@ -268129,7 +268251,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				threadId: parentThreadId,
 				...parentRun === void 0 ? {} : { runId: parentRun.id },
 				providerInstanceId: childRun.providerInstanceId,
-				occurredAt: now$25,
+				occurredAt: now$50,
 				payload: resultHandoff
 			}],
 			{
@@ -268137,7 +268259,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				threadId: parentThreadId,
 				...parentRun === void 0 ? {} : { runId: parentRun.id },
 				providerInstanceId: childRun.providerInstanceId,
-				occurredAt: now$25,
+				occurredAt: now$50,
 				payload: resultTransfer
 			}
 		]);
@@ -268179,7 +268301,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 		const cohort = parentRun?.delegatedCompletion;
 		const delivery = cohort?.delivery;
 		if (parentRun === void 0 || cohort === void 0 || delivery === null || delivery === void 0 || delivery.messageId !== deliveryRun.userMessageId || delivery.generation !== messageOwnership.generation) return;
-		const now$45 = yield* now;
+		const now$34 = yield* now;
 		const nextTaskStates = /* @__PURE__ */ new Map();
 		for (const task of projection.subagents) {
 			if (task.origin !== "app_owned" || task.runId !== parentRun.id || !delivery.taskIds.includes(task.id) || task.completionDelivery?.state !== "claimed") continue;
@@ -268219,11 +268341,11 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				nodeId: task.id,
 				driver: task.driver,
 				providerInstanceId: task.providerInstanceId,
-				occurredAt: now$45,
+				occurredAt: now$34,
 				payload: {
 					...task,
 					completionDelivery,
-					updatedAt: now$45
+					updatedAt: now$34
 				}
 			}];
 		});
@@ -268233,7 +268355,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			runId: updatedParentRun.id,
 			...updatedParentRun.rootNodeId === null ? {} : { nodeId: updatedParentRun.rootNodeId },
 			providerInstanceId: updatedParentRun.providerInstanceId,
-			occurredAt: now$45,
+			occurredAt: now$34,
 			payload: updatedParentRun
 		}]);
 		if (nextDelivery !== null) yield* offerDelegatedCompletionDelivery(threadId, parentRun.id);
@@ -268244,13 +268366,13 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 		const parentRun = projection.runs.find((run) => run.id === ownership?.parentRunId);
 		const cohort = parentRun?.delegatedCompletion;
 		const delivery = cohort?.delivery;
-		const now$31 = yield* now;
+		const now$23 = yield* now;
 		const emitEvent = emit(events, command);
 		if (parentRun === void 0 || cohort === void 0 || cohort.disposition !== "open" || delivery == null || delivery.messageId !== command.messageId || delivery.generation !== ownership?.generation) {
 			yield* emitEvent({
 				type: "thread.metadata-updated",
 				threadId: command.threadId,
-				occurredAt: now$31,
+				occurredAt: now$23,
 				payload: projection.thread
 			});
 			return;
@@ -268277,14 +268399,14 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				nodeId: task.id,
 				driver: task.driver,
 				providerInstanceId: task.providerInstanceId,
-				occurredAt: now$31,
+				occurredAt: now$23,
 				payload: {
 					...task,
 					completionDelivery: {
 						state,
 						observedByRunId: null
 					},
-					updatedAt: now$31
+					updatedAt: now$23
 				}
 			});
 		}
@@ -268293,7 +268415,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 			threadId: command.threadId,
 			runId: parentRun.id,
 			providerInstanceId: parentRun.providerInstanceId,
-			occurredAt: now$31,
+			occurredAt: now$23,
 			payload: {
 				...parentRun,
 				delegatedCompletion: {
@@ -268519,14 +268641,14 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 					commandType: command.type,
 					cause: "Continue the limited thread before resuming its queue."
 				});
-				const now$19 = yield* now;
+				const now$42 = yield* now;
 				const queued = projection.runs.filter((run) => run.status === "queued");
 				for (const run of queued) yield* emit(events, command)({
 					type: "run.updated",
 					threadId: command.threadId,
 					runId: run.id,
 					providerInstanceId: run.providerInstanceId,
-					occurredAt: now$19,
+					occurredAt: now$42,
 					payload: {
 						...run,
 						queueHeld: false
@@ -268535,7 +268657,7 @@ const makeOrchestrator = fn("orchestrationV2.Orchestrator.layer")(function* () {
 				if (queued.length === 0) yield* emit(events, command)({
 					type: "thread.metadata-updated",
 					threadId: command.threadId,
-					occurredAt: now$19,
+					occurredAt: now$42,
 					payload: projection.thread
 				});
 				break;
@@ -269388,9 +269510,12 @@ const make$78 = gen$1(function* () {
 	const stopDelegatedTasks = (input) => gen$1(function* () {
 		const { subagents } = yield* orchestrator.getThreadRecords(input.threadId, ["subagents"]);
 		const failures = [];
+		const stoppedChildThreadIds = /* @__PURE__ */ new Set();
 		for (const task of subagents) {
 			if (task.origin !== "app_owned" || task.childThreadId === null) continue;
 			const threadId = task.childThreadId;
+			if (stoppedChildThreadIds.has(threadId)) continue;
+			stoppedChildThreadIds.add(threadId);
 			yield* dispatch({
 				type: "thread.stop",
 				commandId: CommandId.make(`${input.commandId}:stop:${threadId}`),
@@ -274783,6 +274908,7 @@ const layer$100 = effect(ThreadTitleRegenerationService, make$71);
 const CONTINUE_PROMPT = "Continue where you left off.";
 /** Consecutive automatic continuations allowed before a person has to step in. */
 const MAX_CONTINUATION_CHAIN = 3;
+const CONTINUATION_LOOP_WINDOW_MS = 3e5;
 /**
 * Whether a restart must leave this run for the user: the thread is put away,
 * the provider turn already ended, or the user owes an answer. Checked when
@@ -274856,7 +274982,11 @@ const continueRestartedRun = fn("RestartContinuation.continueRestartedRun")(func
 	if (projection.runs.some((run) => run.id !== source.id && run.status !== "queued" && !cancelledBeforeStart(run) && runRanAfter(run, source))) return;
 	if (projection.thread.providerInstanceId !== source.providerInstanceId) return;
 	let chainLength = 0;
-	for (let run = source; run?.restartContinuationOfRunId !== void 0 && chainLength < MAX_CONTINUATION_CHAIN; run = projection.runs.find((candidate) => candidate.id === run?.restartContinuationOfRunId)) chainLength += 1;
+	const loopWindowStart = toEpochMillis(source.completedAt ?? source.requestedAt) - CONTINUATION_LOOP_WINDOW_MS;
+	for (let run = source; run?.restartContinuationOfRunId !== void 0 && chainLength < MAX_CONTINUATION_CHAIN; run = projection.runs.find((candidate) => candidate.id === run?.restartContinuationOfRunId)) {
+		if (toEpochMillis(run.requestedAt) < loopWindowStart) break;
+		chainLength += 1;
+	}
 	if (chainLength >= MAX_CONTINUATION_CHAIN) {
 		yield* logWarning$1("Not continuing a run restarted too many times in a row", {
 			threadId: input.threadId,
@@ -332221,4 +332351,4 @@ function runCli() {
 //#endregion
 export { runCli };
 
-//# sourceMappingURL=binCli-DNod5652.mjs.map
+//# sourceMappingURL=binCli-DxnOvHXE.mjs.map