ryco-cli 0.1.6 → 0.1.7

package/dist/bin.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import { $ as ProviderStopSessionInput, $n as ApprovalRequestId, $t as ThreadMetaUpdatedPayload$1, A as OpinionatedPluginError, At as OrchestrationThread, B as ServerSettingsError, Bt as ProjectionPendingApprovalDecision, C as McpOauthLoginResult, Cn as SourceControlProviderError, Ct as OrchestrationMessageRole, D as McpServerName, Dt as OrchestrationSession, E as McpServerConfig, En as VcsDriverKind, Et as OrchestrationReplayEventsError, F as CopilotSettings, Fn as MODEL_SLUG_ALIASES_BY_PROVIDER, Ft as ProjectCreatedPayload$1, G as ResolvedKeybindingRule, Gn as EDITORS, Gt as RuntimeMode, H as KeybindingsConfig, Hn as TerminalHistoryError, I as CursorSettings, In as ProviderDriverKind, It as ProjectDeletedPayload$1, J as ProviderInterruptTurnInput, Jn as AuthClientMetadataDeviceType, Jt as ThreadAttachedToWorktreePayload$1, K as THREAD_JUMP_KEYBINDING_COMMANDS, Kn as OpenError, Kt as ThreadActivityAppendedPayload$1, L as DEFAULT_SERVER_SETTINGS, Ln as ProviderInstanceId, Lt as ProjectMetaUpdatedPayload$1, M as ServerProviderUpdateError, Mt as OrchestrationWorktreeShell, N as ClaudeSettings, Nn as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, O as McpSettingsError, On as VcsProcessExitError, Ot as OrchestrationSessionStatus, P as CodexSettings, Pn as DEFAULT_MODEL, Pt as ProjectAvatarSetPayload$1, Q as ProviderSessionStartInput, Qn as AuthRpcError, Qt as ThreadMessageSentPayload, R as OpenCodeSettings, Rn as defaultInstanceIdForDriver, Rt as ProjectMetadataDir, S as McpListServersResult, St as OrchestrationMessage, T as McpServer, Tt as OrchestrationReadModel, U as KeybindingsConfigError, Un as TerminalNotRunningError, Ut as ProviderInteractionMode, V as KeybindingRule, Vn as TerminalCwdError, Vt as ProjectionPendingApprovalStatus, W as MODEL_PICKER_JUMP_KEYBINDING_COMMANDS, Wn as TerminalSessionLookupError, Wt as ProviderSessionRuntimeStatus, X as ProviderRespondToUserInputInput, Xn as AuthRevokeClientSessionInput, Xt as ThreadDeletedPayload$1, Y as ProviderRespondToRequestInput, Yn as AuthCreatePairingCredentialInput, Yt as ThreadCreatedPayload$1, Z as ProviderSendTurnInput, Zn as AuthRevokePairingLinkInput, Zt as ThreadInteractionModeSetPayload$1, _ as GitManagerError, _n as WorktreeId, _r as TrimmedNonEmptyString, _t as OrchestrationEventType, an as ThreadTokenModeSetPayload$1, ar as EnvironmentId, at as DEFAULT_PROVIDER_INTERACTION_MODE, b as McpInventoryResourceTemplate, bn as WorkItemProviderError, bt as OrchestrationGetTurnDiffError, c as ProjectSearchEntriesError, cn as WorktreeArchivedPayload$1, cr as MessageId, ct as OrchestrationActorKind, d as AtlassianCapability, dn as WorktreeManualPositionSetPayload$1, dr as ProjectId, dt as OrchestrationCheckpointStatus, en as ThreadProposedPlanUpsertedPayload$1, er as AtlassianConnectionId, et as AgentTokenMode, f as AtlassianConnectionError, fn as WorktreeMetaUpdatedPayload$1, ft as OrchestrationCheckpointSummary, g as GitCommandError, gn as Worktree, gr as ThreadId, gt as OrchestrationEventMetadata, h as AtlassianProduct, hn as StatusBucket, ht as OrchestrationEvent, i as FilesystemBrowseError, in as ThreadStatusBucketOverriddenPayload$1, ir as CommandId, j as ServerProvider, jn as VcsUnsupportedOperationError, jt as OrchestrationThreadActivityTone, k as McpWorkspaceId, kt as OrchestrationShellSnapshot, l as ProjectStageFileReferenceError, ln as WorktreeCreatedPayload$1, lr as NonNegativeInt, lt as OrchestrationAggregateKind, m as AtlassianConnectionStatus, mn as WorktreeSourceControlStateUpdatedPayload$1, mt as OrchestrationDispatchCommandError, n as WS_METHODS, nn as ThreadRuntimeModeSetPayload$1, nr as AuthSessionId, nt as ClientOrchestrationCommand, o as ProjectListEntriesError, on as ThreadTurnDiffCompletedPayload$1, or as EventId, ot as ModelSelection, p as AtlassianConnectionKind, pn as WorktreeRestoredPayload$1, pt as OrchestrationCommandReceiptStatus, q as isToolLifecycleItemType, qn as AuthBootstrapInput, qt as ThreadArchivedPayload$1, r as WsRpcGroup, rn as ThreadSessionSetPayload$1, rr as CheckpointRef, rt as DEFAULT_AGENT_TOKEN_MODE, s as ProjectReadFileError, sn as ThreadUnarchivedPayload$1, sr as IsoDateTime, st as ORCHESTRATION_WS_METHODS, t as collectUint8StreamText, tn as ThreadRevertedPayload$1, tr as AtlassianResourceId, tt as ChatAttachment, u as ProjectWriteFileError, un as WorktreeDeletedPayload$1, ur as PositiveInt, ut as OrchestrationCheckpointFile, v as TextGenerationError, vn as WORK_ITEM_DETAIL_BODY_MAX_BYTES, vr as TurnId, vt as OrchestrationGetFullThreadDiffError, w as McpProviderSupport, wn as SourceControlRepositoryError, wt as OrchestrationProposedPlanId, x as McpInventoryTool, xn as WorkItemProviderKind, xt as OrchestrationGetTurnDiffResult, y as McpInventoryResource, yn as WORK_ITEM_DETAIL_COMMENT_BODY_MAX_BYTES, yt as OrchestrationGetSnapshotError, z as ServerSettings, zn as isProviderDriverKind, zt as ProjectScript } from "./collectUint8StreamText-C2z5Y8tF.mjs";
-import { _ as formatSchemaError, a as makeForgejoDiscovery, c as sourceBranch, d as firstNonEmptyLine, f as probeSourceControlProvider, g as decodeJsonResult, h as layer$19, i as makeBitbucketDiscovery, m as VcsProcess, n as githubDiscovery, o as SourceControlProvider, p as refineUnknownRemoteProvider, r as gitlabDiscovery, s as parseSourceControlOwnerRef, t as azureDevOpsDiscovery, u as detailFromCause, v as fromLenientJson } from "./SourceControlProviderDiscoveryCatalog-yMDer_Yh.mjs";
+import { $ as ProviderRespondToUserInputInput, $n as AuthRevokeClientSessionInput, $t as ThreadDeletedPayload$1, A as McpServerName, At as OrchestrationSession, B as DEFAULT_SERVER_SETTINGS, Bn as ProviderInstanceId, Bt as ProjectMetaUpdatedPayload$1, C as McpInventoryResourceTemplate, Cn as WorkItemProviderError, Ct as OrchestrationGetTurnDiffError, D as McpProviderSupport, Dn as SourceControlRepositoryError, Dt as OrchestrationProposedPlanId, E as McpOauthLoginResult, En as SourceControlProviderError, Et as OrchestrationMessageRole, F as ServerProviderUpdateError, Ft as OrchestrationWorktreeShell, G as KeybindingsConfig, Gn as TerminalHistoryError, H as ServerSettings, Hn as isProviderDriverKind, Ht as ProjectScript, I as ClaudeSettings, In as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, J as ResolvedKeybindingRule, Jn as EDITORS, Jt as RuntimeMode, K as KeybindingsConfigError, Kn as TerminalNotRunningError, Kt as ProviderInteractionMode, L as CodexSettings, Ln as DEFAULT_MODEL, Lt as ProjectAvatarSetPayload$1, M as McpWorkspaceId, Mt as OrchestrationShellSnapshot, N as OpinionatedPluginError, Nt as OrchestrationThread, O as McpServer, Ot as OrchestrationReadModel, P as ServerProvider, Pn as VcsUnsupportedOperationError, Pt as OrchestrationThreadActivityTone, Q as ProviderRespondToRequestInput, Qn as AuthCreatePairingCredentialInput, Qt as ThreadCreatedPayload$1, R as CopilotSettings, Rn as MODEL_SLUG_ALIASES_BY_PROVIDER, Rt as ProjectCreatedPayload$1, S as McpInventoryResource, Sn as WORK_ITEM_DETAIL_COMMENT_BODY_MAX_BYTES, Sr as TurnId, St as OrchestrationGetSnapshotError, T as McpListServersResult, Tt as OrchestrationMessage, U as ServerSettingsError, Ut as ProjectionPendingApprovalDecision, V as OpenCodeSettings, Vn as defaultInstanceIdForDriver, Vt as ProjectMetadataDir, W as KeybindingRule, Wn as TerminalCwdError, Wt as ProjectionPendingApprovalStatus, X as isToolLifecycleItemType, Xn as AuthBootstrapInput, Xt as ThreadArchivedPayload$1, Y as THREAD_JUMP_KEYBINDING_COMMANDS, Yn as OpenError, Yt as ThreadActivityAppendedPayload$1, Z as ProviderInterruptTurnInput, Zn as AuthClientMetadataDeviceType, Zt as ThreadAttachedToWorktreePayload$1, _ as AtlassianConnectionStatus, _n as WorktreeSourceControlStateUpdatedPayload$1, _t as OrchestrationDispatchCommandError, a as WS_METHODS, an as ThreadRuntimeModeSetPayload$1, ar as AuthSessionId, at as ClientOrchestrationCommand, b as GitManagerError, bn as WorktreeId, br as ThreadId, bt as OrchestrationEventType, cn as ThreadTokenModeSetPayload$1, cr as EnvironmentId, ct as DEFAULT_PROVIDER_INTERACTION_MODE, d as ProjectSearchEntriesError, dn as WorktreeArchivedPayload$1, dr as MessageId, dt as OrchestrationActorKind, en as ThreadInteractionModeSetPayload$1, er as AuthRevokePairingLinkInput, et as ProviderSendTurnInput, f as ProjectStageFileReferenceError, fn as WorktreeCreatedPayload$1, fr as NonNegativeInt, ft as OrchestrationAggregateKind, g as AtlassianConnectionKind, gn as WorktreeRestoredPayload$1, gt as OrchestrationCommandReceiptStatus, h as AtlassianConnectionError, hn as WorktreeMetaUpdatedPayload$1, ht as OrchestrationCheckpointSummary, i as fromLenientJson, in as ThreadRevertedPayload$1, ir as AtlassianResourceId, it as ChatAttachment, j as McpSettingsError, jn as VcsProcessExitError, jt as OrchestrationSessionStatus, k as McpServerConfig, kn as VcsDriverKind, kt as OrchestrationReplayEventsError, l as ProjectListEntriesError, ln as ThreadTurnDiffCompletedPayload$1, lr as EventId, lt as ModelSelection, m as AtlassianCapability, mn as WorktreeManualPositionSetPayload$1, mr as ProjectId, mt as OrchestrationCheckpointStatus, n as decodeJsonResult, nn as ThreadMetaUpdatedPayload$1, nr as ApprovalRequestId, nt as ProviderStopSessionInput, o as WsRpcGroup, on as ThreadSessionSetPayload$1, or as CheckpointRef, ot as DEFAULT_AGENT_TOKEN_MODE, p as ProjectWriteFileError, pn as WorktreeDeletedPayload$1, pr as PositiveInt, pt as OrchestrationCheckpointFile, q as MODEL_PICKER_JUMP_KEYBINDING_COMMANDS, qn as TerminalSessionLookupError, qt as ProviderSessionRuntimeStatus, r as formatSchemaError, rn as ThreadProposedPlanUpsertedPayload$1, rr as AtlassianConnectionId, rt as AgentTokenMode, s as FilesystemBrowseError, sn as ThreadStatusBucketOverriddenPayload$1, sr as CommandId, t as collectUint8StreamText, tn as ThreadMessageSentPayload, tr as AuthRpcError, tt as ProviderSessionStartInput, u as ProjectReadFileError, un as ThreadUnarchivedPayload$1, ur as IsoDateTime, ut as ORCHESTRATION_WS_METHODS, v as AtlassianProduct, vn as StatusBucket, vt as OrchestrationEvent, w as McpInventoryTool, wn as WorkItemProviderKind, wt as OrchestrationGetTurnDiffResult, x as TextGenerationError, xn as WORK_ITEM_DETAIL_BODY_MAX_BYTES, xr as TrimmedNonEmptyString, xt as OrchestrationGetFullThreadDiffError, y as GitCommandError, yn as Worktree, yt as OrchestrationEventMetadata, z as CursorSettings, zn as ProviderDriverKind, zt as ProjectDeletedPayload$1 } from "./collectUint8StreamText-Lv4GGI79.mjs";
 import { A as terminalRestartsTotal, B as mergeGitStatusParts, C as runtimeQueueDequeuesTotal, D as startupCommandGateQueueDepth, E as startupCommandGateEnqueuesTotal, F as WORKTREE_BRANCH_PREFIX, G as compactTraceAttributes, H as resolveAutoFeatureBranchName, I as buildTemporaryWorktreeBranchName, J as RuntimeMode$1, K as outcomeFromExit, L as dedupeRemoteBranchesWithLocalMatches, M as withMetrics, N as LocalDiagnosticsMetrics, O as startupCommandGateQueueHighWater, P as LocalDiagnosticsMetricsLive, Q as resolveStaticDir, R as detectSourceControlProviderFromGitRemoteUrl, S as runtimeQueueDepth, T as runtimeQueueHighWater, U as sanitizeBranchFragment, V as normalizeGitRemoteUrl, W as sanitizeFeatureBranchName, X as deriveServerPaths, Y as ServerConfig, Z as ensureServerDirectories, _ as providerTurnDuration, a as orchestrationCommandAckDuration, b as rpcRequestDuration, c as orchestrationEventsProcessedTotal, d as providerRuntimeEventsTotal, f as providerSessionsTotal, g as providerStartupQueueWaitDuration, h as providerStartupQueueHighWater, i as metricAttributes, j as terminalSessionsTotal, k as startupCommandGateQueueWaitDuration, l as providerEventLogRecordsDroppedTotal, m as providerStartupQueueDepth, n as gitCommandsTotal, o as orchestrationCommandDuration, p as providerStartupAdmissionTotal, q as DEFAULT_PORT, r as increment, s as orchestrationCommandsTotal, t as gitCommandDuration, u as providerMetricAttributes, v as providerTurnMetricAttributes, w as runtimeQueueEnqueuesTotal, x as rpcRequestsTotal, y as providerTurnsTotal, z as isTemporaryWorktreeBranch } from "./Metrics-6Xj17Se3.mjs";
+import { a as makeForgejoDiscovery, c as sourceBranch, d as firstNonEmptyLine, f as probeSourceControlProvider, h as layer$19, i as makeBitbucketDiscovery, m as VcsProcess, n as githubDiscovery, o as SourceControlProvider, p as refineUnknownRemoteProvider, r as gitlabDiscovery, s as parseSourceControlOwnerRef, t as azureDevOpsDiscovery, u as detailFromCause } from "./SourceControlProviderDiscoveryCatalog-mJV_Xitr.mjs";
 import { n as detectSourceControlProviderFromRemoteUrl, r as getChangeRequestTerminologyForKind } from "./sourceControl-iWG-m4wE.mjs";
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
@@ -31,10 +31,10 @@ import sharp from "sharp";
 import { RpcSerialization, RpcServer } from "effect/unstable/rpc";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import * as Semaphore$1 from "effect/Semaphore";
+import * as Random$1 from "effect/Random";
 import "effect/PlatformError";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as Migrator from "effect/unstable/sql/Migrator";
-import * as Random$1 from "effect/Random";
 import fsPromises, { open, realpath } from "node:fs/promises";
 import * as Context$1 from "effect/Context";
 import "effect/Scope";
@@ -46,8 +46,8 @@ import * as Ref$1 from "effect/Ref";
 import * as Stream$1 from "effect/Stream";
 import * as SchemaIssue$1 from "effect/SchemaIssue";
 import * as Sink$1 from "effect/Sink";
-import { clamp } from "effect/Number";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
+import { clamp } from "effect/Number";
 import { pathToFileURL } from "node:url";
 import { parsePatchFiles } from "@pierre/diffs";
 import { monitorEventLoopDelay } from "node:perf_hooks";
@@ -1629,6 +1629,388 @@ const makeProviderMaintenanceCommandCoordinator = Effect.fn("makeProviderMainten
 	return { withCommandLock };
 });
 //#endregion
