@cmmd-center/forge 0.11.1 → 0.13.0

package/dist/bin.cjs

@@ -12,7 +12,7 @@ const require_Cache = require("./Cache-CWlxNDbC.cjs");
 const require_SqlError = require("./SqlError-Bt0Bcd5C.cjs");
 const require_Mime = require("./Mime-Bilnh8zE.cjs");
 const require_esm = require("./esm-BZhXwX5p.cjs");
-const require_runtimeControlAuthority = require("./runtimeControlAuthority-BdIovv-r.cjs");
+const require_runtimeControlAuthority = require("./runtimeControlAuthority-B3kNmYRT.cjs");
 const require_PTY = require("./PTY-BxYDiW3h.cjs");
 let node_child_process = require("node:child_process");
 node_child_process = require_chunk.__toESM(node_child_process);
@@ -16544,7 +16544,7 @@ function makeNetServiceShape(createServer = node_net.createServer) {
 }
 //#endregion
 //#region ../../packages/shared/src/releaseInfo.generated.ts
-const FORGE_RELEASE_VERSION = "0.11.0";
+const FORGE_RELEASE_VERSION = "0.13.0";
 //#endregion
 //#region ../../packages/shared/src/hostProcess.ts
 /**
@@ -18654,6 +18654,43 @@ const TerminalError = require_Schema$1.Union([
 	TerminalSignalError
 ]);
 //#endregion
+//#region ../../packages/contracts/src/projectScriptCommands.ts
+const ProjectScriptIcon = require_Schema$1.Literals([
+	"play",
+	"test",
+	"lint",
+	"configure",
+	"build",
+	"debug"
+]);
+const ProjectScript = require_Schema$1.Struct({
+	id: TrimmedNonEmptyString,
+	name: TrimmedNonEmptyString,
+	command: TrimmedNonEmptyString,
+	icon: ProjectScriptIcon,
+	runOnWorktreeCreate: require_Schema$1.Boolean
+});
+const ProjectScriptUpdateCommand = require_Schema$1.Struct({
+	type: require_Schema$1.Literal("project.script.update"),
+	commandId: CommandId,
+	projectId: ProjectId,
+	mutation: require_Schema$1.Union([
+		require_Schema$1.Struct({
+			kind: require_Schema$1.Literal("add"),
+			script: ProjectScript
+		}),
+		require_Schema$1.Struct({
+			kind: require_Schema$1.Literal("update"),
+			script: ProjectScript,
+			expected: ProjectScript
+		}),
+		require_Schema$1.Struct({
+			kind: require_Schema$1.Literal("remove"),
+			expected: ProjectScript
+		})
+	])
+});
+//#endregion
 //#region ../../packages/contracts/src/model.ts
 const CODEX_REASONING_EFFORT_OPTIONS = [
 	"ultra",
@@ -19200,6 +19237,7 @@ const ORCHESTRATION_WS_METHODS = {
 	streamTurnDiff: "orchestration.streamTurnDiff",
 	streamFullThreadDiff: "orchestration.streamFullThreadDiff",
 	replayEvents: "orchestration.replayEvents",
+	getArchivedShellSnapshot: "orchestration.getArchivedShellSnapshot",
 	subscribeShell: "orchestration.subscribeShell",
 	subscribeThread: "orchestration.subscribeThread"
 };
@@ -19312,21 +19350,6 @@ const UploadChatImageAttachment = require_Schema$1.Struct({
 });
 const ChatAttachment = require_Schema$1.Union([ChatImageAttachment]);
 const UploadChatAttachment = require_Schema$1.Union([UploadChatImageAttachment]);
-const ProjectScriptIcon = require_Schema$1.Literals([
-	"play",
-	"test",
-	"lint",
-	"configure",
-	"build",
-	"debug"
-]);
-const ProjectScript = require_Schema$1.Struct({
-	id: TrimmedNonEmptyString,
-	name: TrimmedNonEmptyString,
-	command: TrimmedNonEmptyString,
-	icon: ProjectScriptIcon,
-	runOnWorktreeCreate: require_Schema$1.Boolean
-});
 /**
 * Availability of the project's `workspaceRoot` on the server's filesystem.
 *
@@ -19957,6 +19980,7 @@ const ThreadSessionStopCommand = require_Schema$1.Struct({
 const DispatchableClientOrchestrationCommand = require_Schema$1.Union([
 	ProjectCreateCommand,
 	ProjectMetaUpdateCommand,
+	ProjectScriptUpdateCommand,
 	ProjectDeleteCommand,
 	ThreadCreateCommand,
 	ThreadDeleteCommand,
@@ -19978,6 +20002,7 @@ const DispatchableClientOrchestrationCommand = require_Schema$1.Union([
 const ClientOrchestrationCommand = require_Schema$1.Union([
 	ProjectCreateCommand,
 	ProjectMetaUpdateCommand,
+	ProjectScriptUpdateCommand,
 	ProjectDeleteCommand,
 	ThreadCreateCommand,
 	ThreadDeleteCommand,
@@ -20669,6 +20694,10 @@ const OrchestrationRpcSchemas = {
 	subscribeShell: {
 		input: require_Schema$1.Struct({}),
 		output: OrchestrationShellStreamItem
+	},
+	getArchivedShellSnapshot: {
+		input: require_Schema$1.Struct({}),
+		output: OrchestrationShellSnapshot
 	}
 };
 var OrchestrationGetSnapshotError = class extends require_Schema$1.TaggedErrorClass()("OrchestrationGetSnapshotError", {
@@ -26564,6 +26593,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,
@@ -26644,7 +26678,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
@@ -31770,6 +31804,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",
@@ -31819,6 +31858,10 @@ const relayCommandPolicyByType = {
 		requiredScope: "project.write",
 		deliveryClass: "idempotent-command"
 	},
+	"project.script.update": {
+		requiredScope: "project.write",
+		deliveryClass: "idempotent-command"
+	},
 	"project.delete": {
 		requiredScope: "project.write",
 		deliveryClass: "idempotent-command"
@@ -65798,7 +65841,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.11.1";
+var version$1 = "0.13.0";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -93066,6 +93109,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);
+}
+//#endregion
 //#region src/cmmd/ownerSessionCredential.ts
 /**
 * The signed-in owner's CMMD credential, for the calls a device makes as
@@ -94709,7 +94761,8 @@ const registerCloudRuntimeForReplicaHydration = require_Schema$1.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");
@@ -95994,6 +96047,10 @@ function threadStatus(thread) {
 	if (thread.latestTurn) return "running";
 	return "active";
 }
+function threadProviderAccountId(thread) {
+	const selection = thread.modelSelection;
+	return selection && "providerAccountId" in selection ? selection.providerAccountId ?? null : null;
+}
 function serializeRuntimeInventory(snapshot, providerInventory) {
 	const activeProjects = snapshot.projects.filter((project) => project.availability !== "missing");
 	const projectIds = new Set(activeProjects.map((project) => project.id));
@@ -96024,6 +96081,7 @@ function serializeRuntimeInventory(snapshot, providerInventory) {
 			status: threadStatus(thread),
 			model: thread.modelSelection?.model ?? null,
 			provider: thread.modelSelection?.provider ?? null,
+			providerAccountId: threadProviderAccountId(thread),
 			branch: thread.branch,
 			lastActivityAt: thread.latestUserMessageAt ?? thread.updatedAt,
 			kind: thread.kind,
@@ -99261,7 +99319,7 @@ var BrowserManager = class extends require_Schema$1.Service()("forge/browser/Ser
 const DEFAULT_PORT_MIN = 5200;
 const DEFAULT_PORT_MAX = 5999;
 var ThreadDevRuntime = class extends require_Schema$1.Service()("forge/threadDevRuntime/ThreadDevRuntime") {};
-function nowIso$4() {
+function nowIso$5() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
 function previewUrlForPort(port) {
@@ -99288,7 +99346,7 @@ const ThreadDevRuntimeLive = require_Schema$1.effect(ThreadDevRuntime, require_S
 				allocatedPort: port,
 				status: "allocated",
 				previewUrl: previewUrlForPort(port),
-				updatedAt: nowIso$4()
+				updatedAt: nowIso$5()
 			};
 			yield* require_HttpServer.update(byThreadId, (current) => {
 				const next = new Map(current);
@@ -99310,7 +99368,7 @@ const ThreadDevRuntimeLive = require_Schema$1.effect(ThreadDevRuntime, require_S
 				next.set(input.threadId, {
 					...existing,
 					status: "released",
-					updatedAt: nowIso$4()
+					updatedAt: nowIso$5()
 				});
 				return next;
 			});
@@ -99336,7 +99394,7 @@ const ThreadDevRuntimeLive = require_Schema$1.effect(ThreadDevRuntime, require_S
 				...patch.terminalId !== void 0 ? { terminalId: patch.terminalId } : {},
 				...patch.previewUrl !== void 0 ? { previewUrl: patch.previewUrl } : {},
 				...patch.tunnelId !== void 0 ? { tunnelId: patch.tunnelId } : {},
-				updatedAt: nowIso$4()
+				updatedAt: nowIso$5()
 			};
 			yield* require_HttpServer.update(byThreadId, (current) => {
 				const next = new Map(current);
@@ -104999,6 +105057,13 @@ const makeWsRpcLayer = (currentSessionId, currentUserId) => WsRpcGroup.toLayer(r
 			message: "Failed to replay orchestration events",
 			cause
 		}))), { "rpc.aggregate": "orchestration" }),
+		[ORCHESTRATION_WS_METHODS.getArchivedShellSnapshot]: (_input) => observeRpcEffect(ORCHESTRATION_WS_METHODS.getArchivedShellSnapshot, require_Schema$1.gen(function* () {
+			yield* startup.awaitCommandReady;
+			return yield* projectionSnapshotQuery.getArchivedShellSnapshot();
+		}).pipe(require_Schema$1.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, require_Schema$1.succeed(makeSnapshotThenLiveStream({
 			loadSnapshot: loadInitialShellSnapshot({
 				startup,
@@ -210941,6 +211006,11 @@ const PUBLIC_PROVIDER_LEAK_PATTERNS = [
 	/https?:\/\/[^\s'"<>)]*(?:apex|deepseek|moonshot|kimi)[^\s'"<>)]*/i
 ];
 const DEFAULT_PUBLIC_PROVIDER_ERROR = "CMMD is temporarily unavailable. Check the workspace AI connection and retry.";
