@p4code/cli 0.6.16 → 0.6.18

package/dist/bin.mjs

@@ -268,7 +268,7 @@ const make$124 = () => {
 const layer$124 = Layer.sync(NetService, make$124);
 //#endregion
 //#region package.json
-var version$1 = "0.6.16";
+var version$1 = "0.6.18";
 //#endregion
 //#region src/config.ts
 /**
@@ -3284,6 +3284,8 @@ const FUSION_GATE_PROMPT_PREFIX = "[fusion-gate]";
 const FUSION_ACTIVATION_PROMPT_PREFIX = "[fusion-activation]";
 /** Server message that returns a Builder to its unfinished phase on Jev's advice. */
 const FUSION_JEV_PROMPT_PREFIX = "[fusion-jev]";
+/** Server message that resumes a Fusion child once after a transient provider failure. */
+const FUSION_RETRY_PROMPT_PREFIX = "[fusion-retry]";
 /**
 * Message-id namespaces for server-generated fusion wakes. Wake detection is
 * keyed off these rather than message text, which a user or expanded skill
@@ -5296,7 +5298,7 @@ var OrchestrationSearchThreadsError = class extends Schema$1.TaggedErrorClass()(
 const ThreadWatchEventsInput = Schema$1.Struct({
 	threadId: ThreadId.annotate({ description: "The thread to read events from. Any thread on this server, not only this session's own." }),
 	afterSequence: Schema$1.optional(NonNegativeInt.annotate({ description: "Exclusive sequence cursor. Events with a higher sequence are returned. Omit to read from the beginning." })),
-	limit: Schema$1.optional(NonNegativeInt.check(Schema$1.isLessThanOrEqualTo(200)).annotate({ description: `Maximum events to return (default 50, max 200).` }))
+	limit: Schema$1.optional(NonNegativeInt.annotate({ description: `Maximum events to return (default 50, max 200; larger values are clamped).` }))
 });
 const ThreadWatchEventsResult = Schema$1.Struct({
 	threadId: ThreadId,
@@ -13355,7 +13357,9 @@ const ThreadContextUpdateInput = Schema$1.Struct({
 });
 const ThreadContextUpdateResult = Schema$1.Struct({
 	pairId: ThreadPairId,
-	updatedAt: IsoDateTime
+	updatedAt: IsoDateTime,
+	/** Explains input the server dropped instead of rejecting the whole update. */
+	notice: Schema$1.optional(Schema$1.String)
 });
 const RoleContextItems = Schema$1.Struct({
 	supervisor: SharedContextItems,
@@ -21561,6 +21565,7 @@ const makeRuntimeSqliteLayer = Effect.fn("makeRuntimeSqliteLayer")(function* (co
 const applyPragmas = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	yield* sql`PRAGMA journal_mode = WAL;`;
+	yield* sql`PRAGMA synchronous = NORMAL;`;
 	yield* sql`PRAGMA foreign_keys = ON;`;
 });
 const setupFile = (dbPath) => Layer.effectDiscard(applyPragmas.pipe(Effect.andThen(runGuardedMigrations({ dbPath })), Effect.andThen(runHistoricalActivityCompaction())));
@@ -45417,8 +45422,9 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			threadId,
 			...bounds
 		})).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listActivities:query", "ProjectionSnapshotQuery.getThreadDetailById:listActivities:decodeRows")), Effect.map((rows) => rows.map(mapThreadActivityRow)));
