very-happy-cli 0.2.178 → 0.2.180

package/dist/{index-piJPsTsm.cjs → index-B2p2Mut7.cjs}

@@ -1,36 +1,39 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-CDkAQXYf.cjs');
-var logger = require('./logger-DXTWlPzP.cjs');
-var AcpSessionManager = require('./AcpSessionManager-DckmUZza.cjs');
-var index = require('./index-_l1Sdmbi.cjs');
+var AcpBackend = require('./AcpBackend-DfRDtMcG.cjs');
+var logger = require('./logger-CphW5nUE.cjs');
+var AcpSessionManager = require('./AcpSessionManager-CASKOnOj.cjs');
+var index = require('./index-Dv0Q48P3.cjs');
 var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var configuration = require('./configuration-4TGMrjul.cjs');
-var attachmentContent = require('./attachmentContent-bpQTBJ0y.cjs');
-var piRuntime = require('./piRuntime-BHRT5MKO.cjs');
+var configuration = require('./configuration-CYO-kPOS.cjs');
+var attachmentContent = require('./attachmentContent-CEm13_gF.cjs');
+var piRuntime = require('./piRuntime-CT5xv_3h.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var api = require('./api-JANhFdZV.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DYl7l4Ts.cjs');
-var deterministicJson = require('./deterministicJson-BjNQsAjO.cjs');
-var persistence = require('./persistence-BfX72dne.cjs');
-var machineMetadata = require('./machineMetadata-DcUupMje.cjs');
-var createSessionMetadata = require('./createSessionMetadata-B2NynaWZ.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-C2EeYTFH.cjs');
-var controlClient = require('./controlClient-BTaZlbC6.cjs');
+var api = require('./api-DM7b1OKj.cjs');
+var deterministicJson = require('./deterministicJson-xqA6DaOm.cjs');
+var client = require('./client-DJplzPjD.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CIsvBrVe.cjs');
+var persistence = require('./persistence-9BMYspxG.cjs');
+var machineMetadata = require('./machineMetadata-BQm9YTcI.cjs');
+var createSessionMetadata = require('./createSessionMetadata-xz767pcG.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-DvvVX3TB.cjs');
+var startupSessionCreate = require('./startupSessionCreate-kdr3m1uX.cjs');
+var controlClient = require('./controlClient-Bqv5v5OM.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var streamRelay = require('./streamRelay-9kBPpbvU.cjs');
-var projectPath = require('./projectPath-ChLhdOyt.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-DyLmKKtO.cjs');
-var titleGenerator = require('./titleGenerator-D26gvNaS.cjs');
-var sessionModeFile = require('./sessionModeFile-CLLdidiJ.cjs');
+var sessionLock = require('./sessionLock-DRZUcKHT.cjs');
+var acpSessionResume = require('./acpSessionResume-CR5pmgVo.cjs');
+var streamRelay = require('./streamRelay-Dy6amlzx.cjs');
+var projectPath = require('./projectPath-C3ioB4Bu.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-BlM_tfej.cjs');
+var titleGenerator = require('./titleGenerator-Cgp5ihFb.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
-require('./time-A6zR3Iy6.cjs');
+require('./time-Cjv0zxQO.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./processTree-CMHWlVse.cjs');
-require('./package-DY4zTbKS.cjs');
+require('./package-KhLqBDX9.cjs');
 require('chalk');
 require('node:util');
 require('node:fs');
@@ -38,49 +41,52 @@ require('@paralleldrive/cuid2');
 require('zod');
 require('node:os');
 require('node:fs/promises');
-require('./attachmentLimits-SqeAHrVC.cjs');
-require('./resources-JDPugcDq.cjs');
+require('./pushNotifications-DI92havG.cjs');
 require('axios');
-require('./lidState-BeOwj6eW.cjs');
+require('./resources-CvIlkzpP.cjs');
+require('./lidState-DWGnm2H4.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./registerCommonHandlers-C0_fyBQ0.cjs');
+require('./registerCommonHandlers-C7a_dUWs.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
-require('./sync-Dhmtk66S.cjs');
+require('./sync-Bn-idAoy.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
-require('tweetnacl');
-require('./types-CRS-srZK.cjs');
-require('./client-Dnza1hgN.cjs');
-require('./context-JoKu0V54.cjs');
-require('./sessionOps-BAnr7n8t.cjs');
-require('./tools-CxJp4T1T.cjs');
-require('./reportProgressTool-B9nCzbkL.cjs');
-require('./client-C4zKGjiJ.cjs');
+require('./prompt-lgF9IE82.cjs');
+require('./reportProgressTool-14AXr959.cjs');
+require('./client-BWjaHKtj.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
 require('./trimIdent-4gvk9Wk6.cjs');
-require('./peerTools-iy3_6Yc5.cjs');
+require('./client-D_loZ9IK.cjs');
+require('./context-6TP-iz_c.cjs');
+require('./sessionOps-BrGiU9-s.cjs');
+require('./tools-BL7Byl_x.cjs');
+require('./peerTools-DQNlrcqM.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-BRTIOX5b.cjs');
+require('./remoteSessionClient-D843fkzL.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('./downloadTarget-BN5vZt3K.cjs');
+require('./downloadTarget-CEb9che-.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-DCQ87Aan.cjs');
+require('./bootstrap-DoA7okld.cjs');
+require('./webPanels-FCgFKvVe.cjs');
 require('./previewPath-B0rBdhy1.cjs');
-require('./detectCLI-DR9ZaN6B.cjs');
+require('tweetnacl');
+require('./types-CRS-srZK.cjs');
+require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-Br-mgogg.cjs');
+require('./localHappyAgentAuth-DZHQnIW9.cjs');
+require('./processTreeSnapshot-mDbnuojn.cjs');
 require('url');
 require('node:module');
 require('./oneShotPrompts-CL0dip9C.cjs');
@@ -128,6 +134,113 @@ function describeAcpTurnFailure(agentName, error) {
   return { message: `${agentName} error: ${oneLine(detailOf(error))}`, exited: false };
 }
 
+const OUT_OF_TURN_QUIET_MS = 6e4;
+function isAcpTurnContent(msg) {
+  if (msg.type === "model-output") return typeof msg.textDelta === "string" && msg.textDelta.length > 0;
+  if (msg.type === "tool-call" || msg.type === "tool-result") return true;
+  return msg.type === "event" && msg.name === "thinking";
+}
+function outOfTurnAction(msg, state) {
+  if (state.inPromptTurn || !state.backendStarted) return null;
+  if (msg.type === "status" && msg.status === "idle") return state.open ? "end" : null;
+  if (!isAcpTurnContent(msg)) return null;
+  return state.open ? "touch" : "start";
+}
+
+function createPiSteerChannel() {
+  let nextId = 0;
+  const pending = [];
+  const waiters = /* @__PURE__ */ new Set();
+  const offers = /* @__PURE__ */ new Map();
+  let ready = false;
+  const readyListeners = [];
+  const hand = () => {
+    while (pending.length > 0 && waiters.size > 0) {
+      const waiter = waiters.values().next().value;
+      waiters.delete(waiter);
+      const item = pending.shift();
+      const offer = offers.get(item.id);
+      if (offer) offer.taken = true;
+      waiter(item);
+    }
+  };
+  return {
+    get ready() {
+      return ready;
+    },
+    /** The extension announced itself (first contact). */
+    hello() {
+      if (ready) return;
+      ready = true;
+      for (const listener of readyListeners.splice(0)) listener();
+    },
+    onReady(listener) {
+      if (ready) listener();
+      else readyListeners.push(listener);
+    },
+    /** Wrapper side: hand `text` to the running turn; true = pi took it. */
+    offer(text, timeoutMs) {
+      const item = { id: ++nextId, text };
+      return new Promise((resolve) => {
+        const timer = setTimeout(() => {
+          const offer = offers.get(item.id);
+          offers.delete(item.id);
+          const index = pending.findIndex((p) => p.id === item.id);
+          if (index >= 0) pending.splice(index, 1);
+          resolve(offer?.taken === true);
+        }, timeoutMs);
+        timer.unref?.();
+        offers.set(item.id, {
+          taken: false,
+          settle: (delivered) => {
+            clearTimeout(timer);
+            offers.delete(item.id);
+            resolve(delivered);
+          }
+        });
+        pending.push(item);
+        hand();
+      });
+    },
+    /** Extension side (long poll): the next message, or null after `waitMs`. */
+    take(waitMs, signal) {
+      return new Promise((resolve) => {
+        const done = () => {
+          clearTimeout(timer);
+          signal?.removeEventListener("abort", onAbort);
+        };
+        const waiter = (item) => {
+          done();
+          resolve(item);
+        };
+        const onAbort = () => {
+          waiters.delete(waiter);
+          done();
+          resolve(null);
+        };
+        const timer = setTimeout(() => {
+          waiters.delete(waiter);
+          done();
+          resolve(null);
+        }, waitMs);
+        timer.unref?.();
+        if (signal?.aborted) {
+          resolve(null);
+          clearTimeout(timer);
+          return;
+        }
+        signal?.addEventListener("abort", onAbort, { once: true });
+        waiters.add(waiter);
+        hand();
+      });
+    },
+    /** Extension side: what happened to a taken message (false: pi was no longer running). */
+    ack(id, delivered) {
+      offers.get(id)?.settle(delivered);
+    }
+  };
+}
+
 const SUPPORTED_CATEGORIES = /* @__PURE__ */ new Set(["mode", "model", "thought_level"]);
 function isRecord$1(value) {
   return !!value && typeof value === "object";
@@ -637,6 +750,7 @@ class GenericAcpPermissionHandler extends BasePermissionHandler.BasePermissionHa
     });
   }
 }
+const PI_STEER_OFFER_TIMEOUT_MS = 5e3;
 function resolveSessionFlavor(agentName) {
   if (agentName === "gemini") {
     return "gemini";
@@ -665,12 +779,45 @@ async function runAcp(opts) {
     machineId: settings.machineId,
     startedBy: opts.startedBy,
     sandbox: settings.sandboxConfig,
-    capabilities: [index.PROMPT_QUEUE_CAPABILITY]
+    capabilities: [index.PROMPT_QUEUE_CAPABILITY, index.PROJECT_SESSION_CAPABILITY]
   });
   metadata.attachmentKinds = [];
-  const response = await api$1.getOrCreateSession({ tag: sessionTag, metadata, state });
+  const reconnect = acpSessionResume.readAcpReconnectEnv(process.env);
+  let response;
+  if (reconnect) {
+    logger.logger.debug(`[acp] Reconnecting to existing session ${reconnect.sessionId}`);
+    response = {
+      id: reconnect.sessionId,
+      seq: reconnect.seq,
+      encryptionKey: authRelay.decodeBase64(reconnect.encryptionKey),
+      encryptionVariant: reconnect.encryptionVariant,
+      metadata,
+      metadataVersion: reconnect.metadataVersion,
+      agentState: state,
+      agentStateVersion: reconnect.agentStateVersion
+    };
+  } else {
+    response = await startupSessionCreate.createSessionForStartup(() => api$1.getOrCreateSession({ tag: sessionTag, metadata, state }), { startedBy: opts.startedBy, log: (m) => logger.logger.debug(m) });
+  }
   if (response) {
     logAcp("muted", `Happy Session ID: ${response.id}`);
+    await sessionLock.claimSessionOrExit(response.id, { takeover: !!reconnect, flavor: resolveSessionFlavor(opts.agentName) });
+  }
+  if (reconnect && response && !await api$1.reactivateSession(response.id)) {
+    throw new Error(`Failed to reactivate archived session ${response.id}`);
+  }
+  let reconnectSeeded = false;
+  let resumedPermissionMode = null;
+  if (reconnect && response) {
+    const snapshot = await api$1.getSession(response.id, response.encryptionKey, response.encryptionVariant);
+    if (snapshot.ok) {
+      response = sessionLock.applyServerSnapshot(response, snapshot.session);
+      reconnectSeeded = true;
+      resumedPermissionMode = acpSessionResume.normalizeAcpPermissionMode(snapshot.session.metadata?.permissionMode) ?? null;
+    } else {
+      response = sessionLock.withoutServerSnapshot(response);
+      logger.logger.debug(`[acp] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
+    }
   }
   let session;
   let permissionHandler;
@@ -680,6 +827,7 @@ async function runAcp(opts) {
     metadata,
     state,
     response,
+    sessionClientOptions: reconnectSeeded && response ? { initialSeq: response.seq } : void 0,
     onSessionSwap: (newSession) => {
       session = newSession;
       if (permissionHandler) {
@@ -689,6 +837,12 @@ async function runAcp(opts) {
     }
   });
   session = initialSession;
+  if (reconnect) {
+    session.suppressNextArchiveSignal();
+    if (!reconnectSeeded) session.skipExistingMessages();
+    void session.cancelUndeliveredQueuedInputs();
+    session.updateMetadata((meta) => sessionLock.mergeReconnectMetadata(meta, metadata, Date.now()));
+  }
   if (response) {
     try {
       await controlClient.notifyDaemonSessionStarted(response.id, metadata, {
@@ -728,7 +882,7 @@ async function runAcp(opts) {
   let sawSlashCommands = false;
   let sawModes = false;
   let sawModels = false;
-  const initialPermissionMode = opts.permissionMode ?? "default";
+  const initialPermissionMode = opts.permissionMode ?? resumedPermissionMode ?? "default";
   let fileBackedModeActive = false;
   const permissionModeIsFileBacked = () => opts.agentName === "pi" || !modeSelector && !legacyModes;
   let fileBackedPermissionMode = null;
@@ -737,7 +891,7 @@ async function runAcp(opts) {
       return true;
     }
     try {
-      sessionModeFile.writeSessionModeFile(session.sessionId, mode);
+      acpSessionResume.writeSessionModeFile(session.sessionId, mode);
     } catch (error) {
       logger.logger.debug(`[${opts.agentName}] Failed to write session mode file:`, error);
       return false;
@@ -748,8 +902,15 @@ async function runAcp(opts) {
     return true;
   };
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
+  const piSteer = opts.agentName === "pi" ? createPiSteerChannel() : null;
+  piSteer?.onReady(() => {
+    logger.logger.debug(`[${opts.agentName}] pi extension connected to the steer channel`);
+    session.updateMetadata((current) => ({ ...current, capabilities: [.../* @__PURE__ */ new Set([...current.capabilities ?? [], index.PI_STEER_CAPABILITY])] }));
+  });
   const happyServer = await deterministicJson.startHappyServer(session, {
     assistant: isAssistantVariant,
+    ...piSteer ? { piSteer } : {},
+    push: { sendAttention: (input) => api$1.push().sendAttention(input) },
     ...opts.agentName === "pi" ? { onContextUsage: (contextUsage) => {
       session.updateAgentState((state2) => ({ ...state2, contextUsage }));
     } } : {}
@@ -771,6 +932,7 @@ async function runAcp(opts) {
       ...teamsPiEnv,
       HAPPY_MCP_URL: happyServer.url,
       ...happyServer.contextUsageUrl ? { HAPPY_CONTEXT_USAGE_URL: happyServer.contextUsageUrl } : {},
+      ...happyServer.steerUrl ? { HAPPY_PI_STEER_URL: happyServer.steerUrl } : {},
       HAPPY_SESSION_ID: session.sessionId,
       // B-497: sender identity for `very-happy sessions message|peers` in this shell.
       VH_PEER_SESSION_ID: session.sessionId,
@@ -783,6 +945,15 @@ async function runAcp(opts) {
   });
   let backend = createBackend();
   let thinking = false;
+  let outOfTurnTimer = null;
+  const endOutOfTurn = (reason) => {
+    if (!outOfTurnTimer) return;
+    clearTimeout(outOfTurnTimer);
+    outOfTurnTimer = null;
+    logger.logger.debug(`[${opts.agentName}] Out-of-turn output ended (${reason})`);
+    sendEnvelopes(sessionManager.endTurn("completed"));
+    setThinking(false);
+  };
   const setThinking = (next) => {
     if (thinking === next) {
       return;
@@ -797,6 +968,7 @@ async function runAcp(opts) {
   let backendStarted = false;
   let backendGone = null;
   let todoDiscoverySent = false;
+  const projectInjector = deterministicJson.createProjectInjector({ client: client.sharedProjectsClient(), sessionId: () => session?.sessionId, metadata: () => session?.getMetadata?.() ?? null, agent: opts.agentName });
   const stopRunnerFromBackendStatus = (status, detail) => {
     const reason = detail ? `${opts.agentName} backend ${status}: ${detail}` : `${opts.agentName} backend ${status}`;
     logger.logger.debug(`[${opts.agentName}] ${reason}; stopping ACP runner`);
@@ -820,7 +992,7 @@ async function runAcp(opts) {
       return;
     }
     if (permissionModeIsFileBacked()) {
-      const mode = sessionModeFile.normalizeAcpPermissionMode(requestedMode);
+      const mode = acpSessionResume.normalizeAcpPermissionMode(requestedMode);
       if (!mode) {
         logger.logger.debug(`[${opts.agentName}] Ignoring unknown file-backed permission mode request: ${requestedMode}`);
         return;
@@ -1094,7 +1266,18 @@ async function runAcp(opts) {
         controlClient.reportSessionEditToDaemon({ sessionId: session.sessionId, path: edit.path, tool: edit.tool, cwd: process.cwd() });
       }
     }
+    const action = outOfTurnAction(msg, { open: outOfTurnTimer !== null, inPromptTurn: thinking && outOfTurnTimer === null, backendStarted });
+    if (action === "start") {
+      sendEnvelopes(sessionManager.startTurn());
+      setThinking(true);
+    }
+    if (action === "start" || action === "touch") {
+      if (outOfTurnTimer) clearTimeout(outOfTurnTimer);
+      outOfTurnTimer = setTimeout(() => endOutOfTurn("quiet"), OUT_OF_TURN_QUIET_MS);
+      outOfTurnTimer.unref?.();
+    }
     sendEnvelopes(sessionManager.mapMessage(msg));
+    if (action === "end") endOutOfTurn("idle");
   };
   backend.onMessage(onBackendMessage);
   const titleGenerator$1 = new titleGenerator.TitleGenerator(session);
@@ -1119,6 +1302,13 @@ async function runAcp(opts) {
       if (message.meta && Object.prototype.hasOwnProperty.call(message.meta, "effort")) {
         currentEffort = message.meta.effort ?? null;
       }
+      if (message.meta?.delivery === "steer" && piSteer?.ready && thinking && !attachments?.length) {
+        if (await piSteer.offer(message.content.text, PI_STEER_OFFER_TIMEOUT_MS)) {
+          logger.logger.debug(`[${opts.agentName}] User message steered into the running turn`);
+          return;
+        }
+        logger.logger.debug(`[${opts.agentName}] Steer not taken; queued for the next turn`);
+      }
       messageQueue.push(message.content.text, {
         permissionMode: currentPermissionMode,
         model: currentModel,
@@ -1155,7 +1345,7 @@ async function runAcp(opts) {
       if (!fileBackedModeActive) {
         throw new Error(`${opts.agentName} does not support live permission mode changes`);
       }
-      const mode = typeof request?.mode === "string" ? sessionModeFile.normalizeAcpPermissionMode(request.mode) : null;
+      const mode = typeof request?.mode === "string" ? acpSessionResume.normalizeAcpPermissionMode(request.mode) : null;
       if (!mode) {
         throw new Error("Invalid permission mode");
       }
@@ -1185,6 +1375,12 @@ async function runAcp(opts) {
       publishFileBackedPermissionMode(fileBackedPermissionMode ?? initialPermissionMode);
     }
   };
+  let agentSessionId = opts.resumeAgentSessionId ?? null;
+  const rememberAgentSession = (id) => {
+    if (!id || opts.agentName !== "pi") return;
+    agentSessionId = id;
+    session.updateMetadata((current) => current.piSessionId === id ? current : { ...current, piSessionId: id });
+  };
   const restartBackend = async () => {
     const gone = backendGone;
     backend.offMessage?.(onBackendMessage);
@@ -1196,19 +1392,27 @@ async function runAcp(opts) {
     }
     backend = createBackend();
     backend.onMessage(onBackendMessage);
-    const started = await backend.startSession();
+    const started = await backend.startSession(void 0, agentSessionId ? { loadSessionId: agentSessionId } : {});
     acpSessionId = started.sessionId;
+    rememberAgentSession(started.agentSessionId);
     backendGone = null;
     todoDiscoverySent = false;
+    projectInjector.reset();
     await afterSessionStarted(currentModel ?? opts.model);
-    logger.logger.debug(`[${opts.agentName}] Restarted the agent after it exited: ${gone?.message ?? "unknown"}`);
-    session.sendSessionEvent({ type: "message", message: `${opts.agentName} was restarted after its process exited; it does not remember the earlier conversation (the transcript here is kept).` });
+    logger.logger.debug(`[${opts.agentName}] Restarted the agent after it exited: ${gone?.message ?? "unknown"} (conversation: ${started.resumed ?? "new"}${started.loadFailure ? `, ${started.loadFailure}` : ""})`);
+    session.sendSessionEvent({ type: "message", message: acpSessionResume.piRestartNotice(opts.agentName, "agent-exit", started) });
   };
   try {
-    const started = await backend.startSession();
+    const resumeId = opts.resumeAgentSessionId;
+    const started = await backend.startSession(void 0, resumeId ? { loadSessionId: resumeId } : {});
     acpSessionId = started.sessionId;
+    rememberAgentSession(started.agentSessionId);
     backendStarted = true;
     await afterSessionStarted(opts.model);
+    if (resumeId) {
+      logger.logger.debug(`[${opts.agentName}] Resume of agent session ${resumeId}: ${started.resumed ?? "new"}${started.loadFailure ? ` (${started.loadFailure})` : ""}`);
+      if (started.resumed !== "loaded") session.sendSessionEvent({ type: "message", message: acpSessionResume.piRestartNotice(opts.agentName, "resume", started) });
+    }
     if (verbose) {
       if (!sawSlashCommands) {
         logAcp("muted", `Outgoing slash commands from ${opts.agentName}: not reported yet`);
@@ -1233,6 +1437,7 @@ async function runAcp(opts) {
         break;
       }
       logAcp("incoming", `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
+      endOutOfTurn("prompt");
       sendEnvelopes(sessionManager.startTurn());
       turnCancelled = false;
       setThinking(true);
@@ -1250,7 +1455,8 @@ async function runAcp(opts) {
         if (typeof batch.mode.effort === "string") {
           await switchEffortIfRequested(batch.mode.effort, modelChanged);
         }
-        const prompt = todoDiscoverySent ? batch.message : `${batch.message}
+        const projected = await projectInjector.decorate(batch.message);
+        const prompt = todoDiscoverySent ? projected : `${projected}
 
 ${index.BUILTIN_TODO_DISCOVERY}`;
         const attachments = batch.attachments ?? [];
@@ -1310,7 +1516,7 @@ ${index.BUILTIN_TODO_DISCOVERY}`;
     await backend.dispose();
     if (fileBackedPermissionMode) {
       try {
-        sessionModeFile.removeSessionModeFile(session.sessionId);
+        acpSessionResume.removeSessionModeFile(session.sessionId);
       } catch (error) {
         logger.logger.debug(`[${opts.agentName}] Failed to remove session mode file:`, error);
       }