+function isProviderRateOrQuotaError(message) {
+	if (!message) return false;
+	const normalized = message.toLowerCase();
+	return /\b(rate[\s-]?limit|too\s+many\s+requests|usage[ _-]limit|usage_limit_reached|quota|insufficient_quota)\b/.test(normalized) || /\b429\b/.test(normalized);
+}
 /**
 * Infer a SAFE, clearer failure category from a (possibly leaky) provider error.
 *
@@ -210956,7 +211026,7 @@ function categorizePublicProviderError(message) {
 	if (/\bforge_runtime_stopped\b/.test(m) || /\bthis turn was interrupted because the environment was stopped\b/.test(m)) return "This turn was interrupted because the environment was stopped. Start the environment and retry.";
 	if (/\bforge_provider_model_not_allowed\b/.test(m) || /\bnot\s+scoped\s+to\s+the\s+requested\s+model\b/.test(m)) return "The workspace AI credential does not cover the model this turn asked for. Retry, or pick that model for the thread.";
 	if (/\bmodel\b[\s\S]*\b(not\s+(found|available|supported)|does\s+not\s+exist|unsupported|invalid|unknown)\b/.test(m) || /\b(unsupported|unknown|invalid)\b[\s\S]*\bmodel\b/.test(m) || /\b(model_not_found|invalid_model|model_not_supported)\b/.test(m)) return "The selected model isn't available right now. Pick a different model and retry.";
-	if (/\b(rate[\s-]?limit|too\s+many\s+requests|quota|insufficient_quota)\b/.test(m) || /\b429\b/.test(m)) return "The AI service is rate-limited or out of quota. Wait a moment and retry.";
+	if (isProviderRateOrQuotaError(m)) return "The AI service is rate-limited or out of quota. Wait a moment and retry.";
 	if (/\b(unauthorized|forbidden|authentication\s+(failed|error|required)|invalid\s+api\s+key|expired\s+(token|credential))\b/.test(m) || /\b40[13]\b/.test(m)) return "Workspace AI authentication failed. Reconnect the workspace and retry.";
 	if (/\b(timed?\s*out|timeout|overloaded|service\s+unavailable)\b/.test(m) || /\b50[234]\b/.test(m)) return "The AI service is temporarily overloaded. Retry in a moment.";
 	return null;
@@ -228606,7 +228676,7 @@ const OpenCodeRuntimeLive = require_Schema$1.effect(OpenCodeRuntime, makeOpenCod
 //#endregion
 //#region src/provider/Layers/OpenCodeAdapter.ts
 const PROVIDER$5 = "opencode";
-const nowIso$3 = require_Schema$1.map(require_Schema$1.now, require_Schema$1.formatIso);
+const nowIso$4 = require_Schema$1.map(require_Schema$1.now, require_Schema$1.formatIso);
 /**
 * Map a tagged OpenCodeRuntimeError produced by {@link runOpenCodeSdk} into
 * the adapter-boundary `ProviderAdapterRequestError`. SDK-method-level call
@@ -228633,7 +228703,7 @@ const toProcessError = (threadId, cause) => new ProviderAdapterProcessError({
 });
 const buildEventBase = (input) => require_Schema$1.gen(function* () {
 	const uuid = yield* nextUUIDv4;
-	const createdAt = input.createdAt ?? (yield* nowIso$3);
+	const createdAt = input.createdAt ?? (yield* nowIso$4);
 	return {
 		eventId: EventId.make(uuid),
 		provider: PROVIDER$5,
@@ -228792,7 +228862,7 @@ function sessionErrorMessage(error) {
 }
 function updateProviderSession(context, patch, options) {
 	return require_Schema$1.gen(function* () {
-		const updatedAt = yield* nowIso$3;
+		const updatedAt = yield* nowIso$4;
 		const nextSession = {
 			...context.session,
 			...patch,
@@ -228914,7 +228984,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 			if (("properties" in event ? event.properties.sessionID : void 0) !== context.openCodeSessionId) return;
 			const turnId = context.activeTurnId;
 			yield* writeNativeEventBestEffort(context.session.threadId, {
-				observedAt: yield* nowIso$3,
+				observedAt: yield* nowIso$4,
 				event: {
 					provider: PROVIDER$5,
 					threadId: context.session.threadId,
@@ -229230,7 +229300,7 @@ function makeOpenCodeAdapter(openCodeSettings, options) {
 				yield* require_Schema$1.close(started.sessionScope, require_Schema$1.void_$1).pipe(require_Schema$1.ignore);
 				return raceWinner.session;
 			}
-			const createdAt = yield* nowIso$3;
+			const createdAt = yield* nowIso$4;
 			const session = {
 				provider: PROVIDER$5,
 				status: "ready",
@@ -236029,7 +236099,7 @@ function filterEvents(events, options) {
 	});
 	return options.limit === void 0 ? filtered : filtered.slice(-options.limit);
 }
-function nowIso$2() {
+function nowIso$3() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
 //#endregion
@@ -236044,7 +236114,7 @@ var BrowserActionEventRecorder = class {
 			type: "browser.action",
 			action,
 			...this.sessionFields(),
-			timestamp: nowIso$2()
+			timestamp: nowIso$3()
 		});
 	}
 	async result(action) {
@@ -236053,7 +236123,7 @@ var BrowserActionEventRecorder = class {
 			action,
 			ok: true,
 			...this.sessionFields(),
-			timestamp: nowIso$2()
+			timestamp: nowIso$3()
 		});
 	}
 	async error(action, error) {
@@ -236062,7 +236132,7 @@ var BrowserActionEventRecorder = class {
 			action,
 			error: error instanceof Error ? error.message : String(error),
 			...this.sessionFields(),
-			timestamp: nowIso$2()
+			timestamp: nowIso$3()
 		});
 	}
 	sessionFields() {
@@ -236583,7 +236653,7 @@ var AgentBrowser = class {
 		await this.options.events?.record({
 			type: "browser.safety.confirmation.requested",
 			...request,
-			createdAt: nowIso$2()
+			createdAt: nowIso$3()
 		});
 		const result = await this.resolveConfirmation(request);
 		const approved = typeof result === "boolean" ? result : result.approved;
@@ -236591,7 +236661,7 @@ var AgentBrowser = class {
 			type: "browser.safety.confirmation.resolved",
 			approved,
 			requestId: request.requestId,
-			resolvedAt: nowIso$2(),
+			resolvedAt: nowIso$3(),
 			...this.events.sessionFields()
 		});
 		if (!approved) throw new BrowserSafetyError(decision.reason ?? "Browser action was not confirmed.", action, {
@@ -281946,7 +282016,7 @@ const DEFAULT_AGENT_BROWSER_BRIDGE_CLOSE_TIMEOUT_MS = 3e4;
 const DEFAULT_AGENT_BROWSER_PLAYWRIGHT_BACKEND_CLOSE_TIMEOUT_MS = 1e4;
 const REMOTE_WEBRTC_UNAVAILABLE_DETAIL = "Remote WebRTC browser display is not available: the current Agent Browser runtime exposes tab control but does not provide a media transport.";
 const REMOTE_WEBRTC_RELAY_REQUIRED_DETAIL = "Remote WebRTC browser display requires a TURN relay in cloud mode. Configure FORGE_BROWSER_WEBRTC_ICE_SERVERS with authenticated turn: or turns: URLs.";
-function nowIso$1() {
+function nowIso$2() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
 function positiveTimeoutMs(value) {
@@ -282046,12 +282116,12 @@ function snapshotAfterTimedOutControl(snapshot, command) {
 		case "setViewport": return {
 			...snapshot,
 			viewport: command.viewport,
-			updatedAt: nowIso$1()
+			updatedAt: nowIso$2()
 		};
 		case "resetViewport": return {
 			...snapshot,
 			viewport: DEFAULT_AGENT_BROWSER_VIEWPORT,
-			updatedAt: nowIso$1()
+			updatedAt: nowIso$2()
 		};
 		default: return snapshot;
 	}
@@ -282497,7 +282567,7 @@ function toStreamEvent(input) {
 		userId: BrowserUserId.make(input.userId),
 		agentId: input.agentId,
 		...input.controlState ? { sessionEpoch: input.controlState.sessionEpoch } : {},
-		createdAt: nowIso$1()
+		createdAt: nowIso$2()
 	};
 	switch (input.event.type) {
 		case "session.started": return {
@@ -282798,7 +282868,7 @@ function createAgentBrowserHostBridgeManager(bridge, options) {
 			environmentId: event.input.environmentId ?? DEFAULT_BROWSER_ENVIRONMENT_ID,
 			userId: event.input.userId ?? "local-user",
 			agentId: null,
-			createdAt: nowIso$1(),
+			createdAt: nowIso$2(),
 			type: "display.iceCandidate",
 			payload: {
 				sessionId: event.input.sessionId,
@@ -287567,7 +287637,8 @@ const makeRuntimeDrainReporter = require_Schema$1.gen(function* () {
 			...config,
 			activeTurnCount: snapshot.activeTurnCount,
 			activeSessionCount: snapshot.activeSessionCount,
-			...forgeGitCommit !== void 0 ? { forgeGitCommit } : {}
+			...forgeGitCommit !== void 0 ? { forgeGitCommit } : {},
+			forgeServerVersion: installedForgeServerVersion
 		});
 	});
 	const applyControlPlaneState = (runtime) => drainState.applyControlPlaneState({
@@ -294928,7 +294999,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "b79da36c868d5629c76dcec88a3326634a02c2c7";
+	return "ebc6c5d85de3dc3324a5054f8f29deb2dd89baa7";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;
@@ -295121,7 +295192,7 @@ const makeServerEnvironment = require_Schema$1.fn("makeServerEnvironment")(funct
 				os,
 				arch: platformArch()
 			},
-			serverVersion: version$1,
+			serverVersion: installedForgeServerVersion,
 			...buildCommit !== void 0 ? { buildCommit } : {},
 			...deviceRuntimeId !== void 0 ? { deviceRuntimeId } : {},
 			capabilities: {
@@ -298009,6 +298080,52 @@ function toProjectorDecodeError(eventType) {
 	});
 }
 //#endregion
+//#region src/orchestration/deciderEventBase.ts
+const nowIso$1 = () => (/* @__PURE__ */ new Date()).toISOString();
+const defaultMetadata = {
+	eventId: crypto.randomUUID(),
+	aggregateKind: "thread",
+	aggregateId: "",
+	occurredAt: nowIso$1(),
+	commandId: null,
+	causationEventId: null,
+	correlationId: null,
+	metadata: {}
+};
+function withEventBase(input) {
+	return {
+		...defaultMetadata,
+		eventId: crypto.randomUUID(),
+		aggregateKind: input.aggregateKind,
+		aggregateId: input.aggregateId,
+		occurredAt: input.occurredAt,
+		commandId: input.commandId,
+		correlationId: input.commandId,
+		metadata: input.metadata ?? {}
+	};
+}
+//#endregion
+//#region src/orchestration/projectScriptMutation.ts
+function unchanged(a, b) {
+	return a !== void 0 && a.id === b.id && a.name === b.name && a.command === b.command && a.icon === b.icon && a.runOnWorktreeCreate === b.runOnWorktreeCreate;
+}
+const applyProjectScriptMutation = require_Schema$1.fn("applyProjectScriptMutation")(function* (scripts, command) {
+	const mutation = command.mutation;
+	const id = mutation.kind === "add" ? mutation.script.id : mutation.expected.id;
+	const existing = scripts.find((script) => script.id === id);
+	if (mutation.kind === "add" ? existing !== void 0 : !unchanged(existing, mutation.expected)) return yield* new OrchestrationCommandInvariantError({
+		commandType: command.type,
+		detail: "This action changed in another window. Reopen it and try again."
+	});
+	if (mutation.kind === "add") return [...scripts, mutation.script];
+	if (mutation.kind === "remove") return scripts.filter((script) => script.id !== id);
+	if (mutation.script.id !== id) return yield* new OrchestrationCommandInvariantError({
+		commandType: command.type,
+		detail: "An action's ID cannot change during an update."
+	});
+	return scripts.map((script) => script.id === id ? mutation.script : script);
+});
+//#endregion
 //#region src/orchestration/turnAccountSelection.ts
 /** A per-turn account choice remains local to the thread and cannot change its provider. */
 function turnAccountSelection(current, requested) {
@@ -298065,28 +298182,6 @@ function requireThreadAbsent(input) {
 //#endregion
 //#region src/orchestration/decider.ts
 const nowIso = () => (/* @__PURE__ */ new Date()).toISOString();
-const defaultMetadata = {
-	eventId: crypto.randomUUID(),
-	aggregateKind: "thread",
-	aggregateId: "",
-	occurredAt: nowIso(),
-	commandId: null,
-	causationEventId: null,
-	correlationId: null,
-	metadata: {}
-};
-function withEventBase(input) {
-	return {
-		...defaultMetadata,
-		eventId: crypto.randomUUID(),
-		aggregateKind: input.aggregateKind,
-		aggregateId: input.aggregateId,
-		occurredAt: input.occurredAt,
-		commandId: input.commandId,
-		correlationId: input.commandId,
-		metadata: input.metadata ?? {}
-	};
-}
 function requireOrdinaryMessageId(commandType, messageId) {
 	return isReservedReplicaSourceMessageId(messageId) ? require_Schema$1.fail(new OrchestrationCommandInvariantError({
 		commandType,
@@ -298139,6 +298234,22 @@ const decideOrchestrationCommand = require_Schema$1.fn("decideOrchestrationComma
 					updatedAt: command.createdAt
 				}
 			};
+		case "project.script.update": {
+			const scripts = yield* applyProjectScriptMutation((yield* requireProject({
+				readModel,
+				command,
+				projectId: command.projectId
+			})).scripts, command);
+			return yield* decideOrchestrationCommand({
+				readModel,
+				command: {
+					type: "project.meta.update",
+					commandId: command.commandId,
+					projectId: command.projectId,
+					scripts
+				}
+			});
+		}
 		case "project.meta.update": {
 			yield* requireProject({
 				readModel,
@@ -299425,6 +299536,7 @@ function commandToAggregateRef(command) {
 	switch (command.type) {
 		case "project.create":
 		case "project.meta.update":
+		case "project.script.update":
 		case "project.delete": return {
 			aggregateKind: "project",
 			aggregateId: command.projectId
@@ -301910,6 +302022,54 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
           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: require_Schema$1.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({
@@ -302564,13 +302724,22 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
 		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(require_Schema$1.all([
-			listProjectRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listProjects:query", "ProjectionSnapshotQuery.getShellSnapshot:listProjects:decodeRows"))),
-			listThreadRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listThreads:query", "ProjectionSnapshotQuery.getShellSnapshot:listThreads:decodeRows"))),
-			listThreadSessionRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listThreadSessions:query", "ProjectionSnapshotQuery.getShellSnapshot:listThreadSessions:decodeRows"))),
-			listLatestTurnRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listLatestTurns:query", "ProjectionSnapshotQuery.getShellSnapshot:listLatestTurns:decodeRows"))),
-			listProjectionStateRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:query", "ProjectionSnapshotQuery.getShellSnapshot:listProjectionState:decodeRows")))
+			listProjectRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listProjects:query`, `ProjectionSnapshotQuery.${operation}:listProjects:decodeRows`))),
+			listThreads(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listThreads:query`, `ProjectionSnapshotQuery.${operation}:listThreads:decodeRows`))),
+			listThreadSessionRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listThreadSessions:query`, `ProjectionSnapshotQuery.${operation}:listThreadSessions:decodeRows`))),
+			listLatestTurnRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listLatestTurns:query`, `ProjectionSnapshotQuery.${operation}:listLatestTurns:decodeRows`))),
+			listProjectionStateRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError(`ProjectionSnapshotQuery.${operation}:listProjectionState:query`, `ProjectionSnapshotQuery.${operation}:listProjectionState:decodeRows`)))
 		])).pipe(require_Schema$1.flatMap(([projectRows, threadRows, sessionRows, latestTurnRows, stateRows]) => require_Schema$1.gen(function* () {
 			let updatedAt = null;
 			for (const row of projectRows) updatedAt = maxIso(updatedAt, row.updatedAt);
@@ -302591,12 +302760,14 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
 				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(require_Schema$1.mapError(toPersistenceDecodeError("ProjectionSnapshotQuery.getShellSnapshot:decodeShellSnapshot")));
+			}).pipe(require_Schema$1.mapError(toPersistenceDecodeError(`ProjectionSnapshotQuery.${operation}:decodeShellSnapshot`)));
 		})), require_Schema$1.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(require_Schema$1.all([
 		listActiveWorkerThreadRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.listActiveWorkerShells:listThreads:query", "ProjectionSnapshotQuery.listActiveWorkerShells:listThreads:decodeRows"))),
 		listActiveWorkerSessionRows(void 0).pipe(require_Schema$1.mapError(toPersistenceSqlOrDecodeError("ProjectionSnapshotQuery.listActiveWorkerShells:listThreadSessions:query", "ProjectionSnapshotQuery.listActiveWorkerShells:listThreadSessions:decodeRows"))),
@@ -302764,6 +302935,7 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
 	return {
 		getSnapshot,
 		getShellSnapshot,
+		getArchivedShellSnapshot,
 		listActiveWorkerShells,
 		listStaleRunningSessionShells,
 		getCounts,
@@ -306785,7 +306957,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",
@@ -306795,7 +306966,7 @@ const AUTHORITY_UPGRADE_OPERATION_KEYS = new Set([
 	"attemptCount",
 	"expectedCredentialEpoch",
 	"resultingCredentialEpoch",
-	"targetForgeGitCommit",
+	"targetForgeServerVersion",
 	"retryAt",
 	"completedAt",
 	"failureCode"
@@ -306863,7 +307034,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",
@@ -306880,6 +307051,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
@@ -307043,13 +307215,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;
@@ -307229,7 +307401,7 @@ function classifyInitialConnection(outcome, runtimeId, trustedRuntimeRouterBaseU
 		}
 	};
 }
-function reconnectExactRuntime(input, targetForgeGitCommit) {
+function reconnectExactRuntime(input, targetForgeServerVersion) {
 	return require_Schema$1.gen(function* () {
 		const connectPath = `/api/forge/context/runtimes/${encodeURIComponent(input.runtimeId)}/connect`;
 		const reconnected = yield* postRuntimeProviderCmmd({
@@ -307246,7 +307418,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
@@ -307257,7 +307429,7 @@ function reconnectExactRuntime(input, targetForgeGitCommit) {
 	});
 }
 function resolveOperation(input, operation) {
-	return operation.status === "completed" ? reconnectExactRuntime(input, operation.targetForgeGitCommit) : require_Schema$1.succeed(pendingOperation(operation));
+	return operation.status === "completed" ? reconnectExactRuntime(input, operation.targetForgeServerVersion) : require_Schema$1.succeed(pendingOperation(operation));
 }
 function beginExactRuntimeConnection(input) {
 	return require_Schema$1.gen(function* () {