@cmmd-center/forge 0.11.0 → 0.12.0

package/dist/bin.mjs

@@ -5,13 +5,13 @@ import { $ as encodeEffect, $a as make$39, $c as fromUndefinedOr, $i as spaced,
 import { $ as toAsyncIterable, A as make$45, At as make$44, Bt as publish, C as fromEffect, Ct as make$43, E as fromQueue, Et as end, F as merge$4, Ft as shutdown$1, G as runFold, H as run$2, Ht as subscribe$1, It as sliding, Jt as getCurrent, K as runForEach, Kt as makeUnsafe$7, Lt as take$1, M as mapAccum, Mt as offerAll, N as mapEffect$1, Nt as offerUnsafe, O as fromSubscription, Ot as failCause$4, Q as tick, R as onExit$1, Rt as takeAll, S as fromChannel, T as fromPubSub, Tt as bounded, U as runCollect, Ut as unbounded$1, V as provideContext$1, Vt as shutdown$2, W as runDrain, Y as succeed$4, Yt as interrupt$4, Z as takeWhile, Zt as runIn, _t as mapInput, at as make$46, b as flatMap$3, bt as fromTransform, c as callback$1, d as debounce$1, f as decodeText$1, g as ensuring$1, h as encodeText, it as get$4, j as map$7, jt as offer$1, k as isStream, l as catchCause$1, m as empty$5, mt as forEach$1, ot as get$5, pt as drain, q as runForEachArray, qt as await_, r as FileSystem, rt as unwrap$1, st as make$47, t as Path$2, u as concat$2, v as failCause$5, w as fromIterable$1, wt as makeUnsafe$6, x as fromAsyncIterable, y as filter$2, yt as fromSubscriptionArray, zt as unbounded$2 } from "./Path-C6Zb2WHp.mjs";
 import { _ as ChildProcessSpawner, a as Stdio, g as make$48, o as make$49, r as isQuitError } from "./NodeTerminal-BEGtoMSS.mjs";
 import { n as layer$7 } from "./NodeServices-CBNXOYLG.mjs";
-import { $ as file, A as SocketErrorReason, At as merge$5, Bt as set$2, Ct as HttpClientErrorSchema, Dt as empty$7, Ft as getAndSet, G as TracerPropagationEnabled, Ht as updateAndGet, I as HttpServerError, It as getUnsafe$2, J as transformResponse, K as filterStatusOk$1, Lt as make$50, Ot as fromInput$1, Pt as get$6, Q as empty$6, Rt as makeUnsafe$8, St as setBody, Tt as jsonUnsafe$1, U as layer$8, Vt as update$4, W as HttpClient, Z as symbol$1, _ as schemaBodyUrlParams, _t as acceptJson, a as withLogAddress, at as setCookie, bt as get$7, ct as stream, d as logger$1, dt as filterStatusOk, et as isHttpServerResponse, f as withLoggerDisabled, ft as matchStatus, g as schemaBodyJson, gt as schemaBodyJson$1, i as serve$1, it as schemaJson, kt as fromRecordUnsafe, lt as text$2, m as ParsedSearchParams, nt as raw, ot as setCookies, p as HttpServerRequest, q as retryTransient, rt as redirect, st as setHeader, t as HttpServer, tt as jsonUnsafe, u as cors, ut as uint8Array, v as schemaHeaders, vt as bearerToken, wt as isHttpClientError, xt as post, y as toURL, yt as bodyJson, z as RouteNotFound, zt as modify$3 } from "./HttpServer-DNGCTTdk.mjs";
+import { $ as file, A as SocketErrorReason, At as merge$5, Bt as set$3, Ct as HttpClientErrorSchema, Dt as empty$7, Ft as getAndSet, G as TracerPropagationEnabled, Ht as updateAndGet, I as HttpServerError, It as getUnsafe$2, J as transformResponse, K as filterStatusOk$1, Lt as make$50, Ot as fromInput$1, Pt as get$6, Q as empty$6, Rt as makeUnsafe$8, St as setBody, Tt as jsonUnsafe$1, U as layer$8, Vt as update$4, W as HttpClient, Z as symbol$1, _ as schemaBodyUrlParams, _t as acceptJson, a as withLogAddress, at as setCookie, bt as get$7, ct as stream, d as logger$1, dt as filterStatusOk, et as isHttpServerResponse, f as withLoggerDisabled, ft as matchStatus, g as schemaBodyJson, gt as schemaBodyJson$1, i as serve$1, it as schemaJson, kt as fromRecordUnsafe, lt as text$2, m as ParsedSearchParams, nt as raw, ot as setCookies, p as HttpServerRequest, q as retryTransient, rt as redirect, st as setHeader, t as HttpServer, tt as jsonUnsafe, u as cors, ut as uint8Array, v as schemaHeaders, vt as bearerToken, wt as isHttpClientError, xt as post, y as toURL, yt as bodyJson, z as RouteNotFound, zt as modify$3 } from "./HttpServer-DNGCTTdk.mjs";
 import { _ as withDefault$3, a as all$1, c as logLevel, d as option$1, f as port, g as url$2, i as TrueValues, l as map$8, m as string$7, n as FalseValues, o as boolean$5, p as schema$2, r as Record$1, s as int$2, t as Boolean$2, u as number$2 } from "./Config-AqUR_lhX.mjs";
-import { a as make$51, i as keys, n as getOption, o as makeWith$1, r as invalidate, s as set$3, t as get$8 } from "./Cache-p0X77SKw.mjs";
+import { a as make$51, i as keys, n as getOption, o as makeWith$1, r as invalidate, s as set$4, t as get$8 } from "./Cache-p0X77SKw.mjs";
 import { S as layer$9, _ as defaultEscape, a as DeadlockError, b as makeCompiler$1, c as SqlError, d as UnknownError, g as custom, h as make$52, i as ConstraintError, l as SqlSyntaxError, m as SqlClient, n as AuthorizationError, o as LockTimeoutError, r as ConnectionError, s as SerializationError, t as AuthenticationError, u as StatementTimeoutError, v as defaultTransforms, y as fragment } from "./SqlError-cyJT2IRY.mjs";
 import { r as wrapper_default, t as Mime_default } from "./Mime-Dq9IoNiV.mjs";
 import { a as diag, c as SpanKind$1, d as TraceFlags, f as ROOT_CONTEXT, i as propagation, l as isSpanContextValid, m as DiagLogLevel, n as init_esm$1, o as context$1, p as createContextKey, r as trace, s as SpanStatusCode, t as esm_exports$1 } from "./esm-wLIF-u3N.mjs";
-import { a as verifyCmmdAuthRuntimeTicket, c as verifyCmmdRuntimeTicket, d as setRuntimeGrantToken, f as createReadOnceFileTokenAccessor, i as sendRuntimeControlHeartbeat, l as verifyCmmdRuntimeTicketRefreshProof, n as bootstrapRuntimeControlAuthorityFromNarrowGrant, o as verifyCmmdClaudeReadinessTicket, r as readRuntimeControlAuthority, s as verifyCmmdClaudeUsageTicket, t as bootstrapRuntimeControlAuthority, u as runtimeGrantToken } from "./runtimeControlAuthority-COHmz_WT.mjs";
+import { a as verifyCmmdAuthRuntimeTicket, c as verifyCmmdRuntimeTicket, d as setRuntimeGrantToken, f as createReadOnceFileTokenAccessor, i as sendRuntimeControlHeartbeat, l as verifyCmmdRuntimeTicketRefreshProof, n as bootstrapRuntimeControlAuthorityFromNarrowGrant, o as verifyCmmdClaudeReadinessTicket, r as readRuntimeControlAuthority, s as verifyCmmdClaudeUsageTicket, t as bootstrapRuntimeControlAuthority, u as runtimeGrantToken } from "./runtimeControlAuthority-D_zKr_eI.mjs";
 import { n as PtySpawnError, t as PtyAdapter } from "./PTY-rIPf52QR.mjs";
 import { createRequire } from "node:module";
 import * as HE from "node:child_process";
@@ -15750,7 +15750,7 @@ const get$1 = (self) => modify$1(self, (current) => [current, current]);
 * })
 * ```
 */
-const set$1 = /* @__PURE__ */ dual(2, (self, value) => update$1(self, () => value));
+const set$2 = /* @__PURE__ */ dual(2, (self, value) => update$1(self, () => value));
 //#endregion
 //#region ../../node_modules/.bun/effect@4.0.0-beta.51/node_modules/effect/dist/TxChunk.js
 /**
@@ -15939,7 +15939,7 @@ const get = (self) => get$1(self.ref);
 * @since 4.0.0
 * @category combinators
 */
-const set = /* @__PURE__ */ dual(2, (self, chunk) => set$1(self.ref, chunk));
+const set$1 = /* @__PURE__ */ dual(2, (self, chunk) => set$2(self.ref, chunk));
 /**
 * Appends an element to the end of the `TxChunk`.
 *
@@ -16187,7 +16187,7 @@ const take = (self) => gen(function* () {
 	const head$3 = head(yield* get(self.items));
 	if (isNone(head$3)) return yield* txRetry;
 	yield* drop(self.items, 1);
-	if (state._tag === "Closing" && (yield* isEmpty(self))) yield* set$1(self.stateRef, {
+	if (state._tag === "Closing" && (yield* isEmpty(self))) yield* set$2(self.stateRef, {
 		_tag: "Done",
 		cause: state.cause
 	});
@@ -16285,11 +16285,11 @@ const interrupt = (self) => withFiber$1((fiber) => failCause(self, interrupt$2(f
 */
 const failCause = /* @__PURE__ */ dual(2, (self, cause) => gen(function* () {
 	if ((yield* get$1(self.stateRef))._tag !== "Open") return false;
-	if (yield* isEmpty(self)) yield* set$1(self.stateRef, {
+	if (yield* isEmpty(self)) yield* set$2(self.stateRef, {
 		_tag: "Done",
 		cause
 	});
-	else yield* set$1(self.stateRef, {
+	else yield* set$2(self.stateRef, {
 		_tag: "Closing",
 		cause
 	});
@@ -16331,7 +16331,7 @@ const clear = (self) => gen(function* () {
 		return yield* failCause$1(state.cause);
 	}
 	const chunk = yield* get(self.items);
-	yield* set(self.items, empty$2());
+	yield* set$1(self.items, empty$2());
 	return toArray(chunk);
 }).pipe(tx$1);
 /**
@@ -16520,7 +16520,7 @@ function makeNetServiceShape(createServer = Net.createServer) {
 }
 //#endregion
 //#region ../../packages/shared/src/releaseInfo.generated.ts
-const FORGE_RELEASE_VERSION = "0.11.0";
+const FORGE_RELEASE_VERSION = "0.12.0";
 //#endregion
 //#region ../../packages/shared/src/hostProcess.ts
 /**
@@ -19116,6 +19116,7 @@ const ORCHESTRATION_WS_METHODS = {
 	streamTurnDiff: "orchestration.streamTurnDiff",
 	streamFullThreadDiff: "orchestration.streamFullThreadDiff",
 	replayEvents: "orchestration.replayEvents",
+	getArchivedShellSnapshot: "orchestration.getArchivedShellSnapshot",
 	subscribeShell: "orchestration.subscribeShell",
 	subscribeThread: "orchestration.subscribeThread"
 };
@@ -20551,6 +20552,10 @@ const OrchestrationRpcSchemas = {
 	subscribeShell: {
 		input: Struct({}),
 		output: OrchestrationShellStreamItem
+	},
+	getArchivedShellSnapshot: {
+		input: Struct({}),
+		output: OrchestrationShellSnapshot
 	}
 };
 var OrchestrationGetSnapshotError = class extends TaggedErrorClass()("OrchestrationGetSnapshotError", {
@@ -26292,6 +26297,11 @@ const WsOrchestrationReplayEventsRpc = make$30(ORCHESTRATION_WS_METHODS.replayEv
 	success: OrchestrationRpcSchemas.replayEvents.output,
 	error: OrchestrationReplayEventsError
 });
+const WsOrchestrationGetArchivedShellSnapshotRpc = make$30(ORCHESTRATION_WS_METHODS.getArchivedShellSnapshot, {
+	payload: OrchestrationRpcSchemas.getArchivedShellSnapshot.input,
+	success: OrchestrationRpcSchemas.getArchivedShellSnapshot.output,
+	error: OrchestrationGetSnapshotError
+});
 const WsOrchestrationSubscribeShellRpc = make$30(ORCHESTRATION_WS_METHODS.subscribeShell, {
 	payload: OrchestrationRpcSchemas.subscribeShell.input,
 	success: OrchestrationRpcSchemas.subscribeShell.output,
@@ -26372,7 +26382,7 @@ const WsRpcGroup = make$29(WsServerGetConfigRpc, WsServerRefreshProvidersRpc, Ws
 	payload: UsageSummaryInput,
 	success: UsageSummary,
 	error: UsageReadError
-}), WsPullRequestsListRpc, WsPullRequestsListStatsRpc, WsPullRequestsDetailRpc, WsPullRequestsActivityRpc, WsPullRequestsThreadCommentsRpc, WsPullRequestsDiffFileContentsRpc, WsPullRequestsRunActionRpc, WsPullRequestsUpdateRpc, WsPullRequestsCommentRpc, WsPullRequestsUpdateCommentRpc, WsPullRequestsSubmitReviewRpc, WsPullRequestsReplyToThreadRpc, WsPullRequestsSetThreadResolutionRpc, WsPullRequestsSetReactionRpc, WsPullRequestsInvalidateRpc, WsPullRequestsReviewerCandidatesRpc, WsPullRequestsRequestReviewersRpc, WsProjectsSearchEntriesRpc, WsProjectsWriteFileRpc, WsProjectCheckoutDeletionPreviewRpc, WsProjectCheckoutDeletionExecuteRpc, WsCodeGraphSummaryRpc, WsCodeGraphNeighborhoodRpc, WsCodeGraphSearchRpc, WsWorkspaceReadFileRpc, WsWorkspaceBeginWriteFileRpc, WsWorkspaceWriteFileChunkRpc, WsWorkspaceCommitWriteFileRpc, WsWorkspaceCancelWriteFileRpc, WsShellOpenInEditorRpc, WsSubscribeGitStatusRpc, WsGitPullRpc, WsGitRefreshStatusRpc, WsGitRunStackedActionRpc, WsGitResolvePullRequestRpc, WsGitPreparePullRequestThreadRpc, WsGitListBranchesRpc, WsVcsListRefsRpc, WsVcsRefreshStatusRpc, WsSubscribeVcsStatusRpc, WsVcsPullRpc, WsVcsCreateWorktreeRpc, WsVcsRemoveWorktreeRpc, WsVcsCreateRefRpc, WsVcsSwitchRefRpc, WsVcsInitRpc, WsGitCreateWorktreeRpc, WsGitRemoveWorktreeRpc, WsGitCreateBranchRpc, WsGitCheckoutRpc, WsGitInitRpc, WsFilesystemBrowseRpc, WsProjectsReadFileRpc, WsReviewGetDiffPreviewRpc, WsCloudListRuntimesRpc, WsTerminalOpenRpc, WsTerminalAttachRpc, WsTerminalWriteRpc, WsTerminalResizeRpc, WsTerminalSignalRpc, WsTerminalClearRpc, WsTerminalRestartRpc, WsTerminalCloseRpc, WsBrowserOpenSessionRpc, WsBrowserListSessionsRpc, WsBrowserCloseSessionRpc, WsBrowserGetSessionRpc, WsBrowserCommandRpc, WsBrowserClearBrowsingDataRpc, WsBrowserAttachDisplayRpc, WsBrowserAddDisplayIceCandidateRpc, WsComputerInputRpc, WsDevTunnelRegisterRpc, WsDevTunnelUnregisterRpc, WsDevTunnelListRpc, WsThreadDevRuntimeGetRpc, WsThreadDevRuntimeAllocatePortRpc, WsThreadDevRuntimeReleaseRpc, WsWorkspaceEnvironmentPreflightRpc, WsWorkspaceEnsureScratchRpc, WsSubscribeTerminalEventsRpc, WsSubscribeTerminalMetadataRpc, WsProjectsListEntriesRpc, WsServerDiscoverSourceControlRpc, WsServerReportClientActivityRpc, WsSubscribeBrowserEventsRpc, WsSubscribeServerConfigRpc, WsSubscribeServerLifecycleRpc, WsSubscribeAuthAccessRpc, WsSubscribeWorkspaceReadinessRpc, WsOrchestrationDispatchCommandRpc, WsOrchestrationGetTurnDiffRpc, WsOrchestrationGetFullThreadDiffRpc, WsOrchestrationStreamTurnDiffRpc, WsOrchestrationStreamFullThreadDiffRpc, WsOrchestrationReplayEventsRpc, WsOrchestrationSubscribeShellRpc, WsOrchestrationSubscribeThreadRpc);
+}), WsPullRequestsListRpc, WsPullRequestsListStatsRpc, WsPullRequestsDetailRpc, WsPullRequestsActivityRpc, WsPullRequestsThreadCommentsRpc, WsPullRequestsDiffFileContentsRpc, WsPullRequestsRunActionRpc, WsPullRequestsUpdateRpc, WsPullRequestsCommentRpc, WsPullRequestsUpdateCommentRpc, WsPullRequestsSubmitReviewRpc, WsPullRequestsReplyToThreadRpc, WsPullRequestsSetThreadResolutionRpc, WsPullRequestsSetReactionRpc, WsPullRequestsInvalidateRpc, WsPullRequestsReviewerCandidatesRpc, WsPullRequestsRequestReviewersRpc, WsProjectsSearchEntriesRpc, WsProjectsWriteFileRpc, WsProjectCheckoutDeletionPreviewRpc, WsProjectCheckoutDeletionExecuteRpc, WsCodeGraphSummaryRpc, WsCodeGraphNeighborhoodRpc, WsCodeGraphSearchRpc, WsWorkspaceReadFileRpc, WsWorkspaceBeginWriteFileRpc, WsWorkspaceWriteFileChunkRpc, WsWorkspaceCommitWriteFileRpc, WsWorkspaceCancelWriteFileRpc, WsShellOpenInEditorRpc, WsSubscribeGitStatusRpc, WsGitPullRpc, WsGitRefreshStatusRpc, WsGitRunStackedActionRpc, WsGitResolvePullRequestRpc, WsGitPreparePullRequestThreadRpc, WsGitListBranchesRpc, WsVcsListRefsRpc, WsVcsRefreshStatusRpc, WsSubscribeVcsStatusRpc, WsVcsPullRpc, WsVcsCreateWorktreeRpc, WsVcsRemoveWorktreeRpc, WsVcsCreateRefRpc, WsVcsSwitchRefRpc, WsVcsInitRpc, WsGitCreateWorktreeRpc, WsGitRemoveWorktreeRpc, WsGitCreateBranchRpc, WsGitCheckoutRpc, WsGitInitRpc, WsFilesystemBrowseRpc, WsProjectsReadFileRpc, WsReviewGetDiffPreviewRpc, WsCloudListRuntimesRpc, WsTerminalOpenRpc, WsTerminalAttachRpc, WsTerminalWriteRpc, WsTerminalResizeRpc, WsTerminalSignalRpc, WsTerminalClearRpc, WsTerminalRestartRpc, WsTerminalCloseRpc, WsBrowserOpenSessionRpc, WsBrowserListSessionsRpc, WsBrowserCloseSessionRpc, WsBrowserGetSessionRpc, WsBrowserCommandRpc, WsBrowserClearBrowsingDataRpc, WsBrowserAttachDisplayRpc, WsBrowserAddDisplayIceCandidateRpc, WsComputerInputRpc, WsDevTunnelRegisterRpc, WsDevTunnelUnregisterRpc, WsDevTunnelListRpc, WsThreadDevRuntimeGetRpc, WsThreadDevRuntimeAllocatePortRpc, WsThreadDevRuntimeReleaseRpc, WsWorkspaceEnvironmentPreflightRpc, WsWorkspaceEnsureScratchRpc, WsSubscribeTerminalEventsRpc, WsSubscribeTerminalMetadataRpc, WsProjectsListEntriesRpc, WsServerDiscoverSourceControlRpc, WsServerReportClientActivityRpc, WsSubscribeBrowserEventsRpc, WsSubscribeServerConfigRpc, WsSubscribeServerLifecycleRpc, WsSubscribeAuthAccessRpc, WsSubscribeWorkspaceReadinessRpc, WsOrchestrationDispatchCommandRpc, WsOrchestrationGetTurnDiffRpc, WsOrchestrationGetFullThreadDiffRpc, WsOrchestrationStreamTurnDiffRpc, WsOrchestrationStreamFullThreadDiffRpc, WsOrchestrationReplayEventsRpc, WsOrchestrationGetArchivedShellSnapshotRpc, WsOrchestrationSubscribeShellRpc, WsOrchestrationSubscribeThreadRpc);
 const RelayWsRpcGroup = WsRpcGroup.middleware(RelayAuthorizationMiddleware).middleware(RelayDeliveryMiddleware);
 /**
 * The direct-WebSocket mount of the same group, with per-method scope
@@ -26406,6 +26416,29 @@ function encodeCmmdRuntimeThreadLifecycleMetadata(lifecycle) {
 	} };
 }
 //#endregion
+//#region ../../packages/contracts/src/cmmdRuntimeThreadWorkspace.ts
+function encodeCmmdRuntimeThreadWorkspaceMetadata(workspace) {
+	return { forgeWorkspace: {
+		schemaVersion: 1,
+		worktreePath: workspace.worktreePath
+	} };
+}
+//#endregion
+//#region ../../packages/contracts/src/cmmdRuntimeToolActivity.ts
+function isRecord$22(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function encodeCmmdRuntimeToolActivityPayload(kind, payload) {
+	return {
+		...isRecord$22(payload) ? payload : { sourcePayload: payload },
+		forgeToolActivity: {
+			schemaVersion: 1,
+			source: "native",
+			kind
+		}
+	};
+}
+//#endregion
 //#region ../../packages/contracts/src/cmmdProjectPatch.ts
 const CMMD_PROJECT_PATCH_FIELDS = {
 	title: "requiredText",
@@ -31467,6 +31500,11 @@ const RELAY_METHOD_POLICY_BASES = [
 		requiredScope: "thread.read",
 		deliveryClass: "subscription"
 	},
+	{
+		method: ORCHESTRATION_WS_METHODS.getArchivedShellSnapshot,
+		requiredScope: "thread.read",
+		deliveryClass: "read"
+	},
 	{
 		method: ORCHESTRATION_WS_METHODS.subscribeShell,
 		requiredScope: "thread.read",
@@ -65495,7 +65533,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.11.0";
+var version$1 = "0.12.0";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -69266,6 +69304,17 @@ const browserApiCorsLayer = middleware(cors({
 	credentials: true,
 	maxAge: 600
 }), { global: true });
+/**
+* An /api path that reaches the static catch-all is not implemented by this
+* server: every real API route is registered ahead of it. Serving the web app's
+* index.html for those made API clients decode an HTML document as JSON, which
+* is how the phone's shell snapshot fetch failed with a JSON parse error on
+* every connect (FOR-36611). Callers can act on a 404; they cannot act on a
+* document that claims to be their payload.
+*/
+function isApiRequestPath(pathname) {
+	return pathname === "/api" || pathname.startsWith("/api/");
+}
 function resolveDevRedirectUrl(devUrl, requestUrl) {
 	const redirectUrl = new URL(devUrl.toString());
 	redirectUrl.pathname = requestUrl.pathname;
@@ -69387,6 +69436,10 @@ const projectFaviconRouteLayer = add$1("GET", "/api/project-favicon", gen(functi
 const staticAndDevRouteLayer = add$1("GET", "*", gen(function* () {
 	const url = toURL(yield* HttpServerRequest);
 	if (isNone(url)) return text$2("Bad Request", { status: 400 });
+	if (isApiRequestPath(url.value.pathname)) return jsonUnsafe({
+		error: "not_found",
+		message: `This server does not serve ${url.value.pathname}.`
+	}, { status: 404 });
 	const config = yield* ServerConfig;
 	if (config.devUrl && isLoopbackHostname(url.value.hostname)) return redirect(resolveDevRedirectUrl(config.devUrl, url.value), { status: 302 });
 	const staticDir = config.staticDir ?? (config.devUrl ? yield* resolveStaticDir() : void 0);
@@ -82637,7 +82690,7 @@ var ServerSettingsService = class ServerSettingsService extends Service$1()("for
 			start: void_$1,
 			ready: void_$1,
 			getSettings: get$6(currentSettingsRef),
-			updateSettings: (patch) => get$6(currentSettingsRef).pipe(map$3((currentSettings) => deepMerge$1(currentSettings, patch)), tap((nextSettings) => set$2(currentSettingsRef, nextSettings))),
+			updateSettings: (patch) => get$6(currentSettingsRef).pipe(map$3((currentSettings) => deepMerge$1(currentSettings, patch)), tap((nextSettings) => set$3(currentSettingsRef, nextSettings))),
 			streamChanges: empty$5
 		};
 	}));
@@ -82777,7 +82830,7 @@ const ServerSettingsLive = effect(ServerSettingsService, gen(function* () {
 				cause
 			})));
 			yield* writeSettingsAtomically(next);
-			yield* set$3(settingsCache, cacheKey, next);
+			yield* set$4(settingsCache, cacheKey, next);
 			yield* emitChange(next);
 			return resolveTextGenerationProvider(next);
 		})),
@@ -91707,7 +91760,7 @@ const KeybindingsLive = effect(Keybindings, gen(function* () {
 	return {
 		start: gen(function* () {
 			if (yield* get$6(startedRef)) return yield* _await(startedDeferred);
-			yield* set$2(startedRef, true);
+			yield* set$3(startedRef, true);
 			const startupExit = yield* exit(gen(function* () {
 				yield* startWatcher;
 				yield* syncDefaultKeybindingsOnStartup;
@@ -91736,7 +91789,7 @@ const KeybindingsLive = effect(Keybindings, gen(function* () {
 			});
 			yield* writeConfigAtomically(cappedConfig);
 			const nextResolved = mergeWithDefaultKeybindings(compileResolvedKeybindingsConfig(cappedConfig));
-			yield* set$3(resolvedConfigCache, resolvedConfigCacheKey, {
+			yield* set$4(resolvedConfigCache, resolvedConfigCacheKey, {
 				keybindings: nextResolved,
 				issues: []
 			});
@@ -91750,7 +91803,7 @@ const KeybindingsLive = effect(Keybindings, gen(function* () {
 			const nextConfig = (yield* loadWritableCustomKeybindingsConfig()).filter((entry) => entry.command !== command);
 			yield* writeConfigAtomically(nextConfig);
 			const nextResolved = mergeWithDefaultKeybindings(compileResolvedKeybindingsConfig(nextConfig));
-			yield* set$3(resolvedConfigCache, resolvedConfigCacheKey, {
+			yield* set$4(resolvedConfigCache, resolvedConfigCacheKey, {
 				keybindings: nextResolved,
 				issues: []
 			});
@@ -92685,6 +92738,15 @@ async function resolveForgeGitCommit(execImpl = (command, args) => execFileAsync
 	}
 	return cached$1;
 }
+//#endregion
+//#region src/environment/serverVersion.ts
+const installedForgeServerVersion = version$1;
+const SEMVER_NUMERIC_IDENTIFIER = "(?:0|[1-9][0-9]*)";
+const SEMVER_PRERELEASE_IDENTIFIER = "(?:0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)";
+const EXACT_FORGE_SERVER_VERSION_PATTERN = new RegExp(`^${SEMVER_NUMERIC_IDENTIFIER}[.]${SEMVER_NUMERIC_IDENTIFIER}[.]${SEMVER_NUMERIC_IDENTIFIER}(?:-${SEMVER_PRERELEASE_IDENTIFIER}(?:[.]${SEMVER_PRERELEASE_IDENTIFIER})*)?(?:[+][0-9A-Za-z-]+(?:[.][0-9A-Za-z-]+)*)?\$`);
+function isExactForgeServerVersion(value) {
+	return typeof value === "string" && EXACT_FORGE_SERVER_VERSION_PATTERN.test(value);
+}
 const decodeSessions = decodeUnknownSync(ArraySchema(Struct({
 	sessionId: AuthSessionId,
 	subject: String$1
@@ -94299,7 +94361,8 @@ const registerCloudRuntimeForReplicaHydration = gen(function* () {
 			credentialEpoch,
 			activeTurnCount: 0,
 			activeSessionCount: 0,
-			...forgeGitCommit !== void 0 ? { forgeGitCommit } : {}
+			...forgeGitCommit !== void 0 ? { forgeGitCommit } : {},
+			forgeServerVersion: installedForgeServerVersion
 		}),
 		catch: (cause) => replicaHydrationFailure("runtime registration heartbeat failed", cause)
 	})) === null) return yield* replicaHydrationFailure("runtime control authority is unavailable");
@@ -95620,10 +95683,13 @@ function serializeRuntimeInventory(snapshot, providerInventory) {
 			workerRole: thread.workerRole,
 			anchorKind: thread.anchorKind,
 			anchorCmmdId: thread.anchorCmmdId,
-			metadata: encodeCmmdRuntimeThreadLifecycleMetadata({
-				settledAt: thread.settledAt ?? null,
-				settledOverride: thread.settledOverride ?? null
-			})
+			metadata: {
+				...encodeCmmdRuntimeThreadLifecycleMetadata({
+					settledAt: thread.settledAt ?? null,
+					settledOverride: thread.settledOverride ?? null
+				}),
+				...encodeCmmdRuntimeThreadWorkspaceMetadata({ worktreePath: thread.worktreePath })
+			}
 		})),
 		metadata: {
 			source: "forge-server-projection",
@@ -95690,7 +95756,7 @@ function serializeNativeToolActivity(activity) {
 			kind: "tool_call",
 			summary,
 			status: activityStatus(activity),
-			...activity.payload === void 0 ? {} : { payload: activity.payload }
+			payload: encodeCmmdRuntimeToolActivityPayload(activity.kind, activity.payload)
 		}
 	};
 }
@@ -97852,8 +97918,8 @@ const runUsageScanWarmup = (options) => gen(function* () {
 	return yield* forever$1(gen(function* () {
 		if (yield* get$6(scanning)) yield* logInfo("usage scan warm-up skipped; the previous scan is still running");
 		else {
-			yield* set$2(scanning, true);
-			yield* forkChild(scanOnce(options, now).pipe(ensuring(set$2(scanning, false))));
+			yield* set$3(scanning, true);
+			yield* forkChild(scanOnce(options, now).pipe(ensuring(set$3(scanning, false))));
 		}
 		yield* sleep(intervalMs);
 	}));
@@ -97871,11 +97937,11 @@ const makeCommandGate = gen(function* () {
 	return {
 		awaitCommandReady: _await(commandReady),
 		signalCommandReady: gen(function* () {
-			yield* set$2(commandReadinessState, "ready");
+			yield* set$3(commandReadinessState, "ready");
 			yield* succeed$3(commandReady, void 0).pipe(orDie);
 		}),
 		failCommandReady: (error) => gen(function* () {
-			yield* set$2(commandReadinessState, error);
+			yield* set$3(commandReadinessState, error);
 			yield* fail$3(commandReady, error).pipe(orDie);
 		}),
 		enqueueCommand: (effect) => gen(function* () {
@@ -98256,413 +98322,23 @@ function browseDirectory(input) {
 	});
 }
 //#endregion
-//#region src/workspace/Services/WorkspaceEntries.ts
+//#region src/pathWithinRoot.ts
 /**
-* WorkspaceEntries - Effect service contract for cached workspace entry search.
+* True when `candidate` is `root` itself or lies below it, judged on the path
+* strings alone. The path from `root` to `candidate` is taken with
+* `path.relative` and normalised to forward slashes, and the candidate is
+* outside when that path climbs out (`..` or `../...`) or is absolute, which is
+* what `relative` returns across Windows drives. A child whose name only starts
+* with two dots, such as `..cache`, is inside. Symlinks are not followed, so a
+* caller that cares where a link points has to compare resolved paths.
 *
-* Owns indexed workspace entry search plus cache invalidation for workspace
-* roots when the underlying filesystem changes.
-*
-* @module WorkspaceEntries
-*/
-var WorkspaceEntriesError = class extends TaggedErrorClass()("WorkspaceEntriesError", {
-	cwd: String$1,
-	operation: String$1,
-	detail: String$1,
-	cause: optional$4(Defect)
-}) {};
-/**
-* WorkspaceEntries - Service tag for cached workspace entry search.
-*/
-var WorkspaceEntries = class extends Service$1()("forge/workspace/Services/WorkspaceEntries") {};
-//#endregion
-//#region src/workspace/Services/WorkspaceBulkTransfer.ts
-var WorkspaceBulkTransfer = class extends Service$1()("forge/workspace/Services/WorkspaceBulkTransfer") {};
-//#endregion
-//#region src/workspace/Layers/WorkspaceBulkTransfer.ts
-const TRANSFER_TTL_MS = 1440 * 60 * 1e3;
-const TRANSFER_LOCK_STRIPE_COUNT = 64;
-function transferError(input) {
-	return new BulkTransferError({
-		code: input.code,
-		message: input.message,
-		transferId: input.transferId ?? null,
-		retryable: input.retryable ?? false,
-		...input.cause === void 0 ? {} : { cause: input.cause }
-	});
-}
-function mapFailure(operation, transferId) {
-	return (cause) => is$1(BulkTransferError)(cause) ? cause : transferError({
-		code: "io_error",
-		message: `Workspace bulk transfer failed during ${operation}.`,
-		...transferId === void 0 ? {} : { transferId },
-		retryable: true,
-		cause
-	});
-}
-/**
-* Exported so the unary file read in `projectFile/readProjectFile.ts` uses this
-* containment check rather than a second copy of it. Two copies of a security
-* rule in one repo is how they drift, and the drift is silent.
+* Only a type import, so a module that has to stay free of Effect services can
+* use it without importing a Layer.
 */
 function isPathWithinRoot(path, root, candidate) {
 	const relative = path.relative(root, candidate).replaceAll("\\", "/");
 	return relative === "" || !relative.startsWith("../") && relative !== ".." && !path.isAbsolute(relative);
 }
-function transferLockStripe(transferId) {
-	let hash = 2166136261;
-	for (let index = 0; index < transferId.length; index += 1) hash = Math.imul(hash ^ transferId.charCodeAt(index), 16777619);
-	return (hash >>> 0) % TRANSFER_LOCK_STRIPE_COUNT;
-}
-const makeWorkspaceBulkTransfer = (options = {}) => gen(function* () {
-	const fileSystem = yield* FileSystem;
-	const path = yield* Path$2;
-	const sql = yield* SqlClient;
-	const workspacePaths = yield* WorkspacePaths;
-	const workspaceEntries = yield* WorkspaceEntries;
-	const fault = options.fault ?? (() => void_$1);
-	const transferLocks = yield* forEach(Array.from({ length: TRANSFER_LOCK_STRIPE_COUNT }), () => make$43(1));
-	const withTransferLock = (transferId, effect) => transferLocks[transferLockStripe(transferId)].withPermit(effect);
-	const findTransfer = (transferId) => sql`
-        SELECT transfer_id AS "transferId", workspace_root AS "workspaceRoot",
-          relative_path AS "relativePath", target_path AS "targetPath", temp_path AS "tempPath",
-          total_bytes AS "totalBytes", whole_sha256 AS "wholeSha256",
-          next_offset AS "nextOffset", state, expires_at AS "expiresAt"
-        FROM workspace_bulk_transfers WHERE transfer_id = ${transferId} LIMIT 1
-      `.pipe(map$3((rows) => rows[0] ?? null));
-	const requireTransfer = (transferId) => findTransfer(transferId).pipe(flatMap((row) => row === null ? fail(transferError({
-		code: "transfer_not_found",
-		message: "Bulk transfer does not exist.",
-		transferId
-	})) : succeed(row)));
-	const requireOpenTransfer = (transferId) => requireTransfer(transferId).pipe(flatMap((row) => {
-		if (row.state === "cancelled") return fail(transferError({
-			code: "transfer_cancelled",
-			message: "Bulk transfer was cancelled.",
-			transferId
-		}));
-		if (row.state === "expired" || Date.parse(row.expiresAt) <= Date.now()) return fail(transferError({
-			code: "transfer_expired",
-			message: "Bulk transfer expired.",
-			transferId
-		}));
-		return succeed(row);
-	}));
-	const resolveTarget = fn$1("WorkspaceBulkTransfer.resolveTarget")(function* (input) {
-		const workspaceRoot = yield* workspacePaths.normalizeWorkspaceRoot(input.cwd);
-		const resolved = yield* workspacePaths.resolveRelativePathWithinRoot({
-			workspaceRoot,
-			relativePath: input.relativePath
-		});
-		const canonicalRoot = yield* fileSystem.realPath(workspaceRoot);
-		const parentSegments = resolved.relativePath.split("/").slice(0, -1);
-		let canonicalParent = canonicalRoot;
-		for (const segment of parentSegments) {
-			const candidate = path.join(canonicalParent, segment);
-			const canonicalCandidate = yield* fileSystem.realPath(candidate).pipe(catch_(() => input.createParent ? fileSystem.makeDirectory(candidate).pipe(flatMap(() => fileSystem.realPath(candidate))) : fileSystem.realPath(candidate)));
-			if (!isPathWithinRoot(path, canonicalRoot, canonicalCandidate)) return yield* transferError({
-				code: "symlink_escape",
-				message: "Workspace file path resolves outside the project root."
-			});
-			canonicalParent = canonicalCandidate;
-		}
-		const targetPath = path.join(canonicalParent, path.basename(resolved.relativePath));
-		const targetRealPath = yield* fileSystem.realPath(targetPath).pipe(catch_(() => succeed(null)));
-		if (targetRealPath !== null && !isPathWithinRoot(path, canonicalRoot, targetRealPath)) return yield* transferError({
-			code: "symlink_escape",
-			message: "Workspace file target resolves outside the project root."
-		});
-		return {
-			workspaceRoot: canonicalRoot,
-			relativePath: resolved.relativePath,
-			targetPath,
-			canonicalParent
-		};
-	});
-	const readFile = (input) => unwrap$1(gen(function* () {
-		const target = yield* resolveTarget({
-			...input,
-			createParent: false
-		});
-		const info = yield* fileSystem.stat(target.targetPath);
-		const maxBytes = input.maxBytes ?? 16777216;
-		if (Number(info.size) > maxBytes) return yield* transferError({
-			code: "size_limit_exceeded",
-			message: `Workspace file exceeds the ${maxBytes}-byte read limit.`
-		});
-		const bytes = yield* fileSystem.readFile(target.targetPath);
-		const transfer = yield* promise(() => chunkBulkTransfer(bytes));
-		const transferId = transfer.chunks[0]?.transferId ?? crypto.randomUUID().replaceAll("-", "_");
-		return fromIterable$1([
-			{
-				kind: "started",
-				transferId,
-				totalBytes: transfer.totalBytes,
-				sha256: transfer.sha256
-			},
-			...transfer.chunks.map((chunk) => ({
-				...chunk,
-				transferId
-			})),
-			{
-				kind: "completed",
-				transferId,
-				totalBytes: transfer.totalBytes,
-				sha256: transfer.sha256
-			}
-		]);
-	}).pipe(mapError(mapFailure("read file"))));
-	const resumeWrite = fn$1("WorkspaceBulkTransfer.resumeWrite")(function* (input, existing) {
-		const target = yield* resolveTarget({
-			...input,
-			createParent: true
-		});
-		if (!(existing.workspaceRoot === target.workspaceRoot && existing.relativePath === target.relativePath && existing.totalBytes === input.totalBytes && existing.wholeSha256 === input.sha256)) return yield* transferError({
-			code: "transfer_identity_conflict",
-			message: "Bulk transfer ID is already bound to different content or a different path.",
-			transferId: input.transferId
-		});
-		if (existing.state === "cancelled") return yield* transferError({
-			code: "transfer_cancelled",
-			message: "Bulk transfer was cancelled.",
-			transferId: input.transferId
-		});
-		if (existing.state === "expired" || Date.parse(existing.expiresAt) <= Date.now()) return yield* transferError({
-			code: "transfer_expired",
-			message: "Bulk transfer expired.",
-			transferId: input.transferId
-		});
-		return {
-			transferId: input.transferId,
-			nextOffset: existing.nextOffset,
-			state: existing.state === "completed" ? "completed" : "open"
-		};
-	});
-	const createWrite = fn$1("WorkspaceBulkTransfer.createWrite")(function* (input) {
-		const target = yield* resolveTarget({
-			...input,
-			createParent: true
-		}).pipe(mapError((cause) => is$1(WorkspacePathOutsideRootError)(cause) ? transferError({
-			code: "path_outside_workspace",
-			message: "Workspace file path must stay within the project root.",
-			transferId: input.transferId,
-			cause
-		}) : cause));
-		const tempPath = path.join(target.canonicalParent, `.forge-transfer-${input.transferId}.part`);
-		yield* scoped(fileSystem.open(tempPath, {
-			flag: "wx",
-			mode: 384
-		}).pipe(flatMap((file) => file.sync), catch_(() => fileSystem.stat(tempPath).pipe(flatMap((stat) => Number(stat.size) === 0 ? void_$1 : fail(transferError({
-			code: "transfer_identity_conflict",
-			message: "Bulk transfer temporary path already contains data.",
-			transferId: input.transferId
-		})))))));
-		const now = /* @__PURE__ */ new Date();
-		yield* sql`
-        INSERT INTO workspace_bulk_transfers (
-          transfer_id, workspace_root, relative_path, target_path, temp_path, total_bytes,
-          whole_sha256, next_offset, state, expires_at, created_at, updated_at
-        ) VALUES (
-          ${input.transferId}, ${target.workspaceRoot}, ${target.relativePath}, ${target.targetPath},
-          ${tempPath}, ${input.totalBytes}, ${input.sha256}, 0, 'open',
-          ${new Date(now.getTime() + TRANSFER_TTL_MS).toISOString()}, ${now.toISOString()},
-          ${now.toISOString()}
-        )
-      `;
-		return {
-			transferId: input.transferId,
-			nextOffset: 0,
-			state: "open"
-		};
-	});
-	const beginWriteEffect = fn$1("WorkspaceBulkTransfer.beginWrite")(function* (input) {
-		const existing = yield* findTransfer(input.transferId);
-		return yield* existing === null ? createWrite(input) : resumeWrite(input, existing);
-	});
-	const beginWrite = (input) => withTransferLock(input.transferId, beginWriteEffect(input)).pipe(mapError(mapFailure("begin write", input.transferId)));
-	const acceptRetriedChunk = fn$1("WorkspaceBulkTransfer.acceptRetriedChunk")(function* (input, row) {
-		const accepted = (yield* sql`
-          SELECT chunk_offset AS "chunkOffset", chunk_bytes AS "chunkBytes",
-            chunk_sha256 AS "chunkSha256"
-          FROM workspace_bulk_transfer_chunks
-          WHERE transfer_id = ${input.transferId} AND chunk_offset = ${input.offset}
-          LIMIT 1
-        `)[0];
-		if (!(accepted !== void 0 && accepted.chunkBytes === input.bytes && accepted.chunkSha256 === input.sha256)) return yield* transferError({
-			code: "integrity_mismatch",
-			message: "Retried bulk transfer chunk differs from the accepted chunk.",
-			transferId: input.transferId
-		});
-		return {
-			transferId: input.transferId,
-			nextOffset: row.nextOffset,
-			duplicate: true
-		};
-	});
-	const validateChunkRange = fn$1("WorkspaceBulkTransfer.validateChunkRange")(function* (input, row, byteLength) {
-		if (input.offset !== row.nextOffset) return yield* transferError({
-			code: "offset_mismatch",
-			message: `Expected chunk offset ${row.nextOffset}, received ${input.offset}.`,
-			transferId: input.transferId,
-			retryable: true
-		});
-		const nextOffset = input.offset + byteLength;
-		if (nextOffset > row.totalBytes) return yield* transferError({
-			code: "size_limit_exceeded",
-			message: "Bulk transfer chunk exceeds the declared total byte count.",
-			transferId: input.transferId
-		});
-		return nextOffset;
-	});
-	const reconcileChunkBytes = fn$1("WorkspaceBulkTransfer.reconcileChunkBytes")(function* (input, row, bytes, nextOffset) {
-		const tempInfo = yield* fileSystem.stat(row.tempPath);
-		if (Number(tempInfo.size) > row.nextOffset) {
-			if (Number(tempInfo.size) !== nextOffset) return yield* transferError({
-				code: "integrity_mismatch",
-				message: "Bulk transfer temporary file cannot be reconciled with the next chunk.",
-				transferId: input.transferId
-			});
-			const recovered = (yield* fileSystem.readFile(row.tempPath)).slice(input.offset, nextOffset);
-			if ((yield* promise(() => sha256Hex(recovered))) !== input.sha256) return yield* transferError({
-				code: "integrity_mismatch",
-				message: "Bulk transfer temporary bytes differ from the retried chunk.",
-				transferId: input.transferId
-			});
-			return;
-		}
-		yield* fault("before-byte-write");
-		yield* scoped(fileSystem.open(row.tempPath, { flag: "r+" }).pipe(flatMap((file) => file.seek(input.offset, "start").pipe(flatMap(() => file.writeAll(bytes)), flatMap(() => file.sync)))));
-		yield* fault("after-byte-write-before-metadata");
-	});
-	const persistAcceptedChunk = fn$1("WorkspaceBulkTransfer.persistAcceptedChunk")(function* (input, nextOffset) {
-		const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-		yield* sql.withTransaction(sql`
-          INSERT INTO workspace_bulk_transfer_chunks (
-            transfer_id, chunk_offset, chunk_bytes, chunk_sha256
-          ) VALUES (${input.transferId}, ${input.offset}, ${input.bytes}, ${input.sha256})
-          ON CONFLICT DO NOTHING
-        `.pipe(flatMap(() => sql`
-            UPDATE workspace_bulk_transfers
-            SET next_offset = ${nextOffset}, updated_at = ${updatedAt}
-            WHERE transfer_id = ${input.transferId} AND next_offset = ${input.offset} AND state = 'open'
-          `)));
-		yield* fault("after-metadata-advance");
-	});
-	const writeChunkEffect = fn$1("WorkspaceBulkTransfer.writeChunk")(function* (input) {
-		const bytes = yield* promise(() => verifyBulkTransferChunk({
-			...input,
-			kind: "chunk"
-		}));
-		const row = yield* requireOpenTransfer(input.transferId);
-		if (row.state === "completed") return yield* transferError({
-			code: "offset_mismatch",
-			message: "Bulk transfer is already complete.",
-			transferId: input.transferId
-		});
-		if (input.offset < row.nextOffset) return yield* acceptRetriedChunk(input, row);
-		const nextOffset = yield* validateChunkRange(input, row, bytes.byteLength);
-		yield* reconcileChunkBytes(input, row, bytes, nextOffset);
-		yield* persistAcceptedChunk(input, nextOffset);
-		return {
-			transferId: input.transferId,
-			nextOffset,
-			duplicate: false
-		};
-	});
-	const writeChunk = (input) => withTransferLock(input.transferId, writeChunkEffect(input)).pipe(mapError(mapFailure("write chunk", input.transferId)));
-	const commitWriteEffect = fn$1("WorkspaceBulkTransfer.commitWrite")(function* (input) {
-		const row = yield* requireOpenTransfer(input.transferId);
-		if (row.state === "completed") return {
-			transferId: row.transferId,
-			relativePath: row.relativePath,
-			totalBytes: row.totalBytes,
-			sha256: row.wholeSha256
-		};
-		if (row.nextOffset !== row.totalBytes) return yield* transferError({
-			code: "offset_mismatch",
-			message: `Bulk transfer is incomplete at byte ${row.nextOffset} of ${row.totalBytes}.`,
-			transferId: row.transferId,
-			retryable: true
-		});
-		if ((yield* resolveTarget({
-			cwd: row.workspaceRoot,
-			relativePath: row.relativePath,
-			createParent: false
-		})).targetPath !== row.targetPath) return yield* transferError({
-			code: "symlink_escape",
-			message: "Workspace file destination changed during transfer.",
-			transferId: row.transferId
-		});
-		const tempInfo = yield* fileSystem.stat(row.tempPath).pipe(catch_(() => succeed(null)));
-		const candidatePath = tempInfo === null ? row.targetPath : row.tempPath;
-		const candidate = yield* fileSystem.readFile(candidatePath);
-		if (candidate.byteLength !== row.totalBytes || (yield* promise(() => sha256Hex(candidate))) !== row.wholeSha256) return yield* transferError({
-			code: "integrity_mismatch",
-			message: "Bulk transfer payload does not match its declared size and digest.",
-			transferId: row.transferId
-		});
-		if (tempInfo !== null) {
-			yield* fileSystem.rename(row.tempPath, row.targetPath);
-			yield* fault("after-atomic-rename");
-		}
-		yield* sql`
-        UPDATE workspace_bulk_transfers SET state = 'completed', updated_at = ${(/* @__PURE__ */ new Date()).toISOString()}
-        WHERE transfer_id = ${row.transferId}
-      `;
-		yield* workspaceEntries.invalidate(row.workspaceRoot);
-		return {
-			transferId: row.transferId,
-			relativePath: row.relativePath,
-			totalBytes: row.totalBytes,
-			sha256: row.wholeSha256
-		};
-	});
-	const commitWrite = (input) => withTransferLock(input.transferId, commitWriteEffect(input)).pipe(mapError(mapFailure("commit write", input.transferId)));
-	const cancelWriteEffect = fn$1("WorkspaceBulkTransfer.cancelWrite")(function* (input) {
-		const row = yield* requireTransfer(input.transferId);
-		if (row.state !== "completed") {
-			yield* fileSystem.remove(row.tempPath, { force: true });
-			yield* sql`
-          UPDATE workspace_bulk_transfers SET state = 'cancelled', updated_at = ${(/* @__PURE__ */ new Date()).toISOString()}
-          WHERE transfer_id = ${input.transferId}
-        `;
-		}
-		return {
-			transferId: input.transferId,
-			state: row.state === "completed" ? "completed" : "cancelled"
-		};
-	});
-	const cancelWrite = (input) => withTransferLock(input.transferId, cancelWriteEffect(input)).pipe(mapError(mapFailure("cancel write", input.transferId)));
-	const cleanupExpiredEffect = fn$1("WorkspaceBulkTransfer.cleanupExpired")(function* () {
-		const now = (/* @__PURE__ */ new Date()).toISOString();
-		const rows = yield* sql`
-        SELECT transfer_id AS "transferId", temp_path AS "tempPath"
-        FROM workspace_bulk_transfers WHERE state = 'open' AND expires_at <= ${now}
-      `;
-		let expiredCount = 0;
-		for (const row of rows) if (yield* withTransferLock(row.transferId, gen(function* () {
-			const current = yield* findTransfer(row.transferId);
-			if (current === null || current.state !== "open" || Date.parse(current.expiresAt) > Date.parse(now)) return false;
-			yield* fileSystem.remove(current.tempPath, { force: true });
-			yield* sql`
-              UPDATE workspace_bulk_transfers SET state = 'expired', updated_at = ${now}
-              WHERE transfer_id = ${row.transferId} AND state = 'open' AND expires_at <= ${now}
-            `;
-			return true;
-		}))) expiredCount += 1;
-		return expiredCount;
-	});
-	const cleanupExpired = () => cleanupExpiredEffect().pipe(mapError(mapFailure("expiry cleanup")));
-	return {
-		readFile,
-		beginWrite,
-		writeChunk,
-		commitWrite,
-		cancelWrite,
-		cleanupExpired
-	};
-});
-const WorkspaceBulkTransferLive = effect(WorkspaceBulkTransfer, makeWorkspaceBulkTransfer());
 //#endregion
 //#region src/projectFile/readProjectFile.ts
 /**
@@ -99464,6 +99140,26 @@ const DevTunnelLive = effect(DevTunnel, gen(function* () {
 	};
 }));
 //#endregion
+//#region src/workspace/Services/WorkspaceEntries.ts
+/**
+* WorkspaceEntries - Effect service contract for cached workspace entry search.
+*
+* Owns indexed workspace entry search plus cache invalidation for workspace
+* roots when the underlying filesystem changes.
+*
+* @module WorkspaceEntries
+*/
+var WorkspaceEntriesError = class extends TaggedErrorClass()("WorkspaceEntriesError", {
+	cwd: String$1,
+	operation: String$1,
+	detail: String$1,
+	cause: optional$4(Defect)
+}) {};
+/**
+* WorkspaceEntries - Service tag for cached workspace entry search.
+*/
+var WorkspaceEntries = class extends Service$1()("forge/workspace/Services/WorkspaceEntries") {};
+//#endregion
 //#region src/workspace/Services/WorkspaceFileSystem.ts
 /**
 * WorkspaceFileSystem - Effect service contract for workspace file mutations.
@@ -99485,6 +99181,9 @@ var WorkspaceFileSystemError = class extends TaggedErrorClass()("WorkspaceFileSy
 */
 var WorkspaceFileSystem = class extends Service$1()("forge/workspace/Services/WorkspaceFileSystem") {};
 //#endregion
+//#region src/workspace/Services/WorkspaceBulkTransfer.ts
+var WorkspaceBulkTransfer = class extends Service$1()("forge/workspace/Services/WorkspaceBulkTransfer") {};
+//#endregion
 //#region src/workspace/Services/WorkspaceReadinessState.ts
 var WorkspaceReadinessState = class extends Service$1()("forge/workspace/Services/WorkspaceReadinessState") {};
 //#endregion
@@ -104941,6 +104640,13 @@ const makeWsRpcLayer = (currentSessionId, currentUserId) => WsRpcGroup.toLayer(g
 			message: "Failed to replay orchestration events",
 			cause
 		}))), { "rpc.aggregate": "orchestration" }),
+		[ORCHESTRATION_WS_METHODS.getArchivedShellSnapshot]: (_input) => observeRpcEffect(ORCHESTRATION_WS_METHODS.getArchivedShellSnapshot, gen(function* () {
+			yield* startup.awaitCommandReady;
+			return yield* projectionSnapshotQuery.getArchivedShellSnapshot();
+		}).pipe(mapError((cause) => new OrchestrationGetSnapshotError({
+			message: "Failed to load archived orchestration shell snapshot",
+			cause
+		}))), { "rpc.aggregate": "orchestration" }),
 		[ORCHESTRATION_WS_METHODS.subscribeShell]: (_input) => observeRpcStreamEffect(ORCHESTRATION_WS_METHODS.subscribeShell, succeed(makeSnapshotThenLiveStream({
 			loadSnapshot: loadInitialShellSnapshot({
 				startup,
@@ -210937,56 +210643,169 @@ function hasConfiguredApexCredential(profiles) {
 	}));
 }
 //#endregion
-//#region src/provider/claudeCredentialContainment.ts
+//#region src/provider/claudeCredentialDirectory.ts
 /**
-* Containment for provider credentials inherited by the Claude Agent SDK child.
+* Per-account credential directories for Claude turns.
 *
-* Pure and dependency-free on purpose: ClaudeAdapter pulls in Effect platform
-* services, the browser manager, and the server config, so a unit test that
-* imports it cannot run in a worktree. This rule is cost-critical and must stay
-* directly testable.
+* Claude Code keeps conversation transcripts under
+* `${CLAUDE_CONFIG_DIR}/projects/<cwd-slug>/<sessionId>.jsonl` and its login
+* under `.credentials.json`. `CLAUDE_SECURESTORAGE_CONFIG_DIR` moves only the
+* credential file, so each Provider Account can hold its own login while every
+* session file stays in one place and `--resume` keeps finding its target. See
+* `docs/adr/claude-accounts-split-credentials-not-sessions.md`.
 *
-* Audit finding S1 (2026-07-25). The Claude Agent SDK reads ANTHROPIC_API_KEY /
-* ANTHROPIC_AUTH_TOKEN from its own environment, and those TAKE PRECEDENCE over
-* the user's claude.ai OAuth login — that precedence is exactly what the
-* adapter relies on to redirect billing at the proxy.
+* That variable is not documented. Under
+* `docs/adr/unpublished-provider-surface-needs-a-fallback.md` the dependency is
+* only allowed because absence degrades to a named behaviour that already
+* works: a thread with no account runs on the Environment's own login. This
+* module sets the variable only when the resolved directory holds a credential
+* the CLI can use, because a missing file, or one whose access token a refusal
+* has blanked, makes the CLI report logged out and a live turn would fail.
 *
-* So on a plain Claude turn (no endpoint profile, no proxy credential), which
-* is supposed to run on the personal subscription, an ANTHROPIC_* key inherited
-* from the server's environment would send the turn straight to
-* api.anthropic.com on a metered account — never reaching
-* /api/provider-egress/*, leaving the fail-closed billing gate inert.
+* Nothing writes these directories yet. #3049 adds the writer and keys each
+* directory on the account identity CMMD writes on the delivery receipt it
+* signs (`docs/adr/provider-account-identity-is-issued-by-cmmd.md`). Until then
+* every runtime takes the `no-account` skip.
 *
-* Forge Cloud sprites were only incidentally safe (no Anthropic key present on
-* the box). This makes containment an enforced property rather than an
-* assumption about what the deployment environment happens to contain.
+* Free of Effect services on purpose, for the same reason as
+* `claudeCredentialContainment.ts`: ClaudeAdapter drags in Effect platform
+* services, the browser manager and the server config, so a unit test that
+* imports it cannot run in a worktree. This rule decides which account pays for
+* a turn, so it has to stay directly testable.
 */
-/** Credentials the Claude Agent SDK will prefer over the user's OAuth login. */
-const INHERITABLE_ANTHROPIC_CREDENTIAL_KEYS = ["ANTHROPIC_API_KEY", "ANTHROPIC_AUTH_TOKEN"];
+/** Repoints `.credentials.json` without moving the transcripts. */
+const CLAUDE_SECURESTORAGE_CONFIG_DIR_ENV = "CLAUDE_SECURESTORAGE_CONFIG_DIR";
+/** The one file Claude Code writes into the credential directory. */
+const CLAUDE_CREDENTIAL_FILE_NAME = ".credentials.json";
 /**
-* Routing override the SDK would obey instead of the login's default endpoint.
-* A CMMD cloud runtime exports it to point at the workspace provider-egress
-* proxy; on a PERSONAL-Claude-in-VM runtime that must be dropped so the turn
-* spends the on-box ~/.claude subscription (card 1359 Phase 2). Stripped ONLY
-* when the runtime signals in-VM delivery — otherwise existing behavior (the
-* inherited base URL survives) is preserved exactly.
+* Runtime env var naming the Provider Account this runtime's Claude turns
+* belong to. Nothing in Forge or CMMD sets it, so no runtime names an account
+* and each keeps its one login.
+*
+* It is a bridge that will not get a writer. #3073 settled the key in
+* `docs/adr/provider-account-identity-is-issued-by-cmmd.md`: the directory name
+* comes from the identity CMMD issues and writes on the delivery receipt it
+* signs, and this variable goes away. #3049 makes that change. The credential
+* generation was ruled out as a key: it rotates on every reconnect, and CMMD
+* uses it as the primary account's id, so keying on it would strand every
+* thread pinned to that account on a directory that stops receiving deliveries.
+*
+* Tests reach the `credentialDirectory` parameter on
+* `ClaudeAdapter.buildClaudeQueryEnv` directly.
 */
-const ANTHROPIC_ENDPOINT_OVERRIDE_KEY = "ANTHROPIC_BASE_URL";
+const CLAUDE_PROVIDER_ACCOUNT_IDENTITY_ENV = "FORGE_CLAUDE_PROVIDER_ACCOUNT_IDENTITY";
+/** Directory under the server's base directory that holds one directory per account. */
+const CREDENTIAL_ROOT_DIRECTORY_NAME = "claude-credentials";
+const DEFAULT_CLAUDE_CONFIG_DIRECTORY_NAME = ".claude";
+const MAX_ACCOUNT_IDENTITY_LENGTH = 256;
+const DIRECTORY_NAME_HASH_LENGTH = 32;
 /**
-* Remove inherited Anthropic credentials so the child falls back to the user's
-* personal claude.ai login. Call this ONLY on the path where no base URL
-* resolved; when the adapter has a profile or proxy credential it sets these
-* variables deliberately, and that assignment must win.
+* Directory name for an account. A hash, so no email or display name reaches a
+* filesystem path and no path-illegal character can appear in one either.
+*/
+function claudeCredentialDirectoryName(accountIdentity) {
+	return `account-${createHash("sha256").update(accountIdentity, "utf8").digest("hex").slice(0, DIRECTORY_NAME_HASH_LENGTH)}`;
+}
+/** The account this runtime's Claude turns belong to, or null while the variable is unset. */
+function resolveClaudeProviderAccountIdentity(env) {
+	const identity = env[CLAUDE_PROVIDER_ACCOUNT_IDENTITY_ENV]?.trim();
+	if (!identity || identity.length > MAX_ACCOUNT_IDENTITY_LENGTH) return null;
+	return identity;
+}
+/**
+* Where per-account credential directories live: `claude-credentials` under the
+* server's base directory, `ServerConfig.baseDir`, which is `FORGE_HOME` or
+* `~/.forge`. A delivery writer gets the same `ServerConfig`, so reader and
+* writer cannot disagree about the root. Always outside `CLAUDE_CONFIG_DIR`, so
+* one of these can never be mistaken for the main credential store, and a stray
+* read of the config directory cannot walk into another account's login.
+*/
+function claudeCredentialDirectoryRoot(env, baseDir) {
+	if (!isAbsolute(baseDir)) return null;
+	const root = resolve(baseDir, CREDENTIAL_ROOT_DIRECTORY_NAME);
+	const configDirectory = claudeConfigDirectory(env);
+	if (configDirectory && isPathWithinRoot({
+		relative,
+		isAbsolute
+	}, configDirectory, root)) return null;
+	return root;
+}
+/** Absolute credential directory for one account, or null when either half is missing. */
+function resolveClaudeCredentialDirectory(input) {
+	if (!input.accountIdentity) return null;
+	const root = claudeCredentialDirectoryRoot(input.env, input.baseDir);
+	if (!root) return null;
+	return join(root, claudeCredentialDirectoryName(input.accountIdentity));
+}
+/**
+* Decide whether this turn may point at a per-account credential directory.
 *
-* `stripEndpointOverride` additionally drops ANTHROPIC_BASE_URL — pass it only on
-* a personal-Claude-in-VM runtime (gated), never by default, so existing turns
-* that rely on an inherited base URL are untouched.
+* The cheap checks run first and the capability probe runs last, so a runtime
+* with no usable credential never spawns the CLI. The probe's error channel is
+* empty, so nothing here catches.
+*
+* A skip is not a fallback onto the default account. With no account the turn
+* runs on the Environment's own login, unchanged. A thread pinned to an account
+* whose credential is missing is refused by name under
+* `docs/adr/provider-account-identity-is-issued-by-cmmd.md`, and #3049 turns
+* `no-usable-credential`, and `capability-not-supported` for a pinned account,
+* into those refusals. Until #3049 nothing names an account, so `no-account` is
+* the only skip a runtime sees.
+*/
+function decideClaudeCredentialDirectory(input) {
+	return gen(function* () {
+		if (!input.accountIdentity) return skip("no-account");
+		if (input.env["CLAUDE_SECURESTORAGE_CONFIG_DIR"]?.trim()) return skip("operator-override");
+		const directory = resolveClaudeCredentialDirectory(input);
+		if (!directory) return skip("no-root");
+		if (!holdsUsableCredential(directory)) return skip("no-usable-credential");
+		return (yield* input.probeSupport) === "supported" ? set(directory) : skip("capability-not-supported");
+	});
+}
+/**
+* True when `.credentials.json` parses and carries a non-empty access token.
+*
+* File presence is not readiness. A refused credential is rewritten in place
+* with `accessToken: ""`, so a file that exists can still leave the CLI logged
+* out. Only the token's length is checked. The value is never logged, returned
+* or kept.
 */
-function withoutInheritedAnthropicCredentials(env, options) {
-	const contained = { ...env };
-	for (const key of INHERITABLE_ANTHROPIC_CREDENTIAL_KEYS) delete contained[key];
-	if (options?.stripEndpointOverride) delete contained[ANTHROPIC_ENDPOINT_OVERRIDE_KEY];
-	return contained;
+function holdsUsableCredential(directory) {
+	const file = join(directory, CLAUDE_CREDENTIAL_FILE_NAME);
+	try {
+		if (!statSync(file).isFile()) return false;
+		return hasAccessToken(JSON.parse(readFileSync(file, "utf8")));
+	} catch {
+		return false;
+	}
+}
+function hasAccessToken(credential) {
+	if (typeof credential !== "object" || credential === null) return false;
+	const oauth = credential.claudeAiOauth;
+	if (typeof oauth !== "object" || oauth === null) return false;
+	const token = oauth.accessToken;
+	return typeof token === "string" && token.length > 0;
+}
+function set(directory) {
+	return {
+		outcome: "set",
+		directory
+	};
+}
+function skip(reason) {
+	return {
+		outcome: "skipped",
+		reason
+	};
+}
+function claudeConfigDirectory(env) {
+	const configured = env.CLAUDE_CONFIG_DIR?.trim();
+	if (configured) return configured;
+	try {
+		return join(homedir(), DEFAULT_CLAUDE_CONFIG_DIRECTORY_NAME);
+	} catch {
+		return null;
+	}
 }
 //#endregion
 //#region src/provider/personalClaudeInVm.ts
@@ -211056,160 +210875,76 @@ function personalClaudeGenerationHash(env = process.env) {
 	}
 }
 //#endregion
-//#region src/provider/claudeCredentialDirectory.ts
+//#region src/provider/claudeCredentialContainment.ts
 /**
-* Per-account credential directories for Claude turns.
-*
-* Claude Code keeps conversation transcripts under
-* `${CLAUDE_CONFIG_DIR}/projects/<cwd-slug>/<sessionId>.jsonl` and its login
-* under `.credentials.json`. `CLAUDE_SECURESTORAGE_CONFIG_DIR` moves only the
-* credential file, so each Provider Account can hold its own login while every
-* session file stays in one place and `--resume` keeps finding its target. See
-* `docs/adr/claude-accounts-split-credentials-not-sessions.md`.
+* Containment for provider credentials inherited by the Claude Agent SDK child.
 *
-* That variable is not documented. Under
-* `docs/adr/unpublished-provider-surface-needs-a-fallback.md` the dependency is
-* only allowed because absence degrades to a named behaviour that already
-* works: one account per Environment, exactly what runs today. This module is
-* the gate that keeps the degrade honest. It sets the variable only when a
-* readable `.credentials.json` is already sitting in the resolved directory,
-* because a missing or empty directory makes the CLI report logged out and a
-* live turn would fail. Nothing writes these directories yet, so every runtime
-* today takes the skip path.
+* Free of Effect services on purpose: ClaudeAdapter pulls in Effect platform
+* services, the browser manager, and the server config, so a unit test that
+* imports it cannot run in a worktree. This rule is cost-critical and must stay
+* directly testable.
 *
-* Pure and dependency-free on purpose, for the same reason as
-* `claudeCredentialContainment.ts`: ClaudeAdapter drags in Effect platform
-* services, the browser manager and the server config, so a unit test that
-* imports it cannot run in a worktree. This rule decides which account pays for
-* a turn, so it has to stay directly testable.
-*/
-/** Repoints `.credentials.json` without moving the transcripts. */
-const CLAUDE_SECURESTORAGE_CONFIG_DIR_ENV = "CLAUDE_SECURESTORAGE_CONFIG_DIR";
-/** The one file Claude Code writes into the credential directory. */
-const CLAUDE_CREDENTIAL_FILE_NAME = ".credentials.json";
-/**
-* Runtime env var naming the Provider Account this runtime's Claude turns
-* belong to.
+* Audit finding S1 (2026-07-25). The Claude Agent SDK reads ANTHROPIC_API_KEY /
+* ANTHROPIC_AUTH_TOKEN from its own environment, and those TAKE PRECEDENCE over
+* the user's claude.ai OAuth login — that precedence is exactly what the
+* adapter relies on to redirect billing at the proxy.
 *
-* NOTHING SETS THIS. It has no writer anywhere in Forge or CMMD, so as shipped
-* the per-account lane can never turn on and every runtime keeps today's single
-* account. The writer waits on issue 3073, which decides which identity keys
-* the directory. That has to be settled first: the credential generation
-* rotates on every re-delivery, so keying on it would give a new directory
-* each time and defeat the point.
+* So on a plain Claude turn (no endpoint profile, no proxy credential), which
+* is supposed to run on the personal subscription, an ANTHROPIC_* key inherited
+* from the server's environment would send the turn straight to
+* api.anthropic.com on a metered account — never reaching
+* /api/provider-egress/*, leaving the fail-closed billing gate inert.
 *
-* It is also not the seam. The seam is the `credentialDirectory` parameter on
-* `ClaudeAdapter.buildClaudeQueryEnv`, which is what tests and callers drive.
-* This variable is one bridge into that parameter, and the delivery step is
-* free to replace it with something better rather than adopt it.
+* Forge Cloud sprites were only incidentally safe (no Anthropic key present on
+* the box). This makes containment an enforced property rather than an
+* assumption about what the deployment environment happens to contain.
 */
-const CLAUDE_PROVIDER_ACCOUNT_IDENTITY_ENV = "FORGE_CLAUDE_PROVIDER_ACCOUNT_IDENTITY";
-/** Operator escape hatch for the directory root, mostly for local debugging. */
-const CLAUDE_CREDENTIAL_ROOT_ENV = "FORGE_CLAUDE_CREDENTIAL_ROOT";
-const CREDENTIAL_ROOT_DIRECTORY_NAME = "claude-credentials";
-const FALLBACK_ROOT_DIRECTORY_NAME = ".forge-claude-credentials";
-const DEFAULT_CLAUDE_CONFIG_DIRECTORY_NAME = ".claude";
-const MAX_ACCOUNT_IDENTITY_LENGTH = 256;
-const DIRECTORY_NAME_HASH_LENGTH = 32;
+/** Credentials the Claude Agent SDK will prefer over the user's OAuth login. */
+const INHERITABLE_ANTHROPIC_CREDENTIAL_KEYS = ["ANTHROPIC_API_KEY", "ANTHROPIC_AUTH_TOKEN"];
 /**
-* Directory name for an account. A hash, so no email or display name reaches a
-* filesystem path and no path-illegal character can appear in one either.
+* Routing override the SDK would obey instead of the login's default endpoint.
+* A CMMD cloud runtime exports it to point at the workspace provider-egress
+* proxy; on a PERSONAL-Claude-in-VM runtime that must be dropped so the turn
+* spends the on-box ~/.claude subscription (card 1359 Phase 2). Stripped ONLY
+* when the runtime signals in-VM delivery — otherwise existing behavior (the
+* inherited base URL survives) is preserved exactly.
 */
-function claudeCredentialDirectoryName(accountIdentity) {
-	return `account-${createHash("sha256").update(accountIdentity, "utf8").digest("hex").slice(0, DIRECTORY_NAME_HASH_LENGTH)}`;
-}
-/** The account this runtime's Claude turns belong to, or null on every runtime today. */
-function resolveClaudeProviderAccountIdentity(env) {
-	const identity = env[CLAUDE_PROVIDER_ACCOUNT_IDENTITY_ENV]?.trim();
-	if (!identity || identity.length > MAX_ACCOUNT_IDENTITY_LENGTH) return null;
-	return identity;
-}
+const ANTHROPIC_ENDPOINT_OVERRIDE_KEY = "ANTHROPIC_BASE_URL";
 /**
-* Where per-account credential directories live. Always outside
-* `CLAUDE_CONFIG_DIR`, so one of them can never be mistaken for the main
-* credential store, and so a stray read of the config directory cannot walk
-* into another account's login.
+* Remove inherited Anthropic credentials so the child falls back to the user's
+* personal claude.ai login. Call this ONLY on the path where no base URL
+* resolved; when the adapter has a profile or proxy credential it sets these
+* variables deliberately, and that assignment must win.
+*
+* `stripEndpointOverride` additionally drops ANTHROPIC_BASE_URL — pass it only on
+* a personal-Claude-in-VM runtime (gated), never by default, so existing turns
+* that rely on an inherited base URL are untouched.
 */
-function claudeCredentialDirectoryRoot(env) {
-	const root = credentialRootCandidate(env);
-	if (!root || !isAbsolute(root)) return null;
-	return isInside(root, claudeConfigDirectory(env)) ? null : resolve(root);
-}
-/** Absolute credential directory for one account, or null when either half is missing. */
-function resolveClaudeCredentialDirectory(input) {
-	if (!input.accountIdentity) return null;
-	const root = claudeCredentialDirectoryRoot(input.env);
-	if (!root) return null;
-	return join(root, claudeCredentialDirectoryName(input.accountIdentity));
+function withoutInheritedAnthropicCredentials(env, options) {
+	const contained = { ...env };
+	for (const key of INHERITABLE_ANTHROPIC_CREDENTIAL_KEYS) delete contained[key];
+	if (options?.stripEndpointOverride) delete contained[ANTHROPIC_ENDPOINT_OVERRIDE_KEY];
+	return contained;
 }
 /**
-* Decide whether this turn may point at a per-account credential directory.
+* The environment a Claude child gets when it runs on the personal
+* subscription. Server-only secrets are scrubbed, inherited Anthropic keys are
+* removed so they cannot outrank the login, and the credential directory is set
+* only when one was decided. The turn's personal-subscription branch and the
+* capability probe both build their environment here, so the probe asks about
+* the setup the turn will run with.
 *
-* The cheap checks run first and the capability probe runs last, so a runtime
-* with no delivered credential never spawns the CLI. Any failure is a skip, so
-* the worst outcome is today's behaviour.
-*/
-async function decideClaudeCredentialDirectory(input) {
-	if (!input.accountIdentity) return skip("no-account");
-	if (input.env["CLAUDE_SECURESTORAGE_CONFIG_DIR"]?.trim()) return skip("operator-override");
-	const directory = resolveClaudeCredentialDirectory(input);
-	if (!directory) return skip("no-root");
-	if (!(input.credentialFilePresent ?? hasReadableCredentialFile)(directory)) return skip("no-credential-file");
-	return await probeSupportSafely(input.probeSupport) === "supported" ? {
-		outcome: "set",
-		directory
-	} : skip("capability-not-supported");
-}
-/** True when `.credentials.json` is in the directory and readable right now. */
-function hasReadableCredentialFile(directory) {
-	const file = join(directory, CLAUDE_CREDENTIAL_FILE_NAME);
-	try {
-		if (!statSync(file).isFile()) return false;
-		accessSync(file, constants.R_OK);
-		return true;
-	} catch {
-		return false;
-	}
-}
-function skip(reason) {
+* The endpoint override goes only when `personalClaudeInVmEnabled` says this
+* runtime is on the personal Claude lane. That check also reads the activation
+* marker CMMD writes on disk (#3081), so a Sprite switched on in place, which
+* has the marker and no env var until it restarts, drops the override too.
+*/
+function claudeSubscriptionChildEnv(processEnv, credentialDirectory) {
 	return {
-		outcome: "skipped",
-		reason
+		...withoutInheritedAnthropicCredentials(scrubForgeProviderChildEnvSecrets(processEnv), { stripEndpointOverride: personalClaudeInVmEnabled(processEnv) }),
+		...credentialDirectory ? { [CLAUDE_SECURESTORAGE_CONFIG_DIR_ENV]: credentialDirectory } : {}
 	};
 }
-/** `inconclusive` is treated as `unsupported`, and so is a probe that throws. */
-async function probeSupportSafely(probeSupport) {
-	try {
-		return await probeSupport();
-	} catch {
-		return "inconclusive";
-	}
-}
-function credentialRootCandidate(env) {
-	const explicit = env[CLAUDE_CREDENTIAL_ROOT_ENV]?.trim();
-	if (explicit) return explicit;
-	const forgeHome = env.FORGE_HOME?.trim();
-	if (forgeHome) return join(forgeHome, CREDENTIAL_ROOT_DIRECTORY_NAME);
-	try {
-		return join(homedir(), FALLBACK_ROOT_DIRECTORY_NAME);
-	} catch {
-		return null;
-	}
-}
-function claudeConfigDirectory(env) {
-	const configured = env.CLAUDE_CONFIG_DIR?.trim();
-	if (configured) return configured;
-	try {
-		return join(homedir(), DEFAULT_CLAUDE_CONFIG_DIRECTORY_NAME);
-	} catch {
-		return null;
-	}
-}
-function isInside(candidate, parent) {
-	if (!parent) return false;
-	const step = relative(resolve(parent), resolve(candidate));
-	return step === "" || !step.startsWith("..") && !isAbsolute(step);
-}
 //#endregion
 //#region src/provider/claudeCredentialDirectoryProbe.ts
 /**
@@ -211222,6 +210957,11 @@ function isInside(candidate, parent) {
 * A runtime with no credential at all is logged out either way and cannot
 * discriminate, which is `inconclusive`, and callers read that as unsupported.
 *
+* An answer only counts for the binary and environment the turn will use. The
+* probe spawns the `binaryPath` the turn hands the SDK, and builds its
+* environment with `claudeSubscriptionChildEnv`, the same builder as the turn's
+* personal-subscription branch.
+*
 * `claude auth status` is a pure read. It sends no prompt and leaves
 * `.credentials.json` byte-identical, so probing spends no subscription usage.
 * It prints JSON on stdout and exits 1 when logged out, so the exit code is not
@@ -211237,38 +210977,62 @@ const VERSION_ARGS = ["--version"];
 * hung or unkillable process costs a few seconds and an `inconclusive`.
 */
 const PROBE_TIMEOUT_MS = 5e3;
+const PROBE_OUTPUT_LIMIT_BYTES = 1024 * 1024;
 const PROBE_DIRECTORY_PREFIX = "forge-claude-capability-";
 const VERSION_PATTERN = /\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/;
 function makeClaudeCredentialDirectoryProbe(deps) {
 	const answers = /* @__PURE__ */ new Map();
-	return { support: async () => {
+	const answer = async () => {
 		const version = await readVersionSafely(deps);
 		if (version === null) return runProbe(deps);
 		const cached = answers.get(version);
 		if (cached) return cached;
 		const pending = runProbe(deps);
 		answers.set(version, pending);
+		const forget = () => {
+			if (answers.get(version) === pending) answers.delete(version);
+		};
+		pending.then((result) => {
+			if (result === "inconclusive") forget();
+		}, forget);
 		return pending;
-	} };
+	};
+	return { support: tryPromise(answer).pipe(orElseSucceed(() => "inconclusive")) };
 }
 /**
-* One probe per binary path for the life of the process. The probe spawns the
-* CLI twice, and every Claude session start would otherwise pay for it.
+* One probe per binary path for the life of the process. A conclusive answer is
+* cached per binary version, so the two `auth status` spawns run once per path
+* and version. `claude --version` still spawns on every call, which is how an
+* in-place CLI upgrade gets a fresh answer.
 */
 const probesByBinaryPath = /* @__PURE__ */ new Map();
+const INCONCLUSIVE_PROBE = { support: succeed("inconclusive") };
+/**
+* The probe for the binary a turn with this `binaryPath` setting runs.
+*
+* `buildClaudeQueryOptions` hands the setting to the SDK as
+* `pathToClaudeCodeExecutable`, and the SDK spawns it as given, so the default
+* `claude` goes through PATH for the probe exactly as for the turn. The SDK
+* picks a bundled build of its own only when the path is empty, and the
+* settings schema turns an empty value into `claude`. Should one arrive empty
+* anyway, the answer is `inconclusive` rather than an answer about another
+* binary.
+*/
 function claudeCredentialDirectoryProbeFor(binaryPath) {
-	const binary = binaryPath?.trim() || "claude";
-	const existing = probesByBinaryPath.get(binary);
+	if (!binaryPath) return INCONCLUSIVE_PROBE;
+	const existing = probesByBinaryPath.get(binaryPath);
 	if (existing) return existing;
-	const probe = makeClaudeCredentialDirectoryProbe(claudeCredentialDirectoryProbeDeps(binary));
-	probesByBinaryPath.set(binary, probe);
+	const probe = makeClaudeCredentialDirectoryProbe(claudeCredentialDirectoryProbeDeps(binaryPath));
+	probesByBinaryPath.set(binaryPath, probe);
 	return probe;
 }
-function claudeCredentialDirectoryProbeDeps(binaryPath) {
+const spawnClaude = (file, args, options) => execFileAsync$3(file, [...args], { ...options });
+function claudeCredentialDirectoryProbeDeps(binaryPath, options = {}) {
+	const run = (args, credentialDirectory) => runClaudeCommand$1(options.execFile ?? spawnClaude, binaryPath, args, claudeSubscriptionChildEnv(options.baseEnv ?? process.env, credentialDirectory));
 	return {
-		runAuthStatus: ({ credentialDirectory }) => runClaudeCommand$1(binaryPath, AUTH_STATUS_ARGS, credentialDirectory),
+		runAuthStatus: ({ credentialDirectory }) => run(AUTH_STATUS_ARGS, credentialDirectory),
 		readBinaryVersion: async () => {
-			const { stdout } = await runClaudeCommand$1(binaryPath, VERSION_ARGS, null);
+			const { stdout } = await run(VERSION_ARGS, null);
 			return VERSION_PATTERN.exec(stdout)?.[0] ?? null;
 		},
 		makeProbeDirectory: () => mkdtemp(join(tmpdir(), PROBE_DIRECTORY_PREFIX)),
@@ -211278,6 +211042,7 @@ function claudeCredentialDirectoryProbeDeps(binaryPath) {
 		})
 	};
 }
+/** Rejects when the probe could not tell. `support` turns that into `inconclusive`. */
 async function runProbe(deps) {
 	let probeDirectory = null;
 	try {
@@ -211287,8 +211052,6 @@ async function runProbe(deps) {
 		const redirected = parseLoggedIn(await runBounded(deps, () => deps.runAuthStatus({ credentialDirectory: directory })));
 		if (redirected === false) return "supported";
 		return redirected === true ? "unsupported" : "inconclusive";
-	} catch {
-		return "inconclusive";
 	} finally {
 		if (probeDirectory !== null) await deps.removeProbeDirectory(probeDirectory).catch(() => void 0);
 	}
@@ -211310,15 +211073,15 @@ async function runBounded(deps, operation) {
 	let timer;
 	try {
 		return await Promise.race([operation(), new Promise((_resolve, reject) => {
-			timer = setTimeout(() => reject(/* @__PURE__ */ new Error("claude auth status timed out")), timeoutMs);
+			timer = setTimeout(() => reject(/* @__PURE__ */ new Error("claude probe call timed out")), timeoutMs);
 		})]);
 	} finally {
 		if (timer !== void 0) clearTimeout(timer);
 	}
 }
 /** The `loggedIn` field, or null when the output does not carry one. */
-function parseLoggedIn(run) {
-	const parsed = parseJsonObject$1(run.stdout);
+function parseLoggedIn(output) {
+	const parsed = parseJsonObject$1(output.stdout);
 	return typeof parsed?.loggedIn === "boolean" ? parsed.loggedIn : null;
 }
 function parseJsonObject$1(output) {
@@ -211333,27 +211096,18 @@ function parseJsonObject$1(output) {
 		return null;
 	}
 }
-async function runClaudeCommand$1(binaryPath, args, credentialDirectory) {
+async function runClaudeCommand$1(execFileImpl, binaryPath, args, env) {
 	try {
-		const { stdout } = await execFileAsync$3(binaryPath, [...args], {
-			env: {
-				...process.env,
-				...credentialDirectory ? { [CLAUDE_SECURESTORAGE_CONFIG_DIR_ENV]: credentialDirectory } : {}
-			},
-			maxBuffer: 1024 * 1024,
+		const { stdout } = await execFileImpl(binaryPath, args, {
+			env,
+			maxBuffer: PROBE_OUTPUT_LIMIT_BYTES,
 			timeout: PROBE_TIMEOUT_MS
 		});
-		return {
-			stdout,
-			exitCode: 0
-		};
+		return { stdout };
 	} catch (cause) {
 		const failure = cause;
 		if (typeof failure.stdout !== "string") throw cause;
-		return {
-			stdout: failure.stdout,
-			exitCode: typeof failure.code === "number" ? failure.code : null
-		};
+		return { stdout: failure.stdout };
 	}
 }
 //#endregion
@@ -211368,12 +211122,12 @@ const makeManagedServerProvider = fn$1("makeManagedServerProvider")(function* (i
 		const forceRefresh = options?.forceRefresh === true;
 		const previousSettings = yield* get$6(settingsRef);
 		if (!forceRefresh && !input.haveSettingsChanged(previousSettings, nextSettings)) {
-			yield* set$2(settingsRef, nextSettings);
+			yield* set$3(settingsRef, nextSettings);
 			return yield* get$6(snapshotRef);
 		}
 		const nextSnapshot = yield* input.checkProvider;
-		yield* set$2(settingsRef, nextSettings);
-		yield* set$2(snapshotRef, nextSnapshot);
+		yield* set$3(settingsRef, nextSettings);
+		yield* set$3(snapshotRef, nextSnapshot);
 		yield* publish(changesPubSub, nextSnapshot);
 		return nextSnapshot;
 	});
@@ -211393,7 +211147,7 @@ const makeManagedServerProvider = fn$1("makeManagedServerProvider")(function* (i
 				failureCount: failureCount + 1,
 				nextDelayMs: Math.min(baseMs * Math.pow(2, failureCount + 1), 3e5)
 			});
-		} else yield* set$2(refreshFailureCount, 0);
+		} else yield* set$3(refreshFailureCount, 0);
 	})).pipe(forkScoped);
 	return {
 		getSnapshot: input.getSettings.pipe(flatMap(applySnapshot), tapError(logError), orDie),
@@ -212867,10 +212621,12 @@ function claudeForgeAttributionPrompt() {
 * `credentialDirectory` points this turn at one Provider Account's own
 * `.credentials.json` without moving the transcripts, which is what lets an
 * account switch keep `--resume` working
-* (`docs/adr/claude-accounts-split-credentials-not-sessions.md`). It is null on
-* every runtime today: `decideClaudeCredentialDirectory` only hands back a
-* directory that already holds a readable credential file, and nothing writes
-* one yet, so the environment stays byte-for-byte what it was.
+* (`docs/adr/claude-accounts-split-credentials-not-sessions.md`). It stays null
+* until #3049 gives the directories a writer, keyed on the account identity on
+* the delivery receipt CMMD signs. `decideClaudeCredentialDirectory` only hands
+* back a directory that already holds a usable credential, and while none
+* exists the environment is byte-for-byte what it would be without this
+* parameter.
 *
 * It applies to the personal-subscription branch below and to nothing else. On
 * the profile / proxy branch the credential file is not what authenticates the
@@ -212880,10 +212636,7 @@ function claudeForgeAttributionPrompt() {
 function buildClaudeQueryEnv(baseProcessEnv, endpointProfile, claudeSettings, providerProxyCredential, credentialDirectory) {
 	const baseEnv = scrubForgeProviderChildEnvSecrets(baseProcessEnv);
 	const effectiveBaseUrl = resolveClaudeQueryBaseUrl(endpointProfile, claudeSettings, providerProxyCredential);
-	if (!effectiveBaseUrl) return {
-		...withoutInheritedAnthropicCredentials(baseEnv, { stripEndpointOverride: personalClaudeInVmEnabled(baseProcessEnv) }),
-		...credentialDirectory ? { [CLAUDE_SECURESTORAGE_CONFIG_DIR_ENV]: credentialDirectory } : {}
-	};
+	if (!effectiveBaseUrl) return claudeSubscriptionChildEnv(baseProcessEnv, credentialDirectory);
 	const effectiveApiKey = resolveClaudeQueryApiKey(endpointProfile, claudeSettings, providerProxyCredential?.token ?? null);
 	return {
 		...baseEnv,
@@ -215151,11 +214904,17 @@ const makeClaudeAdapter = fn$1("makeClaudeAdapter")(function* (options) {
 		})));
 		const claudeSettings = serverSettings.providers.claudeAgent;
 		const claudeBinaryPath = claudeSettings.binaryPath;
-		const claudeCredentialDirectory = yield* tryPromise(() => decideClaudeCredentialDirectory({
+		const credentialDirectoryDecision = yield* decideClaudeCredentialDirectory({
 			env: process.env,
+			baseDir: serverConfig.baseDir,
 			accountIdentity: resolveClaudeProviderAccountIdentity(process.env),
-			probeSupport: () => claudeCredentialDirectoryProbeFor(claudeBinaryPath).support()
-		})).pipe(map$3((decision) => decision.outcome === "set" ? decision.directory : null), orElseSucceed(() => null));
+			probeSupport: claudeCredentialDirectoryProbeFor(claudeBinaryPath).support
+		});
+		if (credentialDirectoryDecision.outcome === "skipped") {
+			const skipLine = `Claude credential directory skipped: ${credentialDirectoryDecision.reason}`;
+			yield* credentialDirectoryDecision.reason === "no-account" ? logDebug(skipLine) : logWarning$1(skipLine);
+		}
+		const claudeCredentialDirectory = credentialDirectoryDecision.outcome === "set" ? credentialDirectoryDecision.directory : null;
 		const modelConfig = resolveClaudeSessionModelConfig(input.modelSelection, claudeSettings.endpointProfiles);
 		const providerProxyCredential = yield* issueClaudeProviderProxyCredential(modelConfig.endpointProfile, modelConfig.modelSlug ?? modelConfig.effectiveApiModelId ?? "unknown", threadId);
 		const permissionMode = permissionModeForRuntimeMode(input.runtimeMode);
@@ -215217,7 +214976,7 @@ const makeClaudeAdapter = fn$1("makeClaudeAdapter")(function* (options) {
 			effectiveApiModelId: modelConfig.effectiveApiModelId,
 			effectiveEffort: modelConfig.effectiveEffort
 		});
-		yield* set$2(contextRef, context$4);
+		yield* set$3(contextRef, context$4);
 		sessions.set(threadId, context$4);
 		yield* emitClaudeSessionStartupEvents({
 			threadId,
@@ -220098,7 +219857,7 @@ const makeAcpSessionRuntime = (options) => gen(function* () {
 			}
 		});
 	});
-	const updateConfigOptions = (response) => set$2(configOptionsRef, sessionConfigOptionsFromSetup(response));
+	const updateConfigOptions = (response) => set$3(configOptionsRef, sessionConfigOptionsFromSetup(response));
 	const updateCurrentModeId = (modeId) => update$4(modeStateRef, (current) => current ? {
 		...current,
 		currentModeId: modeId
@@ -220157,8 +219916,8 @@ const makeAcpSessionRuntime = (options) => gen(function* () {
 			sessionId = created.sessionId;
 			sessionSetupResult = created;
 		}
-		yield* set$2(modeStateRef, parseSessionModeState(sessionSetupResult));
-		yield* set$2(configOptionsRef, sessionConfigOptionsFromSetup(sessionSetupResult));
+		yield* set$3(modeStateRef, parseSessionModeState(sessionSetupResult));
+		yield* set$3(configOptionsRef, sessionConfigOptionsFromSetup(sessionSetupResult));
 		return {
 			sessionId,
 			initializeResult,
@@ -220352,10 +220111,10 @@ const makeStartCoordinator = (startStateRef, startOnce) => gen(function* () {
 		switch (state._tag) {
 			case "Started": return [succeed(state.result), state];
 			case "Starting": return [_await(state.deferred), state];
-			case "NotStarted": return [startOnce.pipe(tap((result) => set$2(startStateRef, {
+			case "NotStarted": return [startOnce.pipe(tap((result) => set$3(startStateRef, {
 				_tag: "Started",
 				result
-			}).pipe(andThen(succeed$3(deferred, result)))), onError$1((cause) => failCause$3(deferred, cause).pipe(andThen(set$2(startStateRef, { _tag: "NotStarted" }))))), {
+			}).pipe(andThen(succeed$3(deferred, result)))), onError$1((cause) => failCause$3(deferred, cause).pipe(andThen(set$3(startStateRef, { _tag: "NotStarted" }))))), {
 				_tag: "Starting",
 				deferred
 			}];
@@ -284032,7 +283791,7 @@ const GitManagerLive = effect(GitManager, fn$1("makeGitManager")(function* () {
 				let preResolvedCommitSuggestion = void 0;
 				const modelSelection = yield* serverSettingsService.getSettings.pipe(map$3((settings) => settings.textGenerationModelSelection), mapError((cause) => gitManagerError("runStackedAction", "Failed to get server settings.", cause)));
 				if (input.featureBranch) {
-					yield* set$2(currentPhase, some("branch"));
+					yield* set$3(currentPhase, some("branch"));
 					yield* progress.emit({
 						kind: "phase_started",
 						phase: "branch",
@@ -284045,12 +283804,12 @@ const GitManagerLive = effect(GitManager, fn$1("makeGitManager")(function* () {
 				} else branchStep = { status: "skipped_not_requested" };
 				const currentBranch = branchStep.name ?? initialStatus.branch;
 				const commitAction = isCommitAction(input.action) ? input.action : null;
-				const commit = commitAction ? yield* set$2(currentPhase, some("commit")).pipe(flatMap(() => runCommitStep(modelSelection, input.cwd, commitAction, currentBranch, commitMessageForStep, preResolvedCommitSuggestion, input.filePaths, options?.progressReporter, progress.actionId, input.threadId))) : { status: "skipped_not_requested" };
+				const commit = commitAction ? yield* set$3(currentPhase, some("commit")).pipe(flatMap(() => runCommitStep(modelSelection, input.cwd, commitAction, currentBranch, commitMessageForStep, preResolvedCommitSuggestion, input.filePaths, options?.progressReporter, progress.actionId, input.threadId))) : { status: "skipped_not_requested" };
 				const push = wantsPush ? yield* progress.emit({
 					kind: "phase_started",
 					phase: "push",
 					label: "Pushing..."
-				}).pipe(tap(() => set$2(currentPhase, some("push"))), flatMap(() => {
+				}).pipe(tap(() => set$3(currentPhase, some("push"))), flatMap(() => {
 					const emit = (event) => progress.emit(event);
 					const hookProgress = createHookProgressEmitter(emit);
 					return gitCore.pushCurrentBranch(input.cwd, currentBranch, { progress: hookProgress.progress }).pipe(tap(() => {
@@ -284068,11 +283827,11 @@ const GitManagerLive = effect(GitManager, fn$1("makeGitManager")(function* () {
 					kind: "phase_started",
 					phase: "pr",
 					label: "Preparing PR merge..."
-				}).pipe(tap(() => set$2(currentPhase, some("pr"))), flatMap(() => runMergePrStep(input.cwd, currentBranch, progress.emit))) : wantsPr ? yield* progress.emit({
+				}).pipe(tap(() => set$3(currentPhase, some("pr"))), flatMap(() => runMergePrStep(input.cwd, currentBranch, progress.emit))) : wantsPr ? yield* progress.emit({
 					kind: "phase_started",
 					phase: "pr",
 					label: "Preparing PR..."
-				}).pipe(tap(() => set$2(currentPhase, some("pr"))), flatMap(() => runPrStep(modelSelection, input.cwd, currentBranch, progress.emit, input.threadId))) : { status: "skipped_not_requested" };
+				}).pipe(tap(() => set$3(currentPhase, some("pr"))), flatMap(() => runPrStep(modelSelection, input.cwd, currentBranch, progress.emit, input.threadId))) : { status: "skipped_not_requested" };
 				const toast = yield* buildCompletionToast(input.cwd, {
 					action: input.action,
 					branch: branchStep,
@@ -287344,7 +287103,8 @@ const makeRuntimeDrainReporter = gen(function* () {
 			...config,
 			activeTurnCount: snapshot.activeTurnCount,
 			activeSessionCount: snapshot.activeSessionCount,
-			...forgeGitCommit !== void 0 ? { forgeGitCommit } : {}
+			...forgeGitCommit !== void 0 ? { forgeGitCommit } : {},
+			forgeServerVersion: installedForgeServerVersion
 		});
 	});
 	const applyControlPlaneState = (runtime) => drainState.applyControlPlaneState({
@@ -287928,7 +287688,7 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, fn$
 			createdAt: ""
 		})
 	});
-	const rememberAssistantMessageId = (threadId, turnId, messageId) => getOption(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId)).pipe(flatMap((existingIds) => set$3(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId), match(existingIds, {
+	const rememberAssistantMessageId = (threadId, turnId, messageId) => getOption(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId)).pipe(flatMap((existingIds) => set$4(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId), match(existingIds, {
 		onNone: () => new Set([messageId]),
 		onSome: (ids) => {
 			const nextIds = new Set(ids);
@@ -287942,7 +287702,7 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, fn$
 			const nextIds = new Set(ids);
 			nextIds.delete(messageId);
 			if (nextIds.size === 0) return invalidate(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId));
-			return set$3(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId), nextIds);
+			return set$4(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId), nextIds);
 		}
 	})));
 	const getAssistantMessageIdsForTurn = (threadId, turnId) => getOption(turnMessageIdsByTurnKey, providerTurnKey(threadId, turnId)).pipe(map$3((existingIds) => getOrElse(existingIds, () => /* @__PURE__ */ new Set())));
@@ -287953,7 +287713,7 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, fn$
 			onSome: (text) => `${text}${delta}`
 		});
 		if (nextText.length <= MAX_BUFFERED_ASSISTANT_CHARS) {
-			yield* set$3(bufferedAssistantTextByMessageId, messageId, nextText);
+			yield* set$4(bufferedAssistantTextByMessageId, messageId, nextText);
 			return "";
 		}
 		yield* invalidate(bufferedAssistantTextByMessageId, messageId);
@@ -287963,7 +287723,7 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, fn$
 	const clearBufferedAssistantText = (messageId) => invalidate(bufferedAssistantTextByMessageId, messageId);
 	const appendBufferedProposedPlan = (planId, delta, createdAt) => getOption(bufferedProposedPlanById, planId).pipe(flatMap((existingEntry) => {
 		const existing = getOrUndefined(existingEntry);
-		return set$3(bufferedProposedPlanById, planId, {
+		return set$4(bufferedProposedPlanById, planId, {
 			text: `${existing?.text ?? ""}${delta}`,
 			createdAt: existing?.createdAt && existing.createdAt.length > 0 ? existing.createdAt : createdAt
 		});
@@ -288841,7 +288601,7 @@ const ProviderCommandReactorLive = effect(ProviderCommandReactor, gen(function*
 		timeToLive: HANDLED_TURN_START_KEY_TTL,
 		lookup: () => succeed(true)
 	});
-	const hasHandledTurnStartRecently = (key) => getOption(handledTurnStartKeys, key).pipe(flatMap((cached) => set$3(handledTurnStartKeys, key, true).pipe(as$3(isSome(cached)))));
+	const hasHandledTurnStartRecently = (key) => getOption(handledTurnStartKeys, key).pipe(flatMap((cached) => set$4(handledTurnStartKeys, key, true).pipe(as$3(isSome(cached)))));
 	const threadModelSelections = /* @__PURE__ */ new Map();
 	/**
 	* The providerAccountId each LIVE provider session was actually started with.
@@ -292684,6 +292444,382 @@ const WorkspaceFileSystemLive = effect(WorkspaceFileSystem, gen(function* () {
 	}) };
 }));
 //#endregion
+//#region src/workspace/Layers/WorkspaceBulkTransfer.ts
+const TRANSFER_TTL_MS = 1440 * 60 * 1e3;
+const TRANSFER_LOCK_STRIPE_COUNT = 64;
+function transferError(input) {
+	return new BulkTransferError({
+		code: input.code,
+		message: input.message,
+		transferId: input.transferId ?? null,
+		retryable: input.retryable ?? false,
+		...input.cause === void 0 ? {} : { cause: input.cause }
+	});
+}
+function mapFailure(operation, transferId) {
+	return (cause) => is$1(BulkTransferError)(cause) ? cause : transferError({
+		code: "io_error",
+		message: `Workspace bulk transfer failed during ${operation}.`,
+		...transferId === void 0 ? {} : { transferId },
+		retryable: true,
+		cause
+	});
+}
+function transferLockStripe(transferId) {
+	let hash = 2166136261;
+	for (let index = 0; index < transferId.length; index += 1) hash = Math.imul(hash ^ transferId.charCodeAt(index), 16777619);
+	return (hash >>> 0) % TRANSFER_LOCK_STRIPE_COUNT;
+}
+const makeWorkspaceBulkTransfer = (options = {}) => gen(function* () {
+	const fileSystem = yield* FileSystem;
+	const path = yield* Path$2;
+	const sql = yield* SqlClient;
+	const workspacePaths = yield* WorkspacePaths;
+	const workspaceEntries = yield* WorkspaceEntries;
+	const fault = options.fault ?? (() => void_$1);
+	const transferLocks = yield* forEach(Array.from({ length: TRANSFER_LOCK_STRIPE_COUNT }), () => make$43(1));
+	const withTransferLock = (transferId, effect) => transferLocks[transferLockStripe(transferId)].withPermit(effect);
+	const findTransfer = (transferId) => sql`
+        SELECT transfer_id AS "transferId", workspace_root AS "workspaceRoot",
+          relative_path AS "relativePath", target_path AS "targetPath", temp_path AS "tempPath",
+          total_bytes AS "totalBytes", whole_sha256 AS "wholeSha256",
+          next_offset AS "nextOffset", state, expires_at AS "expiresAt"
+        FROM workspace_bulk_transfers WHERE transfer_id = ${transferId} LIMIT 1
+      `.pipe(map$3((rows) => rows[0] ?? null));
+	const requireTransfer = (transferId) => findTransfer(transferId).pipe(flatMap((row) => row === null ? fail(transferError({
+		code: "transfer_not_found",
+		message: "Bulk transfer does not exist.",
+		transferId
+	})) : succeed(row)));
+	const requireOpenTransfer = (transferId) => requireTransfer(transferId).pipe(flatMap((row) => {
+		if (row.state === "cancelled") return fail(transferError({
+			code: "transfer_cancelled",
+			message: "Bulk transfer was cancelled.",
+			transferId
+		}));
+		if (row.state === "expired" || Date.parse(row.expiresAt) <= Date.now()) return fail(transferError({
+			code: "transfer_expired",
+			message: "Bulk transfer expired.",
+			transferId
+		}));
+		return succeed(row);
+	}));
+	const resolveTarget = fn$1("WorkspaceBulkTransfer.resolveTarget")(function* (input) {
+		const workspaceRoot = yield* workspacePaths.normalizeWorkspaceRoot(input.cwd);
+		const resolved = yield* workspacePaths.resolveRelativePathWithinRoot({
+			workspaceRoot,
+			relativePath: input.relativePath
+		});
+		const canonicalRoot = yield* fileSystem.realPath(workspaceRoot);
+		const parentSegments = resolved.relativePath.split("/").slice(0, -1);
+		let canonicalParent = canonicalRoot;
+		for (const segment of parentSegments) {
+			const candidate = path.join(canonicalParent, segment);
+			const canonicalCandidate = yield* fileSystem.realPath(candidate).pipe(catch_(() => input.createParent ? fileSystem.makeDirectory(candidate).pipe(flatMap(() => fileSystem.realPath(candidate))) : fileSystem.realPath(candidate)));
+			if (!isPathWithinRoot(path, canonicalRoot, canonicalCandidate)) return yield* transferError({
+				code: "symlink_escape",
+				message: "Workspace file path resolves outside the project root."
+			});
+			canonicalParent = canonicalCandidate;
+		}
+		const targetPath = path.join(canonicalParent, path.basename(resolved.relativePath));
+		const targetRealPath = yield* fileSystem.realPath(targetPath).pipe(catch_(() => succeed(null)));
+		if (targetRealPath !== null && !isPathWithinRoot(path, canonicalRoot, targetRealPath)) return yield* transferError({
+			code: "symlink_escape",
+			message: "Workspace file target resolves outside the project root."
+		});
+		return {
+			workspaceRoot: canonicalRoot,
+			relativePath: resolved.relativePath,
+			targetPath,
+			canonicalParent
+		};
+	});
+	const readFile = (input) => unwrap$1(gen(function* () {
+		const target = yield* resolveTarget({
+			...input,
+			createParent: false
+		});
+		const info = yield* fileSystem.stat(target.targetPath);
+		const maxBytes = input.maxBytes ?? 16777216;
+		if (Number(info.size) > maxBytes) return yield* transferError({
+			code: "size_limit_exceeded",
+			message: `Workspace file exceeds the ${maxBytes}-byte read limit.`
+		});
+		const bytes = yield* fileSystem.readFile(target.targetPath);
+		const transfer = yield* promise(() => chunkBulkTransfer(bytes));
+		const transferId = transfer.chunks[0]?.transferId ?? crypto.randomUUID().replaceAll("-", "_");
+		return fromIterable$1([
+			{
+				kind: "started",
+				transferId,
+				totalBytes: transfer.totalBytes,
+				sha256: transfer.sha256
+			},
+			...transfer.chunks.map((chunk) => ({
+				...chunk,
+				transferId
+			})),
+			{
+				kind: "completed",
+				transferId,
+				totalBytes: transfer.totalBytes,
+				sha256: transfer.sha256
+			}
+		]);
+	}).pipe(mapError(mapFailure("read file"))));
+	const resumeWrite = fn$1("WorkspaceBulkTransfer.resumeWrite")(function* (input, existing) {
+		const target = yield* resolveTarget({
+			...input,
+			createParent: true
+		});
+		if (!(existing.workspaceRoot === target.workspaceRoot && existing.relativePath === target.relativePath && existing.totalBytes === input.totalBytes && existing.wholeSha256 === input.sha256)) return yield* transferError({
+			code: "transfer_identity_conflict",
+			message: "Bulk transfer ID is already bound to different content or a different path.",
+			transferId: input.transferId
+		});
+		if (existing.state === "cancelled") return yield* transferError({
+			code: "transfer_cancelled",
+			message: "Bulk transfer was cancelled.",
+			transferId: input.transferId
+		});
+		if (existing.state === "expired" || Date.parse(existing.expiresAt) <= Date.now()) return yield* transferError({
+			code: "transfer_expired",
+			message: "Bulk transfer expired.",
+			transferId: input.transferId
+		});
+		return {
+			transferId: input.transferId,
+			nextOffset: existing.nextOffset,
+			state: existing.state === "completed" ? "completed" : "open"
+		};
+	});
+	const createWrite = fn$1("WorkspaceBulkTransfer.createWrite")(function* (input) {
+		const target = yield* resolveTarget({
+			...input,
+			createParent: true
+		}).pipe(mapError((cause) => is$1(WorkspacePathOutsideRootError)(cause) ? transferError({
+			code: "path_outside_workspace",
+			message: "Workspace file path must stay within the project root.",
+			transferId: input.transferId,
+			cause
+		}) : cause));
+		const tempPath = path.join(target.canonicalParent, `.forge-transfer-${input.transferId}.part`);
+		yield* scoped(fileSystem.open(tempPath, {
+			flag: "wx",
+			mode: 384
+		}).pipe(flatMap((file) => file.sync), catch_(() => fileSystem.stat(tempPath).pipe(flatMap((stat) => Number(stat.size) === 0 ? void_$1 : fail(transferError({
+			code: "transfer_identity_conflict",
+			message: "Bulk transfer temporary path already contains data.",
+			transferId: input.transferId
+		})))))));
+		const now = /* @__PURE__ */ new Date();
+		yield* sql`
+        INSERT INTO workspace_bulk_transfers (
+          transfer_id, workspace_root, relative_path, target_path, temp_path, total_bytes,
+          whole_sha256, next_offset, state, expires_at, created_at, updated_at
+        ) VALUES (
+          ${input.transferId}, ${target.workspaceRoot}, ${target.relativePath}, ${target.targetPath},
+          ${tempPath}, ${input.totalBytes}, ${input.sha256}, 0, 'open',
+          ${new Date(now.getTime() + TRANSFER_TTL_MS).toISOString()}, ${now.toISOString()},
+          ${now.toISOString()}
+        )
+      `;
+		return {
+			transferId: input.transferId,
+			nextOffset: 0,
+			state: "open"
+		};
+	});
+	const beginWriteEffect = fn$1("WorkspaceBulkTransfer.beginWrite")(function* (input) {
+		const existing = yield* findTransfer(input.transferId);
+		return yield* existing === null ? createWrite(input) : resumeWrite(input, existing);
+	});
+	const beginWrite = (input) => withTransferLock(input.transferId, beginWriteEffect(input)).pipe(mapError(mapFailure("begin write", input.transferId)));
+	const acceptRetriedChunk = fn$1("WorkspaceBulkTransfer.acceptRetriedChunk")(function* (input, row) {
+		const accepted = (yield* sql`
+          SELECT chunk_offset AS "chunkOffset", chunk_bytes AS "chunkBytes",
+            chunk_sha256 AS "chunkSha256"
+          FROM workspace_bulk_transfer_chunks
+          WHERE transfer_id = ${input.transferId} AND chunk_offset = ${input.offset}
+          LIMIT 1
+        `)[0];
+		if (!(accepted !== void 0 && accepted.chunkBytes === input.bytes && accepted.chunkSha256 === input.sha256)) return yield* transferError({
+			code: "integrity_mismatch",
+			message: "Retried bulk transfer chunk differs from the accepted chunk.",
+			transferId: input.transferId
+		});
+		return {
+			transferId: input.transferId,
+			nextOffset: row.nextOffset,
+			duplicate: true
+		};
+	});
+	const validateChunkRange = fn$1("WorkspaceBulkTransfer.validateChunkRange")(function* (input, row, byteLength) {
+		if (input.offset !== row.nextOffset) return yield* transferError({
+			code: "offset_mismatch",
+			message: `Expected chunk offset ${row.nextOffset}, received ${input.offset}.`,
+			transferId: input.transferId,
+			retryable: true
+		});
+		const nextOffset = input.offset + byteLength;
+		if (nextOffset > row.totalBytes) return yield* transferError({
+			code: "size_limit_exceeded",
+			message: "Bulk transfer chunk exceeds the declared total byte count.",
+			transferId: input.transferId
+		});
+		return nextOffset;
+	});
+	const reconcileChunkBytes = fn$1("WorkspaceBulkTransfer.reconcileChunkBytes")(function* (input, row, bytes, nextOffset) {
+		const tempInfo = yield* fileSystem.stat(row.tempPath);
+		if (Number(tempInfo.size) > row.nextOffset) {
+			if (Number(tempInfo.size) !== nextOffset) return yield* transferError({
+				code: "integrity_mismatch",
+				message: "Bulk transfer temporary file cannot be reconciled with the next chunk.",
+				transferId: input.transferId
+			});
+			const recovered = (yield* fileSystem.readFile(row.tempPath)).slice(input.offset, nextOffset);
+			if ((yield* promise(() => sha256Hex(recovered))) !== input.sha256) return yield* transferError({
+				code: "integrity_mismatch",
+				message: "Bulk transfer temporary bytes differ from the retried chunk.",
+				transferId: input.transferId
+			});
+			return;
+		}
+		yield* fault("before-byte-write");
+		yield* scoped(fileSystem.open(row.tempPath, { flag: "r+" }).pipe(flatMap((file) => file.seek(input.offset, "start").pipe(flatMap(() => file.writeAll(bytes)), flatMap(() => file.sync)))));
+		yield* fault("after-byte-write-before-metadata");
+	});
+	const persistAcceptedChunk = fn$1("WorkspaceBulkTransfer.persistAcceptedChunk")(function* (input, nextOffset) {
+		const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+		yield* sql.withTransaction(sql`
+          INSERT INTO workspace_bulk_transfer_chunks (
+            transfer_id, chunk_offset, chunk_bytes, chunk_sha256
+          ) VALUES (${input.transferId}, ${input.offset}, ${input.bytes}, ${input.sha256})
+          ON CONFLICT DO NOTHING
+        `.pipe(flatMap(() => sql`
+            UPDATE workspace_bulk_transfers
+            SET next_offset = ${nextOffset}, updated_at = ${updatedAt}
+            WHERE transfer_id = ${input.transferId} AND next_offset = ${input.offset} AND state = 'open'
+          `)));
+		yield* fault("after-metadata-advance");
+	});
+	const writeChunkEffect = fn$1("WorkspaceBulkTransfer.writeChunk")(function* (input) {
+		const bytes = yield* promise(() => verifyBulkTransferChunk({
+			...input,
+			kind: "chunk"
+		}));
+		const row = yield* requireOpenTransfer(input.transferId);
+		if (row.state === "completed") return yield* transferError({
+			code: "offset_mismatch",
+			message: "Bulk transfer is already complete.",
+			transferId: input.transferId
+		});
+		if (input.offset < row.nextOffset) return yield* acceptRetriedChunk(input, row);
+		const nextOffset = yield* validateChunkRange(input, row, bytes.byteLength);
+		yield* reconcileChunkBytes(input, row, bytes, nextOffset);
+		yield* persistAcceptedChunk(input, nextOffset);
+		return {
+			transferId: input.transferId,
+			nextOffset,
+			duplicate: false
+		};
+	});
+	const writeChunk = (input) => withTransferLock(input.transferId, writeChunkEffect(input)).pipe(mapError(mapFailure("write chunk", input.transferId)));
+	const commitWriteEffect = fn$1("WorkspaceBulkTransfer.commitWrite")(function* (input) {
+		const row = yield* requireOpenTransfer(input.transferId);
+		if (row.state === "completed") return {
+			transferId: row.transferId,
+			relativePath: row.relativePath,
+			totalBytes: row.totalBytes,
+			sha256: row.wholeSha256
+		};
+		if (row.nextOffset !== row.totalBytes) return yield* transferError({
+			code: "offset_mismatch",
+			message: `Bulk transfer is incomplete at byte ${row.nextOffset} of ${row.totalBytes}.`,
+			transferId: row.transferId,
+			retryable: true
+		});
+		if ((yield* resolveTarget({
+			cwd: row.workspaceRoot,
+			relativePath: row.relativePath,
+			createParent: false
+		})).targetPath !== row.targetPath) return yield* transferError({
+			code: "symlink_escape",
+			message: "Workspace file destination changed during transfer.",
+			transferId: row.transferId
+		});
+		const tempInfo = yield* fileSystem.stat(row.tempPath).pipe(catch_(() => succeed(null)));
+		const candidatePath = tempInfo === null ? row.targetPath : row.tempPath;
+		const candidate = yield* fileSystem.readFile(candidatePath);
+		if (candidate.byteLength !== row.totalBytes || (yield* promise(() => sha256Hex(candidate))) !== row.wholeSha256) return yield* transferError({
+			code: "integrity_mismatch",
+			message: "Bulk transfer payload does not match its declared size and digest.",
+			transferId: row.transferId
+		});
+		if (tempInfo !== null) {
+			yield* fileSystem.rename(row.tempPath, row.targetPath);
+			yield* fault("after-atomic-rename");
+		}
+		yield* sql`
+        UPDATE workspace_bulk_transfers SET state = 'completed', updated_at = ${(/* @__PURE__ */ new Date()).toISOString()}
+        WHERE transfer_id = ${row.transferId}
+      `;
+		yield* workspaceEntries.invalidate(row.workspaceRoot);
+		return {
+			transferId: row.transferId,
+			relativePath: row.relativePath,
+			totalBytes: row.totalBytes,
+			sha256: row.wholeSha256
+		};
+	});
+	const commitWrite = (input) => withTransferLock(input.transferId, commitWriteEffect(input)).pipe(mapError(mapFailure("commit write", input.transferId)));
+	const cancelWriteEffect = fn$1("WorkspaceBulkTransfer.cancelWrite")(function* (input) {
+		const row = yield* requireTransfer(input.transferId);
+		if (row.state !== "completed") {
+			yield* fileSystem.remove(row.tempPath, { force: true });
+			yield* sql`
+          UPDATE workspace_bulk_transfers SET state = 'cancelled', updated_at = ${(/* @__PURE__ */ new Date()).toISOString()}
+          WHERE transfer_id = ${input.transferId}
+        `;
+		}
+		return {
+			transferId: input.transferId,
+			state: row.state === "completed" ? "completed" : "cancelled"
+		};
+	});
+	const cancelWrite = (input) => withTransferLock(input.transferId, cancelWriteEffect(input)).pipe(mapError(mapFailure("cancel write", input.transferId)));
+	const cleanupExpiredEffect = fn$1("WorkspaceBulkTransfer.cleanupExpired")(function* () {
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const rows = yield* sql`
+        SELECT transfer_id AS "transferId", temp_path AS "tempPath"
+        FROM workspace_bulk_transfers WHERE state = 'open' AND expires_at <= ${now}
+      `;
+		let expiredCount = 0;
+		for (const row of rows) if (yield* withTransferLock(row.transferId, gen(function* () {
+			const current = yield* findTransfer(row.transferId);
+			if (current === null || current.state !== "open" || Date.parse(current.expiresAt) > Date.parse(now)) return false;
+			yield* fileSystem.remove(current.tempPath, { force: true });
+			yield* sql`
+              UPDATE workspace_bulk_transfers SET state = 'expired', updated_at = ${now}
+              WHERE transfer_id = ${row.transferId} AND state = 'open' AND expires_at <= ${now}
+            `;
+			return true;
+		}))) expiredCount += 1;
+		return expiredCount;
+	});
+	const cleanupExpired = () => cleanupExpiredEffect().pipe(mapError(mapFailure("expiry cleanup")));
+	return {
+		readFile,
+		beginWrite,
+		writeChunk,
+		commitWrite,
+		cancelWrite,
+		cleanupExpired
+	};
+});
+const WorkspaceBulkTransferLive = effect(WorkspaceBulkTransfer, makeWorkspaceBulkTransfer());
+//#endregion
 //#region src/workspace/Layers/WorkspacePaths.ts
 function toPosixRelativePath(input) {
 	return input.replaceAll("\\", "/");
@@ -294277,7 +294413,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "8cafbb87b6204b98e93c1c69253c1c590af5f8a1";
+	return "7695a8221bc664caedd33aa411ac7bcdbb0a3594";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;
@@ -294469,7 +294605,7 @@ const ServerEnvironmentLive = effect(ServerEnvironment, fn$1("makeServerEnvironm
 				os,
 				arch: platformArch()
 			},
-			serverVersion: version$1,
+			serverVersion: installedForgeServerVersion,
 			...buildCommit !== void 0 ? { buildCommit } : {},
 			...deviceRuntimeId !== void 0 ? { deviceRuntimeId } : {},
 			capabilities: {
@@ -294485,7 +294621,7 @@ const ServerEnvironmentLive = effect(ServerEnvironment, fn$1("makeServerEnvironm
 		updateDisplayName: (displayName) => gen(function* () {
 			const normalized = normalizeDisplayName(displayName);
 			yield* writeMetadata({ displayName: normalized }).pipe(orDie);
-			yield* set$2(displayNameOverrideRef, normalized);
+			yield* set$3(displayNameOverrideRef, normalized);
 			const descriptor = yield* buildDescriptor;
 			yield* publish(changesPubSub, descriptor);
 			return descriptor;
@@ -301218,6 +301354,54 @@ const OrchestrationInfrastructureLayerLive = mergeAll(effect(ProjectionSnapshotQ
           AND deleted_at IS NULL
           AND archived_at IS NULL
         ORDER BY created_at ASC, thread_id ASC
+      `
+	});
+	/**
+	* The archive's own rows.
+	*
+	* `listThreadRows` deliberately carries archived threads too, because the
+	* active list needs `archivedAt` to know what to hide and the web archive
+	* panel filters that same snapshot client side. This query is the opposite
+	* selection, for the clients that ask for the archive directly.
+	*/
+	const listArchivedThreadRows = findAll({
+		Request: Void,
+		Result: ProjectionThreadDbRowSchema,
+		execute: () => sql`
+        SELECT
+          thread_id AS "threadId",
+          project_id AS "projectId",
+          title,
+          model_selection_json AS "modelSelection",
+          runtime_mode AS "runtimeMode",
+          interaction_mode AS "interactionMode",
+          branch,
+          worktree_path AS "worktreePath",
+          latest_turn_id AS "latestTurnId",
+          created_at AS "createdAt",
+          updated_at AS "updatedAt",
+          archived_at AS "archivedAt",
+          settled_at AS "settledAt",
+          settled_override AS "settledOverride",
+          latest_user_message_at AS "latestUserMessageAt",
+          pending_approval_count AS "pendingApprovalCount",
+          pending_user_input_count AS "pendingUserInputCount",
+          has_actionable_proposed_plan AS "hasActionableProposedPlan",
+          deleted_at AS "deletedAt",
+          kind,
+          parent_thread_id AS "parentThreadId",
+          anchor_kind AS "anchorKind",
+          anchor_cmmd_id AS "anchorCmmdId",
+          linked_pull_request_json AS "linkedPullRequest",
+          status,
+          worker_role AS "workerRole",
+          goal,
+          pending_auto_create_prompt_json AS "pendingAutoCreatePrompt",
+          COALESCE(rate_limit_status_json, '[]') AS "rateLimitStatus"
+        FROM projection_threads
+        WHERE archived_at IS NOT NULL
+          AND deleted_at IS NULL
+        ORDER BY archived_at DESC, thread_id ASC
       `
 	});
 	const listThreadMessageRows = findAll({
@@ -301872,13 +302056,22 @@ const OrchestrationInfrastructureLayerLive = mergeAll(effect(ProjectionSnapshotQ
 		if (isPersistenceError(error)) return error;
 		return toPersistenceSqlError("ProjectionSnapshotQuery.getSnapshot:query")(error);
 	}));
-	const getShellSnapshot = () => {
+	/**
+	* One snapshot assembly, two selections of threads.
+	*
+	* The active list and the archive differ only in which thread rows they
+	* read, so they share this body. Keeping them on one mapper is the point:
+	* FOR-36394 was a projected column that one path carried and another
+	* dropped, and a second hand-copied assembly here would invite the same
+	* failure for anyone who only remembered to update the active list.
+	*/
+	const readShellSnapshot = (operation, listThreads) => {
 		return sql.withTransaction(all([
-			listProjectRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listProjects:query", "ProjectionSnapshotQuery.getShellSnapshot:listProjects:decodeRows"))),
-			listThreadRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listThreads:query", "ProjectionSnapshotQuery.getShellSnapshot:listThreads:decodeRows"))),
-			listThreadSessionRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listThreadSessions:query", "ProjectionSnapshotQuery.getShellSnapshot:listThreadSessions:decodeRows"))),
-			listLatestTurnRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listLatestTurns:query", "ProjectionSnapshotQuery.getShellSnapshot:listLatestTurns:decodeRows"))),
-			listProjectionStateRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:query", "ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:decodeRows")))
+			listProjectRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listProjects:query`, `ProjectionSnapshotQuery.${operation}:listProjects:decodeRows`))),
+			listThreads(void 0).pipe(mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listThreads:query`, `ProjectionSnapshotQuery.${operation}:listThreads:decodeRows`))),
+			listThreadSessionRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listThreadSessions:query`, `ProjectionSnapshotQuery.${operation}:listThreadSessions:decodeRows`))),
+			listLatestTurnRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listLatestTurns:query`, `ProjectionSnapshotQuery.${operation}:listLatestTurns:decodeRows`))),
+			listProjectionStateRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listProjectionState:query`, `ProjectionSnapshotQuery.${operation}:listProjectionState:decodeRows`)))
 		])).pipe(flatMap(([projectRows, threadRows, sessionRows, latestTurnRows, stateRows]) => gen(function* () {
 			let updatedAt = null;
 			for (const row of projectRows) updatedAt = maxIso(updatedAt, row.updatedAt);
@@ -301899,12 +302092,14 @@ const OrchestrationInfrastructureLayerLive = mergeAll(effect(ProjectionSnapshotQ
 				projects: projectRows.filter((row) => row.deletedAt === null).map((row) => mapProjectShellRow(row, repositoryIdentities.get(row.projectId) ?? null, projectAvailabilities.get(row.projectId) ?? "unknown")),
 				threads: threadShells.filter((thread) => projectIds.has(thread.projectId)),
 				updatedAt: updatedAt ?? (/* @__PURE__ */ new Date(0)).toISOString()
-			}).pipe(mapError(toPersistenceDecodeError("ProjectionSnapshotQuery.getShellSnapshot:decodeShellSnapshot")));
+			}).pipe(mapError(toPersistenceDecodeError(`ProjectionSnapshotQuery.${operation}:decodeShellSnapshot`)));
 		})), mapError((error) => {
 			if (isPersistenceError(error)) return error;
-			return toPersistenceSqlError("ProjectionSnapshotQuery.getShellSnapshot:query")(error);
+			return toPersistenceSqlError(`ProjectionSnapshotQuery.${operation}:query`)(error);
 		}));
 	};
+	const getShellSnapshot = () => readShellSnapshot("getShellSnapshot", listThreadRows);
+	const getArchivedShellSnapshot = () => readShellSnapshot("getArchivedShellSnapshot", listArchivedThreadRows);
 	const listActiveWorkerShells = () => sql.withTransaction(all([
 		listActiveWorkerThreadRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.listActiveWorkerShells:listThreads:query", "ProjectionSnapshotQuery.listActiveWorkerShells:listThreads:decodeRows"))),
 		listActiveWorkerSessionRows(void 0).pipe(mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.listActiveWorkerShells:listThreadSessions:query", "ProjectionSnapshotQuery.listActiveWorkerShells:listThreadSessions:decodeRows"))),
@@ -302071,6 +302266,7 @@ const OrchestrationInfrastructureLayerLive = mergeAll(effect(ProjectionSnapshotQ
 	return {
 		getSnapshot,
 		getShellSnapshot,
+		getArchivedShellSnapshot,
 		listActiveWorkerShells,
 		listStaleRunningSessionShells,
 		getCounts,
@@ -306060,7 +306256,6 @@ const cmmdUpdateProjectAgentMemberAvatarRouteLayer = registerProxyRoute({
 });
 //#endregion
 //#region src/command/runtimeProviderAuthorityUpgradeModel.ts
-const GIT_COMMIT = /^[0-9a-f]{40}$/u;
 const AUTHORITY_UPGRADE_OPERATION_KEYS = new Set([
 	"operationId",
 	"runtimeId",
@@ -306070,7 +306265,7 @@ const AUTHORITY_UPGRADE_OPERATION_KEYS = new Set([
 	"attemptCount",
 	"expectedCredentialEpoch",
 	"resultingCredentialEpoch",
-	"targetForgeGitCommit",
+	"targetForgeServerVersion",
 	"retryAt",
 	"completedAt",
 	"failureCode"
@@ -306138,7 +306333,7 @@ function parseRuntimeAuthorityUpgradeOperation(value, expected) {
 		Number.isSafeInteger(operation.attemptCount) && operation.attemptCount >= 0,
 		operation.expectedCredentialEpoch === 0,
 		operation.resultingCredentialEpoch === 1,
-		typeof operation.targetForgeGitCommit === "string" && GIT_COMMIT.test(operation.targetForgeGitCommit),
+		isExactForgeServerVersion(operation.targetForgeServerVersion),
 		isNullableDateTime(operation.retryAt),
 		isNullableDateTime(operation.completedAt),
 		operation.failureCode === null || typeof operation.failureCode === "string",
@@ -306155,6 +306350,7 @@ function isLegacyRuntimeConnection(value, expectedRuntimeId) {
 		runtime.brokerAuthorityAttestedImageRef === null,
 		runtime.brokerAuthorityAttestedImageVersion === null,
 		runtime.brokerAuthorityAttestedForgeGitCommit === null,
+		runtime.brokerAuthorityAttestedForgeServerVersion === null,
 		runtime.brokerAuthorityAttestedMachineId === null,
 		runtime.brokerAuthorityAttestedCredentialEpoch === null,
 		runtime.brokerAuthorityAttestedAt === null
@@ -306318,13 +306514,13 @@ function hasTrustedRuntimeRoute(url, trustedBase) {
 	const relativePath = url.pathname.slice(trustedPrefix.length);
 	return url.origin === trustedBase.origin && url.username === "" && url.password === "" && url.port === "" && url.search === "" && url.hash === "" && url.pathname.startsWith(`${trustedPrefix}/r/`) && RUNTIME_ROUTE_PATH.test(relativePath);
 }
-function hasExactRuntimeConnectionFields(data, runtime, expectedRuntimeId, expectedAttestedForgeGitCommit) {
-	return runtime.runtimeId === expectedRuntimeId && runtime.runtimeCapabilityMode === "exact_machine_v2" && isNonEmptyString(runtime.brokerAuthorityAttestedMachineId) && isSafeCredentialEpoch(runtime.brokerAuthorityAttestedCredentialEpoch) && (expectedAttestedForgeGitCommit === void 0 || runtime.brokerAuthorityAttestedForgeGitCommit === expectedAttestedForgeGitCommit) && isNonEmptyString(data.httpBaseUrl) && isNonEmptyString(data.bearerToken);
+function hasExactRuntimeConnectionFields(data, runtime, expectedRuntimeId, expectedAttestedForgeServerVersion) {
+	return runtime.runtimeId === expectedRuntimeId && runtime.runtimeCapabilityMode === "exact_machine_v2" && isNonEmptyString(runtime.brokerAuthorityAttestedMachineId) && isSafeCredentialEpoch(runtime.brokerAuthorityAttestedCredentialEpoch) && (expectedAttestedForgeServerVersion === void 0 || runtime.brokerAuthorityAttestedForgeServerVersion === expectedAttestedForgeServerVersion) && isNonEmptyString(data.httpBaseUrl) && isNonEmptyString(data.bearerToken);
 }
-function parseRuntimeConnection(value, expectedRuntimeId, trustedRuntimeRouterBaseUrl, expectedAttestedForgeGitCommit) {
+function parseRuntimeConnection(value, expectedRuntimeId, trustedRuntimeRouterBaseUrl, expectedAttestedForgeServerVersion) {
 	const data = asRecord$1(unwrapData(value));
 	const runtime = asRecord$1(data?.runtime);
-	if (!data || !runtime || !hasExactRuntimeConnectionFields(data, runtime, expectedRuntimeId, expectedAttestedForgeGitCommit)) return null;
+	if (!data || !runtime || !hasExactRuntimeConnectionFields(data, runtime, expectedRuntimeId, expectedAttestedForgeServerVersion)) return null;
 	const trustedBase = parseTrustedRuntimeRouterBaseUrl(trustedRuntimeRouterBaseUrl);
 	if (!trustedBase) return null;
 	let httpBaseUrl;
@@ -306504,7 +306700,7 @@ function classifyInitialConnection(outcome, runtimeId, trustedRuntimeRouterBaseU
 		}
 	};
 }
-function reconnectExactRuntime(input, targetForgeGitCommit) {
+function reconnectExactRuntime(input, targetForgeServerVersion) {
 	return gen(function* () {
 		const connectPath = `/api/forge/context/runtimes/${encodeURIComponent(input.runtimeId)}/connect`;
 		const reconnected = yield* postRuntimeProviderCmmd({
@@ -306521,7 +306717,7 @@ function reconnectExactRuntime(input, targetForgeGitCommit) {
 			error: reconnected.error,
 			stage: "reconnect"
 		};
-		const exact = parseRuntimeConnection(reconnected.value, input.runtimeId, input.trustedRuntimeRouterBaseUrl, targetForgeGitCommit);
+		const exact = parseRuntimeConnection(reconnected.value, input.runtimeId, input.trustedRuntimeRouterBaseUrl, targetForgeServerVersion);
 		return exact ? {
 			ok: true,
 			value: exact
@@ -306532,7 +306728,7 @@ function reconnectExactRuntime(input, targetForgeGitCommit) {
 	});
 }
 function resolveOperation(input, operation) {
-	return operation.status === "completed" ? reconnectExactRuntime(input, operation.targetForgeGitCommit) : succeed(pendingOperation(operation));
+	return operation.status === "completed" ? reconnectExactRuntime(input, operation.targetForgeServerVersion) : succeed(pendingOperation(operation));
 }
 function beginExactRuntimeConnection(input) {
 	return gen(function* () {
@@ -311400,7 +311596,7 @@ const PipelineRunCoordinatorLive = effect(PipelineRunCoordinator, gen(function*
 				contextHash: preparedHandoff.authority.contextHash,
 				contextSnapshot: snapshot.run.contextSnapshot
 			}).pipe(mapError((cause) => coordinatorError("registerHandoff", "PIPELINE_CONTEXT_ARTIFACT_FAILED", "The immutable CMMD run context could not be materialized for the provider.", cause)));
-			const latestPreparedAuthority = yield* heartbeatPublicationSemaphore.withPermits(1)(set$2(acceptingHeartbeatRef, false).pipe(andThen(get$6(preparedAuthorityRef))));
+			const latestPreparedAuthority = yield* heartbeatPublicationSemaphore.withPermits(1)(set$3(acceptingHeartbeatRef, false).pipe(andThen(get$6(preparedAuthorityRef))));
 			const persistedAuthority = yield* persistAuthoritySecret({
 				runId: input.runId,
 				organizationId: latestPreparedAuthority.authority.organizationId,
@@ -311487,7 +311683,7 @@ const PipelineRunCoordinatorLive = effect(PipelineRunCoordinator, gen(function*
 			});
 			yield* heartbeatPublicationSemaphore.withPermits(1)(gen(function* () {
 				if (!(yield* get$6(acceptingHeartbeatRef))) return;
-				yield* set$2(preparedAuthorityRef, {
+				yield* set$3(preparedAuthorityRef, {
 					authority: heartbeat.refreshedAuthority,
 					preparation
 				});
@@ -316261,7 +316457,7 @@ const WorkspaceReadinessStateLive = effect(WorkspaceReadinessState, gen(function
 		const slot = yield* getOrCreateSlot(userId);
 		const previous = yield* get$6(slot.snapshotRef);
 		if (previous !== null && event.ts < previous.ts) return;
-		yield* set$2(slot.snapshotRef, event);
+		yield* set$3(slot.snapshotRef, event);
 		yield* publish(slot.pubsub, event);
 		if (event.phase === "app-ready") yield* schedulePrune(userId, slot);
 	});