@cmmd-center/forge 0.13.81 → 0.13.83

package/dist/bin.cjs

@@ -66275,7 +66275,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.13.81";
+var version$1 = "0.13.83";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -80176,10 +80176,7 @@ function dedupeChecks(entries) {
 	for (const entry of survivors) countsByName.set(entry.check.name, (countsByName.get(entry.check.name) ?? 0) + 1);
 	return survivors.map((entry) => {
 		const workflowName = entry.workflowName ?? "";
-		return workflowName.length > 0 && (countsByName.get(entry.check.name) ?? 0) > 1 ? {
-			...entry.check,
-			name: `${workflowName} / ${entry.check.name}`
-		} : entry.check;
+		return workflowName.length > 0 && (countsByName.get(entry.check.name) ?? 0) > 1 ? Object.assign({}, entry.check, { name: `${workflowName} / ${entry.check.name}` }) : entry.check;
 	});
 }
 //#endregion
@@ -87555,13 +87552,8 @@ const make$21 = require_Schema$1.gen(function* () {
 			author: withAvatar(pullRequest.author, reviewThreads.avatarsByLogin, input.host),
 			reviewers: reviewThreads.reviewers,
 			reactions: reviewThreads.reactions,
-			commits: (reviewThreads.commits.length > 0 ? reviewThreads.commits : pullRequest.commits).map((commit) => ({
-				...commit,
-				...reviewThreads.commitStats.get(commit.oid),
-				authors: commit.authors?.map((author) => withAvatar(author, reviewThreads.avatarsByLogin, input.host) ?? author)
-			})),
-			comments: [...pullRequest.comments, ...reviewThreads.comments].map((comment) => ({
-				...comment,
+			commits: (reviewThreads.commits.length > 0 ? reviewThreads.commits : pullRequest.commits).map((commit) => Object.assign({}, commit, reviewThreads.commitStats.get(commit.oid), { authors: commit.authors?.map((author) => withAvatar(author, reviewThreads.avatarsByLogin, input.host) ?? author) })),
+			comments: [...pullRequest.comments, ...reviewThreads.comments].map((comment) => Object.assign({}, comment, {
 				body: comment.kind === "review" && comment.reviewState?.toUpperCase() === "DISMISSED" && rendersEmpty(comment.body) ? reviewThreads.dismissalsByReviewId.get(comment.id) ?? comment.body : comment.body,
 				author: withAvatar(comment.author, reviewThreads.avatarsByLogin, input.host),
 				reactions: comment.reactions ?? reviewThreads.reactionsById.get(comment.id) ?? []
@@ -151788,7 +151780,7 @@ const OPENAI_PROXY_ENV_KEYS = ["OPENAI_API_KEY", "OPENAI_BASE_URL"];
 function personalCodexServedByControlPlane(env = process.env) {
 	return env.FORGE_CMMD_RUNTIME_MODE === "true" && env.FORGE_PERSONAL_CODEX_VIA_EGRESS === "true";
 }
-function resolveCodexAccessMode(input) {
+function resolveCodexAccessMode$1(input) {
 	if (clampWorkspaceAccessMode(input.accessMode) === "workspace") return "workspace";
 	if (personalCodexServedByControlPlane(input.env ?? process.env)) return "workspace";
 	if (!input.hasCodexChatGptLogin()) throw personalCodexAuthError("This runtime is not signed in to ChatGPT. Open Settings > Providers and connect ChatGPT on this runtime.");
@@ -153506,7 +153498,7 @@ var CodexAppServerManager = class extends node_events.EventEmitter {
 				cwd: resolvedCwd,
 				...codexHomePath ? { homePath: codexHomePath } : {}
 			});
-			const accessMode = resolveCodexAccessMode({
+			const accessMode = resolveCodexAccessMode$1({
 				accessMode: input.accessMode ?? "workspace",
 				hasCodexChatGptLogin: () => hasCodexChatGptLogin({
 					binaryPath: codexBinaryPath,
@@ -223465,6 +223457,9 @@ const makeTerminationError = (handle) => require_Schema$1.match(handle.exitCode,
 });
 //#endregion
 //#region ../../packages/effect-acp/src/client.ts
+function runNotificationHandlers(registration, notification) {
+	return require_Schema$1.forEach(registration.handlers, (handler) => handler(notification).pipe(require_Schema$1.catch_(() => require_Schema$1.void_)), { discard: true });
+}
 var AcpClient = class extends require_Schema$1.Service()("effect-acp/AcpClient") {};
 const make$12 = require_Schema$1.fn("effect-acp/AcpClient.make")(function* (stdio, options = {}, terminationError) {
 	const coreHandlers = {};
@@ -223482,7 +223477,6 @@ const make$12 = require_Schema$1.fn("effect-acp/AcpClient.make")(function* (stdi
 	const extNotificationHandlers = /* @__PURE__ */ new Map();
 	let unknownExtRequestHandler;
 	let unknownExtNotificationHandler;
-	const runNotificationHandlers = (registration, notification) => require_Schema$1.forEach(registration.handlers, (handler) => handler(notification).pipe(require_Schema$1.catch_(() => require_Schema$1.void_)), { discard: true });
 	const flushBufferedNotifications = (registration) => require_Schema$1.suspend$1(() => {
 		if (registration.handlers.length === 0 || registration.pending.length === 0) return require_Schema$1.void_;
 		const pending = registration.pending.splice(0, registration.pending.length);
@@ -237727,6 +237721,34 @@ const CodexProviderLive = require_Schema$1.effect(CodexProvider, require_Schema$
 //#region src/git/Layers/CodexTextGeneration.ts
 const CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT = "low";
 const CODEX_TIMEOUT_MS = 18e4;
+const readCodexStreamAsString = (operation, stream) => stream.pipe(require_Path.decodeText(), require_Path.runFold(() => "", (acc, chunk) => acc + chunk), require_Schema$1.mapError((cause) => normalizeCliError("codex", operation, cause, "Failed to collect process output")));
+function buildCodexExecArgs(input) {
+	return [
+		"exec",
+		"--ephemeral",
+		"--skip-git-repo-check",
+		"-s",
+		"read-only",
+		"--model",
+		input.model,
+		"--config",
+		`model_reasoning_effort="${input.reasoningEffort}"`,
+		"--config",
+		`project_doc_max_bytes=${CODEX_PROJECT_DOC_MAX_BYTES}`,
+		...input.fastMode ? ["--config", `service_tier="fast"`] : [],
+		"--output-schema",
+		input.schemaPath,
+		"--output-last-message",
+		input.outputPath,
+		"--json",
+		...input.imagePaths.flatMap((imagePath) => ["--image", imagePath]),
+		"-"
+	];
+}
+function resolveCodexAccessMode(configuredAccessMode) {
+	const accessMode = clampWorkspaceAccessMode(configuredAccessMode);
+	return accessMode === "personal" && personalCodexServedByControlPlane() ? "workspace" : accessMode;
+}
 /**
 * Byte budget Codex spends on `AGENTS.md` when it builds project instructions.
 * The Codex config reference defines `project_doc_max_bytes` as "Maximum bytes
@@ -237748,7 +237770,6 @@ const makeCodexTextGeneration = require_Schema$1.gen(function* () {
 	const serverConfig = yield* require_Schema$1.service(ServerConfig);
 	const serverSettingsService = yield* require_Schema$1.service(ServerSettingsService);
 	const textGenerationUsage = yield* require_Schema$1.service(TextGenerationUsage);
-	const readStreamAsString = (operation, stream) => stream.pipe(require_Path.decodeText(), require_Path.runFold(() => "", (acc, chunk) => acc + chunk), require_Schema$1.mapError((cause) => normalizeCliError("codex", operation, cause, "Failed to collect process output")));
 	const writeTempFile = (operation, prefix, content) => {
 		return fileSystem.makeTempFileScoped({ prefix: `forge-${prefix}-${process.pid}-${(0, node_crypto.randomUUID)()}.tmp` }).pipe(require_Schema$1.tap((filePath) => fileSystem.writeFileString(filePath, content)), require_Schema$1.mapError((cause) => new TextGenerationError({
 			operation,
@@ -237836,39 +237857,47 @@ const makeCodexTextGeneration = require_Schema$1.gen(function* () {
 		const outputPath = yield* writeTempFile(operation, "codex-output", "");
 		const workingDirectory = yield* makeNeutralWorkingDirectory(operation);
 		const codexSettings = yield* require_Schema$1.map(serverSettingsService.getSettings, (settings) => settings.providers.codex).pipe(require_Schema$1.catch_(() => require_Schema$1.undefined_));
-		const runCodexCommand = require_Schema$1.fn("runCodexJson.runCodexCommand")(function* () {
+		const launchCodexCommand = (command) => require_Schema$1.gen(function* () {
+			const child = yield* commandSpawner.spawn(command).pipe(require_Schema$1.mapError((cause) => normalizeCliError("codex", operation, cause, "Failed to spawn Codex CLI process")));
+			const [stdout, stderr, exitCode] = yield* require_Schema$1.all([
+				readCodexStreamAsString(operation, child.stdout),
+				readCodexStreamAsString(operation, child.stderr),
+				child.exitCode.pipe(require_Schema$1.mapError((cause) => normalizeCliError("codex", operation, cause, "Failed to read Codex CLI exit code")))
+			], { concurrency: "unbounded" });
+			if (exitCode === 0) return stdout;
+			const detail = stderr.trim() || stdout.trim();
+			return yield* new TextGenerationError({
+				operation,
+				detail: detail.length > 0 ? `Codex CLI command failed: ${detail}` : `Codex CLI command failed with code ${exitCode}.`
+			});
+		});
+		const resolveCodexCommandTarget = require_Schema$1.fn("runCodexJson.resolveCommandTarget")(function* () {
 			const normalizedOptions = normalizeCodexModelOptionsWithCapabilities(getCodexModelCapabilities(modelSelection.model), modelSelection.options);
 			const reasoningEffort = modelSelection.options?.reasoningEffort ?? CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;
-			const clampedAccessMode = clampWorkspaceAccessMode(codexSettings?.accessMode ?? "workspace");
-			const accessMode = clampedAccessMode === "personal" && personalCodexServedByControlPlane() ? "workspace" : clampedAccessMode;
-			const providerProxyToken = yield* resolveCodexProviderProxyToken({
-				operation,
+			const accessMode = resolveCodexAccessMode(codexSettings?.accessMode ?? "workspace");
+			return {
+				normalizedOptions,
+				reasoningEffort,
 				accessMode,
+				providerProxyToken: yield* resolveCodexProviderProxyToken({
+					operation,
+					accessMode,
+					model: modelSelection.model,
+					...threadId ? { threadId } : {},
+					authSessionId
+				})
+			};
+		});
+		const runCodexCommand = require_Schema$1.fn("runCodexJson.runCodexCommand")(function* () {
+			const { normalizedOptions, reasoningEffort, accessMode, providerProxyToken } = yield* resolveCodexCommandTarget();
+			return yield* launchCodexCommand(require_NodeTerminal.make$2(codexSettings?.binaryPath || "codex", buildCodexExecArgs({
 				model: modelSelection.model,
-				...threadId ? { threadId } : {},
-				authSessionId
-			});
-			const command = require_NodeTerminal.make$2(codexSettings?.binaryPath || "codex", [
-				"exec",
-				"--ephemeral",
-				"--skip-git-repo-check",
-				"-s",
-				"read-only",
-				"--model",
-				modelSelection.model,
-				"--config",
-				`model_reasoning_effort="${reasoningEffort}"`,
-				"--config",
-				`project_doc_max_bytes=${CODEX_PROJECT_DOC_MAX_BYTES}`,
-				...normalizedOptions?.fastMode ? ["--config", `service_tier="fast"`] : [],
-				"--output-schema",
+				reasoningEffort,
+				fastMode: normalizedOptions?.fastMode,
 				schemaPath,
-				"--output-last-message",
 				outputPath,
-				"--json",
-				...imagePaths.flatMap((imagePath) => ["--image", imagePath]),
-				"-"
-			], {
+				imagePaths
+			}), {
 				env: scrubForgeProviderChildEnvSecrets(buildCodexProcessEnv({
 					baseEnv: process.env,
 					accessMode,
@@ -237881,23 +237910,7 @@ const makeCodexTextGeneration = require_Schema$1.gen(function* () {
 				cwd: workingDirectory,
 				shell: process.platform === "win32",
 				stdin: { stream: require_Path.encodeText(require_Path.make$1(prompt)) }
-			});
-			const child = yield* commandSpawner.spawn(command).pipe(require_Schema$1.mapError((cause) => normalizeCliError("codex", operation, cause, "Failed to spawn Codex CLI process")));
-			const [stdout, stderr, exitCode] = yield* require_Schema$1.all([
-				readStreamAsString(operation, child.stdout),
-				readStreamAsString(operation, child.stderr),
-				child.exitCode.pipe(require_Schema$1.mapError((cause) => normalizeCliError("codex", operation, cause, "Failed to read Codex CLI exit code")))
-			], { concurrency: "unbounded" });
-			if (exitCode !== 0) {
-				const stderrDetail = stderr.trim();
-				const stdoutDetail = stdout.trim();
-				const detail = stderrDetail.length > 0 ? stderrDetail : stdoutDetail;
-				return yield* new TextGenerationError({
-					operation,
-					detail: detail.length > 0 ? `Codex CLI command failed: ${detail}` : `Codex CLI command failed with code ${exitCode}.`
-				});
-			}
-			return stdout;
+			}));
 		});
 		const cleanup = require_Schema$1.all([...[
 			schemaPath,
@@ -238037,6 +238050,7 @@ const CodexTextGenerationLive = require_Schema$1.effect(TextGeneration, makeCode
 * @module ClaudeTextGeneration
 */
 const CLAUDE_TIMEOUT_MS = 18e4;
+const readClaudeStreamAsString = (operation, stream) => stream.pipe(require_Path.decodeText(), require_Path.runFold(() => "", (acc, chunk) => acc + chunk), require_Schema$1.mapError((cause) => normalizeCliError("claude", operation, cause, "Failed to collect process output")));
 /**
 * Schema for the wrapper JSON returned by `claude -p --output-format json`.
 * We only care about `structured_output`.
@@ -238072,7 +238086,6 @@ const makeClaudeTextGeneration = require_Schema$1.gen(function* () {
 			...report.providerSessionId ? { providerSessionId: report.providerSessionId } : {}
 		});
 	});
-	const readStreamAsString = (operation, stream) => stream.pipe(require_Path.decodeText(), require_Path.runFold(() => "", (acc, chunk) => acc + chunk), require_Schema$1.mapError((cause) => normalizeCliError("claude", operation, cause, "Failed to collect process output")));
 	/**
 	* Spawn the Claude CLI with structured JSON output and return the parsed,
 	* schema-validated result.
@@ -238105,8 +238118,8 @@ const makeClaudeTextGeneration = require_Schema$1.gen(function* () {
 			});
 			const child = yield* commandSpawner.spawn(command).pipe(require_Schema$1.mapError((cause) => normalizeCliError("claude", operation, cause, "Failed to spawn Claude CLI process")));
 			const [stdout, stderr, exitCode] = yield* require_Schema$1.all([
-				readStreamAsString(operation, child.stdout),
-				readStreamAsString(operation, child.stderr),
+				readClaudeStreamAsString(operation, child.stdout),
+				readClaudeStreamAsString(operation, child.stderr),
 				child.exitCode.pipe(require_Schema$1.mapError((cause) => normalizeCliError("claude", operation, cause, "Failed to read Claude CLI exit code")))
 			], { concurrency: "unbounded" });
 			if (exitCode !== 0) {
@@ -238503,6 +238516,21 @@ var TerminalProcessSignalError = class extends require_Schema$1.TaggedErrorClass
 	cause: require_Schema$1.optional(require_Schema$1.Defect),
 	signal: require_Schema$1.Literals(["SIGTERM", "SIGKILL"])
 }) {};
+function toTerminalHistoryError(operation, threadId, terminalId) {
+	return (cause) => new TerminalHistoryError({
+		operation,
+		threadId,
+		terminalId,
+		cause
+	});
+}
+function requireRunningProcess(session) {
+	if (session.process && session.status === "running") return require_Schema$1.succeed(session.process);
+	return require_Schema$1.fail(new TerminalNotRunningError({
+		threadId: session.threadId,
+		terminalId: session.terminalId
+	}));
+}
 const MAX_TERMINAL_CONTROL_RECEIPTS = 256;
 function terminalControlPayloadHash(method, payload) {
 	return (0, node_crypto.createHash)("sha256").update(method).update("\0").update(payload).digest("base64url");
@@ -238948,12 +238976,6 @@ const makeTerminalManagerWithOptions = require_Schema$1.fn("makeTerminalManagerW
 		return node_path.default.join(logsDir, `${threadPart}_${toSafeTerminalId(terminalId)}.log`);
 	};
 	const legacyHistoryPath = (threadId) => node_path.default.join(logsDir, `${legacySafeThreadId(threadId)}.log`);
-	const toTerminalHistoryError = (operation, threadId, terminalId) => (cause) => new TerminalHistoryError({
-		operation,
-		threadId,
-		terminalId,
-		cause
-	});
 	const readManagerState = get$2(managerStateRef);
 	const modifyManagerState = (f) => modify$2(managerStateRef, f);
 	const getThreadSemaphore = (threadId) => modifyEffect(threadLocksRef, (current) => {
@@ -239616,13 +239638,6 @@ const makeTerminalManagerWithOptions = require_Schema$1.fn("makeTerminalManagerW
 			transitionReceipts.delete(oldest);
 		}
 	};
-	const requireRunningProcess = (session) => {
-		if (session.process && session.status === "running") return require_Schema$1.succeed(session.process);
-		return require_Schema$1.fail(new TerminalNotRunningError({
-			threadId: session.threadId,
-			terminalId: session.terminalId
-		}));
-	};
 	const write = require_Schema$1.fn("terminal.write")(function* (input) {
 		const terminalId = input.terminalId ?? "default";
 		const session = yield* requireSession(input.threadId, terminalId);
@@ -292599,7 +292614,7 @@ function mapProviderSessionStatusToOrchestrationStatus(status) {
 	}
 }
 const turnStartKeyForEvent = (event) => event.commandId !== null ? `command:${event.commandId}` : `event:${event.eventId}`;
-const serverCommandId$1 = (tag) => CommandId.make(`server:${tag}:${crypto.randomUUID()}`);
+const serverCommandId$2 = (tag) => CommandId.make(`server:${tag}:${crypto.randomUUID()}`);
 const HANDLED_TURN_START_KEY_MAX = 1e4;
 const HANDLED_TURN_START_KEY_TTL = require_Schema$1.minutes(30);
 const DEFAULT_RUNTIME_MODE = "full-access";
@@ -293021,7 +293036,7 @@ const make$8 = require_Schema$1.gen(function* () {
 	const threadSessionAccountIds = /* @__PURE__ */ new Map();
 	const appendProviderFailureActivity = (input) => orchestrationEngine.dispatch({
 		type: "thread.activity.append",
-		commandId: serverCommandId$1("provider-failure-activity"),
+		commandId: serverCommandId$2("provider-failure-activity"),
 		threadId: input.threadId,
 		activity: {
 			id: EventId.make(crypto.randomUUID()),
@@ -293039,7 +293054,7 @@ const make$8 = require_Schema$1.gen(function* () {
 	});
 	const setThreadSession = (input) => orchestrationEngine.dispatch({
 		type: "thread.session.set",
-		commandId: serverCommandId$1("provider-session-set"),
+		commandId: serverCommandId$2("provider-session-set"),
 		threadId: input.threadId,
 		session: input.session,
 		createdAt: input.createdAt
@@ -293071,7 +293086,7 @@ const make$8 = require_Schema$1.gen(function* () {
 		const desiredRuntimeMode = thread.runtimeMode;
 		const currentProvider = thread.session?.status !== "stopped" && isProviderKind(thread.session?.providerName) ? thread.session.providerName : void 0;
 		const requestedModelSelection = options?.modelSelection;
-		const threadProvider = currentProvider ?? requestedModelSelection?.provider ?? thread.modelSelection.provider;
+		const threadProvider = requestedModelSelection?.provider ?? currentProvider ?? thread.modelSelection.provider;
 		const desiredModelSelection = requestedModelSelection ?? thread.modelSelection;
 		const effectiveCwd = resolveThreadWorkspaceCwd({
 			thread,
@@ -293322,7 +293337,7 @@ const make$8 = require_Schema$1.gen(function* () {
 			});
 			yield* orchestrationEngine.dispatch({
 				type: "thread.meta.update",
-				commandId: serverCommandId$1("worktree-branch-rename"),
+				commandId: serverCommandId$2("worktree-branch-rename"),
 				threadId: input.threadId,
 				branch: renamed.branch,
 				worktreePath: cwd
@@ -293361,7 +293376,7 @@ const make$8 = require_Schema$1.gen(function* () {
 			if (!canReplaceThreadTitle(thread.title, input.titleSeed)) return;
 			yield* orchestrationEngine.dispatch({
 				type: "thread.meta.update",
-				commandId: serverCommandId$1("thread-title-rename"),
+				commandId: serverCommandId$2("thread-title-rename"),
 				threadId: input.threadId,
 				title: generated.title
 			});
@@ -293424,7 +293439,7 @@ const make$8 = require_Schema$1.gen(function* () {
 	const dispatchThreadTitleRegenerationCompletion = require_Schema$1.fn("dispatchThreadTitleRegenerationCompletion")(function* (input) {
 		yield* orchestrationEngine.dispatch({
 			type: "thread.title.regeneration.complete",
-			commandId: serverCommandId$1("thread-title-regeneration-complete"),
+			commandId: serverCommandId$2("thread-title-regeneration-complete"),
 			threadId: input.threadId,
 			requestId: input.requestId,
 			...input.title !== void 0 ? { title: input.title } : {}
@@ -293733,7 +293748,7 @@ const make$8 = require_Schema$1.gen(function* () {
 	});
 	const appendRecoverableTurnStartTimeout = (event) => orchestrationEngine.dispatch({
 		type: "thread.activity.append",
-		commandId: serverCommandId$1("provider-turn-start-timeout"),
+		commandId: serverCommandId$2("provider-turn-start-timeout"),
 		threadId: event.payload.threadId,
 		activity: {
 			id: EventId.make(crypto.randomUUID()),
@@ -294567,7 +294582,13 @@ function isGitOutputLimitError(error) {
 	const text = `${"detail" in error && typeof error.detail === "string" ? error.detail : ""}\n${"message" in error && typeof error.message === "string" ? error.message : ""}`;
 	return text.includes("output exceeded") && text.includes("bytes and was truncated");
 }
-const serverCommandId = (tag) => CommandId.make(`server:${tag}:${crypto.randomUUID()}`);
+const serverCommandId$1 = (tag) => CommandId.make(`server:${tag}:${crypto.randomUUID()}`);
+function findSessionWithCwd(session) {
+	return session?.cwd ? require_Schema$1.some({
+		threadId: session.threadId,
+		cwd: session.cwd
+	}) : require_Schema$1.none();
+}
 const make$7 = require_Schema$1.gen(function* () {
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const providerService = yield* ProviderService;
@@ -294577,7 +294598,7 @@ const make$7 = require_Schema$1.gen(function* () {
 	const gitStatusBroadcaster = yield* GitStatusBroadcaster;
 	const appendRevertFailureActivity = (input) => orchestrationEngine.dispatch({
 		type: "thread.activity.append",
-		commandId: serverCommandId("checkpoint-revert-failure"),
+		commandId: serverCommandId$1("checkpoint-revert-failure"),
 		threadId: input.threadId,
 		activity: {
 			id: EventId.make(crypto.randomUUID()),
@@ -294595,7 +294616,7 @@ const make$7 = require_Schema$1.gen(function* () {
 	});
 	const appendCaptureFailureActivity = (input) => orchestrationEngine.dispatch({
 		type: "thread.activity.append",
-		commandId: serverCommandId("checkpoint-capture-failure"),
+		commandId: serverCommandId$1("checkpoint-capture-failure"),
 		threadId: input.threadId,
 		activity: {
 			id: EventId.make(crypto.randomUUID()),
@@ -294613,7 +294634,7 @@ const make$7 = require_Schema$1.gen(function* () {
 	});
 	const appendDiffSummarySkippedActivity = (input) => orchestrationEngine.dispatch({
 		type: "thread.activity.append",
-		commandId: serverCommandId("checkpoint-diff-summary-skipped"),
+		commandId: serverCommandId$1("checkpoint-diff-summary-skipped"),
 		threadId: input.threadId,
 		activity: {
 			id: EventId.make(crypto.randomUUID()),
@@ -294629,20 +294650,12 @@ const make$7 = require_Schema$1.gen(function* () {
 	const resolveSessionRuntimeForThread = require_Schema$1.fn("resolveSessionRuntimeForThread")(function* (threadId) {
 		const thread = (yield* orchestrationEngine.getReadModel()).threads.find((entry) => entry.id === threadId);
 		const sessions = yield* providerService.listSessions();
-		const findSessionWithCwd = (session) => {
-			if (!session?.cwd) return require_Schema$1.none();
-			return require_Schema$1.some({
-				threadId: session.threadId,
-				cwd: session.cwd
-			});
-		};
 		if (thread) {
 			const fromProjected = findSessionWithCwd(sessions.find((session) => session.threadId === thread.id));
 			if (require_Schema$1.isSome(fromProjected)) return fromProjected;
 		}
 		return require_Schema$1.none();
 	});
-	const isGitWorkspace = (cwd) => isGitRepository(cwd);
 	const resolveCheckpointCwd = require_Schema$1.fn("resolveCheckpointCwd")(function* (input) {
 		const fromSession = yield* resolveSessionRuntimeForThread(input.threadId);
 		const fromThread = resolveThreadWorkspaceCwd({
@@ -294657,7 +294670,7 @@ const make$7 = require_Schema$1.gen(function* () {
 			onSome: (runtime) => runtime.cwd
 		});
 		if (!cwd) return;
-		if (!isGitWorkspace(cwd)) return;
+		if (!isGitRepository(cwd)) return;
 		return cwd;
 	});
 	const captureAndDispatchCheckpoint = require_Schema$1.fn("captureAndDispatchCheckpoint")(function* (input) {
@@ -294717,7 +294730,7 @@ const make$7 = require_Schema$1.gen(function* () {
 		const assistantMessageId = input.assistantMessageId ?? input.thread.messages.toReversed().find((entry) => entry.role === "assistant" && entry.turnId === input.turnId)?.id ?? MessageId.make(`assistant:${input.turnId}`);
 		yield* orchestrationEngine.dispatch({
 			type: "thread.turn.diff.complete",
-			commandId: serverCommandId("checkpoint-turn-diff-complete"),
+			commandId: serverCommandId$1("checkpoint-turn-diff-complete"),
 			threadId: input.threadId,
 			turnId: input.turnId,
 			completedAt: input.createdAt,
@@ -294746,7 +294759,7 @@ const make$7 = require_Schema$1.gen(function* () {
 		});
 		yield* orchestrationEngine.dispatch({
 			type: "thread.activity.append",
-			commandId: serverCommandId("checkpoint-captured-activity"),
+			commandId: serverCommandId$1("checkpoint-captured-activity"),
 			threadId: input.threadId,
 			activity: {
 				id: EventId.make(crypto.randomUUID()),
@@ -294928,7 +294941,7 @@ const make$7 = require_Schema$1.gen(function* () {
 			}).pipe(require_Schema$1.catch_(() => require_Schema$1.void_));
 			return;
 		}
-		if (!isGitWorkspace(sessionRuntime.value.cwd)) {
+		if (!isGitRepository(sessionRuntime.value.cwd)) {
 			yield* appendRevertFailureActivity({
 				threadId: event.payload.threadId,
 				turnCount: event.payload.turnCount,
@@ -294984,7 +294997,7 @@ const make$7 = require_Schema$1.gen(function* () {
 		});
 		yield* orchestrationEngine.dispatch({
 			type: "thread.revert.complete",
-			commandId: serverCommandId("checkpoint-revert-complete"),
+			commandId: serverCommandId$1("checkpoint-revert-complete"),
 			threadId: event.payload.threadId,
 			turnCount: event.payload.turnCount,
 			createdAt: now
@@ -299323,7 +299336,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "657f7114dd9dda1b9eda0962d4bafff6d35a928b";
+	return "f79faf155154414eb732bc0ef180d7b98f2b7888";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;
@@ -300720,6 +300733,15 @@ var AuthPairingLinkRepository = class extends require_Schema$1.Service()("forge/
 function toPersistenceSqlOrDecodeError$4(sqlOperation, decodeOperation) {
 	return (cause) => require_Schema$1.isSchemaError(cause) ? toPersistenceDecodeError(decodeOperation)(cause) : toPersistenceSqlError(sqlOperation)(cause);
 }
+function decodeCredential(row) {
+	return require_Schema$1.try_({
+		try: () => ({
+			...row,
+			credential: decodeSensitiveValue("auth-pairing-link", row.credential)
+		}),
+		catch: toPersistenceDecodeDefect("AuthPairingLinkRepository.decryptCredential")
+	});
+}
 const makeAuthPairingLinkRepository = require_Schema$1.gen(function* () {
 	const sql = yield* require_SqlError.SqlClient;
 	const StoredCreateAuthPairingLinkInput = require_Schema$1.Struct({
@@ -300841,13 +300863,6 @@ const makeAuthPairingLinkRepository = require_Schema$1.gen(function* () {
         WHERE credential_lookup = ${credentialLookup}
       `
 	});
-	const decodeCredential = (row) => require_Schema$1.try_({
-		try: () => ({
-			...row,
-			credential: decodeSensitiveValue("auth-pairing-link", row.credential)
-		}),
-		catch: toPersistenceDecodeDefect("AuthPairingLinkRepository.decryptCredential")
-	});
 	const create = (input) => createPairingLinkRow({
 		...input,
 		credential: encodeSensitiveValue("auth-pairing-link", input.credential),
@@ -303277,8 +303292,10 @@ const decideOrchestrationCommand = require_Schema$1.fn("decideOrchestrationComma
 				}
 			};
 			const shouldUpdateAnchor = targetThread.anchorKind !== nextAnchor.anchorKind || targetThread.anchorCmmdId !== nextAnchor.anchorCmmdId;
+			const providerSwitchSelection = command.modelSelection !== void 0 && command.modelSelection.provider !== targetThread.modelSelection.provider ? command.modelSelection : void 0;
 			const accountSelection = turnAccountSelection(targetThread.modelSelection, command.modelSelection);
-			if (!shouldUpdateAnchor && !accountSelection) return [userMessageEvent, turnStartRequestedEvent];
+			const turnModelSelection = providerSwitchSelection ?? accountSelection;
+			if (!shouldUpdateAnchor && !turnModelSelection) return [userMessageEvent, turnStartRequestedEvent];
 			return [
 				{
 					...withEventBase({
@@ -303292,7 +303309,7 @@ const decideOrchestrationCommand = require_Schema$1.fn("decideOrchestrationComma
 						threadId: command.threadId,
 						anchorKind: nextAnchor.anchorKind,
 						anchorCmmdId: nextAnchor.anchorCmmdId,
-						...accountSelection ? { modelSelection: accountSelection } : {},
+						...turnModelSelection ? { modelSelection: turnModelSelection } : {},
 						updatedAt: command.createdAt
 					}
 				},
@@ -313776,14 +313793,8 @@ function buildRuntimeUsageRowBatch(rows, cursor, batchSize = 500) {
 		previousHeadHash: cursor.headHash,
 		rows: capped.map((row, index) => {
 			const sequence = cursor.acknowledgedSequence + 1 + index;
-			return {
-				...row,
-				sequence,
-				payloadHash: hashRuntimeUsageRow({
-					...row,
-					sequence
-				})
-			};
+			const sequencedRow = Object.assign({}, row, { sequence });
+			return Object.assign(sequencedRow, { payloadHash: hashRuntimeUsageRow(sequencedRow) });
 		})
 	};
 }
@@ -316292,6 +316303,23 @@ const EXECUTABLE_STAGES = [
 ];
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
+function decodePersistedReport(item) {
+	let value;
+	try {
+		value = JSON.parse(item.payloadJson);
+	} catch {
+		return null;
+	}
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return null;
+	const report = value;
+	return [
+		report.stage === item.stage,
+		Number.isSafeInteger(report.attempt),
+		(report.attempt ?? 0) > 0,
+		Number.isSafeInteger(report.expectedLockVersion),
+		(report.expectedLockVersion ?? -1) >= 0
+	].every(Boolean) ? report : null;
+}
 function isRecord$2(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -317733,23 +317761,6 @@ const makePipelineRunCoordinator = require_Schema$1.gen(function* () {
 		})).applied) return yield* coordinatorError("reconcileTerminalHandoff", "PIPELINE_RECONCILE_CONFLICT", "The pipeline binding changed before its terminal state could be reconciled.");
 		yield* finalizeTerminalResources(binding, publicationGeneration);
 	}).pipe(require_Schema$1.mapError((cause) => cause instanceof PipelineRunCoordinatorError ? cause : coordinatorError("reconcileTerminalHandoff", "PIPELINE_RECONCILE_FAILED", `Failed to reconcile terminal CMMD run ${input.runId}.`, cause)));
-	const decodePersistedReport = (item) => {
-		let value;
-		try {
-			value = JSON.parse(item.payloadJson);
-		} catch {
-			return null;
-		}
-		if (value === null || typeof value !== "object" || Array.isArray(value)) return null;
-		const report = value;
-		return [
-			report.stage === item.stage,
-			Number.isSafeInteger(report.attempt),
-			(report.attempt ?? 0) > 0,
-			Number.isSafeInteger(report.expectedLockVersion),
-			(report.expectedLockVersion ?? -1) >= 0
-		].every(Boolean) ? report : null;
-	};
 	const synchronizeNonAppliedReport = (item, binding, authority, reportEpoch, currentEpoch) => require_Schema$1.gen(function* () {
 		const snapshot = yield* client.read({
 			runId: item.runId,
@@ -321679,6 +321690,9 @@ function requireMergeValue(value, message) {
 	if (value === null || value === void 0) throw new Error(message);
 	return value;
 }
+function serverCommandId(tag) {
+	return CommandId.make(`server:agent-protocol:${tag}:${crypto.randomUUID()}`);
+}
 const make = require_Schema$1.gen(function* () {
 	const orchestration = yield* OrchestrationEngineService;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
@@ -321690,7 +321704,6 @@ const make = require_Schema$1.gen(function* () {
 	const dispatch = (command) => runPromise(orchestration.dispatch(command).pipe(require_Schema$1.asVoid));
 	const readThread = (threadId) => runPromise(readDurableWorkerDetail(projectionSnapshotQuery, threadId)).then(require_Schema$1.getOrNull);
 	const readProject = (projectId) => runPromise(projectionSnapshotQuery.getProjectShellById(projectId)).then(require_Schema$1.getOrNull);
-	const serverCommandId = (tag) => CommandId.make(`server:agent-protocol:${tag}:${crypto.randomUUID()}`);
 	const appendActivity = async (input) => {
 		const createdAt = input.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
 		await dispatch({