very-happy-cli 0.2.178 → 0.2.180

package/dist/{index-BehVbAsA.mjs → index-BUNnpGFF.mjs}

@@ -1,35 +1,38 @@
-import { D as DefaultTransport, A as AcpBackend, i as isAgentExitError, a as acpNoticeMessage } from './AcpBackend-DCQXHRzT.mjs';
-export { b as DEFAULT_IDLE_TIMEOUT_MS, c as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, d as formatDurationMinutes, h as handleAgentMessageChunk, g as handleAgentThoughtChunk, j as handleLegacyMessageChunk, k as handlePlanUpdate, l as handleThinkingUpdate, m as handleToolCall, n as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-DCQXHRzT.mjs';
-import { l as logger } from './logger--vAVtXB_.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-BXrQcqwC.mjs';
-import { o as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-Clqlu17M.mjs';
+import { D as DefaultTransport, A as AcpBackend, i as isAgentExitError, a as acpNoticeMessage } from './AcpBackend-B8Zi30Zh.mjs';
+export { b as DEFAULT_IDLE_TIMEOUT_MS, c as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, d as formatDurationMinutes, h as handleAgentMessageChunk, g as handleAgentThoughtChunk, j as handleLegacyMessageChunk, k as handlePlanUpdate, l as handleThinkingUpdate, m as handleToolCall, n as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-B8Zi30Zh.mjs';
+import { l as logger } from './logger-BUngm5Xg.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-i8Rab0xT.mjs';
+import { q as PI_STEER_CAPABILITY, f as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY } from './index-C6Vn5Eac.mjs';
 import { r as registerAgentAttachmentDownloads } from './agentAttachments-M_B5qEF2.mjs';
-import { c as configuration } from './configuration-DVrb61aY.mjs';
-import { a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt, C as CLAUDE_ATTACHMENT_KINDS } from './attachmentContent-DkkdpSSJ.mjs';
-import { p as preparePiTeamsRuntime } from './piRuntime-E44qTVQ4.mjs';
+import { c as configuration } from './configuration-PxzEJumr.mjs';
+import { a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt, C as CLAUDE_ATTACHMENT_KINDS } from './attachmentContent-CIn4iPEk.mjs';
+import { p as preparePiTeamsRuntime } from './piRuntime-CdN0JAsa.mjs';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { c as connectionState, A as ApiClient } from './api-Dib0dmqC.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-gwJ5lTf0.mjs';
-import { h as hashObject, s as startHappyServer } from './deterministicJson-C5ZwZ7hu.mjs';
-import { r as readSettings } from './persistence-DTk4sNpd.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-B1H9gNbN.mjs';
-import { c as createSessionMetadata } from './createSessionMetadata-8Fuj2-IV.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-_eD4cuUT.mjs';
-import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon } from './controlClient-BYKyGyxj.mjs';
-import { e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { S as StreamRelay } from './streamRelay-CJoMk_d2.mjs';
+import { c as connectionState, A as ApiClient } from './api-Hov8p7CA.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-CTEJDqtS.mjs';
+import { s as sharedProjectsClient } from './client-Ca5Pcgy_.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-CaqqRYq6.mjs';
+import { r as readSettings } from './persistence-BFUOHW5h.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-BXN_bKU3.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-DDIChCx8.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-1Qlek3wl.mjs';
+import { c as createSessionForStartup } from './startupSessionCreate-uZ6BM0ty.mjs';
+import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon } from './controlClient-DoeYovwP.mjs';
+import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-nBXdJxJm.mjs';
+import { r as readAcpReconnectEnv, n as normalizeAcpPermissionMode, p as piRestartNotice, w as writeSessionModeFile, a as removeSessionModeFile } from './acpSessionResume-B9l54P-X.mjs';
+import { S as StreamRelay } from './streamRelay-DnMCMMfV.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-BVlrEhIi.mjs';
-import { T as TitleGenerator } from './titleGenerator-BGEzNWC9.mjs';
-import { w as writeSessionModeFile, n as normalizeAcpPermissionMode, r as removeSessionModeFile } from './sessionModeFile-ByLbXTbg.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-26fKbRCm.mjs';
+import { T as TitleGenerator } from './titleGenerator-Uzbd4utr.mjs';
 import { E as EditReportThrottle, e as extractAcpEditPaths } from './editPaths-BVfS_FFL.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
-import './time-BuGWTVP6.mjs';
+import './time-D3ETL7Jb.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './processTree-CP5IvQ2Z.mjs';
-import './package-B7B03ejW.mjs';
+import './package-7Ld1YMhh.mjs';
 import 'chalk';
 import 'node:util';
 import 'node:fs';
@@ -37,49 +40,52 @@ import '@paralleldrive/cuid2';
 import 'zod';
 import 'node:os';
 import 'node:fs/promises';
-import './attachmentLimits-UyFn8fkQ.mjs';
-import './resources-BdFBQi8r.mjs';
+import './pushNotifications-DCiBEVeC.mjs';
 import 'axios';
-import './lidState-DNMlIhX0.mjs';
+import './resources-y9jfyO-_.mjs';
+import './lidState-bBrmaQd2.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
 import './limits-DIo7rEBR.mjs';
-import './registerCommonHandlers-CvIedVRf.mjs';
+import './registerCommonHandlers-CTkCvjxt.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
-import './sync-DbW07iQS.mjs';
-import './backgroundTaskActivity-BVwJBl02.mjs';
-import 'tweetnacl';
-import './types-CkqAACXx.mjs';
-import './client-BTX9hsbr.mjs';
-import './context-B3XPVJlj.mjs';
-import './sessionOps-BVoXe12O.mjs';
-import './tools-BtsrQnNS.mjs';
-import './reportProgressTool-D5tEoXMW.mjs';
-import './client-CnlkkrZO.mjs';
+import './sync-BvVhDO40.mjs';
+import './backgroundTaskActivity-8PdPxrvy.mjs';
+import './prompt-BOouDaTM.mjs';
+import './reportProgressTool-ZOCNjWHr.mjs';
+import './client-CnB7kRCT.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
 import './trimIdent-BAjmv_TG.mjs';
-import './peerTools-3R9RUARX.mjs';
+import './client-D4uPb1uu.mjs';
+import './context-CJGRRGWW.mjs';
+import './sessionOps-C58iDeD5.mjs';
+import './tools-Cho7iIWf.mjs';
+import './peerTools-BOlDRyhi.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-DRb2Jr5s.mjs';
+import './remoteSessionClient-PP-mOKmw.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import './downloadTarget-DJPwAZlu.mjs';
+import './downloadTarget-jbOz1egC.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-BUagGC_-.mjs';
+import './bootstrap-Dt5I1SOl.mjs';
+import './webPanels-B2_C2-3g.mjs';
 import './previewPath-CXN4Vag0.mjs';
+import 'tweetnacl';
+import './types-CkqAACXx.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-BezKSFDi.mjs';
+import './localHappyAgentAuth-Dn1jYDpt.mjs';
+import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'url';
 import 'node:module';
 import './oneShotPrompts-DT4p6RNd.mjs';
@@ -127,6 +133,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";
@@ -636,6 +749,7 @@ class GenericAcpPermissionHandler extends BasePermissionHandler {
     });
   }
 }
