@cmmd-center/forge 0.9.17 → 0.9.18

package/dist/bin.cjs

@@ -19196,6 +19196,23 @@ const ProjectAvailability = require_Schema$1.Literals([
 	"missing",
 	"unknown"
 ]);
+/**
+* The CMMD record that places one Forge Project onto one Environment.
+*
+* The organization and the CMMD project together are the durable identity of a
+* Checkout on that Environment, and the key every lookup uses; a directory path
+* only breaks ties. A Forge Cloud Environment is per (organization, user), so
+* every Checkout on it reports the same workspace root and, once connected,
+* an empty `cwd` — nothing about a directory can tell them apart.
+*
+* Optional everywhere it appears: a project created before this field existed,
+* or one added by hand rather than from a Registration, carries none and is
+* still matched by the directory rules.
+*/
+const CmmdRegistration = require_Schema$1.Struct({
+	cmmdOrganizationId: PositiveInt,
+	cmmdProjectId: PositiveInt
+});
 const OrchestrationProject = require_Schema$1.Struct({
 	id: ProjectId,
 	title: TrimmedNonEmptyString,
@@ -19204,6 +19221,7 @@ const OrchestrationProject = require_Schema$1.Struct({
 	availability: require_Schema$1.optional(ProjectAvailability),
 	defaultModelSelection: require_Schema$1.NullOr(ModelSelection),
 	defaultThreadEnvMode: require_Schema$1.optional(require_Schema$1.NullOr(ThreadEnvMode)),
+	cmmdRegistration: require_Schema$1.optional(require_Schema$1.NullOr(CmmdRegistration)),
 	scripts: require_Schema$1.ArraySchema(ProjectScript),
 	createdAt: IsoDateTime,
 	updatedAt: IsoDateTime,
@@ -19476,6 +19494,7 @@ const OrchestrationProjectShell = require_Schema$1.Struct({
 	availability: require_Schema$1.optional(ProjectAvailability),
 	defaultModelSelection: require_Schema$1.NullOr(ModelSelection),
 	defaultThreadEnvMode: require_Schema$1.optional(require_Schema$1.NullOr(ThreadEnvMode)),
+	cmmdRegistration: require_Schema$1.optional(require_Schema$1.NullOr(CmmdRegistration)),
 	scripts: require_Schema$1.ArraySchema(ProjectScript),
 	createdAt: IsoDateTime,
 	updatedAt: IsoDateTime
@@ -19555,6 +19574,7 @@ const ProjectCreateCommand = require_Schema$1.Struct({
 	workspaceRoot: TrimmedNonEmptyString,
 	defaultModelSelection: require_Schema$1.optional(require_Schema$1.NullOr(ModelSelection)),
 	defaultThreadEnvMode: require_Schema$1.optional(require_Schema$1.NullOr(ThreadEnvMode)),
+	cmmdRegistration: require_Schema$1.optional(require_Schema$1.NullOr(CmmdRegistration)),
 	createdAt: IsoDateTime
 });
 const ProjectMetaUpdateCommand = require_Schema$1.Struct({
@@ -19565,6 +19585,7 @@ const ProjectMetaUpdateCommand = require_Schema$1.Struct({
 	workspaceRoot: require_Schema$1.optional(TrimmedNonEmptyString),
 	defaultModelSelection: require_Schema$1.optional(require_Schema$1.NullOr(ModelSelection)),
 	defaultThreadEnvMode: require_Schema$1.optional(require_Schema$1.NullOr(ThreadEnvMode)),
+	cmmdRegistration: require_Schema$1.optional(require_Schema$1.NullOr(CmmdRegistration)),
 	scripts: require_Schema$1.optional(require_Schema$1.ArraySchema(ProjectScript))
 });
 const ProjectDeleteCommand = require_Schema$1.Struct({
@@ -19975,6 +19996,7 @@ const ProjectCreatedPayload$1 = require_Schema$1.Struct({
 	repositoryIdentity: require_Schema$1.optional(require_Schema$1.NullOr(RepositoryIdentity)),
 	defaultModelSelection: require_Schema$1.NullOr(ModelSelection),
 	defaultThreadEnvMode: require_Schema$1.optional(require_Schema$1.NullOr(ThreadEnvMode)),
+	cmmdRegistration: require_Schema$1.optional(require_Schema$1.NullOr(CmmdRegistration)),
 	scripts: require_Schema$1.ArraySchema(ProjectScript),
 	createdAt: IsoDateTime,
 	updatedAt: IsoDateTime
@@ -19986,6 +20008,7 @@ const ProjectMetaUpdatedPayload$1 = require_Schema$1.Struct({
 	repositoryIdentity: require_Schema$1.optional(require_Schema$1.NullOr(RepositoryIdentity)),
 	defaultModelSelection: require_Schema$1.optional(require_Schema$1.NullOr(ModelSelection)),
 	defaultThreadEnvMode: require_Schema$1.optional(require_Schema$1.NullOr(ThreadEnvMode)),
+	cmmdRegistration: require_Schema$1.optional(require_Schema$1.NullOr(CmmdRegistration)),
 	scripts: require_Schema$1.optional(require_Schema$1.ArraySchema(ProjectScript)),
 	updatedAt: IsoDateTime
 });
@@ -20923,7 +20946,30 @@ const ThreadTokenUsageSnapshot = require_Schema$1.Struct({
 	durationMs: require_Schema$1.optional(NonNegativeInt),
 	compactsAutomatically: require_Schema$1.optional(require_Schema$1.Boolean)
 });
-const ThreadTokenUsageUpdatedPayload = require_Schema$1.Struct({ usage: ThreadTokenUsageSnapshot });
+/**
+* What one turn spent, as the adapter saw it on the wire, in the disjoint
+* buckets Forge's usage contract totals. Separate from the context-meter
+* snapshot above on purpose: that snapshot answers "how full is the window",
+* this answers "what did the turn cost", and the two providers report the
+* second differently.
+*
+* `turn-total` is the whole turn so far (Claude reports it once, from the
+* result message). `call-delta` is one provider call (Codex reports one per
+* token update, and a turn's total is the sum of its deltas after dropping
+* consecutive duplicates, exactly as the transcript scanner does).
+*/
+const ProviderTurnUsage = require_Schema$1.Struct({
+	scope: require_Schema$1.Literals(["turn-total", "call-delta"]),
+	uncachedInputTokens: NonNegativeInt,
+	cachedInputTokens: NonNegativeInt,
+	cacheCreationTokens: NonNegativeInt,
+	outputTokens: NonNegativeInt,
+	reasoningTokens: NonNegativeInt
+});
+const ThreadTokenUsageUpdatedPayload = require_Schema$1.Struct({
+	usage: ThreadTokenUsageSnapshot,
+	turnUsage: require_Schema$1.optional(ProviderTurnUsage)
+});
 const ThreadRealtimeStartedPayload = require_Schema$1.Struct({ realtimeSessionId: require_Schema$1.optional(TrimmedNonEmptyStringSchema$2) });
 const ThreadRealtimeItemAddedPayload = require_Schema$1.Struct({ item: require_Schema$1.Unknown });
 const ThreadRealtimeAudioDeltaPayload = require_Schema$1.Struct({ audio: require_Schema$1.Unknown });
@@ -65160,7 +65206,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.9.17";
+var version$1 = "0.9.18";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -68306,7 +68352,8 @@ function fixPath(options = {}) {
 			if (shellPath) break;
 		}
 		const launchctlPath = platform === "darwin" && !shellPath ? (options.readLaunchctlPath ?? readPathFromLaunchctl)() : void 0;
-		const mergedPath = mergePathEntries(shellPath ?? launchctlPath, env.PATH, platform);
+		const hydratedPath = shellPath ?? launchctlPath;
+		const mergedPath = options.preferProcessPath ? mergePathEntries(env.PATH, hydratedPath, platform) : mergePathEntries(hydratedPath, env.PATH, platform);
 		if (mergedPath) env.PATH = mergedPath;
 	} catch (error) {
 		logWarning("Failed to hydrate PATH from the user environment.", error);
@@ -92194,306 +92241,6 @@ var AnalyticsService = class AnalyticsService extends require_Schema$1.Service()
 	});
 };
 //#endregion
-//#region src/cmmdSync/CmmdSyncClient.ts
-const SYNC_TIMEOUT_MS = 1e4;
-var CmmdSyncError = class extends require_Schema$1.TaggedError("CmmdSyncError") {};
-var CmmdSyncClient = class extends require_Schema$1.Service()("forge/cmmdSync/CmmdSyncClient") {};
-const CmmdSyncClientLive = require_Schema$1.effect(CmmdSyncClient, require_Schema$1.gen(function* () {
-	const serverSettings = yield* ServerSettingsService;
-	const syncTurn = (payload) => require_Schema$1.gen(function* () {
-		const { baseUrl, apiKey } = (yield* serverSettings.getSettings.pipe(require_Schema$1.orDie)).providers.cmmd;
-		const url = `${baseUrl.replace(/\/$/, "")}/api/forge/turns`;
-		const headers = { "Content-Type": "application/json" };
-		if (apiKey) headers["Authorization"] = `Bearer ${apiKey}`;
-		const response = yield* require_Schema$1.tryPromise({
-			try: () => fetch(url, {
-				method: "POST",
-				headers,
-				body: JSON.stringify(payload),
-				signal: AbortSignal.timeout(SYNC_TIMEOUT_MS)
-			}),
-			catch: (cause) => new CmmdSyncError({
-				statusCode: 0,
-				body: String(cause)
-			})
-		});
-		const body = yield* require_Schema$1.tryPromise({
-			try: () => response.text(),
-			catch: (cause) => new CmmdSyncError({
-				statusCode: response.status,
-				body: String(cause)
-			})
-		});
-		if (!response.ok) return yield* new CmmdSyncError({
-			statusCode: response.status,
-			body
-		});
-		return yield* require_Schema$1.try_({
-			try: () => JSON.parse(body),
-			catch: (cause) => new CmmdSyncError({
-				statusCode: 200,
-				body: String(cause)
-			})
-		});
-	});
-	return { syncTurn };
-}));
-//#endregion
-//#region src/persistence/Services/ProjectionProjects.ts
-/**
-* ProjectionProjectRepository - Projection repository interface for projects.
-*
-* Owns persistence operations for project rows in the orchestration projection
-* read model.
-*
-* @module ProjectionProjectRepository
-*/
-const ProjectionProject = require_Schema$1.Struct({
-	projectId: ProjectId,
-	title: require_Schema$1.String,
-	workspaceRoot: require_Schema$1.String,
-	defaultModelSelection: require_Schema$1.NullOr(ModelSelection),
-	defaultThreadEnvMode: require_Schema$1.NullOr(ThreadEnvMode),
-	scripts: require_Schema$1.ArraySchema(ProjectScript),
-	createdAt: IsoDateTime,
-	updatedAt: IsoDateTime,
-	deletedAt: require_Schema$1.NullOr(IsoDateTime)
-});
-const GetProjectionProjectInput = require_Schema$1.Struct({ projectId: ProjectId });
-const DeleteProjectionProjectInput = require_Schema$1.Struct({ projectId: ProjectId });
-/**
-* ProjectionProjectRepository - Service tag for project projection persistence.
-*/
-var ProjectionProjectRepository = class extends require_Schema$1.Service()("forge/persistence/Services/ProjectionProjects/ProjectionProjectRepository") {};
-//#endregion
-//#region src/persistence/Services/ProjectionThreadMessages.ts
-/**
-* ProjectionThreadMessageRepository - Projection repository interface for messages.
-*
-* Owns persistence operations for projected thread messages rendered in the
-* orchestration read model.
-*
-* @module ProjectionThreadMessageRepository
-*/
-const ProjectionThreadMessage = require_Schema$1.Struct({
-	messageId: MessageId,
-	threadId: ThreadId,
-	turnId: require_Schema$1.NullOr(TurnId),
-	role: OrchestrationMessageRole,
-	text: require_Schema$1.String,
-	attachments: require_Schema$1.optional(require_Schema$1.ArraySchema(ChatAttachment)),
-	isStreaming: require_Schema$1.Boolean,
-	createdAt: IsoDateTime,
-	updatedAt: IsoDateTime
-});
-const ListProjectionThreadMessagesInput = require_Schema$1.Struct({ threadId: ThreadId });
-const GetProjectionThreadMessageInput = require_Schema$1.Struct({ messageId: MessageId });
-const DeleteProjectionThreadMessagesInput = require_Schema$1.Struct({ threadId: ThreadId });
-/**
-* ProjectionThreadMessageRepository - Service tag for message projection persistence.
-*/
-var ProjectionThreadMessageRepository = class extends require_Schema$1.Service()("forge/persistence/Services/ProjectionThreadMessages/ProjectionThreadMessageRepository") {};
-//#endregion
-//#region src/persistence/Services/ProjectionThreads.ts
-/**
-* ProjectionThreadRepository - Projection repository interface for threads.
-*
-* Owns persistence operations for projected thread records in the
-* orchestration read model.
-*
-* @module ProjectionThreadRepository
-*/
-const ProjectionThread = require_Schema$1.Struct({
-	threadId: ThreadId,
-	projectId: ProjectId,
-	title: require_Schema$1.String,
-	modelSelection: ModelSelection,
-	runtimeMode: RuntimeMode$1,
-	interactionMode: ProviderInteractionMode,
-	branch: require_Schema$1.NullOr(require_Schema$1.String),
-	worktreePath: require_Schema$1.NullOr(require_Schema$1.String),
-	latestTurnId: require_Schema$1.NullOr(TurnId),
-	createdAt: IsoDateTime,
-	updatedAt: IsoDateTime,
-	archivedAt: require_Schema$1.NullOr(IsoDateTime),
-	settledAt: require_Schema$1.NullOr(IsoDateTime),
-	settledOverride: require_Schema$1.NullOr(require_Schema$1.Literals(["settled", "active"])),
-	latestUserMessageAt: require_Schema$1.NullOr(IsoDateTime),
-	pendingApprovalCount: NonNegativeInt,
-	pendingUserInputCount: NonNegativeInt,
-	hasActionableProposedPlan: NonNegativeInt,
-	deletedAt: require_Schema$1.NullOr(IsoDateTime),
-	kind: ThreadKind.pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed("master"))),
-	parentThreadId: require_Schema$1.NullOr(ThreadId).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
-	anchorKind: CmmdAnchorKind.pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed("scratch"))),
-	anchorCmmdId: require_Schema$1.NullOr(require_Schema$1.String).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
-	linkedPullRequest: require_Schema$1.optionalKey(require_Schema$1.NullOr(LinkedPullRequest)),
-	status: ThreadStatus.pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed("idle"))),
-	workerRole: require_Schema$1.NullOr(WorkerRole).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
-	goal: require_Schema$1.NullOr(require_Schema$1.String).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
-	titleRegeneration: require_Schema$1.NullOr(ThreadTitleRegeneration).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
-	pendingAutoCreatePrompt: require_Schema$1.optional(require_Schema$1.NullOr(AutoCreateTaskPrompt)).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
-	rateLimitStatus: require_Schema$1.optional(require_Schema$1.ArraySchema(ThreadProviderRateLimitStatus)).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed([])))
-});
-const GetProjectionThreadInput = require_Schema$1.Struct({ threadId: ThreadId });
-const DeleteProjectionThreadInput = require_Schema$1.Struct({ threadId: ThreadId });
-const ListProjectionThreadsByProjectInput = require_Schema$1.Struct({ projectId: ProjectId });
-/**
-* ProjectionThreadRepository - Service tag for thread projection persistence.
-*/
-var ProjectionThreadRepository = class extends require_Schema$1.Service()("forge/persistence/Services/ProjectionThreads/ProjectionThreadRepository") {};
-//#endregion
-//#region src/cmmdSync/TurnSerializer.ts
-var TurnSerializer = class extends require_Schema$1.Service()("forge/cmmdSync/TurnSerializer") {};
-const TurnSerializerLive = require_Schema$1.effect(TurnSerializer, require_Schema$1.gen(function* () {
-	const threadRepo = yield* ProjectionThreadRepository;
-	const projectRepo = yield* ProjectionProjectRepository;
-	const messageRepo = yield* ProjectionThreadMessageRepository;
-	const buildPayload = (threadId, turnId, completedAt) => require_Schema$1.gen(function* () {
-		const maybeThread = yield* threadRepo.getById({ threadId }).pipe(require_Schema$1.orDie);
-		if (require_Schema$1.isNone(maybeThread)) return yield* require_Schema$1.die(/* @__PURE__ */ new Error(`Thread ${threadId} not found for CMMD sync`));
-		const thread = maybeThread.value;
-		const maybeProject = yield* projectRepo.getById({ projectId: thread.projectId }).pipe(require_Schema$1.orDie);
-		if (require_Schema$1.isNone(maybeProject)) return yield* require_Schema$1.die(/* @__PURE__ */ new Error(`Project ${thread.projectId} not found for CMMD sync`));
-		const project = maybeProject.value;
-		const turnMsgs = (yield* messageRepo.listByThreadId({ threadId }).pipe(require_Schema$1.orDie)).filter((m) => m.turnId === turnId);
-		const userMsg = turnMsgs.find((m) => m.role === "user")?.text ?? "";
-		const assistantMsg = turnMsgs.find((m) => m.role === "assistant")?.text ?? "";
-		const startedAt = turnMsgs.find((m) => m.role === "user")?.createdAt ?? completedAt;
-		return {
-			forgeSessionId: threadId,
-			forgeTurnId: turnId,
-			workspaceId: null,
-			userId: null,
-			projectPath: project.workspaceRoot,
-			projectTitle: project.title,
-			threadTitle: thread.title,
-			model: thread.modelSelection.model,
-			branch: thread.branch,
-			userMessage: userMsg,
-			assistantMessage: assistantMsg,
-			toolCalls: [],
-			status: "complete",
-			startedAt,
-			completedAt,
-			forgeVersion: version$1
-		};
-	});
-	return { buildPayload };
-}));
-//#endregion
-//#region src/cmmdSync/TurnCompletionWatcher.ts
-var TurnCompletionWatcher = class extends require_Schema$1.Service()("forge/cmmdSync/TurnCompletionWatcher") {};
-const isTurnDiffCompleted = (e) => e.type === "thread.turn-diff-completed";
-const TurnCompletionWatcherLive = require_Schema$1.effect(TurnCompletionWatcher, require_Schema$1.gen(function* () {
-	const engine = yield* OrchestrationEngineService;
-	const serializer = yield* TurnSerializer;
-	const syncClient = yield* CmmdSyncClient;
-	const serverSettings = yield* ServerSettingsService;
-	const sql = yield* require_SqlError.SqlClient;
-	const enqueueForRetry = (threadId, turnId, payloadJson) => sql`
-        INSERT INTO cmmd_session_sync_queue
-          (thread_id, turn_id, payload_json, status, attempt_count, created_at)
-        VALUES
-          (${threadId}, ${turnId}, ${payloadJson}, 'pending', 0, ${(/* @__PURE__ */ new Date()).toISOString()})
-        ON CONFLICT (turn_id) DO NOTHING
-      `.pipe(require_Schema$1.orDie);
-	const processEvent = (event) => require_Schema$1.gen(function* () {
-		const settings = yield* serverSettings.getSettings.pipe(require_Schema$1.orDie);
-		if (!settings.providers.cmmd.enabled || !settings.providers.cmmd.apiKey) return;
-		const { threadId, turnId, completedAt } = event.payload;
-		const turnPayload = yield* serializer.buildPayload(threadId, turnId, completedAt);
-		yield* syncClient.syncTurn(turnPayload).pipe(require_Schema$1.catch_((err) => require_Schema$1.gen(function* () {
-			yield* require_Schema$1.logWarning("CMMD sync: push failed, queuing for retry", {
-				threadId,
-				turnId,
-				statusCode: err.statusCode
-			});
-			if (err.statusCode === 0 || err.statusCode >= 500) yield* enqueueForRetry(threadId, turnId, JSON.stringify(turnPayload));
-		})));
-	}).pipe(require_Schema$1.catchCause((cause) => require_Schema$1.logError("CMMD sync: unhandled error in turn watcher", {
-		cause,
-		threadId: event.payload.threadId,
-		turnId: event.payload.turnId
-	})));
-	const start = () => engine.streamDomainEvents.pipe(require_Path.filter(isTurnDiffCompleted), require_Path.mapEffect(processEvent, { concurrency: 1 }), require_Path.runDrain, require_Schema$1.forkScoped, require_Schema$1.asVoid);
-	return { start };
-}));
-//#endregion
-//#region src/cmmdSync/SyncWorker.ts
-const MAX_ATTEMPTS = 5;
-const DRAIN_BATCH = 10;
-var CmmdSyncWorker = class extends require_Schema$1.Service()("forge/cmmdSync/CmmdSyncWorker") {};
-/**
-* Recovers rows that were set to 'in_flight' before a server crash.
-*
-* Exported so regression tests can call it directly through the test's SqlClient
-* (same ambient context) while verifying the exact production SQL path.
-* `start()` delegates to this constant.
-*/
-const resetOrphanedInFlightRows = require_Schema$1.gen(function* () {
-	yield* (yield* require_SqlError.SqlClient)`
-      UPDATE cmmd_session_sync_queue SET status = 'pending'
-      WHERE status = 'in_flight'
-    `.pipe(require_Schema$1.orDie);
-});
-const CmmdSyncWorkerLive = require_Schema$1.effect(CmmdSyncWorker, require_Schema$1.gen(function* () {
-	const syncClient = yield* CmmdSyncClient;
-	const serverSettings = yield* ServerSettingsService;
-	const sql = yield* require_SqlError.SqlClient;
-	const processRow = (row) => require_Schema$1.gen(function* () {
-		yield* sql`
-          UPDATE cmmd_session_sync_queue
-          SET status = 'in_flight', attempt_count = attempt_count + 1, last_attempted_at = ${(/* @__PURE__ */ new Date()).toISOString()}
-          WHERE turn_id = ${row.turn_id}
-        `.pipe(require_Schema$1.orDie);
-		const payload = JSON.parse(row.payload_json);
-		yield* syncClient.syncTurn(payload).pipe(require_Schema$1.flatMap(() => sql`DELETE FROM cmmd_session_sync_queue WHERE turn_id = ${row.turn_id}`.pipe(require_Schema$1.orDie)), require_Schema$1.catch_((err) => require_Schema$1.gen(function* () {
-			const isClientError = err.statusCode >= 400 && err.statusCode < 500;
-			const exhausted = row.attempt_count + 1 >= MAX_ATTEMPTS;
-			const nextStatus = isClientError || exhausted ? "failed" : "pending";
-			yield* sql`
-                UPDATE cmmd_session_sync_queue
-                SET status = ${nextStatus}
-                WHERE turn_id = ${row.turn_id}
-              `.pipe(require_Schema$1.orDie);
-			if (nextStatus === "failed") yield* require_Schema$1.logWarning("CMMD sync: turn permanently failed", {
-				turnId: row.turn_id,
-				threadId: row.thread_id,
-				statusCode: err.statusCode,
-				attempts: row.attempt_count + 1
-			});
-		})), require_Schema$1.catchCause((cause) => require_Schema$1.gen(function* () {
-			const nextStatus = row.attempt_count + 1 >= MAX_ATTEMPTS ? "failed" : "pending";
-			yield* sql`
-                UPDATE cmmd_session_sync_queue
-                SET status = ${nextStatus}
-                WHERE turn_id = ${row.turn_id}
-              `.pipe(require_Schema$1.orDie);
-			yield* require_Schema$1.logError("CMMD sync: unhandled defect in processRow", {
-				turnId: row.turn_id,
-				threadId: row.thread_id,
-				cause,
-				nextStatus
-			});
-		})));
-	});
-	const drainQueue = require_Schema$1.gen(function* () {
-		const settings = yield* serverSettings.getSettings.pipe(require_Schema$1.orDie);
-		if (!settings.providers.cmmd.enabled || !settings.providers.cmmd.apiKey) return;
-		const rows = yield* sql`
-        SELECT turn_id, thread_id, payload_json, attempt_count
-        FROM cmmd_session_sync_queue
-        WHERE status = 'pending'
-        ORDER BY created_at ASC
-        LIMIT ${DRAIN_BATCH}
-      `.pipe(require_Schema$1.orDie);
-		yield* require_Schema$1.forEach(rows, processRow, { concurrency: 1 });
-	});
-	const start = () => resetOrphanedInFlightRows.pipe(require_Schema$1.provideService(require_SqlError.SqlClient, sql), require_Schema$1.andThen(drainQueue.pipe(require_Schema$1.catchCause((cause) => require_Schema$1.logError("CMMD sync worker: unexpected error during drain", { cause })), require_Schema$1.repeat(require_Schema$1.spaced("30 seconds")), require_Schema$1.forkScoped, require_Schema$1.asVoid)));
-	return { start };
-}));
-//#endregion
 //#region src/runtimeReplication/Services/RuntimeReplication.ts
 var RuntimeReplication = class extends require_Schema$1.Service()("forge/runtimeReplication/Services/RuntimeReplication") {};
 //#endregion
@@ -92962,8 +92709,33 @@ const replicaEventKinds = new Set([
 	"activity_summary",
 	"turn_status",
 	"error_summary",
-	"tool_call"
+	"tool_call",
+	"turn_usage"
 ]);
+const turnUsageTokenKeys = [
+	"uncachedInputTokens",
+	"cachedInputTokens",
+	"cacheCreationTokens",
+	"outputTokens",
+	"reasoningTokens"
+];
+function isNonNegativeInt(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
+}
+/** `usage` is null for an Unreported turn, otherwise exactly the five buckets. */
+function isValidTurnUsageTokens(value) {
+	if (value === null) return true;
+	if (!isRecord$16(value)) return false;
+	return turnUsageTokenKeys.every((key) => isNonNegativeInt(value[key])) && Object.keys(value).every((key) => turnUsageTokenKeys.includes(key));
+}
+/** A turn_usage row: no text, no status, and its record in `payload`. */
+function hasValidTurnUsagePayload(value) {
+	const payload = value.payload;
+	return value.text === null && value.status === null && typeof value.turnId === "string" && value.turnId.length > 0 && isRecord$16(payload) && isNonBlankString(payload.provider) && isNonBlankString(payload.model) && "usage" in payload && isValidTurnUsageTokens(payload.usage);
+}
+function hasValidEventTurn(value) {
+	return !("turnId" in value) || value.turnId === null || isNonBlankString(value.turnId);
+}
 const replicaTurnStatuses$1 = new Set([
 	"pending",
 	"running",
@@ -92983,9 +92755,10 @@ function hasEventPayloadKey(value) {
 	return value.kind !== "tool_call" || "payload" in value;
 }
 function hasValidEventFields(value) {
-	return hasValidEventSequence(value.sequence) && isNonBlankString(value.eventId) && replicaEventKinds.has(value.kind) && nullableString(value.text) && hasValidEventStatus(value) && hasEventPayloadKey(value) && isIsoDateTime(value.occurredAt);
+	return hasValidEventSequence(value.sequence) && isNonBlankString(value.eventId) && replicaEventKinds.has(value.kind) && hasValidEventTurn(value) && nullableString(value.text) && hasValidEventStatus(value) && hasEventPayloadKey(value) && isIsoDateTime(value.occurredAt);
 }
 function hasValidEventPayload(value) {
+	if (value.kind === "turn_usage") return hasValidTurnUsagePayload(value);
 	if (value.kind === "turn_status") return value.text === null && value.status !== null;
 	if (value.kind === "tool_call") return isNonBlankString(value.text) && value.status !== null;
 	return isNonBlankString(value.text) && value.status === null;
@@ -93092,28 +92865,41 @@ const REPLICA_MESSAGE_ID_PREFIX = "replica-source-v1:";
 function isReservedReplicaSourceMessageId(value) {
 	return value.startsWith(REPLICA_MESSAGE_ID_PREFIX);
 }
+/**
+* A hydrated message keeps its CMMD turn inside its id rather than in the
+* projection's `turnId`: `retainThreadMessagesAfterRevert` drops messages whose
+* turn is not among the local checkpoints, and a hydrated thread has none, so
+* a later local revert would erase recovered history. The id is the one slot
+* the serializer can read back without touching revert semantics.
+*/
 function encodeReplicaSourceMessageId(input) {
-	return `${REPLICA_MESSAGE_ID_PREFIX}${input.sequence}:${Buffer.from(input.scope).toString("base64url")}:${Buffer.from(input.eventId).toString("base64url")}`;
+	const base = `${REPLICA_MESSAGE_ID_PREFIX}${input.sequence}:${Buffer.from(input.scope).toString("base64url")}:${Buffer.from(input.eventId).toString("base64url")}`;
+	return input.turnId ? `${base}:${Buffer.from(input.turnId).toString("base64url")}` : base;
+}
+/** Decodes one base64url segment, or null when it does not round-trip exactly. */
+function decodeExactSegment(encoded) {
+	const decoded = Buffer.from(encoded, "base64url").toString("utf8");
+	return decoded.length > 0 && Buffer.from(decoded).toString("base64url") === encoded ? decoded : null;
 }
 function decodeReplicaSourceMessageId(value) {
 	if (!value.startsWith(REPLICA_MESSAGE_ID_PREFIX)) return null;
-	const sequenceSeparator = value.indexOf(":", 18);
-	const scopeSeparator = value.indexOf(":", sequenceSeparator + 1);
-	if (sequenceSeparator < 0 || scopeSeparator < 0) return null;
-	const sequence = Number(value.slice(18, sequenceSeparator));
+	const [sequenceText, encodedScope, encodedEventId, encodedTurnId, ...rest] = value.slice(18).split(":");
+	if (rest.length > 0 || encodedScope === void 0 || encodedEventId === void 0) return null;
+	const sequence = Number(sequenceText);
 	if (!Number.isSafeInteger(sequence) || sequence <= 0) return null;
-	try {
-		const encodedScope = value.slice(sequenceSeparator + 1, scopeSeparator);
-		const scope = Buffer.from(encodedScope, "base64url").toString("utf8");
-		const encodedEventId = value.slice(scopeSeparator + 1);
-		const eventId = Buffer.from(encodedEventId, "base64url").toString("utf8");
-		return scope.length > 0 && Buffer.from(scope).toString("base64url") === encodedScope && eventId.length > 0 && Buffer.from(eventId).toString("base64url") === encodedEventId ? {
-			sequence,
-			eventId
-		} : null;
-	} catch {
-		return null;
-	}
+	const scope = decodeExactSegment(encodedScope);
+	const eventId = decodeExactSegment(encodedEventId);
+	if (scope === null || eventId === null) return null;
+	if (encodedTurnId === void 0) return {
+		sequence,
+		eventId
+	};
+	const turnId = decodeExactSegment(encodedTurnId);
+	return turnId === null ? null : {
+		sequence,
+		eventId,
+		turnId
+	};
 }
 var RuntimeThreadHistoryConflict = class extends Error {
 	constructor(message) {
@@ -93131,22 +92917,50 @@ function runtimeThreadFinalGenerationId(runtimeId, streamKey, events) {
 	const projectionHash = node_crypto.createHash("sha256").update(JSON.stringify(events)).digest("base64url");
 	return `${runtimeThreadGenerationId(runtimeId, streamKey)}:final:${projectionHash}`;
 }
+function canonicalKindFields(event) {
+	switch (event.kind) {
+		case "user_message":
+		case "assistant_message": return { text: event.text };
+		case "activity_summary":
+		case "error_summary": return { summary: event.summary };
+		case "turn_status": return { status: event.status };
+		case "tool_call": return {
+			summary: event.summary,
+			status: event.status,
+			...event.payload !== void 0 ? { payload: event.payload } : {}
+		};
+		case "turn_usage": return canonicalTurnUsageFields(event);
+	}
+}
+/**
+* CMMD's forge-runtime-thread-replication-protocol.ts builds this object in
+* the same order and rejects a batch whose hash differs. `turnId` comes after
+* every kind-specific field so an event sent without one hashes byte for byte
+* as it did before recorded turns existed.
+*/
 function canonicalEventPayload(event) {
 	return JSON.stringify({
 		sequence: event.sequence,
 		eventId: event.eventId,
 		occurredAt: event.occurredAt,
 		kind: event.kind,
-		...event.kind === "user_message" || event.kind === "assistant_message" ? { text: event.text } : {},
-		...event.kind === "activity_summary" || event.kind === "error_summary" ? { summary: event.summary } : {},
-		...event.kind === "turn_status" ? { status: event.status } : {},
-		...event.kind === "tool_call" ? {
-			summary: event.summary,
-			status: event.status,
-			...event.payload !== void 0 ? { payload: event.payload } : {}
-		} : {}
+		...canonicalKindFields(event),
+		...event.turnId !== void 0 ? { turnId: event.turnId } : {}
 	});
 }
+function canonicalTurnUsageFields(event) {
+	return {
+		provider: event.provider,
+		model: event.model,
+		usage: event.usage === null ? null : {
+			uncachedInputTokens: event.usage.uncachedInputTokens,
+			cachedInputTokens: event.usage.cachedInputTokens,
+			cacheCreationTokens: event.usage.cacheCreationTokens,
+			outputTokens: event.usage.outputTokens,
+			reasoningTokens: event.usage.reasoningTokens
+		}
+	};
+}
 function hashRuntimeThreadEvent(event) {
 	return sha256$3(canonicalEventPayload(event));
 }
@@ -93267,7 +93081,8 @@ function replicaMessage(runtimeId, generationId, event) {
 		id: MessageId.make(encodeReplicaSourceMessageId({
 			sequence: event.sequence,
 			scope: stableReplicaDigest(runtimeId, generationId),
-			eventId: event.eventId
+			eventId: event.eventId,
+			turnId: event.turnId ?? null
 		})),
 		role: event.kind === "user_message" ? "user" : "assistant",
 		text: event.text ?? "",
@@ -93277,11 +93092,33 @@ function replicaMessage(runtimeId, generationId, event) {
 		updatedAt: event.occurredAt
 	};
 }
-function replicaSourceEvent(event) {
-	const base = {
+function replicaTurnUsage(event) {
+	const payload = event.payload;
+	return {
+		eventId: event.eventId,
+		occurredAt: event.occurredAt,
+		kind: "turn_usage",
+		turnId: event.turnId,
+		provider: payload.provider,
+		model: payload.model,
+		usage: payload.usage === null ? null : {
+			uncachedInputTokens: payload.usage.uncachedInputTokens,
+			cachedInputTokens: payload.usage.cachedInputTokens,
+			cacheCreationTokens: payload.usage.cacheCreationTokens,
+			outputTokens: payload.usage.outputTokens,
+			reasoningTokens: payload.usage.reasoningTokens
+		}
+	};
+}
+function replicaEventBase(event) {
+	const turn = typeof event.turnId === "string" ? { turnId: event.turnId } : {};
+	return {
 		eventId: event.eventId,
-		occurredAt: event.occurredAt
+		occurredAt: event.occurredAt,
+		...turn
 	};
+}
+function replicaTextEvent(event, base) {
 	switch (event.kind) {
 		case "user_message":
 		case "assistant_message": return {
@@ -93295,31 +93132,50 @@ function replicaSourceEvent(event) {
 			kind: event.kind,
 			summary: event.text
 		};
-		case "turn_status": return {
-			...base,
-			kind: event.kind,
-			status: event.status
-		};
-		case "tool_call": return {
-			...base,
-			kind: event.kind,
-			summary: event.text,
-			status: event.status,
-			payload: event.payload ?? void 0
-		};
+		default: return null;
 	}
 }
+function replicaSourceEvent(event) {
+	const base = replicaEventBase(event);
+	const textEvent = replicaTextEvent(event, base);
+	if (textEvent !== null) return textEvent;
+	if (event.kind === "turn_usage") return replicaTurnUsage(event);
+	if (event.kind === "turn_status") return {
+		...base,
+		kind: event.kind,
+		status: replicaTurnStatus(event)
+	};
+	return {
+		...base,
+		kind: "tool_call",
+		summary: event.text,
+		status: event.status,
+		payload: event.payload ?? void 0
+	};
+}
+function replicaTurnStatus(event) {
+	return event.status;
+}
+function replicaActivitySummary(event) {
+	if (event.kind === "turn_status") return event.status ?? "unknown";
+	if (event.kind === "turn_usage") return "Turn usage recorded";
+	return event.text ?? "";
+}
+function replicaActivityTone(event) {
+	const failed = event.kind === "turn_status" && event.status === "failed";
+	return event.kind === "error_summary" || failed ? "error" : "info";
+}
 function replicaActivity(runtimeId, generationId, event) {
-	const summary = event.kind === "turn_status" ? event.status ?? "unknown" : event.text ?? "";
 	return {
 		id: EventId.make("replica:" + stableReplicaDigest(runtimeId, generationId, event.eventId, "activity")),
-		tone: event.kind === "error_summary" || event.kind === "turn_status" && event.status === "failed" ? "error" : "info",
+		tone: replicaActivityTone(event),
 		kind: "replica." + event.kind,
-		summary,
+		summary: replicaActivitySummary(event),
 		payload: {
 			sourceEventId: event.eventId,
 			sourceGenerationId: generationId,
 			sourceRuntimeId: runtimeId,
+			sourceTurnId: typeof event.turnId === "string" ? event.turnId : null,
 			status: event.status,
 			text: event.text,
 			payload: event.payload
@@ -94047,8 +93903,6 @@ const makeServerRuntimeStartup = require_Schema$1.gen(function* () {
 	const serverConfig = yield* ServerConfig;
 	const keybindings = yield* Keybindings;
 	const orchestrationReactor = yield* OrchestrationReactor;
-	const turnCompletionWatcher = yield* TurnCompletionWatcher;
-	const cmmdSyncWorker = yield* CmmdSyncWorker;
 	const runtimeReplication = yield* RuntimeReplication;
 	const localAutomationRunReconciler = yield* LocalAutomationRunReconciler;
 	const agentProtocol = yield* AgentProtocolReactor;
@@ -94085,8 +93939,6 @@ const makeServerRuntimeStartup = require_Schema$1.gen(function* () {
 		yield* runStartupPhase("reactors.start", orchestrationReactor.start().pipe(require_Schema$1.provide$2(reactorScope)));
 		yield* require_Schema$1.logDebug("startup phase: reconciling local automation runs");
 		yield* runStartupPhase("local-automations.reconcile", localAutomationRunReconciler.start().pipe(require_Schema$1.provide$2(reactorScope)));
-		yield* require_Schema$1.logDebug("startup phase: starting CMMD session sync");
-		yield* runStartupPhase("cmmd-sync.start", require_Schema$1.all([turnCompletionWatcher.start().pipe(require_Schema$1.provide$2(reactorScope)), cmmdSyncWorker.start().pipe(require_Schema$1.provide$2(reactorScope))]).pipe(require_Schema$1.asVoid));
 		yield* require_Schema$1.logDebug("startup phase: starting CMMD runtime replication");
 		yield* runStartupPhase("runtime-replication.start", runtimeReplication.start().pipe(require_Schema$1.provide$2(reactorScope)));
 		yield* require_Schema$1.logDebug("startup phase: starting CMMD pipeline reactors");
@@ -94420,36 +94272,92 @@ function finiteNumber$1(value) {
 * Entries without both an input and an output rate are dropped: a half-priced
 * model would silently under-report cost, which is worse than reporting the
 * model as unpriced.
+*
+* Entries keep their full normalized key. Collapsing `claude-opus-5` and
+* `deepinfra/anthropic/claude-opus-5` onto one key let the last one listed win,
+* and the DeepInfra entry carries no cache-read rate, so cached Claude tokens
+* were priced at the full input rate. A bare name is aliased only when no
+* canonical entry claims it and every qualified entry agrees on the rate.
 */
 function parseRateTable(document) {
 	const table = /* @__PURE__ */ new Map();
 	if (typeof document !== "object" || document === null) return table;
 	for (const [name, raw] of Object.entries(document)) {
-		if (typeof raw !== "object" || raw === null) continue;
-		const entry = raw;
-		const input = finiteNumber$1(entry.input_cost_per_token);
-		const output = finiteNumber$1(entry.output_cost_per_token);
-		if (input === null || output === null) continue;
-		table.set(normalizeModelName(name), {
-			inputCostPerToken: input,
-			outputCostPerToken: output,
-			cacheReadCostPerToken: finiteNumber$1(entry.cache_read_input_token_cost) ?? input,
-			cacheCreationCostPerToken: finiteNumber$1(entry.cache_creation_input_token_cost) ?? input
-		});
+		const rate = readRate(raw);
+		const key = normalizeRateKey(name);
+		if (rate === null || key.length === 0) continue;
+		table.set(key, rate);
 	}
+	addBareNameAliases(table);
 	return table;
 }
+/** One LiteLLM entry's rates, or `null` when it is not priced in full. */
+function readRate(raw) {
+	if (typeof raw !== "object" || raw === null) return null;
+	const entry = raw;
+	const input = finiteNumber$1(entry.input_cost_per_token);
+	const output = finiteNumber$1(entry.output_cost_per_token);
+	if (input === null || output === null) return null;
+	return {
+		inputCostPerToken: input,
+		outputCostPerToken: output,
+		cacheReadCostPerToken: finiteNumber$1(entry.cache_read_input_token_cost) ?? input,
+		cacheCreationCostPerToken: finiteNumber$1(entry.cache_creation_input_token_cost) ?? input
+	};
+}
 /**
-* Canonicalises a model name for lookup.
+* Lets a bare name resolve when the table only carries qualified spellings of
+* it, which is how a transcript's `gpt-5.6-terra` reaches `azure/gpt-5.6-terra`.
 *
-* Strips a `provider/` prefix (LiteLLM publishes both `claude-opus-5` and
-* `anthropic/claude-opus-5`) and lowercases, since transcripts are inconsistent
-* about casing.
+* A canonical entry always wins, and a bare name claimed at two different rates
+* gets no alias at all: document order is not a tiebreaker.
 */
-function normalizeModelName(model) {
-	const trimmed = model.trim().toLowerCase();
-	const slash = trimmed.lastIndexOf("/");
-	return slash === -1 ? trimmed : trimmed.slice(slash + 1);
+function addBareNameAliases(table) {
+	for (const [alias, rate] of bareNameAliasCandidates(table)) if (rate !== null) table.set(alias, rate);
+}
+/** The bare name `key` could stand in for, or `null` when it cannot. */
+function aliasableBareName(table, key) {
+	const alias = bareModelName(key);
+	if (alias.length === 0 || alias === key) return null;
+	return table.has(alias) ? null : alias;
+}
+/** Bare names to alias, mapped to `null` where the qualified rates disagree. */
+function bareNameAliasCandidates(table) {
+	const candidates = /* @__PURE__ */ new Map();
+	for (const [key, rate] of table) {
+		const alias = aliasableBareName(table, key);
+		if (alias === null) continue;
+		const held = candidates.get(alias);
+		if (held === void 0) candidates.set(alias, rate);
+		else if (held !== null && !sameRate(held, rate)) candidates.set(alias, null);
+	}
+	return candidates;
+}
+function sameRate(a, b) {
+	return a.inputCostPerToken === b.inputCostPerToken && a.outputCostPerToken === b.outputCostPerToken && a.cacheReadCostPerToken === b.cacheReadCostPerToken && a.cacheCreationCostPerToken === b.cacheCreationCostPerToken;
+}
+/**
+* The key an entry is stored under, and the key a reported model is looked up
+* by. Trimmed and lowercased only: transcripts are inconsistent about casing,
+* but a `provider/` prefix names a different row and must survive.
+*/
+function normalizeRateKey(model) {
+	return model.trim().toLowerCase();
+}
+/** The key with any `provider/` prefix removed. */
+function bareModelName(key) {
+	const slash = key.lastIndexOf("/");
+	return slash === -1 ? key : key.slice(slash + 1);
+}
+/**
+* Drops a bracketed variant suffix such as `claude-opus-5[1m]`, which Claude
+* Code writes for the 1M context tier. The rate table only knows the base name,
+* and we price at the base tier anyway, so a turn on the wide-context tier
+* would otherwise come back unpriced.
+*/
+function stripVariantSuffix(key) {
+	const bracket = key.indexOf("[");
+	return bracket === -1 ? key : key.slice(0, bracket);
 }
 /**
 * Models we never price, regardless of the table.
@@ -94467,9 +94375,10 @@ const UNPRICEABLE_MODELS = new Set([
 	"fable"
 ]);
 function lookupRate(table, model) {
-	const normalized = normalizeModelName(model);
-	if (normalized.length === 0 || UNPRICEABLE_MODELS.has(normalized)) return null;
-	return table.get(normalized) ?? null;
+	const key = stripVariantSuffix(normalizeRateKey(model));
+	const bareName = bareModelName(key);
+	if (bareName.length === 0 || UNPRICEABLE_MODELS.has(bareName)) return null;
+	return table.get(key) ?? null;
 }
 /**
 * Prices a bucket's tokens.
@@ -94756,7 +94665,15 @@ async function readTranscriptRecords(filePath, provider) {
 }
 //#endregion
 //#region src/usage/usageScanCache.ts
-const USAGE_SCAN_CACHE_VERSION = 1;
+/**
+* Bumped whenever cached records could differ from what a fresh parse produces.
+*
+* Version 1 was written before `parseCodexLine` suppressed the parent history a
+* forked rollout copies in, so those caches hold every copied record twice. A
+* transcript never changes after it is written, so a stale entry is a warm hit
+* forever: only the version discarding the file evicts them.
+*/
+const USAGE_SCAN_CACHE_VERSION = 2;
 /** Appends `value` to `table` unless it is already there, returning its index. */
 function intern(table, index, value) {
 	const existing = index.get(value);
@@ -94808,7 +94725,7 @@ function isStringTable(value) {
 *
 * The intern tables must be all strings: a numeric entry would pass the
 * per-record undefined guard, land in a record's model, and crash the aggregate
-* at normalizeModelName. A corrupt table rejects the whole cache.
+* when that model is priced. A corrupt table rejects the whole cache.
 */
 function decodeEnvelope$1(document) {
 	if (typeof document !== "object" || document === null) return null;
@@ -94973,7 +94890,7 @@ const RATES_CACHE_FILE = "usage-model-rates.json";
 const SCAN_CACHE_FILE = "usage-scan-cache.json";
 var UsageService = class extends require_Schema$1.Service()("forge/usage/UsageService") {};
 require_Schema$1.succeed$1(UsageService, UsageService.of({ readSummary: (input) => require_Schema$1.succeed({
-	contractVersion: 1,
+	contractVersion: 2,
 	readAt: "1970-01-01T00:00:00.000Z",
 	timeZone: input.timeZone,
 	sinceDay: input.sinceDay,
@@ -95253,7 +95170,7 @@ const make$15 = require_Schema$1.gen(function* () {
 		const readAt = yield* require_Schema$1.now;
 		const finishedAtMs = yield* require_Schema$1.currentTimeMillis;
 		return {
-			contractVersion: 1,
+			contractVersion: 2,
 			readAt: require_Schema$1.formatIso(readAt),
 			timeZone: input.timeZone,
 			sinceDay: input.sinceDay,
@@ -108659,7 +108576,7 @@ const postgresSchemaStatements = [
 	"CREATE TABLE IF NOT EXISTS orchestration_command_receipts (\n      command_id TEXT PRIMARY KEY,\n      aggregate_kind TEXT NOT NULL,\n      aggregate_id TEXT NOT NULL,\n      accepted_at TEXT NOT NULL,\n      result_sequence INTEGER NOT NULL,\n      status TEXT NOT NULL,\n      error TEXT\n    )",
 	"CREATE TABLE IF NOT EXISTS checkpoint_diff_blobs (\n      thread_id TEXT NOT NULL,\n      from_turn_count INTEGER NOT NULL,\n      to_turn_count INTEGER NOT NULL,\n      diff TEXT NOT NULL,\n      created_at TEXT NOT NULL,\n      UNIQUE (thread_id, from_turn_count, to_turn_count)\n    )",
 	"CREATE TABLE IF NOT EXISTS provider_session_runtime (\n      thread_id TEXT PRIMARY KEY,\n      provider_name TEXT NOT NULL,\n      adapter_key TEXT NOT NULL,\n      runtime_mode TEXT NOT NULL DEFAULT 'full-access',\n      status TEXT NOT NULL,\n      last_seen_at TEXT NOT NULL,\n      resume_cursor_json TEXT,\n      runtime_payload_json TEXT\n    )",
-	"CREATE TABLE IF NOT EXISTS projection_projects (\n      project_id TEXT PRIMARY KEY,\n      title TEXT NOT NULL,\n      workspace_root TEXT NOT NULL,\n      scripts_json TEXT NOT NULL,\n      created_at TEXT NOT NULL,\n      updated_at TEXT NOT NULL,\n      deleted_at TEXT\n    , default_model_selection_json TEXT, default_thread_env_mode TEXT)",
+	"CREATE TABLE IF NOT EXISTS projection_projects (\n      project_id TEXT PRIMARY KEY,\n      title TEXT NOT NULL,\n      workspace_root TEXT NOT NULL,\n      scripts_json TEXT NOT NULL,\n      created_at TEXT NOT NULL,\n      updated_at TEXT NOT NULL,\n      deleted_at TEXT\n    , default_model_selection_json TEXT, default_thread_env_mode TEXT, cmmd_registration_json TEXT)",
 	"CREATE TABLE IF NOT EXISTS projection_threads (\n      thread_id TEXT PRIMARY KEY,\n      project_id TEXT NOT NULL,\n      title TEXT NOT NULL,\n      branch TEXT,\n      worktree_path TEXT,\n      latest_turn_id TEXT,\n      created_at TEXT NOT NULL,\n      updated_at TEXT NOT NULL,\n      deleted_at TEXT\n    , runtime_mode TEXT NOT NULL DEFAULT 'full-access', interaction_mode TEXT NOT NULL DEFAULT 'default', model_selection_json TEXT, archived_at TEXT, latest_user_message_at TEXT, pending_approval_count INTEGER NOT NULL DEFAULT 0, pending_user_input_count INTEGER NOT NULL DEFAULT 0, has_actionable_proposed_plan INTEGER NOT NULL DEFAULT 0, kind TEXT NOT NULL DEFAULT 'master', parent_thread_id TEXT, status TEXT NOT NULL DEFAULT 'idle', anchor_kind TEXT NOT NULL DEFAULT 'scratch', anchor_cmmd_id TEXT, worker_role TEXT DEFAULT NULL, goal TEXT, pending_auto_create_prompt_json TEXT, title_regeneration_json TEXT, rate_limit_status_json TEXT, linked_pull_request_json TEXT, settled_at TEXT, settled_override TEXT)",
 	"CREATE TABLE IF NOT EXISTS projection_thread_messages (\n      message_id TEXT PRIMARY KEY,\n      thread_id TEXT NOT NULL,\n      turn_id TEXT,\n      role TEXT NOT NULL,\n      text TEXT NOT NULL,\n      is_streaming INTEGER NOT NULL,\n      created_at TEXT NOT NULL,\n      updated_at TEXT NOT NULL\n    , attachments_json TEXT)",
 	"CREATE TABLE IF NOT EXISTS projection_thread_activities (\n      activity_id TEXT PRIMARY KEY,\n      thread_id TEXT NOT NULL,\n      turn_id TEXT,\n      tone TEXT NOT NULL,\n      kind TEXT NOT NULL,\n      summary TEXT NOT NULL,\n      payload_json TEXT NOT NULL,\n      created_at TEXT NOT NULL\n    , sequence INTEGER)",
@@ -108930,7 +108847,8 @@ const postgresUpgradeMigrations = new Map([
         thread_id      TEXT NOT NULL PRIMARY KEY,
         detail         TEXT NOT NULL,
         quarantined_at TEXT NOT NULL
-      )`]]
+      )`]],
+	[74, [`ALTER TABLE projection_projects ADD COLUMN IF NOT EXISTS cmmd_registration_json TEXT`]]
 ]);
 function requirePostgresUpgradeStatements(version) {
 	const statements = postgresUpgradeMigrations.get(version);
@@ -108956,15 +108874,15 @@ const runPostgresMigrations = require_Schema$1.fn("runPostgresMigrations")(funct
         ORDER BY version DESC
         LIMIT 1
       `)[0]?.version ?? 0;
-		if (currentVersion > 73) return yield* require_Schema$1.die(/* @__PURE__ */ new Error(`Forge Postgres schema ${currentVersion} is newer than server schema 73.`));
+		if (currentVersion > 74) return yield* require_Schema$1.die(/* @__PURE__ */ new Error(`Forge Postgres schema ${currentVersion} is newer than server schema 74.`));
 		if (currentVersion === 0) {
 			for (const statement of postgresSchemaStatements) yield* sql.unsafe(statement);
 			yield* sql`
           INSERT INTO forge_schema_migrations (version)
-          VALUES (${73})
+          VALUES (${74})
           ON CONFLICT (version) DO NOTHING
         `;
-		} else for (let version = currentVersion + 1; version <= 73; version += 1) {
+		} else for (let version = currentVersion + 1; version <= 74; version += 1) {
 			const statements = yield* require_Schema$1.sync(() => requirePostgresUpgradeStatements(version));
 			for (const statement of statements) yield* sql.unsafe(statement);
 			yield* sql`
@@ -111623,6 +111541,31 @@ var _073_ReplicaThreadQuarantine_default = require_Schema$1.gen(function* () {
   `;
 });
 //#endregion
+//#region src/persistence/Migrations/074_ProjectCmmdRegistration.ts
+/**
+* Let a Checkout say which Registration it was created from.
+*
+* A Forge Cloud Environment is per (organization, user), so one Environment
+* holds every Checkout its owner registered. They all report the sprite's own
+* root as their workspace root, and once connected they report an empty `cwd`,
+* so nothing about a path can tell them apart. The Registration is the durable
+* identity, and until now it lived only on the CMMD catalog row: the Checkout
+* itself could not answer which project it was.
+*
+* NULL is a Checkout that was not created from a Registration, and that is
+* every row written before this column existed. Those keep resolving through
+* the directory rules, so nothing is backfilled and no existing row is touched.
+*/
+var _074_ProjectCmmdRegistration_default = require_Schema$1.gen(function* () {
+	const sql = yield* require_SqlError.SqlClient;
+	if (!(yield* sql`
+    PRAGMA table_info(projection_projects)
+  `).some((column) => column.name === "cmmd_registration_json")) yield* sql`
+      ALTER TABLE projection_projects
+      ADD COLUMN cmmd_registration_json TEXT
+    `;
+});
+//#endregion
 //#region src/persistence/Migrations.ts
 /**
 * MigrationsLive - Migration runner with inline loader
@@ -112008,6 +111951,11 @@ const migrationEntries = [
 		73,
 		"ReplicaThreadQuarantine",
 		_073_ReplicaThreadQuarantine_default
+	],
+	[
+		74,
+		"ProjectCmmdRegistration",
+		_074_ProjectCmmdRegistration_default
 	]
 ];
 const makeMigrationLoader = (throughId) => fromRecord(Object.fromEntries(migrationEntries.filter(([id]) => throughId === void 0 || id <= throughId).map(([id, name, migration]) => [`${id}_${name}`, migration])));
@@ -204659,13 +204607,45 @@ function mapCodexThreadNameUpdatedEvent(event, canonicalThreadId, payload) {
 		}
 	}];
 }
+/**
+* One provider call's spend, from Codex's `last_token_usage`. Codex reports
+* `input_tokens` inclusive of the cached and cache-write portions, so the
+* uncached bucket is the remainder; reasoning is reported inside output and
+* is surfaced separately without being added again. Mirrors
+* `parseCodexLine` in usage/usageTranscripts.ts so a Recorded turn and a
+* scanned transcript agree on the same numbers.
+*/
+function codexTurnUsageDelta(value) {
+	const usage = asObject$2(value);
+	const lastUsage = asObject$2(usage?.last_token_usage ?? usage?.last);
+	if (!lastUsage) return void 0;
+	const int = (key, alt) => Math.max(0, Math.trunc(asNumber(lastUsage[key]) ?? asNumber(lastUsage[alt]) ?? 0));
+	const inputTokens = int("input_tokens", "inputTokens");
+	const cachedInputTokens = int("cached_input_tokens", "cachedInputTokens");
+	const cacheCreationTokens = int("cache_write_input_tokens", "cacheWriteInputTokens");
+	const outputTokens = int("output_tokens", "outputTokens");
+	if (inputTokens + cachedInputTokens + cacheCreationTokens + outputTokens === 0) return void 0;
+	return {
+		scope: "call-delta",
+		uncachedInputTokens: Math.max(0, inputTokens - cachedInputTokens - cacheCreationTokens),
+		cachedInputTokens,
+		cacheCreationTokens,
+		outputTokens,
+		reasoningTokens: Math.min(outputTokens, int("reasoning_output_tokens", "reasoningOutputTokens"))
+	};
+}
 function mapCodexThreadTokenUsageEvent(event, canonicalThreadId, payload) {
-	const normalizedUsage = normalizeCodexTokenUsage(asObject$2(payload?.tokenUsage) ?? event.payload);
+	const tokenUsage = asObject$2(payload?.tokenUsage);
+	const normalizedUsage = normalizeCodexTokenUsage(tokenUsage ?? event.payload);
 	if (!normalizedUsage) return [];
+	const turnUsage = codexTurnUsageDelta(tokenUsage ?? event.payload);
 	return [{
 		type: "thread.token-usage.updated",
 		...runtimeEventBase(event, canonicalThreadId),
-		payload: { usage: normalizedUsage }
+		payload: {
+			usage: normalizedUsage,
+			...turnUsage ? { turnUsage } : {}
+		}
 	}];
 }
 const codexThreadMethodMappers = {
@@ -207294,6 +207274,29 @@ function finiteNumberField(usage, key) {
 function finiteNumberFieldOrZero(usage, key) {
 	return finiteNumberField(usage, key) ?? 0;
 }
+/**
+* The whole turn's spend from the SDK result message, cache split intact.
+* Claude reports `input_tokens` exclusive of the cached and cache-creation
+* portions, so the buckets are already disjoint. Claude does not report
+* reasoning separately.
+*/
+function claudeTurnUsageTotal(value) {
+	const usage = asClaudeUsageRecord(value);
+	if (!usage) return void 0;
+	const uncachedInputTokens = finiteNumberFieldOrZero(usage, "input_tokens");
+	const cachedInputTokens = finiteNumberFieldOrZero(usage, "cache_read_input_tokens");
+	const cacheCreationTokens = finiteNumberFieldOrZero(usage, "cache_creation_input_tokens");
+	const outputTokens = finiteNumberFieldOrZero(usage, "output_tokens");
+	if (uncachedInputTokens + cachedInputTokens + cacheCreationTokens + outputTokens <= 0) return;
+	return {
+		scope: "turn-total",
+		uncachedInputTokens: Math.trunc(uncachedInputTokens),
+		cachedInputTokens: Math.trunc(cachedInputTokens),
+		cacheCreationTokens: Math.trunc(cacheCreationTokens),
+		outputTokens: Math.trunc(outputTokens),
+		reasoningTokens: 0
+	};
+}
 function normalizedClaudeInputTokens(usage) {
 	return finiteNumberFieldOrZero(usage, "input_tokens") + finiteNumberFieldOrZero(usage, "cache_creation_input_tokens") + finiteNumberFieldOrZero(usage, "cache_read_input_tokens");
 }
@@ -207937,8 +207940,9 @@ const makeClaudeAdapter = require_Schema$1.fn("makeClaudeAdapter")(function* (op
 			}
 		});
 	});
-	const emitTurnUsageUpdated = require_Schema$1.fn("emitTurnUsageUpdated")(function* (context, turnState, usageSnapshot) {
+	const emitTurnUsageUpdated = require_Schema$1.fn("emitTurnUsageUpdated")(function* (context, turnState, usageSnapshot, result) {
 		if (!usageSnapshot) return;
+		const turnUsage = claudeTurnUsageTotal(result?.usage);
 		const usageStamp = yield* makeEventStamp();
 		yield* offerRuntimeEvent({
 			type: "thread.token-usage.updated",
@@ -207947,7 +207951,10 @@ const makeClaudeAdapter = require_Schema$1.fn("makeClaudeAdapter")(function* (op
 			createdAt: usageStamp.createdAt,
 			threadId: context.session.threadId,
 			...turnState ? { turnId: turnState.turnId } : {},
-			payload: { usage: usageSnapshot },
+			payload: {
+				usage: usageSnapshot,
+				...turnUsage ? { turnUsage } : {}
+			},
 			providerRefs: turnState ? nativeProviderRefs(context) : {}
 		});
 	});
@@ -207965,7 +207972,7 @@ const makeClaudeAdapter = require_Schema$1.fn("makeClaudeAdapter")(function* (op
 		});
 	});
 	const emitTurnCompletionWithoutActiveTurn = require_Schema$1.fn("emitTurnCompletionWithoutActiveTurn")(function* (context, status, errorMessage, result, usageSnapshot) {
-		yield* emitTurnUsageUpdated(context, void 0, usageSnapshot);
+		yield* emitTurnUsageUpdated(context, void 0, usageSnapshot, result);
 		yield* emitTurnCompleted(context, void 0, status, errorMessage, result);
 	});
 	const completeInFlightTools = require_Schema$1.fn("completeInFlightTools")(function* (context, turnState, status, result) {
@@ -208029,7 +208036,7 @@ const makeClaudeAdapter = require_Schema$1.fn("makeClaudeAdapter")(function* (op
 		yield* completeInFlightTools(context, turnState, status, result);
 		yield* completePendingAssistantTextBlocks(context, turnState, status, result);
 		recordCompletedTurn(context, turnState);
-		yield* emitTurnUsageUpdated(context, turnState, usageSnapshot);
+		yield* emitTurnUsageUpdated(context, turnState, usageSnapshot, result);
 		yield* emitTurnCompleted(context, turnState, status, errorMessage, result);
 		yield* finalizeTurnSession(context, status, errorMessage);
 	});
@@ -277819,6 +277826,83 @@ var PlanTaskCreationReactor = class extends require_Schema$1.Service()("forge/or
 */
 var SpriteTaskHoldReactor = class extends require_Schema$1.Service()("forge/orchestration/Services/SpriteTaskHoldReactor") {};
 //#endregion
+//#region src/persistence/Services/ProjectionProjects.ts
+/**
+* ProjectionProjectRepository - Projection repository interface for projects.
+*
+* Owns persistence operations for project rows in the orchestration projection
+* read model.
+*
+* @module ProjectionProjectRepository
+*/
+const ProjectionProject = require_Schema$1.Struct({
+	projectId: ProjectId,
+	title: require_Schema$1.String,
+	workspaceRoot: require_Schema$1.String,
+	defaultModelSelection: require_Schema$1.NullOr(ModelSelection),
+	defaultThreadEnvMode: require_Schema$1.NullOr(ThreadEnvMode),
+	cmmdRegistration: require_Schema$1.NullOr(CmmdRegistration),
+	scripts: require_Schema$1.ArraySchema(ProjectScript),
+	createdAt: IsoDateTime,
+	updatedAt: IsoDateTime,
+	deletedAt: require_Schema$1.NullOr(IsoDateTime)
+});
+const GetProjectionProjectInput = require_Schema$1.Struct({ projectId: ProjectId });
+const DeleteProjectionProjectInput = require_Schema$1.Struct({ projectId: ProjectId });
+/**
+* ProjectionProjectRepository - Service tag for project projection persistence.
+*/
+var ProjectionProjectRepository = class extends require_Schema$1.Service()("forge/persistence/Services/ProjectionProjects/ProjectionProjectRepository") {};
+//#endregion
+//#region src/persistence/Services/ProjectionThreads.ts
+/**
+* ProjectionThreadRepository - Projection repository interface for threads.
+*
+* Owns persistence operations for projected thread records in the
+* orchestration read model.
+*
+* @module ProjectionThreadRepository
+*/
+const ProjectionThread = require_Schema$1.Struct({
+	threadId: ThreadId,
+	projectId: ProjectId,
+	title: require_Schema$1.String,
+	modelSelection: ModelSelection,
+	runtimeMode: RuntimeMode$1,
+	interactionMode: ProviderInteractionMode,
+	branch: require_Schema$1.NullOr(require_Schema$1.String),
+	worktreePath: require_Schema$1.NullOr(require_Schema$1.String),
+	latestTurnId: require_Schema$1.NullOr(TurnId),
+	createdAt: IsoDateTime,
+	updatedAt: IsoDateTime,
+	archivedAt: require_Schema$1.NullOr(IsoDateTime),
+	settledAt: require_Schema$1.NullOr(IsoDateTime),
+	settledOverride: require_Schema$1.NullOr(require_Schema$1.Literals(["settled", "active"])),
+	latestUserMessageAt: require_Schema$1.NullOr(IsoDateTime),
+	pendingApprovalCount: NonNegativeInt,
+	pendingUserInputCount: NonNegativeInt,
+	hasActionableProposedPlan: NonNegativeInt,
+	deletedAt: require_Schema$1.NullOr(IsoDateTime),
+	kind: ThreadKind.pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed("master"))),
+	parentThreadId: require_Schema$1.NullOr(ThreadId).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
+	anchorKind: CmmdAnchorKind.pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed("scratch"))),
+	anchorCmmdId: require_Schema$1.NullOr(require_Schema$1.String).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
+	linkedPullRequest: require_Schema$1.optionalKey(require_Schema$1.NullOr(LinkedPullRequest)),
+	status: ThreadStatus.pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed("idle"))),
+	workerRole: require_Schema$1.NullOr(WorkerRole).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
+	goal: require_Schema$1.NullOr(require_Schema$1.String).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
+	titleRegeneration: require_Schema$1.NullOr(ThreadTitleRegeneration).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
+	pendingAutoCreatePrompt: require_Schema$1.optional(require_Schema$1.NullOr(AutoCreateTaskPrompt)).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed(null))),
+	rateLimitStatus: require_Schema$1.optional(require_Schema$1.ArraySchema(ThreadProviderRateLimitStatus)).pipe(require_Schema$1.withDecodingDefault(require_Schema$1.succeed([])))
+});
+const GetProjectionThreadInput = require_Schema$1.Struct({ threadId: ThreadId });
+const DeleteProjectionThreadInput = require_Schema$1.Struct({ threadId: ThreadId });
+const ListProjectionThreadsByProjectInput = require_Schema$1.Struct({ projectId: ProjectId });
+/**
+* ProjectionThreadRepository - Service tag for thread projection persistence.
+*/
+var ProjectionThreadRepository = class extends require_Schema$1.Service()("forge/persistence/Services/ProjectionThreads/ProjectionThreadRepository") {};
+//#endregion
 //#region src/orchestration/Layers/OrchestrationReactor.ts
 const RETENTION_SWEEP_INTERVAL_MS = 300 * 1e3;
 const makeOrchestrationReactor = require_Schema$1.gen(function* () {
@@ -280395,7 +280479,10 @@ function threadEventToActivities(event) {
 				tone: "info",
 				kind: "context-window.updated",
 				summary: "Context window updated",
-				payload
+				payload: {
+					...payload,
+					...event.payload.turnUsage ? { turnUsage: event.payload.turnUsage } : {}
+				}
 			}] : [];
 		}
 		default: return;
@@ -286765,6 +286852,7 @@ const ProjectCheckoutDeletionLive = require_Schema$1.effect(ProjectCheckoutDelet
 //#region src/persistence/Layers/ProjectionProjects.ts
 const ProjectionProjectDbRow = ProjectionProject.mapFields(require_Schema$1.assign({
 	defaultModelSelection: require_Schema$1.NullOr(require_Schema$1.fromJsonString(ModelSelection)),
+	cmmdRegistration: require_Schema$1.NullOr(require_Schema$1.fromJsonString(CmmdRegistration)),
 	scripts: require_Schema$1.fromJsonString(require_Schema$1.ArraySchema(ProjectScript))
 }));
 const makeProjectionProjectRepository = require_Schema$1.gen(function* () {
@@ -286778,6 +286866,7 @@ const makeProjectionProjectRepository = require_Schema$1.gen(function* () {
           workspace_root,
           default_model_selection_json,
           default_thread_env_mode,
+          cmmd_registration_json,
           scripts_json,
           created_at,
           updated_at,
@@ -286789,6 +286878,7 @@ const makeProjectionProjectRepository = require_Schema$1.gen(function* () {
           ${row.workspaceRoot},
           ${row.defaultModelSelection !== null ? JSON.stringify(row.defaultModelSelection) : null},
           ${row.defaultThreadEnvMode},
+          ${row.cmmdRegistration !== null ? JSON.stringify(row.cmmdRegistration) : null},
           ${JSON.stringify(row.scripts)},
           ${row.createdAt},
           ${row.updatedAt},
@@ -286800,6 +286890,7 @@ const makeProjectionProjectRepository = require_Schema$1.gen(function* () {
           workspace_root = excluded.workspace_root,
           default_model_selection_json = excluded.default_model_selection_json,
           default_thread_env_mode = excluded.default_thread_env_mode,
+          cmmd_registration_json = excluded.cmmd_registration_json,
           scripts_json = excluded.scripts_json,
           created_at = excluded.created_at,
           updated_at = excluded.updated_at,
@@ -286816,6 +286907,7 @@ const makeProjectionProjectRepository = require_Schema$1.gen(function* () {
           workspace_root AS "workspaceRoot",
           default_model_selection_json AS "defaultModelSelection",
           default_thread_env_mode AS "defaultThreadEnvMode",
+          cmmd_registration_json AS "cmmdRegistration",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -286834,6 +286926,7 @@ const makeProjectionProjectRepository = require_Schema$1.gen(function* () {
           workspace_root AS "workspaceRoot",
           default_model_selection_json AS "defaultModelSelection",
           default_thread_env_mode AS "defaultThreadEnvMode",
+          cmmd_registration_json AS "cmmdRegistration",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -287998,7 +288091,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "86c71b55bb7a5dfbbad063d6e4c082570759f006";
+	return "0ef3571b544de985c96601544e36094a62787683";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;
@@ -288171,7 +288264,7 @@ const makeServerEnvironment = require_Schema$1.fn("makeServerEnvironment")(funct
 				os,
 				arch: platformArch()
 			},
-			serverVersion: FORGE_RELEASE_VERSION,
+			serverVersion: version$1,
 			...buildCommit !== void 0 ? { buildCommit } : {},
 			capabilities: {
 				...executionEnvironmentCapabilities(serverConfig),
@@ -291169,6 +291262,7 @@ const decideOrchestrationCommand = require_Schema$1.fn("decideOrchestrationComma
 					workspaceRoot: command.workspaceRoot,
 					defaultModelSelection: command.defaultModelSelection ?? null,
 					...command.defaultThreadEnvMode !== void 0 ? { defaultThreadEnvMode: command.defaultThreadEnvMode } : {},
+					...command.cmmdRegistration !== void 0 ? { cmmdRegistration: command.cmmdRegistration } : {},
 					scripts: [],
 					createdAt: command.createdAt,
 					updatedAt: command.createdAt
@@ -291195,6 +291289,7 @@ const decideOrchestrationCommand = require_Schema$1.fn("decideOrchestrationComma
 					...command.workspaceRoot !== void 0 ? { workspaceRoot: command.workspaceRoot } : {},
 					...command.defaultModelSelection !== void 0 ? { defaultModelSelection: command.defaultModelSelection } : {},
 					...command.defaultThreadEnvMode !== void 0 ? { defaultThreadEnvMode: command.defaultThreadEnvMode } : {},
+					...command.cmmdRegistration !== void 0 ? { cmmdRegistration: command.cmmdRegistration } : {},
 					...command.scripts !== void 0 ? { scripts: command.scripts } : {},
 					updatedAt: occurredAt
 				}
@@ -292056,6 +292151,7 @@ function projectProjectDomainEvent(nextBase, event) {
 				workspaceRoot: payload.workspaceRoot,
 				defaultModelSelection: payload.defaultModelSelection,
 				defaultThreadEnvMode: payload.defaultThreadEnvMode ?? null,
+				cmmdRegistration: payload.cmmdRegistration ?? null,
 				scripts: payload.scripts,
 				createdAt: payload.createdAt,
 				updatedAt: payload.updatedAt,
@@ -292074,6 +292170,7 @@ function projectProjectDomainEvent(nextBase, event) {
 				...payload.workspaceRoot !== void 0 ? { workspaceRoot: payload.workspaceRoot } : {},
 				...payload.defaultModelSelection !== void 0 ? { defaultModelSelection: payload.defaultModelSelection } : {},
 				...payload.defaultThreadEnvMode !== void 0 ? { defaultThreadEnvMode: payload.defaultThreadEnvMode } : {},
+				...payload.cmmdRegistration !== void 0 ? { cmmdRegistration: payload.cmmdRegistration } : {},
 				...payload.scripts !== void 0 ? { scripts: payload.scripts } : {},
 				updatedAt: payload.updatedAt
 			} : project)
@@ -292679,6 +292776,34 @@ const DeleteProjectionThreadActivitiesInput = require_Schema$1.Struct({ threadId
 */
 var ProjectionThreadActivityRepository = class extends require_Schema$1.Service()("forge/persistence/Services/ProjectionThreadActivities/ProjectionThreadActivityRepository") {};
 //#endregion
+//#region src/persistence/Services/ProjectionThreadMessages.ts
+/**
+* ProjectionThreadMessageRepository - Projection repository interface for messages.
+*
+* Owns persistence operations for projected thread messages rendered in the
+* orchestration read model.
+*
+* @module ProjectionThreadMessageRepository
+*/
+const ProjectionThreadMessage = require_Schema$1.Struct({
+	messageId: MessageId,
+	threadId: ThreadId,
+	turnId: require_Schema$1.NullOr(TurnId),
+	role: OrchestrationMessageRole,
+	text: require_Schema$1.String,
+	attachments: require_Schema$1.optional(require_Schema$1.ArraySchema(ChatAttachment)),
+	isStreaming: require_Schema$1.Boolean,
+	createdAt: IsoDateTime,
+	updatedAt: IsoDateTime
+});
+const ListProjectionThreadMessagesInput = require_Schema$1.Struct({ threadId: ThreadId });
+const GetProjectionThreadMessageInput = require_Schema$1.Struct({ messageId: MessageId });
+const DeleteProjectionThreadMessagesInput = require_Schema$1.Struct({ threadId: ThreadId });
+/**
+* ProjectionThreadMessageRepository - Service tag for message projection persistence.
+*/
+var ProjectionThreadMessageRepository = class extends require_Schema$1.Service()("forge/persistence/Services/ProjectionThreadMessages/ProjectionThreadMessageRepository") {};
+//#endregion
 //#region src/persistence/Services/ProjectionThreadProposedPlans.ts
 const ProjectionThreadProposedPlan = require_Schema$1.Struct({
 	planId: OrchestrationProposedPlanId,
@@ -293630,6 +293755,7 @@ const makeOrchestrationProjectionPipeline = require_Schema$1.fn("makeOrchestrati
 					workspaceRoot: event.payload.workspaceRoot,
 					defaultModelSelection: event.payload.defaultModelSelection,
 					defaultThreadEnvMode: event.payload.defaultThreadEnvMode ?? null,
+					cmmdRegistration: event.payload.cmmdRegistration ?? null,
 					scripts: event.payload.scripts,
 					createdAt: event.payload.createdAt,
 					updatedAt: event.payload.updatedAt,
@@ -293645,6 +293771,7 @@ const makeOrchestrationProjectionPipeline = require_Schema$1.fn("makeOrchestrati
 					...event.payload.workspaceRoot !== void 0 ? { workspaceRoot: event.payload.workspaceRoot } : {},
 					...event.payload.defaultModelSelection !== void 0 ? { defaultModelSelection: event.payload.defaultModelSelection } : {},
 					...event.payload.defaultThreadEnvMode !== void 0 ? { defaultThreadEnvMode: event.payload.defaultThreadEnvMode } : {},
+					...event.payload.cmmdRegistration !== void 0 ? { cmmdRegistration: event.payload.cmmdRegistration } : {},
 					...event.payload.scripts !== void 0 ? { scripts: event.payload.scripts } : {},
 					updatedAt: event.payload.updatedAt
 				});
@@ -294540,6 +294667,7 @@ const decodeShellSnapshot = require_Schema$1.decodeUnknownEffect(OrchestrationSh
 const decodeThread = require_Schema$1.decodeUnknownEffect(OrchestrationThread);
 const ProjectionProjectDbRowSchema = ProjectionProject.mapFields(require_Schema$1.assign({
 	defaultModelSelection: require_Schema$1.NullOr(require_Schema$1.fromJsonString(ModelSelection)),
+	cmmdRegistration: require_Schema$1.NullOr(require_Schema$1.fromJsonString(CmmdRegistration)),
 	scripts: require_Schema$1.fromJsonString(require_Schema$1.ArraySchema(ProjectScript))
 }));
 const ProjectionThreadMessageDbRowSchema = ProjectionThreadMessage.mapFields(require_Schema$1.assign({
@@ -294678,6 +294806,7 @@ function mapProjectShellRow(row, repositoryIdentity, availability) {
 		repositoryIdentity,
 		availability,
 		defaultModelSelection: row.defaultModelSelection,
+		cmmdRegistration: row.cmmdRegistration,
 		scripts: row.scripts,
 		createdAt: row.createdAt,
 		updatedAt: row.updatedAt
@@ -294715,6 +294844,7 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
           workspace_root AS "workspaceRoot",
           default_model_selection_json AS "defaultModelSelection",
           default_thread_env_mode AS "defaultThreadEnvMode",
+          cmmd_registration_json AS "cmmdRegistration",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -295010,6 +295140,7 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
           workspace_root AS "workspaceRoot",
           default_model_selection_json AS "defaultModelSelection",
           default_thread_env_mode AS "defaultThreadEnvMode",
+          cmmd_registration_json AS "cmmdRegistration",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -295031,6 +295162,7 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
           workspace_root AS "workspaceRoot",
           default_model_selection_json AS "defaultModelSelection",
           default_thread_env_mode AS "defaultThreadEnvMode",
+          cmmd_registration_json AS "cmmdRegistration",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -295051,6 +295183,7 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
           workspace_root AS "workspaceRoot",
           default_model_selection_json AS "defaultModelSelection",
           default_thread_env_mode AS "defaultThreadEnvMode",
+          cmmd_registration_json AS "cmmdRegistration",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -295368,6 +295501,7 @@ const makeProjectionSnapshotQuery = require_Schema$1.gen(function* () {
 			repositoryIdentity: repositoryIdentities.get(row.projectId) ?? null,
 			availability: projectAvailabilities.get(row.projectId) ?? "unknown",
 			defaultModelSelection: row.defaultModelSelection,
+			cmmdRegistration: row.cmmdRegistration,
 			scripts: row.scripts,
 			createdAt: row.createdAt,
 			updatedAt: row.updatedAt,
@@ -298900,6 +299034,23 @@ const cmmdRenameDeviceRouteLayer = registerProxyRoute({
 	orgIdSource: "none",
 	responseShape: "unwrapData"
 });
+/**
+* Name the caller's cloud Environment (FOR-36371).
+*
+* Owner JWT lane, like every other `/api/cmmd/forge-runtimes/*` control call.
+* CMMD scopes the rename to the caller's own Environment and answers 409
+* `environment_name_taken` when this Seat already has one by that name; both
+* the status and the code reach the browser unchanged, which is what lets the
+* rename field say something specific instead of "something went wrong".
+*/
+const cmmdRenameForgeRuntimeRouteLayer = registerProxyRoute({
+	forgePath: "/api/cmmd/forge-runtimes/:runtimeId/rename",
+	method: "POST",
+	cmmdPath: "/api/forge/context/runtimes/:runtimeId/rename",
+	orgIdSource: "none",
+	responseShape: "unwrapData",
+	successStatus: 200
+});
 const cmmdRevokeDeviceRouteLayer = registerProxyRoute({
 	forgePath: "/api/cmmd/devices/:deviceId/revoke",
 	method: "POST",
@@ -300826,16 +300977,26 @@ const replicaTurnStatuses = new Set([
 function isRecord$6(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function replicaSourceSequence(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : null;
+}
+function replicaSourceEventId(value) {
+	return typeof value === "string" && value.length > 0 ? value : null;
+}
+function replicaSourceTurn(sourceTurnId) {
+	return typeof sourceTurnId === "string" && sourceTurnId.length > 0 ? { turnId: sourceTurnId } : {};
+}
 function replicaActivitySource(activity) {
 	if (!activity.kind.startsWith("replica.") || !isRecord$6(activity.payload)) return null;
-	const sourceSequence = activity.sequence;
-	const eventId = activity.payload.sourceEventId;
-	if (sourceSequence === void 0 || !Number.isSafeInteger(sourceSequence) || sourceSequence <= 0) return null;
-	return typeof eventId === "string" && eventId.length > 0 ? {
+	const sourceSequence = replicaSourceSequence(activity.sequence);
+	const eventId = replicaSourceEventId(activity.payload.sourceEventId);
+	if (sourceSequence === null || eventId === null) return null;
+	return {
 		sourceSequence,
 		eventId,
-		occurredAt: activity.createdAt
-	} : null;
+		occurredAt: activity.createdAt,
+		turn: replicaSourceTurn(activity.payload.sourceTurnId)
+	};
 }
 function replicaSummaryEvent(activity, source) {
 	if (activity.kind !== "replica.activity_summary" && activity.kind !== "replica.error_summary") return null;
@@ -300845,6 +301006,7 @@ function replicaSummaryEvent(activity, source) {
 		event: {
 			eventId: source.eventId,
 			occurredAt: source.occurredAt,
+			...source.turn,
 			kind: activity.kind.slice(8),
 			summary: typeof sourceText === "string" ? sourceText : activity.summary
 		}
@@ -300858,6 +301020,7 @@ function replicaTurnEvent(activity, source) {
 		event: {
 			eventId: source.eventId,
 			occurredAt: source.occurredAt,
+			...source.turn,
 			kind: "turn_status",
 			status
 		}
@@ -300873,6 +301036,7 @@ function replicaToolCallEvent(activity, source) {
 		event: {
 			eventId: source.eventId,
 			occurredAt: source.occurredAt,
+			...source.turn,
 			kind: "tool_call",
 			summary: sourceText,
 			status,
@@ -300880,9 +301044,36 @@ function replicaToolCallEvent(activity, source) {
 		}
 	};
 }
+function replicaTurnUsageEvent(activity, source) {
+	if (activity.kind !== "replica.turn_usage" || !isRecord$6(activity.payload)) return null;
+	const usage = activity.payload.payload;
+	if (!("turnId" in source.turn) || !isRecord$6(usage)) return null;
+	const provider = usage.provider;
+	const model = usage.model;
+	if (typeof provider !== "string" || typeof model !== "string" || !("usage" in usage)) return null;
+	const tokens = usage.usage;
+	return {
+		sourceSequence: source.sourceSequence,
+		event: {
+			eventId: source.eventId,
+			occurredAt: source.occurredAt,
+			kind: "turn_usage",
+			turnId: source.turn.turnId,
+			provider,
+			model,
+			usage: tokens === null ? null : {
+				uncachedInputTokens: tokens.uncachedInputTokens,
+				cachedInputTokens: tokens.cachedInputTokens,
+				cacheCreationTokens: tokens.cacheCreationTokens,
+				outputTokens: tokens.outputTokens,
+				reasoningTokens: tokens.reasoningTokens
+			}
+		}
+	};
+}
 function serializeReplicaActivity(activity) {
 	const source = replicaActivitySource(activity);
-	return source === null ? null : replicaSummaryEvent(activity, source) ?? replicaTurnEvent(activity, source) ?? replicaToolCallEvent(activity, source);
+	return source === null ? null : replicaSummaryEvent(activity, source) ?? replicaTurnEvent(activity, source) ?? replicaToolCallEvent(activity, source) ?? replicaTurnUsageEvent(activity, source);
 }
 function serializeReplicaMessage(message) {
 	const source = decodeReplicaSourceMessageId(message.id);
@@ -300892,6 +301083,7 @@ function serializeReplicaMessage(message) {
 		event: {
 			eventId: source.eventId,
 			occurredAt: message.createdAt,
+			...source.turnId === void 0 ? {} : { turnId: source.turnId },
 			kind: message.role === "user" ? "user_message" : "assistant_message",
 			text: message.text
 		}
@@ -300968,12 +301160,17 @@ function canonicalRuntimeEventTimestamp(value) {
 	if (Number.isNaN(timestamp.getTime())) throw new Error(`Invalid runtime event timestamp: ${value}`);
 	return timestamp.toISOString();
 }
+/** Spread onto an event: present only when the projection knows the turn. */
+function eventTurn(turnId) {
+	return turnId ? { turnId } : {};
+}
 function orderedLocalMessageEvent(message, content) {
 	return {
 		sourceSequence: null,
 		event: {
 			eventId: `message:${message.id}`,
 			occurredAt: canonicalRuntimeEventTimestamp(message.createdAt),
+			...eventTurn(message.turnId),
 			kind: message.role === "user" ? "user_message" : "assistant_message",
 			text: content
 		}
@@ -301004,6 +301201,7 @@ function serializeNativeToolActivity(activity) {
 		event: {
 			eventId: `activity:${activity.id}`,
 			occurredAt: canonicalRuntimeEventTimestamp(activity.createdAt),
+			...eventTurn(activity.turnId),
 			kind: "tool_call",
 			summary,
 			status: activityStatus(activity),
@@ -301046,11 +301244,123 @@ function serializeProviderFailureActivity(activity) {
 		event: {
 			eventId: `activity:${activity.id}`,
 			occurredAt: canonicalRuntimeEventTimestamp(activity.createdAt),
+			...eventTurn(activity.turnId),
 			kind: "error_summary",
 			summary: text(detail === null ? summary : `${summary}: ${detail}`, 4e3) ?? summary
 		}
 	};
 }
+const turnUsageKeys = [
+	"uncachedInputTokens",
+	"cachedInputTokens",
+	"cacheCreationTokens",
+	"outputTokens",
+	"reasoningTokens"
+];
+function isTurnUsageRecord(value) {
+	if (!value || typeof value !== "object") return false;
+	const record = value;
+	return (record.scope === "turn-total" || record.scope === "call-delta") && turnUsageKeys.every((key) => Number.isSafeInteger(record[key]) && record[key] >= 0);
+}
+function providerTurnUsage(activity) {
+	if (activity.kind !== "context-window.updated") return null;
+	const payload = activity.payload;
+	const usage = payload && typeof payload === "object" ? payload.turnUsage : void 0;
+	return isTurnUsageRecord(usage) ? usage : null;
+}
+function tokensOf(usage) {
+	return {
+		uncachedInputTokens: usage.uncachedInputTokens,
+		cachedInputTokens: usage.cachedInputTokens,
+		cacheCreationTokens: usage.cacheCreationTokens,
+		outputTokens: usage.outputTokens,
+		reasoningTokens: usage.reasoningTokens
+	};
+}
+/**
+* What one turn spent, from the usage the adapter reported while it ran.
+*
+* A `turn-total` (Claude, from the result message) is the whole turn, so the
+* last one wins. Otherwise the turn is the sum of its `call-delta` rows
+* (Codex, one per token update) after dropping consecutive duplicates, the
+* same rule usage/usageTranscripts.ts applies to a Codex rollout so a Recorded
+* turn and a scanned transcript agree. No usage at all is an Unreported turn.
+*/
+function turnUsageTokens(activities) {
+	const reported = activities.map(providerTurnUsage).filter((usage) => usage !== null);
+	const total = reported.findLast((usage) => usage.scope === "turn-total");
+	if (total) return tokensOf(total);
+	let summed = null;
+	let previous = null;
+	for (const delta of reported) {
+		const signature = JSON.stringify(tokensOf(delta));
+		if (signature === previous) continue;
+		previous = signature;
+		const tokens = tokensOf(delta);
+		summed = summed ? {
+			uncachedInputTokens: summed.uncachedInputTokens + tokens.uncachedInputTokens,
+			cachedInputTokens: summed.cachedInputTokens + tokens.cachedInputTokens,
+			cacheCreationTokens: summed.cacheCreationTokens + tokens.cacheCreationTokens,
+			outputTokens: summed.outputTokens + tokens.outputTokens,
+			reasoningTokens: summed.reasoningTokens + tokens.reasoningTokens
+		} : tokens;
+	}
+	return summed;
+}
+/**
+* One Recorded turn per settled local turn: the turns named on this thread's
+* own messages and activities, minus the one still running (it would churn a
+* new generation on every token update). Hydrated replica rows carry no local
+* turn, so a recovered thread does not re-record turns CMMD already holds.
+*
+* Model and provider are the thread's current selection. The adapters do not
+* yet report which model answered a given turn, so a mid-thread model switch
+* is attributed to the selection in force when the thread is serialized.
+* Recorded on FOR-36388.
+*/
+/** Turns named on this thread's own rows; hydrated replica rows carry no local turn. */
+function localTurnIds(thread) {
+	const fromMessages = thread.messages.filter((message) => !message.streaming).map((message) => message.turnId);
+	const fromActivities = thread.activities.filter((activity) => !activity.kind.startsWith("replica.")).map((activity) => activity.turnId);
+	const turnIds = /* @__PURE__ */ new Set();
+	for (const turnId of [...fromMessages, ...fromActivities]) if (turnId) turnIds.add(turnId);
+	return turnIds;
+}
+function settledTurnIds(thread) {
+	const turnIds = localTurnIds(thread);
+	if (thread.latestTurn?.state === "running") turnIds.delete(thread.latestTurn.turnId);
+	return turnIds;
+}
+function turnActivities(thread, turnId) {
+	return thread.activities.filter((activity) => activity.turnId === turnId).toSorted((left, right) => left.createdAt.localeCompare(right.createdAt) || left.id.localeCompare(right.id));
+}
+/** The last thing that happened in the turn: what the Recorded turn is stamped with. */
+function turnLatestAt(thread, turnId, activities) {
+	return [...activities.map((activity) => activity.createdAt), ...thread.messages.filter((message) => message.turnId === turnId).map((message) => message.createdAt)].toSorted().at(-1);
+}
+function recordedTurnEvent(thread, turnId) {
+	const activities = turnActivities(thread, turnId);
+	const latestAt = turnLatestAt(thread, turnId, activities);
+	if (latestAt === void 0) return null;
+	return {
+		sourceSequence: null,
+		event: {
+			eventId: `usage:${turnId}`,
+			occurredAt: canonicalRuntimeEventTimestamp(latestAt),
+			kind: "turn_usage",
+			turnId,
+			provider: thread.modelSelection?.provider ?? "unknown",
+			model: thread.modelSelection?.model ?? "unknown",
+			usage: turnUsageTokens(activities)
+		}
+	};
+}
+function serializeRecordedTurns(thread) {
+	return [...settledTurnIds(thread)].flatMap((turnId) => {
+		const event = recordedTurnEvent(thread, turnId);
+		return event === null ? [] : [event];
+	});
+}
 function serializeRuntimeThreadEvents(thread) {
 	const messages = thread.messages.flatMap(serializeThreadMessage);
 	const failureActivities = thread.activities.flatMap((activity) => {
@@ -301065,11 +301375,13 @@ function serializeRuntimeThreadEvents(thread) {
 		const event = serializeNativeToolActivity(activity);
 		return event === null ? [] : [event];
 	});
+	const recordedTurns = serializeRecordedTurns(thread);
 	return [
 		...messages,
 		...replicaActivities,
 		...toolActivities,
-		...failureActivities
+		...failureActivities,
+		...recordedTurns
 	].toSorted((left, right) => {
 		if (left.sourceSequence !== null && right.sourceSequence !== null) return left.sourceSequence - right.sourceSequence;
 		if (left.sourceSequence !== null) return -1;
@@ -310311,7 +310623,6 @@ const PlatformServicesLive = require_Schema$1.unwrap(require_Schema$1.gen(functi
 		return layer;
 	}
 }));
-const CmmdSyncLayerLive = require_Schema$1.empty$1.pipe(require_Schema$1.provideMerge(TurnCompletionWatcherLive), require_Schema$1.provideMerge(CmmdSyncWorkerLive), require_Schema$1.provideMerge(TurnSerializerLive), require_Schema$1.provideMerge(CmmdSyncClientLive));
 const RuntimeReplicationLayerLive = RuntimeReplicationLive.pipe(require_Schema$1.provideMerge(RuntimeReplicationClientLive), require_Schema$1.provideMerge(RuntimeReplicationOutboxLive), require_Schema$1.provideMerge(ActiveHourMeterLive.pipe(require_Schema$1.provide$1(RuntimeReplicationOutboxLive))));
 const RuntimeDrainLayerLive = RuntimeDrainReporterLive.pipe(require_Schema$1.provideMerge(RuntimeDrainStateLive));
 const RuntimeAwareProviderReactorsLive = require_Schema$1.mergeAll(ProviderRuntimeIngestionLive, ProviderCommandReactorLive).pipe(require_Schema$1.provide$1(RuntimeDrainLayerLive));
@@ -310319,7 +310630,7 @@ const PipelineWorkerCoordinatorLayerLive = PipelineWorkerCoordinatorLive.pipe(re
 const AgentProtocolReactorLayerLive = AgentProtocolReactorLive.pipe(require_Schema$1.provideMerge(PipelineRunStoreLive));
 const PipelineRunCoordinatorLayerLive = PipelineRunCoordinatorLive.pipe(require_Schema$1.provideMerge(PipelineProviderAuthorityInstallerLive), require_Schema$1.provideMerge(PipelineChangeInspectorLive), require_Schema$1.provideMerge(PipelineContextArtifactStoreLive), require_Schema$1.provideMerge(PipelineModelPolicyLive), require_Schema$1.provideMerge(PipelineRunClientLive), require_Schema$1.provideMerge(PipelineRunStoreLive), require_Schema$1.provideMerge(PipelineRunWorkspaceAllocatorLive), require_Schema$1.provideMerge(PipelineStagePolicyLive), require_Schema$1.provideMerge(PipelineWorkerCoordinatorLayerLive));
 const PipelineRuntimeLayerLive = PipelineCoordinatorReactorLive.pipe(require_Schema$1.provideMerge(PipelineRunCoordinatorLayerLive), require_Schema$1.provideMerge(AgentProtocolReactorLayerLive));
-const ReactorLayerLive = require_Schema$1.empty$1.pipe(require_Schema$1.provideMerge(OrchestrationReactorLive), require_Schema$1.provideMerge(ApprovedWorkerPlanReactorLive), require_Schema$1.provideMerge(RuntimeAwareProviderReactorsLive), require_Schema$1.provideMerge(CheckpointReactorLive), require_Schema$1.provideMerge(SpriteTaskHoldReactorLive), require_Schema$1.provideMerge(PlanTaskCreationReactorLive), require_Schema$1.provideMerge(RuntimeReceiptBusLive), require_Schema$1.provideMerge(CmmdSyncLayerLive), require_Schema$1.provideMerge(RuntimeReplicationLayerLive), require_Schema$1.provideMerge(PipelineRuntimeLayerLive), require_Schema$1.provideMerge(LocalAutomationRunReconcilerLive));
+const ReactorLayerLive = require_Schema$1.empty$1.pipe(require_Schema$1.provideMerge(OrchestrationReactorLive), require_Schema$1.provideMerge(ApprovedWorkerPlanReactorLive), require_Schema$1.provideMerge(RuntimeAwareProviderReactorsLive), require_Schema$1.provideMerge(CheckpointReactorLive), require_Schema$1.provideMerge(SpriteTaskHoldReactorLive), require_Schema$1.provideMerge(PlanTaskCreationReactorLive), require_Schema$1.provideMerge(RuntimeReceiptBusLive), require_Schema$1.provideMerge(RuntimeReplicationLayerLive), require_Schema$1.provideMerge(PipelineRuntimeLayerLive), require_Schema$1.provideMerge(LocalAutomationRunReconcilerLive));
 const CheckpointingLayerLive = require_Schema$1.empty$1.pipe(require_Schema$1.provideMerge(CheckpointDiffQueryLive), require_Schema$1.provideMerge(CheckpointStoreLive));
 const ProviderLayerLive = require_Schema$1.unwrap(require_Schema$1.gen(function* () {
 	const config = yield* ServerConfig;
@@ -310375,10 +310686,10 @@ const MiscRuntimeLayerLive = require_Schema$1.mergeAll(AnalyticsServiceLayerLive
 const RuntimeDependenciesWithoutPullRequestsLive = ReactorLayerLive.pipe(require_Schema$1.provideMerge(CheckpointingLayerLive), require_Schema$1.provideMerge(GitLayerLive), require_Schema$1.provideMerge(OrchestrationLayerLive), require_Schema$1.provideMerge(ProviderLayerLive), require_Schema$1.provideMerge(TerminalLayerLive), require_Schema$1.provideMerge(AgentBrowserManagerLive), require_Schema$1.provideMerge(require_Schema$1.mergeAll(ThreadDevRuntimeLive, DevTunnelLive.pipe(require_Schema$1.provide$1(ThreadDevRuntimeLive)))), require_Schema$1.provideMerge(PersistenceLayerLive), require_Schema$1.provideMerge(KeybindingsLive), require_Schema$1.provideMerge(ProviderRegistryLive), require_Schema$1.provideMerge(require_Schema$1.mergeAll(ServerSettingsLive, UsageServiceLive.pipe(require_Schema$1.provide$1(ServerSettingsLive)))), require_Schema$1.provideMerge(WorkspaceLayerLive), require_Schema$1.provideMerge(WorkspaceReadinessStateLive), require_Schema$1.provideMerge(ProjectFaviconResolverLive), require_Schema$1.provideMerge(RepositoryIdentityResolverLive), require_Schema$1.provideMerge(ServerEnvironmentLive), require_Schema$1.provideMerge(AuthLayerLive), require_Schema$1.provideMerge(ServerSecretStoreLayerLive), require_Schema$1.provideMerge(require_Schema$1.mergeAll(CloudRedisCoordinationLive, CloudStateSyncLive.pipe(require_Schema$1.provide$1(PersistenceLayerLive)))), require_Schema$1.provideMerge(MiscRuntimeLayerLive));
 const RuntimeDependenciesLive = pullRequestServiceFactoryLayer.pipe(require_Schema$1.provideMerge(RuntimeDependenciesWithoutPullRequestsLive), require_Schema$1.provideMerge(cmmdProjectIdentityResolverLive.pipe(require_Schema$1.provide$1(RuntimeDependenciesWithoutPullRequestsLive))), require_Schema$1.provideMerge(pullRequestProviderRuntimeLive));
 const RuntimeServicesLive = ServerRuntimeStartupLive.pipe(require_Schema$1.provideMerge(RuntimeDependenciesLive));
-const makeRoutesLayer = require_Schema$1.mergeAll(authBearerBootstrapRouteLayer, authBootstrapRouteLayer, authCommandBearerBootstrapRouteLayer, authCommandBootstrapRouteLayer, authOAuthTokenExchangeRouteLayer, authWebSocketTicketRouteLayer, authCmmdOAuthDeviceRouteLayer, authCmmdOAuthTokenRouteLayer, authCmmdPasswordTokenRouteLayer, authClientsRevokeOthersRouteLayer, authClientsRevokeRouteLayer, authClientsRouteLayer, authLogoutRouteLayer, authPairingLinksRevokeRouteLayer, authPairingLinksRouteLayer, authPairingCredentialRouteLayer, authSessionRouteLayer, authWebSocketTokenRouteLayer, authWebLoginRouteLayer, authWebCallbackRouteLayer, desktopLocalWebBridgePublishRouteLayer, desktopLocalWebBridgeBootstrapRouteLayer, desktopRelayControlPlaneRouteLayer, apiDocsHtmlRouteLayer, apiDocsOpenApiRouteLayer, pulseSignalStateListRouteLayer, pulseSignalStateUpsertRouteLayer, cmmdProfileRouteLayer, cmmdCreateBrainDocRouteLayer, cmmdUpdateTaskRouteLayer, cmmdUpsertTaskPullRequestRouteLayer, ...cmmdPullRequestRouteLayers, cmmdAddTaskCommentRouteLayer, cmmdWorkIntakeRouteLayer, cmmdWsTokenRouteLayer, cmmdSearchTasksRouteLayer, cmmdGetTaskCommentsRouteLayer, cmmdGetProjectCommentsRouteLayer, cmmdAddProjectCommentRouteLayer, cmmdUpdateProjectRouteLayer, cmmdGetOrgMembersRouteLayer, cmmdSimHostsRouteLayer, cmmdSimLeaseReadRouteLayer, cmmdSimLeaseClaimRouteLayer, cmmdSimLeaseReleaseRouteLayer, cmmdSimLeaseRenewRouteLayer, cmmdUploadTaskAttachmentRouteLayer, cmmdGetTaskAttachmentsRouteLayer, cmmdUpdateTaskCommentRouteLayer, cmmdDeleteTaskCommentRouteLayer, cmmdGetProjectRepositoryRouteLayer, cmmdListProjectRepositoriesRouteLayer, cmmdArchiveTaskRouteLayer, cmmdUnarchiveTaskRouteLayer, cmmdListTasksRouteLayer, cmmdCreateTaskRouteLayer, cmmdListCampaignsRouteLayer, cmmdGetCampaignRouteLayer, cmmdCreateCampaignRouteLayer, cmmdUpdateCampaignRouteLayer, cmmdDeleteCampaignRouteLayer, cmmdListSavedViewsRouteLayer, cmmdCreateSavedViewRouteLayer, cmmdImportSavedViewRouteLayer, cmmdUpdateSavedViewRouteLayer, cmmdDeleteSavedViewRouteLayer, cmmdListProjectsRouteLayer, cmmdGetProjectRouteLayer, cmmdCreateProjectRouteLayer, cmmdDeleteProjectRouteLayer, cmmdMoveProjectRouteLayer, cmmdGetProjectMembersRouteLayer, cmmdListWorkspaceMembersRouteLayer, cmmdAddProjectMemberRouteLayer, cmmdGetProjectMilestonesRouteLayer, cmmdCreateProjectMilestoneRouteLayer, cmmdUpdateProjectMilestoneRouteLayer, cmmdDeleteProjectMilestoneRouteLayer, cmmdGetProjectUpdatesRouteLayer, cmmdCreateProjectUpdateRouteLayer, cmmdUpdateProjectUpdateRouteLayer, cmmdDeleteProjectUpdateRouteLayer, cmmdImproveProjectContentRouteLayer, cmmdCreateProjectTaskDraftRouteLayer, cmmdGetProjectTaskDraftRouteLayer, cmmdUpdateProjectTaskDraftRouteLayer, cmmdPreviewProjectTaskDraftRouteLayer, cmmdCommitProjectTaskDraftRouteLayer, cmmdDiscardProjectTaskDraftRouteLayer, cmmdGetProjectLeadPlanRouteLayer, cmmdActivateProjectLeadAuthorityRouteLayer, cmmdGetProjectLeadReadinessRouteLayer, cmmdGetProjectLeadCapabilitiesRouteLayer, cmmdGetProjectLeadSummaryRouteLayer, cmmdGetProjectLeadDetailRouteLayer, cmmdGetProjectLeadBriefingRouteLayer, cmmdListProjectLeadEventsRouteLayer, cmmdExplainProjectLeadRouteLayer, cmmdPauseProjectLeadRouteLayer, cmmdResumeProjectLeadRouteLayer, cmmdReserveProjectLeadTaskRouteLayer, cmmdReleaseProjectLeadReservationRouteLayer, cmmdReconcileProjectLeadRouteLayer, cmmdResolveProjectLeadAttentionRouteLayer, cmmdClaimProjectLeadControllerRouteLayer, cmmdRenewProjectLeadControllerClaimRouteLayer, cmmdYieldProjectLeadControllerClaimRouteLayer, cmmdAcknowledgeProjectLeadControllerEventRouteLayer, cmmdRecordProjectLeadControllerDecisionRouteLayer, cmmdListForgeAutomationPresetsRouteLayer, cmmdListUserForgeAutomationRulesRouteLayer, cmmdCreateUserForgeAutomationRuleRouteLayer, cmmdUpdateUserForgeAutomationRuleRouteLayer, cmmdListUserForgeAutomationRunsRouteLayer, cmmdStartUserForgeAutomationRunRouteLayer, cmmdListForgeAutomationRulesRouteLayer, cmmdCreateForgeAutomationRuleRouteLayer, cmmdUpdateForgeAutomationRuleRouteLayer, cmmdListForgeAutomationRunsRouteLayer, cmmdStartForgeAutomationRunRouteLayer, cmmdGetForgeAutomationRunRouteLayer, cmmdRetryForgeAutomationRunRouteLayer, cmmdCancelForgeAutomationRunRouteLayer, cmmdApproveForgeAutomationEscalationRouteLayer, cmmdRejectForgeAutomationEscalationRouteLayer, cmmdListProjectAgentMembersRouteLayer, cmmdCreateProjectAgentMemberRouteLayer, cmmdGetProjectAgentMemberRouteLayer, cmmdRenameProjectAgentMemberRouteLayer, cmmdRetireProjectAgentMemberRouteLayer, cmmdUpdateProjectAgentMemberAvatarRouteLayer, cmmdListProjectAgentMemberInstancesRouteLayer, cmmdPreviewProjectAgentMemberConsolidationRouteLayer, cmmdApplyProjectAgentMemberConsolidationRouteLayer, cmmdPutProjectTaskAssignmentRouteLayer, cmmdListProjectBoardRouteLayer, cmmdGetProjectTaskWorkflowRouteLayer, cmmdUpdateProjectTaskWorkflowRouteLayer, cmmdCreateProjectBoardTaskRouteLayer, cmmdUpdateProjectBoardTaskRouteLayer, cmmdUpdateProjectBoardTaskStatusRouteLayer, cmmdListTaskExecutionOptionsRouteLayer, cmmdCreateTaskWorkSessionRouteLayer, cmmdListProjectWorkSessionsRouteLayer, cmmdGetWorkSessionRouteLayer, cmmdUpdateWorkSessionRouteLayer, cmmdAttachWorkSessionThreadRouteLayer, cmmdListTaskConversationsRouteLayer, cmmdLinkTaskConversationRouteLayer, cmmdGetTaskHistoryRouteLayer, cmmdGetTaskConversationRouteLayer, cmmdSpawnForgeThreadFromBoardTaskRouteLayer, cmmdListCenterBoardRouteLayer, cmmdCreateCenterBoardTaskRouteLayer, cmmdCreateFeedbackRouteLayer, cmmdUpdateCenterBoardTaskRouteLayer, cmmdMoveCenterBoardTaskRouteLayer, cmmdMoveProjectBoardTaskRouteLayer, cmmdArchiveProjectBoardTaskRouteLayer, cmmdUnarchiveProjectBoardTaskRouteLayer, cmmdArchiveCenterBoardTaskRouteLayer, cmmdUnarchiveCenterBoardTaskRouteLayer, cmmdBootstrapRouteLayer, cmmdGetAccountPreferencesRouteLayer, cmmdUpdateAccountPreferencesRouteLayer, cmmdGetOrgProviderPolicyRouteLayer, cmmdListChatsRouteLayer, cmmdGetChatRouteLayer, cmmdListDevicesRouteLayer, runtimeReplicationStatusRouteLayer, cmmdRegisterDeviceRouteLayer, cmmdHeartbeatRuntimeRouteLayer, cmmdGrantRuntimeAccessRouteLayer, cmmdRevokeRuntimeAccessRouteLayer, cmmdCreateRelayControlRouteLayer, cmmdCreateRelayActionGrantRouteLayer, cmmdReplaceRuntimeInventoryRouteLayer, cmmdListRuntimeInventoryRouteLayer, cmmdGetRuntimeDiagnosticsRouteLayer, cmmdProvisionAuthRuntimeRouteLayer, cmmdGetAuthRuntimeRouteLayer, cmmdDestroyAuthRuntimeRouteLayer, cmmdConnectAuthRuntimeRouteLayer, cmmdGetProviderAccountsRouteLayer, cmmdDeleteProviderAccountRouteLayer, cmmdSetProviderAccountDefaultRouteLayer, cmmdGetProviderUsageRouteLayer, cmmdRefreshProviderUsageRouteLayer, cmmdGetUserCodexCredentialRouteLayer, cmmdDeleteUserCodexCredentialRouteLayer, cmmdGetUserClaudeCredentialRouteLayer, cmmdDeleteUserClaudeCredentialRouteLayer, cmmdGetClaudeRuntimeReadinessRouteLayer, cmmdAppendRuntimeThreadEventsRouteLayer, cmmdGetRuntimeThreadReplicaRouteLayer, cmmdRenameDeviceRouteLayer, cmmdRevokeDeviceRouteLayer, cmmdInstallConnectorRouteLayer, cmmdListConnectorsRouteLayer, cmmdForgeCloudProjectsListRouteLayer, cmmdForgeCloudProjectsEventsRouteLayer, cmmdForgeCloudProjectRegisterRouteLayer, cmmdForgeCloudProjectUnregisterRouteLayer, cmmdForgeCloudProjectLifecyclePreflightRouteLayer, cmmdForgeCloudProjectRemovalRouteLayer, cmmdForgeCloudProjectRemovalPreviewRouteLayer, cmmdForgeCloudProjectRemovalReceiptRouteLayer, cmmdForgeRuntimesEnsureRouteLayer, cmmdForgeRuntimesConnectRouteLayer, ownerRuntimeCodexReadinessRouteLayer, cmmdForgeRuntimesStatusRouteLayer, cmmdForgeRuntimesStartRouteLayer, cmmdForgeRuntimesStopRouteLayer, cmmdForgeRuntimesRecycleRouteLayer, cmmdForgeRuntimesUpdateCommitRouteLayer, cmmdForgeRuntimesDestroyRouteLayer, cmmdGetTaskRouteLayer, commandUpdateTaskRouteLayer, mobileProviderCatalogRouteLayer, cmmdUsageSummaryRouteLayer, cmmdBillingRouteLayer, cmmdBillingSeriesRouteLayer, attachmentsRouteLayer, orchestrationDispatchRouteLayer, orchestrationCmmdWorkRunEventRouteLayer, orchestrationAutomationStartThreadRouteLayer, orchestrationAutomationRebindRouteLayer, orchestrationAutomationTerminalReconcileRouteLayer, mobileGitRunStackedActionRouteLayer, pullRequestDiffRouteLayer, orchestrationSnapshotRouteLayer, localAutomationListRouteLayer, localAutomationCreateRouteLayer, localAutomationUpdateRouteLayer, localAutomationDeleteRouteLayer, localAutomationRunRouteLayer, otlpTracesProxyRouteLayer, devTunnelProxyRouteLayer, devTunnelLocalPortProxyRouteLayer, projectFaviconRouteLayer, serverEnvironmentRouteLayer, browserWebRtcReadinessRouteLayer, staticAndDevRouteLayer, githubStatusRouteLayer, githubAuthorizeUrlRouteLayer, githubDisconnectRouteLayer, githubReposRouteLayer, githubCloneRouteLayer, githubCloneJobStartRouteLayer, githubCloneJobStatusRouteLayer, githubRefreshCredentialsRouteLayer, githubToolConfirmationApproveRouteLayer, projectLinkGetRouteLayer, projectLinkListRouteLayer, projectLinkSetRouteLayer, projectLinkDeleteRouteLayer, cmmdWorkspacesRouteLayer, cmmdCampaignsRouteLayer, cmmdProjectLinksRouteLayer, cmmdEnsureGitHubProjectContextRouteLayer, cmmdProjectRepositoryEnsureRouteLayer, cmmdProjectsGetRouteLayer, cmmdProjectsCreateRouteLayer, workspaceReadinessRouteLayer, runtimeLivenessRouteLayer, claudeNativeGenerationProofRouteLayer, claudeUsageRouteLayer, codexRuntimeProviderReadinessRouteLayer, runtimeDiagnosticsRouteLayer, cloudFoldersRouteLayer, cloudProjectCreateRouteLayer, gitUrlCloneRouteLayer, websocketRpcRouteLayer).pipe(require_Schema$1.provide$1(browserApiCorsLayer));
+const makeRoutesLayer = require_Schema$1.mergeAll(authBearerBootstrapRouteLayer, authBootstrapRouteLayer, authCommandBearerBootstrapRouteLayer, authCommandBootstrapRouteLayer, authOAuthTokenExchangeRouteLayer, authWebSocketTicketRouteLayer, authCmmdOAuthDeviceRouteLayer, authCmmdOAuthTokenRouteLayer, authCmmdPasswordTokenRouteLayer, authClientsRevokeOthersRouteLayer, authClientsRevokeRouteLayer, authClientsRouteLayer, authLogoutRouteLayer, authPairingLinksRevokeRouteLayer, authPairingLinksRouteLayer, authPairingCredentialRouteLayer, authSessionRouteLayer, authWebSocketTokenRouteLayer, authWebLoginRouteLayer, authWebCallbackRouteLayer, desktopLocalWebBridgePublishRouteLayer, desktopLocalWebBridgeBootstrapRouteLayer, desktopRelayControlPlaneRouteLayer, apiDocsHtmlRouteLayer, apiDocsOpenApiRouteLayer, pulseSignalStateListRouteLayer, pulseSignalStateUpsertRouteLayer, cmmdProfileRouteLayer, cmmdCreateBrainDocRouteLayer, cmmdUpdateTaskRouteLayer, cmmdUpsertTaskPullRequestRouteLayer, ...cmmdPullRequestRouteLayers, cmmdAddTaskCommentRouteLayer, cmmdWorkIntakeRouteLayer, cmmdWsTokenRouteLayer, cmmdSearchTasksRouteLayer, cmmdGetTaskCommentsRouteLayer, cmmdGetProjectCommentsRouteLayer, cmmdAddProjectCommentRouteLayer, cmmdUpdateProjectRouteLayer, cmmdGetOrgMembersRouteLayer, cmmdSimHostsRouteLayer, cmmdSimLeaseReadRouteLayer, cmmdSimLeaseClaimRouteLayer, cmmdSimLeaseReleaseRouteLayer, cmmdSimLeaseRenewRouteLayer, cmmdUploadTaskAttachmentRouteLayer, cmmdGetTaskAttachmentsRouteLayer, cmmdUpdateTaskCommentRouteLayer, cmmdDeleteTaskCommentRouteLayer, cmmdGetProjectRepositoryRouteLayer, cmmdListProjectRepositoriesRouteLayer, cmmdArchiveTaskRouteLayer, cmmdUnarchiveTaskRouteLayer, cmmdListTasksRouteLayer, cmmdCreateTaskRouteLayer, cmmdListCampaignsRouteLayer, cmmdGetCampaignRouteLayer, cmmdCreateCampaignRouteLayer, cmmdUpdateCampaignRouteLayer, cmmdDeleteCampaignRouteLayer, cmmdListSavedViewsRouteLayer, cmmdCreateSavedViewRouteLayer, cmmdImportSavedViewRouteLayer, cmmdUpdateSavedViewRouteLayer, cmmdDeleteSavedViewRouteLayer, cmmdListProjectsRouteLayer, cmmdGetProjectRouteLayer, cmmdCreateProjectRouteLayer, cmmdDeleteProjectRouteLayer, cmmdMoveProjectRouteLayer, cmmdGetProjectMembersRouteLayer, cmmdListWorkspaceMembersRouteLayer, cmmdAddProjectMemberRouteLayer, cmmdGetProjectMilestonesRouteLayer, cmmdCreateProjectMilestoneRouteLayer, cmmdUpdateProjectMilestoneRouteLayer, cmmdDeleteProjectMilestoneRouteLayer, cmmdGetProjectUpdatesRouteLayer, cmmdCreateProjectUpdateRouteLayer, cmmdUpdateProjectUpdateRouteLayer, cmmdDeleteProjectUpdateRouteLayer, cmmdImproveProjectContentRouteLayer, cmmdCreateProjectTaskDraftRouteLayer, cmmdGetProjectTaskDraftRouteLayer, cmmdUpdateProjectTaskDraftRouteLayer, cmmdPreviewProjectTaskDraftRouteLayer, cmmdCommitProjectTaskDraftRouteLayer, cmmdDiscardProjectTaskDraftRouteLayer, cmmdGetProjectLeadPlanRouteLayer, cmmdActivateProjectLeadAuthorityRouteLayer, cmmdGetProjectLeadReadinessRouteLayer, cmmdGetProjectLeadCapabilitiesRouteLayer, cmmdGetProjectLeadSummaryRouteLayer, cmmdGetProjectLeadDetailRouteLayer, cmmdGetProjectLeadBriefingRouteLayer, cmmdListProjectLeadEventsRouteLayer, cmmdExplainProjectLeadRouteLayer, cmmdPauseProjectLeadRouteLayer, cmmdResumeProjectLeadRouteLayer, cmmdReserveProjectLeadTaskRouteLayer, cmmdReleaseProjectLeadReservationRouteLayer, cmmdReconcileProjectLeadRouteLayer, cmmdResolveProjectLeadAttentionRouteLayer, cmmdClaimProjectLeadControllerRouteLayer, cmmdRenewProjectLeadControllerClaimRouteLayer, cmmdYieldProjectLeadControllerClaimRouteLayer, cmmdAcknowledgeProjectLeadControllerEventRouteLayer, cmmdRecordProjectLeadControllerDecisionRouteLayer, cmmdListForgeAutomationPresetsRouteLayer, cmmdListUserForgeAutomationRulesRouteLayer, cmmdCreateUserForgeAutomationRuleRouteLayer, cmmdUpdateUserForgeAutomationRuleRouteLayer, cmmdListUserForgeAutomationRunsRouteLayer, cmmdStartUserForgeAutomationRunRouteLayer, cmmdListForgeAutomationRulesRouteLayer, cmmdCreateForgeAutomationRuleRouteLayer, cmmdUpdateForgeAutomationRuleRouteLayer, cmmdListForgeAutomationRunsRouteLayer, cmmdStartForgeAutomationRunRouteLayer, cmmdGetForgeAutomationRunRouteLayer, cmmdRetryForgeAutomationRunRouteLayer, cmmdCancelForgeAutomationRunRouteLayer, cmmdApproveForgeAutomationEscalationRouteLayer, cmmdRejectForgeAutomationEscalationRouteLayer, cmmdListProjectAgentMembersRouteLayer, cmmdCreateProjectAgentMemberRouteLayer, cmmdGetProjectAgentMemberRouteLayer, cmmdRenameProjectAgentMemberRouteLayer, cmmdRetireProjectAgentMemberRouteLayer, cmmdUpdateProjectAgentMemberAvatarRouteLayer, cmmdListProjectAgentMemberInstancesRouteLayer, cmmdPreviewProjectAgentMemberConsolidationRouteLayer, cmmdApplyProjectAgentMemberConsolidationRouteLayer, cmmdPutProjectTaskAssignmentRouteLayer, cmmdListProjectBoardRouteLayer, cmmdGetProjectTaskWorkflowRouteLayer, cmmdUpdateProjectTaskWorkflowRouteLayer, cmmdCreateProjectBoardTaskRouteLayer, cmmdUpdateProjectBoardTaskRouteLayer, cmmdUpdateProjectBoardTaskStatusRouteLayer, cmmdListTaskExecutionOptionsRouteLayer, cmmdCreateTaskWorkSessionRouteLayer, cmmdListProjectWorkSessionsRouteLayer, cmmdGetWorkSessionRouteLayer, cmmdUpdateWorkSessionRouteLayer, cmmdAttachWorkSessionThreadRouteLayer, cmmdListTaskConversationsRouteLayer, cmmdLinkTaskConversationRouteLayer, cmmdGetTaskHistoryRouteLayer, cmmdGetTaskConversationRouteLayer, cmmdSpawnForgeThreadFromBoardTaskRouteLayer, cmmdListCenterBoardRouteLayer, cmmdCreateCenterBoardTaskRouteLayer, cmmdCreateFeedbackRouteLayer, cmmdUpdateCenterBoardTaskRouteLayer, cmmdMoveCenterBoardTaskRouteLayer, cmmdMoveProjectBoardTaskRouteLayer, cmmdArchiveProjectBoardTaskRouteLayer, cmmdUnarchiveProjectBoardTaskRouteLayer, cmmdArchiveCenterBoardTaskRouteLayer, cmmdUnarchiveCenterBoardTaskRouteLayer, cmmdBootstrapRouteLayer, cmmdGetAccountPreferencesRouteLayer, cmmdUpdateAccountPreferencesRouteLayer, cmmdGetOrgProviderPolicyRouteLayer, cmmdListChatsRouteLayer, cmmdGetChatRouteLayer, cmmdListDevicesRouteLayer, runtimeReplicationStatusRouteLayer, cmmdRegisterDeviceRouteLayer, cmmdHeartbeatRuntimeRouteLayer, cmmdGrantRuntimeAccessRouteLayer, cmmdRevokeRuntimeAccessRouteLayer, cmmdCreateRelayControlRouteLayer, cmmdCreateRelayActionGrantRouteLayer, cmmdReplaceRuntimeInventoryRouteLayer, cmmdListRuntimeInventoryRouteLayer, cmmdGetRuntimeDiagnosticsRouteLayer, cmmdProvisionAuthRuntimeRouteLayer, cmmdGetAuthRuntimeRouteLayer, cmmdDestroyAuthRuntimeRouteLayer, cmmdConnectAuthRuntimeRouteLayer, cmmdGetProviderAccountsRouteLayer, cmmdDeleteProviderAccountRouteLayer, cmmdSetProviderAccountDefaultRouteLayer, cmmdGetProviderUsageRouteLayer, cmmdRefreshProviderUsageRouteLayer, cmmdGetUserCodexCredentialRouteLayer, cmmdDeleteUserCodexCredentialRouteLayer, cmmdGetUserClaudeCredentialRouteLayer, cmmdDeleteUserClaudeCredentialRouteLayer, cmmdGetClaudeRuntimeReadinessRouteLayer, cmmdAppendRuntimeThreadEventsRouteLayer, cmmdGetRuntimeThreadReplicaRouteLayer, cmmdRenameDeviceRouteLayer, cmmdRevokeDeviceRouteLayer, cmmdInstallConnectorRouteLayer, cmmdListConnectorsRouteLayer, cmmdForgeCloudProjectsListRouteLayer, cmmdForgeCloudProjectsEventsRouteLayer, cmmdForgeCloudProjectRegisterRouteLayer, cmmdForgeCloudProjectUnregisterRouteLayer, cmmdForgeCloudProjectLifecyclePreflightRouteLayer, cmmdForgeCloudProjectRemovalRouteLayer, cmmdForgeCloudProjectRemovalPreviewRouteLayer, cmmdForgeCloudProjectRemovalReceiptRouteLayer, cmmdForgeRuntimesEnsureRouteLayer, cmmdForgeRuntimesConnectRouteLayer, ownerRuntimeCodexReadinessRouteLayer, cmmdForgeRuntimesStatusRouteLayer, cmmdForgeRuntimesStartRouteLayer, cmmdForgeRuntimesStopRouteLayer, cmmdForgeRuntimesRecycleRouteLayer, cmmdForgeRuntimesUpdateCommitRouteLayer, cmmdForgeRuntimesDestroyRouteLayer, cmmdRenameForgeRuntimeRouteLayer, cmmdGetTaskRouteLayer, commandUpdateTaskRouteLayer, mobileProviderCatalogRouteLayer, cmmdUsageSummaryRouteLayer, cmmdBillingRouteLayer, cmmdBillingSeriesRouteLayer, attachmentsRouteLayer, orchestrationDispatchRouteLayer, orchestrationCmmdWorkRunEventRouteLayer, orchestrationAutomationStartThreadRouteLayer, orchestrationAutomationRebindRouteLayer, orchestrationAutomationTerminalReconcileRouteLayer, mobileGitRunStackedActionRouteLayer, pullRequestDiffRouteLayer, orchestrationSnapshotRouteLayer, localAutomationListRouteLayer, localAutomationCreateRouteLayer, localAutomationUpdateRouteLayer, localAutomationDeleteRouteLayer, localAutomationRunRouteLayer, otlpTracesProxyRouteLayer, devTunnelProxyRouteLayer, devTunnelLocalPortProxyRouteLayer, projectFaviconRouteLayer, serverEnvironmentRouteLayer, browserWebRtcReadinessRouteLayer, staticAndDevRouteLayer, githubStatusRouteLayer, githubAuthorizeUrlRouteLayer, githubDisconnectRouteLayer, githubReposRouteLayer, githubCloneRouteLayer, githubCloneJobStartRouteLayer, githubCloneJobStatusRouteLayer, githubRefreshCredentialsRouteLayer, githubToolConfirmationApproveRouteLayer, projectLinkGetRouteLayer, projectLinkListRouteLayer, projectLinkSetRouteLayer, projectLinkDeleteRouteLayer, cmmdWorkspacesRouteLayer, cmmdCampaignsRouteLayer, cmmdProjectLinksRouteLayer, cmmdEnsureGitHubProjectContextRouteLayer, cmmdProjectRepositoryEnsureRouteLayer, cmmdProjectsGetRouteLayer, cmmdProjectsCreateRouteLayer, workspaceReadinessRouteLayer, runtimeLivenessRouteLayer, claudeNativeGenerationProofRouteLayer, claudeUsageRouteLayer, codexRuntimeProviderReadinessRouteLayer, runtimeDiagnosticsRouteLayer, cloudFoldersRouteLayer, cloudProjectCreateRouteLayer, gitUrlCloneRouteLayer, websocketRpcRouteLayer).pipe(require_Schema$1.provide$1(browserApiCorsLayer));
 const makeServerLayer = require_Schema$1.unwrap(require_Schema$1.gen(function* () {
 	const config = yield* ServerConfig;
-	fixPath();
+	fixPath({ preferProcessPath: config.forgeCmmdRuntimeMode === true });
 	const httpListeningLayer = require_Schema$1.effectDiscard(require_Schema$1.gen(function* () {
 		yield* require_HttpServer.HttpServer;
 		yield* (yield* ServerRuntimeStartup).markHttpListening;