very-happy-cli 0.2.178 → 0.2.180

package/dist/{codexCommand-DzxIWXIT.cjs → codexCommand-BNoD1t1C.cjs}

@@ -1,100 +1,105 @@
 'use strict';
 
-var auth = require('./auth-DgIV0Cvt.cjs');
-var index = require('./index-_l1Sdmbi.cjs');
+var auth = require('./auth-CBXnm-Mj.cjs');
+var index = require('./index-Dv0Q48P3.cjs');
+var deterministicJson = require('./deterministicJson-xqA6DaOm.cjs');
+var client = require('./client-DJplzPjD.cjs');
 var promises = require('node:fs/promises');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
 var node_crypto = require('node:crypto');
 var cuid2 = require('@paralleldrive/cuid2');
 var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var attachmentContent = require('./attachmentContent-bpQTBJ0y.cjs');
+var attachmentContent = require('./attachmentContent-CEm13_gF.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-DWX6BbiU.cjs');
+var sessionLock = require('./sessionLock-DRZUcKHT.cjs');
 var React = require('react');
-var api = require('./api-JANhFdZV.cjs');
-var codexAppServerClient = require('./codexAppServerClient-CRlBWGn3.cjs');
-var specialCommands = require('./specialCommands-BJ-nqY4s.cjs');
-var logger = require('./logger-DXTWlPzP.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-DyLmKKtO.cjs');
-var codexTermination = require('./codexTermination-C28FzlLb.cjs');
+var api = require('./api-DM7b1OKj.cjs');
+var codexAppServerClient = require('./codexAppServerClient-PE-12AsW.cjs');
+var specialCommands = require('./specialCommands-BRufxlqe.cjs');
+var logger = require('./logger-CphW5nUE.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-BlM_tfej.cjs');
+var codexTermination = require('./codexTermination-BmBbizFK.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-BfX72dne.cjs');
-var machineMetadata = require('./machineMetadata-DcUupMje.cjs');
-var configuration = require('./configuration-4TGMrjul.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DYl7l4Ts.cjs');
-var projectPath = require('./projectPath-ChLhdOyt.cjs');
+var persistence = require('./persistence-9BMYspxG.cjs');
+var machineMetadata = require('./machineMetadata-BQm9YTcI.cjs');
+var configuration = require('./configuration-CYO-kPOS.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CIsvBrVe.cjs');
+var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-B2NynaWZ.cjs');
-var deterministicJson = require('./deterministicJson-BjNQsAjO.cjs');
-var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
-var controlClient = require('./controlClient-BTaZlbC6.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-BEWCqJU-.cjs');
+var createSessionMetadata = require('./createSessionMetadata-xz767pcG.cjs');
+var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
+var controlClient = require('./controlClient-Bqv5v5OM.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-PkZGsQDk.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-C2EeYTFH.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-DvvVX3TB.cjs');
+var startupSessionCreate = require('./startupSessionCreate-kdr3m1uX.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-C5QfToCe.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-D-HyjGIX.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-A6zR3Iy6.cjs');
-require('./browser-CSKhc0Bl.cjs');
+require('./time-Cjv0zxQO.cjs');
+require('./browser-DZ6qRtfH.cjs');
 require('open');
 require('zod');
-require('./attachmentLimits-SqeAHrVC.cjs');
+require('./prompt-lgF9IE82.cjs');
+require('./reportProgressTool-14AXr959.cjs');
+require('./client-BWjaHKtj.cjs');
+require('./precheckCompat-CWOi5c9L.cjs');
+require('./agentGuidance-BtBx2xxE.cjs');
 require('node:fs');
