@cmmd-center/forge 0.10.12 → 0.10.14

package/dist/bin.cjs

@@ -2,18 +2,18 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-BhaIgcZK.cjs");
-const require_Schema$1 = require("./Schema-Cf_uEUQU.cjs");
-const require_Path = require("./Path-CHDjKLrB.cjs");
-const require_NodeTerminal = require("./NodeTerminal-DfKMT-mE.cjs");
-const require_NodeServices = require("./NodeServices-pfwgkiUu.cjs");
-const require_HttpServer = require("./HttpServer-B-QOc7bR.cjs");
-const require_Config = require("./Config-e5bi-5Ut.cjs");
-const require_Cache = require("./Cache-D56wNKiH.cjs");
-const require_SqlError = require("./SqlError-Du_dEWbw.cjs");
+const require_Schema$1 = require("./Schema-dLi7Qssy.cjs");
+const require_Path = require("./Path-Be7zSwar.cjs");
+const require_NodeTerminal = require("./NodeTerminal-5iWbO0B2.cjs");
+const require_NodeServices = require("./NodeServices-Cw6SxEbl.cjs");
+const require_HttpServer = require("./HttpServer-DGoLR-kU.cjs");
+const require_Config = require("./Config-CkEzdD9L.cjs");
+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_PTY = require("./PTY-DB-DmqyE.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);
 let node_stream = require("node:stream");
@@ -18674,16 +18674,81 @@ const CLAUDE_CODE_EFFORT_OPTIONS = [
 const CODEX_DEFAULT_MODEL = "gpt-6-astra";
 const CODEX_SPARK_MODEL = "gpt-5.3-codex-spark";
 const CLAUDE_DEFAULT_MODEL = "claude-fable-5-1";
-const CodexModelOptions = require_Schema$1.Struct({
+/**
+* Generic option value carried by ACP-based provider adapters (cursor, opencode).
+* Used to pass per-turn options like reasoning effort or thinking toggles to
+* the agent without baking them into model-specific schemas.
+*
+* Mirrors t3code's @t3tools/contracts ProviderOptionSelection — required by
+* the ported ACP runtime (apps/server/src/provider/acp/*) so cursor + opencode
+* adapters can carry user-selected reasoning levels through the session.
+*/
+const ProviderOptionSelectionValue = require_Schema$1.Union([TrimmedNonEmptyString, require_Schema$1.Boolean]);
+const ProviderOptionSelection = require_Schema$1.Struct({
+	id: TrimmedNonEmptyString,
+	value: ProviderOptionSelectionValue
+});
+/**
+* The object form on its own, exported so callers that need the individual
+* field schemas can reach them. The exported `CodexModelOptions` below is a
+* union and has no `.fields`.
+*/
+const CodexModelOptionsObject = require_Schema$1.Struct({
 	reasoningEffort: require_Schema$1.optional(require_Schema$1.Literals(CODEX_REASONING_EFFORT_OPTIONS)),
 	fastMode: require_Schema$1.optional(require_Schema$1.Boolean)
 });
-const ClaudeModelOptions = require_Schema$1.Struct({
+/** The object form on its own; see {@link CodexModelOptionsObject}. */
+const ClaudeModelOptionsObject = require_Schema$1.Struct({
 	thinking: require_Schema$1.optional(require_Schema$1.Boolean),
 	effort: require_Schema$1.optional(require_Schema$1.Literals(CLAUDE_CODE_EFFORT_OPTIONS)),
 	fastMode: require_Schema$1.optional(require_Schema$1.Boolean),
 	contextWindow: require_Schema$1.optional(require_Schema$1.String)
 });
+/**
+* `[{ id, value }]` folded into `{ [id]: value }`.
+*
+* Duplicate ids keep the last, which is what an object literal would have done
+* had the sender used one.
+*/
+function selectionArrayToRecord(selections) {
+	const record = {};
+	for (const { id, value } of selections) record[id] = value;
+	return record;
+}
+function recordToSelectionArray(value) {
+	if (typeof value !== "object" || value === null) return [];
+	return Object.entries(value).flatMap(([id, entry]) => typeof entry === "string" || typeof entry === "boolean" ? [{
+		id,
+		value: entry
+	}] : []);
+}
+/**
+* Also accept the option array that t3code-derived clients send.
+*
+* Forge's own surfaces send `{ reasoningEffort: "high" }`. The vendored mobile
+* client encodes the same choice as `[{ id: "reasoningEffort", value: "high" }]`,
+* its canonical shape, and the two contract packages never compare notes. So a
+* person picking a reasoning effort on the phone produced a `startTurn` payload
+* the server refused outright with "Expected object, got [...]" — not a dropped
+* option, a turn that never ran at all.
+*
+* Tolerated here rather than changed in the vendored encoder: this accepts both
+* shapes from any client, while `@t3tools/contracts` keeps the canonical form
+* it shares with upstream. The array is normalised into the object the provider
+* adapters already read, so nothing downstream learns a second shape.
+*
+* The object member stays first because it is what every Forge surface sends.
+* `Schema.Struct` rejects an array outright rather than decoding it to an empty
+* object, so an array falls through to the member built for it.
+*/
+const CodexModelOptions = require_Schema$1.Union([CodexModelOptionsObject, require_Schema$1.ArraySchema(ProviderOptionSelection).pipe(require_Schema$1.decodeTo(CodexModelOptionsObject, require_Schema$1.transformOrFail({
+	decode: (selections) => require_Schema$1.succeed(selectionArrayToRecord(selections)),
+	encode: (value) => require_Schema$1.succeed(recordToSelectionArray(value))
+})))]);
+const ClaudeModelOptions = require_Schema$1.Union([ClaudeModelOptionsObject, require_Schema$1.ArraySchema(ProviderOptionSelection).pipe(require_Schema$1.decodeTo(ClaudeModelOptionsObject, require_Schema$1.transformOrFail({
+	decode: (selections) => require_Schema$1.succeed(selectionArrayToRecord(selections)),
+	encode: (value) => require_Schema$1.succeed(recordToSelectionArray(value))
+})))]);
 require_Schema$1.Struct({
 	codex: require_Schema$1.optional(CodexModelOptions),
 	claudeAgent: require_Schema$1.optional(ClaudeModelOptions),
@@ -18710,20 +18775,6 @@ const ModelCapabilities = require_Schema$1.Struct({
 	contextWindowOptions: require_Schema$1.ArraySchema(ContextWindowOption),
 	promptInjectedEffortLevels: require_Schema$1.ArraySchema(TrimmedNonEmptyString)
 });
-/**
-* Generic option value carried by ACP-based provider adapters (cursor, opencode).
-* Used to pass per-turn options like reasoning effort or thinking toggles to
-* the agent without baking them into model-specific schemas.
-*
-* Mirrors t3code's @t3tools/contracts ProviderOptionSelection — required by
-* the ported ACP runtime (apps/server/src/provider/acp/*) so cursor + opencode
-* adapters can carry user-selected reasoning levels through the session.
-*/
-const ProviderOptionSelectionValue = require_Schema$1.Union([TrimmedNonEmptyString, require_Schema$1.Boolean]);
-const ProviderOptionSelection = require_Schema$1.Struct({
-	id: TrimmedNonEmptyString,
-	value: ProviderOptionSelectionValue
-});
 function effortLabel(value) {
 	switch (value) {
 		case "xhigh": return "Extra High";
@@ -22376,14 +22427,14 @@ var ServerSettingsError = class extends require_Schema$1.TaggedErrorClass()("Ser
 	...DEFAULT_CLIENT_SETTINGS
 });
 const CodexModelOptionsPatch = require_Schema$1.Struct({
-	reasoningEffort: require_Schema$1.optionalKey(CodexModelOptions.fields.reasoningEffort),
-	fastMode: require_Schema$1.optionalKey(CodexModelOptions.fields.fastMode)
+	reasoningEffort: require_Schema$1.optionalKey(CodexModelOptionsObject.fields.reasoningEffort),
+	fastMode: require_Schema$1.optionalKey(CodexModelOptionsObject.fields.fastMode)
 });
 const ClaudeModelOptionsPatch = require_Schema$1.Struct({
-	thinking: require_Schema$1.optionalKey(ClaudeModelOptions.fields.thinking),
-	effort: require_Schema$1.optionalKey(ClaudeModelOptions.fields.effort),
-	fastMode: require_Schema$1.optionalKey(ClaudeModelOptions.fields.fastMode),
-	contextWindow: require_Schema$1.optionalKey(ClaudeModelOptions.fields.contextWindow)
+	thinking: require_Schema$1.optionalKey(ClaudeModelOptionsObject.fields.thinking),
+	effort: require_Schema$1.optionalKey(ClaudeModelOptionsObject.fields.effort),
+	fastMode: require_Schema$1.optionalKey(ClaudeModelOptionsObject.fields.fastMode),
+	contextWindow: require_Schema$1.optionalKey(ClaudeModelOptionsObject.fields.contextWindow)
 });
 const ModelSelectionPatch = require_Schema$1.Union([require_Schema$1.Struct({
 	provider: require_Schema$1.optionalKey(require_Schema$1.Literal("codex")),
@@ -65724,7 +65775,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.10.12";
+var version$1 = "0.10.14";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -75358,7 +75409,7 @@ const makeNoSerialization = /* @__PURE__ */ require_Schema$1.fnUntraced(function
 	const services = yield* require_Schema$1.context();
 	const scope = require_Schema$1.get(services, require_Schema$1.Scope);
 	const trackFiber = require_Path.runIn(require_Schema$1.forkUnsafe(scope, "parallel"));
-	const concurrencySemaphore = concurrency === "unbounded" ? void 0 : yield* require_Path.make$4(concurrency);
+	const concurrencySemaphore = concurrency === "unbounded" ? void 0 : yield* require_Path.make$5(concurrency);
 	const clients = /* @__PURE__ */ new Map();
 	let isShutdown = false;
 	const shutdownLatch = require_Path.makeUnsafe$1(false);
@@ -75767,7 +75818,7 @@ const toHttpEffectWebsocket = /* @__PURE__ */ require_Schema$1.fnUntraced(functi
 });
 const makeSocketProtocol = /* @__PURE__ */ require_Schema$1.gen(function* () {
 	const serialization = yield* RpcSerialization;
-	const disconnects = yield* require_Path.make$5();
+	const disconnects = yield* require_Path.make$6();
 	let clientId = 0;
 	const clients = /* @__PURE__ */ new Map();
 	const clientIds = /* @__PURE__ */ new Set();
@@ -82957,7 +83008,7 @@ const makeServerSettings = require_Schema$1.gen(function* () {
 	const { settingsPath } = yield* ServerConfig;
 	const fs = yield* require_Path.FileSystem;
 	const pathService = yield* require_Path.Path;
-	const writeSemaphore = yield* require_Path.make$4(1);
+	const writeSemaphore = yield* require_Path.make$5(1);
 	const cacheKey = "settings";
 	const changesPubSub = yield* require_Path.unbounded$1();
 	const startedRef = yield* require_HttpServer.make$3(false);
@@ -91805,7 +91856,7 @@ const makeKeybindings = require_Schema$1.gen(function* () {
 	const { keybindingsConfigPath } = yield* ServerConfig;
 	const fs = yield* require_Path.FileSystem;
 	const path = yield* require_Path.Path;
-	const upsertSemaphore = yield* require_Path.make$4(1);
+	const upsertSemaphore = yield* require_Path.make$5(1);
 	const resolvedConfigCacheKey = "resolved";
 	const changesPubSub = yield* require_Path.unbounded$1();
 	const startedRef = yield* require_HttpServer.make$3(false);
@@ -97710,7 +97761,7 @@ const make$15 = (hooks) => require_Schema$1.gen(function* () {
 	const selfRuntimeId = resolveRuntimeReplicationRuntimeId(config);
 	const scanScope = yield* require_Schema$1.make$3("sequential");
 	yield* require_Schema$1.addFinalizer(() => require_Schema$1.close(scanScope, require_Schema$1.void_$1));
-	const scanSemaphore = yield* require_Path.make$4(1);
+	const scanSemaphore = yield* require_Path.make$5(1);
 	const inFlight = /* @__PURE__ */ new Map();
 	const ratesCachePath = path.join(config.stateDir, RATES_CACHE_FILE);
 	const scanCachePath = path.join(config.stateDir, SCAN_CACHE_FILE);
@@ -98647,7 +98698,7 @@ const makeWorkspaceBulkTransfer = (options = {}) => require_Schema$1.gen(functio
 	const workspacePaths = yield* WorkspacePaths;
 	const workspaceEntries = yield* WorkspaceEntries;
 	const fault = options.fault ?? (() => require_Schema$1.void_);
-	const transferLocks = yield* require_Schema$1.forEach(Array.from({ length: TRANSFER_LOCK_STRIPE_COUNT }), () => require_Path.make$4(1));
+	const transferLocks = yield* require_Schema$1.forEach(Array.from({ length: TRANSFER_LOCK_STRIPE_COUNT }), () => require_Path.make$5(1));
 	const withTransferLock = (transferId, effect) => transferLocks[transferLockStripe(transferId)].withPermit(effect);
 	const findTransfer = (transferId) => sql`
         SELECT transfer_id AS "transferId", workspace_root AS "workspaceRoot",
@@ -116506,8 +116557,8 @@ require_Schema$1.effectDiscard(runMigrations());
 //#endregion
 //#region src/persistence/Layers/Sqlite.ts
 const defaultSqliteClientLoaders = {
-	bun: () => Promise.resolve().then(() => require("./SqliteClient-D4Srj6O8.cjs")),
-	node: () => Promise.resolve().then(() => require("./NodeSqliteClient-PZ6NN2gq.cjs"))
+	bun: () => Promise.resolve().then(() => require("./SqliteClient-B08FzZM4.cjs")),
+	node: () => Promise.resolve().then(() => require("./NodeSqliteClient-CmxPzcBf.cjs"))
 };
 const makeRuntimeSqliteLayer = require_Schema$1.fn("makeRuntimeSqliteLayer")(function* (config) {
 	const loader = defaultSqliteClientLoaders[process.versions.bun !== void 0 ? "bun" : "node"];
@@ -150144,6 +150195,23 @@ function issueCmmdLocalUserProviderEgressCredential(input) {
 	});
 }
 //#endregion
+//#region src/provider/codexAccountTransition.ts
+function explicitProviderAccountTransition(fromAccountId, toAccountId) {
+	if (!fromAccountId || !toAccountId || fromAccountId === toAccountId) return void 0;
+	return {
+		fromAccountId,
+		toAccountId
+	};
+}
+function permitsCodexAccountTransition(input) {
+	const { transition, requestedAccountId, prior, current } = input;
+	if (!transition || transition.fromAccountId === transition.toAccountId || transition.toAccountId !== requestedAccountId || prior.identity.kind !== "provider_account" || current.identity.kind !== "provider_account" || prior.identity.provider !== "codex" || current.identity.provider !== "codex") return false;
+	return providerDeliveryBindingsEqual({
+		...prior,
+		identity: current.identity
+	}, current);
+}
+//#endregion
 //#region src/providerAuth/codexLocalAccountIdentity.ts
 const ACCOUNT_IDENTITY_PATH = "/api/forge/context/providers/codex/account-identity";
 const PROVIDER_ACCOUNT_IDENTITY$1 = /^pai_v1_[A-Za-z0-9_-]{43}$/;
@@ -150641,7 +150709,12 @@ var CodexAppServerManager = class extends node_events.EventEmitter {
 				const rawPriorDeliveryBinding = input.resumeCursor.providerDeliveryBinding;
 				const priorDeliveryBinding = readProviderDeliveryBinding(rawPriorDeliveryBinding);
 				if (rawPriorDeliveryBinding !== void 0 && rawPriorDeliveryBinding !== null && !priorDeliveryBinding) throw new Error("Existing Codex history cannot resume because its persisted delivered provider account binding is unreadable.");
-				if (priorDeliveryBinding && !providerDeliveryBindingsEqual(priorDeliveryBinding, currentDeliveryBinding)) throw new Error("Existing Codex history cannot resume because the delivered provider account changed.");
+				if (priorDeliveryBinding && !providerDeliveryBindingsEqual(priorDeliveryBinding, currentDeliveryBinding) && !permitsCodexAccountTransition({
+					transition: input.accountTransition,
+					requestedAccountId: input.providerAccountId,
+					prior: priorDeliveryBinding,
+					current: currentDeliveryBinding
+				})) throw new Error("Existing Codex history cannot resume because the delivered provider account changed.");
 			}
 			const initialResumeCursor = initialCodexResumeCursor({
 				resumeCursor: input.resumeCursor,
@@ -210790,6 +210863,7 @@ const makeCodexAdapter = require_Schema$1.fn("makeCodexAdapter")(function* (opti
 			...browserToolEnvironmentId !== void 0 ? { environmentId: browserToolEnvironmentId } : {}
 		};
 		const managerInput = {
+			...input.accountTransition ? { accountTransition: input.accountTransition } : {},
 			threadId: input.threadId,
 			provider: "codex",
 			...input.cwd !== void 0 ? { cwd: input.cwd } : {},
@@ -211120,7 +211194,7 @@ function withoutInheritedAnthropicCredentials(env, options) {
 //#endregion
 //#region src/provider/makeManagedServerProvider.ts
 const makeManagedServerProvider = require_Schema$1.fn("makeManagedServerProvider")(function* (input) {
-	const refreshSemaphore = yield* require_Path.make$4(1);
+	const refreshSemaphore = yield* require_Path.make$5(1);
 	const changesPubSub = yield* require_Schema$1.acquireRelease(require_Path.unbounded$1(), require_Path.shutdown$1);
 	const initialSettings = yield* input.getSettings;
 	const initialSnapshot = input.initialSnapshot(initialSettings);
@@ -220860,7 +220934,7 @@ function makeCursorAdapter(cursorSettings, options) {
 		const getThreadSemaphore = (threadId) => modifyEffect(threadLocksRef, (current) => {
 			const existing = require_Schema$1.fromNullishOr(current.get(threadId));
 			return require_Schema$1.match$2(existing, {
-				onNone: () => require_Path.make$4(1).pipe(require_Schema$1.map((semaphore) => {
+				onNone: () => require_Path.make$5(1).pipe(require_Schema$1.map((semaphore) => {
 					const next = new Map(current);
 					next.set(threadId, semaphore);
 					return [semaphore, next];
@@ -229270,6 +229344,8 @@ const makeProviderService = require_Schema$1.fn("makeProviderService")(function*
 	const canonicalEventLogger = options?.canonicalEventLogger ?? (options?.canonicalEventLogPath !== void 0 ? yield* makeEventNdjsonLogger(options.canonicalEventLogPath, { stream: "canonical" }) : void 0);
 	const registry = yield* ProviderAdapterRegistry;
 	const directory = yield* ProviderSessionDirectory;
+	const sessionLocks = yield* require_Path.make$3({ lookup: (_threadId) => require_Path.make$5(1) });
+	const withSessionLock = (threadId, effect) => require_Path.get$1(sessionLocks, threadId).pipe(require_Schema$1.flatMap((lock) => lock.withPermit(effect)), require_Schema$1.scoped);
 	const runtimeEventPubSub = yield* require_Path.unbounded$1();
 	const assertProviderExecutable = options?.assertProviderExecutable ?? (() => require_Schema$1.succeed(null));
 	const assertCurrentProviderDelivery = require_Schema$1.fn("assertCurrentProviderDelivery")(function* (input) {
@@ -229444,18 +229520,19 @@ const makeProviderService = require_Schema$1.fn("makeProviderService")(function*
 				"provider.runtime_mode": input.runtimeMode
 			});
 			const persistedBinding = require_Schema$1.getOrUndefined$1(yield* directory.getBinding(threadId));
-			yield* assertProviderAccountBoundary({
+			const adapter = yield* registry.getByProvider(effectiveProvider);
+			const priorAccountId = readPersistedProviderAccountId(persistedBinding?.runtimePayload);
+			const requestedAccountId = readProviderAccountIdFromModelSelection(input.modelSelection);
+			if (effectiveProvider !== "codex" || persistedBinding?.provider !== effectiveProvider || (yield* adapter.hasSession(threadId))) yield* assertProviderAccountBoundary({
 				operation: "ProviderService.startSession",
 				threadId,
-				persistedAccountId: readPersistedProviderAccountId(persistedBinding?.runtimePayload),
-				requestedAccountId: readProviderAccountIdFromModelSelection(input.modelSelection)
+				persistedAccountId: priorAccountId,
+				requestedAccountId
 			});
-			const effectiveResumeCursor = input.resumeCursor ?? (persistedBinding?.provider === effectiveProvider ? persistedBinding.resumeCursor : void 0);
-			const adapter = yield* registry.getByProvider(effectiveProvider);
 			const boundResumeCursor = yield* bindProviderDeliveryToResumeCursor({
 				operation: "ProviderService.startSession",
 				provider: effectiveProvider,
-				resumeCursor: effectiveResumeCursor,
+				resumeCursor: input.resumeCursor ?? (persistedBinding?.provider === effectiveProvider ? persistedBinding.resumeCursor : void 0),
 				currentBinding: yield* assertProviderExecutable({
 					threadId,
 					provider: effectiveProvider,
@@ -229464,6 +229541,7 @@ const makeProviderService = require_Schema$1.fn("makeProviderService")(function*
 			});
 			const session = yield* adapter.startSession({
 				...input,
+				accountTransition: explicitProviderAccountTransition(priorAccountId, requestedAccountId),
 				...boundResumeCursor !== void 0 ? { resumeCursor: boundResumeCursor } : {}
 			});
 			if (session.provider !== adapter.provider) return yield* toValidationError("ProviderService.startSession", `Adapter/provider mismatch: requested '${adapter.provider}', received '${session.provider}'.`);
@@ -229765,15 +229843,15 @@ const makeProviderService = require_Schema$1.fn("makeProviderService")(function*
 	});
 	yield* require_Schema$1.addFinalizer(() => require_Schema$1.catch_(runStopAll(), (cause) => require_Schema$1.logWarning("failed to stop provider service", { cause })));
 	return {
-		startSession,
-		sendTurn,
-		interruptTurn,
-		respondToRequest,
-		respondToUserInput,
-		stopSession,
+		startSession: (threadId, input) => withSessionLock(threadId, startSession(threadId, input)),
+		sendTurn: (input) => withSessionLock(input?.threadId, sendTurn(input)),
+		interruptTurn: (input) => withSessionLock(input?.threadId, interruptTurn(input)),
+		respondToRequest: (input) => withSessionLock(input?.threadId, respondToRequest(input)),
+		respondToUserInput: (input) => withSessionLock(input?.threadId, respondToUserInput(input)),
+		stopSession: (input) => withSessionLock(input?.threadId, stopSession(input)),
 		listSessions,
 		getCapabilities,
-		rollbackConversation,
+		rollbackConversation: (input) => withSessionLock(input?.threadId, rollbackConversation(input)),
 		get streamEvents() {
 			return require_Path.fromPubSub(runtimeEventPubSub);
 		}
@@ -231020,7 +231098,7 @@ const createTrace2Monitor = require_Schema$1.fn("createTrace2Monitor")(function*
 			});
 		}
 	});
-	const readTraceDelta = (yield* require_Path.make$4(1)).withPermit(fs.readFileString(traceFilePath).pipe(require_Schema$1.flatMap((contents) => require_Schema$1.uninterruptible(require_HttpServer.modify(traceTailState, ({ processedChars, remainder }) => {
+	const readTraceDelta = (yield* require_Path.make$5(1)).withPermit(fs.readFileString(traceFilePath).pipe(require_Schema$1.flatMap((contents) => require_Schema$1.uninterruptible(require_HttpServer.modify(traceTailState, ({ processedChars, remainder }) => {
 		if (contents.length <= processedChars) return [[], {
 			processedChars,
 			remainder
@@ -234639,7 +234717,7 @@ const makeTerminalManagerWithOptions = require_Schema$1.fn("makeTerminalManagerW
 	const getThreadSemaphore = (threadId) => modifyEffect(threadLocksRef, (current) => {
 		const existing = require_Schema$1.fromNullishOr(current.get(threadId));
 		return require_Schema$1.match$2(existing, {
-			onNone: () => require_Path.make$4(1).pipe(require_Schema$1.map((semaphore) => {
+			onNone: () => require_Path.make$5(1).pipe(require_Schema$1.map((semaphore) => {
 				const next = new Map(current);
 				next.set(threadId, semaphore);
 				return [semaphore, next];
@@ -285797,7 +285875,7 @@ const make$10 = require_Schema$1.gen(function* () {
 	const runtimeContext = yield* require_Schema$1.context();
 	const runPromise = require_Schema$1.runPromiseWith(runtimeContext);
 	const eventState = makeApprovedWorkerPlanEventState();
-	const reconcileSemaphore = yield* require_Path.make$4(1);
+	const reconcileSemaphore = yield* require_Path.make$5(1);
 	const dispatch = (command) => runPromise(orchestration.dispatch(command).pipe(require_Schema$1.asVoid));
 	const readMasterContext = async (prompt) => {
 		const thread = require_Schema$1.getOrNull(await runPromise(readDurableWorkerDetail(projectionSnapshotQuery, ThreadId.make(prompt.masterThreadId))));
@@ -287193,7 +287271,7 @@ const makeRuntimeDrainReporter = require_Schema$1.gen(function* () {
 	const providerService = yield* ProviderService;
 	const serverConfig = yield* ServerConfig;
 	const spriteTaskHoldReactor = yield* SpriteTaskHoldReactor;
-	const reportSemaphore = yield* require_Path.make$4(1);
+	const reportSemaphore = yield* require_Path.make$5(1);
 	let heartbeatSilent = false;
 	const postHeartbeat = (config, snapshot) => require_Schema$1.promise(async () => {
 		const forgeGitCommit = await resolveForgeGitCommit();
@@ -293990,7 +294068,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "4c61547a96474064b48ee5bee21db4e726e14fb8";
+	return "fe3ee5efe095539824d092372a8dde00f1e2f98c";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;
@@ -297071,6 +297149,19 @@ function toProjectorDecodeError(eventType) {
 	});
 }
 //#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) {
+	if (!requested || requested.provider !== current.provider) return void 0;
+	if (requested.provider !== "codex" && requested.provider !== "claudeAgent") return void 0;
+	const currentAccountId = "providerAccountId" in current ? current.providerAccountId : void 0;
+	if (requested.providerAccountId === void 0 || requested.providerAccountId === currentAccountId) return void 0;
+	return {
+		...current,
+		providerAccountId: requested.providerAccountId
+	};
+}
+//#endregion
 //#region src/orchestration/commandInvariants.ts
 function invariantError(commandType, detail) {
 	return new OrchestrationCommandInvariantError({
@@ -297609,7 +297700,9 @@ const decideOrchestrationCommand = require_Schema$1.fn("decideOrchestrationComma
 					createdAt: command.createdAt
 				}
 			};
-			if (!(targetThread.anchorKind !== nextAnchor.anchorKind || targetThread.anchorCmmdId !== nextAnchor.anchorCmmdId)) return [userMessageEvent, turnStartRequestedEvent];
+			const shouldUpdateAnchor = targetThread.anchorKind !== nextAnchor.anchorKind || targetThread.anchorCmmdId !== nextAnchor.anchorCmmdId;
+			const accountSelection = turnAccountSelection(targetThread.modelSelection, command.modelSelection);
+			if (!shouldUpdateAnchor && !accountSelection) return [userMessageEvent, turnStartRequestedEvent];
 			return [
 				{
 					...withEventBase({
@@ -297623,6 +297716,7 @@ const decideOrchestrationCommand = require_Schema$1.fn("decideOrchestrationComma
 						threadId: command.threadId,
 						anchorKind: nextAnchor.anchorKind,
 						anchorCmmdId: nextAnchor.anchorCmmdId,
+						...accountSelection ? { modelSelection: accountSelection } : {},
 						updatedAt: command.createdAt
 					}
 				},
@@ -311039,7 +311133,7 @@ const makePipelineRunCoordinator = require_Schema$1.gen(function* () {
 			preparation: preparedHandoff.providerAuthorityPreparation
 		});
 		const acceptingHeartbeatRef = yield* require_HttpServer.make$3(true);
-		const heartbeatPublicationSemaphore = yield* require_Path.make$4(1);
+		const heartbeatPublicationSemaphore = yield* require_Path.make$5(1);
 		if ((yield* store.getByRunId(input.runId)) !== null) return yield* coordinatorError("registerHandoff", "PIPELINE_HANDOFF_ALREADY_BOUND", "The CMMD run already has a Forge task thread and must use the authority rebind contract.");
 		const snapshot = preparedHandoff.snapshot;
 		const readModel = yield* orchestration.getReadModel();
@@ -314925,7 +315019,7 @@ function makeProjectLeadSchedulerLive(options = {}) {
 	return require_Schema$1.effect(ProjectLeadScheduler, require_Schema$1.gen(function* () {
 		const client = yield* ProjectLeadControllerClient;
 		const dispatcher = yield* ProjectLeadReservationDispatcher;
-		const semaphore = yield* require_Path.make$4(1);
+		const semaphore = yield* require_Path.make$5(1);
 		const leaseSeconds = options.leaseSeconds ?? DEFAULT_LEASE_SECONDS;
 		const batchSize = options.batchSize ?? DEFAULT_BATCH_SIZE;
 		const projectLimit = options.projectLimit ?? DEFAULT_PROJECT_LIMIT;
@@ -316944,13 +317038,13 @@ const gitUrlCloneRouteLayer = add$1("POST", "/api/cloud/git/clone-url", require_
 //#endregion
 //#region src/server.ts
 const PtyAdapterLive = require_Schema$1.unwrap(require_Schema$1.gen(function* () {
-	if (typeof Bun !== "undefined") return (yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./BunPTY-B4Ra6mph.cjs")))).layer;
-	else return (yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./NodePTY-wATyTf3M.cjs")))).layer;
+	if (typeof Bun !== "undefined") return (yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./BunPTY-86ttlTi6.cjs")))).layer;
+	else return (yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./NodePTY-Cps0jsDA.cjs")))).layer;
 }));
 const HttpServerLive = require_Schema$1.unwrap(require_Schema$1.gen(function* () {
 	const config = yield* ServerConfig;
-	if (typeof Bun !== "undefined") return (yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./BunHttpServer-CjwNydcy.cjs")))).layer(bunHttpServerOptions(config));
-	const [NodeHttpServer, NodeHttp] = yield* require_Schema$1.all([require_Schema$1.promise(() => Promise.resolve().then(() => require("./NodeHttpServer-Cy1XvkSE.cjs"))), require_Schema$1.promise(() => import("node:http"))]);
+	if (typeof Bun !== "undefined") return (yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./BunHttpServer-BhE7Szci.cjs")))).layer(bunHttpServerOptions(config));
+	const [NodeHttpServer, NodeHttp] = yield* require_Schema$1.all([require_Schema$1.promise(() => Promise.resolve().then(() => require("./NodeHttpServer-BPjxt_DT.cjs"))), require_Schema$1.promise(() => import("node:http"))]);
 	return NodeHttpServer.layer(NodeHttp.createServer, {
 		host: config.host,
 		port: config.port
@@ -316958,10 +317052,10 @@ const HttpServerLive = require_Schema$1.unwrap(require_Schema$1.gen(function* ()
 }));
 const PlatformServicesLive = require_Schema$1.unwrap(require_Schema$1.gen(function* () {
 	if (typeof Bun !== "undefined") {
-		const { layer } = yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./BunServices-CUeOgVUt.cjs")));
+		const { layer } = yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./BunServices-BwE9KexF.cjs")));
 		return layer;
 	} else {
-		const { layer } = yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./NodeServices-BqfcuvmN.cjs")));
+		const { layer } = yield* require_Schema$1.promise(() => Promise.resolve().then(() => require("./NodeServices-Ddr-tYRu.cjs")));
 		return layer;
 	}
 }));