-		const [threadRow, messageRows, proposedPlanRows, activities, checkpointRows, turnRows, latestTurnRow, sessionRow, scheduledTaskRows] = yield* Effect.all([
-			getActiveThreadRowById({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getThread:query", "ProjectionSnapshotQuery.getThreadDetailById:getThread:decodeRow"))),
+		const threadRow = yield* getActiveThreadRowById({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getThread:query", "ProjectionSnapshotQuery.getThreadDetailById:getThread:decodeRow")));
+		if (Option.isNone(threadRow)) return Option.none();
+		const [messageRows, proposedPlanRows, activities, checkpointRows, turnRows, latestTurnRow, sessionRow, scheduledTaskRows] = yield* Effect.all([
 			(bounds === void 0 ? listThreadMessageRowsByThread({ threadId }) : listThreadMessageRowsByThreadWindow({
 				threadId,
 				...bounds
@@ -45431,7 +45437,6 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
 			getThreadSessionRowByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:getSession:query", "ProjectionSnapshotQuery.getThreadDetailById:getSession:decodeRow"))),
 			listThreadScheduledTaskRowsByThread({ threadId }).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$1("ProjectionSnapshotQuery.getThreadDetailById:listScheduledTasks:query", "ProjectionSnapshotQuery.getThreadDetailById:listScheduledTasks:decodeRows")))
 		]);
-		if (Option.isNone(threadRow)) return Option.none();
 		const thread = {
 			id: threadRow.value.threadId,
 			projectId: threadRow.value.projectId,
@@ -49909,6 +49914,7 @@ const findXcodeProject = (fs, root) => Effect.gen(function* () {
 });
 function createAppleDeviceAdapter(input) {
 	const sessions = /* @__PURE__ */ new Map();
+	const openings = /* @__PURE__ */ new Map();
 	const fail = (operation) => (cause) => new DeviceOperationError({
 		operation,
 		reason: "request_failed",
@@ -49921,6 +49927,8 @@ function createAppleDeviceAdapter(input) {
 	const closeSession = (leaseId) => {
 		const pending = sessions.get(leaseId);
 		sessions.delete(leaseId);
+		openings.get(leaseId)?.abort();
+		openings.delete(leaseId);
 		pending?.then(async (owned) => {
 			try {
 				await owned.client.call("DeviceInteractionEndSession", { interactionSessionKey: owned.key }, new AbortController().signal);
@@ -49932,11 +49940,13 @@ function createAppleDeviceAdapter(input) {
 	const workspaceFor = (session) => input.workspacePath !== void 0 || !session.workspaceRoot || session.leaseId !== void 0 && sessions.has(session.leaseId) ? Effect.succeed(input.workspacePath) : findXcodeProject(input.fs, session.workspaceRoot);
 	const get = (session) => Effect.flatMap(workspaceFor(session), (workspace) => open(session, workspace));
 	const open = (session, workspace) => Effect.tryPromise({
-		try: async (signal) => {
+		try: async () => {
 			if (session.hostId !== "local" || session.platform !== "ios" || !session.leaseId) throw new Error("Apple MCP requires an exact local iOS device lease.");
 			let pending = sessions.get(session.leaseId);
 			if (!pending) {
 				if (sessions.size >= MAX_SESSIONS) throw new Error("Close an existing device session first.");
+				const controller = new AbortController();
+				const signal = controller.signal;
 				pending = (async () => {
 					const client = await XcodeMcpClient.start("/usr/bin/xcrun", input.cwd, {
 						...input.environment,
@@ -49966,8 +49976,12 @@ function createAppleDeviceAdapter(input) {
 					}
 				})();
 				sessions.set(session.leaseId, pending);
+				openings.set(session.leaseId, controller);
 				const leaseId = session.leaseId;
-				pending.catch(() => {
+				pending.then(() => {
+					if (openings.get(leaseId) === controller) openings.delete(leaseId);
+				}, () => {
+					if (openings.get(leaseId) === controller) openings.delete(leaseId);
 					if (sessions.get(leaseId) === pending) sessions.delete(leaseId);
 				});
 			}
@@ -61866,6 +61880,38 @@ const prepareSharedCheckout = (input, git) => Effect.gen(function* () {
 	return { branch };
 }).pipe(Effect.withSpan("prepareSharedCheckout"));
 //#endregion
+//#region src/orchestration/ShellStreamingThrottle.ts
+/** Minimum gap between shell refetches caused by one streaming message. */
+const SHELL_STREAMING_REFRESH_INTERVAL_MS = 1e3;
+/**
+* Per-subscription filter for the shell stream. A streaming assistant message
+* emits a delta roughly every 50 ms and each one only moves the thread's
+* `updatedAt`, yet every delta would otherwise refetch the thread shell and
+* push it to the client. The first delta of a message always passes (it can
+* change `latestTurn`), later deltas pass at most once per interval, and the
+* final non-streaming message always passes, so the shell still settles on the
+* current state.
+*
+* Returns `(event, nowMs) => keep`. Create one per subscription: the state is
+* which deltas this subscriber has already seen.
+*/
+function makeShellStreamingThrottle(intervalMs = SHELL_STREAMING_REFRESH_INTERVAL_MS) {
+	const lastPassedAtByMessageId = /* @__PURE__ */ new Map();
+	return (event, nowMs) => {
+		if (event.type !== "thread.message-sent") return true;
+		const messageId = event.payload.messageId;
+		if (!event.payload.streaming) {
+			lastPassedAtByMessageId.delete(messageId);
+			return true;
+		}
+		const lastPassedAt = lastPassedAtByMessageId.get(messageId);
+		if (lastPassedAt !== void 0 && nowMs - lastPassedAt < intervalMs) return false;
+		if (lastPassedAtByMessageId.size >= 1e3) lastPassedAtByMessageId.clear();
+		lastPassedAtByMessageId.set(messageId, nowMs);
+		return true;
+	};
+}
+//#endregion
 //#region src/provider/ProviderInstanceEnvironment.ts
 function mergeProviderInstanceEnvironment(environment, baseEnv = process.env) {
 	if (!environment || environment.length === 0) return baseEnv;
@@ -92270,6 +92316,11 @@ const makeCodexSubagentModelReporter = (options) => {
 */
 /** Codex's own name for the token variable of p4code's built-in server. */
 const CODEX_P4CODE_BEARER_TOKEN_ENV_VAR = "P4_MCP_BEARER_TOKEN";
+/**
+* Codex `mcp_servers.<name>.tool_timeout_sec` for p4code's built-in server, a
+* TOML float. An hour, because `ask_user_question` blocks until a person answers.
+*/
+const CODEX_P4CODE_TOOL_TIMEOUT_SEC = "3600.0";
 /** Its own variable, so the Computer Use credential never rides on p4-code's. */
 const CODEX_P4_COMPUTER_USE_BEARER_TOKEN_ENV_VAR = "P4_COMPUTER_USE_BEARER_TOKEN";
 /** Prefix for the per-server variables the registered servers get. */
@@ -94405,7 +94456,9 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 						"-c",
 						`mcp_servers.${P4CODE_MCP_SERVER_NAME}.url=${mcpSession.endpoint}`,
 						"-c",
-						`mcp_servers.${P4CODE_MCP_SERVER_NAME}.bearer_token_env_var="${CODEX_P4CODE_BEARER_TOKEN_ENV_VAR}"`
+						`mcp_servers.${P4CODE_MCP_SERVER_NAME}.bearer_token_env_var="${CODEX_P4CODE_BEARER_TOKEN_ENV_VAR}"`,
+						"-c",
+						`mcp_servers.${P4CODE_MCP_SERVER_NAME}.tool_timeout_sec=${CODEX_P4CODE_TOOL_TIMEOUT_SEC}`
 					] : [],
 					...mcpSession?.computerUse ? [
 						"-c",
@@ -132581,7 +132634,10 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker, computerUseBrok
 		output.push(...yield* coalesceShellEvents(pendingEvents));
 		return output;
 	});
-	const coalesceShellLiveStream = (stream) => stream.pipe(Stream.groupedWithin(SHELL_COALESCE_MAX_CHUNK, SHELL_COALESCE_WINDOW), Stream.mapEffect(coalesceShellLiveInputs), Stream.flatMap((items) => Stream.fromIterable(items)));
+	const coalesceShellLiveStream = (stream) => {
+		const keepStreamingDelta = makeShellStreamingThrottle();
+		return stream.pipe(Stream.filterEffect((input) => input.kind === "event" ? Clock.currentTimeMillis.pipe(Effect.map((nowMs) => keepStreamingDelta(input.event, nowMs))) : Effect.succeed(true)), Stream.groupedWithin(SHELL_COALESCE_MAX_CHUNK, SHELL_COALESCE_WINDOW), Stream.mapEffect(coalesceShellLiveInputs), Stream.flatMap((items) => Stream.fromIterable(items)));
+	};
 	const dispatchBootstrapTurnStart = (command) => Effect.gen(function* () {
 		const bootstrap = command.bootstrap;
 		const { bootstrap: _bootstrap, ...finalTurnStartCommand } = command;
@@ -136998,7 +137054,9 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 		const { invocation, pair, reject } = yield* requireSharedPair("thread_context_update");
 		const isBuilder = invocation.threadId === pair.implementerThreadId;
 		if (isBuilder && (input.requirements !== void 0 || input.decisions !== void 0)) return yield* reject("Supervisor owns requirements and decisions. Propose revisions through thread_ask.");
-		if (!isBuilder && input.summary !== void 0) return yield* reject("Only Builder may replace its phase summary.");
+		const { summary, ...supervisorContext } = input;
+		const ignoresSummary = !isBuilder && summary !== void 0;
+		if (ignoresSummary && input.requirements === void 0 && input.decisions === void 0 && input.blockers.length === 0 && input.evidence.length === 0) return yield* reject("Only Builder may replace its phase summary.");
 		const crypto = yield* Crypto.Crypto;
 		const createdAt = DateTime.formatIso(yield* DateTime.now);
 		yield* dispatchControl({
@@ -137014,14 +137072,15 @@ const ThreadToolkitHandlersLive = ThreadToolkit.toLayer({
 				summary: "Shared working context updated",
 				turnId: null,
 				payload: {
-					...input,
+					...isBuilder ? input : supervisorContext,
 					pairId: pair.id
 				}
 			}
 		}, invocation.threadId);
 		return {
 			pairId: pair.id,
-			updatedAt: createdAt
+			updatedAt: createdAt,
+			...ignoresSummary ? { notice: "summary was ignored because only Builder owns its phase summary; the other fields were saved." } : {}
 		};
 	}),
 	thread_plan_update: (input) => Effect.gen(function* () {
@@ -139053,7 +139112,7 @@ const WatchToolkitHandlersLive = WatchToolkit.toLayer({
 		const page = yield* (yield* ThreadEventStreamService).read({
 			threadId: input.threadId,
 			...input.afterSequence !== void 0 ? { afterSequence: input.afterSequence } : {},
-			limit: input.limit ?? 50
+			limit: Math.min(input.limit ?? 50, 200)
 		}).pipe(Effect.mapError((cause) => new ThreadWatchFailedError({
 			threadId: input.threadId,
 			detail: cause.message
@@ -145016,7 +145075,8 @@ function citedSequences(summary) {
 * sequence numbers, the summary is required to cite them, and a dropped line,
 * unrenderable transcript field, or dropped ledger row makes coverage
 * incomplete. A shortened transcript field or clipped ledger argument stays
-* visible and its full text stays in the raw event, so neither does.
+* visible and its full text stays in the raw event, so neither does. A summary
+* line citing a sequence the transcript lacks is removed, never kept.
 *
 * @module orchestration/handoff/fusionEvidenceHandoff
 */
@@ -145170,6 +145230,34 @@ function summaryRejection(input) {
 	if (cited.length === 0) return "summary-uncited";
 	return cited.every((sequence) => input.includedSequences.has(sequence)) ? null : "summary-citation-invalid";
 }
+/**
+* The summary with every line citing a sequence absent from the transcript,
+* and the uncited lines continuing it, removed; or null when nothing was
+* removed or nothing cited survives.
+*
+* A line is the unit of claim: one invented citation condemns the line it is
+* on, never the lines beside it that cite real evidence. The removal is
+* disclosed in the text so the supervisor knows the summary was cut.
+*/
+function salvageSummary(input) {
+	const lines = input.summary.split("\n");
+	const kept = [];
+	let droppingClaim = false;
+	for (const line of lines) {
+		const cited = citedSequences(line);
+		if (cited.length > 0) droppingClaim = !cited.every((sequence) => input.includedSequences.has(sequence));
+		else if (/^\s*#{1,6}\s/u.test(line)) droppingClaim = false;
+		if (!droppingClaim) kept.push(line);
+	}
+	const dropped = lines.length - kept.length;
+	if (dropped === 0) return null;
+	const text = kept.join("\n").trim();
+	if (summaryRejection({
+		summary: text,
+		includedSequences: input.includedSequences
+	}) !== null) return null;
+	return `${text}\n\n[Server removed ${dropped} summary ${dropped === 1 ? "line" : "lines"} resting on sequences absent from this transcript.]`;
+}
 const buildFusionEvidenceHandoff = Effect.fn("fusionEvidenceHandoff.build")(function* (input) {
 	const engine = yield* OrchestrationEngineService;
 	const textGeneration = yield* TextGeneration;
@@ -145237,6 +145325,19 @@ const buildFusionEvidenceHandoff = Effect.fn("fusionEvidenceHandoff.build")(func
 		produced: Option.none(),
 		reason
 	});
+	const salvaged = (result) => {
+		const summary = salvageSummary({
+			summary: result.summary,
+			includedSequences: evidence.includedSequences
+		});
+		return summary === null ? null : {
+			produced: Option.some({
+				...result,
+				summary
+			}),
+			reason: null
+		};
+	};
 	const attempt = yield* Effect.gen(function* () {
 		const first = yield* runSummary(handoffSummaryInstructions({ includedSequences: evidence.includedSequences }));
 		if (Option.isNone(first)) return noSummary("summary-unavailable");
@@ -145250,6 +145351,8 @@ const buildFusionEvidenceHandoff = Effect.fn("fusionEvidenceHandoff.build")(func
 			produced: first,
 			reason: null
 		};
+		const firstSalvage = salvaged(first.value);
+		if (firstSalvage !== null) return firstSalvage;
 		const repaired = yield* runSummary(handoffSummaryRepairInstructions({
 			rejection,
 			summary: first.value.summary,
@@ -145265,7 +145368,7 @@ const buildFusionEvidenceHandoff = Effect.fn("fusionEvidenceHandoff.build")(func
 		return repairedRejection === null ? {
 			produced: repaired,
 			reason: null
-		} : noSummary(repairedRejection);
+		} : salvaged(repaired.value) ?? noSummary(repairedRejection);
 	}).pipe(Effect.timeoutOption(HANDOFF_TIMEOUT), Effect.map(Option.getOrElse(() => noSummary("summary-unavailable"))));
 	const produced = attempt.produced;
 	if (Option.isNone(produced)) return yield* fallback(attempt.reason ?? "summary-unavailable");
@@ -145356,6 +145459,26 @@ const gateMessageId = (gateId, round) => MessageId.make(`${FUSION_GATE_MESSAGE_I
 const gateActivityId = (gateId, threadId, suffix) => EventId.make(`fusion-gate:${gateId}:${suffix}:${threadId}`);
 const pairFailureCommandId = (pairId, sequence, suffix) => CommandId.make(`server:fusion:${pairId}:provider-failure:${sequence}:${suffix}`);
 const pairFailureActivityId = (pairId, sequence, threadId) => EventId.make(`fusion-provider-failure:${pairId}:${sequence}:${threadId}`);
+const PROVIDER_RETRY_MESSAGE_ID_PREFIX = "fusion-provider-retry:";
+const providerRetryCommandId = (pairId, sequence) => CommandId.make(`server:fusion:${pairId}:provider-retry:${sequence}`);
+/** Carries the origin and the failed completion's sequence ahead of the free-form pair id. */
+const providerRetryMessageId = (origin, sequence, pairId) => MessageId.make(`${PROVIDER_RETRY_MESSAGE_ID_PREFIX}${origin}:${sequence}:${pairId}`);
+const PROVIDER_RETRY_MESSAGE_ID = /^fusion-provider-retry:(review|other):(\d+):/u;
+/** The failed completion a review retry resumes, or null for any other message. */
+const retriedReviewSequence = (messageId) => {
+	const match = messageId === null ? null : PROVIDER_RETRY_MESSAGE_ID.exec(messageId);
+	return match?.[1] === "review" ? Number(match[2]) : null;
+};
+const TRANSIENT_PROVIDER_FAILURE = /runtime stream failed|stream disconnected|at capacity|overloaded|server failed|server error|internal error|\b(?:500|502|503|504|529)\b/i;
+const PERSISTENT_PROVIDER_FAILURE = /usage limit|rate limit|quota|billing|auth|log ?in|credential|unauthori[sz]ed|forbidden|\b(?:401|403)\b|does not exist|not found/i;
+/**
+* Whether a failed turn's recorded error is worth one automatic retry: a
+* dropped stream, a provider at capacity, or a server-side outage. Usage
+* limits, auth and missing paths never are, because retrying cannot fix them.
+*/
+function isTransientProviderFailure(lastError) {
+	return typeof lastError === "string" && TRANSIENT_PROVIDER_FAILURE.test(lastError) && !PERSISTENT_PROVIDER_FAILURE.test(lastError);
+}
 const idlePauseCommandId = (pairId, sequence, threadId) => CommandId.make(`server:fusion:${pairId}:idle-pause:${sequence}:${threadId}`);
 const idlePauseActivityId = (pairId, sequence, threadId) => EventId.make(`fusion-idle-pause:${pairId}:${sequence}:${threadId}`);
 /**
@@ -145634,10 +145757,11 @@ const make$3 = Effect.gen(function* () {
 		});
 	});
 	/**
-	* A provider-level failure is not a review boundary. Stop the other child if
-	* it is still active, record one visible pair-level reason, and leave both
-	* idle until a human starts the next turn. Deterministic ids make replay a
-	* no-op, while ignoring interrupted completions prevents a reciprocal loop.
+	* A provider-level failure that was not retried is not a review boundary.
+	* Stop the other child if it is still active, record one visible pair-level
+	* reason, and leave both idle until a human starts the next turn.
+	* Deterministic ids make replay a no-op, while ignoring interrupted
+	* completions prevents a reciprocal loop.
 	*/
 	const pausePairAfterProviderFailure = Effect.fn("FusionWatcherReactor.pausePairAfterProviderFailure")(function* (input) {
 		const { readModel } = yield* readPairs;
@@ -145674,6 +145798,46 @@ const make$3 = Effect.gen(function* () {
 			discard: true
 		});
 	});
+	/**
+	* Resumes a child whose turn failed on a transient provider error, once,
+	* instead of pausing the pair and interrupting its healthy peer. True when
+	* the retry went out (now or on an earlier pass); false sends the failure to
+	* the pause. A retry turn that fails again, a turn whose start message is
+	* unknown, a thread someone already started again, and a failure replayed
+	* at boot are never retried.
+	*/
+	const retryTransientProviderFailure = Effect.fn("FusionWatcherReactor.retryTransientProviderFailure")(function* (input) {
+		const { pair, completion, readModel } = input;
+		const threadId = completion.payload.threadId;
+		const retryIds = new Set(["review", "other"].map((origin) => providerRetryMessageId(origin, completion.sequence, pair.id)));
+		const laterStarts = yield* orchestrationEngine.readEvents(completion.sequence, readModel.snapshotSequence - completion.sequence, { eventTypes: ["thread.turn-start-requested"] }).pipe(Stream.takeWhile((event) => event.sequence <= readModel.snapshotSequence), Stream.filter((event) => event.type === "thread.turn-start-requested" && event.payload.threadId === threadId), Stream.runCollect);
+		if (laterStarts.some((event) => event.type === "thread.turn-start-requested" && retryIds.has(event.payload.messageId))) return true;
+		if (input.replayed) return false;
+		const thread = readModel.threads.find((candidate) => candidate.id === threadId && candidate.deletedAt === null);
+		if (laterStarts.length > 0 || thread === void 0 || thread.latestTurn?.state === "running" || !isTransientProviderFailure(thread.session?.lastError) || completion.payload.turnId === null) return false;
+		const started = yield* projectionSnapshotQuery.getTurnStart(threadId, completion.payload.turnId).pipe(Effect.map(Option.getOrNull), Effect.orElseSucceed(() => null));
+		if (started === null || started.messageId === null || started.messageId.startsWith(PROVIDER_RETRY_MESSAGE_ID_PREFIX)) return false;
+		return yield* orchestrationEngine.dispatch({
+			type: "thread.turn.start",
+			commandId: providerRetryCommandId(pair.id, completion.sequence),
+			threadId,
+			message: {
+				messageId: providerRetryMessageId(started.messageId.startsWith("fusion-review:") ? "review" : "other", completion.sequence, pair.id),
+				role: "user",
+				text: `${FUSION_RETRY_PROMPT_PREFIX} Your previous turn stopped on a transient provider error. Continue the same work from where it stopped; no new work or authority is added. If it was already finished, end with the report you would have given.`,
+				attachments: []
+			},
+			runtimeMode: thread.runtimeMode,
+			interactionMode: thread.interactionMode,
+			compressMode: thread.compressMode,
+			unpromptedSubagents: thread.unpromptedSubagents,
+			createdAt: completion.occurredAt
+		}).pipe(Effect.as(true), Effect.catchCause((cause) => Effect.logWarning("provider failure retry was not sent; pausing the pair instead", {
+			pairId: pair.id,
+			sequence: completion.sequence,
+			cause
+		}).pipe(Effect.as(false))));
+	});
 	const wakeWasRequested = Effect.fn("FusionWatcherReactor.wakeWasRequested")(function* (afterSequence, throughSequence, messageId) {
 		return (yield* orchestrationEngine.readEvents(afterSequence, throughSequence - afterSequence, { eventTypes: ["thread.turn-start-requested"] }).pipe(Stream.takeWhile((event) => event.sequence <= throughSequence), Stream.filter((event) => event.type === "thread.turn-start-requested" && event.payload.messageId === messageId), Stream.take(1), Stream.runCollect)).length > 0;
 	});
@@ -146008,7 +146172,7 @@ const make$3 = Effect.gen(function* () {
 			resolvedAt: event.payload.createdAt
 		});
 	});
-	const isFusionProtocolText = (text) => text.startsWith("[fusion-review]") || text.startsWith("[fusion-gate]") || text.startsWith("[fusion-activation]") || text.startsWith("[fusion-jev]") || text.startsWith("[fusion-advice]");
+	const isFusionProtocolText = (text) => text.startsWith("[fusion-review]") || text.startsWith("[fusion-gate]") || text.startsWith("[fusion-activation]") || text.startsWith("[fusion-jev]") || text.startsWith("[fusion-retry]") || text.startsWith("[fusion-advice]");
 	const processMessageSent = Effect.fn("FusionWatcherReactor.processMessageSent")(function* (event) {
 		if (event.sequence <= liveEventsAfterSequence) return;
 		if (event.payload.role !== "user") return;
@@ -147081,17 +147245,19 @@ Set outcome to summarized, fallback, or failed from the review that just ended.
 		if (Option.isNone(turn)) return;
 		const started = turn.value;
 		if (started.threadId !== pair.watcherThreadId) return;
+		const retriedSequence = retriedReviewSequence(started.messageId);
+		const retriedTurnId = retriedSequence === null ? null : yield* orchestrationEngine.readEvents(retriedSequence - 1, 1).pipe(Stream.runHead, Effect.map(Option.flatMap((event) => event.type === "thread.turn-completed" && event.payload.threadId === pair.watcherThreadId ? Option.fromNullishOr(event.payload.turnId) : Option.none())), Effect.map(Option.getOrNull), Effect.orElseSucceed(() => null));
 		const readAt = Date.parse(latest.readAt);
 		if (latest.turnId === null) {
 			if (input.replayed) return;
 			if (started.startedAt !== null && readAt < Date.parse(started.startedAt)) return;
 			if (readAt > Date.parse(completion.occurredAt)) return;
-		} else if (latest.turnId !== completion.payload.turnId) return;
+		} else if (latest.turnId !== completion.payload.turnId && (retriedTurnId === null || latest.turnId !== retriedTurnId)) return;
 		const wakeAt = (prefix) => projectionSnapshotQuery.getLatestThreadMessageWithIdPrefix(pair.watcherThreadId, prefix).pipe(Effect.map(Option.flatMap((wake) => {
 			const sentAt = Date.parse(wake.createdAt);
 			return Number.isNaN(sentAt) || sentAt > readAt ? Option.none() : Option.some(sentAt);
 		})), Effect.orElseSucceed(() => Option.none()));
-		if (!(started.messageId === null ? yield* Effect.map(Effect.all([wakeAt("fusion-review:"), wakeAt("fusion-gate:")]), ([review, gate]) => Option.isSome(review) && (Option.isNone(gate) || gate.value < review.value)) : started.messageId.startsWith("fusion-review:"))) return;
+		if (!(started.messageId === null ? yield* Effect.map(Effect.all([wakeAt("fusion-review:"), wakeAt("fusion-gate:")]), ([review, gate]) => Option.isSome(review) && (Option.isNone(gate) || gate.value < review.value)) : started.messageId.startsWith("fusion-review:") || retriedSequence !== null)) return;
 		if (latest.hasReport) {
 			if (input.watcher !== void 0) yield* dispatchEvidenceReportRepair(pair, input.watcher, completion.occurredAt, {
 				watchedThreadId: latest.watchedThreadId,
@@ -147107,6 +147273,12 @@ Set outcome to summarized, fallback, or failed from the review that just ended.
 		const activePairs = (readModel.threadPairs ?? []).filter((pair) => pair.detachedAt === null);
 		const failedPair = activePairs.find((pair) => pair.implementerThreadId === event.payload.threadId || pair.watcherThreadId === event.payload.threadId);
 		if (event.payload.state === "failed" && failedPair !== void 0) {
+			if (yield* retryTransientProviderFailure({
+				pair: failedPair,
+				completion: event,
+				readModel,
+				replayed: event.sequence <= liveEventsAfterSequence
+			})) return;
 			yield* pausePairAfterProviderFailure({
 				pair: failedPair,
 				failedThreadId: event.payload.threadId,

package/dist/client/assets/{DiffPanel-D-49iCgp.js → DiffPanel-Cq5Tpiyo.js}

@@ -1,4 +1,4 @@
-import{r as e}from"./rolldown-runtime-QTnfLwEv.js";import{n as t,r as n,t as r}from"./compiler-runtime-CLAvuQ-D.js";import{$a as i,$u as a,Ba as o,Cl as s,Cn as c,Dt as l,Eu as ee,Ga as te,Kl as u,Kr as ne,La as d,Qa as f,Qr as re,Sl as p,Vr as m,Wa as h,Xa as ie,Za as g,_t as _,b as v,bu as ae,ct as y,eo as b,gt as x,h as S,hu as C,lu as w,vn as oe,wl as T,xl as E,yt as D}from"./previewAssetResource-CdRrwvdJ.js";import{a as O,c as se,i as k,n as A,o as j,r as M,s as ce,t as le}from"./toggle-group-BPwLpAJP.js";import{A as ue,Fr as de,J as fe,Lr as pe,M as N,Mr as me,Nr as he,Rr as ge,Y as _e,_ as ve,ar as ye,cr as be,ct as xe,dr as Se,dt as Ce,ft as P,h as we,ir as Te,j as Ee,jr as De,k as Oe,lr as ke,lt as Ae,nr as je,oi as Me,or as Ne,ot as Pe,pr as Fe,rr as Ie,si as Le,sr as Re,st as ze,ut as Be,yr as Ve}from"./index-sXPBcrsQ.js";import{a as He,n as Ue}from"./fileCommentAnnotations-CgO_0-Tr.js";var We=T(`pilcrow`,[[`path`,{d:`M13 4v16`,key:`8vvj80`}],[`path`,{d:`M17 4v16`,key:`7dpous`}],[`path`,{d:`M19 4H9.5a4.5 4.5 0 0 0 0 9H13`,key:`sh4n9v`}]]),F=e(n(),1);function Ge({threadRef:e,filePath:t,activeCwd:n,openInEditor:r,openFileSurface:i}){if(e){if(i){i(t);return}y.getState().openFile(e,t);return}r(n?S(t,n):t)}var I=r();function Ke(e,t){let n=(0,I.c)(4),r=Se(e,t),i;return n[0]!==r.data||n[1]!==r.error||n[2]!==r.isPending?(i={data:r.data,error:r.error,isPending:r.isPending},n[0]=r.data,n[1]=r.error,n[2]=r.isPending,n[3]=i):i=n[3],i}var L=t(),qe=[];function Je(e){return(e.endSide??e.side)===`deletions`?`deletions`:`additions`}function R(e,t,n){let r=Je(t),i=e.findIndex(e=>e.side===r&&e.lineNumber===t.end);return i<0?[...e,{side:r,lineNumber:t.end,metadata:{entries:[n]}}]:e.map((e,t)=>t===i?{...e,metadata:{entries:[...e.metadata.entries,n]}}:e)}function Ye(e){let t=(0,I.c)(50),{files:n,sectionId:r,sectionTitle:i,composerDraftTarget:a,options:o,viewerRef:s,className:c,renderHeaderPrefix:l}=e,ee=m(Qe),te=m(B),u;t[0]===a?u=t[1]:(u=e=>e.getComposerDraft(a)?.reviewComments??qe,t[0]=a,t[1]=u);let d=m(u),[f,p]=(0,F.useState)(null),[h,ie]=(0,F.useState)(null),g;t[2]===n?g=t[3]:(g=new Map(n.map(Ze)),t[2]=n,t[3]=g);let _=g,v;if(t[4]!==h||t[5]!==n||t[6]!==d||t[7]!==r){let e;t[9]!==h||t[10]!==d||t[11]!==r?(e=e=>{let{fileDiff:t,filePath:n,fileKey:i,collapsed:a}=e,o=d.filter(e=>e.sectionId===r&&e.filePath===n&&(e.fenceLanguage??`diff`)===`diff`).reduce((e,n)=>{let r=re(t,n);return r?R(e,r,{id:n.id,kind:`comment`,range:r,rangeLabel:n.rangeLabel,text:n.text}):e},[]),s=h?.fileKey===i?[...o,h.annotation]:o;return{id:i,type:`diff`,fileDiff:t,annotations:s,collapsed:a,version:ze(`${a?`1`:`0`}:${s.flatMap(z).join(`:`)}`)}},t[9]=h,t[10]=d,t[11]=r,t[12]=e):e=t[12],v=n.map(e),t[4]=h,t[5]=n,t[6]=d,t[7]=r,t[8]=v}else v=t[8];let ae=v,y;t[13]!==a||t[14]!==h?.annotation||t[15]!==te?(y=e=>{p(null),h?.annotation.metadata.entries.some(t=>t.id===e)?ie(null):te(a,e)},t[13]=a,t[14]=h?.annotation,t[15]=te,t[16]=y):y=t[16];let b=y,x;t[17]!==ee||t[18]!==a||t[19]!==h||t[20]!==_||t[21]!==r||t[22]!==i?(x=(e,t)=>{let n=h?.annotation.metadata.entries.find(t=>t.id===e),o=h?_.get(h.fileKey):void 0;if(!n||!o)return;let s=ne({id:n.id,sectionId:r,sectionTitle:i,filePath:o.filePath,fileDiff:o.fileDiff,range:n.range,text:t});s&&ee(a,s),p(null),ie(null)},t[17]=ee,t[18]=a,t[19]=h,t[20]=_,t[21]=r,t[22]=i,t[23]=x):x=t[23];let S=x,C;t[24]!==_||t[25]!==r||t[26]!==i?(C=(e,t)=>{if(!e)return;let n=t.item;if(n.type!==`diff`)return;let a=_.get(n.id);if(!a)return;let o=Ue(),s=ne({id:o,sectionId:r,sectionTitle:i,filePath:a.filePath,fileDiff:a.fileDiff,range:e,text:``});s&&ie({fileKey:n.id,annotation:{side:Je(e),lineNumber:e.end,metadata:{entries:[{id:o,kind:`draft`,range:e,rangeLabel:s.rangeLabel,text:``}]}}})},t[24]=_,t[25]=r,t[26]=i,t[27]=C):C=t[27];let w=C,oe=h!==null,T;t[28]===s?T=t[29]:(T=s?{ref:s}:{},t[28]=s,t[29]=T);let E;t[30]===c?E=t[31]:(E=c?{className:c}:{},t[30]=c,t[31]=E);let D=!oe,se=!oe,k;t[32]!==w||t[33]!==o||t[34]!==se||t[35]!==D?(k={...o,enableGutterUtility:D,enableLineSelection:se,onLineSelectionEnd:w},t[32]=w,t[33]=o,t[34]=se,t[35]=D,t[36]=k):k=t[36];let A;t[37]===l?A=t[38]:(A=e=>e.type===`diff`?l(e.fileDiff,e.id,e.collapsed===!0):null,t[37]=l,t[38]=A);let j;t[39]!==b||t[40]!==S?(j=e=>(0,L.jsx)(`div`,{className:`py-1`,children:e.metadata.entries.map(e=>(0,L.jsx)(He,{kind:e.kind,rangeLabel:e.rangeLabel,text:e.text,onCancel:()=>b(e.id),onComment:t=>S(e.id,t),onDelete:()=>b(e.id)},e.id))}),t[39]=b,t[40]=S,t[41]=j):j=t[41];let M;return t[42]!==ae||t[43]!==f||t[44]!==k||t[45]!==A||t[46]!==j||t[47]!==T||t[48]!==E?(M=(0,L.jsx)(O,{...T,...E,items:ae,selectedLines:f,onSelectedLinesChange:p,options:k,renderHeaderPrefix:A,renderAnnotation:j}),t[42]=ae,t[43]=f,t[44]=k,t[45]=A,t[46]=j,t[47]=T,t[48]=E,t[49]=M):M=t[49],M}function z(e){return e.metadata.entries.map(Xe)}function Xe(e){return`${e.id}:${e.rangeLabel}:${e.text}`}function Ze(e){return[e.fileKey,e]}function B(e){return e.removeReviewComment}function Qe(e){return e.addReviewComment}function $e(e){return{diffPreview:w(e,{label:`environment-data:review:diff-preview`,tag:a.reviewGetDiffPreview,staleTimeMs:5e3})}}var et=$e(c);function V(e){return e.remoteName&&e.name.startsWith(`${e.remoteName}/`)?e.name.slice(e.remoteName.length+1):e.name}function tt(e,t){let n=new Set(t),r=e.map(e=>{let r=t.filter(t=>n.has(t)&&V(t)===e.name),i=r.find(e=>e.remoteName===`origin`)??r[0]??null;return i&&n.delete(i),{id:`local:${e.name}`,label:e.name,local:e,remote:i}}),i=t.filter(e=>n.has(e)).map(e=>({id:`remote:${e.name}`,label:e.name,local:null,remote:e}));return[...r,...i]}function nt(e,t){let n=t.trim().toLocaleLowerCase();return n.length===0?e:e.filter(e=>e.label.toLocaleLowerCase().includes(n)||e.local?.name.toLocaleLowerCase().includes(n)===!0||e.remote?.name.toLocaleLowerCase().includes(n)===!0)}var H=`__automatic_base_ref__`,rt=new Set,it=`
+import{r as e}from"./rolldown-runtime-QTnfLwEv.js";import{n as t,r as n,t as r}from"./compiler-runtime-CLAvuQ-D.js";import{$a as i,$u as a,Ba as o,Cl as s,Cn as c,Dt as l,Eu as ee,Ga as te,Kl as u,Kr as ne,La as d,Qa as f,Qr as re,Sl as p,Vr as m,Wa as h,Xa as ie,Za as g,_t as _,b as v,bu as ae,ct as y,eo as b,gt as x,h as S,hu as C,lu as w,vn as oe,wl as T,xl as E,yt as D}from"./previewAssetResource-CscIFHNv.js";import{a as O,c as se,i as k,n as A,o as j,r as M,s as ce,t as le}from"./toggle-group-C8xCVvsa.js";import{A as ue,Fr as de,J as fe,Lr as pe,M as N,Mr as me,Nr as he,Rr as ge,Y as _e,_ as ve,ar as ye,cr as be,ct as xe,dr as Se,dt as Ce,ft as P,h as we,ir as Te,j as Ee,jr as De,k as Oe,lr as ke,lt as Ae,nr as je,oi as Me,or as Ne,ot as Pe,pr as Fe,rr as Ie,si as Le,sr as Re,st as ze,ut as Be,yr as Ve}from"./index-DYICyvf7.js";import{a as He,n as Ue}from"./fileCommentAnnotations-BRlauqkZ.js";var We=T(`pilcrow`,[[`path`,{d:`M13 4v16`,key:`8vvj80`}],[`path`,{d:`M17 4v16`,key:`7dpous`}],[`path`,{d:`M19 4H9.5a4.5 4.5 0 0 0 0 9H13`,key:`sh4n9v`}]]),F=e(n(),1);function Ge({threadRef:e,filePath:t,activeCwd:n,openInEditor:r,openFileSurface:i}){if(e){if(i){i(t);return}y.getState().openFile(e,t);return}r(n?S(t,n):t)}var I=r();function Ke(e,t){let n=(0,I.c)(4),r=Se(e,t),i;return n[0]!==r.data||n[1]!==r.error||n[2]!==r.isPending?(i={data:r.data,error:r.error,isPending:r.isPending},n[0]=r.data,n[1]=r.error,n[2]=r.isPending,n[3]=i):i=n[3],i}var L=t(),qe=[];function Je(e){return(e.endSide??e.side)===`deletions`?`deletions`:`additions`}function R(e,t,n){let r=Je(t),i=e.findIndex(e=>e.side===r&&e.lineNumber===t.end);return i<0?[...e,{side:r,lineNumber:t.end,metadata:{entries:[n]}}]:e.map((e,t)=>t===i?{...e,metadata:{entries:[...e.metadata.entries,n]}}:e)}function Ye(e){let t=(0,I.c)(50),{files:n,sectionId:r,sectionTitle:i,composerDraftTarget:a,options:o,viewerRef:s,className:c,renderHeaderPrefix:l}=e,ee=m(Qe),te=m(B),u;t[0]===a?u=t[1]:(u=e=>e.getComposerDraft(a)?.reviewComments??qe,t[0]=a,t[1]=u);let d=m(u),[f,p]=(0,F.useState)(null),[h,ie]=(0,F.useState)(null),g;t[2]===n?g=t[3]:(g=new Map(n.map(Ze)),t[2]=n,t[3]=g);let _=g,v;if(t[4]!==h||t[5]!==n||t[6]!==d||t[7]!==r){let e;t[9]!==h||t[10]!==d||t[11]!==r?(e=e=>{let{fileDiff:t,filePath:n,fileKey:i,collapsed:a}=e,o=d.filter(e=>e.sectionId===r&&e.filePath===n&&(e.fenceLanguage??`diff`)===`diff`).reduce((e,n)=>{let r=re(t,n);return r?R(e,r,{id:n.id,kind:`comment`,range:r,rangeLabel:n.rangeLabel,text:n.text}):e},[]),s=h?.fileKey===i?[...o,h.annotation]:o;return{id:i,type:`diff`,fileDiff:t,annotations:s,collapsed:a,version:ze(`${a?`1`:`0`}:${s.flatMap(z).join(`:`)}`)}},t[9]=h,t[10]=d,t[11]=r,t[12]=e):e=t[12],v=n.map(e),t[4]=h,t[5]=n,t[6]=d,t[7]=r,t[8]=v}else v=t[8];let ae=v,y;t[13]!==a||t[14]!==h?.annotation||t[15]!==te?(y=e=>{p(null),h?.annotation.metadata.entries.some(t=>t.id===e)?ie(null):te(a,e)},t[13]=a,t[14]=h?.annotation,t[15]=te,t[16]=y):y=t[16];let b=y,x;t[17]!==ee||t[18]!==a||t[19]!==h||t[20]!==_||t[21]!==r||t[22]!==i?(x=(e,t)=>{let n=h?.annotation.metadata.entries.find(t=>t.id===e),o=h?_.get(h.fileKey):void 0;if(!n||!o)return;let s=ne({id:n.id,sectionId:r,sectionTitle:i,filePath:o.filePath,fileDiff:o.fileDiff,range:n.range,text:t});s&&ee(a,s),p(null),ie(null)},t[17]=ee,t[18]=a,t[19]=h,t[20]=_,t[21]=r,t[22]=i,t[23]=x):x=t[23];let S=x,C;t[24]!==_||t[25]!==r||t[26]!==i?(C=(e,t)=>{if(!e)return;let n=t.item;if(n.type!==`diff`)return;let a=_.get(n.id);if(!a)return;let o=Ue(),s=ne({id:o,sectionId:r,sectionTitle:i,filePath:a.filePath,fileDiff:a.fileDiff,range:e,text:``});s&&ie({fileKey:n.id,annotation:{side:Je(e),lineNumber:e.end,metadata:{entries:[{id:o,kind:`draft`,range:e,rangeLabel:s.rangeLabel,text:``}]}}})},t[24]=_,t[25]=r,t[26]=i,t[27]=C):C=t[27];let w=C,oe=h!==null,T;t[28]===s?T=t[29]:(T=s?{ref:s}:{},t[28]=s,t[29]=T);let E;t[30]===c?E=t[31]:(E=c?{className:c}:{},t[30]=c,t[31]=E);let D=!oe,se=!oe,k;t[32]!==w||t[33]!==o||t[34]!==se||t[35]!==D?(k={...o,enableGutterUtility:D,enableLineSelection:se,onLineSelectionEnd:w},t[32]=w,t[33]=o,t[34]=se,t[35]=D,t[36]=k):k=t[36];let A;t[37]===l?A=t[38]:(A=e=>e.type===`diff`?l(e.fileDiff,e.id,e.collapsed===!0):null,t[37]=l,t[38]=A);let j;t[39]!==b||t[40]!==S?(j=e=>(0,L.jsx)(`div`,{className:`py-1`,children:e.metadata.entries.map(e=>(0,L.jsx)(He,{kind:e.kind,rangeLabel:e.rangeLabel,text:e.text,onCancel:()=>b(e.id),onComment:t=>S(e.id,t),onDelete:()=>b(e.id)},e.id))}),t[39]=b,t[40]=S,t[41]=j):j=t[41];let M;return t[42]!==ae||t[43]!==f||t[44]!==k||t[45]!==A||t[46]!==j||t[47]!==T||t[48]!==E?(M=(0,L.jsx)(O,{...T,...E,items:ae,selectedLines:f,onSelectedLinesChange:p,options:k,renderHeaderPrefix:A,renderAnnotation:j}),t[42]=ae,t[43]=f,t[44]=k,t[45]=A,t[46]=j,t[47]=T,t[48]=E,t[49]=M):M=t[49],M}function z(e){return e.metadata.entries.map(Xe)}function Xe(e){return`${e.id}:${e.rangeLabel}:${e.text}`}function Ze(e){return[e.fileKey,e]}function B(e){return e.removeReviewComment}function Qe(e){return e.addReviewComment}function $e(e){return{diffPreview:w(e,{label:`environment-data:review:diff-preview`,tag:a.reviewGetDiffPreview,staleTimeMs:5e3})}}var et=$e(c);function V(e){return e.remoteName&&e.name.startsWith(`${e.remoteName}/`)?e.name.slice(e.remoteName.length+1):e.name}function tt(e,t){let n=new Set(t),r=e.map(e=>{let r=t.filter(t=>n.has(t)&&V(t)===e.name),i=r.find(e=>e.remoteName===`origin`)??r[0]??null;return i&&n.delete(i),{id:`local:${e.name}`,label:e.name,local:e,remote:i}}),i=t.filter(e=>n.has(e)).map(e=>({id:`remote:${e.name}`,label:e.name,local:null,remote:e}));return[...r,...i]}function nt(e,t){let n=t.trim().toLocaleLowerCase();return n.length===0?e:e.filter(e=>e.label.toLocaleLowerCase().includes(n)||e.local?.name.toLocaleLowerCase().includes(n)===!0||e.remote?.name.toLocaleLowerCase().includes(n)===!0)}var H=`__automatic_base_ref__`,rt=new Set,it=`
 [data-diffs-header],
 [data-diff],
 [data-file],
@@ -95,4 +95,4 @@ import{r as e}from"./rolldown-runtime-QTnfLwEv.js";import{n as t,r as n,t as r}f
   text-decoration-color: currentColor;
 }
 `;function U({mode:e=`inline`,composerDraftTarget:t,initialGitScope:n,threadRef:r}){let{resolvedTheme:a}=v(),c=de(),[ne]=(0,F.useState)(n),[re,m]=(0,F.useState)(`stacked`),[y,S]=(0,F.useState)(c.wordWrap),[w,T]=(0,F.useState)(c.diffIgnoreWhitespace),[O,ve]=(0,F.useState)(``),[Se,ze]=(0,F.useState)(()=>({scopeKey:null,fileKeys:rt})),He=(0,F.useRef)(null),Ue=r.threadId,I=he(r),qe=I?.projectId??null,Je=me(I&&qe?{environmentId:I.environmentId,projectId:qe}:null),R=I?.worktreePath??Je?.workspaceRoot,z=u(oe.configValueAtom(I?.environmentId??null)),Xe=Fe(I?.environmentId??null,z?.availableEditors??[]),Ze=l(I!=null&&R!=null?De.status({environmentId:I.environmentId,input:{cwd:R}}):null),B=N(e=>Ee(e.byThreadKey,r,ne===`unstaged`)),Qe=Ze.data?.isRepo??!0,{turnDiffSummaries:$e,inferredCheckpointTurnCountByTurnId:V}=ue(I),U=(0,F.useMemo)(()=>[...$e].toSorted((e,t)=>{let n=e.checkpointTurnCount??V[e.turnId]??0,r=t.checkpointTurnCount??V[t.turnId]??0;return n===r?t.completedAt.localeCompare(e.completedAt):r-n}),[V,$e]);(0,F.useEffect)(()=>{B.kind===`turn`&&N.getState().reconcileTurnSelection(r,U.map(e=>e.turnId))},[B,U,r]);let W=B.kind===`turn`?B.turnId:null,G=B.kind===`unstaged`?`unstaged`:`branch`,K=B.kind===`branch`?B.baseRef:null,at=B.kind===`turn`?B.filePath:null,ot=B.kind===`turn`?B.revealRequestId:0,q=W===null?void 0:U.find(e=>e.turnId===W)??U[0],J=q&&(q.checkpointTurnCount??V[q.turnId]),st=U[0],ct=W===null?G===`unstaged`?`Working tree`:`Branch changes`:q?.turnId===st?.turnId?`Latest turn`:`Turn ${J??`?`}`,lt=q?`turn:${q.turnId}`:G,Y=`${r.environmentId}:${r.threadId}:${lt}`,ut=Se.scopeKey===Y?Se.fileKeys:rt,dt=q?`Turn ${J??`?`}`:G===`unstaged`?`Working tree`:`Branch changes`,ft=(0,F.useMemo)(()=>typeof J==`number`?{fromTurnCount:Math.max(0,J-1),toTurnCount:J}:null,[J]),pt=Ke({environmentId:I?.environmentId??null,threadId:Ue,fromTurnCount:ft?.fromTurnCount??null,toTurnCount:ft?.toTurnCount??null,ignoreWhitespace:w,cacheScope:q?`turn:${q.turnId}`:null},{enabled:Qe&&q!==void 0}),mt=l(W===null&&I&&R?et.diffPreview({environmentId:I.environmentId,input:{cwd:R,...K?{baseRef:K}:{},ignoreWhitespace:w}}):null),ht=W===null&&mt.error?.includes(`configured workspace root`)===!0&&z?.cwd!==void 0&&z.cwd!==R,gt=l(ht&&I&&z?et.diffPreview({environmentId:I.environmentId,input:{cwd:z.cwd,...K?{baseRef:K}:{},ignoreWhitespace:w}}):null),X=ht?gt:mt,Z=X.data?.sources.find(e=>e.kind===(G===`unstaged`?`working-tree`:`branch-range`)),_t=l(W===null&&G===`branch`&&I&&X.data?.cwd?De.listRefs({environmentId:I.environmentId,input:{cwd:X.data.cwd,includeMatchingRemoteRefs:!0,refKind:`local`,...O.trim().length>0?{query:O.trim()}:{},limit:100}}):null),vt=l(W===null&&G===`branch`&&I&&X.data?.cwd?De.listRefs({environmentId:I.environmentId,input:{cwd:X.data.cwd,includeMatchingRemoteRefs:!0,refKind:`remote`,...O.trim().length>0?{query:O.trim()}:{},limit:100}}):null),yt=tt(_t.data?.refs.filter(e=>e.name!==Z?.headRef)??[],vt.data?.refs??[]),bt=nt(yt,O),xt=e=>K&&K===e.remote?.name?K:e.local?.name??e.remote?.name??e.id,St=[H,...yt.map(xt)],Ct=[...O.trim().length===0?[H]:[],...bt.map(xt)],wt=Z?.diff,Tt=q?pt.data?.diff:wt,Et=!q&&Z?.truncated===!0,Dt=q?pt.isPending:X.isPending,Ot=q?pt.error:X.error,kt=typeof Tt==`string`&&Tt.trim().length===0,Q=(0,F.useMemo)(()=>Be(Tt,`diff-panel:${a}`,{compactPartialHunkOffsets:W===null}),[a,Tt,W]),At=(0,F.useMemo)(()=>!Q||Q.kind!==`files`?[]:Q.files.toSorted((e,t)=>P(e).localeCompare(P(t),void 0,{numeric:!0,sensitivity:`base`})),[Q]),$=(0,F.useMemo)(()=>At.map(e=>{let t=Pe(e);return{fileDiff:e,filePath:P(e),fileKey:t,collapsed:ut.has(t)}}),[ut,At]),jt=(0,F.useMemo)(()=>$.map(e=>e.fileKey),[$]),Mt=M(jt,ut),Nt=(0,F.useMemo)(()=>Ae(At),[At]);(0,F.useEffect)(()=>{if(!at)return;let e=$.find(e=>e.filePath===at);e&&He.current?.scrollTo({type:`item`,id:e.fileKey,align:`start`})},[$,at,ot]);let Pt=Oe({threadRef:r,workspaceRoot:R??null}),Ft=(0,F.useCallback)(e=>{Ge({threadRef:r,filePath:e,activeCwd:R,openFileSurface:Pt,openInEditor:e=>{(async()=>{let t=await Xe(e);t._tag===`Failure`&&!C(t)&&console.warn(`Failed to open diff file in editor.`,{operation:`open-diff-file`,environmentId:r.environmentId,threadId:r.threadId,...ee(ae(t))})})()}})},[R,Pt,Xe,r]),It=(0,F.useCallback)(e=>{ze(t=>{let n=new Set(t.scopeKey===Y?t.fileKeys:[]);return n.has(e)?n.delete(e):n.add(e),{scopeKey:Y,fileKeys:n}})},[Y]),Lt=(0,F.useCallback)(()=>{ze(e=>{let t=e.scopeKey===Y?e.fileKeys:rt;return{scopeKey:Y,fileKeys:k(jt,t)}})},[Y,jt]),Rt=e=>{N.getState().selectTurn(r,e)},zt=e=>{N.getState().selectGitScope(r,e)},Bt=e=>{N.getState().selectBranchBaseRef(r,e)};return(0,L.jsx)(_e,{mode:e,header:(0,L.jsxs)(L.Fragment,{children:[(0,L.jsxs)(`div`,{className:`flex min-w-0 flex-1 items-center gap-3 [-webkit-app-region:no-drag]`,children:[(0,L.jsxs)(o,{children:[(0,L.jsxs)(i,{className:`inline-flex h-6 max-w-full items-center gap-1 rounded-md bg-muted/70 px-2 text-xs font-medium text-foreground outline-none transition-colors hover:bg-muted focus-visible:ring-2 focus-visible:ring-ring`,"aria-label":`Diff scope: ${ct}`,children:[(0,L.jsx)(`span`,{className:`truncate`,children:ct}),(0,L.jsx)(p,{className:`size-3.5 shrink-0 text-muted-foreground`})]}),(0,L.jsxs)(te,{align:`start`,className:`w-60`,children:[(0,L.jsx)(h,{className:W===null&&G===`unstaged`?`bg-foreground/[0.08]`:void 0,onClick:()=>zt(`unstaged`),children:(0,L.jsx)(`span`,{children:`Working tree`})}),(0,L.jsx)(h,{className:W===null&&G===`branch`?`bg-foreground/[0.08]`:void 0,onClick:()=>zt(`branch`),children:(0,L.jsx)(`span`,{children:`Branch changes`})}),(0,L.jsx)(h,{className:W!==null&&q?.turnId===st?.turnId?`bg-foreground/[0.08]`:void 0,onClick:()=>{st&&Rt(st.turnId)},children:(0,L.jsx)(`span`,{children:`Latest turn`})}),(0,L.jsxs)(ie,{children:[(0,L.jsx)(f,{children:`Turn`}),(0,L.jsx)(g,{className:`w-64`,children:U.map(e=>{let t=e.checkpointTurnCount??V[e.turnId]??`?`;return(0,L.jsxs)(h,{className:e.turnId===q?.turnId?`bg-foreground/[0.08]`:void 0,onClick:()=>Rt(e.turnId),children:[(0,L.jsxs)(`span`,{children:[`Turn `,t]}),(0,L.jsx)(`span`,{className:`ml-auto text-xs tabular-nums text-muted-foreground`,children:Ve(e.completedAt,c.timestampFormat)})]},e.turnId)})})]})]})]}),W===null&&G===`branch`&&Z?.baseRef&&(0,L.jsxs)(`div`,{className:`flex min-w-0 max-w-full items-center gap-2 overflow-hidden text-xs text-muted-foreground`,title:`${Z.headRef??`HEAD`} → ${Z.baseRef}`,"aria-label":`Comparing ${Z.headRef??`HEAD`} against ${Z.baseRef}`,children:[(0,L.jsx)(`span`,{className:`min-w-0 max-w-48 truncate`,children:Z.headRef??`HEAD`}),(0,L.jsx)(Le,{className:`size-3.5 shrink-0 opacity-70`}),(0,L.jsxs)(je,{items:St,filteredItems:Ct,value:K??H,onOpenChange:e=>{e||ve(``)},onValueChange:e=>{e&&Bt(e===H?null:e)},children:[(0,L.jsxs)(be,{className:`inline-flex min-w-0 max-w-48 items-center gap-1 overflow-hidden rounded-md px-1.5 py-1 outline-none transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring`,"aria-label":`Change comparison target. Currently ${Z.baseRef}`,children:[(0,L.jsx)(`span`,{className:`min-w-0 truncate`,children:Z.baseRef}),(0,L.jsx)(p,{className:`size-3.5 shrink-0 opacity-70`})]}),(0,L.jsxs)(Re,{align:`start`,className:`w-72 min-w-0 max-w-[calc(100vw-1rem)] overflow-hidden [&>[data-slot=combobox-popup]]:min-w-0 [&>[data-slot=combobox-popup]]:overflow-hidden`,children:[(0,L.jsx)(`div`,{className:`min-w-0 shrink-0 px-3 pt-2.5`,children:(0,L.jsxs)(`div`,{className:`relative -translate-y-px border-b border-border/70 pb-1.5 transition-colors focus-within:border-ring`,children:[(0,L.jsx)(ge,{"aria-hidden":`true`,className:`pointer-events-none absolute top-1.5 left-0 size-4 shrink-0 text-muted-foreground/55`}),(0,L.jsx)(Te,{className:`[&_input]:h-6.5 [&_input]:ps-5 [&_input]:font-sans [&_input]:leading-6.5`,inputClassName:`rounded-none bg-transparent text-sm`,placeholder:`Search refs...`,showTrigger:!1,size:`sm`,unstyled:!0,value:O,onChange:e=>ve(e.target.value)})]})}),(0,L.jsxs)(`div`,{className:`grid shrink-0 grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 border-b border-border/70 ps-3 pe-6.5 pt-2 pb-1.5 font-medium text-[10px] text-muted-foreground uppercase tracking-wide`,children:[(0,L.jsx)(`span`,{"aria-hidden":`true`}),(0,L.jsxs)(`div`,{className:`grid min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center`,children:[(0,L.jsx)(`span`,{children:`Branch`}),(0,L.jsx)(`span`,{className:`text-right`,children:`Remote`})]})]}),(0,L.jsx)(Ie,{children:`No matching refs.`}),(0,L.jsxs)(Ne,{className:`max-h-64 min-w-0 overflow-x-hidden`,children:[(0,L.jsx)(ye,{className:`h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0`,contentClassName:`w-full min-w-0 overflow-hidden`,value:H,children:(0,L.jsx)(`span`,{className:`block min-w-0 truncate`,children:`Automatic`})}),yt.map(e=>{let t=xt(e),n=e.local!==null&&e.remote!==null,r=e.remote?.name===t;return(0,L.jsx)(ye,{className:`h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0`,contentClassName:`w-full min-w-0 overflow-hidden`,value:t,children:(0,L.jsxs)(`div`,{className:`grid w-full min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center overflow-hidden`,children:[(0,L.jsx)(`span`,{className:`block min-w-0 truncate pe-2`,children:e.label}),n?(0,L.jsx)(`div`,{className:`flex justify-end`,onClick:e=>e.stopPropagation(),onPointerDown:e=>e.stopPropagation(),children:(0,L.jsx)(ke,{"aria-label":`Use remote version of ${e.label}`,checked:r,className:`[--thumb-size:--spacing(3)]`,onCheckedChange:t=>{let n=t?e.remote?.name:e.local?.name;n&&Bt(n)}})}):e.remote?(0,L.jsx)(`span`,{className:`flex justify-end text-muted-foreground`,title:`Remote only`,children:(0,L.jsx)(s,{"aria-hidden":`true`,className:`size-3`})}):null]})},e.id)})]})]})]})]})]}),(0,L.jsxs)(`div`,{className:`flex shrink-0 items-center gap-1 [-webkit-app-region:no-drag]`,children:[$.length>0&&(0,L.jsx)(we,{additions:Nt.additions,deletions:Nt.deletions,className:`mr-1 text-[11px]`,layout:`inline`}),$.length>0&&(0,L.jsxs)(x,{children:[(0,L.jsx)(D,{render:(0,L.jsx)(d,{type:`button`,size:`icon-xs`,variant:`outline`,"aria-label":Mt?`Expand all files`:`Collapse all files`,onClick:Lt}),children:Mt?(0,L.jsx)(Me,{className:`size-3`}):(0,L.jsx)(se,{className:`size-3`})}),(0,L.jsx)(_,{side:`top`,children:Mt?`Expand all files`:`Collapse all files`})]}),(0,L.jsxs)(A,{className:`shrink-0`,variant:`outline`,size:`xs`,value:[re],onValueChange:e=>{let t=e[0];(t===`stacked`||t===`split`)&&m(t)},children:[(0,L.jsx)(le,{"aria-label":`Stacked diff view`,value:`stacked`,children:(0,L.jsx)(j,{className:`size-3`})}),(0,L.jsx)(le,{"aria-label":`Split diff view`,value:`split`,children:(0,L.jsx)(ce,{className:`size-3`})})]}),(0,L.jsxs)(x,{children:[(0,L.jsx)(D,{render:(0,L.jsx)(le,{"aria-label":y?`Disable diff line wrapping`:`Enable diff line wrapping`,variant:`outline`,size:`xs`,pressed:y,onPressedChange:e=>{S(!!e)}}),children:(0,L.jsx)(pe,{className:`size-3`})}),(0,L.jsx)(_,{side:`top`,children:y?`Disable line wrapping`:`Enable line wrapping`})]}),(0,L.jsxs)(x,{children:[(0,L.jsx)(D,{render:(0,L.jsx)(le,{"aria-label":w?`Show whitespace changes`:`Hide whitespace changes`,variant:`outline`,size:`xs`,pressed:w,onPressedChange:e=>{T(!!e)}}),children:(0,L.jsx)(We,{className:`size-3`})}),(0,L.jsx)(_,{side:`top`,children:w?`Show whitespace changes`:`Hide whitespace changes`})]})]})]}),children:I?Qe?W!==null&&U.length===0?(0,L.jsx)(`div`,{className:`flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70`,children:`No completed turns yet.`}):(0,L.jsx)(L.Fragment,{children:(0,L.jsxs)(`div`,{className:`diff-panel-viewport flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden`,children:[Et&&(0,L.jsx)(`p`,{className:`shrink-0 border-b border-border/70 bg-muted/40 px-3 py-1.5 text-[11px] text-muted-foreground`,children:`This diff was truncated because it exceeded the preview limit. The changes shown are incomplete.`}),Ot&&!Q&&(0,L.jsx)(`div`,{className:`px-3`,children:(0,L.jsx)(`p`,{className:`mb-2 text-[11px] text-red-500/80`,children:Ot})}),Q?Q.kind===`files`?(0,L.jsx)(`div`,{className:`min-h-0 flex-1`,onClickCapture:e=>{let t=(e.nativeEvent.composedPath?.()??[]).find(e=>e instanceof HTMLElement&&e.hasAttribute(`data-title`))?.textContent?.trim();t&&Ft(t)},children:(0,L.jsx)(Ye,{viewerRef:He,className:`diff-render-surface h-full min-h-0 overflow-auto`,files:$,sectionId:lt,sectionTitle:dt,composerDraftTarget:t,renderHeaderPrefix:(e,t,n)=>{let r=P(e);return(0,L.jsxs)(x,{children:[(0,L.jsx)(D,{render:(0,L.jsx)(`button`,{type:`button`,className:b(`inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0 transition-colors hover:bg-foreground/10 focus-visible:outline-hidden`,xe(e)),"aria-label":n?`Expand ${r}`:`Collapse ${r}`,"aria-expanded":!n,onClick:e=>{e.stopPropagation(),It(t)}}),children:n?(0,L.jsx)(E,{className:`size-4`}):(0,L.jsx)(p,{className:`size-4`})}),(0,L.jsx)(_,{side:`top`,children:n?`Expand diff`:`Collapse diff`})]})},options:{diffStyle:re===`split`?`split`:`unified`,lineDiffType:`none`,overflow:y?`wrap`:`scroll`,theme:Ce(a),themeType:a,unsafeCSS:it,stickyHeaders:!0,itemMetrics:{diffHeaderHeight:33},layout:{paddingTop:0,paddingBottom:8,gap:8}}},Y??lt)}):(0,L.jsx)(`div`,{className:`min-h-0 flex-1 overflow-auto p-2`,children:(0,L.jsxs)(`div`,{className:`space-y-2`,children:[(0,L.jsx)(`p`,{className:`text-[11px] text-muted-foreground/75`,children:Q.reason}),(0,L.jsx)(`pre`,{className:b(`max-h-[72vh] rounded-md border border-border/70 bg-background/70 p-3 font-mono text-[11px] leading-relaxed text-muted-foreground/90`,y?`overflow-auto whitespace-pre-wrap wrap-break-word`:`overflow-auto`),children:Q.text})]})}):Dt?(0,L.jsx)(fe,{label:q?`Loading checkpoint diff...`:G===`unstaged`?`Loading working tree diff...`:`Loading branch diff...`}):(0,L.jsx)(`div`,{className:`flex h-full items-center justify-center px-3 py-2 text-xs text-muted-foreground/70`,children:(0,L.jsx)(`p`,{children:kt?`No net changes in this selection.`:`No patch available for this selection.`})})]})}):(0,L.jsx)(`div`,{className:`flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70`,children:`Turn diffs are unavailable because this project is not a git repository.`}):(0,L.jsx)(`div`,{className:`flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70`,children:`Select a thread to inspect turn diffs.`})})}export{ve as DiffWorkerPoolProvider,U as default};
-//# sourceMappingURL=DiffPanel-D-49iCgp.js.map
+//# sourceMappingURL=DiffPanel-Cq5Tpiyo.js.map