@overdeck/desktop 0.49.1 → 0.50.0

package/server/{config-yaml-BwOEANMr.js → config-yaml-D60AnTIu.js}

@@ -22,7 +22,11 @@ import { promisify } from "node:util";
 //#region ../../lib/paths.ts
 /** Get OVERDECK_HOME dynamically (reads env var on each call, useful for testing) */
 function getOverdeckHome() {
-	return process.env.OVERDECK_HOME || join$1(homedir(), ".overdeck");
+	return process.env.OVERDECK_HOME || getCanonicalOverdeckHome();
+}
+/** The canonical home used by the shared Overdeck runtime. */
+function getCanonicalOverdeckHome() {
+	return join$1(homedir(), ".overdeck");
 }
 /**
 * Pre-rebrand home (`~/.panopticon`). Used ONLY by the opt-in `--seed-from-legacy`
@@ -186,7 +190,7 @@ function claudeSessionTranscriptExists(cwd, sessionId) {
 }
 var OVERDECK_HOME, CONFIG_DIR, SKILLS_DIR, AGENTS_DIR, BIN_DIR, COSTS_DIR, ARCHIVES_DIR, LOGS_DIR, TRAEFIK_DIR, CONFIG_FILE, CLAUDE_DIR, TEMPLATES_DIR, currentDir, packageRoot, DEPLOYMENT_GENERATION_DIR_RE, SYNC_SOURCES_ROOT, SYNC_SOURCES, CACHE_AGENTS_DIR, CACHE_RULES_DIR, DOCS_DIR, PRDS_DIR, PROJECT_DOCS_SUBDIR, PROJECT_PRDS_SUBDIR, PROJECT_PRDS_ACTIVE_SUBDIR, PROJECT_PRDS_PLANNED_SUBDIR, PROJECT_PRDS_COMPLETED_SUBDIR;
 var init_paths = __esmMin((() => {
-	OVERDECK_HOME = process.env.OVERDECK_HOME || join$1(homedir(), ".overdeck");
+	OVERDECK_HOME = process.env.OVERDECK_HOME || getCanonicalOverdeckHome();
 	CONFIG_DIR = OVERDECK_HOME;
 	SKILLS_DIR = join$1(OVERDECK_HOME, "skills");
 	join$1(OVERDECK_HOME, "commands");
@@ -410,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;
@@ -420,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
@@ -2973,7 +2978,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,
@@ -10137,6 +10142,19 @@ function resolveBareNumericIdSync(input, overdeckHome) {
 }
 var init_issue_id = __esmMin((() => {}));
 //#endregion
+//#region ../../lib/projects-cache-events.ts
+function subscribeProjectsConfigInvalidation(listener) {
+	listeners.add(listener);
+	return () => listeners.delete(listener);
+}
+function notifyProjectsConfigInvalidated() {
+	for (const listener of listeners) listener();
+}
+var listeners;
+var init_projects_cache_events = __esmMin((() => {
+	listeners = /* @__PURE__ */ new Set();
+}));
+//#endregion
 //#region ../../lib/projects.ts
 /**
 * Project Registry - Multi-project support for Overdeck
@@ -10297,6 +10315,7 @@ function getProjectSwarmHotspots(project) {
 }
 function invalidateProjectsConfigCache() {
 	_projectsCache = null;
+	notifyProjectsConfigInvalidated();
 }
 function loadProjectsConfigSync() {
 	if (!existsSync(PROJECTS_CONFIG_FILE)) return { projects: {} };
@@ -10335,7 +10354,7 @@ function updateProjectsConfigSync(transform) {
 			result: mutation.result
 		};
 	});
-	_projectsCache = null;
+	invalidateProjectsConfigCache();
 	return result;
 }
 async function updateProjectsConfigAsync(transform) {
@@ -10346,7 +10365,7 @@ async function updateProjectsConfigAsync(transform) {
 			result: mutation.result
 		};
 	});
-	_projectsCache = null;
+	invalidateProjectsConfigCache();
 	return result;
 }
 /**
@@ -10357,7 +10376,7 @@ function saveProjectsConfigSync(config) {
 	withProjectsConfigWriteSync(PROJECTS_CONFIG_FILE, () => {
 		atomicWriteProjectsConfigSync(PROJECTS_CONFIG_FILE, yaml);
 	});
-	_projectsCache = null;
+	invalidateProjectsConfigCache();
 }
 /**
 * Get a list of all registered projects
@@ -10794,6 +10813,7 @@ var init_projects = __esmMin((() => {
 	init_paths();
 	init_projects_config_write();
 	init_issue_id();
+	init_projects_cache_events();
 	PROJECTS_CONFIG_FILE = join$1(OVERDECK_HOME, "projects.yaml");
 	ProjectRenameError = class extends Error {
 		constructor(reason, message) {
@@ -10856,7 +10876,7 @@ var init_projects = __esmMin((() => {
 		try: async () => {
 			const out = (0, import_dist$1.stringify)(config, { indent: 2 });
 			await withProjectsConfigWrite(PROJECTS_CONFIG_FILE, () => atomicWriteProjectsConfig(PROJECTS_CONFIG_FILE, out));
-			_projectsCache = null;
+			invalidateProjectsConfigCache();
 		},
 		catch: (cause) => new FsError({
 			path: PROJECTS_CONFIG_FILE,
@@ -12833,6 +12853,7 @@ var init_defaults = __esmMin((() => {
 			maxSlots: 3,
 			autoAdvance: true
 		},
+		context: { rules: {} },
 		tmux: { configMode: "managed" },
 		enabledProviders: new Set(["anthropic"]),
 		defaultConversationModel: "claude-sonnet-5",
@@ -12903,7 +12924,7 @@ var init_defaults = __esmMin((() => {
 			}
 		},
 		conversationSearch: {
-			enabled: false,
+			enabled: true,
 			provider: "openai",
 			model: "text-embedding-3-small",
 			apiKeyRef: void 0,
@@ -12986,7 +13007,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 },
@@ -13243,10 +13266,17 @@ 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,
 		swarm: { ...DEFAULT_CONFIG.swarm },
+		context: { rules: { ...DEFAULT_CONFIG.context.rules } },
 		tmux: { ...DEFAULT_CONFIG.tmux },
 		enabledProviders: new Set(DEFAULT_CONFIG.enabledProviders),
 		providerHarnesses: { ...DEFAULT_CONFIG.providerHarnesses },
@@ -13319,7 +13349,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 },
@@ -13349,6 +13381,10 @@ function mergeConfigs(...configs) {
 			...result.swarm,
 			...config.swarm
 		};
+		if (config.context?.rules) result.context = { rules: {
+			...result.context.rules,
+			...config.context.rules
+		} };
 		if (config.models?.providers) {
 			const providers = config.models.providers;
 			const legacyKeys = config.api_keys || {};
@@ -13565,6 +13601,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);
@@ -13591,7 +13629,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;
@@ -13621,7 +13660,7 @@ function mergeConfigs(...configs) {
 		explicitlyDisabled
 	};
 }
-var lastTieredInvalidReasonWarned;
+var lastTieredInvalidReasonWarned, warnedInvalidClaudePermissionModes;
 var init_merge = __esmMin((() => {
 	init_model_capabilities();
 	init_registry();
@@ -13630,6 +13669,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
@@ -16110,6 +16150,6 @@ var init_config_yaml = __esmMin((() => {
 	init_load();
 }));
 //#endregion
-export { readIssueRecord as $, canUseHarnessSync as $n, LinearApiError as $r, findProjectByPathSync as $t, validateTieredExecutionConfig as A, getDocsIndexPath as Ai, resolveProjectKeyForCwdAsync as An, getModelEffortLevelsSync as Ar, STATE_PLANE_PATHS as At, clearIssueOwner as B, sessionFilePath as Bi, unregisterProject as Bn, fmix32 as Br, init_state_migration_lock as Bt, DEFAULT_TIERED_EXECUTION_CONFIG as C, SYNC_SOURCES as Ci, registerProjectSync as Cn, computeModelOrigin as Cr, flushAllPendingAutoCommits as Ct, resolveTieredExecutionBlock as D, encodeClaudeProjectDir as Di, resolveProjectFromIssue as Dn, MODEL_CAPABILITIES as Dr, queueAutoCommit as Dt, init_tier_table as E, claudeSessionTranscriptExists as Ei, resolveInfraRepo as En, resolveModel as Er, pushPendingStateCommits as Et, appendSessionEntry as F, init_paths as Fi, setProjectAutoMergeDefaultSync as Fn, CLIPROXY_GPT56_CONTEXT_WINDOW as Fr, isOverdeckWorkspaceRuntimePath as Ft, getIssueRecordPath as G, init_issue_id as Gn, ROLE_EFFORTS as Gr, shouldCommitLegacyWorkspaceArtifacts as Gt, ensureIssueRecord as H, validateVersionSyncConfig as Hn, init_percent as Hr, init_state_read_home as Ht, appendSessionEntrySync as I, isDeploymentGenerationRoot as Ii, setProjectMergeTrain as In, CLIPROXY_GPT56_LONG_CONTEXT_WINDOW as Ir, isStatePlaneOnlyStatus as It, getProjectConfigFromWorkspacePath as J, resolveBareNumericIdSync as Jn, ConfigError as Jr, PROJECTS_CONFIG_FILE as Jt, getIssueRecordPathForWorkspace as K, normalizeIssueIdSync as Kn, CheckpointError as Kr, init_project_key as Kt, batchReadIssueRecords as L, isDevMode as Li, setProjectMergeTrainSync as Ln, GPT56_LONG_CONTEXT_VARIANTS as Lr, isStatePlanePath as Lt, RECORD_SCHEMA_VERSION as M, getHandoffsDir as Mi, saveProjectsConfig as Mn, init_model_capabilities as Mr, init_state_plane as Mt, appendFeedbackEntry as N, getLegacyHome as Ni, saveProjectsConfigSync as Nn, modelSupportsImagesSync as Nr, isGeneratedGitHookPath as Nt, resolveTieredExecutionEnabled as O, getDocsBudgetStatePath as Oi, resolveProjectFromIssueSync as On, MODEL_DEPRECATIONS as Or, reconcileStatePlaneDrift as Ot, appendFeedbackEntrySync as P, getOverdeckHome as Pi, setProjectAutoMergeDefault as Pn, resolveModelIdSync as Pr, isOverdeckOwnedOnlyStatus as Pt, queueIssueRecordCommit as Q, require_dist as Qn, InvalidAgentIdError as Qr, findProjectByPath as Qt, buildOwnUri as R, packageRoot as Ri, setProjectSwarmPolicy as Rn, apiLaunchModelIdSync as Rr, parsePorcelainStatusPaths as Rt, init_defaults as S, SKILLS_DIR as Si, registerProject as Sn, DEFAULT_WORKHORSES as Sr, deriveProjectRoot as St, TieredExecutionConfigError as T, activeDeploymentRepoRoot as Ti, renameProjectSync as Tn, init_roles as Tr, init_auto_commit as Tt, ensureIssueRecordSync as U, extractNumberSync as Un, COMPLIANCE_MODES as Ur, resolveStateReadHomeAsync as Ut, clearRecordFeedbackSync as V, unregisterProjectSync as Vn, fnv1a32 as Vr, STATE_BRANCH as Vt, getIssueRecordBasePath as W, extractPrefixSync as Wn, PARENT_MODEL_REF as Wr, resolveStateReadHomeSync as Wt, markRecordPipelineClosedOutSync as X, init_projects_config_write as Xn, GitError as Xr, createDefaultProjectsConfig as Xt, init_record as Y, resolveIssueIdSync as Yn, FsError as Yr, ProjectRenameError as Yt, markRecordPipelineResidueClosedOutSync as Z, updateProjectsConfigText as Zn, GitHubApiError as Zr, extractTeamPrefix as Zt, mergeConfigs as _, PROJECT_DOCS_SUBDIR as _i, listProjectsAsync as _n, getDashScopeUpstreamBaseUrl as _r, writeRecordTieredExecutionOverride as _t, getConversationsConfigSync as a, VcsError as ai, getProjectSwarmHotspots as an, UnknownModelError as ar, writeAgentHarnessModelSync as at, mergeTtsDaemonConfigs as b, PROJECT_PRDS_PLANNED_SUBDIR as bi, loadProjectsConfigSync as bn, init_registry as br, writeStatusOverrideSync as bt, init_load as c, ARCHIVES_DIR as ci, getSpecialistPromptOverride as cn, getKimiAnthropicBaseUrl as cr, writeIssueRecordForWorkspaceSync as ct, isTldrEnabledSync as d, CACHE_RULES_DIR as di, hasProjectsSync as dn, init_providers as dr, writeRecordDecisionsSync as dt, MergeConflictError as ei, findProjectByTeam as en, canUseModelWithAuthSync as er, readIssueRecordForWorkspaceSync as et, loadConfigNoMigration as f, CLAUDE_DIR as fi, init_projects as fn, piProviderForModel as fr, writeRecordHazards as ft, jsYaml as g, OVERDECK_HOME as gi, listProjects as gn, ensureOpenAICompatibleProxyRunning as gr, writeRecordScopeDriftSync as gt, init_js_yaml as h, LOGS_DIR as hi, invalidateProjectsConfigCache as hn, setupCredentialFileAuthSync as hr, writeRecordResumePointSync as ht, getConversationsConfig as i, TrackerError as ii, getProject as in, PROVIDERS as ir, writeAgentHarnessModel as it, RECORD_DIRNAME as j, getDocsTelemetryPath as ji, resolveProjectPath as jn, hasModelCapabilitySync as jr, getMainDivergence as jt, resolveTieredExecutionEnabledForIssue as k, getDocsDisableStatePath as ki, resolveProjectKeyForCwd as kn, getModelCapabilitySync as kr, STATE_BRANCH_PATHS as kt, isClaudeCodeChannelsEnabled as l, BIN_DIR as li, getSpecialistRetention as ln, getProviderEnvSync as lr, writeIssueRecordSync as lt, updateConversationsConfig as m, COSTS_DIR as mi, initializeProjectsConfigSync as mn, resolveKimiCodeModelAlias as mr, writeRecordResumePoint as mt, clearConfigCache as n, ProcessSpawnError as ni, findProjectsByRallyProject as nn, KIMI_CODING_BASE_URL as nr, readRecordContinueViewSync as nt, getGlobalConfigPath as o, init_errors as oi, getProjectSync as on, clearCredentialFileAuthSync as or, writeCloseOutDodGate as ot, loadConfigSync as p, CONFIG_FILE as pi, initializeProjectsConfig as pn, qualifyPiModel as pr, writeRecordHazardsSync as pt, getIssueWorkspacePath as q, parseIssueIdSync as qn, ClaudeCredentialParseError as qr, projectKey as qt, getConversationSearchConfigSync as r, TmuxError as ri, getIssuePrefix as rn, KIMI_PLATFORM_BASE_URL as rr, resolveProjectForIssue as rt, getOpenInEditorCommand as s, AGENTS_DIR as si, getSpecialistConfig as sn, getBuiltInDefaultHarness as sr, writeCloseOutDodGateSync as st, init_config_yaml as t, MessageDeliveryFailed as ti, findProjectByTeamSync as tn, init_harness_policy as tr, readIssueRecordSync as tt, isClaudeCodeChannelsMcpEnabled as u, CACHE_AGENTS_DIR as ui, hasProjects as un, getProviderForModelSync as ur, writeRecordDecisions as ut, getDefaultDocsConfig as v, PROJECT_PRDS_ACTIVE_SUBDIR as vi, listProjectsSync as vn, init_openai_compatible_proxy as vr, writeRecordTieredExecutionOverrideSync as vt, TIERED_EXECUTION_DIFFICULTIES as w, TRAEFIK_DIR as wi, renameProject as wn, derefWorkhorse as wr, flushAutoCommits as wt, DEFAULT_CONFIG as x, PROJECT_PRDS_SUBDIR as xi, projects_exports as xn, DEFAULT_ROLES as xr, writeStatusOverridesSync as xt, getDefaultTtsDaemonConfig as y, PROJECT_PRDS_COMPLETED_SUBDIR as yi, loadProjectsConfig as yn, defaultBackgroundAiFeatures as yr, writeStatusOverride as yt, claimIssueOwner as z, resolveOhmypiExtensionPath as zi, setProjectSwarmPolicySync as zn, init_model_context_windows 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-BwOEANMr.js.map
+//# sourceMappingURL=config-yaml-D60AnTIu.js.map

package/server/{conflict-gate-DlpWCMd7.js → conflict-gate-0dD1kxjN.js}

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

package/server/{conflict-gate-D2L1kZeL.js → conflict-gate-hAUCL-un.js}

@@ -1,6 +1,6 @@
-import { a as emitActivityEntrySync, c as init_activity_logger } from "./activity-logger-BAVLrkR7.js";
-import { Lt as init_messaging, Qt as init_spawn, Rt as messageAgent, en as spawnRun } from "./agent-state-Bb3UUxQm.js";
-import { d as getReviewStatusSync, p as init_review_status, w as setReviewStatusSync } from "./review-status-DBnR5t4z.js";
+import { l as init_activity_logger, o as emitActivityEntrySync } from "./activity-logger-SlTXYCVf.js";
+import { Ht as init_messaging, Ut as messageAgent, an as init_spawn, sn as spawnRun } from "./agent-state-FABw8neJ.js";
+import { d as getReviewStatusSync, p as init_review_status, w as setReviewStatusSync } from "./review-status-DpniqzPT.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-D2L1kZeL.js.map
+//# sourceMappingURL=conflict-gate-hAUCL-un.js.map

package/server/{context-layers-CSPGc2Hb.js → context-layers-CdpabJj0.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fi as init_paths, oi as init_errors } from "./config-yaml-BwOEANMr.js";
-import { E as init_layers, c as init_render, f as init_rules, r as init_assemble } from "./assemble-DyTp2gSB.js";
+import { li as init_errors, zi as init_paths } from "./config-yaml-D60AnTIu.js";
+import { D as init_layers, l as init_render, p as init_rules, r as init_assemble } from "./assemble-B_JgnCbG.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-CSPGc2Hb.js.map
+//# sourceMappingURL=context-layers-CdpabJj0.js.map

package/server/context-layers-Ds1MnEFI.js

@@ -0,0 +1,4 @@
+import { A as piGlobalContextFile, C as codexGlobalContextFile } from "./assemble-B_JgnCbG.js";
+import { t as init_context_layers } from "./context-layers-CdpabJj0.js";
+init_context_layers();
+export { codexGlobalContextFile, piGlobalContextFile };

package/server/{continue-U3Af0jUq.js → continue-CnvrUfxw.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Yr as FsError, oi as init_errors } from "./config-yaml-BwOEANMr.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-DbxY2QB6.js";
+import { Qr as FsError, li as init_errors } from "./config-yaml-D60AnTIu.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";
 import { existsSync } from "node:fs";
@@ -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-U3Af0jUq.js.map
+//# sourceMappingURL=continue-CnvrUfxw.js.map