@overdeck/desktop 0.45.23 → 0.45.24

package/server/{queries-6d7Cdtm7.js → queries-CjNIf-Ub.js}

@@ -1,45 +1,46 @@
 import { n as __esmMin, o as __toESM } from "./rolldown-runtime-DNCzzKnI.js";
-import { B as getProviderEnvSync, Br as getOverdeckHome, C as TIERED_EXECUTION_DIFFICULTIES, D as resolveTieredExecutionEnabled, Ft as resolveProjectForIssue, G as setupCredentialFileAuthSync, Gr as sessionFilePath, H as init_providers, It as writeAgentHarnessModelSync, K as ensureOpenAICompatibleProxyRunning, L as clearCredentialFileAuthSync, Mt as readIssueRecordForWorkspaceSync, Nr as encodeClaudeProjectDir, Nt as readIssueRecordSync, O as resolveTieredExecutionEnabledForIssue, Ot as init_record, Qn as resolveBareNumericIdSync, R as getBuiltInDefaultHarness, S as DEFAULT_TIERED_EXECUTION_CONFIG, T as init_tier_table, Tn as init_projects, Ur as packageRoot, V as getProviderForModelSync, Vr as init_paths, Wr as resolveOhmypiExtensionPath, Yn as init_issue_id, dt as fnv1a32, er as require_dist, et as init_roles, f as loadConfigSync, fn as findProjectByPathSync, ft as init_percent, gn as getIssuePrefix, hr as AGENTS_DIR, in as shouldCommitLegacyWorkspaceArtifacts, ir as FsError, it as getModelCapabilitySync, l as isClaudeCodeChannelsMcpEnabled, lt as resolveModelIdSync, mr as init_errors, nn as init_state_read_home, nr as ClaudeCredentialParseError, ot as hasModelCapabilitySync, q as init_openai_compatible_proxy, st as init_model_capabilities, t as init_config_yaml, tt as resolveModel, u as isTldrEnabledSync, ut as fmix32, vn as getProjectSwarmHotspots, yn as getProjectSync, zn as resolveProjectFromIssueSync } from "./config-yaml-DvyMuOle.js";
+import { B as getProviderEnvSync, Br as getOverdeckHome, C as TIERED_EXECUTION_DIFFICULTIES, D as resolveTieredExecutionEnabled, Ft as resolveProjectForIssue, G as setupCredentialFileAuthSync, Gr as sessionFilePath, H as init_providers, Hr as isDevMode, It as writeAgentHarnessModelSync, K as ensureOpenAICompatibleProxyRunning, L as clearCredentialFileAuthSync, Mt as readIssueRecordForWorkspaceSync, Nr as encodeClaudeProjectDir, Nt as readIssueRecordSync, O as resolveTieredExecutionEnabledForIssue, Ot as init_record, Qn as resolveBareNumericIdSync, R as getBuiltInDefaultHarness, S as DEFAULT_TIERED_EXECUTION_CONFIG, T as init_tier_table, Tn as init_projects, Ur as packageRoot, V as getProviderForModelSync, Vr as init_paths, Wr as resolveOhmypiExtensionPath, Yn as init_issue_id, dt as fnv1a32, er as require_dist, et as init_roles, f as loadConfigSync, fn as findProjectByPathSync, ft as init_percent, gn as getIssuePrefix, hr as AGENTS_DIR, in as shouldCommitLegacyWorkspaceArtifacts, ir as FsError, it as getModelCapabilitySync, l as isClaudeCodeChannelsMcpEnabled, lt as resolveModelIdSync, mr as init_errors, nn as init_state_read_home, nr as ClaudeCredentialParseError, ot as hasModelCapabilitySync, q as init_openai_compatible_proxy, st as init_model_capabilities, t as init_config_yaml, tt as resolveModel, u as isTldrEnabledSync, ut as fmix32, vn as getProjectSwarmHotspots, yn as getProjectSync, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
 import { a as init_activity_logger, n as emitActivityEntrySync, r as emitActivityTtsSync } from "./activity-logger-DDlOIAML.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-CzaSOgul.js";
-import { $ as init_child_env, A as listPaneValues, D as killSession, E as isPaneDead, H as sessionExists, O as killSessionSync, P as listSessionsSync, R as sendEscapeKeyAsync, U as sessionExistsSync, V as sendRawKeystroke, W as setOption, X as BLANKED_PROVIDER_ENV, a as capturePaneSync, c as createSessionSync, i as capturePane, m as exactPaneTarget, s as createSession, w as init_tmux, z as sendKeys } from "./tmux-ftABRAmc.js";
-import { a as init_event_store, i as initEventStore } from "./event-store-tdiY5eDZ.js";
-import { a as OHMYPI_BEHAVIOR, o as getHarnessBehavior } from "./src-U7_kTPEE.js";
-import { D as listOverdeckAgentStatesSync, E as init_agent_state_sync, O as saveOverdeckAgentStateSync, T as getOverdeckAgentStateSync, h as resetPipelineVerdictsForWorkStartSync, l as init_review_status } from "./review-status-A7quS5KJ.js";
-import { i as countAgentsByStatus, o as init_agents$1 } from "./agents-B4Bjbkfv.js";
-import { n as ensureSessionContextBriefingFile, r as init_briefing_freshness } from "./briefing-freshness-DWdW7vUm.js";
-import { o as getPricingSync, s as init_cost } from "./cost-Ca0YTWDw.js";
-import { _ as init_tier_metrics, g as estimateFeedDeliveryTokens, v as recordTierFeedDelivery } from "./cost-sync-C0VdGme1.js";
-import { a as persistCurrentSessionId, d as isAgentStateServiceInProcess, i as logLauncherSessionPinned, l as getRuntimeSnapshot, n as createFreshSessionIdentity, o as init_persistent_logger, r as init_session_history, s as logAgentLifecycleSync, u as init_agent_runtime_mirror } from "./session-history-CVZDpS3c.js";
-import { t as init_behavior } from "./behavior-B_-4EKF3.js";
-import { i as ensureInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-Bb4XeV2x.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BEqFxlJc.js";
+import { $ as init_child_env, A as listPaneValues, D as killSession, E as isPaneDead, H as sessionExists, O as killSessionSync, P as listSessionsSync, R as sendEscapeKeyAsync, U as sessionExistsSync, V as sendRawKeystroke, W as setOption, X as BLANKED_PROVIDER_ENV, a as capturePaneSync, c as createSessionSync, i as capturePane, m as exactPaneTarget, s as createSession, w as init_tmux, z as sendKeys } from "./tmux-R7N7y-Mh.js";
+import { a as init_event_store, i as initEventStore } from "./event-store-CQL6NeqB.js";
+import { a as OHMYPI_BEHAVIOR, o as getHarnessBehavior } from "./src-DtcUOZCq.js";
+import { D as listOverdeckAgentStatesSync, E as init_agent_state_sync, O as saveOverdeckAgentStateSync, T as getOverdeckAgentStateSync, h as resetPipelineVerdictsForWorkStartSync, l as init_review_status } from "./review-status-kZj_KyCk.js";
+import { i as countAgentsByStatus, o as init_agents$1 } from "./agents-EbI0zCJl.js";
+import { n as ensureSessionContextBriefingFile, r as init_briefing_freshness } from "./briefing-freshness-D1wzUIWv.js";
+import { o as getPricingSync, s as init_cost } from "./cost-B2ddP6wq.js";
+import { _ as init_tier_metrics, g as estimateFeedDeliveryTokens, v as recordTierFeedDelivery } from "./cost-sync-BsN6ER0n.js";
+import { a as persistCurrentSessionId, d as isAgentStateServiceInProcess, i as logLauncherSessionPinned, l as getRuntimeSnapshot, n as createFreshSessionIdentity, o as init_persistent_logger, r as init_session_history, s as logAgentLifecycleSync, u as init_agent_runtime_mirror } from "./session-history-BT3IvqhC.js";
+import { t as init_behavior } from "./behavior-B3exJ42O.js";
+import { i as ensureInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-s0-oKybJ.js";
 import { i as readReviewStatusMap, n as init_review_status_source, r as isRoleTerminal } from "./review-status-source-CxuEjLGg.js";
-import { m as readWorkspacePlanSync, o as init_io } from "./io-B3_AHDfr.js";
-import { c as bridgeGeminiAuthToCliproxy, d as getCliproxyAuthDir, g as getCliproxyLogPath, l as decodeJwtPayload$1, p as getCliproxyClientEnv, s as bridgeCodexAuthToCliproxySync, v as init_cliproxy } from "./cliproxy-Bgb2XCqi.js";
-import { L as normalizeHarness, R as reactivateConversationForSpawn, S as getConversationByName, k as init_conversations, y as createConversation } from "./conversations-DbOs1e9Q.js";
-import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-B0pmAz0a.js";
-import { a as readCavemanVariant, n as init_workspace } from "./workspace-BVl4rihN.js";
-import { a as requireModelOverrideSync, i as normalizeModelOverrideSync, n as init_launcher_generator, o as shellQuoteModelIdSync, r as init_model_validation, t as generateLauncherScriptSync } from "./launcher-generator-CHVm7bGT.js";
-import { a as init_claude_permissions, r as getClaudePermissionFlagsStringSync } from "./claude-permissions-H_5wHQZQ.js";
-import { h as workspaceContextFile, o as init_layers } from "./layers-DzxSTGNA.js";
-import { a as extractThreadIdFromRollout, c as initCodexHome, l as init_codex, o as findLatestRollout } from "./codex-TmSi-yTv.js";
-import { n as init_harness_binary, r as prepareHarnessLaunch } from "./harness-binary-CVio2m-u.js";
-import { f as init_config, m as loadConfigSync$1 } from "./config-CCvjQf27.js";
-import { a as getFlywheelActiveRunIdSync, s as init_control_settings } from "./control-settings-aP1ANIlI.js";
-import { n as createTrackerFromConfig, r as init_factory, t as createTracker } from "./factory-CynerjXO.js";
-import { a as init_stack_health, i as getWorkspaceStackHealth } from "./stack-health-puygdaMd.js";
-import { i as createActiveSlice, l as init_dag, o as getDispatchableItems, s as groupItemsByWave } from "./dag-CdOjJVDT.js";
-import { c as generateFixedPointPromptSync, f as initHookSync, n as checkHookSync, p as init_hooks } from "./hooks-DUXw8A0-.js";
-import { n as resolveHarness, t as init_harness_resolve } from "./harness-resolve-qHJBhy3Z.js";
-import { a as loadCloisterConfigSync, r as init_config$1 } from "./config-DjLOdbgT.js";
-import { t as init_reap_terminal_sessions } from "./reap-terminal-sessions-N3BTkmX_.js";
-import { c as isStateMigrated, o as init_state_home } from "./state-home-CIGjwNfJ.js";
-import { n as provisionClaudeHooks, t as init_claude_hooks_provision } from "./claude-hooks-provision-but-_qGY.js";
-import { a as init_lifecycle_io, t as appendContinueSessionEntryForIssue } from "./lifecycle-io-D8iNBcux.js";
-import { r as init_swarm_readiness, t as analyzeSwarmReadiness } from "./swarm-readiness-CQ_fwUWF.js";
+import { m as readWorkspacePlanSync, o as init_io } from "./io-C9kF1wtJ.js";
+import { c as bridgeGeminiAuthToCliproxy, d as getCliproxyAuthDir, g as getCliproxyLogPath, l as decodeJwtPayload$1, p as getCliproxyClientEnv, s as bridgeCodexAuthToCliproxySync, v as init_cliproxy } from "./cliproxy-C8a1vtTU.js";
+import { L as normalizeHarness, R as reactivateConversationForSpawn, S as getConversationByName, k as init_conversations, y as createConversation } from "./conversations-6AfUfbwc.js";
+import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-DKZFMbFt.js";
+import { a as readCavemanVariant, n as init_workspace } from "./workspace-BPUws1-_.js";
+import { a as normalizeModelOverrideSync, i as init_model_validation, n as init_launcher_generator, o as requireModelOverrideSync, s as shellQuoteModelIdSync, t as generateLauncherScriptSync } from "./launcher-generator-BBWG_SiS.js";
+import { a as init_claude_permissions, r as getClaudePermissionFlagsStringSync } from "./claude-permissions-DNWEVV6z.js";
+import { E as init_layers, I as workspaceContextFile, P as resolveWorkspaceContextFile, c as init_render, i as workspaceContextWithoutProjectLayer, l as renderGlobalLayer, r as init_assemble, u as renderProjectLayer, v as init_harness, y as renderForHarness } from "./assemble-J2ZZ2C15.js";
+import { a as extractThreadIdFromRollout, c as initCodexHome, l as init_codex, o as findLatestRollout } from "./codex-BZXGhUVB.js";
+import { i as prepareHarnessLaunch, r as init_harness_binary } from "./harness-binary-DPUi-Pv8.js";
+import { f as init_config, m as loadConfigSync$1 } from "./config-BZ0sHTju.js";
+import { a as getFlywheelActiveRunIdSync, s as init_control_settings } from "./control-settings-BQp7_4uD.js";
+import { n as createTrackerFromConfig, r as init_factory, t as createTracker } from "./factory-CFibJuaw.js";
+import { a as getWorkspaceStackHealth, s as init_stack_health } from "./stack-health-DxSdG9cW.js";
+import { i as createActiveSlice, l as init_dag, o as getDispatchableItems, s as groupItemsByWave } from "./dag-B1ucnjDU.js";
+import { c as generateFixedPointPromptSync, f as initHookSync, n as checkHookSync, p as init_hooks } from "./hooks-CKZgXlJb.js";
+import { n as resolveHarness, t as init_harness_resolve } from "./harness-resolve-3lNZkyT4.js";
+import { a as loadCloisterConfigSync, r as init_config$1 } from "./config-CKxYiCmX.js";
+import { t as init_reap_terminal_sessions } from "./reap-terminal-sessions-BtHPo6Xc.js";
+import { c as isStateMigrated, o as init_state_home } from "./state-home-Cn_Qu8IX.js";
+import { n as provisionClaudeHooks, t as init_claude_hooks_provision } from "./claude-hooks-provision-D8GXF3_s.js";
+import { a as init_lifecycle_io, t as appendContinueSessionEntryForIssue } from "./lifecycle-io-BREGpnLk.js";
+import { i as init_git_utils, o as renderWorkspaceGitShowPromise } from "./git-utils-CRw2zLPC.js";
+import { r as init_swarm_readiness, t as analyzeSwarmReadiness } from "./swarm-readiness-DlP_UjHq.js";
 import { dirname, join, relative } from "node:path";
 import { Data, Duration, Effect, FileSystem } from "effect";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, statSync, statfsSync, unlinkSync, writeFileSync } from "fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, statfsSync, unlinkSync, writeFileSync } from "fs";
 import { basename as basename$1, dirname as dirname$1, join as join$1, resolve as resolve$1 } from "path";
 import { homedir } from "os";
 import { cpus as cpus$1, loadavg as loadavg$1, platform as platform$1, totalmem as totalmem$1 } from "node:os";
@@ -1827,6 +1828,33 @@ var init_agent_state = __esmMin((() => {
 function buildDefaultResumeContinueMessage(issueId) {
 	return `You are resuming work on ${issueId}. Read .pan/continue.json for context and pick up where you left off — do not wait for further instructions.`;
 }
+/** Completed marker check: the agent dir's own markers, or the workspace's. */
+function hasCompletionMarkerForAgent(state) {
+	const agentDir = getAgentDir(state.id);
+	if (existsSync(join$1(agentDir, "completed")) || existsSync(join$1(agentDir, "completed.processed"))) return true;
+	const workspace = state.workspace;
+	if (workspace && (existsSync(join$1(workspace, ".pan", "completed")) || existsSync(join$1(workspace, ".pan", "completed.processed")))) return true;
+	return false;
+}
+/**
+* PAN-2974 (root cause B): the resume kickoff is phase-aware. Telling an agent
+* whose work was already handed off (completed marker) to "pick up where you
+* left off — do not wait for further instructions" makes it re-drive pipeline
+* stages on its own authority — 2026-07-21 MIN-882: a post-reboot resume
+* re-ran verification, restored config, and fired `pan review request` /
+* `pan review restart` while the operator was mid-UAT on finished work.
+* A handed-off agent gets a PASSIVE restore instead; only agents that crashed
+* mid-implementation get the aggressive kickoff.
+*/
+function buildResumeContinueMessage(state) {
+	const issueId = state.issueId;
+	if (hasCompletionMarkerForAgent(state)) return [
+		`Your session for ${issueId} was restored after a restart.`,
+		`The work was already handed off — a completed marker exists. Do NOT re-drive pipeline stages (review, test, verify, merge) on your own authority.`,
+		`Stay available for the operator and act only on new instructions.`
+	].join(" ");
+	return buildDefaultResumeContinueMessage(issueId);
+}
 async function buildResumeMessageForAgent(state, fallbackMessage, callerMessage) {
 	if (state.role !== "work" || state.kickoffDelivered !== false) return {
 		message: callerMessage ?? fallbackMessage,
@@ -2656,6 +2684,34 @@ var init_claude_auth = __esmMin((() => {
 	});
 }));
 //#endregion
+//#region ../../lib/acp/context.ts
+function materializeAcpContextFile(agentDir, workspace) {
+	const sections = [renderGlobalLayer("acp", isDevMode())];
+	const project = findProjectByPathSync(workspace);
+	if (project) sections.push(renderProjectLayer(project.path, "acp"));
+	const workspaceFile = resolveWorkspaceContextFile(workspace);
+	if (existsSync$1(workspaceFile)) {
+		const workspaceContent = readFileSync$1(workspaceFile, "utf8");
+		const workspaceOnly = project ? workspaceContextWithoutProjectLayer(workspaceContent) : workspaceContent;
+		sections.push(renderForHarness(workspaceOnly, "acp").trim());
+	}
+	const content = sections.filter((section) => section.trim().length > 0).join(SECTION_SEPARATOR);
+	const contextPath = join(agentDir, "acp-context.md");
+	mkdirSync$1(dirname(contextPath), { recursive: true });
+	writeFileSync$1(contextPath, `${content.trim()}\n`, { mode: 384 });
+	return contextPath;
+}
+var SECTION_SEPARATOR;
+var init_context = __esmMin((() => {
+	init_assemble();
+	init_harness();
+	init_layers();
+	init_render();
+	init_paths();
+	init_projects();
+	SECTION_SEPARATOR = "\n\n---\n\n";
+}));
+//#endregion
 //#region ../../lib/runtimes/ohmypi-fifo.ts
 /**
 * oh-my-pi (omp) RPC named-pipe lifecycle (PAN-1989).
@@ -2815,6 +2871,8 @@ async function writeLauncherScriptAtomic(launcherScript, content) {
 	await rename$1(tmp, launcherScript);
 }
 async function claudeSystemPromptFiles(workspace, harness) {
+	const behavior = getHarnessBehavior(harness);
+	if (behavior.contextLayerKind === "acp") return [];
 	const files = [];
 	const contextFile = workspaceContextFile(workspace);
 	try {
@@ -2824,14 +2882,13 @@ async function claudeSystemPromptFiles(workspace, harness) {
 		if (!isNodeNotFound(error)) throw error;
 	}
 	files.push(await ensureSessionContextBriefingFile());
-	const behavior = getHarnessBehavior(harness);
 	if (behavior.contextLayerKind === "pi") {
-		const { piGlobalContextFile } = await import("./context-layers-B3Nt58jl.js");
+		const { piGlobalContextFile } = await import("./context-layers-BrPmE__h.js");
 		const globalFile = piGlobalContextFile();
 		if (existsSync(globalFile)) files.unshift(globalFile);
 	}
 	if (behavior.contextLayerKind === "codex") {
-		const { codexGlobalContextFile } = await import("./context-layers-B3Nt58jl.js");
+		const { codexGlobalContextFile } = await import("./context-layers-BrPmE__h.js");
 		const globalFile = codexGlobalContextFile();
 		if (existsSync(globalFile)) files.unshift(globalFile);
 	}
@@ -2887,6 +2944,18 @@ async function getOhmypiLauncherFields(agentId, model) {
 		model
 	};
 }
+function getAcpLauncherFields(agentId, model, workspace, binaryPath, _role) {
+	return {
+		harness: "acp",
+		acpAgentId: agentId,
+		acpProvider: getProviderForModelSync(model).name,
+		acpWorkspace: workspace,
+		acpBinaryPath: binaryPath,
+		acpContextFile: materializeAcpContextFile(getAgentDir(agentId), workspace),
+		model,
+		unsetProviderEnv: true
+	};
+}
 function getCodexLauncherFields(agentId, model, workspacePath, role) {
 	const codexHome = join$1(homedir(), ".overdeck", "agents", agentId, "codex-home");
 	const codexConfig = loadConfigSync().config.codex;
@@ -3048,12 +3117,45 @@ async function waitForCodexAppServerReady(agentId, timeoutSec = 30, deps = {}) {
 	const detail = lastError ? ` Last status error: ${lastError}` : ` Last state: ${lastState}.`;
 	throw new Error(`Timed out waiting for Codex app-server readiness for ${agentId}.${detail}`);
 }
+async function waitForAcpHostReady(agentId, timeoutSec = 30, deps = {}) {
+	const now = deps.now ?? (() => Date.now());
+	const sleep = deps.sleep ?? ((ms) => new Promise((resolveSleep) => setTimeout(resolveSleep, ms)));
+	const sessionExistsForAgent = deps.sessionExists ?? (async (id) => Effect.runPromise(sessionExists(id)));
+	const readText = deps.readText ?? ((path) => readFileSync(path, "utf8"));
+	const pathExists = deps.pathExists ?? existsSync;
+	const agentDir = getAgentDir(agentId);
+	const sessionIdPath = join$1(agentDir, "acp-session-id");
+	const errorPath = join$1(agentDir, "acp-launch-error");
+	const tokenPath = join$1(agentDir, "acp-token");
+	const socketPath = join$1(getOverdeckHome(), "sockets", `acp-${agentId}.sock`);
+	const deadline = now() + timeoutSec * 1e3;
+	while (now() < deadline) {
+		if (pathExists(errorPath)) {
+			const launchError = readText(errorPath).trim();
+			if (launchError) throw new Error(`ACP host ${agentId} failed to start: ${launchError}`);
+		}
+		if (!await sessionExistsForAgent(agentId)) throw new Error(`ACP host session ${agentId} exited before readiness.`);
+		try {
+			const sessionId = readText(sessionIdPath).trim();
+			const token = readText(tokenPath).trim();
+			if (sessionId && token && pathExists(socketPath)) return;
+		} catch (error) {
+			if (!isNodeNotFound(error)) throw error;
+		}
+		await sleep(500);
+	}
+	throw new Error(`Timed out waiting for ACP host readiness for ${agentId}.`);
+}
 async function waitForPromptReady(agentId, harness, timeoutSec = 30) {
 	const readinessKind = harness === "codex" && loadConfigSync().config.codex?.transport !== "tui" ? "codex-app-server-ready" : getHarnessBehavior(harness).readinessKind;
 	if (readinessKind === "codex-app-server-ready") {
 		await waitForCodexAppServerReady(agentId, timeoutSec);
 		return true;
 	}
+	if (readinessKind === "acp-host-ready") {
+		await waitForAcpHostReady(agentId, timeoutSec);
+		return true;
+	}
 	if (readinessKind === "codex-tui-prompt") return waitForCodexTuiReady(agentId, timeoutSec);
 	return waitForReadySignal(agentId, timeoutSec);
 }
@@ -3081,7 +3183,7 @@ async function injectPiPromptTimeMemory(agentId, prompt) {
 			agentRole: agentState.role ?? "work",
 			agentHarness: agentState.harness ?? "claude-code"
 		};
-		const { injectPromptTimeMemory } = await import("./injection-oNZeoDhL.js");
+		const { injectPromptTimeMemory } = await import("./injection-CPUIqNhI.js");
 		const result = await injectPromptTimeMemory({
 			prompt,
 			identity,
@@ -3115,7 +3217,7 @@ async function injectPiConversationMemory(opts, prompt) {
 			agentRole: "work",
 			agentHarness: "ohmypi"
 		};
-		const { injectPromptTimeMemory } = await import("./injection-oNZeoDhL.js");
+		const { injectPromptTimeMemory } = await import("./injection-CPUIqNhI.js");
 		const result = await injectPromptTimeMemory({
 			prompt,
 			identity,
@@ -3176,6 +3278,7 @@ async function getAgentRuntimeBaseCommand(model, agentName, agentDefinition, har
 	const behavior = getHarnessBehavior(harness);
 	if (behavior.launchCommandKind === "ohmypi-rpc") return `omp --mode rpc --model ${quotedModel}`;
 	if (behavior.launchCommandKind === "codex-work-tui") return `codex`;
+	if (behavior.launchCommandKind === "acp-host") return "acp-host";
 	if (process.env.OVERDECK_TEST_HARNESS_COMMAND) return process.env.OVERDECK_TEST_HARNESS_COMMAND;
 	const provider = getProviderForModelSync(validatedModel);
 	const nameFlag = agentName ? ` --name ${agentName}` : "";
@@ -3273,6 +3376,7 @@ async function getRoleRuntimeBaseCommand(model, agentName, role, harness = "clau
 		return `omp --mode rpc --model ${quotedModel}`;
 	}
 	if (behavior.launchCommandKind === "codex-work-tui") return `codex`;
+	if (behavior.launchCommandKind === "acp-host") return "acp-host";
 	if (process.env.OVERDECK_TEST_HARNESS_COMMAND) return process.env.OVERDECK_TEST_HARNESS_COMMAND;
 	const provider = getProviderForModelSync(validatedModel);
 	const requestedDefinitionPath = roleAgentDefinitionPath(role, subRole);
@@ -3297,6 +3401,7 @@ var init_runtime_command = __esmMin((() => {
 	init_briefing_freshness();
 	init_claude_auth();
 	init_layers();
+	init_context();
 	init_behavior();
 	init_codex();
 	init_ohmypi_fifo();
@@ -3639,20 +3744,25 @@ async function transitionIssueToInReview(issueId, workspacePath) {
 async function buildAgentLaunchConfig(opts) {
 	const model = requireModelOverrideSync(opts.model);
 	try {
-		const { injectOverdeckInfraDeny } = await import("./claude-settings-overlay-BTENVmYf.js");
+		const { injectOverdeckInfraDeny } = await import("./claude-settings-overlay-DWy-Bb4Y.js");
 		await Effect.runPromise(injectOverdeckInfraDeny(opts.workspace));
 	} catch (err) {
 		console.warn(`[agents] injectOverdeckInfraDeny failed for ${opts.agentId} (non-fatal): ${err instanceof Error ? err.message : err}`);
 	}
-	const providerEnv = await getProviderEnvForModel(model);
-	const provider = getProviderForModelSync(model);
-	if (provider.authType === "credential-file") setupCredentialFileAuthSync(provider, opts.workspace);
-	else clearCredentialFileAuthSync(opts.workspace);
-	const providerExports = await getProviderExportsForModel(model);
-	const launchRole = opts.isPlanning ? "plan" : opts.role;
 	const behavior = getHarnessBehavior(opts.harness);
+	const isAcp = behavior.launchCommandKind === "acp-host";
+	const providerEnv = isAcp ? {} : await getProviderEnvForModel(model);
+	if (!isAcp) {
+		const provider = getProviderForModelSync(model);
+		if (provider.authType === "credential-file") setupCredentialFileAuthSync(provider, opts.workspace);
+		else clearCredentialFileAuthSync(opts.workspace);
+	}
+	const providerExports = isAcp ? void 0 : await getProviderExportsForModel(model);
+	const launchRole = opts.isPlanning ? "plan" : opts.role;
 	const piLauncherFields = behavior.usesRpcFifo ? await getOhmypiLauncherFields(opts.agentId, model) : {};
 	const codexLauncherFields = behavior.usesCodexHome ? getCodexLauncherFields(opts.agentId, model, opts.workspace, launchRole) : {};
+	if (isAcp && !opts.harnessBinaryPath) throw new Error("ACP launch requires the executable path resolved by preflight");
+	const acpLauncherFields = isAcp ? getAcpLauncherFields(opts.agentId, model, opts.workspace, opts.harnessBinaryPath, launchRole) : {};
 	if (opts.spawnMode === "resume" && opts.resumeSessionId) return {
 		launcherContent: generateLauncherScriptSync({
 			role: launchRole,
@@ -3663,7 +3773,7 @@ async function buildAgentLaunchConfig(opts) {
 			providerExports,
 			baseCommand: behavior.launchCommandKind !== "claude-code" ? await getAgentRuntimeBaseCommand(model, opts.agentId, launchRole, opts.harness) : `claude ${getClaudePermissionFlagsStringSync()}${roleSystemPromptInjectionSync(roleAgentDefinitionPath(launchRole))}`,
 			resumeSessionId: opts.resumeSessionId,
-			model: behavior.launchCommandKind !== "claude-code" || providerExports.includes("ANTHROPIC_BASE_URL") ? model : void 0,
+			model: behavior.launchCommandKind !== "claude-code" || providerExports?.includes("ANTHROPIC_BASE_URL") ? model : void 0,
 			extraArgs: behavior.launchCommandKind !== "claude-code" ? void 0 : `--name ${opts.agentId}`,
 			appendSystemPromptFiles: await claudeSystemPromptFiles(opts.workspace, opts.harness),
 			extraEnvExports: opts.extraEnvExports,
@@ -3671,7 +3781,8 @@ async function buildAgentLaunchConfig(opts) {
 			supervisorScriptPath: opts.supervisorScriptPath,
 			promptInline: opts.promptInline,
 			...piLauncherFields,
-			...codexLauncherFields
+			...codexLauncherFields,
+			...acpLauncherFields
 		}),
 		providerEnv
 	};
@@ -3695,6 +3806,7 @@ async function buildAgentLaunchConfig(opts) {
 			promptInline: opts.promptInline,
 			...piLauncherFields,
 			...codexLauncherFields,
+			...acpLauncherFields,
 			...opts.channelsBridgeMcpConfig ? {
 				channelsBridgeMcpConfig: opts.channelsBridgeMcpConfig,
 				channelsBridgeServerName: opts.channelsBridgeServerName ?? "overdeck-bridge"
@@ -3720,7 +3832,7 @@ async function retrieveSpawnTimeMemoryContext(input) {
 			agentRole: input.role,
 			agentHarness: input.harness
 		};
-		const { injectPromptTimeMemory } = await import("./injection-oNZeoDhL.js");
+		const { injectPromptTimeMemory } = await import("./injection-CPUIqNhI.js");
 		return (await injectPromptTimeMemory({
 			prompt: input.prompt,
 			identity,
@@ -3811,7 +3923,7 @@ async function assertWorkspaceStackHealthyForSpawn(issueId, role, allowHost = fa
 	record.attempts += 1;
 	spawnStackRebuildState.set(normalizedIssue, record);
 	console.log(`[agents] Workspace stack for ${normalizedIssue} unhealthy (${details}) — rebuilding before spawn (attempt ${record.attempts}/${SPAWN_STACK_REBUILD_MAX_ATTEMPTS})`);
-	const { rebuildWorkspaceStack } = await import("./rebuild-stack-kA7XngID.js");
+	const { rebuildWorkspaceStack } = await import("./rebuild-stack-CFvcBHsS.js");
 	const result = await Effect.runPromise(rebuildWorkspaceStack(issueId, { onProgress: (m) => console.log(`[agents]   ${normalizedIssue} stack rebuild: ${m}`) })).catch((err) => ({
 		success: false,
 		error: err instanceof Error ? err.message : String(err)
@@ -4198,22 +4310,27 @@ async function appendChannelDeliveryLog(agentId, entry) {
 		await (await import("fs/promises")).appendFile(join$1(dir, `bridge-${agentId}.log`), `${line}\n`, "utf-8");
 	} catch {}
 }
-function readAppServerTokenSync(agentId) {
+function readSocketTokenSync(agentId, filename) {
 	try {
-		const tokenPath = join$1(overdeckHomeForSockets(), "agents", agentId, "appserver-token");
+		const tokenPath = join$1(overdeckHomeForSockets(), "agents", agentId, filename);
 		if (!existsSync(tokenPath)) return null;
 		return readFileSync(tokenPath, "utf-8").trim() || null;
 	} catch {
 		return null;
 	}
 }
+function readAppServerTokenSync(agentId) {
+	return readSocketTokenSync(agentId, "appserver-token");
+}
+function readAcpTokenSync(agentId) {
+	return readSocketTokenSync(agentId, "acp-token");
+}
 /**
 * POST a JSON body to a Unix-domain socket using node:net + a hand-rolled
 * minimal HTTP/1.1 request. Resolves on a 200-class response, rejects on any
-* error including socket-not-found, connection refused, write timeout, or
-* non-2xx status. Kept tiny on purpose: this is a hot path, only one caller,
-* and the whole point of a fallback to tmux is that we do not need a robust
-* HTTP client here.
+* error including socket-not-found, connection refused, an optional client
+* timeout, or non-2xx status. Kept tiny on purpose because this is a hot path
+* and these local protocol hosts need only a narrow HTTP client.
 */
 async function postUnixSocketJson(socketPath, body, timeoutMs, token, tokenHeader = BRIDGE_TOKEN_HEADER) {
 	const payload = JSON.stringify(body);
@@ -4264,10 +4381,12 @@ async function postUnixSocketJson(socketPath, body, timeoutMs, token, tokenHeade
 				finishErr(/* @__PURE__ */ new Error(`socket POST: status ${status}: ${responseBody.slice(0, 100)}`));
 			});
 		});
-		timeout = setTimeout(() => {
-			req.destroy(/* @__PURE__ */ new Error("socket POST timeout"));
-		}, timeoutMs);
-		timeout.unref?.();
+		if (timeoutMs !== void 0) {
+			timeout = setTimeout(() => {
+				req.destroy(/* @__PURE__ */ new Error("socket POST timeout"));
+			}, timeoutMs);
+			timeout.unref?.();
+		}
 		req.on("error", (err) => {
 			finishErr(err);
 		});
@@ -4277,8 +4396,9 @@ async function postUnixSocketJson(socketPath, body, timeoutMs, token, tokenHeade
 }
 /**
 * Single delivery primitive for orchestrator-to-work-agent messages. Auto mode
-* tries the PTY supervisor socket, then legacy Channels MCP, then tmux. Explicit
-* socket methods are strict and throw instead of falling back.
+* tries persistent protocol hosts, the PTY supervisor socket, legacy Channels
+* MCP, then tmux. Explicit socket methods and ACP targets are strict: ACP prompts
+* cannot fall back to terminal injection because only session/prompt reaches the agent.
 */
 async function deliverAgentMessage(agentId, message, caller = "unknown", deliveryMethod) {
 	const normalizedId = normalizeAgentId(agentId);
@@ -4292,6 +4412,8 @@ async function deliverAgentMessage(agentId, message, caller = "unknown", deliver
 	} catch {
 		resolvedMethod ??= "auto";
 	}
+	const isAcpTarget = state?.harness === "acp";
+	if (isAcpTarget && resolvedMethod !== "auto") throw new Error(`MessageDeliveryFailed: ACP delivery failed for ${normalizedId} (${caller}): ACP requires authenticated host RPC delivery`);
 	if (resolvedMethod === "tmux") {
 		await assertTmuxTargetCanReceive(normalizedId, caller);
 		await Effect.runPromise(sendKeys(normalizedId, message));
@@ -4301,7 +4423,7 @@ async function deliverAgentMessage(agentId, message, caller = "unknown", deliver
 		};
 	}
 	let appServerFailure;
-	if (resolvedMethod === "auto") {
+	if (resolvedMethod === "auto" && !isAcpTarget) {
 		const appServerSocketPath = join$1(overdeckHomeForSockets(), "sockets", `appserver-${normalizedId}.sock`);
 		if (existsSync(appServerSocketPath)) {
 			const appServerToken = readAppServerTokenSync(normalizedId);
@@ -4327,6 +4449,39 @@ async function deliverAgentMessage(agentId, message, caller = "unknown", deliver
 			}
 		}
 	}
+	let acpFailure;
+	if (resolvedMethod === "auto") {
+		const acpSocketPath = join$1(overdeckHomeForSockets(), "sockets", `acp-${normalizedId}.sock`);
+		const acpSocketExists = existsSync(acpSocketPath);
+		if (isAcpTarget || acpSocketExists) {
+			const acpToken = readAcpTokenSync(normalizedId);
+			if (!acpSocketExists) acpFailure = "socket-missing";
+			else if (!acpToken) acpFailure = "acp-token-missing";
+			else try {
+				await postUnixSocketJson(acpSocketPath, {
+					op: "message",
+					content: message,
+					meta: { caller }
+				}, 8e3, acpToken);
+				await appendChannelDeliveryLog(normalizedId, {
+					path: "acp",
+					caller
+				});
+				return {
+					ok: true,
+					path: "acp"
+				};
+			} catch (err) {
+				acpFailure = `socket-post-failed: ${err instanceof Error ? err.message : String(err)}`;
+			}
+			await appendChannelDeliveryLog(normalizedId, {
+				path: "acp",
+				reason: acpFailure,
+				caller
+			});
+			throw new Error(`MessageDeliveryFailed: ACP delivery failed for ${normalizedId} (${caller}): ${acpFailure}`);
+		}
+	}
 	let supervisorFailure;
 	if (resolvedMethod === "auto" || resolvedMethod === "supervisor") {
 		const supervisorSocketPath = join$1(overdeckHomeForSockets(), "sockets", `pty-${normalizedId}.sock`);
@@ -4383,6 +4538,7 @@ async function deliverAgentMessage(agentId, message, caller = "unknown", deliver
 			reason: channelFailure,
 			caller,
 			...appServerFailure ? { appServer: appServerFailure } : {},
+			...acpFailure ? { acp: acpFailure } : {},
 			...supervisorFailure ? { "pty-supervisor": supervisorFailure } : {},
 			...channelFailure ? { channels: channelFailure } : {}
 		});
@@ -4915,6 +5071,12 @@ function stopAgentSync(agentId) {
 		killSessionSync(normalizedId);
 	}
 	killLauncherProcessSync(normalizedId);
+	try {
+		rmSync(join$1(AGENTS_DIR, normalizedId, "git-guard"), {
+			recursive: true,
+			force: true
+		});
+	} catch {}
 	const state = getAgentStateSync(normalizedId);
 	if (state) {
 		if (!state.id) state.id = normalizedId;
@@ -4969,6 +5131,14 @@ var init_termination = __esmMin((() => {
 					throw cause;
 				}
 			}).pipe(Effect.catch(() => Effect.void));
+			yield* Effect.promise(async () => {
+				try {
+					await rm$1(join$1(AGENTS_DIR, normalizedId, "git-guard"), {
+						recursive: true,
+						force: true
+					});
+				} catch {}
+			});
 			const state = yield* getAgentState(normalizedId);
 			if (state) {
 				if (!state.id) state.id = normalizedId;
@@ -5054,18 +5224,18 @@ async function spawnRun(issueId, role, options = {}) {
 		let reapWarmIdle = false;
 		const advancing = role === "review" || role === "test" || role === "ship";
 		try {
-			const { isPaneDead } = await import("./tmux-DoThH6aj.js");
+			const { isPaneDead } = await import("./tmux-B6z7h_vZ.js");
 			if (await Effect.runPromise(isPaneDead(agentId))) reapWarmIdle = true;
 			else if (advancing) {
-				const { getReviewStatusSync } = await import("./review-status-C6n6-9f_.js");
-				const { isRoleTerminal } = await import("./reap-terminal-sessions-MWnqdLCJ.js");
+				const { getReviewStatusSync } = await import("./review-status-btEYlaxA.js");
+				const { isRoleTerminal } = await import("./reap-terminal-sessions-7KeHv1R1.js");
 				const status = getReviewStatusSync(issueId);
 				reapWarmIdle = !!status && isRoleTerminal(role, status);
 			}
 		} catch {}
 		if (!reapWarmIdle) throw new Error(`Role run ${agentId} already running. Use 'pan tell' to message it.`);
 		console.log(`[spawn] ${agentId} is warm-idle from the previous cycle — reaping it for the new ${role} dispatch (PAN-2579)`);
-		const { killSession } = await import("./tmux-DoThH6aj.js");
+		const { killSession } = await import("./tmux-B6z7h_vZ.js");
 		await Effect.runPromise(killSession(agentId)).catch(() => {});
 	}
 	await assertWorkspaceStackHealthyForSpawn(issueId, role, options.allowHost, workspace);
@@ -5075,11 +5245,12 @@ async function spawnRun(issueId, role, options = {}) {
 		role,
 		model: selectedModel
 	});
+	const isAcp = getHarnessBehavior(resolvedHarness).launchCommandKind === "acp-host";
 	const harnessLaunch = await prepareHarnessLaunch(resolvedHarness);
 	assertCodexNativeAuthForSpawn(resolvedHarness, listAgentStates());
 	await ensureLifecycleHooksBeforeLaunch(agentId, resolvedHarness);
 	if (getProviderForModelSync(selectedModel).name === "openai" && await getProviderAuthMode(selectedModel) === "subscription") {
-		const { isCliproxyRunning } = await import("./cliproxy-DW0V86F8.js");
+		const { isCliproxyRunning } = await import("./cliproxy-fHfIeiGd.js");
 		if (!await Effect.runPromise(isCliproxyRunning())) throw new Error("CLIProxyAPI sidecar is not running. GPT subscription role runs route through a local cliproxy process managed by `pan up`. Run `pan up` (or restart the dashboard) before spawning a GPT role run.");
 	}
 	const state = {
@@ -5102,6 +5273,7 @@ async function spawnRun(issueId, role, options = {}) {
 	const shouldDeliverPromptViaTmux = shouldRegisterConversation && resolvedHarness === "claude-code";
 	const shouldDeliverPromptViaPi = shouldRegisterConversation && resolvedHarness === "ohmypi";
 	const shouldDeliverPromptViaCodexTui = shouldRegisterConversation && resolvedHarness === "codex";
+	const shouldDeliverPromptViaAcp = resolvedHarness === "acp";
 	const prompt = options.prompt ? await withSpawnTimeMemoryContext({
 		prompt: options.prompt,
 		issueId,
@@ -5112,26 +5284,29 @@ async function spawnRun(issueId, role, options = {}) {
 	}) : "";
 	let promptFile;
 	const tracksKickoffDelivery = role === "flywheel";
-	if (prompt && (tracksKickoffDelivery || !shouldDeliverPromptViaTmux && !shouldDeliverPromptViaPi && !shouldDeliverPromptViaCodexTui)) {
+	if (prompt && !shouldDeliverPromptViaAcp && (tracksKickoffDelivery || !shouldDeliverPromptViaTmux && !shouldDeliverPromptViaPi && !shouldDeliverPromptViaCodexTui)) {
 		promptFile = join$1(getAgentDir(agentId), "initial-prompt.md");
 		await writeFile$1(promptFile, prompt);
-		if (tracksKickoffDelivery) {
-			state.kickoffDelivered = false;
-			await Effect.runPromise(saveAgentState(state));
-		}
 	}
-	const provider = getProviderForModelSync(selectedModel);
-	if (provider.authType === "credential-file") setupCredentialFileAuthSync(provider, workspace);
-	else clearCredentialFileAuthSync(workspace);
-	const providerExports = await getProviderExportsForModel(selectedModel);
-	const providerEnv = await getProviderEnvForModel(selectedModel);
+	if (prompt && tracksKickoffDelivery) {
+		state.kickoffDelivered = false;
+		await Effect.runPromise(saveAgentState(state));
+	}
+	if (!isAcp) {
+		const provider = getProviderForModelSync(selectedModel);
+		if (provider.authType === "credential-file") setupCredentialFileAuthSync(provider, workspace);
+		else clearCredentialFileAuthSync(workspace);
+	}
+	const providerExports = isAcp ? void 0 : await getProviderExportsForModel(selectedModel);
+	const providerEnv = isAcp ? {} : await getProviderEnvForModel(selectedModel);
 	const piLauncherFields = resolvedHarness === "ohmypi" ? await getOhmypiLauncherFields(agentId, selectedModel) : {};
 	const codexLauncherFields = resolvedHarness === "codex" ? getCodexLauncherFields(agentId, selectedModel, workspace, role) : {};
+	const acpLauncherFields = isAcp ? getAcpLauncherFields(agentId, selectedModel, workspace, harnessLaunch.binaryPath, role) : {};
 	let sessionId;
 	let rawSessionId;
 	if (shouldRegisterConversation) {
-		rawSessionId = options.resumeSessionId ?? randomUUID();
-		try {
+		rawSessionId = isAcp ? options.resumeSessionId : options.resumeSessionId ?? randomUUID();
+		if (!isAcp && rawSessionId) try {
 			const agentDir = getAgentDir(agentId);
 			await mkdir$1(agentDir, { recursive: true });
 			await writeFile$1(join$1(agentDir, "session.id"), rawSessionId, "utf-8");
@@ -5184,14 +5359,15 @@ async function spawnRun(issueId, role, options = {}) {
 		reviewSignal: void 0,
 		trapHup: void 0,
 		...piLauncherFields,
-		...codexLauncherFields
+		...codexLauncherFields,
+		...acpLauncherFields
 	});
 	const launcherScript = join$1(getAgentDir(agentId), "launcher.sh");
 	await writeLauncherScriptAtomic(launcherScript, launcherContent);
 	const claudeCmd = `bash ${launcherScript}`;
 	console.log(`[claude-invoke] purpose=role-run | role=${role} | model=${state.model} | source=agents.ts:spawnRun | session=${agentId} | command="${claudeCmd}"`);
 	try {
-		const { preTrustDirectory } = await import("./workspace-manager-ZTdJAy9M.js");
+		const { preTrustDirectory } = await import("./workspace-manager-CWT55qeI.js");
 		preTrustDirectory(workspace);
 	} catch {}
 	clearReadySignal(agentId);
@@ -5216,7 +5392,22 @@ async function spawnRun(issueId, role, options = {}) {
 	await Effect.runPromise(setOption(agentId, "destroy-unattached", "off"));
 	await Effect.runPromise(setOption(exactPaneTarget(agentId), "remain-on-exit", "on"));
 	if (prompt) {
-		if (shouldDeliverPromptViaPi) try {
+		if (shouldDeliverPromptViaAcp) try {
+			await waitForPromptReady(agentId, resolvedHarness, 30);
+			const delivery = await deliverAgentMessage(agentId, prompt, "spawnRun:initial-prompt");
+			if (!delivery.ok) throw new Error(delivery.failure ?? `ACP delivery returned ok=false via ${delivery.path}`);
+			if (tracksKickoffDelivery) {
+				state.kickoffDelivered = true;
+				await Effect.runPromise(saveAgentState(state));
+			}
+		} catch (err) {
+			const message = err instanceof Error ? err.message : String(err);
+			console.error(`[${agentId}] ACP prompt delivery failed:`, message);
+			if (tracksKickoffDelivery) await recordKickoffDeliveryFailure(state, issueId, role);
+			await Effect.runPromise(stopAgent(agentId));
+			throw new Error(`Agent ${agentId} kickoff delivery failed: ${message}`);
+		}
+		else if (shouldDeliverPromptViaPi) try {
 			await writeOhmypiAgentPrompt(agentId, prompt);
 			if (tracksKickoffDelivery) {
 				state.kickoffDelivered = true;
@@ -5271,7 +5462,7 @@ async function spawnAgent(options) {
 	});
 	console.log(`[DEBUG] Selected model: ${selectedModel}`);
 	if (getProviderForModelSync(selectedModel).name === "openai" && await getProviderAuthMode(selectedModel) === "subscription") {
-		const { isCliproxyRunning } = await import("./cliproxy-DW0V86F8.js");
+		const { isCliproxyRunning } = await import("./cliproxy-fHfIeiGd.js");
 		if (!await Effect.runPromise(isCliproxyRunning())) throw new Error("CLIProxyAPI sidecar is not running. GPT subscription agents route through a local cliproxy process managed by `pan up`. Run `pan up` (or restart the dashboard) before spawning a GPT agent.");
 	}
 	const resolvedHarness = await resolveHarness({
@@ -5279,6 +5470,7 @@ async function spawnAgent(options) {
 		role,
 		model: selectedModel
 	});
+	const isAcp = getHarnessBehavior(resolvedHarness).launchCommandKind === "acp-host";
 	const harnessLaunch = await prepareHarnessLaunch(resolvedHarness);
 	assertCodexNativeAuthForSpawn(resolvedHarness, listAgentStates());
 	await ensureLifecycleHooksBeforeLaunch(agentId, resolvedHarness);
@@ -5301,7 +5493,7 @@ async function spawnAgent(options) {
 	if (role === "work") {
 		try {
 			if (resetPipelineVerdictsForWorkStartSync(options.issueId)) {
-				const { resetPostMergeState } = await import("./merge-agent-BQM3a8z5.js");
+				const { resetPostMergeState } = await import("./merge-agent-CKkgIBPB.js");
 				resetPostMergeState(options.issueId);
 			}
 		} catch (err) {
@@ -5312,7 +5504,7 @@ async function spawnAgent(options) {
 		});
 	}
 	if (role === "work") try {
-		const { writeStoryFeatureContext } = await import("./work-agent-prompt-Yb2bd3Fq.js");
+		const { writeStoryFeatureContext } = await import("./work-agent-prompt-Du8Vh2aJ.js");
 		await writeStoryFeatureContext(options.workspace, options.issueId);
 	} catch (ctxErr) {
 		console.warn(`[agents] Could not write story feature context for ${options.issueId}: ${ctxErr.message}`);
@@ -5351,17 +5543,15 @@ async function spawnAgent(options) {
 	});
 	const promptFile = join$1(getAgentDir(agentId), "initial-prompt.md");
 	const tracksKickoffDelivery = role === "work" || role === "strike";
-	if (prompt) {
-		await writeFile$1(promptFile, prompt);
-		if (tracksKickoffDelivery) {
-			state.kickoffDelivered = false;
-			saveAgentStateSync(state);
-		}
+	if (prompt && !isAcp) await writeFile$1(promptFile, prompt);
+	if (prompt && tracksKickoffDelivery) {
+		state.kickoffDelivered = false;
+		saveAgentStateSync(state);
 	}
 	try {
 		const venvPath = join$1(options.workspace, ".venv");
 		if (isTldrEnabledSync() && existsSync(venvPath)) {
-			const { getTldrDaemonServiceSync } = await import("./tldr-daemon-DL566HbH.js");
+			const { getTldrDaemonServiceSync } = await import("./tldr-daemon-BYFkts95.js");
 			const tldrService = getTldrDaemonServiceSync(options.workspace, venvPath);
 			if (!(await tldrService.getStatus()).running) {
 				await tldrService.start(true);
@@ -5391,6 +5581,7 @@ async function spawnAgent(options) {
 		useSupervisor: supervisorLaunch.useSupervisor,
 		supervisorScriptPath: supervisorLaunch.supervisorScriptPath,
 		harness: state.harness ?? "claude-code",
+		harnessBinaryPath: harnessLaunch.binaryPath,
 		sessionId: state.sessionId,
 		extraEnvExports: [harnessLaunch.pathExport, ...flywheelEnvExports(flywheelEnv)],
 		effort: options.effort
@@ -5401,13 +5592,13 @@ async function spawnAgent(options) {
 	const claudeCmd = `bash ${launcherScript}`;
 	console.log(`[claude-invoke] purpose=work-agent | model=${state.model} | source=agents.ts:spawnAgent | session=${agentId} | command="${claudeCmd}"`);
 	try {
-		const { preTrustDirectory } = await import("./workspace-manager-ZTdJAy9M.js");
+		const { preTrustDirectory } = await import("./workspace-manager-CWT55qeI.js");
 		preTrustDirectory(options.workspace);
 	} catch {}
 	try {
-		const { isGitHubAppConfigured, generateInstallationToken, configureWorkspaceForBot } = await import("./github-app-CPfoFAdV.js");
+		const { isGitHubAppConfigured, generateInstallationToken, configureWorkspaceForBot } = await import("./github-app-ClZ2lk8D.js");
 		if (isGitHubAppConfigured()) {
-			const { findProjectByPathSync } = await import("./projects-9SkRpES9.js");
+			const { findProjectByPathSync } = await import("./projects-vjjcmiN8.js");
 			const ghRepo = findProjectByPathSync(resolve$1(options.workspace, "..", ".."))?.github_repo;
 			if (ghRepo) {
 				const [owner, repo] = ghRepo.split("/");
@@ -5437,7 +5628,22 @@ async function spawnAgent(options) {
 		sessionHarness: resolvedHarness
 	});
 	const dismissChannelsDialogPromise = channelsBridgeMcpConfig ? dismissDevChannelsDialog(agentId).catch(() => void 0) : null;
-	if (prompt && resolvedHarness === "ohmypi") try {
+	if (prompt && isAcp) try {
+		await waitForPromptReady(agentId, resolvedHarness, 30);
+		const delivery = await deliverAgentMessage(agentId, prompt, "spawnAgent:initial-prompt");
+		if (!delivery.ok) throw new Error(delivery.failure ?? `ACP delivery returned ok=false via ${delivery.path}`);
+		if (tracksKickoffDelivery) {
+			state.kickoffDelivered = true;
+			saveAgentStateSync(state);
+		}
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		console.error(`[${agentId}] ACP prompt delivery failed:`, message);
+		if (tracksKickoffDelivery) await recordKickoffDeliveryFailure(state, options.issueId, role);
+		await Effect.runPromise(stopAgent(agentId));
+		throw new Error(`Agent ${agentId} kickoff delivery failed: ${message}`);
+	}
+	else if (prompt && resolvedHarness === "ohmypi") try {
 		await writeOhmypiAgentPrompt(agentId, prompt);
 		if (tracksKickoffDelivery) {
 			state.kickoffDelivered = true;
@@ -5470,7 +5676,7 @@ async function spawnAgent(options) {
 		const codexHomeForAgent = join$1(homedir(), ".overdeck", "agents", agentId, "codex-home");
 		(async () => {
 			try {
-				const { waitForCodexRollout, extractThreadIdFromRollout, writeThreadId } = await import("./codex-Dg7Is5yb.js");
+				const { waitForCodexRollout, extractThreadIdFromRollout, writeThreadId } = await import("./codex-GcHuUF-k.js");
 				const rollout = await waitForCodexRollout(codexHomeForAgent, 12e4);
 				if (rollout) {
 					const threadId = extractThreadIdFromRollout(rollout);
@@ -6098,6 +6304,11 @@ function pickFreshestExistingSessionIdSync(agentId, candidates) {
 function getLatestSessionIdSync(agentId) {
 	const codexThreadId = resolveCodexThreadIdSync(agentId);
 	if (codexThreadId) return codexThreadId;
+	const agentState = getAgentStateSync(agentId);
+	if (agentState?.harness && getHarnessBehavior(agentState.harness).sessionIdSource === "acp-session-id") try {
+		const acpSessionId = readFileSync(join$1(getAgentDir(agentId), "acp-session-id"), "utf-8").trim();
+		if (acpSessionId) return acpSessionId;
+	} catch {}
 	const fromSessionFile = getSessionId(agentId);
 	if (fromSessionFile) return fromSessionFile;
 	const sessionsFile = join$1(getAgentDir(agentId), "sessions.json");
@@ -6119,7 +6330,6 @@ function getLatestSessionIdSync(agentId) {
 			if (threadId) return threadId;
 		}
 	} catch {}
-	const agentState = getAgentStateSync(agentId);
 	if (agentState?.harness && getHarnessBehavior(agentState.harness).sessionIdSource === "transcript-jsonl") {
 		const ohmypiSessionId = resolveLatestOhmypiSessionId(agentId);
 		if (ohmypiSessionId) return ohmypiSessionId;
@@ -6200,6 +6410,10 @@ function queueAgentMail(agentId, message, pendingTurnEndDelivery = false) {
 	mkdirSync(mailDir, { recursive: true });
 	writeFileSync(join$1(mailDir, `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}${pendingTurnEndDelivery ? ".pending" : ""}.md`), `# Message\n\n${message}\n`);
 }
+function resolveAgentDeliveryMethod(state) {
+	if (state?.harness === "acp") return "auto";
+	return resilientDeliveryMethod(state?.deliveryMethod);
+}
 function claimCodexIdleTurn(agentId) {
 	try {
 		unlinkSync(join$1(getAgentDir(agentId), "turn-completed"));
@@ -6244,7 +6458,11 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 		queueAgentMail(normalizedId, message);
 		logAgentLifecycleSync(normalizedId, `messageAgent queued mail without resume: ${gateBlockReason}`);
 		console.log(`[agents] Queued message for ${normalizedId}; ${gateBlockReason}`);
-		return;
+		return {
+			delivered: false,
+			queuedToMail: true,
+			reason: gateBlockReason
+		};
 	}
 	if (getAgentRuntimeStateSync(normalizedId)?.state === "suspended") {
 		const suspendedGate = decideMessageGate();
@@ -6253,15 +6471,22 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 			queueAgentMail(normalizedId, message);
 			logAgentLifecycleSync(normalizedId, `messageAgent queued mail without resume: ${gateBlockReason}`);
 			console.log(`[agents] Queued message for ${normalizedId}; ${gateBlockReason}`);
-			return;
+			return {
+				delivered: false,
+				queuedToMail: true,
+				reason: gateBlockReason
+			};
 		}
 		console.log(`[agents] Auto-resuming suspended agent ${normalizedId} to deliver message`);
-		const { resumeAgent } = await import("./agents-FlIgQ3ql.js");
+		const { resumeAgent } = await import("./agents-wi9NWzs2.js");
 		const result = await resumeAgent(normalizedId, message);
 		if (!result.success) throw new Error(`Failed to auto-resume agent: ${result.error}`);
 		if (result.messageDelivered === false) throw new Error(`Agent resumed but ready signal did not fire — message not delivered. Feedback is in the mail queue.`);
 		await appendTellInterventionForUserSource(normalizedId, caller);
-		return;
+		return {
+			delivered: true,
+			queuedToMail: false
+		};
 	}
 	if (agentState && agentState.status === "stopped") {
 		const stoppedGate = decideMessageGate();
@@ -6270,16 +6495,23 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 			queueAgentMail(normalizedId, message);
 			logAgentLifecycleSync(normalizedId, `messageAgent queued mail without resume: ${gateBlockReason}`);
 			console.log(`[agents] Queued message for ${normalizedId}; ${gateBlockReason}`);
-			return;
+			return {
+				delivered: false,
+				queuedToMail: true,
+				reason: gateBlockReason
+			};
 		}
 		console.log(`[agents] Auto-resuming stopped agent ${normalizedId} to deliver feedback (session exists: ${await Effect.runPromise(sessionExists(normalizedId))})`);
-		const { resumeAgent } = await import("./agents-FlIgQ3ql.js");
+		const { resumeAgent } = await import("./agents-wi9NWzs2.js");
 		const resumeResult = await resumeAgent(normalizedId, message);
 		queueAgentMail(normalizedId, message);
 		if (resumeResult.success && resumeResult.messageDelivered !== false) {
 			await appendTellInterventionForUserSource(normalizedId, caller);
 			console.log(`[agents] Resumed ${normalizedId} and delivered feedback`);
-			return;
+			return {
+				delivered: true,
+				queuedToMail: true
+			};
 		}
 		if (!resumeResult.success) console.warn(`[agents] Resume failed for ${normalizedId}: ${resumeResult.error} — falling back to fresh launch`);
 		else console.warn(`[agents] Resume succeeded for ${normalizedId} but message not delivered (ready signal timed out) — falling back to fresh launch`);
@@ -6292,7 +6524,11 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 				message: `${normalizedId}: ${stopMsg}`,
 				issueId: agentState.issueId
 			});
-			return;
+			return {
+				delivered: false,
+				queuedToMail: true,
+				reason: stopMsg
+			};
 		}
 		const providerEnv = agentState.model ? await getProviderEnvForModel(agentState.model) : {};
 		if (agentState.model) {
@@ -6310,7 +6546,7 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 		const resumeModel = agentState.model || "claude-sonnet-4-6";
 		const fallbackHarness = agentState.harness ?? "claude-code";
 		const harnessLaunch = await prepareHarnessLaunch(fallbackHarness);
-		const { assertWorkspaceStackHealthyForSpawn } = await import("./agents-FlIgQ3ql.js");
+		const { assertWorkspaceStackHealthyForSpawn } = await import("./agents-wi9NWzs2.js");
 		await assertWorkspaceStackHealthyForSpawn(agentState.issueId || normalizedId.replace(/^agent-/, "").toUpperCase(), resumeRole, agentState.hostOverride === true, agentState.workspace);
 		const fallbackPiFields = fallbackHarness === "ohmypi" ? await getOhmypiLauncherFields(normalizedId, resumeModel) : {};
 		const fallbackCodexFields = fallbackHarness === "codex" ? getCodexLauncherFields(normalizedId, resumeModel, agentState.workspace, resumeRole) : {};
@@ -6341,7 +6577,10 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 		saveAgentStateSync(agentState);
 		const ready = await waitForPromptReady(normalizedId, fallbackHarness, 30);
 		const resumeMessage = await buildResumeMessageForAgent(agentState, `You are resuming work on ${agentState.issueId}. Check .pan/feedback/ for specialist feedback that arrived while you were stopped, then continue working.\n\n${message}`, message);
+		let delivered = false;
+		let reason;
 		if (resumeMessage.error) {
+			reason = resumeMessage.error;
 			console.error(`[agents] Fallback-restarted ${normalizedId} but ${resumeMessage.error}`);
 			emitActivityEntrySync({
 				source: "work-agent",
@@ -6350,7 +6589,6 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 				issueId: agentState.issueId
 			});
 		} else if (ready && resumeMessage.message) {
-			let delivered = false;
 			if (fallbackHarness === "claude-code") {
 				const fallbackSessionId = getLatestSessionIdSync(normalizedId);
 				if (fallbackSessionId) {
@@ -6360,28 +6598,48 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 						sessionId: fallbackSessionId,
 						message: resumeMessage.message,
 						caller: "resumeAgent:resume-prompt",
-						deliveryMethod: resilientDeliveryMethod(agentState.deliveryMethod)
+						deliveryMethod: resolveAgentDeliveryMethod(agentState)
 					});
 					delivered = delivery.delivered;
-					if (!delivery.delivered) console.error(`[agents] Fallback resume prompt did not land after ${delivery.attempts} delivery attempts`);
-				} else console.error(`[agents] Fallback-restarted ${normalizedId} but no session id was recorded — feedback in mail queue`);
-			} else delivered = (await deliverAgentMessage(normalizedId, resumeMessage.message, "resumeAgent:resume-prompt", resilientDeliveryMethod(agentState.deliveryMethod))).ok;
+					if (!delivery.delivered) {
+						reason = `resume prompt did not land after ${delivery.attempts} delivery attempts`;
+						console.error(`[agents] Fallback resume prompt did not land after ${delivery.attempts} delivery attempts`);
+					}
+				} else {
+					reason = "no session id was recorded";
+					console.error(`[agents] Fallback-restarted ${normalizedId} but no session id was recorded — feedback in mail queue`);
+				}
+			} else {
+				const delivery = await deliverAgentMessage(normalizedId, resumeMessage.message, "resumeAgent:resume-prompt", resolveAgentDeliveryMethod(agentState));
+				delivered = delivery.ok;
+				if (!delivery.ok) reason = "resume prompt delivery failed";
+			}
 			if (delivered) {
 				if (resumeMessage.redeliveringKickoff) markKickoffRedelivered(agentState);
 				await appendTellInterventionForUserSource(normalizedId, caller);
 				console.log(`[agents] Fallback-restarted ${normalizedId} and delivered feedback`);
 			}
-		} else console.warn(`[agents] Fallback-restarted ${normalizedId} but ready signal not detected — feedback in mail queue`);
-		return;
+		} else {
+			reason = "ready signal not detected";
+			console.warn(`[agents] Fallback-restarted ${normalizedId} but ready signal not detected — feedback in mail queue`);
+		}
+		return {
+			delivered,
+			queuedToMail: true,
+			...reason ? { reason } : {}
+		};
 	}
-	const { loadRemoteAgentState, sendToRemoteAgent } = await import("./remote-agents-CRCg1L4H.js");
+	const { loadRemoteAgentState, sendToRemoteAgent } = await import("./remote-agents-CA3Ihlxj.js");
 	const remoteState = loadRemoteAgentState(normalizedId);
 	if (remoteState && remoteState.vmName) {
 		console.log(`[agents] Sending message to remote agent ${normalizedId} on ${remoteState.vmName}`);
 		await sendToRemoteAgent(normalizedId, remoteState.vmName, message);
 		queueAgentMail(normalizedId, message);
 		await appendTellInterventionForUserSource(normalizedId, caller);
-		return;
+		return {
+			delivered: true,
+			queuedToMail: true
+		};
 	}
 	const expectedHarness = agentState?.harness ?? "claude-code";
 	let appServerState;
@@ -6394,31 +6652,46 @@ async function messageAgent(agentId, message, caller = "internal", opts = {}) {
 			logAgentLifecycleSync(normalizedId, "messageAgent queued mail for codex turn-end delivery: agent busy");
 			console.log(`[agents] Queued message for ${normalizedId}; codex agent is mid-turn`);
 			await appendTellInterventionForUserSource(normalizedId, caller);
-			return;
+			return {
+				delivered: true,
+				queuedToMail: true,
+				reason: "queued for turn-end delivery"
+			};
 		}
-		const deliveryMethod = resilientDeliveryMethod(agentState?.deliveryMethod);
-		await deliverAgentMessage(normalizedId, message, `messageAgent:${caller}`, deliveryMethod);
+		const deliveryMethod = resolveAgentDeliveryMethod(agentState);
+		const delivery = await deliverAgentMessage(normalizedId, message, `messageAgent:${caller}`, deliveryMethod);
 		queueAgentMail(normalizedId, message);
 		await appendTellInterventionForUserSource(normalizedId, caller);
-		return;
+		return {
+			delivered: delivery.ok,
+			queuedToMail: true
+		};
 	}
 	if (!await Effect.runPromise(sessionExists(normalizedId))) throw new Error(`Agent ${normalizedId} not running`);
 	const panePids = await Effect.runPromise(listPaneValues(normalizedId, "#{pane_pid}"));
 	if (panePids.length > 0 && !await hasAgentRuntimeInSubtree(panePids[0], expectedHarness)) {
 		console.warn(`[agents] ${normalizedId} tmux session is a zombie (no ${expectedHarness} runtime) — attempting resume`);
-		const { resumeAgent } = await import("./agents-FlIgQ3ql.js");
+		const { resumeAgent } = await import("./agents-wi9NWzs2.js");
 		const resumeResult = await resumeAgent(normalizedId, message);
 		if (resumeResult.success) {
-			if (resumeResult.messageDelivered !== false) await appendTellInterventionForUserSource(normalizedId, caller);
-			return;
+			const delivered = resumeResult.messageDelivered !== false;
+			if (delivered) await appendTellInterventionForUserSource(normalizedId, caller);
+			return {
+				delivered,
+				queuedToMail: false
+			};
 		}
 		throw new Error(`Agent ${normalizedId} session is dead and resume failed: ${resumeResult.error}`);
 	}
 	if (!await waitForAgentIdle(normalizedId, 5e3)) console.warn(`[agents] ${normalizedId} not at idle prompt after 5s — sending message anyway`);
-	const deliveryMethod = resilientDeliveryMethod(agentState?.deliveryMethod);
-	await deliverAgentMessage(normalizedId, message, `messageAgent:${caller}`, deliveryMethod);
+	const deliveryMethod = resolveAgentDeliveryMethod(agentState);
+	const delivery = await deliverAgentMessage(normalizedId, message, `messageAgent:${caller}`, deliveryMethod);
 	queueAgentMail(normalizedId, message);
 	await appendTellInterventionForUserSource(normalizedId, caller);
+	return {
+		delivered: delivery.ok,
+		queuedToMail: true
+	};
 }
 var USER_MESSAGE_INTERVENTION_SOURCES;
 var init_messaging = __esmMin((() => {
@@ -6487,6 +6760,54 @@ var init_context_overflow = __esmMin((() => {
 	];
 }));
 //#endregion
+//#region ../../lib/agents/session-pointers.ts
+/**
+* Clear every mutable pointer that can make a later launch resume an old
+* session. Claude JSONL transcripts live outside the agent directory and are
+* deliberately never touched.
+*/
+async function clearAgentSessionPointers(agentId) {
+	const agentDir = getAgentDir(agentId);
+	const cleared = [];
+	for (const name of [
+		"session.id",
+		"sessions.json",
+		"codex-thread-id",
+		"launcher.sh"
+	]) {
+		const path = join(agentDir, name);
+		if (!existsSync$1(path)) continue;
+		unlinkSync$1(path);
+		cleared.push(name);
+	}
+	const runtimeFile = join(agentDir, "runtime.json");
+	if (existsSync$1(runtimeFile)) try {
+		const runtime = JSON.parse(readFileSync$1(runtimeFile, "utf-8"));
+		if (Object.prototype.hasOwnProperty.call(runtime, "claudeSessionId")) {
+			delete runtime.claudeSessionId;
+			writeFileSync$1(runtimeFile, JSON.stringify(runtime, null, 2));
+			cleared.push("runtime.json:claudeSessionId");
+		}
+	} catch {}
+	const state = getAgentStateSync(agentId);
+	if (state?.sessionId) {
+		delete state.sessionId;
+		saveAgentStateSync(state);
+		cleared.push("agents.session_id");
+	}
+	await Effect.runPromise(emitAgentEvent(agentId, {
+		kind: "model_set",
+		model: state?.model ?? "unknown",
+		claudeSessionId: null
+	}));
+	cleared.push("runtime.claudeSessionId");
+	return { cleared };
+}
+var init_session_pointers = __esmMin((() => {
+	init_agent_runtime();
+	init_agent_state();
+}));
+//#endregion
 //#region ../../lib/agents/resume.ts
 /**
 * Resume a suspended agent (PAN-80)
@@ -6519,7 +6840,7 @@ async function buildCompactRecoverySeed(agentId) {
 	if (agentState?.workspace && sessionId) {
 		const sessionFile = sessionFilePath(agentState.workspace, sessionId);
 		try {
-			const [{ getConversationCompactionSettings }, { generateSmartSummary }] = await Promise.all([import("./conversation-compaction-DiG5zWQq.js"), import("./smart-compaction-CHIxLr_d.js")]);
+			const [{ getConversationCompactionSettings }, { generateSmartSummary }] = await Promise.all([import("./conversation-compaction-eQB5CkOe.js"), import("./smart-compaction-CV2ukKND.js")]);
 			const settings = getConversationCompactionSettings();
 			summary = (await Effect.runPromise(generateSmartSummary({
 				jsonlPath: sessionFile,
@@ -6530,7 +6851,7 @@ async function buildCompactRecoverySeed(agentId) {
 		} catch (err) {
 			logAgentLifecycleSync(normalizedId, `compact-recovery smart summary failed (${err instanceof Error ? err.message : String(err)}); trying heuristic fallback`);
 			try {
-				const { generateFallbackSummary } = await import("./summary-fork-D8bXjCr7.js");
+				const { generateFallbackSummary } = await import("./summary-fork-DpcxN9tf.js");
 				summary = await Effect.runPromise(generateFallbackSummary(sessionFile));
 			} catch (fallbackErr) {
 				logAgentLifecycleSync(normalizedId, `compact-recovery fallback summary failed (${fallbackErr instanceof Error ? fallbackErr.message : String(fallbackErr)}); seeding with reseed instructions only`);
@@ -6655,7 +6976,13 @@ async function resumeAgent(agentId, message, opts) {
 		if (legacyHarnessMigrated) resumeDriftReasons.push(`legacy harness ${priorHarness}→${effectiveHarness} (PAN-1797 re-default)`);
 		const piDeadRecovery = effectiveHarness === "ohmypi" && !piProcessWasAlive && !compactSeed && resumeDriftReasons.length === 0;
 		if (piDeadRecovery) logAgentLifecycleSync(normalizedId, "resumeAgent: dead ohmypi process — fresh-launching for recovery instead of omp --resume (PAN-2009)");
-		const shouldResumeSavedSession = !compactSeed && resumeDriftReasons.length === 0 && !piDeadRecovery;
+		const expectedClaudeJsonl = sessionFilePath(agentState.workspace, sessionId);
+		const claudeJsonlMissingRecovery = effectiveHarness === "claude-code" && !compactSeed && resumeDriftReasons.length === 0 && !existsSync(expectedClaudeJsonl);
+		if (claudeJsonlMissingRecovery) {
+			logAgentLifecycleSync(normalizedId, `resumeAgent: saved Claude transcript is missing at ${expectedClaudeJsonl} — clearing stale pointers and fresh-launching (PAN-2895)`);
+			await clearAgentSessionPointers(normalizedId);
+		}
+		const shouldResumeSavedSession = !compactSeed && resumeDriftReasons.length === 0 && !piDeadRecovery && !claudeJsonlMissingRecovery;
 		if (sessionRotationRefused({
 			compactSeed: Boolean(compactSeed),
 			driftReasons: resumeDriftReasons,
@@ -6676,12 +7003,14 @@ async function resumeAgent(agentId, message, opts) {
 		}
 		const freshSessionId = !shouldResumeSavedSession && effectiveHarness === "claude-code" ? randomUUID() : void 0;
 		if (resumeDriftReasons.length > 0) logAgentLifecycleSync(normalizedId, `resumeAgent: starting fresh session instead of --resume because session origin drifted (${resumeDriftReasons.join(", ")})`);
-		if (freshSessionId) saveSessionId(normalizedId, freshSessionId);
-		else if (!shouldResumeSavedSession) try {
+		if (freshSessionId) {
+			saveSessionId(normalizedId, freshSessionId);
+			agentState.sessionId = freshSessionId;
+		} else if (!shouldResumeSavedSession) try {
 			unlinkSync(join$1(getAgentDir(normalizedId), "session.id"));
 		} catch {}
 		const issueId = agentState.issueId || normalizedId.replace(/^agent-/, "").toUpperCase();
-		const defaultResumeMessage = buildDefaultResumeContinueMessage(issueId);
+		const defaultResumeMessage = buildResumeContinueMessage(agentState);
 		const resumeMessage = compactSeed ? {
 			message: message ? `${compactSeed}\n\n${message}` : compactSeed,
 			redeliveringKickoff: false
@@ -6715,6 +7044,7 @@ async function resumeAgent(agentId, message, opts) {
 			} : {},
 			sessionId: freshSessionId,
 			harness: effectiveHarness,
+			harnessBinaryPath: harnessLaunch.binaryPath,
 			useSupervisor: supervisorLaunch.useSupervisor,
 			supervisorScriptPath: supervisorLaunch.supervisorScriptPath,
 			extraEnvExports: [harnessLaunch.pathExport]
@@ -6730,6 +7060,11 @@ async function resumeAgent(agentId, message, opts) {
 			CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION: "false",
 			...providerEnv
 		} }));
+		if (freshSessionId) await saveAgentRuntimeState(normalizedId, {
+			claudeSessionId: freshSessionId,
+			sessionModel: model,
+			sessionHarness: effectiveHarness
+		});
 		let messageDelivered = false;
 		if (effectiveHarness === "ohmypi") try {
 			await writeOhmypiAgentPrompt(normalizedId, effectiveMessage);
@@ -6739,7 +7074,18 @@ async function resumeAgent(agentId, message, opts) {
 			const msg = err instanceof Error ? err.message : String(err);
 			console.error(`[resumeAgent] ohmypi prompt delivery failed: ${msg}`);
 		}
-		else if (effectiveHarness === "codex") {
+		else if (effectiveHarness === "acp") {
+			const delivery = await deliverInitialPromptWithRetry(normalizedId, effectiveMessage, "resumeAgent:acp-continue");
+			messageDelivered = delivery.ok;
+			if (delivery.ok && resumeMessage.redeliveringKickoff) markKickoffRedelivered(agentState);
+			if (!delivery.ok) {
+				await Effect.runPromise(killSession(normalizedId));
+				return {
+					success: false,
+					error: `ACP continue prompt did not land: ${delivery.failure ?? "unknown failure"}`
+				};
+			}
+		} else if (effectiveHarness === "codex") {
 			const delivery = await deliverInitialPromptWithRetry(normalizedId, effectiveMessage, "resumeAgent:codex-continue", resilientDeliveryMethod(agentState.deliveryMethod));
 			messageDelivered = delivery.ok;
 			if (delivery.ok && resumeMessage.redeliveringKickoff) markKickoffRedelivered(agentState);
@@ -6768,6 +7114,9 @@ async function resumeAgent(agentId, message, opts) {
 		} else if (piDeadRecovery) {
 			console.log(`[agents] Respawned ${normalizedId} fresh because the prior Pi process was dead (archived session ${sessionId})`);
 			logAgentLifecycleSync(normalizedId, `resumeAgent SUCCESS: fresh respawn after dead Pi process (archived sessionId=${sessionId}), messageDelivered=${messageDelivered}`);
+		} else if (claudeJsonlMissingRecovery) {
+			console.log(`[agents] Respawned ${normalizedId} fresh because the saved Claude transcript was missing (stale session ${sessionId}${freshSessionId ? `, new session ${freshSessionId}` : ""})`);
+			logAgentLifecycleSync(normalizedId, `resumeAgent SUCCESS: fresh respawn after missing Claude JSONL (stale sessionId=${sessionId}${freshSessionId ? `, newSessionId=${freshSessionId}` : ""}), messageDelivered=${messageDelivered}`);
 		} else if (!shouldResumeSavedSession) {
 			console.log(`[agents] Respawned ${normalizedId} fresh because session origin drifted (archived session ${sessionId}${freshSessionId ? `, new session ${freshSessionId}` : ""})`);
 			logAgentLifecycleSync(normalizedId, `resumeAgent SUCCESS: fresh respawn after origin drift (archived sessionId=${sessionId}${freshSessionId ? `, newSessionId=${freshSessionId}` : ""}), messageDelivered=${messageDelivered}`);
@@ -6850,6 +7199,7 @@ var init_resume = __esmMin((() => {
 	init_tmux();
 	init_agent_state();
 	init_activity();
+	init_session_pointers();
 	init_delivery();
 	init_identity();
 	init_runtime_state();
@@ -6885,7 +7235,7 @@ var init_graceful_restart = __esmMin((() => {
 //#endregion
 //#region ../../lib/agents/recovery.ts
 function resolveRecoveryResumeSessionId(agentId, harness) {
-	if (harness !== "codex") return void 0;
+	if (harness !== "codex" && harness !== "acp") return void 0;
 	return getLatestSessionIdSync(agentId) ?? void 0;
 }
 async function restartAgent(agentId, opts = {}) {
@@ -6945,6 +7295,7 @@ async function restartAgent(agentId, opts = {}) {
 			role: agentState.role,
 			isPlanning: agentState.role === "plan",
 			harness: effectiveHarness,
+			harnessBinaryPath: harnessLaunch.binaryPath,
 			useSupervisor: supervisorLaunch.useSupervisor,
 			supervisorScriptPath: supervisorLaunch.supervisorScriptPath,
 			extraEnvExports: [harnessLaunch.pathExport]
@@ -6962,18 +7313,20 @@ async function restartAgent(agentId, opts = {}) {
 			GIT_SEQUENCE_EDITOR: "false",
 			...providerEnv
 		} }));
-		const prompt = message || `You are resuming work on ${agentState.issueId}. Read .pan/continue.json for context and pick up where you left off.`;
+		const prompt = message || buildResumeContinueMessage(agentState);
 		if (effectiveHarness === "ohmypi") try {
 			await writeOhmypiAgentPrompt(normalizedId, prompt);
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
 			console.error(`[restartAgent] ohmypi prompt delivery failed for ${normalizedId}: ${msg}`);
 		}
-		else if (await waitForPromptReady(normalizedId, effectiveHarness, 30)) {
+		else {
+			if (!await waitForPromptReady(normalizedId, effectiveHarness, 30)) throw new Error(`${getHarnessBehavior(effectiveHarness).displayName} did not become ready within 30s for ${normalizedId}`);
 			await new Promise((r) => setTimeout(r, 500));
-			if (effectiveHarness === "codex") await deliverAgentMessage(normalizedId, prompt, "restartAgent:continue-prompt", resilientDeliveryMethod(agentState.deliveryMethod));
-			else await Effect.runPromise(sendKeys(normalizedId, prompt));
-		} else console.error(`[restartAgent] ${effectiveHarness === "codex" ? "Codex" : "Claude"} did not become ready within 30s for ${normalizedId}`);
+			if (effectiveHarness === "codex" || effectiveHarness === "acp") {
+				if (!(await deliverAgentMessage(normalizedId, prompt, "restartAgent:continue-prompt", effectiveHarness === "codex" ? resilientDeliveryMethod(agentState.deliveryMethod) : void 0)).ok) throw new Error(`${getHarnessBehavior(effectiveHarness).displayName} continue prompt delivery failed`);
+			} else await Effect.runPromise(sendKeys(normalizedId, prompt));
+		}
 		markAgentRunning(agentState);
 		saveAgentStateSync(agentState);
 		await saveAgentRuntimeState(normalizedId, {
@@ -6984,6 +7337,7 @@ async function restartAgent(agentId, opts = {}) {
 		return { success: true };
 	} catch (error) {
 		const msg = error instanceof Error ? error.message : String(error);
+		await Effect.runPromise(stopAgent(normalizedId)).catch(() => void 0);
 		logAgentLifecycleSync(normalizedId, `restartAgent FAILED: ${msg}`);
 		return {
 			success: false,
@@ -7086,6 +7440,7 @@ async function recoverAgent(agentId, opts = {}) {
 			role: recoveryRole,
 			isPlanning: recoveryRole === "plan",
 			harness: "ohmypi",
+			harnessBinaryPath: harnessLaunch.binaryPath,
 			extraEnvExports: [harnessLaunch.pathExport]
 		});
 		const launcherScript = join$1(getAgentDir(normalizedId), "launcher.sh");
@@ -7109,6 +7464,42 @@ async function recoverAgent(agentId, opts = {}) {
 		logAgentLifecycleSync(normalizedId, `recoverAgent SUCCESS: recoveryCount=${health.recoveryCount} (ohmypi)`);
 		return state;
 	}
+	if (recoveryHarness === "acp") {
+		const resumeSessionId = resolveRecoveryResumeSessionId(normalizedId, recoveryHarness);
+		const { launcherContent, providerEnv: acpProviderEnv } = await buildAgentLaunchConfig({
+			agentId: normalizedId,
+			model: state.model,
+			workspace: state.workspace,
+			role: recoveryRole,
+			isPlanning: recoveryRole === "plan",
+			...resumeSessionId ? {
+				spawnMode: "resume",
+				resumeSessionId
+			} : {},
+			harness: "acp",
+			harnessBinaryPath: harnessLaunch.binaryPath,
+			extraEnvExports: [harnessLaunch.pathExport]
+		});
+		const launcherScript = join$1(getAgentDir(normalizedId), "launcher.sh");
+		await writeLauncherScriptAtomic(launcherScript, launcherContent);
+		await Effect.runPromise(createSession(normalizedId, state.workspace, `bash ${launcherScript}`, { env: {
+			...BLANKED_PROVIDER_ENV,
+			OVERDECK_AGENT_ID: normalizedId,
+			OVERDECK_ISSUE_ID: state.issueId || "",
+			OVERDECK_SESSION_TYPE: recoveryRole,
+			CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION: "false",
+			...acpProviderEnv
+		} }));
+		const delivery = await deliverInitialPromptWithRetry(normalizedId, recoveryPrompt, "recoverAgent:acp-recovery-prompt");
+		if (!delivery.ok) {
+			await Effect.runPromise(stopAgent(normalizedId));
+			throw new Error(`ACP recovery prompt delivery failed for ${normalizedId}: ${delivery.failure ?? "unknown failure"}`);
+		}
+		markAgentRunning(state);
+		saveAgentStateSync(state);
+		logAgentLifecycleSync(normalizedId, `recoverAgent SUCCESS: recoveryCount=${health.recoveryCount} (acp)`);
+		return state;
+	}
 	const recoveryCodexFields = recoveryHarness === "codex" ? getCodexLauncherFields(normalizedId, state.model, state.workspace, recoveryRole) : {};
 	const recoveryLauncherContent = generateLauncherScriptSync({
 		role: recoveryRole,
@@ -7210,6 +7601,7 @@ var init_recovery = __esmMin((() => {
 	init_persistent_logger();
 	init_providers();
 	init_conversations();
+	init_behavior();
 	init_tmux();
 	init_agent_state();
 	init_delivery();
@@ -7481,11 +7873,11 @@ async function renderCommitFeedDiff(workspace, sha, feedConfig = DEFAULT_FEED_CO
 		".",
 		...feedConfig.exclude.map((glob) => `:(exclude)${glob}`)
 	] : [];
-	const diff = await gitShow(workspace, sha, pathspecArgs);
+	const diff = await renderWorkspaceGitShowPromise(deps.issueId, workspace, sha, pathspecArgs, gitShow);
 	const maxBytes = feedConfig.max_diff_bytes;
 	if (maxBytes === null || Buffer.byteLength(diff, "utf-8") <= maxBytes) return diff;
 	return [
-		(await gitShow(workspace, sha, ["--stat", ...pathspecArgs])).trimEnd(),
+		(await renderWorkspaceGitShowPromise(deps.issueId, workspace, sha, ["--stat", ...pathspecArgs], gitShow)).trimEnd(),
 		"",
 		`[tiered_execution.feed.max_diff_bytes truncated commit diff: ${Buffer.byteLength(diff, "utf-8")} bytes exceeded ${maxBytes} bytes]`,
 		""
@@ -7527,7 +7919,10 @@ function composeCommitFeedMessage(sha, itemTitle, diff, callout) {
 async function broadcastCommit(options) {
 	const feedConfig = options.feedConfig ?? DEFAULT_FEED_CONFIG;
 	if (shouldSkipFeedSubject(options.commitSubject ?? options.itemTitle, feedConfig)) return [];
-	const renderDiff = options.renderDiff ?? (options.gitShow ? (workspace, sha) => options.gitShow(workspace, sha) : renderCommitFeedDiff);
+	const renderDiff = options.renderDiff ?? ((workspace, sha, config) => renderCommitFeedDiff(workspace, sha, config, {
+		issueId: options.issueId,
+		gitShow: options.gitShow ? (repoPath, repoSha) => options.gitShow(repoPath, repoSha) : void 0
+	}));
 	const deliver = options.deliver ?? deliverAgentMessage;
 	const recordDelivery = options.recordDelivery ?? recordTierFeedDelivery;
 	const now = options.now ?? (() => /* @__PURE__ */ new Date());
@@ -7576,6 +7971,7 @@ async function broadcastCommit(options) {
 }
 var execFileAsync$5, DEFAULT_FEED_CONFIG;
 var init_tier_feed = __esmMin((() => {
+	init_git_utils();
 	init_delivery();
 	init_tier_metrics();
 	init_tier_table();
@@ -7793,13 +8189,19 @@ Rules:
 - Do not use any other endpoint or side channel for the verdict.
 - Only review this commit against this bead's acceptance criteria — compile, lint, and tests are the verification gate's job, and code style is the review convoy's job.`;
 }
-async function getCommitDiff(workspacePath, sha) {
-	const { stdout } = await execFileAsync$4("git", ["show", sha], {
-		cwd: workspacePath,
-		encoding: "utf-8",
-		maxBuffer: 10 * 1024 * 1024
+async function getCommitDiff(issueId, workspacePath, sha) {
+	return renderWorkspaceGitShowPromise(issueId, workspacePath, sha, [], async (repoPath, repoSha, args) => {
+		const { stdout } = await execFileAsync$4("git", [
+			"show",
+			repoSha,
+			...args
+		], {
+			cwd: repoPath,
+			encoding: "utf-8",
+			maxBuffer: 10 * 1024 * 1024
+		});
+		return stdout;
 	});
-	return stdout;
 }
 /**
 * Deliver one subscribed commit to the standing supervisor for review:
@@ -7809,7 +8211,7 @@ async function getCommitDiff(workspacePath, sha) {
 */
 async function deliverCommitForReview(options) {
 	const deliver = options.deps?.deliver ?? deliverAgentMessage;
-	const diff = await (options.deps?.getDiff ?? getCommitDiff)(options.workspacePath, options.sha);
+	const diff = await (options.deps?.getDiff ?? ((workspacePath, sha) => getCommitDiff(options.issueId, workspacePath, sha)))(options.workspacePath, options.sha);
 	const traces = Array.isArray(options.item.metadata?.traces) ? options.item.metadata.traces : [];
 	const frText = options.prdMarkdown && traces.length > 0 ? extractTracedFrText(options.prdMarkdown, traces) : void 0;
 	const message = buildSupervisorReviewMessage({
@@ -7826,6 +8228,7 @@ async function deliverCommitForReview(options) {
 }
 var SUPERVISOR_SUB_ROLE, execFileAsync$4;
 var init_tier_supervisor = __esmMin((() => {
+	init_git_utils();
 	init_delivery();
 	init_spawn_prep();
 	init_spawn();
@@ -7840,7 +8243,7 @@ var init_tier_supervisor = __esmMin((() => {
 * from `git log <base>..HEAD`, oldest commit first.
 */
 async function replayStandingAgent(target, options = {}) {
-	const deps = replayDeps(options.deps);
+	const deps = replayDeps(options.deps, target.issueId);
 	const replayTarget = target.kind === "tier" ? {
 		...target,
 		...resolveReplaySlot(target, deps)
@@ -7865,7 +8268,7 @@ async function replayCrashedStandingAgent(target, options = {}) {
 */
 async function compactAtTierRunBoundary(options) {
 	if (!shouldReplayCompactAtTierRunBoundary(options.compaction)) return null;
-	const deps = replayDeps(options.deps);
+	const deps = replayDeps(options.deps, options.target.issueId);
 	const rerouted = resolveReroutedReplayTarget(options.target);
 	if (!rerouted) {
 		if (options.target.agentId) await deps.stop(options.target.agentId);
@@ -8028,27 +8431,34 @@ async function runGitLog(workspace, base) {
 		};
 	}).filter((entry) => entry.sha.trim().length > 0);
 }
-async function runGitShow(workspace, sha) {
-	const { stdout } = await execFileAsync$3("git", ["show", sha], {
-		cwd: workspace,
-		encoding: "utf-8",
-		maxBuffer: 16 * 1024 * 1024
+async function runGitShow(issueId, workspace, sha) {
+	return renderWorkspaceGitShowPromise(issueId, workspace, sha, [], async (repoPath, repoSha, args) => {
+		const { stdout } = await execFileAsync$3("git", [
+			"show",
+			repoSha,
+			...args
+		], {
+			cwd: repoPath,
+			encoding: "utf-8",
+			maxBuffer: 16 * 1024 * 1024
+		});
+		return stdout;
 	});
-	return stdout;
 }
-function replayDeps(deps = {}) {
+function replayDeps(deps = {}, issueId) {
 	return {
 		spawn: deps.spawn ?? spawnRun,
 		deliver: deps.deliver ?? deliverAgentMessage,
 		stop: deps.stop ?? stopAgent,
 		gitLog: deps.gitLog ?? runGitLog,
-		gitShow: deps.gitShow ?? runGitShow,
-		renderDiff: deps.renderDiff ?? (deps.gitShow ? (workspace, sha) => deps.gitShow(workspace, sha) : renderCommitFeedDiff),
+		gitShow: deps.gitShow ?? ((workspace, sha) => runGitShow(issueId, workspace, sha)),
+		renderDiff: deps.renderDiff ?? (deps.gitShow ? (workspace, sha) => deps.gitShow(workspace, sha) : (workspace, sha, feedConfig) => renderCommitFeedDiff(workspace, sha, feedConfig, { issueId })),
 		listSlotOwnership: deps.listSlotOwnership ?? listSlotOwnership
 	};
 }
 var execFileAsync$3, DEFAULT_REPLAY_THRESHOLD;
 var init_tier_replay = __esmMin((() => {
+	init_git_utils();
 	init_model_capabilities();
 	init_delivery();
 	init_spawn();
@@ -8644,7 +9054,7 @@ var init_runtime_census = __esmMin((() => {
 	]);
 	runtimeCensusService = createRuntimeCensusService({
 		listPanes: async () => {
-			const { listAllPaneRecords } = await import("./tmux-DoThH6aj.js");
+			const { listAllPaneRecords } = await import("./tmux-B6z7h_vZ.js");
 			return Effect.runPromise(listAllPaneRecords());
 		},
 		readProcesses: readRuntimeProcessTable
@@ -8798,6 +9208,6 @@ var init_queries = __esmMin((() => {
 	});
 }));
 //#endregion
-export { appendActivity as $, recordAgentFailure as $n, OHMYPI_AGENT_READY_TIMEOUT_SECONDS as $t, spawnTierSupervisor as A, writeChannelsBridgeMcpConfig as An, init_codex_auth as Ar, deliverAgentPermissionDecision as At, detectCrashedAgents as B, getAgentDir as Bn, assertWorkspaceStackHealthyForSpawn as Bt, replayCrashedStandingAgent as C, validateProviderHealth as Cn, getAgentRuntimeStateSync as Cr, tryReserveAdvancingSlot as Ct, init_tier_supervisor as D, decideChannelsForWorkAgent as Dn, init_agent_runtime as Dr, init_memory_verdict_cache as Dt, deliverCommitForReview as E, buildDefaultResumeContinueMessage as En, getAgentRuntimeSnapshot as Er, getCachedMemoryVerdict as Et, init_tier_escalation as F, clearAgentPausedSync as Fn, init_transcript_landing as Ft, resumeAgent as G, init_agent_state as Gn, transitionIssueToInProgress as Gt, restartAgent as H, getAgentState as Hn, defaultRunWorkspace as Ht, init_slot_reconcile as I, clearAgentTroubled as In, probeTranscriptSince as It, isContextOverflowTail as J, isRole as Jn, providerDefaultHarnessSync as Jt, init_context_overflow as K, isAgentPaused as Kn, transitionIssueToInReview as Kt, listSlotAssignments as L, clearAgentTroubledSync as Ln, BRIDGE_TOKEN_HEADER as Lt, broadcastCommit as M, SESSION_EXITED_BEFORE_KICKOFF as Mn, init_ohmypi_parser as Mr, deliverResumeMessageWithTranscriptConfirmation as Mt, init_tier_feed as N, __testInternals as Nn, parseOhmypiSessionCostResultSync as Nr, setAgentDeliveryMethod as Nt, loadPrdDraft as O, decideSupervisorForWorkAgent as On, applyCodexAuthBurnFlag as Or, setCachedMemoryVerdict as Ot, decideEscalation as P, clearAgentPaused as Pn, captureTranscriptUserRecordSnapshot as Pt, operatorInterventionEvent as Q, markAgentTroubled as Qn, resolveTier as Qt, reconcileSlotState as R, clearYieldForResumeSync as Rn, init_bridge_token as Rt, contextWindowForModel as S, init_provider_health as Sn, getAgentRuntimeState as Sr, resetPatrolDispatchBudget as St, shouldReplayCompactAtTierRunBoundary as T, init_openai_auth as Tn, saveAgentRuntimeState as Tr, workResumeSlotsAvailable as Tt, buildCompactRecoverySeed as U, getAgentStateFilePath as Un, init_spawn_prep as Ut, recoverAgent as V, getAgentResumeGateBlockReason as Vn, buildAgentLaunchConfig as Vt, init_resume as W, getAgentStateSync as Wn, retrieveSpawnTimeMemoryContext as Wt, messageAgent as X, markAgentRunningState as Xn, resolveStaffing as Xt, init_messaging as Y, markAgentRunning as Yn, resolveImplicitStaffing as Yt, init_operator_interventions as Z, markAgentStoppedState as Zn, init_resolve_tier as Zt, init_linux as _, buildSpawnEnvForModel as _n, isQualifiedAgentId as _r, emergencyBrake as _t, listRunningAgentsSync as a, getRoleRuntimeBaseCommand as an, setAgentPaused as ar, saveSessionId as at, init_agents as b, getProviderExportsForModel as bn, waitForAgentIdle as br, releaseAdvancingSlot as bt, getRuntimeCensus as c, roleAgentDefinitionPath as cn, wipeAgentStateDirs as cr, init_spawn as ct, panePidsForSession as d, piFifoPaths as dn, readAgentHarnessModelRecordSync as dr, init_termination as dt, describeOhmypiSpawnFailure as en, recordAgentFailureSync as er, getActivity as et, refreshRuntimeCensus as f, init_ohmypi_fifo as fn, init_pty_token as fr, stopAgent as ft, LINUX_MEMORY_PRESSURE_DEFAULTS as g, buildCavemanExports as gn, clearReadySignal as gr, describeRunningAgents as gt, init_collector as h, init_claude_auth as hn, resolvePtySupervisorScriptPath as hr, countRunningSwarmSlotsForIssue as ht, listRunningAgents as i, getProviderAuthMode as in, saveAgentStateSync as ir, init_activity as it, supervisorAgentId as j, GOVERNOR_SLOT_PAUSE_REASON_PREFIX as jn, paneShowsCodexAuthBurn as jr, deliverInitialPromptWithRetry as jt, shouldSupervise as k, dismissDevChannelsDialog as kn, checkCodexAuthStatus as kr, deliverAgentMessage as kt, getRuntimeCensusSnapshot as l, waitForPromptReady as ln, writeAgentStateJsonSync as lr, spawnAgent as lt, createHostHealthCollector as m, getClaudeAuthStatus as mn, init_pty_supervisor_locate as mr, countRunningAgents as mt, init_queries as n, getCodexLauncherFields as nn, resetAgentFailureCount as nr, getLatestSessionIdSync as nt, warnOnBareNumericIssueIds as o, init_runtime_command as on, setAgentPausedSync as or, createOhmypiRuntimeSync as ot, runtimeCensusHasHarnessProcess as p, ohmypiFifoPaths as pn, writePtyToken as pr, stopAgentSync as pt, isContextOverflowError as q, isAgentTroubled as qn, init_staffing as qt, listAgentStates as r, getOhmypiLauncherFields as rn, saveAgentState as rr, getSessionId as rt, descendantPidsForSession as s, injectPiConversationMemory as sn, setAgentYieldedSync as sr, init_ohmypi as st, dropLegacyAgentStatesMissingRoleAsync as t, getAgentRuntimeBaseCommand as tn, recordStartupSessionExit as tr, getLatestSessionId as tt, init_runtime_census as u, init_pi_fifo as un, init_agent_record_sync as ur, spawnRun as ut, DARWIN_MEMORY_PRESSURE_DEFAULTS as v, determineModel as vn, normalizeAgentId as vr, getConcurrencyLimits as vt, replayStandingAgent as w, getOpenAIAuthStatus as wn, init_runtime_state as wr, tryReserveSwarmSlot as wt, compactAtTierRunBoundary as x, getProviderTmuxFlags as xn, waitForReadySignal as xr, releaseSwarmSlot as xt, init_darwin as y, getProviderEnvForModel as yn, resolveAgentTargetSync as yr, init_concurrency as yt, autoRecoverAgents as z, decideResumeGate as zn, writeBridgeTokenSync as zt };
+export { appendActivity as $, isRole as $n, OHMYPI_AGENT_READY_TIMEOUT_SECONDS as $t, spawnTierSupervisor as A, buildDefaultResumeContinueMessage as An, saveAgentRuntimeState as Ar, deliverAgentPermissionDecision as At, detectCrashedAgents as B, clearAgentPausedSync as Bn, assertWorkspaceStackHealthyForSpawn as Bt, replayCrashedStandingAgent as C, getProviderEnvForModel as Cn, normalizeAgentId as Cr, tryReserveAdvancingSlot as Ct, init_tier_supervisor as D, validateProviderHealth as Dn, getAgentRuntimeState as Dr, init_memory_verdict_cache as Dt, deliverCommitForReview as E, init_provider_health as En, waitForReadySignal as Er, getCachedMemoryVerdict as Et, init_tier_escalation as F, writeChannelsBridgeMcpConfig as Fn, init_codex_auth as Fr, init_transcript_landing as Ft, resumeAgent as G, getAgentDir as Gn, transitionIssueToInProgress as Gt, restartAgent as H, clearAgentTroubledSync as Hn, defaultRunWorkspace as Ht, init_slot_reconcile as I, GOVERNOR_SLOT_PAUSE_REASON_PREFIX as In, paneShowsCodexAuthBurn as Ir, probeTranscriptSince as It, isContextOverflowTail as J, getAgentStateFilePath as Jn, providerDefaultHarnessSync as Jt, init_context_overflow as K, getAgentResumeGateBlockReason as Kn, transitionIssueToInReview as Kt, listSlotAssignments as L, SESSION_EXITED_BEFORE_KICKOFF as Ln, init_ohmypi_parser as Lr, BRIDGE_TOKEN_HEADER as Lt, broadcastCommit as M, decideChannelsForWorkAgent as Mn, init_agent_runtime as Mr, deliverResumeMessageWithTranscriptConfirmation as Mt, init_tier_feed as N, decideSupervisorForWorkAgent as Nn, applyCodexAuthBurnFlag as Nr, setAgentDeliveryMethod as Nt, loadPrdDraft as O, getOpenAIAuthStatus as On, getAgentRuntimeStateSync as Or, setCachedMemoryVerdict as Ot, decideEscalation as P, dismissDevChannelsDialog as Pn, checkCodexAuthStatus as Pr, captureTranscriptUserRecordSnapshot as Pt, operatorInterventionEvent as Q, isAgentTroubled as Qn, resolveTier as Qt, reconcileSlotState as R, __testInternals as Rn, parseOhmypiSessionCostResultSync as Rr, init_bridge_token as Rt, contextWindowForModel as S, determineModel as Sn, isQualifiedAgentId as Sr, resetPatrolDispatchBudget as St, shouldReplayCompactAtTierRunBoundary as T, getProviderTmuxFlags as Tn, waitForAgentIdle as Tr, workResumeSlotsAvailable as Tt, buildCompactRecoverySeed as U, clearYieldForResumeSync as Un, init_spawn_prep as Ut, recoverAgent as V, clearAgentTroubled as Vn, buildAgentLaunchConfig as Vt, init_resume as W, decideResumeGate as Wn, retrieveSpawnTimeMemoryContext as Wt, messageAgent as X, init_agent_state as Xn, resolveStaffing as Xt, init_messaging as Y, getAgentStateSync as Yn, resolveImplicitStaffing as Yt, init_operator_interventions as Z, isAgentPaused as Zn, init_resolve_tier as Zt, init_linux as _, materializeAcpContextFile as _n, init_pty_token as _r, emergencyBrake as _t, listRunningAgentsSync as a, getProviderAuthMode as an, recordAgentFailureSync as ar, saveSessionId as at, init_agents as b, buildCavemanExports as bn, resolvePtySupervisorScriptPath as br, releaseAdvancingSlot as bt, getRuntimeCensus as c, injectPiConversationMemory as cn, saveAgentState as cr, init_spawn as ct, panePidsForSession as d, waitForPromptReady as dn, setAgentPausedSync as dr, init_termination as dt, describeOhmypiSpawnFailure as en, markAgentRunning as er, getActivity as et, refreshRuntimeCensus as f, init_pi_fifo as fn, setAgentYieldedSync as fr, stopAgent as ft, LINUX_MEMORY_PRESSURE_DEFAULTS as g, init_context as gn, readAgentHarnessModelRecordSync as gr, describeRunningAgents as gt, init_collector as h, ohmypiFifoPaths as hn, init_agent_record_sync as hr, countRunningSwarmSlotsForIssue as ht, listRunningAgents as i, getOhmypiLauncherFields as in, recordAgentFailure as ir, init_activity as it, supervisorAgentId as j, buildResumeContinueMessage as jn, getAgentRuntimeSnapshot as jr, deliverInitialPromptWithRetry as jt, shouldSupervise as k, init_openai_auth as kn, init_runtime_state as kr, deliverAgentMessage as kt, getRuntimeCensusSnapshot as l, roleAgentDefinitionPath as ln, saveAgentStateSync as lr, spawnAgent as lt, createHostHealthCollector as m, init_ohmypi_fifo as mn, writeAgentStateJsonSync as mr, countRunningAgents as mt, init_queries as n, getAgentRuntimeBaseCommand as nn, markAgentStoppedState as nr, getLatestSessionIdSync as nt, warnOnBareNumericIssueIds as o, getRoleRuntimeBaseCommand as on, recordStartupSessionExit as or, createOhmypiRuntimeSync as ot, runtimeCensusHasHarnessProcess as p, piFifoPaths as pn, wipeAgentStateDirs as pr, stopAgentSync as pt, isContextOverflowError as q, getAgentState as qn, init_staffing as qt, listAgentStates as r, getCodexLauncherFields as rn, markAgentTroubled as rr, getSessionId as rt, descendantPidsForSession as s, init_runtime_command as sn, resetAgentFailureCount as sr, init_ohmypi as st, dropLegacyAgentStatesMissingRoleAsync as t, getAcpLauncherFields as tn, markAgentRunningState as tr, getLatestSessionId as tt, init_runtime_census as u, waitForAcpHostReady as un, setAgentPaused as ur, spawnRun as ut, DARWIN_MEMORY_PRESSURE_DEFAULTS as v, getClaudeAuthStatus as vn, writePtyToken as vr, getConcurrencyLimits as vt, replayStandingAgent as w, getProviderExportsForModel as wn, resolveAgentTargetSync as wr, tryReserveSwarmSlot as wt, compactAtTierRunBoundary as x, buildSpawnEnvForModel as xn, clearReadySignal as xr, releaseSwarmSlot as xt, init_darwin as y, init_claude_auth as yn, init_pty_supervisor_locate as yr, init_concurrency as yt, autoRecoverAgents as z, clearAgentPaused as zn, writeBridgeTokenSync as zt };
 
-//# sourceMappingURL=queries-6d7Cdtm7.js.map
+//# sourceMappingURL=queries-CjNIf-Ub.js.map