@overdeck/desktop 0.49.2 → 0.50.1

package/server/{compaction-continuation-Bjfi70G-.js → compaction-continuation-TG0HYkOq.js}

@@ -1,5 +1,5 @@
-import { Ri as init_paths, Ui as sessionFilePath } from "./config-yaml-D9nfpEx1.js";
-import { G as init_runtime_state, Si as init_supervisor_channels, W as getAgentRuntimeStateSync, _ as init_agent_state, g as getAgentStateSync, xi as hasCompletionMarkerForAgent } from "./agent-state-BJhGIJZe.js";
+import { Wi as sessionFilePath, zi as init_paths } from "./config-yaml-OoH-ZpTb.js";
+import { G as init_runtime_state, Si as init_supervisor_channels, W as getAgentRuntimeStateSync, _ as init_agent_state, g as getAgentStateSync, xi as hasCompletionMarkerForAgent } from "./agent-state-BnyNoDWQ.js";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { existsSync, readdirSync } from "node:fs";
@@ -237,4 +237,4 @@ async function continueCompactedAgentAfterHook(args) {
 //#endregion
 export { continueCompactedAgentAfterHook, maybeContinueCompactedAgent };
 
-//# sourceMappingURL=compaction-continuation-Bjfi70G-.js.map
+//# sourceMappingURL=compaction-continuation-TG0HYkOq.js.map

package/server/{config-ZGjvuR6J.js → config-Cx3N6gWz.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Ri as init_paths, Zr as FsError, ci as init_errors, hi as CONFIG_FILE, p as loadConfigSync$1, t as init_config_yaml } from "./config-yaml-D9nfpEx1.js";
+import { Qr as FsError, gi as CONFIG_FILE, li as init_errors, p as loadConfigSync$1, t as init_config_yaml, zi as init_paths } from "./config-yaml-OoH-ZpTb.js";
 import { t as require_toml } from "./toml-CeLDATih.js";
 import { Effect } from "effect";
 import { existsSync, promises, readFileSync, writeFileSync } from "fs";
@@ -266,4 +266,4 @@ var init_config = __esmMin((() => {
 //#endregion
 export { saveConfig as _, getConversationsConfigSync as a, getDashboardLoopbackApiUrlSync as c, getDevrootPath as d, getDevrootPathSync as f, normalizeRemoteConfig as g, loadConfigSync as h, getConversationsConfig as i, getDefaultConfig as l, loadConfig as m, findDevrootForProject as n, getDashboardApiUrl as o, init_config as p, findDevrootForProjectSync as r, getDashboardApiUrlSync as s, checkDevrootDeprecation as t, getDefaultConfigSync as u, saveConfigSync as v };
 
-//# sourceMappingURL=config-ZGjvuR6J.js.map
+//# sourceMappingURL=config-Cx3N6gWz.js.map

package/server/{config-Doq_tF-f.js → config-DP0VV7rX.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Ri as init_paths, Xr as ConfigError, Zr as FsError, ci as init_errors, vi as OVERDECK_HOME } from "./config-yaml-D9nfpEx1.js";
+import { Qr as FsError, Zr as ConfigError, li as init_errors, yi as OVERDECK_HOME, zi as init_paths } from "./config-yaml-OoH-ZpTb.js";
 import { t as require_toml } from "./toml-CeLDATih.js";
 import { Effect } from "effect";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -290,4 +290,4 @@ var init_config = __esmMin((() => {
 //#endregion
 export { loadCloisterConfigSync as a, loadCloisterConfig as i, getHealthThresholdsMs as n, saveCloisterConfigSync as o, init_config as r, shouldAutoStart as s, DEFAULT_CLOISTER_CONFIG as t };
 
-//# sourceMappingURL=config-Doq_tF-f.js.map
+//# sourceMappingURL=config-DP0VV7rX.js.map

package/server/{config-CH1AqqIQ.js → config-DURnId0k.js}

@@ -1,3 +1,3 @@
-import { _ as saveConfig, a as getConversationsConfigSync, c as getDashboardLoopbackApiUrlSync, d as getDevrootPath, f as getDevrootPathSync, g as normalizeRemoteConfig, h as loadConfigSync, i as getConversationsConfig, l as getDefaultConfig, m as loadConfig, n as findDevrootForProject, o as getDashboardApiUrl, p as init_config, r as findDevrootForProjectSync, s as getDashboardApiUrlSync, t as checkDevrootDeprecation, u as getDefaultConfigSync, v as saveConfigSync } from "./config-ZGjvuR6J.js";
+import { _ as saveConfig, a as getConversationsConfigSync, c as getDashboardLoopbackApiUrlSync, d as getDevrootPath, f as getDevrootPathSync, g as normalizeRemoteConfig, h as loadConfigSync, i as getConversationsConfig, l as getDefaultConfig, m as loadConfig, n as findDevrootForProject, o as getDashboardApiUrl, p as init_config, r as findDevrootForProjectSync, s as getDashboardApiUrlSync, t as checkDevrootDeprecation, u as getDefaultConfigSync, v as saveConfigSync } from "./config-Cx3N6gWz.js";
 init_config();
 export { checkDevrootDeprecation, findDevrootForProject, findDevrootForProjectSync, getConversationsConfig, getConversationsConfigSync, getDashboardApiUrl, getDashboardApiUrlSync, getDashboardLoopbackApiUrlSync, getDefaultConfig, getDefaultConfigSync, getDevrootPath, getDevrootPathSync, loadConfig, loadConfigSync, normalizeRemoteConfig, saveConfig, saveConfigSync };

package/server/{config-yaml-D9nfpEx1.js → config-yaml-OoH-ZpTb.js}

@@ -414,7 +414,7 @@ var init_percent = __esmMin((() => {}));
 function apiLaunchModelIdSync(modelId) {
 	return GPT56_LONG_CONTEXT_VARIANTS[modelId] ?? modelId;
 }
-var CLIPROXY_CODEX_CONTEXT_WINDOW, CLIPROXY_GPT56_CONTEXT_WINDOW, CLIPROXY_GPT56_LONG_CONTEXT_WINDOW, GPT56_LONG_CONTEXT_VARIANTS;
+var CLIPROXY_CODEX_CONTEXT_WINDOW, CLIPROXY_GPT56_CONTEXT_WINDOW, CLIPROXY_GPT56_LONG_CONTEXT_WINDOW, GPT56_LONG_CONTEXT_VARIANTS, OPENROUTER_MODEL_CONTEXT_WINDOWS;
 var init_model_context_windows = __esmMin((() => {
 	CLIPROXY_CODEX_CONTEXT_WINDOW = 15e4;
 	CLIPROXY_GPT56_CONTEXT_WINDOW = 272e3;
@@ -424,6 +424,7 @@ var init_model_context_windows = __esmMin((() => {
 		"gpt-5.6-terra[372k]": "gpt-5.6-terra",
 		"gpt-5.6-luna[372k]": "gpt-5.6-luna"
 	};
+	OPENROUTER_MODEL_CONTEXT_WINDOWS = { "stealth/ox-alpha": 1048576 };
 }));
 //#endregion
 //#region ../../lib/model-capabilities.ts
@@ -840,6 +841,28 @@ var init_model_capabilities = __esmMin((() => {
 			},
 			notes: "Most advanced OpenAI model. Enhanced reasoning and agentic capabilities over GPT-5.4. Pro subscribers only."
 		},
+		"gpt-6-astra": {
+			model: "gpt-6-astra",
+			provider: "openai",
+			displayName: "GPT-6 Astra",
+			costPer1MTokens: 30,
+			contextWindow: CLIPROXY_GPT56_CONTEXT_WINDOW,
+			minTier: "plus",
+			skills: {
+				"code-generation": 99,
+				"code-review": 97,
+				debugging: 98,
+				planning: 98,
+				documentation: 95,
+				testing: 96,
+				security: 95,
+				performance: 95,
+				synthesis: 97,
+				speed: 55,
+				"context-length": 95
+			},
+			notes: "OpenAI flagship (September 2026), first GPT-6 generation. Codex catalog (`codex debug models`, 2026-09-07): context_window 272000, max_context_window 872000, default effort medium, efforts up to ultra, supported_in_api true. Pinned to the same 272K billing tier as the GPT-5.6 family (CLIPROXY_GPT56_CONTEXT_WINDOW) — >272K input is billed 2x in / 1.5x out for the full request (PAN-3388). No [372k] opt-in variant yet: the 372K pin was measured on gpt-5.6-sol and has not been re-measured for astra. 1.05M marketing context."
+		},
 		"gpt-5.6-sol": {
 			model: "gpt-5.6-sol",
 			provider: "openai",
@@ -2627,6 +2650,7 @@ function getProviderForModelSync(modelId) {
 		"claude-haiku-4-5"
 	].includes(modelId)) return PROVIDERS.anthropic;
 	if ([
+		"gpt-6-astra",
 		"gpt-5.6-sol",
 		"gpt-5.6-terra",
 		"gpt-5.6-luna",
@@ -2873,6 +2897,7 @@ var init_providers = __esmMin((() => {
 			compatibility: "direct",
 			defaultHarness: "codex",
 			models: [
+				"gpt-6-astra",
 				"gpt-5.6-sol",
 				"gpt-5.6-terra",
 				"gpt-5.6-luna",
@@ -2977,7 +3002,7 @@ var init_providers = __esmMin((() => {
 			displayName: "OpenRouter",
 			compatibility: "direct",
 			defaultHarness: "ohmypi",
-			baseUrl: "https://openrouter.ai/api/v1",
+			baseUrl: "https://openrouter.ai/api",
 			authType: "static",
 			models: [],
 			tested: true,
@@ -12923,7 +12948,7 @@ var init_defaults = __esmMin((() => {
 			}
 		},
 		conversationSearch: {
-			enabled: false,
+			enabled: true,
 			provider: "openai",
 			model: "text-embedding-3-small",
 			apiKeyRef: void 0,
@@ -13006,7 +13031,9 @@ var init_defaults = __esmMin((() => {
 			governorFootprintDefaultTestGb: 1,
 			governorSwapSoftFreePercent: 25,
 			governorSwapRecoveryFreePercent: 50,
-			governorPsiFullShedAvg10: 1
+			governorPsiFullShedAvg10: 1,
+			governorPsiCalmReadmitAvg10: .05,
+			governorPsiCalmWindowMs: 6e5
 		},
 		issues: { closedWindowDays: 14 },
 		telemetry: { enabled: true },
@@ -13263,6 +13290,12 @@ function degradeInvalidTieredExecution(result, err) {
 		enabled: false
 	};
 }
+function warnInvalidClaudePermissionMode(raw, effective) {
+	const shown = typeof raw === "string" ? raw : JSON.stringify(raw);
+	if (warnedInvalidClaudePermissionModes.has(String(shown))) return;
+	warnedInvalidClaudePermissionModes.add(String(shown));
+	console.error(`[config] claude.permissionMode "${shown}" is not a valid value — valid values are 'auto' (Claude Code runs with --permission-mode default; needs the auto-approve hooks) and 'bypass' (--permission-mode bypassPermissions; no prompts). Ignoring it and using "${effective}".`);
+}
 function mergeConfigs(...configs) {
 	const result = {
 		...DEFAULT_CONFIG,
@@ -13340,7 +13373,9 @@ function mergeConfigs(...configs) {
 			governorFootprintDefaultTestGb: DEFAULT_CONFIG.resources.governorFootprintDefaultTestGb,
 			governorSwapSoftFreePercent: DEFAULT_CONFIG.resources.governorSwapSoftFreePercent,
 			governorSwapRecoveryFreePercent: DEFAULT_CONFIG.resources.governorSwapRecoveryFreePercent,
-			governorPsiFullShedAvg10: DEFAULT_CONFIG.resources.governorPsiFullShedAvg10
+			governorPsiFullShedAvg10: DEFAULT_CONFIG.resources.governorPsiFullShedAvg10,
+			governorPsiCalmReadmitAvg10: DEFAULT_CONFIG.resources.governorPsiCalmReadmitAvg10,
+			governorPsiCalmWindowMs: DEFAULT_CONFIG.resources.governorPsiCalmWindowMs
 		},
 		issues: { closedWindowDays: DEFAULT_CONFIG.issues.closedWindowDays },
 		telemetry: { enabled: DEFAULT_CONFIG.telemetry.enabled },
@@ -13590,6 +13625,8 @@ function mergeConfigs(...configs) {
 			if (typeof config.resources.governor_swap_soft_free_percent === "number") result.resources.governorSwapSoftFreePercent = config.resources.governor_swap_soft_free_percent;
 			if (typeof config.resources.governor_swap_recovery_free_percent === "number") result.resources.governorSwapRecoveryFreePercent = config.resources.governor_swap_recovery_free_percent;
 			if (typeof config.resources.governor_psi_full_shed_avg10 === "number") result.resources.governorPsiFullShedAvg10 = config.resources.governor_psi_full_shed_avg10;
+			if (typeof config.resources.governor_psi_calm_readmit_avg10 === "number" && Number.isFinite(config.resources.governor_psi_calm_readmit_avg10) && config.resources.governor_psi_calm_readmit_avg10 >= 0) result.resources.governorPsiCalmReadmitAvg10 = config.resources.governor_psi_calm_readmit_avg10;
+			if (typeof config.resources.governor_psi_calm_window_ms === "number" && Number.isFinite(config.resources.governor_psi_calm_window_ms) && config.resources.governor_psi_calm_window_ms > 0) result.resources.governorPsiCalmWindowMs = config.resources.governor_psi_calm_window_ms;
 			if (result.resources.governorRecoveryReserveGb <= result.resources.governorSoftReserveGb) result.resources.governorRecoveryReserveGb = result.resources.governorSoftReserveGb + 1;
 			if (result.resources.governorWatchReserveGb <= result.resources.governorSoftReserveGb) result.resources.governorWatchReserveGb = result.resources.governorSoftReserveGb + 1;
 			if (result.resources.governorSwapRecoveryFreePercent <= result.resources.governorSwapSoftFreePercent) result.resources.governorSwapRecoveryFreePercent = Math.min(result.resources.governorSwapSoftFreePercent + 10, 100);
@@ -13616,7 +13653,8 @@ function mergeConfigs(...configs) {
 			if (typeof config.experimental.streamdownRenderer === "boolean") result.experimental.streamdownRenderer = config.experimental.streamdownRenderer;
 			if (typeof config.experimental.showHarnessModelPermutations === "boolean") result.experimental.showHarnessModelPermutations = config.experimental.showHarnessModelPermutations;
 		}
-		if (config.claude && (config.claude.permissionMode === "auto" || config.claude.permissionMode === "bypass")) result.claude.permissionMode = config.claude.permissionMode;
+		if (config.claude?.permissionMode !== void 0) if (config.claude.permissionMode === "auto" || config.claude.permissionMode === "bypass") result.claude.permissionMode = config.claude.permissionMode;
+		else warnInvalidClaudePermissionMode(config.claude.permissionMode, result.claude.permissionMode);
 		if (config.codex && (config.codex.permissionMode === "read-only" || config.codex.permissionMode === "workspace" || config.codex.permissionMode === "auto-review" || config.codex.permissionMode === "full-access")) result.codex.permissionMode = config.codex.permissionMode;
 		if (config.codex && (config.codex.transport === "app-server" || config.codex.transport === "tui")) result.codex.transport = config.codex.transport;
 		if (config.acp?.permissionMode === "auto") result.acp.permissionMode = config.acp.permissionMode;
@@ -13646,7 +13684,7 @@ function mergeConfigs(...configs) {
 		explicitlyDisabled
 	};
 }
-var lastTieredInvalidReasonWarned;
+var lastTieredInvalidReasonWarned, warnedInvalidClaudePermissionModes;
 var init_merge = __esmMin((() => {
 	init_model_capabilities();
 	init_registry();
@@ -13655,6 +13693,7 @@ var init_merge = __esmMin((() => {
 	init_roles();
 	init_domain_mergers();
 	init_schema();
+	warnedInvalidClaudePermissionModes = /* @__PURE__ */ new Set();
 }));
 //#endregion
 //#region ../../../node_modules/.bun/js-yaml@4.1.1/node_modules/js-yaml/dist/js-yaml.mjs
@@ -16135,6 +16174,6 @@ var init_config_yaml = __esmMin((() => {
 	init_load();
 }));
 //#endregion
-export { readIssueRecord as $, updateProjectsConfigText as $n, GitHubApiError as $r, findProjectByPathSync as $t, validateTieredExecutionConfig as A, getCanonicalOverdeckHome as Ai, resolveProjectKeyForCwdAsync as An, MODEL_DEPRECATIONS as Ar, STATE_PLANE_PATHS as At, clearIssueOwner as B, isDevMode as Bi, unregisterProject as Bn, apiLaunchModelIdSync as Br, init_state_migration_lock as Bt, DEFAULT_TIERED_EXECUTION_CONFIG as C, PROJECT_PRDS_SUBDIR as Ci, registerProjectSync as Cn, DEFAULT_ROLES as Cr, flushAllPendingAutoCommits as Ct, resolveTieredExecutionBlock as D, activeDeploymentRepoRoot as Di, resolveProjectFromIssue as Dn, init_roles as Dr, queueAutoCommit as Dt, init_tier_table as E, TRAEFIK_DIR as Ei, resolveInfraRepo as En, derefWorkhorse as Er, pushPendingStateCommits as Et, appendSessionEntry as F, getHandoffsDir as Fi, setProjectAutoMergeDefaultSync as Fn, modelSupportsImagesSync as Fr, isOverdeckWorkspaceRuntimePath as Ft, getIssueRecordPath as G, extractNumberSync as Gn, COMPLIANCE_MODES as Gr, shouldCommitLegacyWorkspaceArtifacts as Gt, ensureIssueRecord as H, resolveOhmypiExtensionPath as Hi, validateVersionSyncConfig as Hn, fmix32 as Hr, init_state_read_home as Ht, appendSessionEntrySync as I, getLegacyHome as Ii, setProjectMergeTrain as In, resolveModelIdSync as Ir, isStatePlaneOnlyStatus as It, getProjectConfigFromWorkspacePath as J, normalizeIssueIdSync as Jn, CheckpointError as Jr, PROJECTS_CONFIG_FILE as Jt, getIssueRecordPathForWorkspace as K, extractPrefixSync as Kn, PARENT_MODEL_REF as Kr, init_project_key as Kt, batchReadIssueRecords as L, getOverdeckHome as Li, setProjectMergeTrainSync as Ln, CLIPROXY_GPT56_CONTEXT_WINDOW as Lr, isStatePlanePath as Lt, RECORD_SCHEMA_VERSION as M, getDocsDisableStatePath as Mi, saveProjectsConfig as Mn, getModelEffortLevelsSync as Mr, init_state_plane as Mt, appendFeedbackEntry as N, getDocsIndexPath as Ni, saveProjectsConfigSync as Nn, hasModelCapabilitySync as Nr, isGeneratedGitHookPath as Nt, resolveTieredExecutionEnabled as O, claudeSessionTranscriptExists as Oi, resolveProjectFromIssueSync as On, resolveModel as Or, reconcileStatePlaneDrift as Ot, appendFeedbackEntrySync as P, getDocsTelemetryPath as Pi, setProjectAutoMergeDefault as Pn, init_model_capabilities as Pr, isOverdeckOwnedOnlyStatus as Pt, queueIssueRecordCommit as Q, init_projects_config_write as Qn, GitError as Qr, findProjectByPath as Qt, buildOwnUri as R, init_paths as Ri, setProjectSwarmPolicy as Rn, CLIPROXY_GPT56_LONG_CONTEXT_WINDOW as Rr, parsePorcelainStatusPaths as Rt, init_defaults as S, PROJECT_PRDS_PLANNED_SUBDIR as Si, registerProject as Sn, init_registry as Sr, deriveProjectRoot as St, TieredExecutionConfigError as T, SYNC_SOURCES as Ti, renameProjectSync as Tn, computeModelOrigin as Tr, init_auto_commit as Tt, ensureIssueRecordSync as U, sessionFilePath as Ui, init_projects_cache_events as Un, fnv1a32 as Ur, resolveStateReadHomeAsync as Ut, clearRecordFeedbackSync as V, packageRoot as Vi, unregisterProjectSync as Vn, init_model_context_windows as Vr, STATE_BRANCH as Vt, getIssueRecordBasePath as W, subscribeProjectsConfigInvalidation as Wn, init_percent as Wr, resolveStateReadHomeSync as Wt, markRecordPipelineClosedOutSync as X, resolveBareNumericIdSync as Xn, ConfigError as Xr, createDefaultProjectsConfig as Xt, init_record as Y, parseIssueIdSync as Yn, ClaudeCredentialParseError as Yr, ProjectRenameError as Yt, markRecordPipelineResidueClosedOutSync as Z, resolveIssueIdSync as Zn, FsError as Zr, extractTeamPrefix as Zt, mergeConfigs as _, LOGS_DIR as _i, listProjectsAsync as _n, setupCredentialFileAuthSync as _r, writeRecordTieredExecutionOverride as _t, getConversationsConfigSync as a, TmuxError as ai, getProjectSwarmHotspots as an, KIMI_PLATFORM_BASE_URL as ar, writeAgentHarnessModelSync as at, mergeTtsDaemonConfigs as b, PROJECT_PRDS_ACTIVE_SUBDIR as bi, loadProjectsConfigSync as bn, init_openai_compatible_proxy as br, writeStatusOverrideSync as bt, init_load as c, init_errors as ci, getSpecialistPromptOverride as cn, clearCredentialFileAuthSync as cr, writeIssueRecordForWorkspaceSync as ct, isTldrEnabledSync as d, BIN_DIR as di, hasProjectsSync as dn, getProviderEnvSync as dr, writeRecordDecisionsSync as dt, InvalidAgentIdError as ei, findProjectByTeam as en, require_dist as er, readIssueRecordForWorkspaceSync as et, loadConfigNoMigration as f, CACHE_AGENTS_DIR as fi, init_projects as fn, getProviderForModelSync as fr, writeRecordHazards as ft, jsYaml as g, COSTS_DIR as gi, listProjects as gn, resolveKimiCodeModelAlias as gr, writeRecordScopeDriftSync as gt, init_js_yaml as h, CONFIG_FILE as hi, invalidateProjectsConfigCache as hn, qualifyPiModel as hr, writeRecordResumePointSync as ht, getConversationsConfig as i, ProcessSpawnError as ii, getProject as in, KIMI_CODING_BASE_URL as ir, writeAgentHarnessModel as it, RECORD_DIRNAME as j, getDocsBudgetStatePath as ji, resolveProjectPath as jn, getModelCapabilitySync as jr, getMainDivergence as jt, resolveTieredExecutionEnabledForIssue as k, encodeClaudeProjectDir as ki, resolveProjectKeyForCwd as kn, MODEL_CAPABILITIES as kr, STATE_BRANCH_PATHS as kt, isClaudeCodeChannelsEnabled as l, AGENTS_DIR as li, getSpecialistRetention as ln, getBuiltInDefaultHarness as lr, writeIssueRecordSync as lt, updateConversationsConfig as m, CLAUDE_DIR as mi, initializeProjectsConfigSync as mn, piProviderForModel as mr, writeRecordResumePoint as mt, clearConfigCache as n, MergeConflictError as ni, findProjectsByRallyProject as nn, canUseModelWithAuthSync as nr, readRecordContinueViewSync as nt, getGlobalConfigPath as o, TrackerError as oi, getProjectSync as on, PROVIDERS as or, writeCloseOutDodGate as ot, loadConfigSync as p, CACHE_RULES_DIR as pi, initializeProjectsConfig as pn, init_providers as pr, writeRecordHazardsSync as pt, getIssueWorkspacePath as q, init_issue_id as qn, ROLE_EFFORTS as qr, projectKey as qt, getConversationSearchConfigSync as r, MessageDeliveryFailed as ri, getIssuePrefix as rn, init_harness_policy as rr, resolveProjectForIssue as rt, getOpenInEditorCommand as s, VcsError as si, getSpecialistConfig as sn, UnknownModelError as sr, writeCloseOutDodGateSync as st, init_config_yaml as t, LinearApiError as ti, findProjectByTeamSync as tn, canUseHarnessSync as tr, readIssueRecordSync as tt, isClaudeCodeChannelsMcpEnabled as u, ARCHIVES_DIR as ui, hasProjects as un, getKimiAnthropicBaseUrl as ur, writeRecordDecisions as ut, getDefaultDocsConfig as v, OVERDECK_HOME as vi, listProjectsSync as vn, ensureOpenAICompatibleProxyRunning as vr, writeRecordTieredExecutionOverrideSync as vt, TIERED_EXECUTION_DIFFICULTIES as w, SKILLS_DIR as wi, renameProject as wn, DEFAULT_WORKHORSES as wr, flushAutoCommits as wt, DEFAULT_CONFIG as x, PROJECT_PRDS_COMPLETED_SUBDIR as xi, projects_exports as xn, defaultBackgroundAiFeatures as xr, writeStatusOverridesSync as xt, getDefaultTtsDaemonConfig as y, PROJECT_DOCS_SUBDIR as yi, loadProjectsConfig as yn, getDashScopeUpstreamBaseUrl as yr, writeStatusOverride as yt, claimIssueOwner as z, isDeploymentGenerationRoot as zi, setProjectSwarmPolicySync as zn, GPT56_LONG_CONTEXT_VARIANTS as zr, acquireStateMigrationLock as zt };
+export { readIssueRecord as $, updateProjectsConfigText as $n, GitError as $r, findProjectByPathSync as $t, validateTieredExecutionConfig as A, encodeClaudeProjectDir as Ai, resolveProjectKeyForCwdAsync as An, MODEL_DEPRECATIONS as Ar, STATE_PLANE_PATHS as At, clearIssueOwner as B, isDeploymentGenerationRoot as Bi, unregisterProject as Bn, OPENROUTER_MODEL_CONTEXT_WINDOWS as Br, init_state_migration_lock as Bt, DEFAULT_TIERED_EXECUTION_CONFIG as C, PROJECT_PRDS_PLANNED_SUBDIR as Ci, registerProjectSync as Cn, DEFAULT_ROLES as Cr, flushAllPendingAutoCommits as Ct, resolveTieredExecutionBlock as D, TRAEFIK_DIR as Di, resolveProjectFromIssue as Dn, init_roles as Dr, queueAutoCommit as Dt, init_tier_table as E, SYNC_SOURCES as Ei, resolveInfraRepo as En, derefWorkhorse as Er, pushPendingStateCommits as Et, appendSessionEntry as F, getDocsTelemetryPath as Fi, setProjectAutoMergeDefaultSync as Fn, modelSupportsImagesSync as Fr, isOverdeckWorkspaceRuntimePath as Ft, getIssueRecordPath as G, extractNumberSync as Gn, init_percent as Gr, shouldCommitLegacyWorkspaceArtifacts as Gt, ensureIssueRecord as H, packageRoot as Hi, validateVersionSyncConfig as Hn, init_model_context_windows as Hr, init_state_read_home as Ht, appendSessionEntrySync as I, getHandoffsDir as Ii, setProjectMergeTrain as In, resolveModelIdSync as Ir, isStatePlaneOnlyStatus as It, getProjectConfigFromWorkspacePath as J, normalizeIssueIdSync as Jn, ROLE_EFFORTS as Jr, PROJECTS_CONFIG_FILE as Jt, getIssueRecordPathForWorkspace as K, extractPrefixSync as Kn, COMPLIANCE_MODES as Kr, init_project_key as Kt, batchReadIssueRecords as L, getLegacyHome as Li, setProjectMergeTrainSync as Ln, CLIPROXY_GPT56_CONTEXT_WINDOW as Lr, isStatePlanePath as Lt, RECORD_SCHEMA_VERSION as M, getDocsBudgetStatePath as Mi, saveProjectsConfig as Mn, getModelEffortLevelsSync as Mr, init_state_plane as Mt, appendFeedbackEntry as N, getDocsDisableStatePath as Ni, saveProjectsConfigSync as Nn, hasModelCapabilitySync as Nr, isGeneratedGitHookPath as Nt, resolveTieredExecutionEnabled as O, activeDeploymentRepoRoot as Oi, resolveProjectFromIssueSync as On, resolveModel as Or, reconcileStatePlaneDrift as Ot, appendFeedbackEntrySync as P, getDocsIndexPath as Pi, setProjectAutoMergeDefault as Pn, init_model_capabilities as Pr, isOverdeckOwnedOnlyStatus as Pt, queueIssueRecordCommit as Q, init_projects_config_write as Qn, FsError as Qr, findProjectByPath as Qt, buildOwnUri as R, getOverdeckHome as Ri, setProjectSwarmPolicy as Rn, CLIPROXY_GPT56_LONG_CONTEXT_WINDOW as Rr, parsePorcelainStatusPaths as Rt, init_defaults as S, PROJECT_PRDS_COMPLETED_SUBDIR as Si, registerProject as Sn, init_registry as Sr, deriveProjectRoot as St, TieredExecutionConfigError as T, SKILLS_DIR as Ti, renameProjectSync as Tn, computeModelOrigin as Tr, init_auto_commit as Tt, ensureIssueRecordSync as U, resolveOhmypiExtensionPath as Ui, init_projects_cache_events as Un, fmix32 as Ur, resolveStateReadHomeAsync as Ut, clearRecordFeedbackSync as V, isDevMode as Vi, unregisterProjectSync as Vn, apiLaunchModelIdSync as Vr, STATE_BRANCH as Vt, getIssueRecordBasePath as W, sessionFilePath as Wi, subscribeProjectsConfigInvalidation as Wn, fnv1a32 as Wr, resolveStateReadHomeSync as Wt, markRecordPipelineClosedOutSync as X, resolveBareNumericIdSync as Xn, ClaudeCredentialParseError as Xr, createDefaultProjectsConfig as Xt, init_record as Y, parseIssueIdSync as Yn, CheckpointError as Yr, ProjectRenameError as Yt, markRecordPipelineResidueClosedOutSync as Z, resolveIssueIdSync as Zn, ConfigError as Zr, extractTeamPrefix as Zt, mergeConfigs as _, COSTS_DIR as _i, listProjectsAsync as _n, setupCredentialFileAuthSync as _r, writeRecordTieredExecutionOverride as _t, getConversationsConfigSync as a, ProcessSpawnError as ai, getProjectSwarmHotspots as an, KIMI_PLATFORM_BASE_URL as ar, writeAgentHarnessModelSync as at, mergeTtsDaemonConfigs as b, PROJECT_DOCS_SUBDIR as bi, loadProjectsConfigSync as bn, init_openai_compatible_proxy as br, writeStatusOverrideSync as bt, init_load as c, VcsError as ci, getSpecialistPromptOverride as cn, clearCredentialFileAuthSync as cr, writeIssueRecordForWorkspaceSync as ct, isTldrEnabledSync as d, ARCHIVES_DIR as di, hasProjectsSync as dn, getProviderEnvSync as dr, writeRecordDecisionsSync as dt, GitHubApiError as ei, findProjectByTeam as en, require_dist as er, readIssueRecordForWorkspaceSync as et, loadConfigNoMigration as f, BIN_DIR as fi, init_projects as fn, getProviderForModelSync as fr, writeRecordHazards as ft, jsYaml as g, CONFIG_FILE as gi, listProjects as gn, resolveKimiCodeModelAlias as gr, writeRecordScopeDriftSync as gt, init_js_yaml as h, CLAUDE_DIR as hi, invalidateProjectsConfigCache as hn, qualifyPiModel as hr, writeRecordResumePointSync as ht, getConversationsConfig as i, MessageDeliveryFailed as ii, getProject as in, KIMI_CODING_BASE_URL as ir, writeAgentHarnessModel as it, RECORD_DIRNAME as j, getCanonicalOverdeckHome as ji, resolveProjectPath as jn, getModelCapabilitySync as jr, getMainDivergence as jt, resolveTieredExecutionEnabledForIssue as k, claudeSessionTranscriptExists as ki, resolveProjectKeyForCwd as kn, MODEL_CAPABILITIES as kr, STATE_BRANCH_PATHS as kt, isClaudeCodeChannelsEnabled as l, init_errors as li, getSpecialistRetention as ln, getBuiltInDefaultHarness as lr, writeIssueRecordSync as lt, updateConversationsConfig as m, CACHE_RULES_DIR as mi, initializeProjectsConfigSync as mn, piProviderForModel as mr, writeRecordResumePoint as mt, clearConfigCache as n, LinearApiError as ni, findProjectsByRallyProject as nn, canUseModelWithAuthSync as nr, readRecordContinueViewSync as nt, getGlobalConfigPath as o, TmuxError as oi, getProjectSync as on, PROVIDERS as or, writeCloseOutDodGate as ot, loadConfigSync as p, CACHE_AGENTS_DIR as pi, initializeProjectsConfig as pn, init_providers as pr, writeRecordHazardsSync as pt, getIssueWorkspacePath as q, init_issue_id as qn, PARENT_MODEL_REF as qr, projectKey as qt, getConversationSearchConfigSync as r, MergeConflictError as ri, getIssuePrefix as rn, init_harness_policy as rr, resolveProjectForIssue as rt, getOpenInEditorCommand as s, TrackerError as si, getSpecialistConfig as sn, UnknownModelError as sr, writeCloseOutDodGateSync as st, init_config_yaml as t, InvalidAgentIdError as ti, findProjectByTeamSync as tn, canUseHarnessSync as tr, readIssueRecordSync as tt, isClaudeCodeChannelsMcpEnabled as u, AGENTS_DIR as ui, hasProjects as un, getKimiAnthropicBaseUrl as ur, writeRecordDecisions as ut, getDefaultDocsConfig as v, LOGS_DIR as vi, listProjectsSync as vn, ensureOpenAICompatibleProxyRunning as vr, writeRecordTieredExecutionOverrideSync as vt, TIERED_EXECUTION_DIFFICULTIES as w, PROJECT_PRDS_SUBDIR as wi, renameProject as wn, DEFAULT_WORKHORSES as wr, flushAutoCommits as wt, DEFAULT_CONFIG as x, PROJECT_PRDS_ACTIVE_SUBDIR as xi, projects_exports as xn, defaultBackgroundAiFeatures as xr, writeStatusOverridesSync as xt, getDefaultTtsDaemonConfig as y, OVERDECK_HOME as yi, loadProjectsConfig as yn, getDashScopeUpstreamBaseUrl as yr, writeStatusOverride as yt, claimIssueOwner as z, init_paths as zi, setProjectSwarmPolicySync as zn, GPT56_LONG_CONTEXT_VARIANTS as zr, acquireStateMigrationLock as zt };
 
-//# sourceMappingURL=config-yaml-D9nfpEx1.js.map
+//# sourceMappingURL=config-yaml-OoH-ZpTb.js.map

package/server/{conflict-gate-DcUTY4Gb.js → conflict-gate-SgOELW84.js}

@@ -1,6 +1,6 @@
-import { l as init_activity_logger, o as emitActivityEntrySync } from "./activity-logger-BWZhVphb.js";
-import { Ht as init_messaging, Ut as messageAgent, an as init_spawn, sn as spawnRun } from "./agent-state-BJhGIJZe.js";
-import { d as getReviewStatusSync, p as init_review_status, w as setReviewStatusSync } from "./review-status-yOGD2MuK.js";
+import { l as init_activity_logger, o as emitActivityEntrySync } from "./activity-logger-ru8ggv-d.js";
+import { Ht as init_messaging, Ut as messageAgent, an as init_spawn, sn as spawnRun } from "./agent-state-BnyNoDWQ.js";
+import { d as getReviewStatusSync, p as init_review_status, w as setReviewStatusSync } from "./review-status-C3PJkfjv.js";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 //#region ../../lib/cloister/conflict-gate.ts
@@ -229,7 +229,7 @@ function buildConflictResolverPrompt(input) {
 		"",
 		"Resolve the conflict WITHOUT degrading either side of the change:",
 		`1. Read what origin/${input.targetBranch} changed and what ${input.issueId} intended before editing.`,
-		`2. Rebase this branch onto origin/${input.targetBranch} and resolve every conflict so BOTH intents are preserved.`,
+		`2. Run pan sync-main ${input.issueId} to merge origin/${input.targetBranch} through the repository-approved sync path, then resolve every conflict so BOTH intents are preserved.`,
 		"3. Build, run the relevant tests, and commit the resolved state.",
 		"4. Re-request review when the branch is clean (use pan done or pan review request as appropriate for this workspace).",
 		"",
@@ -270,4 +270,4 @@ function shellQuote(value) {
 //#endregion
 export { probeBranchConflictPaths as a, parseMergeTreeNameOnly as i, checkBranchMergeability as n, resolveConflictGate as o, getCachedConflictGateMergeability as r, buildRealConflictGateDeps as t };
 
-//# sourceMappingURL=conflict-gate-DcUTY4Gb.js.map
+//# sourceMappingURL=conflict-gate-SgOELW84.js.map

package/server/{conflict-gate-D4XCtrm2.js → conflict-gate-pMfhBEVB.js}

@@ -1,2 +1,2 @@
-import { o as resolveConflictGate, t as buildRealConflictGateDeps } from "./conflict-gate-DcUTY4Gb.js";
+import { o as resolveConflictGate, t as buildRealConflictGateDeps } from "./conflict-gate-SgOELW84.js";
 export { buildRealConflictGateDeps, resolveConflictGate };

package/server/{context-layers-BGj2Y9l3.js → context-layers-D0QBOPJJ.js}

@@ -1,4 +1,4 @@
-import { A as piGlobalContextFile, C as codexGlobalContextFile } from "./assemble-CyvEBmmq.js";
-import { t as init_context_layers } from "./context-layers-BBTKP-Y4.js";
+import { A as piGlobalContextFile, C as codexGlobalContextFile } from "./assemble-D88iFkP-.js";
+import { t as init_context_layers } from "./context-layers-LY5zt0da.js";
 init_context_layers();
 export { codexGlobalContextFile, piGlobalContextFile };

package/server/{context-layers-BBTKP-Y4.js → context-layers-LY5zt0da.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Ri as init_paths, ci as init_errors } from "./config-yaml-D9nfpEx1.js";
-import { D as init_layers, l as init_render, p as init_rules, r as init_assemble } from "./assemble-CyvEBmmq.js";
+import { li as init_errors, zi as init_paths } from "./config-yaml-OoH-ZpTb.js";
+import { D as init_layers, l as init_render, p as init_rules, r as init_assemble } from "./assemble-D88iFkP-.js";
 import "effect";
 import "fs";
 import "path";
@@ -34,4 +34,4 @@ var init_context_layers = __esmMin((() => {
 //#endregion
 export { init_context_layers as t };
 
-//# sourceMappingURL=context-layers-BBTKP-Y4.js.map
+//# sourceMappingURL=context-layers-LY5zt0da.js.map

package/server/{continue-i7Revg8D.js → continue-Cmzd6leL.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Zr as FsError, ci as init_errors } from "./config-yaml-D9nfpEx1.js";
+import { Qr as FsError, li as init_errors } from "./config-yaml-OoH-ZpTb.js";
 import { c as PAN_SESSIONS_FILENAME, f as WORKSPACE_RUNTIME_DIRNAME, i as PAN_CONTINUE_FILENAME, m as init_types, n as PAN_CONTEXT_FILENAME, s as PAN_FEEDBACK_DIRNAME, t as LEGACY_WORKSPACE_RUNTIME_DIRNAME, u as PAN_SPEC_FILENAME } from "./types-pLpbsNto.js";
 import { Effect, FileSystem } from "effect";
 import { join } from "path";
@@ -60,4 +60,4 @@ var init_continue = __esmMin((() => {
 //#endregion
 export { init_continue as a, getWorkspacePanPaths as i, getLegacyWorkspacePanPaths as n, getReadableWorkspacePanPaths as r, ensureWorkspacePanDir as t };
 
-//# sourceMappingURL=continue-i7Revg8D.js.map
+//# sourceMappingURL=continue-Cmzd6leL.js.map

package/server/{control-settings-BMoDHY1G.js → control-settings-Bdud_B1j.js}

@@ -1,9 +1,312 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { bn as loadProjectsConfigSync, fn as init_projects, on as getProjectSync } from "./config-yaml-D9nfpEx1.js";
-import { _ as integer, a as EventBus, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, v as init_drizzle_orm, x as eq } from "./infra-CHIvOb9q.js";
-import { n as init_issues, t as IssueId } from "./issues-e_Ck1Ln2.js";
+import { bn as loadProjectsConfigSync, fn as init_projects, li as init_errors, on as getProjectSync } from "./config-yaml-OoH-ZpTb.js";
+import { _ as integer, a as EventBus, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, v as init_drizzle_orm, x as eq } from "./infra-BbSWNOpH.js";
+import { n as init_issues, t as IssueId } from "./issues-DYAEUW45.js";
+import { o as getPricingSync, s as init_cost } from "./cost-CxXv7ei-.js";
 import { Context, Effect, Layer, Schema } from "effect";
+import { existsSync, readFileSync } from "fs";
 import { HttpApiEndpoint, HttpApiGroup } from "effect/unstable/httpapi";
+//#region ../../lib/cost-parsers/ohmypi-parser.ts
+/**
+* oh-my-pi (omp) JSONL parser (PAN-1989). Forked from pi-parser.ts (PAN-636).
+*
+* omp sessions live at:
+*   ~/.omp/agent/sessions/<encoded-cwd>/<timestamp>_<session-id>.jsonl
+*
+* Format (omp v3 — same as Pi v3):
+*   - First line:  { type: "session", version: 3, id, timestamp, cwd }
+*   - Subsequent:  every entry has an opaque `id` and a `parentId`. parentId
+*                  is null for the first non-session entry.
+*   - The graph is a tree (omp supports forking/branching), not a list.
+*
+* To compute usage for the *active* branch we walk leaf -> root via parentId
+* from the latest leaf (max timestamp among entries that have no children).
+* omp assistant messages report per-call usage — input/output tokens are NOT
+* cumulative across the conversation — so summing along the active branch is
+* correct without subtracting pre-compaction input.
+*
+* SessionUsage shape comes from jsonl-parser.ts (the Claude Code parser); we
+* map into it unchanged so all upstream consumers keep working.
+*/
+function isMessage(entry) {
+	return entry.type === "message";
+}
+function isAssistantMessage(entry) {
+	return isMessage(entry) && entry.message?.role === "assistant";
+}
+function pricingProviderFor(provider, model) {
+	const lowerProvider = provider?.toLowerCase() ?? "";
+	const lowerModel = model.toLowerCase();
+	if (lowerProvider === "openai" || lowerProvider === "openai-codex" || lowerModel.includes("gpt")) return "openai";
+	if (lowerProvider === "google" || lowerModel.includes("gemini")) return "google";
+	if (lowerProvider === "anthropic" || lowerModel.includes("claude")) return "anthropic";
+	if (lowerProvider === "kimi" || lowerProvider === "minimax" || lowerProvider === "zai" || lowerProvider === "zhipu" || lowerProvider === "custom" || lowerModel.includes("kimi") || lowerModel.includes("minimax") || lowerModel.includes("glm")) return "custom";
+	return null;
+}
+function computeCostFromPricing(provider, model, usage) {
+	const pricingProvider = pricingProviderFor(provider, model);
+	if (!pricingProvider) return {
+		cost: 0,
+		reason: "unknown-provider"
+	};
+	const pricing = getPricingSync(pricingProvider, model);
+	if (!pricing) return {
+		cost: 0,
+		reason: "unpriced-model"
+	};
+	return { cost: usage.inputTokens / 1e3 * pricing.inputPer1k + usage.outputTokens / 1e3 * pricing.outputPer1k + (usage.cacheReadTokens ?? 0) / 1e3 * (pricing.cacheReadPer1k ?? 0) + (usage.cacheWriteTokens ?? 0) / 1e3 * (pricing.cacheWrite5mPer1k ?? 0) };
+}
+function tsMs(timestamp) {
+	if (!timestamp) return 0;
+	const t = Date.parse(timestamp);
+	return Number.isFinite(t) ? t : 0;
+}
+/**
+* Parse a Pi session JSONL file into a SessionUsage record.
+*
+* Returns null if the file does not exist, is empty, or is unparseable. Errors
+* during line parsing are tolerated (the line is skipped); we never throw.
+*/
+function parseOhmypiSessionSync(filePath) {
+	if (!existsSync(filePath)) return null;
+	const result = parseOhmypiSessionContent(readFileSync(filePath, "utf8"), filePath);
+	return result.ok ? result.usage : null;
+}
+function parseOhmypiSessionCostResultSync(filePath) {
+	if (!existsSync(filePath)) return {
+		ok: false,
+		reason: "unreadable"
+	};
+	try {
+		return parseOhmypiSessionContent(readFileSync(filePath, "utf8"), filePath);
+	} catch {
+		return {
+			ok: false,
+			reason: "unreadable"
+		};
+	}
+}
+/**
+* Parse Pi session JSONL content. Exposed for tests and callers that already
+* have the file content in memory.
+*/
+function parseOhmypiSessionContent(content, filePath = "<inline>") {
+	const lines = content.split("\n").filter((l) => l.trim().length > 0);
+	if (lines.length === 0) return {
+		ok: false,
+		reason: "empty"
+	};
+	let root = null;
+	const entriesById = /* @__PURE__ */ new Map();
+	const childrenOf = /* @__PURE__ */ new Map();
+	const unknownTypesSeen = /* @__PURE__ */ new Set();
+	for (const line of lines) {
+		let parsed;
+		try {
+			parsed = JSON.parse(line);
+		} catch {
+			continue;
+		}
+		if (!parsed || typeof parsed !== "object") continue;
+		const entry = parsed;
+		if (entry.type === "session") {
+			root = entry;
+			continue;
+		}
+		if (!entry.id) continue;
+		if (!KNOWN_TYPES.has(entry.type)) {
+			if (!unknownTypesSeen.has(entry.type)) {
+				unknownTypesSeen.add(entry.type);
+				console.debug(`[ohmypi-parser] unknown entry type "${entry.type}" in ${filePath} — ignoring`);
+			}
+		}
+		entriesById.set(entry.id, entry);
+		const list = childrenOf.get(entry.parentId ?? null);
+		if (list) list.push(entry.id);
+		else childrenOf.set(entry.parentId ?? null, [entry.id]);
+	}
+	if (!root) return {
+		ok: false,
+		reason: "missing-session-root"
+	};
+	if (entriesById.size === 0) return {
+		ok: true,
+		usage: emptyUsage(filePath, root)
+	};
+	const leaves = [];
+	for (const entry of entriesById.values()) {
+		const kids = childrenOf.get(entry.id);
+		if (!kids || kids.length === 0) leaves.push(entry);
+	}
+	if (leaves.length === 0) leaves.push(...entriesById.values());
+	let latestLeaf = leaves[0];
+	for (const leaf of leaves) if (tsMs(leaf.timestamp) > tsMs(latestLeaf.timestamp)) latestLeaf = leaf;
+	const branch = [];
+	const visited = /* @__PURE__ */ new Set();
+	let cursor = latestLeaf;
+	while (cursor) {
+		if (visited.has(cursor.id)) break;
+		visited.add(cursor.id);
+		branch.push(cursor);
+		if (!cursor.parentId) break;
+		cursor = entriesById.get(cursor.parentId);
+	}
+	branch.reverse();
+	const totals = {
+		inputTokens: 0,
+		outputTokens: 0,
+		cacheReadTokens: 0,
+		cacheWriteTokens: 0
+	};
+	let costV2 = 0;
+	let messageCount = 0;
+	let costRecomputedFromTokens = 0;
+	const modelBreakdown = {};
+	const usageEvents = [];
+	const unpricedModels = [];
+	const modelsInOrder = [];
+	let compactionCount = 0;
+	let firstTs = null;
+	let lastTs = null;
+	for (const entry of branch) {
+		if (entry.type === "compaction_start" || entry.type === "session_compact") compactionCount += 1;
+		if (!firstTs && entry.timestamp) firstTs = entry.timestamp;
+		if (entry.timestamp) lastTs = entry.timestamp;
+		if (!isAssistantMessage(entry)) continue;
+		const usage = entry.message.usage;
+		if (!usage) continue;
+		const model = entry.message.model || "unknown";
+		const provider = typeof entry.message.provider === "string" ? entry.message.provider : null;
+		const input = usage.input ?? 0;
+		const output = usage.output ?? 0;
+		const cacheRead = usage.cacheRead ?? 0;
+		const cacheWrite = usage.cacheWrite ?? 0;
+		const tokenUsage = {
+			inputTokens: input,
+			outputTokens: output,
+			cacheReadTokens: cacheRead,
+			cacheWriteTokens: cacheWrite
+		};
+		const hasInlineCost = usage.cost?.total !== void 0;
+		let cost = usage.cost?.total ?? 0;
+		let warning;
+		if (!hasInlineCost && input + output + cacheRead + cacheWrite > 0) {
+			const computed = computeCostFromPricing(provider, model, tokenUsage);
+			cost = computed.cost;
+			if (computed.reason) {
+				unpricedModels.push({
+					provider,
+					model,
+					reason: computed.reason
+				});
+				warning = [{
+					type: "unpriced-model",
+					provider,
+					model,
+					reason: computed.reason
+				}];
+			}
+		}
+		const localComputed = hasInlineCost ? (usage.cost?.input ?? 0) + (usage.cost?.output ?? 0) + (usage.cost?.cacheRead ?? 0) + (usage.cost?.cacheWrite ?? 0) : cost;
+		totals.inputTokens += input;
+		totals.outputTokens += output;
+		totals.cacheReadTokens = (totals.cacheReadTokens ?? 0) + cacheRead;
+		totals.cacheWriteTokens = (totals.cacheWriteTokens ?? 0) + cacheWrite;
+		costV2 += cost;
+		costRecomputedFromTokens += localComputed;
+		messageCount += 1;
+		if (!modelBreakdown[model]) {
+			modelBreakdown[model] = {
+				cost: 0,
+				inputTokens: 0,
+				outputTokens: 0,
+				messageCount: 0,
+				cacheReadTokens: 0,
+				cacheWriteTokens: 0
+			};
+			modelsInOrder.push(model);
+		}
+		const slot = modelBreakdown[model];
+		slot.cost += cost;
+		slot.inputTokens += input;
+		slot.outputTokens += output;
+		slot.messageCount += 1;
+		slot.cacheReadTokens = (slot.cacheReadTokens ?? 0) + cacheRead;
+		slot.cacheWriteTokens = (slot.cacheWriteTokens ?? 0) + cacheWrite;
+		usageEvents.push({
+			requestId: `ohmypi:${root.id}:${entry.id}`,
+			timestamp: entry.timestamp || root.timestamp,
+			sessionId: root.id,
+			sessionFile: filePath,
+			provider,
+			model,
+			input,
+			output,
+			cacheRead,
+			cacheWrite,
+			cost,
+			...warning ? { warnings: warning } : {}
+		});
+	}
+	if (Math.abs(costV2 - costRecomputedFromTokens) > 1e-9) console.debug(`[ohmypi-parser] inline cost vs sum-of-line-items delta=${(costV2 - costRecomputedFromTokens).toFixed(6)} in ${filePath}`);
+	if (compactionCount > 0) console.debug(`[ohmypi-parser] active branch in ${filePath} has ${compactionCount} compaction event(s) — usage summed per-message (no double-count)`);
+	const display = modelsInOrder.length === 0 ? "unknown" : modelsInOrder.length === 1 ? modelsInOrder[0] : modelsInOrder.join(" → ");
+	return {
+		ok: true,
+		usage: {
+			sessionId: root.id,
+			sessionFile: filePath,
+			startTime: firstTs ?? root.timestamp,
+			endTime: lastTs ?? root.timestamp,
+			model: display,
+			usage: totals,
+			cost: costV2,
+			cost_v2: costV2,
+			messageCount,
+			modelBreakdown
+		},
+		usageEvents,
+		unpricedModels
+	};
+}
+function emptyUsage(filePath, root) {
+	return {
+		sessionId: root.id,
+		sessionFile: filePath,
+		startTime: root.timestamp,
+		endTime: root.timestamp,
+		model: "unknown",
+		usage: {
+			inputTokens: 0,
+			outputTokens: 0,
+			cacheReadTokens: 0,
+			cacheWriteTokens: 0
+		},
+		cost: 0,
+		cost_v2: 0,
+		messageCount: 0,
+		modelBreakdown: {}
+	};
+}
+var KNOWN_TYPES;
+var init_ohmypi_parser = __esmMin((() => {
+	init_cost();
+	init_errors();
+	KNOWN_TYPES = new Set([
+		"session",
+		"message",
+		"model_change",
+		"thinking_level_change",
+		"compaction_start",
+		"compaction_end",
+		"session_before_compact",
+		"session_compact",
+		"session_before_switch",
+		"session_before_fork",
+		"session_start"
+	]);
+}));
+//#endregion
 //#region ../../lib/overdeck/control-settings.ts
 function mapProjectConfig(raw, key) {
 	return {
@@ -438,6 +741,6 @@ var init_control_settings = __esmMin((() => {
 	})).add(HttpApiEndpoint.get("listProjects", "/projects", { success: Schema.Array(ProjectConfig) }));
 }));
 //#endregion
-export { setFlywheelGloballyPaused as C, setSetting as D, setMergeTrainEnabled as E, stampBootReconciliation as O, setFlywheelAutoPickupBacklog as S, setLastCleanShutdownAt as T, setBootReconciliationGrace as _, getFlywheelActiveRunIdSync as a, setDeaconGloballyPausedSync as b, init_control_settings as c, isDeaconGloballyPausedSync as d, isFlywheelAutoPickupBacklog as f, setBootReconciliationDecision as g, isMergeTrainEnabled as h, getFlywheelActiveRunId as i, isCloisterSpawnsPausedSync as l, isFlywheelRequireUatBeforeMerge as m, FLYWHEEL_GLOBAL_PAUSE_KEY as n, getLastCleanShutdownAt as o, isFlywheelGloballyPaused as p, getBootReconciliationState as r, getSetting as s, FLYWHEEL_ACTIVE_RUN_ID_KEY as t, isDeaconGloballyPaused as u, setCloisterSpawnsPausedSync as v, setFlywheelRequireUatBeforeMerge as w, setFlywheelActiveRunId as x, setDeaconGloballyPaused as y };
+export { parseOhmypiSessionCostResultSync as A, setFlywheelGloballyPaused as C, setSetting as D, setMergeTrainEnabled as E, stampBootReconciliation as O, setFlywheelAutoPickupBacklog as S, setLastCleanShutdownAt as T, setBootReconciliationGrace as _, getFlywheelActiveRunIdSync as a, setDeaconGloballyPausedSync as b, init_control_settings as c, isDeaconGloballyPausedSync as d, isFlywheelAutoPickupBacklog as f, setBootReconciliationDecision as g, isMergeTrainEnabled as h, getFlywheelActiveRunId as i, parseOhmypiSessionSync as j, init_ohmypi_parser as k, isCloisterSpawnsPausedSync as l, isFlywheelRequireUatBeforeMerge as m, FLYWHEEL_GLOBAL_PAUSE_KEY as n, getLastCleanShutdownAt as o, isFlywheelGloballyPaused as p, getBootReconciliationState as r, getSetting as s, FLYWHEEL_ACTIVE_RUN_ID_KEY as t, isDeaconGloballyPaused as u, setCloisterSpawnsPausedSync as v, setFlywheelRequireUatBeforeMerge as w, setFlywheelActiveRunId as x, setDeaconGloballyPaused as y };
 
-//# sourceMappingURL=control-settings-BMoDHY1G.js.map
+//# sourceMappingURL=control-settings-Bdud_B1j.js.map

package/server/{conversation-compaction-DzIjYMfg.js → conversation-compaction-BX9UR8nl.js}

@@ -1,3 +1,3 @@
-import { a as init_conversation_compaction, c as shouldInterceptManualCompact, i as getConversationCompactionSettings, n as compactConversationNative, o as isCompacting, r as estimateContextTokens, s as maybeCompactBeforeRespawn, t as buildCompactionRuntimeInfo } from "./conversation-compaction-D4VOmF7p.js";
+import { a as init_conversation_compaction, c as shouldInterceptManualCompact, i as getConversationCompactionSettings, n as compactConversationNative, o as isCompacting, r as estimateContextTokens, s as maybeCompactBeforeRespawn, t as buildCompactionRuntimeInfo } from "./conversation-compaction-dFx_2wpa.js";
 init_conversation_compaction();
 export { buildCompactionRuntimeInfo, compactConversationNative, estimateContextTokens, getConversationCompactionSettings, isCompacting, maybeCompactBeforeRespawn, shouldInterceptManualCompact };