-require('./lidState-BeOwj6eW.cjs');
+require('./client-D_loZ9IK.cjs');
+require('./context-6TP-iz_c.cjs');
+require('./sessionOps-BrGiU9-s.cjs');
+require('socket.io-client');
+require('./backgroundTaskActivity-CBvUdj39.cjs');
+require('./resources-CvIlkzpP.cjs');
+require('./tools-BL7Byl_x.cjs');
+require('./peerTools-DQNlrcqM.cjs');
+require('node:os');
+require('./ids-B6ZC0HGt.cjs');
+require('./remoteSessionClient-D843fkzL.cjs');
+require('@modelcontextprotocol/sdk/server/mcp.js');
+require('node:http');
+require('@modelcontextprotocol/sdk/server/streamableHttp.js');
+require('./limits-C-a7gr04.cjs');
+require('./downloadTarget-CEb9che-.cjs');
+require('./terminals-B_bfC9c2.cjs');
+require('./terminalTitleSuggest-DhvRFX3H.cjs');
+require('./tmuxSocket-D-Xt6Vn-.cjs');
+require('./bootstrap-DoA7okld.cjs');
+require('./package-KhLqBDX9.cjs');
+require('./webPanels-FCgFKvVe.cjs');
+require('./pushNotifications-DI92havG.cjs');
+require('./contentLogMetadata-ZSFk_NjQ.cjs');
+require('./previewPath-B0rBdhy1.cjs');
+require('crypto');
+require('./processTreeSnapshot-mDbnuojn.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('./backgroundTaskActivity-CBvUdj39.cjs');
-require('./contentLogMetadata-ZSFk_NjQ.cjs');
+require('./sync-Bn-idAoy.cjs');
 require('chalk');
 require('node:readline');
 require('./manager-HrEj442o.cjs');
 require('@anthropic-ai/sandbox-runtime');
-require('node:os');
-require('./package-DY4zTbKS.cjs');
-require('./rateLimitWindows-Czb7_7cK.cjs');
+require('./rateLimitWindows-YRIYVdo4.cjs');
 require('./processTree-CMHWlVse.cjs');
 require('node:util');
-require('./detectCLI-DR9ZaN6B.cjs');
+require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-Br-mgogg.cjs');
+require('./localHappyAgentAuth-DZHQnIW9.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./client-Dnza1hgN.cjs');
-require('./context-JoKu0V54.cjs');
-require('./sessionOps-BAnr7n8t.cjs');
-require('./resources-JDPugcDq.cjs');
-require('./tools-CxJp4T1T.cjs');
-require('./reportProgressTool-B9nCzbkL.cjs');
-require('./client-C4zKGjiJ.cjs');
-require('./precheckCompat-CWOi5c9L.cjs');
-require('./agentGuidance-BtBx2xxE.cjs');
-require('./peerTools-iy3_6Yc5.cjs');
-require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-BRTIOX5b.cjs');
-require('@modelcontextprotocol/sdk/server/mcp.js');
-require('node:http');
-require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('./downloadTarget-BN5vZt3K.cjs');
-require('./terminals-B_bfC9c2.cjs');
-require('./terminalTitleSuggest-DhvRFX3H.cjs');
-require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-DCQ87Aan.cjs');
-require('./previewPath-B0rBdhy1.cjs');
-require('./spawnHappyCLI-fzUagkKV.cjs');
-require('./doctorReadiness-BCZGcN0a.cjs');
+require('./spawnHappyCLI-DnUZv0X2.cjs');
+require('./doctorReadiness-Dl6yRQCy.cjs');
 
 function getStartedSubagents(state) {
   return state.startedSubagents ?? /* @__PURE__ */ new Set();
@@ -1396,7 +1401,7 @@ async function runCodex(opts) {
     dangerouslySkipPermissions: initialPermissionMode === "yolo" || initialPermissionMode === "bypassPermissions",
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
     ...forkedFromMessageId ? { forkedFromMessageId } : {},
-    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, index.CODEX_STEER_CAPABILITY]
+    capabilities: [index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, index.CODEX_STEER_CAPABILITY, index.PROJECT_SESSION_CAPABILITY]
   });
   metadata.attachmentKinds = [...attachmentContent.CLAUDE_ATTACHMENT_KINDS];
   const importCodexThreadId = process.env[IMPORT_CODEX_THREAD_ENV];