+const PI_STEER_OFFER_TIMEOUT_MS = 5e3;
 function resolveSessionFlavor(agentName) {
   if (agentName === "gemini") {
     return "gemini";
@@ -664,12 +778,45 @@ async function runAcp(opts) {
     machineId: settings.machineId,
     startedBy: opts.startedBy,
     sandbox: settings.sandboxConfig,
-    capabilities: [PROMPT_QUEUE_CAPABILITY]
+    capabilities: [PROMPT_QUEUE_CAPABILITY, PROJECT_SESSION_CAPABILITY]
   });
   metadata.attachmentKinds = [];
-  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
+  const reconnect = readAcpReconnectEnv(process.env);
+  let response;
+  if (reconnect) {
+    logger.debug(`[acp] Reconnecting to existing session ${reconnect.sessionId}`);
+    response = {
+      id: reconnect.sessionId,
+      seq: reconnect.seq,
+      encryptionKey: decodeBase64(reconnect.encryptionKey),
+      encryptionVariant: reconnect.encryptionVariant,
+      metadata,
+      metadataVersion: reconnect.metadataVersion,
+      agentState: state,
+      agentStateVersion: reconnect.agentStateVersion
+    };
+  } else {
+    response = await createSessionForStartup(() => api.getOrCreateSession({ tag: sessionTag, metadata, state }), { startedBy: opts.startedBy, log: (m) => logger.debug(m) });
+  }
   if (response) {
     logAcp("muted", `Happy Session ID: ${response.id}`);
+    await claimSessionOrExit(response.id, { takeover: !!reconnect, flavor: resolveSessionFlavor(opts.agentName) });
+  }
+  if (reconnect && response && !await api.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.getSession(response.id, response.encryptionKey, response.encryptionVariant);
+    if (snapshot.ok) {
+      response = applyServerSnapshot(response, snapshot.session);
+      reconnectSeeded = true;
+      resumedPermissionMode = normalizeAcpPermissionMode(snapshot.session.metadata?.permissionMode) ?? null;
+    } else {
+      response = withoutServerSnapshot(response);
+      logger.debug(`[acp] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
+    }
   }
   let session;
   let permissionHandler;
@@ -679,6 +826,7 @@ async function runAcp(opts) {
     metadata,
     state,
     response,
+    sessionClientOptions: reconnectSeeded && response ? { initialSeq: response.seq } : void 0,
     onSessionSwap: (newSession) => {
       session = newSession;
       if (permissionHandler) {
@@ -688,6 +836,12 @@ async function runAcp(opts) {
     }
   });
   session = initialSession;
+  if (reconnect) {
+    session.suppressNextArchiveSignal();
+    if (!reconnectSeeded) session.skipExistingMessages();
+    void session.cancelUndeliveredQueuedInputs();
+    session.updateMetadata((meta) => mergeReconnectMetadata(meta, metadata, Date.now()));
+  }
   if (response) {
     try {
       await notifyDaemonSessionStarted(response.id, metadata, {
@@ -727,7 +881,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;
@@ -747,8 +901,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.debug(`[${opts.agentName}] pi extension connected to the steer channel`);
+    session.updateMetadata((current) => ({ ...current, capabilities: [.../* @__PURE__ */ new Set([...current.capabilities ?? [], PI_STEER_CAPABILITY])] }));
+  });
   const happyServer = await startHappyServer(session, {
     assistant: isAssistantVariant,
+    ...piSteer ? { piSteer } : {},
+    push: { sendAttention: (input) => api.push().sendAttention(input) },
     ...opts.agentName === "pi" ? { onContextUsage: (contextUsage) => {
       session.updateAgentState((state2) => ({ ...state2, contextUsage }));
     } } : {}
@@ -770,6 +931,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,
@@ -782,6 +944,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.debug(`[${opts.agentName}] Out-of-turn output ended (${reason})`);
+    sendEnvelopes(sessionManager.endTurn("completed"));
+    setThinking(false);
+  };
   const setThinking = (next) => {
     if (thinking === next) {
       return;
@@ -796,6 +967,7 @@ async function runAcp(opts) {
   let backendStarted = false;
   let backendGone = null;
   let todoDiscoverySent = false;
+  const projectInjector = createProjectInjector({ 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.debug(`[${opts.agentName}] ${reason}; stopping ACP runner`);
@@ -1093,7 +1265,18 @@ async function runAcp(opts) {
         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 = new TitleGenerator(session);
@@ -1118,6 +1301,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.debug(`[${opts.agentName}] User message steered into the running turn`);
+          return;
+        }
+        logger.debug(`[${opts.agentName}] Steer not taken; queued for the next turn`);
+      }
       messageQueue.push(message.content.text, {
         permissionMode: currentPermissionMode,
         model: currentModel,
@@ -1184,6 +1374,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);
@@ -1195,19 +1391,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.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.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: 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.debug(`[${opts.agentName}] Resume of agent session ${resumeId}: ${started.resumed ?? "new"}${started.loadFailure ? ` (${started.loadFailure})` : ""}`);
+      if (started.resumed !== "loaded") session.sendSessionEvent({ type: "message", message: piRestartNotice(opts.agentName, "resume", started) });
+    }
     if (verbose) {
       if (!sawSlashCommands) {
         logAcp("muted", `Outgoing slash commands from ${opts.agentName}: not reported yet`);
@@ -1232,6 +1436,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);
@@ -1249,7 +1454,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}
 
 ${BUILTIN_TODO_DISCOVERY}`;
         const attachments = batch.attachments ?? [];

package/dist/{index-Bvldtdny.mjs → index-Bsvbgh9e.mjs}

@@ -1,14 +1,14 @@
 import { statSync, readdirSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { l as logger } from './logger--vAVtXB_.mjs';
-import { r as readSettings } from './persistence-DTk4sNpd.mjs';
+import { l as logger } from './logger-BUngm5Xg.mjs';
+import { r as readSettings } from './persistence-BFUOHW5h.mjs';
 import { d as describeAgentHome, C as CLAUDE_CONFIG_DIR_ENV, a as CODEX_HOME_ENV, f as findClaudeConversation, b as agentHomeCandidates, c as findCodexThread, r as resolveAgentHomes, A as AGENT_HOME_ENV_NAMES, g as agentHomeEnv, p as probeLoginShellEnv } from './loginShellEnv-Dw8M7tkI.mjs';
 export { h as claudeConversationPath, i as claudeProjectDirName, j as codexRolloutFileMatches, e as expandHomePath } from './loginShellEnv-Dw8M7tkI.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-DVrb61aY.mjs';
+import './configuration-PxzEJumr.mjs';
 import 'node:path';
-import './package-B7B03ejW.mjs';
+import './package-7Ld1YMhh.mjs';
 import 'node:fs/promises';
 import 'zod';
 import './authRelay-DhQhkBvX.mjs';

package/dist/{index-BYOZ_8WZ.cjs → index-C64Ufj4D.cjs}

@@ -2,14 +2,14 @@
 
 var node_fs = require('node:fs');
 var os = require('node:os');
-var logger = require('./logger-DXTWlPzP.cjs');
-var persistence = require('./persistence-BfX72dne.cjs');
+var logger = require('./logger-CphW5nUE.cjs');
+var persistence = require('./persistence-9BMYspxG.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-4TGMrjul.cjs');
+require('./configuration-CYO-kPOS.cjs');
 require('node:path');
-require('./package-DY4zTbKS.cjs');
+require('./package-KhLqBDX9.cjs');
 require('node:fs/promises');
 require('zod');
 require('./authRelay-Dy1qU9td.cjs');