+//#region src/atomicWrite.ts
+const writeFileStringAtomically = (input) => Effect.scoped(Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const tempFileId = yield* Random$1.nextUUIDv4;
+	const targetDirectory = path.dirname(input.filePath);
+	yield* fs.makeDirectory(targetDirectory, { recursive: true });
+	const tempDirectory = yield* fs.makeTempDirectoryScoped({
+		directory: targetDirectory,
+		prefix: `${path.basename(input.filePath)}.`
+	});
+	const tempPath = path.join(tempDirectory, `${tempFileId}.tmp`);
+	yield* fs.writeFileString(tempPath, input.contents);
+	yield* fs.rename(tempPath, input.filePath);
+}));
+//#endregion
+//#region src/auth/Services/ServerSecretStore.ts
+var SecretStoreError = class extends Data.TaggedError("SecretStoreError") {};
+var ServerSecretStore = class extends Context.Service()("ryco/auth/Services/ServerSecretStore") {};
+//#endregion
+//#region src/auth/Layers/ServerSecretStore.ts
+const makeServerSecretStore = Effect.gen(function* () {
+	const fileSystem = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const serverConfig = yield* ServerConfig;
+	yield* fileSystem.makeDirectory(serverConfig.secretsDir, { recursive: true });
+	yield* fileSystem.chmod(serverConfig.secretsDir, 448).pipe(Effect.mapError((cause) => new SecretStoreError({
+		message: `Failed to secure secrets directory ${serverConfig.secretsDir}.`,
+		cause
+	})));
+	const resolveSecretPath = (name) => path.join(serverConfig.secretsDir, `${name}.bin`);
+	const ensureSecretDirectory = (secretPath) => {
+		const directory = path.dirname(secretPath);
+		return fileSystem.makeDirectory(directory, { recursive: true }).pipe(Effect.flatMap(() => fileSystem.chmod(directory, 448)));
+	};
+	const isPlatformError = (u) => Predicate.isTagged(u, "PlatformError");
+	const get = (name) => fileSystem.readFile(resolveSecretPath(name)).pipe(Effect.map((bytes) => Uint8Array.from(bytes)), Effect.catch((cause) => cause.reason._tag === "NotFound" ? Effect.succeed(null) : Effect.fail(new SecretStoreError({
+		message: `Failed to read secret ${name}.`,
+		cause
+	}))));
+	const set = (name, value) => {
+		const secretPath = resolveSecretPath(name);
+		const tempPath = `${secretPath}.${Crypto.randomUUID()}.tmp`;
+		return Effect.gen(function* () {
+			yield* ensureSecretDirectory(secretPath);
+			yield* fileSystem.writeFile(tempPath, value);
+			yield* fileSystem.chmod(tempPath, 384);
+			yield* fileSystem.rename(tempPath, secretPath);
+			yield* fileSystem.chmod(secretPath, 384);
+		}).pipe(Effect.catch((cause) => fileSystem.remove(tempPath).pipe(Effect.ignore, Effect.flatMap(() => Effect.fail(new SecretStoreError({
+			message: `Failed to persist secret ${name}.`,
+			cause
+		}))))));
+	};
+	const create = (name, value) => {
+		const secretPath = resolveSecretPath(name);
+		return Effect.scoped(Effect.gen(function* () {
+			yield* ensureSecretDirectory(secretPath);
+			const file = yield* fileSystem.open(secretPath, {
+				flag: "wx",
+				mode: 384
+			});
+			yield* file.writeAll(value);
+			yield* file.sync;
+			yield* fileSystem.chmod(secretPath, 384);
+		})).pipe(Effect.mapError((cause) => new SecretStoreError({
+			message: `Failed to persist secret ${name}.`,
+			cause
+		})));
+	};
+	const getOrCreateRandom = (name, bytes) => get(name).pipe(Effect.flatMap((existing) => {
+		if (existing) return Effect.succeed(existing);
+		const generated = Crypto.randomBytes(bytes);
+		return create(name, generated).pipe(Effect.as(Uint8Array.from(generated)), Effect.catchTag("SecretStoreError", (error) => isPlatformError(error.cause) && error.cause.reason._tag === "AlreadyExists" ? get(name).pipe(Effect.flatMap((created) => created !== null ? Effect.succeed(created) : Effect.fail(new SecretStoreError({ message: `Failed to read secret ${name} after concurrent creation.` })))) : Effect.fail(error)));
+	}));
+	const remove = (name) => fileSystem.remove(resolveSecretPath(name)).pipe(Effect.catch((cause) => cause.reason._tag === "NotFound" ? Effect.void : Effect.fail(new SecretStoreError({
+		message: `Failed to remove secret ${name}.`,
+		cause
+	}))));
+	return {
+		get,
+		set,
+		getOrCreateRandom,
+		remove
+	};
+});
+const ServerSecretStoreLive = Layer.effect(ServerSecretStore, makeServerSecretStore);
+//#endregion
+//#region src/serverSettings.ts
+/**
+* ServerSettings - Server-authoritative settings service.
+*
+* Owns persistence, validation, and change notification of settings that affect
+* server-side behavior (binary paths, streaming mode, env mode, custom models,
+* text generation model selection).
+*
+* Follows the same pattern as `keybindings.ts`: JSON file + Cache + PubSub +
+* Semaphore + FileSystem.watch for concurrency and external edit detection.
+*
+* @module ServerSettings
+*/
+const textEncoder$2 = new TextEncoder();
+const textDecoder$2 = new TextDecoder();
+function providerEnvironmentSecretName(input) {
+	return `provider-env-${Buffer.from(input.instanceId, "utf8").toString("base64url")}-${Buffer.from(input.name, "utf8").toString("base64url")}`;
+}
+function redactProviderEnvironmentVariable(variable) {
+	if (!variable.sensitive) {
+		const { valueRedacted: _omit, ...rest } = variable;
+		return rest;
+	}
+	return {
+		...variable,
+		value: "",
+		...variable.value.length > 0 || variable.valueRedacted ? { valueRedacted: true } : {}
+	};
+}
+function redactServerSettingsForClient(settings) {
+	const providerInstances = Object.fromEntries(Object.entries(settings.providerInstances).map(([instanceId, instance]) => [instanceId, instance.environment ? {
+		...instance,
+		environment: instance.environment.map(redactProviderEnvironmentVariable)
+	} : instance]));
+	return {
+		...settings,
+		providerInstances
+	};
+}
+var ServerSettingsService = class ServerSettingsService extends Context.Service()("ryco/serverSettings/ServerSettingsService") {
+	static layerTest = (overrides = {}) => Layer.effect(ServerSettingsService, Effect.gen(function* () {
+		const currentSettingsRef = yield* Ref.make(deepMerge(DEFAULT_SERVER_SETTINGS, overrides));
+		return {
+			start: Effect.void,
+			ready: Effect.void,
+			getSettings: Ref.get(currentSettingsRef),
+			updateSettings: (patch) => Ref.get(currentSettingsRef).pipe(Effect.flatMap((currentSettings) => Schema.decodeEffect(ServerSettings)(applyServerSettingsPatch(currentSettings, patch)).pipe(Effect.mapError((cause) => new ServerSettingsError({
+				settingsPath: "<memory>",
+				detail: `failed to normalize server settings: ${SchemaIssue.makeFormatterDefault()(cause.issue)}`,
+				cause
+			})))), Effect.tap((nextSettings) => Ref.set(currentSettingsRef, nextSettings))),
+			streamChanges: Stream.empty
+		};
+	}));
+};
+const ServerSettingsJson = fromLenientJson(ServerSettings);
+const getLegacyProviderSettings = (settings, provider) => settings.providers[provider];
+/**
+* Ensure the `textGenerationModelSelection` points to an enabled provider.
+* If the selected provider is disabled, fall back to the first enabled
+* provider with its default model.  This is applied at read-time so the
+* persisted preference is preserved for when a provider is re-enabled.
+*/
+function resolveTextGenerationProvider(settings) {
+	const selection = settings.textGenerationModelSelection;
+	const instanceConfig = settings.providerInstances[selection.instanceId];
+	if (instanceConfig !== void 0) return instanceConfig.enabled ?? true ? settings : fallbackTextGenerationProvider(settings);
+	if (isProviderDriverKind(selection.instanceId) && getLegacyProviderSettings(settings, selection.instanceId)?.enabled) return settings;
+	return fallbackTextGenerationProvider(settings);
+}
+function fallbackTextGenerationProvider(settings) {
+	const fallbackEntry = Object.entries(settings.providers).find(([, provider]) => provider.enabled);
+	const fallback = fallbackEntry ? ProviderDriverKind.make(fallbackEntry[0]) : void 0;
+	if (!fallback) return settings;
+	return {
+		...settings,
+		textGenerationModelSelection: {
+			instanceId: ProviderInstanceId.make(fallback),
+			model: DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER[fallback] ?? "gpt-5.4-mini"
+		}
+	};
+}
+const ATOMIC_SETTINGS_KEYS = new Set(["textGenerationModelSelection"]);
+function stripDefaultServerSettings(current, defaults) {
+	if (Array.isArray(current) || Array.isArray(defaults)) return Equal.equals(current, defaults) ? void 0 : current;
+	if (current !== null && defaults !== null && typeof current === "object" && typeof defaults === "object") {
+		const currentRecord = current;
+		const defaultsRecord = defaults;
+		const next = {};
+		for (const key of Object.keys(currentRecord)) if (ATOMIC_SETTINGS_KEYS.has(key)) {
+			if (!Equal.equals(currentRecord[key], defaultsRecord[key])) next[key] = currentRecord[key];
+		} else {
+			const stripped = stripDefaultServerSettings(currentRecord[key], defaultsRecord[key]);
+			if (stripped !== void 0) next[key] = stripped;
+		}
+		return Object.keys(next).length > 0 ? next : void 0;
+	}
+	return Object.is(current, defaults) ? void 0 : current;
+}
+const makeServerSettings = Effect.gen(function* () {
+	const { settingsPath } = yield* ServerConfig;
+	const fs = yield* FileSystem.FileSystem;
+	const pathService = yield* Path.Path;
+	const secretStore = yield* ServerSecretStore;
+	const writeSemaphore = yield* Semaphore$1.make(1);
+	const cacheKey = "settings";
+	const changesPubSub = yield* PubSub.unbounded();
+	const startedRef = yield* Ref.make(false);
+	const startedDeferred = yield* Deferred.make();
+	const watcherScope = yield* Scope.make("sequential");
+	yield* Effect.addFinalizer(() => Scope.close(watcherScope, Exit.void));
+	const emitChange = (settings) => PubSub.publish(changesPubSub, settings).pipe(Effect.asVoid);
+	const readConfigExists = fs.exists(settingsPath).pipe(Effect.mapError((cause) => new ServerSettingsError({
+		settingsPath,
+		detail: "failed to check settings file existence",
+		cause
+	})));
+	const readRawConfig = fs.readFileString(settingsPath).pipe(Effect.mapError((cause) => new ServerSettingsError({
+		settingsPath,
+		detail: "failed to read settings file",
+		cause
+	})));
+	const loadSettingsFromDisk = Effect.gen(function* () {
+		if (!(yield* readConfigExists)) return DEFAULT_SERVER_SETTINGS;
+		const raw = yield* readRawConfig;
+		const decoded = Schema.decodeUnknownExit(ServerSettingsJson)(raw);
+		if (decoded._tag === "Failure") {
+			yield* Effect.logWarning("failed to parse settings.json, using defaults", {
+				path: settingsPath,
+				issues: Cause.pretty(decoded.cause)
+			});
+			return DEFAULT_SERVER_SETTINGS;
+		}
+		return decoded.value;
+	});
+	const settingsCache = yield* Cache.make({
+		capacity: 1,
+		lookup: () => loadSettingsFromDisk
+	});
+	const getSettingsFromCache = Cache.get(settingsCache, cacheKey);
+	const toSettingsError = (detail, cause) => new ServerSettingsError({
+		settingsPath,
+		detail,
+		cause
+	});
+	const materializeProviderEnvironmentSecrets = (settings) => Effect.gen(function* () {
+		const providerInstances = { ...settings.providerInstances };
+		for (const [instanceId, instance] of Object.entries(settings.providerInstances)) {
+			if (!instance.environment) continue;
+			const environment = [];
+			for (const variable of instance.environment) {
+				if (!variable.sensitive || !variable.valueRedacted) {
+					environment.push(variable);
+					continue;
+				}
+				const secret = yield* secretStore.get(providerEnvironmentSecretName({
+					instanceId,
+					name: variable.name
+				})).pipe(Effect.mapError((cause) => toSettingsError(`failed to read sensitive environment variable ${variable.name}`, cause)));
+				environment.push({
+					...variable,
+					value: secret ? textDecoder$2.decode(secret) : ""
+				});
+			}
+			providerInstances[instanceId] = {
+				...instance,
+				environment
+			};
+		}
+		return {
+			...settings,
+			providerInstances
+		};
+	});
+	const persistProviderEnvironmentSecrets = (current, next) => Effect.gen(function* () {
+		const providerInstances = { ...next.providerInstances };
+		const nextSecretKeys = /* @__PURE__ */ new Set();
+		for (const [instanceId, instance] of Object.entries(next.providerInstances)) {
+			if (!instance.environment) continue;
+			const environment = [];
+			for (const variable of instance.environment) {
+				const secretName = providerEnvironmentSecretName({
+					instanceId,
+					name: variable.name
+				});
+				if (!variable.sensitive) {
+					yield* secretStore.remove(secretName).pipe(Effect.mapError((cause) => toSettingsError(`failed to remove environment secret ${variable.name}`, cause)));
+					environment.push(redactProviderEnvironmentVariable(variable));
+					continue;
+				}
+				nextSecretKeys.add(secretName);
+				if (!variable.valueRedacted) {
+					if (variable.value.length > 0) {
+						yield* secretStore.set(secretName, textEncoder$2.encode(variable.value)).pipe(Effect.mapError((cause) => toSettingsError(`failed to persist environment secret ${variable.name}`, cause)));
+						environment.push({
+							...variable,
+							value: "",
+							valueRedacted: true
+						});
+					} else {
+						yield* secretStore.remove(secretName).pipe(Effect.mapError((cause) => toSettingsError(`failed to remove environment secret ${variable.name}`, cause)));
+						const { valueRedacted: _omit, ...rest } = variable;
+						environment.push(rest);
+					}
+					continue;
+				}
+				environment.push(redactProviderEnvironmentVariable(variable));
+			}
+			providerInstances[instanceId] = {
+				...instance,
+				environment
+			};
+		}
+		for (const [instanceId, instance] of Object.entries(current.providerInstances)) for (const variable of instance.environment ?? []) {
+			if (!variable.sensitive) continue;
+			const secretName = providerEnvironmentSecretName({
+				instanceId,
+				name: variable.name
+			});
+			if (nextSecretKeys.has(secretName)) continue;
+			yield* secretStore.remove(secretName).pipe(Effect.mapError((cause) => toSettingsError(`failed to remove stale environment secret ${variable.name}`, cause)));
+		}
+		return {
+			...next,
+			providerInstances
+		};
+	});
+	const writeSettingsAtomically = (settings) => {
+		const sparseSettings = stripDefaultServerSettings(settings, DEFAULT_SERVER_SETTINGS) ?? {};
+		return writeFileStringAtomically({
+			filePath: settingsPath,
+			contents: `${JSON.stringify(sparseSettings, null, 2)}\n`
+		}).pipe(Effect.provideService(FileSystem.FileSystem, fs), Effect.provideService(Path.Path, pathService), Effect.mapError((cause) => new ServerSettingsError({
+			settingsPath,
+			detail: "failed to write settings file",
+			cause
+		})));
+	};
+	const revalidateAndEmit = writeSemaphore.withPermits(1)(Effect.gen(function* () {
+		yield* Cache.invalidate(settingsCache, cacheKey);
+		yield* emitChange(yield* getSettingsFromCache);
+	}));
+	const startWatcher = Effect.gen(function* () {
+		const settingsDir = pathService.dirname(settingsPath);
+		const settingsFile = pathService.basename(settingsPath);
+		const settingsPathResolved = pathService.resolve(settingsPath);
+		yield* fs.makeDirectory(settingsDir, { recursive: true }).pipe(Effect.mapError((cause) => new ServerSettingsError({
+			settingsPath,
+			detail: "failed to prepare settings directory",
+			cause
+		})));
+		const revalidateAndEmitSafely = revalidateAndEmit.pipe(Effect.ignoreCause({ log: true }));
+		const debouncedSettingsEvents = fs.watch(settingsDir).pipe(Stream.filter((event) => {
+			return event.path === settingsFile || event.path === settingsPath || pathService.resolve(settingsDir, event.path) === settingsPathResolved;
+		}), Stream.debounce(Duration.millis(100)));
+		yield* Stream.runForEach(debouncedSettingsEvents, () => revalidateAndEmitSafely).pipe(Effect.ignoreCause({ log: true }), Effect.forkIn(watcherScope), Effect.asVoid);
+	});
+	return {
+		start: Effect.gen(function* () {
+			if (!(yield* Ref.modify(startedRef, (started) => [!started, true]))) return yield* Deferred.await(startedDeferred);
+			const startup = Effect.gen(function* () {
+				yield* startWatcher;
+				yield* Cache.invalidate(settingsCache, cacheKey);
+				yield* getSettingsFromCache;
+			});
+			const startupExit = yield* Effect.exit(startup);
+			if (startupExit._tag === "Failure") {
+				yield* Deferred.failCause(startedDeferred, startupExit.cause).pipe(Effect.orDie);
+				return yield* Effect.failCause(startupExit.cause);
+			}
+			yield* Deferred.succeed(startedDeferred, void 0).pipe(Effect.orDie);
+		}),
+		ready: Deferred.await(startedDeferred),
+		getSettings: getSettingsFromCache.pipe(Effect.flatMap(materializeProviderEnvironmentSecrets), Effect.map(resolveTextGenerationProvider)),
+		updateSettings: (patch) => writeSemaphore.withPermits(1)(Effect.gen(function* () {
+			const current = yield* getSettingsFromCache;
+			const nextPersisted = yield* persistProviderEnvironmentSecrets(current, applyServerSettingsPatch(current, patch));
+			const next = yield* Schema.decodeEffect(ServerSettings)(nextPersisted).pipe(Effect.mapError((cause) => new ServerSettingsError({
+				settingsPath: "<memory>",
+				detail: `failed to normalize server settings: ${SchemaIssue.makeFormatterDefault()(cause.issue)}`,
+				cause
+			})));
+			yield* writeSettingsAtomically(next);
+			yield* Cache.set(settingsCache, cacheKey, next);
+			yield* emitChange(next);
+			return resolveTextGenerationProvider(yield* materializeProviderEnvironmentSecrets(next));
+		})),
+		get streamChanges() {
+			return Stream.fromPubSub(changesPubSub).pipe(Stream.mapEffect((settings) => materializeProviderEnvironmentSecrets(settings).pipe(Effect.catch((error) => Effect.logWarning("failed to materialize provider environment secrets", { detail: error.detail }).pipe(Effect.as(settings))))), Stream.map(resolveTextGenerationProvider));
+		}
+	};
+});
+const ServerSettingsLive = Layer.effect(ServerSettingsService, makeServerSettings).pipe(Layer.provide(ServerSecretStoreLive));
+//#endregion
 //#region src/provider/cliVersion.ts
 const CLI_VERSION_NUMBER_SEGMENT = /^\d+$/;
 function normalizeCliVersion(version) {
@@ -1929,7 +2311,8 @@ const resolveLatestProviderVersion = Effect.fn("resolveLatestProviderVersion")(f
 });
 const enrichProviderSnapshotWithVersionAdvisory = Effect.fn("enrichProviderSnapshotWithVersionAdvisory")(function* (snapshot, maintenanceCapabilities) {
 	const capabilities = maintenanceCapabilities ?? makeManualProviderMaintenanceCapabilities$1(snapshot.driver);
-	if (!snapshot.enabled || !snapshot.installed || !snapshot.version) return {
+	const { enableProviderUpdateChecks } = yield* (yield* ServerSettingsService).getSettings.pipe(Effect.orElseSucceed(() => DEFAULT_SERVER_SETTINGS));
+	if (!enableProviderUpdateChecks || !snapshot.enabled || !snapshot.installed || !snapshot.version) return {
 		...snapshot,
 		versionAdvisory: createProviderVersionAdvisory({
 			driver: snapshot.driver,
@@ -2024,6 +2407,7 @@ const make$21 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 	const providerRegistry = yield* ProviderRegistry;
 	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 	const httpClient = yield* HttpClient.HttpClient;
+	const serverSettings = yield* ServerSettingsService;
 	const runMaintenanceCommand = (command, args) => runProviderMaintenanceCommandWithSpawner({
 		spawner,
 		command,
@@ -2042,7 +2426,7 @@ const make$21 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 			providers,
 			verifiedProviders: []
 		});
-		return Effect.forEach(refreshedProviders, (refreshedProvider) => enrichProviderSnapshotWithVersionAdvisory(refreshedProvider, maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, httpClient)), { concurrency: "unbounded" }).pipe(Effect.map((verifiedProviders) => ({
+		return Effect.forEach(refreshedProviders, (refreshedProvider) => enrichProviderSnapshotWithVersionAdvisory(refreshedProvider, maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.provideService(ServerSettingsService, serverSettings)), { concurrency: "unbounded" }).pipe(Effect.map((verifiedProviders) => ({
 			providers,
 			verifiedProviders
 		})), Effect.catchCause((cause) => Effect.logWarning("Provider post-update version verification failed", {
@@ -2132,78 +2516,6 @@ const make$21 = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
 });
 const layer$18 = Layer.effect(ProviderMaintenanceRunner, make$21());
 //#endregion
-//#region src/auth/Services/ServerSecretStore.ts
-var SecretStoreError = class extends Data.TaggedError("SecretStoreError") {};
-var ServerSecretStore = class extends Context.Service()("ryco/auth/Services/ServerSecretStore") {};
-//#endregion
-//#region src/auth/Layers/ServerSecretStore.ts
-const makeServerSecretStore = Effect.gen(function* () {
-	const fileSystem = yield* FileSystem.FileSystem;
-	const path = yield* Path.Path;
-	const serverConfig = yield* ServerConfig;
-	yield* fileSystem.makeDirectory(serverConfig.secretsDir, { recursive: true });
-	yield* fileSystem.chmod(serverConfig.secretsDir, 448).pipe(Effect.mapError((cause) => new SecretStoreError({
-		message: `Failed to secure secrets directory ${serverConfig.secretsDir}.`,
-		cause
-	})));
-	const resolveSecretPath = (name) => path.join(serverConfig.secretsDir, `${name}.bin`);
-	const ensureSecretDirectory = (secretPath) => {
-		const directory = path.dirname(secretPath);
-		return fileSystem.makeDirectory(directory, { recursive: true }).pipe(Effect.flatMap(() => fileSystem.chmod(directory, 448)));
-	};
-	const isPlatformError = (u) => Predicate.isTagged(u, "PlatformError");
-	const get = (name) => fileSystem.readFile(resolveSecretPath(name)).pipe(Effect.map((bytes) => Uint8Array.from(bytes)), Effect.catch((cause) => cause.reason._tag === "NotFound" ? Effect.succeed(null) : Effect.fail(new SecretStoreError({
-		message: `Failed to read secret ${name}.`,
-		cause
-	}))));
-	const set = (name, value) => {
-		const secretPath = resolveSecretPath(name);
-		const tempPath = `${secretPath}.${Crypto.randomUUID()}.tmp`;
-		return Effect.gen(function* () {
-			yield* ensureSecretDirectory(secretPath);
-			yield* fileSystem.writeFile(tempPath, value);
-			yield* fileSystem.chmod(tempPath, 384);
-			yield* fileSystem.rename(tempPath, secretPath);
-			yield* fileSystem.chmod(secretPath, 384);
-		}).pipe(Effect.catch((cause) => fileSystem.remove(tempPath).pipe(Effect.ignore, Effect.flatMap(() => Effect.fail(new SecretStoreError({
-			message: `Failed to persist secret ${name}.`,
-			cause
-		}))))));
-	};
-	const create = (name, value) => {
-		const secretPath = resolveSecretPath(name);
-		return Effect.scoped(Effect.gen(function* () {
-			yield* ensureSecretDirectory(secretPath);
-			const file = yield* fileSystem.open(secretPath, {
-				flag: "wx",
-				mode: 384
-			});
-			yield* file.writeAll(value);
-			yield* file.sync;
-			yield* fileSystem.chmod(secretPath, 384);
-		})).pipe(Effect.mapError((cause) => new SecretStoreError({
-			message: `Failed to persist secret ${name}.`,
-			cause
-		})));
-	};
-	const getOrCreateRandom = (name, bytes) => get(name).pipe(Effect.flatMap((existing) => {
-		if (existing) return Effect.succeed(existing);
-		const generated = Crypto.randomBytes(bytes);
-		return create(name, generated).pipe(Effect.as(Uint8Array.from(generated)), Effect.catchTag("SecretStoreError", (error) => isPlatformError(error.cause) && error.cause.reason._tag === "AlreadyExists" ? get(name).pipe(Effect.flatMap((created) => created !== null ? Effect.succeed(created) : Effect.fail(new SecretStoreError({ message: `Failed to read secret ${name} after concurrent creation.` })))) : Effect.fail(error)));
-	}));
-	const remove = (name) => fileSystem.remove(resolveSecretPath(name)).pipe(Effect.catch((cause) => cause.reason._tag === "NotFound" ? Effect.void : Effect.fail(new SecretStoreError({
-		message: `Failed to remove secret ${name}.`,
-		cause
-	}))));
-	return {
-		get,
-		set,
-		getOrCreateRandom,
-		remove
-	};
-});
-const ServerSecretStoreLive = Layer.effect(ServerSecretStore, makeServerSecretStore);
-//#endregion
 //#region src/persistence/Errors.ts
 var PersistenceSqlError = class extends Schema.TaggedErrorClass()("PersistenceSqlError", {
 	operation: Schema.String,
@@ -3897,6 +4209,35 @@ var _040_ProjectionThreadsProjectUpdatedAtIndex_default = Effect$1.gen(function*
   `;
 });
 //#endregion
+//#region src/persistence/Migrations/041_ProjectionThreadsSubagentNesting.ts
+var _041_ProjectionThreadsSubagentNesting_default = Effect$1.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const columns = yield* sql`
+    PRAGMA table_info(projection_threads)
+  `;
+	const columnNames = new Set(columns.map((column) => column.name));
+	if (!columnNames.has("thread_kind")) yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN thread_kind TEXT NOT NULL DEFAULT 'normal'
+    `;
+	if (!columnNames.has("visibility")) yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN visibility TEXT NOT NULL DEFAULT 'normal'
+    `;
+	if (!columnNames.has("parent_thread_id")) yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN parent_thread_id TEXT
+    `;
+	if (!columnNames.has("parent_subagent_id")) yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN parent_subagent_id TEXT
+    `;
+	yield* sql`
+    CREATE INDEX IF NOT EXISTS idx_projection_threads_parent_thread
+    ON projection_threads(parent_thread_id, created_at, thread_id)
+  `;
+});
+//#endregion
 //#region src/persistence/Migrations.ts
 /**
 * MigrationsLive - Migration runner with inline loader
@@ -4117,6 +4458,11 @@ const migrationEntries = [
 		40,
 		"ProjectionThreadsProjectUpdatedAtIndex",
 		_040_ProjectionThreadsProjectUpdatedAtIndex_default
+	],
+	[
+		41,
+		"ProjectionThreadsSubagentNesting",
+		_041_ProjectionThreadsSubagentNesting_default
 	]
 ];
 const makeMigrationLoader = (throughId) => Migrator.fromRecord(Object.fromEntries(migrationEntries.filter(([id]) => throughId === void 0 || id <= throughId).map(([id, name, migration]) => [`${id}_${name}`, migration])));
@@ -4186,6 +4532,45 @@ const repairProjectionTokenModeColumns = Effect$1.fn("repairProjectionTokenModeC
 		yield* Effect$1.log("Repaired projection_thread_sessions.token_mode column");
 	}
 });
+const repairProjectionThreadSubagentNestingColumns = Effect$1.fn("repairProjectionThreadSubagentNestingColumns")(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	if ((yield* sql`
+    SELECT name FROM sqlite_master
+    WHERE type = 'table' AND name = 'projection_threads'
+  `).length === 0) return;
+	const columns = yield* sql`
+    PRAGMA table_info(projection_threads)
+  `;
+	const columnNames = new Set(columns.map((column) => column.name));
+	if (!columnNames.has("thread_kind")) {
+		yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN thread_kind TEXT NOT NULL DEFAULT 'normal'
+    `;
+		yield* Effect$1.log("Repaired projection_threads.thread_kind column");
+	}
+	if (!columnNames.has("visibility")) {
+		yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN visibility TEXT NOT NULL DEFAULT 'normal'
+    `;
+		yield* Effect$1.log("Repaired projection_threads.visibility column");
+	}
+	if (!columnNames.has("parent_thread_id")) {
+		yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN parent_thread_id TEXT
+    `;
+		yield* Effect$1.log("Repaired projection_threads.parent_thread_id column");
+	}
+	if (!columnNames.has("parent_subagent_id")) {
+		yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN parent_subagent_id TEXT
+    `;
+		yield* Effect$1.log("Repaired projection_threads.parent_subagent_id column");
+	}
+});
 /**
 * Run all pending migrations.
 *
@@ -4202,6 +4587,7 @@ const runMigrations = Effect$1.fn("runMigrations")(function* ({ toMigrationInclu
 	if (toMigrationInclusive === void 0 || toMigrationInclusive >= 31) yield* repairProjectionWorktreeTitleColumn();
 	if (toMigrationInclusive === void 0 || toMigrationInclusive >= 34) yield* repairProjectionProjectAvatarColumns();
 	if (toMigrationInclusive === void 0 || toMigrationInclusive >= 35) yield* repairProjectionTokenModeColumns();
+	if (toMigrationInclusive === void 0 || toMigrationInclusive >= 41) yield* repairProjectionThreadSubagentNestingColumns();
 	yield* Effect$1.log("Migrations ran successfully").pipe(Effect$1.annotateLogs({ migrations: executedMigrations.map(([id, name]) => `${id}_${name}`) }));
 	return executedMigrations;
 });
@@ -4995,7 +5381,7 @@ Schema.Struct({
 var ProjectAtlassianLinkRepository = class extends Context.Service()("ryco/persistence/Services/ProjectAtlassianLinks/ProjectAtlassianLinkRepository") {};
 //#endregion
 //#region src/atlassian/AtlassianConnectionService.ts
-const textEncoder$2 = new TextEncoder();
+const textEncoder$1 = new TextEncoder();
 var AtlassianConnectionService = class extends Context.Service()("ryco/atlassian/AtlassianConnectionService") {};
 function atlassianError(operation, detail, cause) {
 	return new AtlassianConnectionError({
@@ -5123,7 +5509,7 @@ const make$19 = Effect.fn("makeAtlassianConnectionService")(function* () {
 				createdAt,
 				updatedAt: createdAt
 			};
-			return secretStore.set(manualBitbucketTokenSecretName(connectionId), textEncoder$2.encode(input.token)).pipe(Effect.flatMap(() => connections.upsert(record)), cleanupSecretOnFailure(manualBitbucketTokenSecretName(connectionId)), Effect.as(toSummary(record)), Effect.mapError(mapError$1("atlassian.saveManualBitbucketToken", "Failed to save the Bitbucket token.")));
+			return secretStore.set(manualBitbucketTokenSecretName(connectionId), textEncoder$1.encode(input.token)).pipe(Effect.flatMap(() => connections.upsert(record)), cleanupSecretOnFailure(manualBitbucketTokenSecretName(connectionId)), Effect.as(toSummary(record)), Effect.mapError(mapError$1("atlassian.saveManualBitbucketToken", "Failed to save the Bitbucket token.")));
 		},
 		saveManualJiraToken: (input) => {
 			const createdAt = nowIso$2();
@@ -5159,7 +5545,7 @@ const make$19 = Effect.fn("makeAtlassianConnectionService")(function* () {
 				avatarUrl: null,
 				updatedAt: createdAt
 			};
-			return secretStore.set(manualJiraTokenSecretName(connectionId), textEncoder$2.encode(input.token)).pipe(Effect.flatMap(() => connections.upsert(record)), Effect.flatMap(() => resources.upsertForConnection({
+			return secretStore.set(manualJiraTokenSecretName(connectionId), textEncoder$1.encode(input.token)).pipe(Effect.flatMap(() => connections.upsert(record)), Effect.flatMap(() => resources.upsertForConnection({
 				connectionId,
 				resources: [resource]
 			})), cleanupSecretOnFailure(manualJiraTokenSecretName(connectionId)), Effect.as(toSummary(record)), Effect.mapError(mapError$1("atlassian.saveManualJiraToken", "Failed to save the Jira API token.")));
@@ -5275,6 +5661,11 @@ const NON_REPOSITORY_STATUS_DETAILS = Object.freeze({
 	behindCount: 0,
 	aheadOfDefaultCount: 0
 });
+const emptyDiffTotals = () => ({
+	files: [],
+	insertions: 0,
+	deletions: 0
+});
 var StatusRemoteRefreshCacheKey = class extends Data.Class {};
 function parseBranchAb(value) {
 	const match = value.match(/^\+(\d+)\s+-(\d+)$/);
@@ -5921,6 +6312,31 @@ const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* (option
 		const parsed = Number.parseInt(result.stdout.trim(), 10);
 		return Number.isFinite(parsed) ? Math.max(0, parsed) : 0;
 	});
+	const readCommittedAgainstBase = Effect.fn("readCommittedAgainstBase")(function* (cwd, refName) {
+		const baseRef = yield* resolveBaseBranchForNoUpstream(cwd, refName).pipe(Effect.catch(() => Effect.succeed(null)));
+		if (!baseRef) return emptyDiffTotals();
+		const result = yield* executeGit("GitVcsDriver.readCommittedAgainstBase.diff", cwd, [
+			"diff",
+			"--numstat",
+			`${baseRef}...HEAD`
+		], { allowNonZeroExit: true });
+		if (result.exitCode !== 0) return emptyDiffTotals();
+		let insertions = 0;
+		let deletions = 0;
+		return {
+			files: parseNumstatEntries(result.stdout).map((entry) => {
+				insertions += entry.insertions;
+				deletions += entry.deletions;
+				return {
+					path: entry.path,
+					insertions: entry.insertions,
+					deletions: entry.deletions
+				};
+			}).toSorted((a, b) => a.path.localeCompare(b.path)),
+			insertions,
+			deletions
+		};
+	});
 	const readBranchRecency = Effect.fn("readBranchRecency")(function* (cwd) {
 		const branchRecency = yield* executeGit("GitVcsDriver.readBranchRecency", cwd, [
 			"for-each-ref",
@@ -6039,6 +6455,7 @@ const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* (option
 			});
 		}
 		files.sort((a, b) => a.path.localeCompare(b.path));
+		const committed = refName && !isDefaultBranch ? yield* readCommittedAgainstBase(cwd, refName).pipe(Effect.catch(() => Effect.succeed(emptyDiffTotals()))) : void 0;
 		return {
 			isRepo: true,
 			hasOriginRemote: hasPrimaryRemote,
@@ -6051,6 +6468,7 @@ const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* (option
 				insertions,
 				deletions
 			},
+			...committed ? { committed } : {},
 			hasUpstream: upstreamRef !== null,
 			aheadCount,
 			behindCount,
@@ -6071,6 +6489,7 @@ const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function* (option
 		refName: details.branch,
 		hasWorkingTreeChanges: details.hasWorkingTreeChanges,
 		workingTree: details.workingTree,
+		...details.committed ? { committed: details.committed } : {},
 		hasUpstream: details.hasUpstream,
 		aheadCount: details.aheadCount,
 		behindCount: details.behindCount,
@@ -6963,7 +7382,7 @@ const layer$13 = Layer.effect(VcsDriverRegistry, make$16()).pipe(Layer.provide(l
 //#endregion
 //#region src/sourceControl/BitbucketApi.ts
 const DEFAULT_API_BASE_URL = "https://api.bitbucket.org/2.0";
-const textDecoder$2 = new TextDecoder();
+const textDecoder$1 = new TextDecoder();
 const BitbucketApiEnvConfig = Config.all({
 	baseUrl: Config.string("RYCO_BITBUCKET_API_BASE_URL").pipe(Config.withDefault(DEFAULT_API_BASE_URL)),
 	accessToken: Config.string("RYCO_BITBUCKET_ACCESS_TOKEN").pipe(Config.option),
@@ -7308,7 +7727,7 @@ const make$15 = Effect.fn("makeBitbucketApi")(function* () {
 				cause
 			})));
 			if (!tokenBytes || tokenBytes.length === 0) continue;
-			const token = textDecoder$2.decode(tokenBytes).trim();
+			const token = textDecoder$1.decode(tokenBytes).trim();
 			if (!token) continue;
 			return {
 				source: "stored",
@@ -10532,26 +10951,26 @@ const make$11 = Effect.fn("makeSourceControlProviderRegistry")(function* () {
 	const azureDevOpsCli = yield* AzureDevOpsCli;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const github = yield* makeLazyProvider("github", Effect.tryPromise({
-		try: () => import("./GitHubSourceControlProvider-C-LGwho3.mjs"),
+		try: () => import("./GitHubSourceControlProvider-26IofDAO.mjs"),
 		catch: (cause) => providerLoadError("github", cause)
 	}).pipe(Effect.flatMap((module) => module.make()), Effect.provideService(GitHubCli, githubCli), Effect.provideService(FileSystem.FileSystem, fileSystem)));
 	const gitlab = yield* makeLazyProvider("gitlab", Effect.tryPromise({
-		try: () => import("./GitLabSourceControlProvider-CkeT2aEx.mjs"),
+		try: () => import("./GitLabSourceControlProvider-DePct78W.mjs"),
 		catch: (cause) => providerLoadError("gitlab", cause)
 	}).pipe(Effect.flatMap((module) => module.make()), Effect.provideService(GitLabCli, gitlabCli)));
 	const bitbucket = yield* makeLazyProvider("bitbucket", Effect.tryPromise({
-		try: () => import("./BitbucketSourceControlProvider-CYR_BD1d.mjs"),
+		try: () => import("./BitbucketSourceControlProvider-CKH09tfT.mjs"),
 		catch: (cause) => providerLoadError("bitbucket", cause)
 	}).pipe(Effect.flatMap((module) => module.make()), Effect.provideService(BitbucketApi, bitbucketApi)), {
 		searchRepositories: true,
 		cloneAuthentication: true
 	});
 	const forgejo = yield* makeLazyProvider("forgejo", Effect.tryPromise({
-		try: () => import("./ForgejoSourceControlProvider-DX6d9gvz.mjs"),
+		try: () => import("./ForgejoSourceControlProvider-e-4hvvZ_.mjs"),
 		catch: (cause) => providerLoadError("forgejo", cause)
 	}).pipe(Effect.flatMap((module) => module.make()), Effect.provideService(ForgejoApi, forgejoApi)));
 	const azureDevOps = yield* makeLazyProvider("azure-devops", Effect.tryPromise({
-		try: () => import("./AzureDevOpsSourceControlProvider-CC2_COxP.mjs"),
+		try: () => import("./AzureDevOpsSourceControlProvider-CF5LuCHp.mjs"),
 		catch: (cause) => providerLoadError("azure-devops", cause)
 	}).pipe(Effect.flatMap((module) => module.make()), Effect.provideService(AzureDevOpsCli, azureDevOpsCli)));
 	const bitbucketDiscovery = makeBitbucketDiscovery(bitbucketApi);
@@ -10674,22 +11093,6 @@ var CheckpointDiffQuery = class extends Context.Service()("ryco/checkpointing/Se
 //#region src/diagnostics/Services/Diagnostics.ts
 var Diagnostics = class extends Context.Service()("ryco/diagnostics/Services/Diagnostics") {};
 //#endregion
-//#region src/atomicWrite.ts
-const writeFileStringAtomically = (input) => Effect.scoped(Effect.gen(function* () {
-	const fs = yield* FileSystem.FileSystem;
-	const path = yield* Path.Path;
-	const tempFileId = yield* Random$1.nextUUIDv4;
-	const targetDirectory = path.dirname(input.filePath);
-	yield* fs.makeDirectory(targetDirectory, { recursive: true });
-	const tempDirectory = yield* fs.makeTempDirectoryScoped({
-		directory: targetDirectory,
-		prefix: `${path.basename(input.filePath)}.`
-	});
-	const tempPath = path.join(tempDirectory, `${tempFileId}.tmp`);
-	yield* fs.writeFileString(tempPath, input.contents);
-	yield* fs.rename(tempPath, input.filePath);
-}));
-//#endregion
 //#region ../../packages/shared/src/keybindings.ts
 const DEFAULT_KEYBINDINGS = [
 	{
@@ -26075,300 +26478,6 @@ async function runProcess(command, args, options = {}) {
 	});
 }
 //#endregion
-//#region src/serverSettings.ts
-/**
-* ServerSettings - Server-authoritative settings service.
-*
-* Owns persistence, validation, and change notification of settings that affect
-* server-side behavior (binary paths, streaming mode, env mode, custom models,
-* text generation model selection).
-*
-* Follows the same pattern as `keybindings.ts`: JSON file + Cache + PubSub +
-* Semaphore + FileSystem.watch for concurrency and external edit detection.
-*
-* @module ServerSettings
-*/
-const textEncoder$1 = new TextEncoder();
-const textDecoder$1 = new TextDecoder();
-function providerEnvironmentSecretName(input) {
-	return `provider-env-${Buffer.from(input.instanceId, "utf8").toString("base64url")}-${Buffer.from(input.name, "utf8").toString("base64url")}`;
-}
-function redactProviderEnvironmentVariable(variable) {
-	if (!variable.sensitive) {
-		const { valueRedacted: _omit, ...rest } = variable;
-		return rest;
-	}
-	return {
-		...variable,
-		value: "",
-		...variable.value.length > 0 || variable.valueRedacted ? { valueRedacted: true } : {}
-	};
-}
-function redactServerSettingsForClient(settings) {
-	const providerInstances = Object.fromEntries(Object.entries(settings.providerInstances).map(([instanceId, instance]) => [instanceId, instance.environment ? {
-		...instance,
-		environment: instance.environment.map(redactProviderEnvironmentVariable)
-	} : instance]));
-	return {
-		...settings,
-		providerInstances
-	};
-}
-var ServerSettingsService = class ServerSettingsService extends Context.Service()("ryco/serverSettings/ServerSettingsService") {
-	static layerTest = (overrides = {}) => Layer.effect(ServerSettingsService, Effect.gen(function* () {
-		const currentSettingsRef = yield* Ref.make(deepMerge(DEFAULT_SERVER_SETTINGS, overrides));
-		return {
-			start: Effect.void,
-			ready: Effect.void,
-			getSettings: Ref.get(currentSettingsRef),
-			updateSettings: (patch) => Ref.get(currentSettingsRef).pipe(Effect.flatMap((currentSettings) => Schema.decodeEffect(ServerSettings)(applyServerSettingsPatch(currentSettings, patch)).pipe(Effect.mapError((cause) => new ServerSettingsError({
-				settingsPath: "<memory>",
-				detail: `failed to normalize server settings: ${SchemaIssue.makeFormatterDefault()(cause.issue)}`,
-				cause
-			})))), Effect.tap((nextSettings) => Ref.set(currentSettingsRef, nextSettings))),
-			streamChanges: Stream.empty
-		};
-	}));
-};
-const ServerSettingsJson = fromLenientJson(ServerSettings);
-const getLegacyProviderSettings = (settings, provider) => settings.providers[provider];
-/**
-* Ensure the `textGenerationModelSelection` points to an enabled provider.
-* If the selected provider is disabled, fall back to the first enabled
-* provider with its default model.  This is applied at read-time so the
-* persisted preference is preserved for when a provider is re-enabled.
-*/
-function resolveTextGenerationProvider(settings) {
-	const selection = settings.textGenerationModelSelection;
-	const instanceConfig = settings.providerInstances[selection.instanceId];
-	if (instanceConfig !== void 0) return instanceConfig.enabled ?? true ? settings : fallbackTextGenerationProvider(settings);
-	if (isProviderDriverKind(selection.instanceId) && getLegacyProviderSettings(settings, selection.instanceId)?.enabled) return settings;
-	return fallbackTextGenerationProvider(settings);
-}
-function fallbackTextGenerationProvider(settings) {
-	const fallbackEntry = Object.entries(settings.providers).find(([, provider]) => provider.enabled);
-	const fallback = fallbackEntry ? ProviderDriverKind.make(fallbackEntry[0]) : void 0;
-	if (!fallback) return settings;
-	return {
-		...settings,
-		textGenerationModelSelection: {
-			instanceId: ProviderInstanceId.make(fallback),
-			model: DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER[fallback] ?? "gpt-5.4-mini"
-		}
-	};
-}
-const ATOMIC_SETTINGS_KEYS = new Set(["textGenerationModelSelection"]);
-function stripDefaultServerSettings(current, defaults) {
-	if (Array.isArray(current) || Array.isArray(defaults)) return Equal.equals(current, defaults) ? void 0 : current;
-	if (current !== null && defaults !== null && typeof current === "object" && typeof defaults === "object") {
-		const currentRecord = current;
-		const defaultsRecord = defaults;
-		const next = {};
-		for (const key of Object.keys(currentRecord)) if (ATOMIC_SETTINGS_KEYS.has(key)) {
-			if (!Equal.equals(currentRecord[key], defaultsRecord[key])) next[key] = currentRecord[key];
-		} else {
-			const stripped = stripDefaultServerSettings(currentRecord[key], defaultsRecord[key]);
-			if (stripped !== void 0) next[key] = stripped;
-		}
-		return Object.keys(next).length > 0 ? next : void 0;
-	}
-	return Object.is(current, defaults) ? void 0 : current;
-}
-const makeServerSettings = Effect.gen(function* () {
-	const { settingsPath } = yield* ServerConfig;
-	const fs = yield* FileSystem.FileSystem;
-	const pathService = yield* Path.Path;
-	const secretStore = yield* ServerSecretStore;
-	const writeSemaphore = yield* Semaphore$1.make(1);
-	const cacheKey = "settings";
-	const changesPubSub = yield* PubSub.unbounded();
-	const startedRef = yield* Ref.make(false);
-	const startedDeferred = yield* Deferred.make();
-	const watcherScope = yield* Scope.make("sequential");
-	yield* Effect.addFinalizer(() => Scope.close(watcherScope, Exit.void));
-	const emitChange = (settings) => PubSub.publish(changesPubSub, settings).pipe(Effect.asVoid);
-	const readConfigExists = fs.exists(settingsPath).pipe(Effect.mapError((cause) => new ServerSettingsError({
-		settingsPath,
-		detail: "failed to check settings file existence",
-		cause
-	})));
-	const readRawConfig = fs.readFileString(settingsPath).pipe(Effect.mapError((cause) => new ServerSettingsError({
-		settingsPath,
-		detail: "failed to read settings file",
-		cause
-	})));
-	const loadSettingsFromDisk = Effect.gen(function* () {
-		if (!(yield* readConfigExists)) return DEFAULT_SERVER_SETTINGS;
-		const raw = yield* readRawConfig;
-		const decoded = Schema.decodeUnknownExit(ServerSettingsJson)(raw);
-		if (decoded._tag === "Failure") {
-			yield* Effect.logWarning("failed to parse settings.json, using defaults", {
-				path: settingsPath,
-				issues: Cause.pretty(decoded.cause)
-			});
-			return DEFAULT_SERVER_SETTINGS;
-		}
-		return decoded.value;
-	});
-	const settingsCache = yield* Cache.make({
-		capacity: 1,
-		lookup: () => loadSettingsFromDisk
-	});
-	const getSettingsFromCache = Cache.get(settingsCache, cacheKey);
-	const toSettingsError = (detail, cause) => new ServerSettingsError({
-		settingsPath,
-		detail,
-		cause
-	});
-	const materializeProviderEnvironmentSecrets = (settings) => Effect.gen(function* () {
-		const providerInstances = { ...settings.providerInstances };
-		for (const [instanceId, instance] of Object.entries(settings.providerInstances)) {
-			if (!instance.environment) continue;
-			const environment = [];
-			for (const variable of instance.environment) {
-				if (!variable.sensitive || !variable.valueRedacted) {
-					environment.push(variable);
-					continue;
-				}
-				const secret = yield* secretStore.get(providerEnvironmentSecretName({
-					instanceId,
-					name: variable.name
-				})).pipe(Effect.mapError((cause) => toSettingsError(`failed to read sensitive environment variable ${variable.name}`, cause)));
-				environment.push({
-					...variable,
-					value: secret ? textDecoder$1.decode(secret) : ""
-				});
-			}
-			providerInstances[instanceId] = {
-				...instance,
-				environment
-			};
-		}
-		return {
-			...settings,
-			providerInstances
-		};
-	});
-	const persistProviderEnvironmentSecrets = (current, next) => Effect.gen(function* () {
-		const providerInstances = { ...next.providerInstances };
-		const nextSecretKeys = /* @__PURE__ */ new Set();
-		for (const [instanceId, instance] of Object.entries(next.providerInstances)) {
-			if (!instance.environment) continue;
-			const environment = [];
-			for (const variable of instance.environment) {
-				const secretName = providerEnvironmentSecretName({
-					instanceId,
-					name: variable.name
-				});
-				if (!variable.sensitive) {
-					yield* secretStore.remove(secretName).pipe(Effect.mapError((cause) => toSettingsError(`failed to remove environment secret ${variable.name}`, cause)));
-					environment.push(redactProviderEnvironmentVariable(variable));
-					continue;
-				}
-				nextSecretKeys.add(secretName);
-				if (!variable.valueRedacted) {
-					if (variable.value.length > 0) {
-						yield* secretStore.set(secretName, textEncoder$1.encode(variable.value)).pipe(Effect.mapError((cause) => toSettingsError(`failed to persist environment secret ${variable.name}`, cause)));
-						environment.push({
-							...variable,
-							value: "",
-							valueRedacted: true
-						});
-					} else {
-						yield* secretStore.remove(secretName).pipe(Effect.mapError((cause) => toSettingsError(`failed to remove environment secret ${variable.name}`, cause)));
-						const { valueRedacted: _omit, ...rest } = variable;
-						environment.push(rest);
-					}
-					continue;
-				}
-				environment.push(redactProviderEnvironmentVariable(variable));
-			}
-			providerInstances[instanceId] = {
-				...instance,
-				environment
-			};
-		}
-		for (const [instanceId, instance] of Object.entries(current.providerInstances)) for (const variable of instance.environment ?? []) {
-			if (!variable.sensitive) continue;
-			const secretName = providerEnvironmentSecretName({
-				instanceId,
-				name: variable.name
-			});
-			if (nextSecretKeys.has(secretName)) continue;
-			yield* secretStore.remove(secretName).pipe(Effect.mapError((cause) => toSettingsError(`failed to remove stale environment secret ${variable.name}`, cause)));
-		}
-		return {
-			...next,
-			providerInstances
-		};
-	});
-	const writeSettingsAtomically = (settings) => {
-		const sparseSettings = stripDefaultServerSettings(settings, DEFAULT_SERVER_SETTINGS) ?? {};
-		return writeFileStringAtomically({
-			filePath: settingsPath,
-			contents: `${JSON.stringify(sparseSettings, null, 2)}\n`
-		}).pipe(Effect.provideService(FileSystem.FileSystem, fs), Effect.provideService(Path.Path, pathService), Effect.mapError((cause) => new ServerSettingsError({
-			settingsPath,
-			detail: "failed to write settings file",
-			cause
-		})));
-	};
-	const revalidateAndEmit = writeSemaphore.withPermits(1)(Effect.gen(function* () {
-		yield* Cache.invalidate(settingsCache, cacheKey);
-		yield* emitChange(yield* getSettingsFromCache);
-	}));
-	const startWatcher = Effect.gen(function* () {
-		const settingsDir = pathService.dirname(settingsPath);
-		const settingsFile = pathService.basename(settingsPath);
-		const settingsPathResolved = pathService.resolve(settingsPath);
-		yield* fs.makeDirectory(settingsDir, { recursive: true }).pipe(Effect.mapError((cause) => new ServerSettingsError({
-			settingsPath,
-			detail: "failed to prepare settings directory",
-			cause
-		})));
-		const revalidateAndEmitSafely = revalidateAndEmit.pipe(Effect.ignoreCause({ log: true }));
-		const debouncedSettingsEvents = fs.watch(settingsDir).pipe(Stream.filter((event) => {
-			return event.path === settingsFile || event.path === settingsPath || pathService.resolve(settingsDir, event.path) === settingsPathResolved;
-		}), Stream.debounce(Duration.millis(100)));
-		yield* Stream.runForEach(debouncedSettingsEvents, () => revalidateAndEmitSafely).pipe(Effect.ignoreCause({ log: true }), Effect.forkIn(watcherScope), Effect.asVoid);
-	});
-	return {
-		start: Effect.gen(function* () {
-			if (!(yield* Ref.modify(startedRef, (started) => [!started, true]))) return yield* Deferred.await(startedDeferred);
-			const startup = Effect.gen(function* () {
-				yield* startWatcher;
-				yield* Cache.invalidate(settingsCache, cacheKey);
-				yield* getSettingsFromCache;
-			});
-			const startupExit = yield* Effect.exit(startup);
-			if (startupExit._tag === "Failure") {
-				yield* Deferred.failCause(startedDeferred, startupExit.cause).pipe(Effect.orDie);
-				return yield* Effect.failCause(startupExit.cause);
-			}
-			yield* Deferred.succeed(startedDeferred, void 0).pipe(Effect.orDie);
-		}),
-		ready: Deferred.await(startedDeferred),
-		getSettings: getSettingsFromCache.pipe(Effect.flatMap(materializeProviderEnvironmentSecrets), Effect.map(resolveTextGenerationProvider)),
-		updateSettings: (patch) => writeSemaphore.withPermits(1)(Effect.gen(function* () {
-			const current = yield* getSettingsFromCache;
-			const nextPersisted = yield* persistProviderEnvironmentSecrets(current, applyServerSettingsPatch(current, patch));
-			const next = yield* Schema.decodeEffect(ServerSettings)(nextPersisted).pipe(Effect.mapError((cause) => new ServerSettingsError({
-				settingsPath: "<memory>",
-				detail: `failed to normalize server settings: ${SchemaIssue.makeFormatterDefault()(cause.issue)}`,
-				cause
-			})));
-			yield* writeSettingsAtomically(next);
-			yield* Cache.set(settingsCache, cacheKey, next);
-			yield* emitChange(next);
-			return resolveTextGenerationProvider(yield* materializeProviderEnvironmentSecrets(next));
-		})),
-		get streamChanges() {
-			return Stream.fromPubSub(changesPubSub).pipe(Stream.mapEffect((settings) => materializeProviderEnvironmentSecrets(settings).pipe(Effect.catch((error) => Effect.logWarning("failed to materialize provider environment secrets", { detail: error.detail }).pipe(Effect.as(settings))))), Stream.map(resolveTextGenerationProvider));
-		}
-	};
-});
-const ServerSettingsLive = Layer.effect(ServerSettingsService, makeServerSettings).pipe(Layer.provide(ServerSecretStoreLive));
-//#endregion
 //#region src/pathExpansion.ts
 /**
 * Expand a leading `~` (or `~/…`, `~\…`) in a user-supplied path to the
@@ -26689,7 +26798,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: CodexSettings,
 		defaultConfig: () => Schema.decodeSync(CodexSettings)({}),
 		create: (input) => Effect.tryPromise({
-			try: () => import("./CodexDriver-BILrJG8o.mjs"),
+			try: () => import("./CodexDriver-93-TmCrO.mjs"),
 			catch: (cause) => driverImportError(codexDriverKind, input, cause)
 		}).pipe(Effect.flatMap(({ CodexDriver }) => CodexDriver.create(input)))
 	},
@@ -26702,7 +26811,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: ClaudeSettings,
 		defaultConfig: () => Schema.decodeSync(ClaudeSettings)({}),
 		create: (input) => Effect.tryPromise({
-			try: () => import("./ClaudeDriver-D3nsxwH9.mjs"),
+			try: () => import("./ClaudeDriver-WwWFTu61.mjs"),
 			catch: (cause) => driverImportError(claudeDriverKind, input, cause)
 		}).pipe(Effect.flatMap(({ ClaudeDriver }) => ClaudeDriver.create(input)))
 	},
@@ -26715,7 +26824,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: CopilotSettings,
 		defaultConfig: () => Schema.decodeSync(CopilotSettings)({}),
 		create: (input) => Effect.tryPromise({
-			try: () => import("./CopilotDriver-CmD3Ffyl.mjs"),
+			try: () => import("./CopilotDriver-BASi8pJ0.mjs"),
 			catch: (cause) => driverImportError(copilotDriverKind, input, cause)
 		}).pipe(Effect.flatMap(({ CopilotDriver }) => CopilotDriver.create(input)))
 	},
@@ -26728,7 +26837,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: CursorSettings,
 		defaultConfig: () => Schema.decodeSync(CursorSettings)({}),
 		create: (input) => Effect.tryPromise({
-			try: () => import("./CursorDriver-CbeaIbdb.mjs"),
+			try: () => import("./CursorDriver-D5LvIqUk.mjs"),
 			catch: (cause) => driverImportError(cursorDriverKind, input, cause)
 		}).pipe(Effect.flatMap(({ CursorDriver }) => CursorDriver.create(input)))
 	},
@@ -26741,7 +26850,7 @@ const BUILT_IN_DRIVERS = [
 		configSchema: OpenCodeSettings,
 		defaultConfig: () => Schema.decodeSync(OpenCodeSettings)({}),
 		create: (input) => Effect.tryPromise({
-			try: () => import("./OpenCodeDriver-ClWtCk0j.mjs"),
+			try: () => import("./OpenCodeDriver-BhvLOmvn.mjs"),
 			catch: (cause) => driverImportError(openCodeDriverKind, input, cause)
 		}).pipe(Effect.flatMap(({ OpenCodeDriver }) => OpenCodeDriver.create(input)))
 	}
@@ -27454,7 +27563,7 @@ const scopedSafeTeardown = (label) => (effect) => Effect.gen(function* () {
 });
 //#endregion
 //#region package.json
-var version = "0.1.6";
+var version = "0.1.7";
 //#endregion
 //#region src/provider/Layers/CodexProvider.ts
 const PROVIDER_PROBE_TIMEOUT_MS = 8e3;
@@ -28491,6 +28600,387 @@ var OrchestrationEngineService = class extends Context.Service()("ryco/orchestra
 */
 var ProjectionSnapshotQuery = class extends Context.Service()("ryco/orchestration/Services/ProjectionSnapshotQuery") {};
 //#endregion
+//#region src/statistics/StatisticsQuery.ts
+/**
+* StatisticsQuery - usage analytics over the orchestration projection tables.
+*
+* Aggregates the existing read models (threads, sessions, token-usage
+* activities, turns/checkpoints, worktrees) into a {@link StatisticsSnapshot}
+* on demand. No dedicated statistics tables exist; everything is derived from
+* data already persisted by the projection pipeline.
+*
+* Token figures use a per-turn delta attribution: for each `(thread, turn)` we
+* read the final `context-window.updated` activity and sum its `last*` deltas,
+* bucketed by day/project/model. When deltas are absent (older data / providers
+* that only report cumulative totals) we fall back to attributing a thread's
+* cumulative total to its primary model and last-activity day.
+*
+* @module StatisticsQuery
+*/
+/**
+* StatisticsQuery - service tag.
+*/
+var StatisticsQuery = class extends Context.Service()("ryco/statistics/StatisticsQuery") {};
+function toPersistenceSqlOrDecodeError$7(sqlOperation, decodeOperation) {
+	return (cause) => Schema.isSchemaError(cause) ? toPersistenceDecodeError(decodeOperation)(cause) : toPersistenceSqlError(sqlOperation)(cause);
+}
+const ThreadRow = Schema.Struct({
+	threadId: Schema.String,
+	projectId: ProjectId,
+	model: Schema.NullOr(Schema.String),
+	createdAt: Schema.String,
+	providerName: Schema.NullOr(Schema.String)
+});
+const ProjectRow = Schema.Struct({
+	projectId: ProjectId,
+	title: Schema.String,
+	deletedAt: Schema.NullOr(Schema.String)
+});
+const TokenActivityRow = Schema.Struct({
+	threadId: Schema.String,
+	turnId: Schema.NullOr(Schema.String),
+	sequence: Schema.NullOr(Schema.Number),
+	createdAt: Schema.String,
+	payloadJson: Schema.String
+});
+const ToolUseRow = Schema.Struct({
+	threadId: Schema.String,
+	date: Schema.String,
+	count: Schema.Number
+});
+const TurnRow = Schema.Struct({
+	threadId: Schema.String,
+	startedAt: Schema.NullOr(Schema.String),
+	completedAt: Schema.NullOr(Schema.String),
+	checkpointTurnCount: Schema.NullOr(Schema.Number),
+	filesJson: Schema.String
+});
+const WorktreeRow = Schema.Struct({
+	createdAt: Schema.String,
+	archivedAt: Schema.NullOr(Schema.String),
+	prNumber: Schema.NullOr(Schema.Number)
+});
+function num(value) {
+	return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function dayOf(iso) {
+	return iso.length >= 10 ? iso.slice(0, 10) : null;
+}
+const makeStatisticsQuery = Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const listThreadRows = SqlSchema.findAll({
+		Request: Schema.Void,
+		Result: ThreadRow,
+		execute: () => sql`
+        SELECT
+          t.thread_id AS "threadId",
+          t.project_id AS "projectId",
+          json_extract(t.model_selection_json, '$.model') AS "model",
+          t.created_at AS "createdAt",
+          COALESCE(
+            s.provider_name,
+            json_extract(t.model_selection_json, '$.provider')
+          ) AS "providerName"
+        FROM projection_threads t
+        LEFT JOIN projection_thread_sessions s ON s.thread_id = t.thread_id
+      `
+	});
+	const listProjectRows = SqlSchema.findAll({
+		Request: Schema.Void,
+		Result: ProjectRow,
+		execute: () => sql`
+        SELECT
+          project_id AS "projectId",
+          title,
+          deleted_at AS "deletedAt"
+        FROM projection_projects
+      `
+	});
+	const listTokenActivityRows = SqlSchema.findAll({
+		Request: Schema.Void,
+		Result: TokenActivityRow,
+		execute: () => sql`
+        SELECT
+          thread_id AS "threadId",
+          turn_id AS "turnId",
+          sequence,
+          created_at AS "createdAt",
+          payload_json AS "payloadJson"
+        FROM projection_thread_activities
+        WHERE kind = 'context-window.updated'
+        ORDER BY thread_id ASC, turn_id ASC, sequence ASC, created_at ASC, activity_id ASC
+      `
+	});
+	const listToolUseRows = SqlSchema.findAll({
+		Request: Schema.Void,
+		Result: ToolUseRow,
+		execute: () => sql`
+        SELECT
+          thread_id AS "threadId",
+          substr(created_at, 1, 10) AS "date",
+          COUNT(*) AS "count"
+        FROM projection_thread_activities
+        WHERE kind = 'tool.completed'
+        GROUP BY thread_id, substr(created_at, 1, 10)
+      `
+	});
+	const listTurnRows = SqlSchema.findAll({
+		Request: Schema.Void,
+		Result: TurnRow,
+		execute: () => sql`
+        SELECT
+          thread_id AS "threadId",
+          started_at AS "startedAt",
+          completed_at AS "completedAt",
+          checkpoint_turn_count AS "checkpointTurnCount",
+          checkpoint_files_json AS "filesJson"
+        FROM projection_turns
+      `
+	});
+	const listWorktreeRows = SqlSchema.findAll({
+		Request: Schema.Void,
+		Result: WorktreeRow,
+		execute: () => sql`
+        SELECT
+          created_at AS "createdAt",
+          archived_at AS "archivedAt",
+          pr_number AS "prNumber"
+        FROM projection_worktrees
+      `
+	});
+	const getStatistics = () => Effect.gen(function* () {
+		const [threadRows, projectRows, tokenRows, toolRows, turnRows, worktreeRows] = yield* Effect.all([
+			listThreadRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$7("StatisticsQuery.getStatistics:listThreads:query", "StatisticsQuery.getStatistics:listThreads:decodeRows"))),
+			listProjectRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$7("StatisticsQuery.getStatistics:listProjects:query", "StatisticsQuery.getStatistics:listProjects:decodeRows"))),
+			listTokenActivityRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$7("StatisticsQuery.getStatistics:listTokenActivities:query", "StatisticsQuery.getStatistics:listTokenActivities:decodeRows"))),
+			listToolUseRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$7("StatisticsQuery.getStatistics:listToolUses:query", "StatisticsQuery.getStatistics:listToolUses:decodeRows"))),
+			listTurnRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$7("StatisticsQuery.getStatistics:listTurns:query", "StatisticsQuery.getStatistics:listTurns:decodeRows"))),
+			listWorktreeRows(void 0).pipe(Effect.mapError(toPersistenceSqlOrDecodeError$7("StatisticsQuery.getStatistics:listWorktrees:query", "StatisticsQuery.getStatistics:listWorktrees:decodeRows")))
+		], { concurrency: "unbounded" });
+		const threadMeta = /* @__PURE__ */ new Map();
+		const modelProvider = /* @__PURE__ */ new Map();
+		for (const row of threadRows) {
+			const provider = row.providerName?.trim() || void 0;
+			const model = (row.model ?? "").trim() || "unknown";
+			threadMeta.set(row.threadId, {
+				projectId: row.projectId,
+				model,
+				provider,
+				createdAt: row.createdAt
+			});
+			if (!modelProvider.has(model) || modelProvider.get(model) === void 0 && provider) modelProvider.set(model, provider);
+		}
+		const buckets = /* @__PURE__ */ new Map();
+		const getBucket = (date, projectId, model) => {
+			const key = `${date}${projectId}${model}`;
+			let bucket = buckets.get(key);
+			if (!bucket) {
+				bucket = {
+					date,
+					projectId,
+					model,
+					provider: modelProvider.get(model),
+					inputTokens: 0,
+					outputTokens: 0,
+					cachedInputTokens: 0,
+					reasoningTokens: 0,
+					turns: 0,
+					activeMs: 0,
+					toolUses: 0,
+					filesChanged: 0,
+					additions: 0,
+					deletions: 0,
+					commits: 0,
+					pushes: 0,
+					threadsCreated: 0
+				};
+				buckets.set(key, bucket);
+			}
+			return bucket;
+		};
+		let earliest;
+		const considerIso = (iso) => {
+			if (iso && (earliest === void 0 || iso < earliest)) earliest = iso;
+		};
+		const lastPerTurn = /* @__PURE__ */ new Map();
+		const lastPerThread = /* @__PURE__ */ new Map();
+		const isLater = (a, b) => {
+			if (a.createdAt !== b.createdAt) return a.createdAt > b.createdAt;
+			return (a.sequence ?? -1) >= (b.sequence ?? -1);
+		};
+		for (const row of tokenRows) {
+			considerIso(row.createdAt);
+			lastPerTurn.set(`${row.threadId}${row.turnId ?? ""}`, row);
+			const prevThread = lastPerThread.get(row.threadId);
+			if (!prevThread || isLater(row, prevThread)) lastPerThread.set(row.threadId, row);
+		}
+		let perTurnDeltaSum = 0;
+		for (const row of lastPerTurn.values()) {
+			const payload = safeParse(row.payloadJson);
+			perTurnDeltaSum += num(payload?.lastInputTokens) + num(payload?.lastOutputTokens) + num(payload?.lastCachedInputTokens) + num(payload?.lastReasoningOutputTokens);
+		}
+		let cumulativeSum = 0;
+		for (const row of lastPerThread.values()) {
+			const payload = safeParse(row.payloadJson);
+			cumulativeSum += num(payload?.inputTokens) + num(payload?.outputTokens);
+		}
+		const attribution = perTurnDeltaSum === 0 && cumulativeSum > 0 ? "thread-cumulative" : "per-turn-delta";
+		if (attribution === "per-turn-delta") for (const row of lastPerTurn.values()) {
+			const meta = threadMeta.get(row.threadId);
+			const date = dayOf(row.createdAt);
+			if (!meta || !date) continue;
+			const payload = safeParse(row.payloadJson);
+			const bucket = getBucket(date, meta.projectId, meta.model);
+			bucket.inputTokens += num(payload?.lastInputTokens);
+			bucket.outputTokens += num(payload?.lastOutputTokens);
+			bucket.cachedInputTokens += num(payload?.lastCachedInputTokens);
+			bucket.reasoningTokens += num(payload?.lastReasoningOutputTokens);
+		}
+		else for (const row of lastPerThread.values()) {
+			const meta = threadMeta.get(row.threadId);
+			const date = dayOf(row.createdAt);
+			if (!meta || !date) continue;
+			const payload = safeParse(row.payloadJson);
+			const bucket = getBucket(date, meta.projectId, meta.model);
+			bucket.inputTokens += num(payload?.inputTokens);
+			bucket.outputTokens += num(payload?.outputTokens);
+			bucket.cachedInputTokens += num(payload?.cachedInputTokens);
+			bucket.reasoningTokens += num(payload?.reasoningOutputTokens);
+		}
+		for (const row of turnRows) {
+			const meta = threadMeta.get(row.threadId);
+			if (!meta) continue;
+			considerIso(row.startedAt);
+			considerIso(row.completedAt);
+			const anchor = row.completedAt ?? row.startedAt;
+			const date = anchor ? dayOf(anchor) : null;
+			if (!date) continue;
+			const bucket = getBucket(date, meta.projectId, meta.model);
+			if (row.completedAt) {
+				bucket.turns += 1;
+				if (row.startedAt) {
+					const delta = Date.parse(row.completedAt) - Date.parse(row.startedAt);
+					if (Number.isFinite(delta) && delta > 0) bucket.activeMs += delta;
+				}
+			}
+			const files = safeParseArray(row.filesJson);
+			if (files.length > 0) {
+				bucket.filesChanged += files.length;
+				for (const file of files) {
+					bucket.additions += num(file?.additions);
+					bucket.deletions += num(file?.deletions);
+				}
+			}
+		}
+		for (const row of toolRows) {
+			const meta = threadMeta.get(row.threadId);
+			if (!meta) continue;
+			const bucket = getBucket(row.date, meta.projectId, meta.model);
+			bucket.toolUses += num(row.count);
+		}
+		for (const meta of threadMeta.values()) {
+			considerIso(meta.createdAt);
+			const date = dayOf(meta.createdAt);
+			if (!date) continue;
+			getBucket(date, meta.projectId, meta.model).threadsCreated += 1;
+		}
+		let wtCreated = 0;
+		let wtArchived = 0;
+		let wtOpenPrs = 0;
+		for (const row of worktreeRows) {
+			considerIso(row.createdAt);
+			wtCreated += 1;
+			if (row.archivedAt) wtArchived += 1;
+			else if (row.prNumber !== null) wtOpenPrs += 1;
+		}
+		const dailyBuckets = [];
+		const totals = {
+			inputTokens: 0,
+			outputTokens: 0,
+			cachedInputTokens: 0,
+			reasoningTokens: 0,
+			totalTokens: 0,
+			turns: 0,
+			activeMs: 0,
+			toolUses: 0,
+			filesChanged: 0,
+			additions: 0,
+			deletions: 0,
+			commits: 0,
+			pushes: 0,
+			threads: threadMeta.size,
+			projects: 0
+		};
+		for (const bucket of buckets.values()) {
+			const { provider, ...rest } = bucket;
+			dailyBuckets.push(provider ? {
+				...rest,
+				provider
+			} : rest);
+			totals.inputTokens += bucket.inputTokens;
+			totals.outputTokens += bucket.outputTokens;
+			totals.cachedInputTokens += bucket.cachedInputTokens;
+			totals.reasoningTokens += bucket.reasoningTokens;
+			totals.turns += bucket.turns;
+			totals.activeMs += bucket.activeMs;
+			totals.toolUses += bucket.toolUses;
+			totals.filesChanged += bucket.filesChanged;
+			totals.additions += bucket.additions;
+			totals.deletions += bucket.deletions;
+			totals.commits += bucket.commits;
+			totals.pushes += bucket.pushes;
+		}
+		totals.totalTokens = totals.inputTokens + totals.outputTokens;
+		const projectTitle = /* @__PURE__ */ new Map();
+		for (const row of projectRows) projectTitle.set(row.projectId, row.title);
+		const projectIdsInData = /* @__PURE__ */ new Set();
+		for (const meta of threadMeta.values()) projectIdsInData.add(meta.projectId);
+		for (const bucket of buckets.values()) projectIdsInData.add(bucket.projectId);
+		totals.projects = projectIdsInData.size;
+		const projects = [...projectIdsInData].map((id) => ({
+			id,
+			title: projectTitle.get(id)?.trim() || id
+		}));
+		const models = [...modelProvider].map(([model, provider]) => provider ? {
+			model,
+			provider
+		} : { model });
+		return {
+			generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+			...earliest ? { earliestActivityAt: earliest } : {},
+			projects,
+			models,
+			dailyBuckets,
+			worktrees: {
+				created: wtCreated,
+				archived: wtArchived,
+				active: wtCreated - wtArchived,
+				openPrs: wtOpenPrs
+			},
+			totals,
+			tokenAttribution: attribution
+		};
+	});
+	return { getStatistics };
+});
+function safeParse(json) {
+	try {
+		const parsed = JSON.parse(json);
+		return parsed && typeof parsed === "object" ? parsed : null;
+	} catch {
+		return null;
+	}
+}
+function safeParseArray(json) {
+	try {
+		const parsed = JSON.parse(json);
+		return Array.isArray(parsed) ? parsed : [];
+	} catch {
+		return [];
+	}
+}
+const StatisticsQueryLive = Layer.effect(StatisticsQuery, makeStatisticsQuery);
+//#endregion
 //#region src/serverLifecycleEvents.ts
 var ServerLifecycleEvents = class extends Context.Service()("ryco/serverLifecycleEvents") {};
 const ServerLifecycleEventsLive = Layer.effect(ServerLifecycleEvents, Effect.gen(function* () {
@@ -30380,7 +30870,8 @@ const makeGitManager = Effect.fn("makeGitManager")(function* () {
 			isDefaultRef: details.isDefaultBranch,
 			refName: details.branch,
 			hasWorkingTreeChanges: details.hasWorkingTreeChanges,
-			workingTree: details.workingTree
+			workingTree: details.workingTree,
+			...details.committed ? { committed: details.committed } : {}
 		};
 	});
 	const localStatusResultCache = yield* Cache.makeWith(readLocalStatus, {
@@ -32514,6 +33005,8 @@ const layer = Layer.effect(JiraWorkItemService, make$5());
 //#region src/remote/Services/AdvertisedEndpointRegistry.ts
 var AdvertisedEndpointRegistry = class extends Context.Service()("ryco/remote/Services/AdvertisedEndpointRegistry") {};
 const ORCHESTRATION_REPLAY_PAGE_MAX_LIMIT = 1e3;
+const ORCHESTRATION_LEGACY_REPLAY_MAX_EVENTS = ORCHESTRATION_REPLAY_PAGE_MAX_LIMIT;
+const ORCHESTRATION_LIVE_QUEUE_MAX_EVENTS = 1e3;
 //#endregion
 //#region src/ws/context/gitErrors.ts
 function gitErrorText(error) {
@@ -32547,6 +33040,10 @@ const failGitWorkflow = (operation, detail, cause) => Effect.fail(toGitManagerEr
 const wsOrchestrationReplayDepth = Metric.gauge("t3_ws_orchestration_replay_depth", { description: "Current persisted orchestration event replay depth for a replayable WebSocket subscription." });
 const wsOrchestrationLiveBufferDepth = Metric.gauge("t3_ws_orchestration_live_buffer_depth", { description: "Current live orchestration event buffer depth for a replayable WebSocket subscription." });
 const wsOrchestrationLiveBufferHighWater = Metric.gauge("t3_ws_orchestration_live_buffer_high_water", { description: "Highest observed live orchestration event buffer depth for a replayable WebSocket subscription." });
+const wsOrchestrationLiveBufferOverflowsTotal = Metric.counter("t3_ws_orchestration_live_buffer_overflows_total", {
+	description: "Total live orchestration event buffer overflows that forced replayable WebSocket subscription resync.",
+	incremental: true
+});
 const wsOrchestrationReplayLag = Metric.gauge("t3_ws_orchestration_replay_lag", { description: "Sequence lag between the latest live event observed and the latest replay/live event drained by a replayable WebSocket subscription." });
 const normalizeSequence = (sequence) => Number.isFinite(sequence) ? Math.max(0, Math.floor(sequence)) : 0;
 const updateGauge$1 = (metric, attributes, value) => Metric.update(Metric.withAttributes(metric, attributes), value);
@@ -32584,6 +33081,18 @@ const makeWsReplayMetrics = (input) => Effect.gen(function* () {
 			yield* recordLiveBuffer(yield* Ref.updateAndGet(liveBufferDepth, (current) => Math.max(0, current - 1)), yield* Ref.get(liveBufferHighWater));
 			yield* markDrained(sequence);
 		}),
+		recordLiveOverflow: (sequence, capacity) => Effect.gen(function* () {
+			const normalizedSequence = normalizeSequence(sequence);
+			const normalizedCapacity = Math.max(0, Math.floor(capacity));
+			yield* Ref.update(latestLiveSequence, (current) => Math.max(current, normalizedSequence));
+			yield* Ref.set(liveBufferDepth, normalizedCapacity);
+			const highWater = yield* Ref.updateAndGet(liveBufferHighWater, (current) => Math.max(current, normalizedCapacity));
+			yield* Effect.all([
+				recordLiveBuffer(normalizedCapacity, highWater),
+				updateGauge$1(wsOrchestrationLiveBufferOverflowsTotal, attributes, 1),
+				recordLag
+			], { discard: true });
+		}),
 		reset: Effect.all([
 			updateGauge$1(wsOrchestrationReplayDepth, attributes, 0),
 			updateGauge$1(wsOrchestrationLiveBufferDepth, attributes, 0),
@@ -32634,6 +33143,29 @@ const buildWorkItemBranchNameMessage = (input) => {
 };
 //#endregion
 //#region src/ws/context/orchestrationStreams.ts
+const makeLiveQueueOverflowError = (input) => new OrchestrationGetSnapshotError({
+	message: `Orchestration ${input.stream} live event queue overflowed; reconnect to resynchronize`,
+	cause: /* @__PURE__ */ new Error(`orchestration ${input.stream} live queue overflow at sequence ${input.sequence} with capacity ${input.capacity}`)
+});
+const offerOrchestrationLiveEventOrFail = (input) => Effect.gen(function* () {
+	const capacity = input.capacity ?? 1e3;
+	if (Queue.offerUnsafe(input.liveQueue, input.event)) {
+		yield* input.replayMetrics.recordLiveEnqueued(input.event.sequence);
+		return;
+	}
+	if (!(yield* Ref.modify(input.overflowedRef, (overflowed) => [!overflowed, true]))) return;
+	yield* input.replayMetrics.recordLiveOverflow(input.event.sequence, capacity);
+	yield* Effect.logWarning("orchestration live stream queue overflow; forcing resync", {
+		stream: input.stream,
+		sequence: input.event.sequence,
+		capacity
+	});
+	yield* Queue.fail(input.liveQueue, makeLiveQueueOverflowError({
+		stream: input.stream,
+		sequence: input.event.sequence,
+		capacity
+	}));
+});
 const makeOrchestrationStreamHelpers = (deps) => {
 	const { orchestrationEngine, projectionSnapshotQuery, repositoryIdentityResolver } = deps;
 	const enrichProjectEvent = (event) => {
@@ -32753,8 +33285,9 @@ const makeOrchestrationStreamHelpers = (deps) => {
 		const loadedSnapshot = yield* snapshot;
 		const snapshotSequence = loadedSnapshot.snapshotSequence;
 		const liveSubscription = yield* orchestrationEngine.subscribeDomainEvents;
-		const liveQueue = yield* Queue.unbounded();
+		const liveQueue = yield* Queue.bounded(ORCHESTRATION_LIVE_QUEUE_MAX_EVENTS);
 		const lastSequenceRef = yield* Ref.make(snapshotSequence);
+		const overflowedRef = yield* Ref.make(false);
 		const replayBoundary = yield* makeReplayBoundaryTracker(snapshotSequence);
 		const replayMetrics = yield* makeWsReplayMetrics({
 			stream: "shell",
@@ -32763,8 +33296,13 @@ const makeOrchestrationStreamHelpers = (deps) => {
 		});
 		yield* Stream.fromSubscription(liveSubscription).pipe(Stream.runForEach((event) => Effect.gen(function* () {
 			yield* replayBoundary.recordLiveSequence(event.sequence);
-			yield* Queue.offer(liveQueue, event);
-			yield* replayMetrics.recordLiveEnqueued(event.sequence);
+			yield* offerOrchestrationLiveEventOrFail({
+				stream: "shell",
+				event,
+				liveQueue,
+				overflowedRef,
+				replayMetrics
+			});
 		})), Effect.ensuring(Queue.shutdown(liveQueue)), Effect.ignoreCause({ log: true }), Effect.forkScoped);
 		const replayStream = makeBoundedReplayStream({
 			snapshotSequence,
@@ -32782,8 +33320,9 @@ const makeOrchestrationStreamHelpers = (deps) => {
 		const loadedSnapshot = yield* snapshot;
 		const snapshotSequence = loadedSnapshot.snapshotSequence;
 		const liveSubscription = yield* orchestrationEngine.subscribeDomainEvents;
-		const liveQueue = yield* Queue.unbounded();
+		const liveQueue = yield* Queue.bounded(ORCHESTRATION_LIVE_QUEUE_MAX_EVENTS);
 		const lastSequenceRef = yield* Ref.make(snapshotSequence);
+		const overflowedRef = yield* Ref.make(false);
 		const replayBoundary = yield* makeReplayBoundaryTracker(snapshotSequence);
 		const replayMetrics = yield* makeWsReplayMetrics({
 			stream: "thread",
@@ -32796,8 +33335,13 @@ const makeOrchestrationStreamHelpers = (deps) => {
 		})));
 		yield* Stream.fromSubscription(liveSubscription).pipe(Stream.runForEach((event) => Effect.gen(function* () {
 			yield* replayBoundary.recordLiveSequence(event.sequence);
-			yield* Queue.offer(liveQueue, event);
-			yield* replayMetrics.recordLiveEnqueued(event.sequence);
+			yield* offerOrchestrationLiveEventOrFail({
+				stream: "thread",
+				event,
+				liveQueue,
+				overflowedRef,
+				replayMetrics
+			});
 		})), Effect.ensuring(Queue.shutdown(liveQueue)), Effect.ignoreCause({ log: true }), Effect.forkScoped);
 		const replayStream = makeBoundedReplayStream({
 			snapshotSequence,
@@ -33338,6 +33882,7 @@ function toDiagnosticsProviderProcess(provider) {
 const makeWsRpcContext = (session) => Effect.gen(function* () {
 	const currentSessionId = session.sessionId;
 	const projectionSnapshotQuery = yield* ProjectionSnapshotQuery;
+	const statisticsQuery = yield* StatisticsQuery;
 	const orchestrationEngine = yield* OrchestrationEngineService;
 	const checkpointDiffQuery = yield* CheckpointDiffQuery;
 	const keybindings = yield* Keybindings;
@@ -33661,6 +34206,7 @@ const makeWsRpcContext = (session) => Effect.gen(function* () {
 	return {
 		currentSessionId,
 		projectionSnapshotQuery,
+		statisticsQuery,
 		orchestrationEngine,
 		checkpointDiffQuery,
 		keybindings,
@@ -33938,9 +34484,9 @@ function recordServerPerfPayload(label, value, record) {
 //#endregion
 //#region src/ws/orchestrationRpc.ts
 const makeOrchestrationHandlers = (ctx) => {
-	const { withAccess, ownerEffect, projectionSnapshotQuery, dispatchNormalizedCommand, dispatchWorktreeCommand, serverCommandId, terminalManager, checkpointDiffQuery, orchestrationEngine, enrichOrchestrationEvents, makeReplayableShellStream, makeReplayableThreadStream } = ctx;
+	const { ownerEffect, projectionSnapshotQuery, dispatchNormalizedCommand, dispatchWorktreeCommand, serverCommandId, terminalManager, checkpointDiffQuery, orchestrationEngine, enrichOrchestrationEvents, makeReplayableShellStream, makeReplayableThreadStream } = ctx;
 	return defineWsHandlers({
-		[ORCHESTRATION_WS_METHODS.dispatchCommand]: (command) => observeRpcEffect(ORCHESTRATION_WS_METHODS.dispatchCommand, withAccess("authenticated", ORCHESTRATION_WS_METHODS.dispatchCommand, Effect.gen(function* () {
+		[ORCHESTRATION_WS_METHODS.dispatchCommand]: (command) => observeRpcEffect(ORCHESTRATION_WS_METHODS.dispatchCommand, ownerEffect(ORCHESTRATION_WS_METHODS.dispatchCommand, Effect.gen(function* () {
 			const normalizedCommand = yield* normalizeDispatchCommand(command);
 			const shouldStopSessionAfterArchive = normalizedCommand.type === "thread.archive" ? yield* projectionSnapshotQuery.getThreadShellById(normalizedCommand.threadId).pipe(Effect.map(Option.match({
 				onNone: () => false,
@@ -33980,7 +34526,7 @@ const makeOrchestrationHandlers = (ctx) => {
 		[ORCHESTRATION_WS_METHODS.replayEvents]: (input) => observeRpcEffect(ORCHESTRATION_WS_METHODS.replayEvents, Stream.runCollect(orchestrationEngine.readEvents(clamp(input.fromSequenceExclusive, {
 			maximum: Number.MAX_SAFE_INTEGER,
 			minimum: 0
-		}))).pipe(Effect.map((events) => Array.from(events)), Effect.flatMap(enrichOrchestrationEvents), Effect.mapError((cause) => new OrchestrationReplayEventsError({
+		}), ORCHESTRATION_LEGACY_REPLAY_MAX_EVENTS)).pipe(Effect.map((events) => Array.from(events)), Effect.flatMap(enrichOrchestrationEvents), Effect.mapError((cause) => new OrchestrationReplayEventsError({
 			message: "Failed to replay orchestration events",
 			cause
 		}))), { "rpc.aggregate": "orchestration" }),
@@ -34111,10 +34657,25 @@ const makeTerminalHandlers = (ctx) => {
 		[WS_METHODS.terminalClear]: (input) => observeRpcEffect(WS_METHODS.terminalClear, ownerEffect(WS_METHODS.terminalClear, terminalManager.clear(input)), { "rpc.aggregate": "terminal" }),
 		[WS_METHODS.terminalRestart]: (input) => observeRpcEffect(WS_METHODS.terminalRestart, ownerEffect(WS_METHODS.terminalRestart, terminalManager.restart(input)), { "rpc.aggregate": "terminal" }),
 		[WS_METHODS.terminalClose]: (input) => observeRpcEffect(WS_METHODS.terminalClose, ownerEffect(WS_METHODS.terminalClose, terminalManager.close(input)), { "rpc.aggregate": "terminal" }),
-		[WS_METHODS.subscribeTerminalEvents]: (_input) => observeRpcStream(WS_METHODS.subscribeTerminalEvents, ownerStream(WS_METHODS.subscribeTerminalEvents, Stream.callback((queue) => Effect.acquireRelease(terminalManager.subscribe((event) => Effect.gen(function* () {
-			recordServerPerfPayload("server.ws.terminal.events", event);
-			yield* Queue.offer(queue, event);
-		})), (unsubscribe) => Effect.sync(unsubscribe)))), { "rpc.aggregate": "terminal" })
+		[WS_METHODS.subscribeTerminalEvents]: (_input) => observeRpcStream(WS_METHODS.subscribeTerminalEvents, ownerStream(WS_METHODS.subscribeTerminalEvents, Stream.callback((queue) => Effect.acquireRelease(Effect.gen(function* () {
+			const unsubscribe = yield* terminalManager.subscribe((event) => Effect.gen(function* () {
+				recordServerPerfPayload("server.ws.terminal.events", event);
+				yield* Queue.offer(queue, event);
+			}));
+			const snapshots = yield* terminalManager.listSessions;
+			yield* Effect.forEach(snapshots.filter((snapshot) => snapshot.status === "running"), (snapshot) => {
+				const event = {
+					type: "started",
+					threadId: snapshot.threadId,
+					terminalId: snapshot.terminalId,
+					createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+					snapshot
+				};
+				recordServerPerfPayload("server.ws.terminal.events", event);
+				return Queue.offer(queue, event);
+			}, { discard: true });
+			return unsubscribe;
+		}), (unsubscribe) => Effect.sync(unsubscribe)))), { "rpc.aggregate": "terminal" })
 	});
 };
 //#endregion
@@ -34209,7 +34770,7 @@ const makeSourceControlHandlers = (ctx) => {
 			cwd,
 			reason: "sourceControl.searchIssues"
 		})))), { "rpc.aggregate": "source-control" }),
-		[WS_METHODS.sourceControlListChangeRequests]: ({ cwd, state, limit, query }) => observeRpcEffect(WS_METHODS.sourceControlListChangeRequests, sourceControlRegistry.resolve({ cwd }).pipe(Effect.flatMap((provider) => {
+		[WS_METHODS.sourceControlListChangeRequests]: ({ cwd, state, limit, query }) => observeRpcEffect(WS_METHODS.sourceControlListChangeRequests, ownerEffect(WS_METHODS.sourceControlListChangeRequests, sourceControlRegistry.resolve({ cwd }).pipe(Effect.flatMap((provider) => {
 			const trimmedQuery = query?.trim() ?? "";
 			if (trimmedQuery.length > 0) return provider.searchChangeRequests({
 				cwd,
@@ -34225,7 +34786,7 @@ const makeSourceControlHandlers = (ctx) => {
 		}), Effect.tap(() => refreshLinkedWorktreeSourceControlStates({
 			cwd,
 			reason: "sourceControl.listChangeRequests"
-		}))), { "rpc.aggregate": "source-control" }),
+		})))), { "rpc.aggregate": "source-control" }),
 		[WS_METHODS.sourceControlSearchChangeRequests]: ({ cwd, query, limit }) => observeRpcEffect(WS_METHODS.sourceControlSearchChangeRequests, ownerEffect(WS_METHODS.sourceControlSearchChangeRequests, sourceControlRegistry.resolve({ cwd }).pipe(Effect.flatMap((provider) => provider.searchChangeRequests({
 			cwd,
 			query,
@@ -34975,12 +35536,19 @@ const makeProviderHandlers = (ctx) => {
 	});
 };
 //#endregion
+//#region src/ws/statisticsRpc.ts
+const makeStatisticsHandlers = (ctx) => {
+	const { statisticsQuery, ownerEffect } = ctx;
+	return defineWsHandlers({ [WS_METHODS.serverGetStatistics]: (_input) => observeRpcEffect(WS_METHODS.serverGetStatistics, ownerEffect(WS_METHODS.serverGetStatistics, statisticsQuery.getStatistics().pipe(Effect.orDie)), { "rpc.aggregate": "server" }) });
+};
+//#endregion
 //#region src/ws/index.ts
 const makeWsRpcLayer = (session) => WsRpcGroup.toLayer(Effect.gen(function* () {
 	const ctx = yield* makeWsRpcContext(session);
 	return WsRpcGroup.of({
 		...makeOrchestrationHandlers(ctx),
 		...makeProviderHandlers(ctx),
+		...makeStatisticsHandlers(ctx),
 		...makeSourceControlHandlers(ctx),
 		...makeProjectHandlers(ctx),
 		...makeGitHandlers(ctx),
@@ -37398,6 +37966,8 @@ const DEFAULT_PERSIST_DEBOUNCE_MS = 40;
 const DEFAULT_SUBPROCESS_POLL_INTERVAL_MS = 1e3;
 const DEFAULT_PROCESS_KILL_GRACE_MS = 1e3;
 const DEFAULT_MAX_RETAINED_INACTIVE_SESSIONS = 128;
+const DEFAULT_MAX_PENDING_PROCESS_EVENTS = 2048;
+const DEFAULT_MAX_PENDING_PROCESS_OUTPUT_BYTES = 2 * 1024 * 1024;
 const DEFAULT_OPEN_COLS = 120;
 const DEFAULT_OPEN_ROWS = 30;
 const TERMINAL_ENV_BLOCKLIST = new Set([
@@ -37454,13 +38024,86 @@ function cleanupProcessHandles(session) {
 	session.unsubscribeExit?.();
 	session.unsubscribeExit = null;
 }
-function enqueueProcessEvent(session, expectedPid, event) {
+function clearPendingProcessEvents(session) {
+	session.pendingProcessEvents = [];
+	session.pendingProcessEventIndex = 0;
+	session.pendingProcessOutputBytes = 0;
+	session.processEventDrainRunning = false;
+}
+function enqueueProcessEvent(session, expectedPid, event, limits) {
 	if (!session.process || session.status !== "running" || session.pid !== expectedPid) return false;
+	if (event.type === "output" && session.pendingProcessEvents.some((pendingEvent) => pendingEvent.type === "exit")) return false;
+	compactPendingProcessEvents(session);
 	session.pendingProcessEvents.push(event);
+	if (event.type === "output") session.pendingProcessOutputBytes += event.byteLength;
+	enforcePendingProcessEventLimits(session, limits);
 	if (session.processEventDrainRunning) return false;
 	session.processEventDrainRunning = true;
 	return true;
 }
+function compactPendingProcessEvents(session) {
+	if (session.pendingProcessEventIndex <= 0) return;
+	session.pendingProcessEvents = session.pendingProcessEvents.slice(session.pendingProcessEventIndex);
+	session.pendingProcessEventIndex = 0;
+}
+function coalesceOldestPendingOutputPair(session) {
+	for (let index = 0; index < session.pendingProcessEvents.length - 1; index += 1) {
+		const current = session.pendingProcessEvents[index];
+		const next = session.pendingProcessEvents[index + 1];
+		if (current?.type !== "output" || next?.type !== "output") continue;
+		session.pendingProcessEvents.splice(index, 2, {
+			type: "output",
+			data: `${current.data}${next.data}`,
+			byteLength: current.byteLength + next.byteLength
+		});
+		return true;
+	}
+	return false;
+}
+function trimOutputDataToApproxBytes(data, maxBytes) {
+	if (maxBytes <= 0 || data.length === 0) return {
+		data: "",
+		byteLength: 0
+	};
+	let nextData = data;
+	let byteLength = approximateTextBytes(nextData);
+	while (byteLength > maxBytes && nextData.length > 0) {
+		const excessBytes = byteLength - maxBytes;
+		const sliceStart = Math.min(nextData.length, Math.max(1, excessBytes));
+		nextData = nextData.slice(sliceStart);
+		byteLength = approximateTextBytes(nextData);
+	}
+	return {
+		data: nextData,
+		byteLength
+	};
+}
+function trimPendingOutputBytesToLimit(session, maxPendingProcessOutputBytes) {
+	if (session.pendingProcessOutputBytes <= maxPendingProcessOutputBytes) return;
+	for (let index = 0; index < session.pendingProcessEvents.length; index += 1) {
+		if (session.pendingProcessOutputBytes <= maxPendingProcessOutputBytes) return;
+		const event = session.pendingProcessEvents[index];
+		if (event?.type !== "output") continue;
+		const targetEventBytes = Math.max(0, event.byteLength - (session.pendingProcessOutputBytes - maxPendingProcessOutputBytes));
+		if (targetEventBytes <= 0) {
+			session.pendingProcessEvents.splice(index, 1);
+			session.pendingProcessOutputBytes = Math.max(0, session.pendingProcessOutputBytes - event.byteLength);
+			index -= 1;
+			continue;
+		}
+		const trimmed = trimOutputDataToApproxBytes(event.data, targetEventBytes);
+		session.pendingProcessEvents[index] = {
+			type: "output",
+			data: trimmed.data,
+			byteLength: trimmed.byteLength
+		};
+		session.pendingProcessOutputBytes = Math.max(0, session.pendingProcessOutputBytes - (event.byteLength - trimmed.byteLength));
+	}
+}
+function enforcePendingProcessEventLimits(session, limits) {
+	while (session.pendingProcessEvents.length > limits.maxPendingProcessEvents && coalesceOldestPendingOutputPair(session));
+	trimPendingOutputBytesToLimit(session, limits.maxPendingProcessOutputBytes);
+}
 function defaultShellResolver(platform = process.platform, env = process.env) {
 	if (platform === "win32") return "pwsh.exe";
 	return env.SHELL ?? "bash";
@@ -37827,6 +38470,10 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 	const subprocessPollIntervalMs = options.subprocessPollIntervalMs ?? DEFAULT_SUBPROCESS_POLL_INTERVAL_MS;
 	const processKillGraceMs = options.processKillGraceMs ?? DEFAULT_PROCESS_KILL_GRACE_MS;
 	const maxRetainedInactiveSessions = options.maxRetainedInactiveSessions ?? DEFAULT_MAX_RETAINED_INACTIVE_SESSIONS;
+	const pendingProcessEventLimits = {
+		maxPendingProcessEvents: Math.max(1, options.maxPendingProcessEvents ?? DEFAULT_MAX_PENDING_PROCESS_EVENTS),
+		maxPendingProcessOutputBytes: Math.max(1, options.maxPendingProcessOutputBytes ?? DEFAULT_MAX_PENDING_PROCESS_OUTPUT_BYTES)
+	};
 	yield* fileSystem.makeDirectory(logsDir, { recursive: true }).pipe(Effect.orDie);
 	const managerStateRef = yield* SynchronizedRef.make({
 		sessions: /* @__PURE__ */ new Map(),
@@ -38063,16 +38710,12 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 		while (true) {
 			const action = yield* Effect.sync(() => {
 				if (session.pid !== expectedPid || !session.process || session.status !== "running") {
-					session.pendingProcessEvents = [];
-					session.pendingProcessEventIndex = 0;
-					session.processEventDrainRunning = false;
+					clearPendingProcessEvents(session);
 					return { type: "idle" };
 				}
 				const nextEvent = session.pendingProcessEvents[session.pendingProcessEventIndex];
 				if (!nextEvent) {
-					session.pendingProcessEvents = [];
-					session.pendingProcessEventIndex = 0;
-					session.processEventDrainRunning = false;
+					clearPendingProcessEvents(session);
 					return { type: "idle" };
 				}
 				session.pendingProcessEventIndex += 1;
@@ -38081,6 +38724,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 					session.pendingProcessEventIndex = 0;
 				}
 				if (nextEvent.type === "output") {
+					session.pendingProcessOutputBytes = Math.max(0, session.pendingProcessOutputBytes - nextEvent.byteLength);
 					const sanitized = sanitizeTerminalHistoryChunk(session.pendingHistoryControlSequence, nextEvent.data);
 					session.pendingHistoryControlSequence = sanitized.pendingControlSequence;
 					if (sanitized.visibleText.length > 0) session.history = capHistory(`${session.history}${sanitized.visibleText}`, historyLineLimit);
@@ -38100,9 +38744,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 				session.hasRunningSubprocess = false;
 				session.status = "exited";
 				session.pendingHistoryControlSequence = "";
-				session.pendingProcessEvents = [];
-				session.pendingProcessEventIndex = 0;
-				session.processEventDrainRunning = false;
+				clearPendingProcessEvents(session);
 				session.exitCode = Number.isInteger(nextEvent.event.exitCode) ? nextEvent.event.exitCode : null;
 				session.exitSignal = Number.isInteger(nextEvent.event.signal) ? nextEvent.event.signal : null;
 				session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -38150,9 +38792,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 			session.hasRunningSubprocess = false;
 			session.status = "exited";
 			session.pendingHistoryControlSequence = "";
-			session.pendingProcessEvents = [];
-			session.pendingProcessEventIndex = 0;
-			session.processEventDrainRunning = false;
+			clearPendingProcessEvents(session);
 			session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 			return [void 0, state];
 		});
@@ -38204,9 +38844,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 			session.exitCode = null;
 			session.exitSignal = null;
 			session.hasRunningSubprocess = false;
-			session.pendingProcessEvents = [];
-			session.pendingProcessEventIndex = 0;
-			session.processEventDrainRunning = false;
+			clearPendingProcessEvents(session);
 			session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 			return [void 0, state];
 		});
@@ -38220,15 +38858,16 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 			const unsubscribeData = ptyProcess.onData((data) => {
 				if (!enqueueProcessEvent(session, processPid, {
 					type: "output",
-					data
-				})) return;
+					data,
+					byteLength: approximateTextBytes(data)
+				}, pendingProcessEventLimits)) return;
 				runFork(drainProcessEvents(session, processPid));
 			});
 			const unsubscribeExit = ptyProcess.onExit((event) => {
 				if (!enqueueProcessEvent(session, processPid, {
 					type: "exit",
 					event
-				})) return;
+				}, pendingProcessEventLimits)) return;
 				runFork(drainProcessEvents(session, processPid));
 			});
 			yield* modifyManagerState((state) => {
@@ -38260,9 +38899,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 				session.unsubscribeData = null;
 				session.unsubscribeExit = null;
 				session.hasRunningSubprocess = false;
-				session.pendingProcessEvents = [];
-				session.pendingProcessEventIndex = 0;
-				session.processEventDrainRunning = false;
+				clearPendingProcessEvents(session);
 				session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 				return [void 0, state];
 			});
@@ -38372,6 +39009,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 				pendingHistoryControlSequence: "",
 				pendingProcessEvents: [],
 				pendingProcessEventIndex: 0,
+				pendingProcessOutputBytes: 0,
 				processEventDrainRunning: false,
 				exitCode: null,
 				exitSignal: null,
@@ -38418,18 +39056,14 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 			liveSession.runtimeEnv = nextRuntimeEnv;
 			liveSession.history = "";
 			liveSession.pendingHistoryControlSequence = "";
-			liveSession.pendingProcessEvents = [];
-			liveSession.pendingProcessEventIndex = 0;
-			liveSession.processEventDrainRunning = false;
+			clearPendingProcessEvents(liveSession);
 			yield* persistHistory(liveSession.threadId, liveSession.terminalId, liveSession.history);
 		} else if (liveSession.status === "exited" || liveSession.status === "error") {
 			liveSession.runtimeEnv = nextRuntimeEnv;
 			liveSession.worktreePath = input.worktreePath ?? null;
 			liveSession.history = "";
 			liveSession.pendingHistoryControlSequence = "";
-			liveSession.pendingProcessEvents = [];
-			liveSession.pendingProcessEventIndex = 0;
-			liveSession.processEventDrainRunning = false;
+			clearPendingProcessEvents(liveSession);
 			yield* persistHistory(liveSession.threadId, liveSession.terminalId, liveSession.history);
 		}
 		if (!liveSession.process) {
@@ -38483,9 +39117,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 		const session = yield* requireSession(input.threadId, terminalId);
 		session.history = "";
 		session.pendingHistoryControlSequence = "";
-		session.pendingProcessEvents = [];
-		session.pendingProcessEventIndex = 0;
-		session.processEventDrainRunning = false;
+		clearPendingProcessEvents(session);
 		session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 		yield* persistHistory(input.threadId, terminalId, session.history);
 		yield* publishEvent({
@@ -38516,6 +39148,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 				pendingHistoryControlSequence: "",
 				pendingProcessEvents: [],
 				pendingProcessEventIndex: 0,
+				pendingProcessOutputBytes: 0,
 				processEventDrainRunning: false,
 				exitCode: null,
 				exitSignal: null,
@@ -38549,9 +39182,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 		const rows = input.rows ?? session.rows;
 		session.history = "";
 		session.pendingHistoryControlSequence = "";
-		session.pendingProcessEvents = [];
-		session.pendingProcessEventIndex = 0;
-		session.processEventDrainRunning = false;
+		clearPendingProcessEvents(session);
 		yield* persistHistory(input.threadId, terminalId, session.history);
 		yield* startSession(session, {
 			threadId: input.threadId,
@@ -38573,6 +39204,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 		yield* Effect.forEach(threadSessions, (session) => closeSession(input.threadId, session.terminalId, false), { discard: true });
 		if (input.deleteHistory) yield* deleteAllHistoryForThread(input.threadId);
 	}));
+	const listSessions = SynchronizedRef.get(managerStateRef).pipe(Effect.map((state) => [...state.sessions.values()].map(snapshot).toSorted((left, right) => right.updatedAt.localeCompare(left.updatedAt))));
 	return {
 		open,
 		write,
@@ -38581,6 +39213,7 @@ const makeTerminalManagerWithOptions = Effect.fn("makeTerminalManagerWithOptions
 		restart,
 		close,
 		listDiagnostics: SynchronizedRef.get(managerStateRef).pipe(Effect.map((state) => [...state.sessions.values()].map(diagnosticsSnapshot).toSorted((left, right) => right.updatedAt.localeCompare(left.updatedAt)))),
+		listSessions,
 		subscribe: (listener) => Effect.sync(() => {
 			terminalEventListeners.add(listener);
 			return () => {
@@ -39076,7 +39709,7 @@ function isGitRepository(cwd) {
 //#endregion
 //#region src/orchestration/Layers/ProviderRuntimeIngestion.ts
 const providerTurnKey = (threadId, turnId) => `${threadId}:${turnId}`;
-const providerCommandId = (event, tag) => CommandId.make(`provider:${event.eventId}:${tag}:${crypto.randomUUID()}`);
+const providerCommandId = (event, tag, discriminator) => CommandId.make(discriminator === void 0 ? `provider:${event.eventId}:${tag}` : `provider:${event.eventId}:${tag}:${discriminator}`);
 const liveAssistantDeltaBufferKey = (threadId, messageId) => `${threadId}:${messageId}`;
 const TURN_MESSAGE_IDS_BY_TURN_CACHE_CAPACITY = 1e4;
 const TURN_MESSAGE_IDS_BY_TURN_TTL = Duration.minutes(120);
@@ -39150,6 +39783,7 @@ function rawPayloadThreadId(event) {
 	return asTrimmedString(asRecord(event.raw?.payload)?.threadId);
 }
 function collabReceiverThreadIdsFromRuntimeEvent(event) {
+	if (event.type === "subagent.started" || event.type === "subagent.updated" || event.type === "subagent.completed") return event.payload.subagent.providerThreadId ? [event.payload.subagent.providerThreadId] : [];
 	if (event.type !== "item.started" && event.type !== "item.updated" && event.type !== "item.completed") return [];
 	if (event.payload.itemType !== "collab_agent_tool_call") return [];
 	const item = asRecord(asRecord(event.payload.data)?.item);
@@ -39207,6 +39841,9 @@ function normalizeRuntimeTurnState(value) {
 		default: return "completed";
 	}
 }
+function isTerminalProjectionTurnState(state) {
+	return state === "completed" || state === "error" || state === "interrupted";
+}
 function orchestrationSessionStatusFromRuntimeState(state) {
 	switch (state) {
 		case "starting": return "starting";
@@ -39394,6 +40031,53 @@ function runtimeEventToActivities(event) {
 			turnId: toTurnId$1(event.turnId) ?? null,
 			...maybeSequence
 		}];
+		case "subagent.started": return [{
+			id: event.eventId,
+			createdAt: event.createdAt,
+			tone: "tool",
+			kind: "subagent.started",
+			summary: `${event.payload.subagent.label ?? "Subagent"} started`,
+			payload: {
+				itemType: "collab_agent_tool_call",
+				status: "running",
+				subagent: event.payload.subagent
+			},
+			turnId: toTurnId$1(event.turnId) ?? null,
+			...maybeSequence
+		}];
+		case "subagent.updated": return [{
+			id: event.eventId,
+			createdAt: event.createdAt,
+			tone: "tool",
+			kind: "subagent.updated",
+			summary: event.payload.summary ?? `${event.payload.subagent.label ?? "Subagent"} updated`,
+			payload: {
+				itemType: "collab_agent_tool_call",
+				...event.payload.status ? { status: event.payload.status } : {},
+				subagent: event.payload.subagent,
+				...event.payload.detail ? { detail: truncateDetail(event.payload.detail) } : {},
+				...event.payload.summary ? { summary: truncateDetail(event.payload.summary) } : {},
+				...event.payload.usage !== void 0 ? { usage: event.payload.usage } : {}
+			},
+			turnId: toTurnId$1(event.turnId) ?? null,
+			...maybeSequence
+		}];
+		case "subagent.completed": return [{
+			id: event.eventId,
+			createdAt: event.createdAt,
+			tone: event.payload.status === "failed" ? "error" : "tool",
+			kind: "subagent.completed",
+			summary: event.payload.status === "failed" ? `${event.payload.subagent.label ?? "Subagent"} failed` : event.payload.status === "stopped" ? `${event.payload.subagent.label ?? "Subagent"} stopped` : `${event.payload.subagent.label ?? "Subagent"} completed`,
+			payload: {
+				itemType: "collab_agent_tool_call",
+				status: event.payload.status,
+				subagent: event.payload.subagent,
+				...event.payload.summary ? { detail: truncateDetail(event.payload.summary) } : {},
+				...event.payload.usage !== void 0 ? { usage: event.payload.usage } : {}
+			},
+			turnId: toTurnId$1(event.turnId) ?? null,
+			...maybeSequence
+		}];
 		case "thread.state.changed":
 			if (event.payload.state !== "compacted") return [];
 			return [{
@@ -39586,7 +40270,7 @@ const make$3 = Effect.gen(function* () {
 		}
 		yield* orchestrationEngine.dispatch({
 			type: "thread.message.assistant.delta",
-			commandId: providerCommandId(buffer.event, input.commandTag),
+			commandId: providerCommandId(buffer.event, input.commandTag, String(buffer.messageId)),
 			threadId: buffer.threadId,
 			messageId: buffer.messageId,
 			delta: buffer.text,
@@ -39665,9 +40349,10 @@ const make$3 = Effect.gen(function* () {
 	};
 	const upsertSubagentMessageActivity = (input) => Effect.gen(function* () {
 		const sessionSequence = input.event.sessionSequence;
+		const commandKey = `${input.providerThreadId}:${input.providerItemId}`;
 		yield* orchestrationEngine.dispatch({
 			type: "thread.activity.append",
-			commandId: providerCommandId(input.event, "subagent-message-upsert"),
+			commandId: providerCommandId(input.event, "subagent-message-upsert", commandKey),
 			threadId: input.threadId,
 			activity: {
 				id: subagentMessageActivityId({
@@ -39685,6 +40370,7 @@ const make$3 = Effect.gen(function* () {
 					streaming: input.streaming,
 					providerThreadId: input.providerThreadId,
 					providerItemId: input.providerItemId,
+					...input.subagentId ? { subagentId: input.subagentId } : {},
 					...input.event.providerRefs ? { providerRefs: input.event.providerRefs } : {}
 				},
 				turnId: toTurnId$1(input.event.turnId) ?? null,
@@ -39724,6 +40410,16 @@ const make$3 = Effect.gen(function* () {
 			streaming: false
 		});
 	});
+	const bufferedSubagentProviderItemIds = (input) => {
+		const prefix = subagentMessageBufferKey({
+			threadId: input.threadId,
+			providerThreadId: input.providerThreadId,
+			providerItemId: ""
+		});
+		const providerItemIds = /* @__PURE__ */ new Set();
+		for (const key of subagentMessageTextByKey.keys()) if (key.startsWith(prefix)) providerItemIds.add(key.slice(prefix.length));
+		return [...providerItemIds];
+	};
 	const clearSubagentMessageBuffersForThread = (threadId) => Effect.sync(() => {
 		const prefix = `${threadId}:`;
 		for (const key of subagentMessageTextByKey.keys()) if (key.startsWith(prefix)) subagentMessageTextByKey.delete(key);
@@ -39757,7 +40453,7 @@ const make$3 = Effect.gen(function* () {
 		if (!hasRenderableAssistantText(bufferedText)) return false;
 		yield* orchestrationEngine.dispatch({
 			type: "thread.message.assistant.delta",
-			commandId: providerCommandId(input.event, input.commandTag),
+			commandId: providerCommandId(input.event, input.commandTag, String(input.messageId)),
 			threadId: input.threadId,
 			messageId: input.messageId,
 			delta: bufferedText,
@@ -39785,7 +40481,7 @@ const make$3 = Effect.gen(function* () {
 		const hasRenderableText = hasRenderableAssistantText(text);
 		if (hasRenderableText) yield* orchestrationEngine.dispatch({
 			type: "thread.message.assistant.delta",
-			commandId: providerCommandId(input.event, input.finalDeltaCommandTag),
+			commandId: providerCommandId(input.event, input.finalDeltaCommandTag, String(input.messageId)),
 			threadId: input.threadId,
 			messageId: input.messageId,
 			delta: text,
@@ -39794,7 +40490,7 @@ const make$3 = Effect.gen(function* () {
 		});
 		if (input.hasProjectedMessage || hasRenderableText) yield* orchestrationEngine.dispatch({
 			type: "thread.message.assistant.complete",
-			commandId: providerCommandId(input.event, input.commandTag),
+			commandId: providerCommandId(input.event, input.commandTag, String(input.messageId)),
 			threadId: input.threadId,
 			messageId: input.messageId,
 			...input.turnId ? { turnId: input.turnId } : {},
@@ -39828,7 +40524,7 @@ const make$3 = Effect.gen(function* () {
 		const existingPlan = findProposedPlanById(input.threadProposedPlans, input.planId);
 		yield* orchestrationEngine.dispatch({
 			type: "thread.proposed-plan.upsert",
-			commandId: providerCommandId(input.event, "proposed-plan-upsert"),
+			commandId: providerCommandId(input.event, "proposed-plan-upsert", input.planId),
 			threadId: input.threadId,
 			proposedPlan: {
 				id: input.planId,
@@ -39895,13 +40591,13 @@ const make$3 = Effect.gen(function* () {
 		if (!sameId$1(yield* getExpectedProviderTurnIdForThread(threadId), eventTurnId)) return null;
 		return yield* getSourceProposedPlanReferenceForPendingTurnStart(threadId);
 	});
-	const markSourceProposedPlanImplemented = Effect.fn("markSourceProposedPlanImplemented")(function* (sourceThreadId, sourcePlanId, implementationThreadId, implementedAt) {
+	const markSourceProposedPlanImplemented = Effect.fn("markSourceProposedPlanImplemented")(function* (event, sourceThreadId, sourcePlanId, implementationThreadId, implementedAt) {
 		const sourceThread = yield* resolveThreadDetail(sourceThreadId);
 		const sourcePlan = sourceThread?.proposedPlans.find((entry) => entry.id === sourcePlanId);
 		if (!sourceThread || !sourcePlan || sourcePlan.implementedAt !== null) return;
 		yield* orchestrationEngine.dispatch({
 			type: "thread.proposed-plan.upsert",
-			commandId: CommandId.make(`provider:source-proposed-plan-implemented:${implementationThreadId}:${crypto.randomUUID()}`),
+			commandId: providerCommandId(event, "source-proposed-plan-implemented", `${sourceThreadId}:${sourcePlanId}:${implementationThreadId}`),
 			threadId: sourceThread.id,
 			proposedPlan: {
 				...sourcePlan,
@@ -39926,6 +40622,12 @@ const make$3 = Effect.gen(function* () {
 		const activeTurnId = thread.session?.activeTurnId ?? null;
 		const conflictsWithActiveTurn = activeTurnId !== null && eventTurnId !== void 0 && !sameId$1(activeTurnId, eventTurnId);
 		const missingTurnForActiveTurn = activeTurnId !== null && eventTurnId === void 0;
+		const existingEventTurn = event.type === "turn.started" && eventTurnId !== void 0 ? yield* projectionTurnRepository.getByTurnId({
+			threadId: thread.id,
+			turnId: eventTurnId
+		}) : Option.none();
+		const eventTurnAlreadyTerminal = Option.isSome(existingEventTurn) && isTerminalProjectionTurnState(existingEventTurn.value.state);
+		const eventTurnAlreadyProjectedWithoutActiveSession = activeTurnId === null && Option.isSome(existingEventTurn);
 		if (!isAssistantTextDeltaEvent(event)) yield* flushLiveAssistantDeltaBuffersSafely({ commandTag: "assistant-delta-flush-before-runtime-event" });
 		yield* rememberSubagentProviderThreadIds(thread.id, event);
 		const eventProviderThreadId = rawPayloadThreadId(event);
@@ -39936,8 +40638,9 @@ const make$3 = Effect.gen(function* () {
 				case "session.exited": return true;
 				case "session.started":
 				case "thread.started": return true;
-				case "turn.started": return !conflictsWithActiveTurn;
+				case "turn.started": return !conflictsWithActiveTurn && !eventTurnAlreadyTerminal && !eventTurnAlreadyProjectedWithoutActiveSession;
 				case "turn.completed":
+				case "turn.aborted":
 					if (conflictsWithActiveTurn || missingTurnForActiveTurn) return false;
 					if (activeTurnId !== null && eventTurnId !== void 0) return sameId$1(activeTurnId, eventTurnId);
 					return true;
@@ -39945,21 +40648,22 @@ const make$3 = Effect.gen(function* () {
 			}
 		})();
 		const acceptedTurnStartedSourcePlan = event.type === "turn.started" && shouldApplyThreadLifecycle ? yield* getSourceProposedPlanReferenceForAcceptedTurnStart(thread.id, eventTurnId) : null;
-		if (event.type === "session.started" || event.type === "session.state.changed" || event.type === "session.exited" || event.type === "thread.started" || event.type === "turn.started" || event.type === "turn.completed") {
-			const nextActiveTurnId = event.type === "turn.started" ? eventTurnId ?? null : event.type === "turn.completed" || event.type === "session.exited" ? null : activeTurnId;
+		if (event.type === "session.started" || event.type === "session.state.changed" || event.type === "session.exited" || event.type === "thread.started" || event.type === "turn.started" || event.type === "turn.completed" || event.type === "turn.aborted") {
+			const nextActiveTurnId = event.type === "turn.started" ? eventTurnId ?? null : event.type === "turn.completed" || event.type === "turn.aborted" || event.type === "session.exited" ? null : activeTurnId;
 			const status = (() => {
 				switch (event.type) {
 					case "session.state.changed": return orchestrationSessionStatusFromRuntimeState(event.payload.state);
 					case "turn.started": return "running";
 					case "session.exited": return "stopped";
 					case "turn.completed": return normalizeRuntimeTurnState(event.payload.state) === "failed" ? "error" : "ready";
+					case "turn.aborted": return "ready";
 					case "session.started":
 					case "thread.started": return activeTurnId !== null ? "running" : "ready";
 				}
 			})();
 			const lastError = event.type === "session.state.changed" && event.payload.state === "error" ? event.payload.reason ?? thread.session?.lastError ?? "Provider session error" : event.type === "turn.completed" && normalizeRuntimeTurnState(event.payload.state) === "failed" ? event.payload.errorMessage ?? thread.session?.lastError ?? "Turn failed" : status === "ready" ? null : thread.session?.lastError ?? null;
 			if (shouldApplyThreadLifecycle) {
-				if (event.type === "turn.started" && acceptedTurnStartedSourcePlan !== null) yield* markSourceProposedPlanImplemented(acceptedTurnStartedSourcePlan.sourceThreadId, acceptedTurnStartedSourcePlan.sourcePlanId, thread.id, now).pipe(Effect.catchCause((cause) => Effect.logWarning("provider runtime ingestion failed to mark source proposed plan", {
+				if (event.type === "turn.started" && acceptedTurnStartedSourcePlan !== null) yield* markSourceProposedPlanImplemented(event, acceptedTurnStartedSourcePlan.sourceThreadId, acceptedTurnStartedSourcePlan.sourcePlanId, thread.id, now).pipe(Effect.catchCause((cause) => Effect.logWarning("provider runtime ingestion failed to mark source proposed plan", {
 					eventId: event.eventId,
 					eventType: event.type,
 					cause: Cause.pretty(cause)
@@ -39981,11 +40685,30 @@ const make$3 = Effect.gen(function* () {
 					},
 					createdAt: now
 				});
+				if (event.type === "turn.aborted" && eventTurnId !== void 0) yield* orchestrationEngine.dispatch({
+					type: "thread.turn.interrupt",
+					commandId: providerCommandId(event, "thread-turn-interrupt", String(eventTurnId)),
+					threadId: thread.id,
+					turnId: eventTurnId,
+					createdAt: now
+				});
 			}
 		}
 		const assistantDelta = isAssistantTextDeltaEvent(event) ? event.payload.delta : void 0;
+		const subagentDelta = event.type === "subagent.message.delta" ? event.payload.delta : void 0;
 		const proposedPlanDelta = event.type === "turn.proposed.delta" ? event.payload.delta : void 0;
-		if (assistantDelta && assistantDelta.length > 0 && isSubagentProviderThread && eventProviderThreadId) yield* appendSubagentMessageDelta({
+		if (event.type === "subagent.message.delta" && subagentDelta && subagentDelta.length > 0) {
+			const subagentPayload = event.payload;
+			yield* appendSubagentMessageDelta({
+				event,
+				threadId: thread.id,
+				subagentId: String(subagentPayload.subagentId),
+				providerThreadId: subagentPayload.providerThreadId ?? String(subagentPayload.subagentId),
+				providerItemId: subagentPayload.providerMessageId ?? String(subagentPayload.subagentId),
+				delta: subagentDelta,
+				createdAt: now
+			});
+		} else if (assistantDelta && assistantDelta.length > 0 && isSubagentProviderThread && eventProviderThreadId) yield* appendSubagentMessageDelta({
 			event,
 			threadId: thread.id,
 			providerThreadId: eventProviderThreadId,
@@ -40005,7 +40728,7 @@ const make$3 = Effect.gen(function* () {
 				const spillChunk = yield* appendBufferedAssistantText(assistantMessageId, assistantDelta);
 				if (spillChunk.length > 0) yield* orchestrationEngine.dispatch({
 					type: "thread.message.assistant.delta",
-					commandId: providerCommandId(event, "assistant-delta-buffer-spill"),
+					commandId: providerCommandId(event, "assistant-delta-buffer-spill", String(assistantMessageId)),
 					threadId: thread.id,
 					messageId: assistantMessageId,
 					delta: spillChunk,
@@ -40090,6 +40813,26 @@ const make$3 = Effect.gen(function* () {
 			...subagentMessageCompletion.fallbackText !== void 0 ? { fallbackText: subagentMessageCompletion.fallbackText } : {},
 			createdAt: now
 		});
+		if (event.type === "subagent.completed") {
+			const subagentId = String(event.payload.subagent.subagentId);
+			const providerThreadId = event.payload.subagent.providerThreadId ?? subagentId;
+			const providerItemIds = bufferedSubagentProviderItemIds({
+				threadId: thread.id,
+				providerThreadId
+			});
+			yield* Effect.forEach(providerItemIds.length > 0 ? providerItemIds : [subagentId], (providerItemId) => completeSubagentMessage({
+				event,
+				threadId: thread.id,
+				subagentId,
+				providerThreadId,
+				providerItemId,
+				...event.payload.summary !== void 0 ? { fallbackText: event.payload.summary } : {},
+				createdAt: now
+			}), {
+				concurrency: 1,
+				discard: true
+			});
+		}
 		if (proposedPlanCompletion) {
 			const detailedThread = yield* getLoadedThreadDetail();
 			yield* finalizeBufferedProposedPlan({
@@ -40102,7 +40845,7 @@ const make$3 = Effect.gen(function* () {
 				updatedAt: now
 			});
 		}
-		if (event.type === "turn.completed") {
+		if (event.type === "turn.completed" || event.type === "turn.aborted") {
 			const detailedThread = yield* getLoadedThreadDetail();
 			const messages = detailedThread?.messages ?? [];
 			const proposedPlans = detailedThread?.proposedPlans ?? [];
@@ -40172,7 +40915,7 @@ const make$3 = Effect.gen(function* () {
 				const assistantMessageId = MessageId.make(`assistant:${event.itemId ?? event.turnId ?? event.eventId}`);
 				yield* orchestrationEngine.dispatch({
 					type: "thread.turn.diff.complete",
-					commandId: providerCommandId(event, "thread-turn-diff-complete"),
+					commandId: providerCommandId(event, "thread-turn-diff-complete", String(turnId)),
 					threadId: thread.id,
 					turnId,
 					completedAt: now,
@@ -40188,7 +40931,7 @@ const make$3 = Effect.gen(function* () {
 		const activities = runtimeEventToActivities(event);
 		yield* Effect.forEach(activities, (activity) => orchestrationEngine.dispatch({
 			type: "thread.activity.append",
-			commandId: providerCommandId(event, "thread-activity-append"),
+			commandId: providerCommandId(event, "thread-activity-append", String(activity.id)),
 			threadId: thread.id,
 			activity,
 			createdAt: activity.createdAt
@@ -40252,6 +40995,7 @@ function mapProviderSessionStatusToOrchestrationStatus(status) {
 }
 const turnStartKeyForEvent = (event) => event.commandId !== null ? `command:${event.commandId}` : `event:${event.eventId}`;
 const serverCommandId$1 = (tag) => CommandId.make(`server:${tag}:${crypto.randomUUID()}`);
+const isProviderOriginatedCommandId = (commandId) => commandId !== null && String(commandId).startsWith("provider:");
 const HANDLED_TURN_START_KEY_MAX = 1e4;
 const HANDLED_TURN_START_KEY_TTL = Duration.minutes(30);
 const DEFAULT_RUNTIME_MODE = "full-access";
@@ -40603,6 +41347,17 @@ const make$2 = Effect.gen(function* () {
 		if (yield* hasHandledTurnStartRecently(turnStartKeyForEvent(event))) return;
 		const thread = yield* resolveThread(event.payload.threadId);
 		if (!thread) return;
+		if (thread.session?.status === "running" && thread.session.activeTurnId !== null) {
+			yield* appendProviderFailureActivity({
+				threadId: event.payload.threadId,
+				kind: "provider.turn.start.failed",
+				summary: "Provider turn start rejected",
+				detail: `Thread already has active turn '${thread.session.activeTurnId}'. Queuing overlapping turns is not supported; wait for the active turn to finish before starting another.`,
+				turnId: null,
+				createdAt: event.payload.createdAt
+			});
+			return;
+		}
 		const message = thread.messages.find((entry) => entry.id === event.payload.messageId);
 		if (!message || message.role !== "user") {
 			yield* appendProviderFailureActivity({
@@ -40673,6 +41428,7 @@ const make$2 = Effect.gen(function* () {
 		yield* providerService.sendTurn(sendTurnRequest.value).pipe(Effect.catchCause(recoverTurnStartFailure), Effect.forkScoped);
 	});
 	const processTurnInterruptRequested = Effect.fn("processTurnInterruptRequested")(function* (event) {
+		if (isProviderOriginatedCommandId(event.commandId)) return;
 		const thread = yield* resolveThread(event.payload.threadId);
 		if (!thread) return;
 		if (!(thread.session && thread.session.status !== "stopped")) return yield* appendProviderFailureActivity({
@@ -46969,6 +47725,10 @@ const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand")(funct
 				command,
 				threadId: command.threadId
 			});
+			if (targetThread.session?.status === "running" && targetThread.session.activeTurnId !== null) return yield* new OrchestrationCommandInvariantError({
+				commandType: command.type,
+				detail: `Thread '${command.threadId}' already has active turn '${targetThread.session.activeTurnId}' and cannot start another turn until it finishes.`
+			});
 			const sourceProposedPlan = command.sourceProposedPlan;
 			const sourceThread = sourceProposedPlan ? yield* requireThread({
 				readModel,
@@ -50926,7 +51686,7 @@ const OrchestrationProjectionSnapshotQueryLive = Layer.effect(ProjectionSnapshot
 //#region src/orchestration/runtimeLayer.ts
 const OrchestrationEventInfrastructureLayerLive = Layer.mergeAll(OrchestrationEventStoreLive, OrchestrationCommandReceiptRepositoryLive);
 const OrchestrationProjectionPipelineLayerLive = OrchestrationProjectionPipelineLive.pipe(Layer.provide(OrchestrationEventStoreLive));
-const OrchestrationInfrastructureLayerLive = Layer.mergeAll(OrchestrationProjectionSnapshotQueryLive, OrchestrationEventInfrastructureLayerLive, OrchestrationProjectionPipelineLayerLive);
+const OrchestrationInfrastructureLayerLive = Layer.mergeAll(OrchestrationProjectionSnapshotQueryLive, StatisticsQueryLive, OrchestrationEventInfrastructureLayerLive, OrchestrationProjectionPipelineLayerLive);
 const OrchestrationLayerLive = Layer.mergeAll(OrchestrationInfrastructureLayerLive, OrchestrationEngineLive.pipe(Layer.provide(OrchestrationInfrastructureLayerLive)));
 //#endregion
 //#region src/serverRuntimeState.ts
@@ -51702,4 +52462,4 @@ const CliRuntimeLayer = Layer$1.mergeAll(NodeServices.layer, NetService.layer);
 const program = Command.run(cli, { version }).pipe(Effect$1.scoped, Effect$1.provide(CliRuntimeLayer));
 NodeRuntime.runMain(program);
 //#endregion
-export { ServerRequest__CommandExecutionRequestApprovalParams as $, makeProviderMaintenanceCapabilities as $t, nonEmptyTrimmed as A, V2ThreadStatusChangedNotification as At, codexContinuationIdentity as B, GitLabCli as Bt, DEFAULT_TIMEOUT_MS as C, V2ThreadNameUpdatedNotification as Ct, collectStreamAsString as D, V2ThreadRealtimeOutputAudioDeltaNotification as Dt, buildServerProvider as E, V2ThreadRealtimeItemAddedNotification as Et, ProviderAdapterRequestError as F, V2TurnStartParams as Ft, layerChildProcess as G, withoutStatusCheckRollupJsonField as Gt, resolveCodexHomeLayout as H, GitHubCli as Ht, ProviderAdapterSessionClosedError as I, V2TurnStartParams__CollaborationMode as It, CodexAppServerRequestError as J, BitbucketApi as Jt, CodexAppServerProcessExitedError as K, decodeGitHubPullRequestListJson as Kt, ProviderAdapterSessionNotFoundError as L, V2TurnStartResponse as Lt, providerModelsFromSettings as M, V2TurnCompletedNotification as Mt, spawnAndCollect as N, V2TurnDiffUpdatedNotification as Nt, detailFromResult as O, V2ThreadRealtimeStartedNotification as Ot, ProviderAdapterProcessError as P, V2TurnPlanUpdatedNotification as Pt, ServerRequest__ApplyPatchApprovalParams as Q, makePackageManagedProviderMaintenanceResolver as Qt, ProviderAdapterValidationError as R, V2WindowsSandboxSetupCompletedNotification as Rt, makePendingCodexProvider as S, V2ServerRequestResolvedNotification as St, buildSelectOptionDescriptor as T, V2ThreadRealtimeErrorNotification as Tt, expandHomePath$3 as U, formatGitHubJsonFields as Ut, materializeCodexShadowHome as V, GITHUB_PULL_REQUEST_LIST_JSON_FIELDS as Vt, CodexAppServerClient as W, isStatusCheckRollupAccessError as Wt, CodexAppServerTransportError as X, enrichProviderSnapshotWithVersionAdvisory as Xt, CodexAppServerSpawnError as Y, AzureDevOpsCli as Yt, SERVER_NOTIFICATION_METHODS as Z, makeManualOnlyProviderMaintenanceCapabilities as Zt, buildTokenReductionInstructions as _, V2McpToolCallProgressNotification as _t, OpenCodeRuntime as a, resolveCommandPath as an, ToolRequestUserInputResponse as at, buildCodexInitializeParams as b, V2ReasoningSummaryTextDeltaNotification as bt, openCodeQuestionId as c, getModelSelectionBooleanOptionValue as cn, V2AgentMessageDeltaNotification as ct, runOpenCodeSdk as d, getProviderOptionCurrentValue as dn, V2DeprecationNoticeNotification as dt, makeStaticProviderMaintenanceResolver as en, ServerRequest__DynamicToolCallParams as et, toOpenCodeFileParts as f, getProviderOptionDescriptors as fn, V2ErrorNotification as ft, makeEventNdjsonLogger as g, V2McpServerOauthLoginCompletedNotification as gt, ProviderEventLoggers as h, resolvePromptInjectedEffort as hn, V2ItemStartedNotification as ht, PtySpawnError as i, resolveAttachmentPath as in, ToolRequestUserInputParams as it, parseGenericCliVersion as j, V2ThreadTokenUsageUpdatedNotification as jt, isCommandMissingCause as k, V2ThreadStartedNotification as kt, openCodeRuntimeErrorDetail as l, getModelSelectionStringOptionValue as ln, V2CommandExecutionOutputDeltaNotification as lt, toOpenCodeQuestionAnswers as m, normalizeModelSlug as mn, V2ItemCompletedNotification as mt, ignoreProviderBackgroundCause as n, resolveProviderMaintenanceCapabilitiesEffect as nn, ServerRequest__FileChangeRequestApprovalParams as nt, OpenCodeRuntimeError as o, applyClaudePromptEffortPrefix as on, V2AccountRateLimitsUpdatedNotification as ot, toOpenCodePermissionReply as p, getProviderOptionStringSelectionValue as pn, V2FileChangeOutputDeltaNotification as pt, CodexAppServerProtocolParseError as q, ForgejoApi as qt, PtyAdapter as r, compareCliVersions as rn, ServerRequest__ToolRequestUserInputParams as rt, buildOpenCodePermissionRules as s, createModelCapabilities as sn, V2AccountUpdatedNotification as st, makeServerQueueMetrics as t, normalizeCommandPath as tn, ServerRequest__ExecCommandApprovalParams as tt, parseOpenCodeModelSlug as u, getProviderOptionBooleanSelectionValue as un, V2ConfigWarningNotification as ut, checkRtkAvailability as v, V2ModelReroutedNotification as vt, buildBooleanOptionDescriptor as w, V2ThreadRealtimeClosedNotification as wt, checkCodexProviderStatus as x, V2ReasoningTextDeltaNotification as xt, mergeProviderInstanceEnvironment as y, V2PlanDeltaNotification as yt, ProviderDriverError as z, V2WindowsWorldWritableWarningNotification as zt };
+export { ServerRequest__CommandExecutionRequestApprovalParams as $, makeProviderMaintenanceCapabilities as $t, nonEmptyTrimmed as A, V2ThreadStatusChangedNotification as At, codexContinuationIdentity as B, GitLabCli as Bt, DEFAULT_TIMEOUT_MS as C, V2ThreadNameUpdatedNotification as Ct, collectStreamAsString as D, V2ThreadRealtimeOutputAudioDeltaNotification as Dt, buildServerProvider as E, V2ThreadRealtimeItemAddedNotification as Et, ProviderAdapterRequestError as F, V2TurnStartParams as Ft, layerChildProcess as G, withoutStatusCheckRollupJsonField as Gt, resolveCodexHomeLayout as H, GitHubCli as Ht, ProviderAdapterSessionClosedError as I, V2TurnStartParams__CollaborationMode as It, CodexAppServerRequestError as J, BitbucketApi as Jt, CodexAppServerProcessExitedError as K, decodeGitHubPullRequestListJson as Kt, ProviderAdapterSessionNotFoundError as L, V2TurnStartResponse as Lt, providerModelsFromSettings as M, V2TurnCompletedNotification as Mt, spawnAndCollect as N, V2TurnDiffUpdatedNotification as Nt, detailFromResult as O, V2ThreadRealtimeStartedNotification as Ot, ProviderAdapterProcessError as P, V2TurnPlanUpdatedNotification as Pt, ServerRequest__ApplyPatchApprovalParams as Q, makePackageManagedProviderMaintenanceResolver as Qt, ProviderAdapterValidationError as R, V2WindowsSandboxSetupCompletedNotification as Rt, makePendingCodexProvider as S, V2ServerRequestResolvedNotification as St, buildSelectOptionDescriptor as T, V2ThreadRealtimeErrorNotification as Tt, expandHomePath$3 as U, formatGitHubJsonFields as Ut, materializeCodexShadowHome as V, GITHUB_PULL_REQUEST_LIST_JSON_FIELDS as Vt, CodexAppServerClient as W, isStatusCheckRollupAccessError as Wt, CodexAppServerTransportError as X, enrichProviderSnapshotWithVersionAdvisory as Xt, CodexAppServerSpawnError as Y, AzureDevOpsCli as Yt, SERVER_NOTIFICATION_METHODS as Z, makeManualOnlyProviderMaintenanceCapabilities as Zt, buildTokenReductionInstructions as _, V2McpToolCallProgressNotification as _t, OpenCodeRuntime as a, resolveAttachmentPath as an, ToolRequestUserInputResponse as at, buildCodexInitializeParams as b, V2ReasoningSummaryTextDeltaNotification as bt, openCodeQuestionId as c, createModelCapabilities as cn, V2AgentMessageDeltaNotification as ct, runOpenCodeSdk as d, getProviderOptionBooleanSelectionValue as dn, V2DeprecationNoticeNotification as dt, makeStaticProviderMaintenanceResolver as en, ServerRequest__DynamicToolCallParams as et, toOpenCodeFileParts as f, getProviderOptionCurrentValue as fn, V2ErrorNotification as ft, makeEventNdjsonLogger as g, resolvePromptInjectedEffort as gn, V2McpServerOauthLoginCompletedNotification as gt, ProviderEventLoggers as h, normalizeModelSlug as hn, V2ItemStartedNotification as ht, PtySpawnError as i, ServerSettingsService as in, ToolRequestUserInputParams as it, parseGenericCliVersion as j, V2ThreadTokenUsageUpdatedNotification as jt, isCommandMissingCause as k, V2ThreadStartedNotification as kt, openCodeRuntimeErrorDetail as l, getModelSelectionBooleanOptionValue as ln, V2CommandExecutionOutputDeltaNotification as lt, toOpenCodeQuestionAnswers as m, getProviderOptionStringSelectionValue as mn, V2ItemCompletedNotification as mt, ignoreProviderBackgroundCause as n, resolveProviderMaintenanceCapabilitiesEffect as nn, ServerRequest__FileChangeRequestApprovalParams as nt, OpenCodeRuntimeError as o, resolveCommandPath as on, V2AccountRateLimitsUpdatedNotification as ot, toOpenCodePermissionReply as p, getProviderOptionDescriptors as pn, V2FileChangeOutputDeltaNotification as pt, CodexAppServerProtocolParseError as q, ForgejoApi as qt, PtyAdapter as r, compareCliVersions as rn, ServerRequest__ToolRequestUserInputParams as rt, buildOpenCodePermissionRules as s, applyClaudePromptEffortPrefix as sn, V2AccountUpdatedNotification as st, makeServerQueueMetrics as t, normalizeCommandPath as tn, ServerRequest__ExecCommandApprovalParams as tt, parseOpenCodeModelSlug as u, getModelSelectionStringOptionValue as un, V2ConfigWarningNotification as ut, checkRtkAvailability as v, V2ModelReroutedNotification as vt, buildBooleanOptionDescriptor as w, V2ThreadRealtimeClosedNotification as wt, checkCodexProviderStatus as x, V2ReasoningTextDeltaNotification as xt, mergeProviderInstanceEnvironment as y, V2PlanDeltaNotification as yt, ProviderDriverError as z, V2WindowsWorldWritableWarningNotification as zt };