@@ -1425,7 +1430,7 @@ async function runCodex(opts) {
       agentStateVersion: parseInt(reconnectAgentStateVersion || "0", 10)
     };
   } else {
-    response = await api$1.getOrCreateSession({ tag: sessionTag, metadata, state });
+    response = await startupSessionCreate.createSessionForStartup(() => api$1.getOrCreateSession({ tag: sessionTag, metadata, state }), { startedBy: opts.startedBy, log: (m) => logger.logger.debug(m) });
   }
   if (response) {
     await sessionLock.claimSessionOrExit(response.id, { takeover: !!reconnectSessionId, flavor: "codex" });
@@ -1435,15 +1440,18 @@ async function runCodex(opts) {
   }
   let reconnectSeeded = false;
   let wakingFromHibernation = false;
+  let reconnectReplay = null;
   if (reconnectSessionId && response) {
     const snapshot = await api$1.getSession(response.id, response.encryptionKey, response.encryptionVariant);
     if (snapshot.ok) {
       response = sessionLock.applyServerSnapshot(response, snapshot.session);
       reconnectSeeded = true;
       logger.logger.debug(`[START] Reconnect seeded from server: seq=${snapshot.session.seq} metadataVersion=${snapshot.session.metadataVersion}`);
-      const wake = sessionLock.applyHibernationReplay(response);
+      const wake = sessionLock.applyReconnectReplay(response);
       response = wake.response;
-      wakingFromHibernation = wake.replaying;
+      reconnectReplay = wake.replay;
+      wakingFromHibernation = wake.replay?.source === "hibernation";
+      if (wake.replay) logger.logger.debug(`[START] Resuming (${wake.replay.source}): replaying records after seq=${response.seq}`);
     } else {
       response = sessionLock.withoutServerSnapshot(response);
       logger.logger.debug(`[START] Reconnect without server snapshot (${snapshot.reason}); skipping existing messages`);
@@ -1451,7 +1459,7 @@ async function runCodex(opts) {
   }
   let session;
   let permissionHandler;
-  let client;
+  let client$1;
   let reasoningProcessor;
   let abortInProgress = null;
   let turnActive = false;
@@ -1474,7 +1482,7 @@ async function runCodex(opts) {
   if (reconnectSessionId) {
     session.suppressNextArchiveSignal();
     if (!reconnectSeeded) session.skipExistingMessages();
-    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs();
+    if (!wakingFromHibernation) void session.cancelUndeliveredQueuedInputs(reconnectReplay ? { maxSeq: reconnectReplay.seq } : void 0);
     session.updateMetadata((meta) => sessionLock.mergeReconnectMetadata(meta, metadata, Date.now()));
   }
   if (response) {
@@ -1530,7 +1538,7 @@ async function runCodex(opts) {
   const CODEX_IMAGE_MIME_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
   const steerDeps = {
     ownsTurn: () => turnActive && !abortInProgress && !shouldExit,
-    steer: (input) => client.steerTurn(input),
+    steer: (input) => client$1.steerTurn(input),
     stage: (attachments) => attachmentContent.stageClaudeAttachments(attachments, {
       happyHomeDir: configuration.configuration.happyHomeDir,
       sessionId: session.sessionId
@@ -1538,7 +1546,7 @@ async function runCodex(opts) {
     withAttachments: attachmentContent.appendStagedAttachmentsToPrompt,
     unlink: (path) => promises.unlink(path),
     isImage: (file) => CODEX_IMAGE_MIME_TYPES.includes(file.mimeType),
-    onSteered: (text) => messageBuffer$1.addMessage(text, "user"),
+    onSteered: (text) => messageBuffer.addMessage(text, "user"),
     log: (message) => logger.logger.debug(message)
   };
   let userMessageDelivery = Promise.resolve();
@@ -1673,8 +1681,8 @@ async function runCodex(opts) {
         if (permissionHandler) {
           permissionHandler.abortAll();
         }
-        if (client) {
-          const abortResult = await client.abortTurnWithFallback({
+        if (client$1) {
+          const abortResult = await client$1.abortTurnWithFallback({
             gracePeriodMs: 3e3,
             forceRestartOnTimeout: true
           });
@@ -1710,12 +1718,14 @@ async function runCodex(opts) {
       return;
     }
     logger.logger.debug("[Codex] Kill session requested - terminating process");
+    const exitCursor = intent === "offline" && session ? sessionLock.exitCursorStamp(session.messageCursor, Date.now()) : void 0;
+    if (exitCursor) session.freezeInbound();
     await handleAbort("kill");
     logger.logger.debug("[Codex] Abort completed, proceeding with termination");
     try {
-      if (session) await codexTermination.settleCodexSession(session, intent, (id) => api$1.deactivateSession(id), (m, e) => logger.logger.debug(m, safeCodexErrorMetadata(e)));
+      if (session) await codexTermination.settleCodexSession(session, intent, (id) => api$1.deactivateSession(id), (m, e) => logger.logger.debug(m, safeCodexErrorMetadata(e)), exitCursor);
       try {
-        await client.disconnect();
+        await client$1.disconnect();
       } catch (e) {
         logger.logger.debug("[Codex] Error disconnecting Codex during termination", safeCodexErrorMetadata(e));
       }
@@ -1729,20 +1739,20 @@ async function runCodex(opts) {
   };
   session.rpcHandlerManager.registerHandler("codex-child-read", async (args) => {
     try {
-      return await readChildThread(client, args?.threadId);
+      return await readChildThread(client$1, args?.threadId);
     } catch (error) {
       return { error: error instanceof Error ? error.message : "Child read failed" };
     }
   });
   session.rpcHandlerManager.registerHandler("abort", () => handleAbort("user"));
   const disposeTermination = registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, () => handleKillSession("archive"), session, { processSignals: true, onSignal: () => handleKillSession("offline") });
-  const messageBuffer$1 = new messageBuffer.MessageBuffer();
+  const messageBuffer = new sessionExitLifecycle.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
   if (hasTTY) {
     console.clear();
     inkInstance = ink.render(React.createElement(CodexDisplay, {
-      messageBuffer: messageBuffer$1,
+      messageBuffer,
       logPath: process.env.DEBUG ? logger.logger.getLogPath() : void 0,
       onExit: async () => {
         logger.logger.debug("[codex]: Exiting agent via Ctrl-C");
@@ -1761,7 +1771,7 @@ async function runCodex(opts) {
     }
     process.stdin.setEncoding("utf8");
   }
-  client = new codexAppServerClient.CodexAppServerClient(sandboxConfig);
+  client$1 = new codexAppServerClient.CodexAppServerClient(sandboxConfig);
   const idleRelease = new CodexIdleReleaseTimer({
     delayMs: resolveCodexIdleReleaseMs(process.env[CODEX_IDLE_RELEASE_ENV]),
     isIdle: () => shouldReleaseIdleCodex({
@@ -1771,7 +1781,7 @@ async function runCodex(opts) {
       abortInProgress: abortInProgress !== null
     }),
     release: async () => {
-      const released = await client.releaseIdleProcess();
+      const released = await client$1.releaseIdleProcess();
       if (released) {
         logger.logger.debug("[Codex] Released idle app-server; thread kept for resume on next message");
       }
@@ -1792,7 +1802,7 @@ async function runCodex(opts) {
       session.sendSessionProtocolMessage(envelope);
     }
   });
-  client.setApprovalHandler(async (params) => {
+  client$1.setApprovalHandler(async (params) => {
     const toolName = params.type === "exec" ? "CodexBash" : params.type === "patch" ? "CodexPatch" : params.toolName ?? "McpTool";
     const input = params.type === "exec" ? { command: params.command, cwd: params.cwd } : params.type === "patch" ? { changes: params.fileChanges } : params.input ?? {};
     try {
@@ -1805,52 +1815,52 @@ async function runCodex(opts) {
     }
   });
   const editThrottle = new editPaths.EditReportThrottle();
-  client.setRateLimitHandler((snapshot) => specialCommands.wrapperRateLimitReporter().observeCodex(snapshot));
-  client.setEventHandler((msg) => {
+  client$1.setRateLimitHandler((snapshot) => specialCommands.wrapperRateLimitReporter().observeCodex(snapshot));
+  client$1.setEventHandler((msg) => {
     if (msg.type === "token_count") {
       session.sendAgentUsageSnapshot("codex", msg);
     }
     logger.logger.debug("[Codex] Event metadata", codexEventLogMetadata(msg));
     if (msg.type === "agent_message") {
-      messageBuffer$1.addMessage(msg.message, "assistant");
+      messageBuffer.addMessage(msg.message, "assistant");
     } else if (msg.type === "agent_reasoning_delta") ; else if (msg.type === "agent_reasoning") {
-      messageBuffer$1.addMessage(`[Thinking] ${msg.text.substring(0, 100)}...`, "system");
+      messageBuffer.addMessage(`[Thinking] ${msg.text.substring(0, 100)}...`, "system");
     } else if (msg.type === "exec_command_begin") {
-      messageBuffer$1.addMessage(`Executing: ${msg.command}`, "tool");
+      messageBuffer.addMessage(`Executing: ${msg.command}`, "tool");
     } else if (msg.type === "exec_command_end") {
       const output = msg.output || msg.error || "Command completed";
       const truncatedOutput = output.substring(0, 200);
-      messageBuffer$1.addMessage(
+      messageBuffer.addMessage(
         `Result: ${truncatedOutput}${output.length > 200 ? "..." : ""}`,
         "result"
       );
     } else if (msg.type === "task_started") {
-      messageBuffer$1.addMessage("Starting task...", "status");
+      messageBuffer.addMessage("Starting task...", "status");
     } else if (msg.type === "task_complete") {
       const failure = describeCodexFailure(msg);
       if (failure) {
-        messageBuffer$1.addMessage(`Task failed: ${failure}`, "status");
+        messageBuffer.addMessage(`Task failed: ${failure}`, "status");
         session.sendSessionEvent({ type: "message", message: `Codex error: ${failure}` });
       } else {
-        messageBuffer$1.addMessage("Task completed", "status");
+        messageBuffer.addMessage("Task completed", "status");
       }
     } else if (msg.type === "turn_aborted") {
       const failure = describeCodexFailure(msg);
       if (failure) {
-        messageBuffer$1.addMessage(`Turn aborted: ${failure}`, "status");
+        messageBuffer.addMessage(`Turn aborted: ${failure}`, "status");
         session.sendSessionEvent({ type: "message", message: `Codex error: ${failure}` });
       } else {
-        messageBuffer$1.addMessage("Turn aborted", "status");
+        messageBuffer.addMessage("Turn aborted", "status");
       }
     } else if (msg.type === "turn_retry") {
       const notice = describeCodexRetry(msg);
-      messageBuffer$1.addMessage(notice, "status");
+      messageBuffer.addMessage(notice, "status");
       session.sendSessionEvent({ type: "message", message: notice });
     } else if (msg.type === "steer_dropped") {
       const clientIds = Array.isArray(msg.client_ids) ? msg.client_ids.filter((id) => typeof id === "string" && id.length > 0) : [];
       if (clientIds.length > 0) {
         session.sendQueueCancelReason(clientIds, "aborted");
-        messageBuffer$1.addMessage("A steered message was not read before the turn ended", "status");
+        messageBuffer.addMessage("A steered message was not read before the turn ended", "status");
       }
     }
     if (msg.type === "task_started") {
@@ -1884,16 +1894,16 @@ async function runCodex(opts) {
       }
       const changeCount = Object.keys(changes).length;
       const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
-      messageBuffer$1.addMessage(`Modifying ${filesMsg}...`, "tool");
+      messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
     }
     if (msg.type === "patch_apply_end") {
       const { stdout, stderr, success } = msg;
       if (success) {
         const message = stdout || "Files modified successfully";
-        messageBuffer$1.addMessage(message.substring(0, 200), "result");
+        messageBuffer.addMessage(message.substring(0, 200), "result");
       } else {
         const errorMsg = stderr || "Failed to modify files";
-        messageBuffer$1.addMessage(`Error: ${errorMsg.substring(0, 200)}`, "result");
+        messageBuffer.addMessage(`Error: ${errorMsg.substring(0, 200)}`, "result");
       }
     }
     if (msg.type === "turn_diff") {
@@ -1919,7 +1929,7 @@ async function runCodex(opts) {
       }
     }
   });
-  const happyServer = await deterministicJson.startHappyServer(session);
+  const happyServer = await deterministicJson.startHappyServer(session, { push: { sendAttention: (input) => api$1.push().sendAttention(input) } });
   const bridgeEntrypoint = path.join(projectPath.projectPath(), "bin", "very-happy-mcp.mjs");
   const mcpServers = {
     [HAPPY_MCP_SERVER_NAME]: {
@@ -1929,13 +1939,14 @@ async function runCodex(opts) {
   };
   let first = true;
   let appendSystemPromptInjected = false;
+  const projectInjector = deterministicJson.createProjectInjector({ client: client.sharedProjectsClient(), sessionId: () => session?.sessionId, metadata: () => session?.getMetadata?.() ?? null, agent: "codex" });
   process.env.VH_PEER_SESSION_ID = session.sessionId;
   try {
     logger.logger.debug("[codex]: client.connect begin");
-    await client.connect();
+    await client$1.connect();
     logger.logger.debug("[codex]: client.connect done");
     try {
-      discoveredModels = await client.listModels();
+      discoveredModels = await client$1.listModels();
       if (discoveredModels.length > 0) {
         session.updateMetadata((metadata2) => ({
           ...metadata2,
@@ -1954,9 +1965,9 @@ async function runCodex(opts) {
     }
     if (opts.resumeThreadId) {
       await resumeExistingThread({
-        client,
+        client: client$1,
         session,
-        messageBuffer: messageBuffer$1,
+        messageBuffer,
         threadId: opts.resumeThreadId,
         cwd: process.cwd(),
         mcpServers
@@ -1966,9 +1977,9 @@ async function runCodex(opts) {
     }
     if (!reconnectSessionId && !opts.resumeThreadId && importCodexThreadId) {
       await importCodexThread({
-        client,
+        client: client$1,
         session,
-        messageBuffer: messageBuffer$1,
+        messageBuffer,
         threadId: importCodexThreadId,
         cwd: process.cwd(),
         mcpServers
@@ -1979,7 +1990,7 @@ async function runCodex(opts) {
     const forkCodexThreadId = process.env.HAPPY_FORK_CODEX_THREAD_ID;
     if (!reconnectSessionId && forkCodexThreadId) {
       try {
-        const { thread } = await client.readThread({
+        const { thread } = await client$1.readThread({
           threadId: forkCodexThreadId,
           includeTurns: true
         });
@@ -2076,7 +2087,7 @@ async function runCodex(opts) {
       turnActive = true;
       if (isCodexClearText(message.message)) {
         logger.logger.debug("[Codex] Handling /clear command - resetting Codex thread state");
-        client.clearThreadState();
+        client$1.clearThreadState();
         currentTurnId = null;
         codexStartedSubagents = /* @__PURE__ */ new Set();
         codexActiveSubagents = /* @__PURE__ */ new Set();
@@ -2088,7 +2099,7 @@ async function runCodex(opts) {
         appendSystemPromptInjected = false;
         thinking = false;
         session.keepAlive(thinking, "remote");
-        messageBuffer$1.addMessage("Context was reset", "status");
+        messageBuffer.addMessage("Context was reset", "status");
         session.sendSessionEvent({ type: "message", message: "Context was reset" });
         session.updateMetadata((currentMetadata) => {
           const nextMetadata = { ...currentMetadata };
@@ -2106,10 +2117,10 @@ async function runCodex(opts) {
         idleRelease.arm();
         continue;
       }
-      messageBuffer$1.addMessage(message.message, "user");
+      messageBuffer.addMessage(message.message, "user");
       try {
-        await client.ensureConnected();
-        const sandboxManagedByHappy = client.sandboxEnabled;
+        await client$1.ensureConnected();
+        const sandboxManagedByHappy = client$1.sandboxEnabled;
         const executionPolicy = resolveCodexExecutionPolicy(
           message.mode.permissionMode,
           sandboxManagedByHappy
@@ -2118,8 +2129,8 @@ async function runCodex(opts) {
         if (effortRefusal) {
           throw new Error(effortRefusal);
         }
-        if (!client.hasActiveThread()) {
-          const startedThread = await client.startThread({
+        if (!client$1.hasActiveThread()) {
+          const startedThread = await client$1.startThread({
             model: message.mode.model,
             cwd: process.cwd(),
             approvalPolicy: executionPolicy.approvalPolicy,
@@ -2135,7 +2146,7 @@ async function runCodex(opts) {
           message.mode.appendSystemPrompt && !appendSystemPromptInjected
         );
         const turnPrompt = buildCodexTurnPrompt({
-          message: message.message,
+          message: await projectInjector.decorate(message.message),
           mode: message.mode,
           includeAppendSystemPrompt,
           includeTitleInstruction: first
@@ -2144,7 +2155,7 @@ async function runCodex(opts) {
           happyHomeDir: configuration.configuration.happyHomeDir,
           sessionId: session.sessionId
         }) : [];
-        const result = await client.sendTurnAndWait(attachmentContent.appendStagedAttachmentsToPrompt(turnPrompt, staged), {
+        const result = await client$1.sendTurnAndWait(attachmentContent.appendStagedAttachmentsToPrompt(turnPrompt, staged), {
           images: staged.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => file.path),
           model: message.mode.model,
           approvalPolicy: executionPolicy.approvalPolicy,
@@ -2162,11 +2173,11 @@ async function runCodex(opts) {
         logger.logger.warn("Error in codex session", safeCodexErrorMetadata(error));
         const reason = describeThrownTurnError(error);
         if (reason) {
-          messageBuffer$1.addMessage(`Task failed: ${reason}`, "status");
+          messageBuffer.addMessage(`Task failed: ${reason}`, "status");
           session.sendSessionEvent({ type: "message", message: `Codex error: ${reason}` });
         } else {
           const tail = codexStderrTailOf(error);
-          messageBuffer$1.addMessage("Process exited unexpectedly", "status");
+          messageBuffer.addMessage("Process exited unexpectedly", "status");
           session.sendSessionEvent({ type: "message", message: tail ? `Process exited unexpectedly: ${tail}` : "Process exited unexpectedly" });
         }
       } finally {
@@ -2211,7 +2222,7 @@ async function runCodex(opts) {
     }
     idleRelease.cancel();
     logger.logger.debug("[codex]: client.disconnect begin");
-    await client.disconnect();
+    await client$1.disconnect();
     logger.logger.debug("[codex]: client.disconnect done");
     logger.logger.debug("[codex]: happyServer.stop");
     happyServer.stop();
@@ -2235,7 +2246,7 @@ async function runCodex(opts) {
       logger.logger.debug("[codex]: inkInstance.unmount()");
       inkInstance.unmount();
     }
-    messageBuffer$1.clear();
+    messageBuffer.clear();
     logActiveHandles("cleanup-end");
     logger.logger.debug("[codex]: Final cleanup completed");
     if (hibernationExit.hibernating && hibernationStamp) {