happy-imou-cloud 2.1.48 → 2.1.50

package/dist/{BaseReasoningProcessor-CM3JbXUC.mjs → BaseReasoningProcessor-2qoX8OA1.mjs}

@@ -1,5 +1,5 @@
-import { a as createSessionMetadata, p as publishSessionRegistration } from './index-BzsBo3_Z.mjs';
-import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-CSjP-Z3Y.mjs';
+import { a as createSessionMetadata, p as publishSessionRegistration } from './index-CyGHrYHl.mjs';
+import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-6B4EMs47.mjs';
 import { EventEmitter } from 'node:events';
 import { randomUUID } from 'node:crypto';
 

package/dist/{BaseReasoningProcessor-CKtDfihV.cjs → BaseReasoningProcessor-D3q5lh9h.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-C8X1VlHZ.cjs');
-var persistence = require('./api-eaGKJjMt.cjs');
+var index = require('./index-CZJH0CUT.cjs');
+var persistence = require('./api-D4JOaMll.cjs');
 var node_events = require('node:events');
 var node_crypto = require('node:crypto');
 

package/dist/{ProviderSelectionHandler-BHKIBw4t.cjs → ProviderSelectionHandler-CO5BYEgC.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var persistence = require('./api-eaGKJjMt.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CLCYBgZX.cjs');
+var persistence = require('./api-D4JOaMll.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Bo_MMbdY.cjs');
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{ProviderSelectionHandler-vgZ2egD_.mjs → ProviderSelectionHandler-CO6foZET.mjs}

@@ -1,5 +1,5 @@
-import { l as logger } from './api-CSjP-Z3Y.mjs';
-import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-BHu-3hZQ.mjs';
+import { l as logger } from './api-6B4EMs47.mjs';
+import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-ggfGac_S.mjs';
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{api-CSjP-Z3Y.mjs → api-6B4EMs47.mjs}

@@ -18,7 +18,7 @@ import { spawn } from 'node:child_process';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.1.48";
+var version = "2.1.50";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";

package/dist/{api-eaGKJjMt.cjs → api-D4JOaMll.cjs}

@@ -38,7 +38,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "happy-imou-cloud";
-var version = "2.1.48";
+var version = "2.1.50";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";

package/dist/{command-BzPI4N1n.mjs → command-BbJCdR2t.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-BzsBo3_Z.mjs';
+import { c as createDefaultRuntimeShell } from './index-CyGHrYHl.mjs';
 import 'chalk';
-import './api-CSjP-Z3Y.mjs';
+import './api-6B4EMs47.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';

package/dist/{command-DDoz1Eky.cjs → command-DuKDmbdM.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-C8X1VlHZ.cjs');
+var index = require('./index-CZJH0CUT.cjs');
 require('chalk');
-require('./api-eaGKJjMt.cjs');
+require('./api-D4JOaMll.cjs');
 require('axios');
 require('fs');
 require('node:fs');

package/dist/{index-C8X1VlHZ.cjs → index-CZJH0CUT.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
-var persistence = require('./api-eaGKJjMt.cjs');
+var persistence = require('./api-D4JOaMll.cjs');
 var z = require('zod');
 var fs$2 = require('fs/promises');
 var os$1 = require('os');
@@ -52,7 +52,7 @@ async function openBrowser(url) {
   }
 }
 
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-C8X1VlHZ.cjs', document.baseURI).href)));
+const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CZJH0CUT.cjs', document.baseURI).href)));
 const QRCode = require$1("qrcode-terminal/vendor/QRCode");
 const QRErrorCorrectLevel = require$1("qrcode-terminal/vendor/QRCode/QRErrorCorrectLevel");
 const pendingTempFiles = /* @__PURE__ */ new Set();
@@ -617,7 +617,7 @@ function setupCleanupHandlers() {
   });
 }
 
-const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-C8X1VlHZ.cjs', document.baseURI).href))));
+const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CZJH0CUT.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$2, "..");
   return path;
@@ -2341,19 +2341,27 @@ function buildDaemonSpawnArgs(agent, optionsOrResume) {
   const options = isLegacyResumeOptions(optionsOrResume) ? { resume: optionsOrResume } : optionsOrResume ?? {};
   const startingMode = options.startingMode ?? "remote";
   const startedBy = options.startedBy ?? "daemon";
+  const resolvedAgent = resolveDaemonSpawnAgent(agent);
   const args = [
-    resolveDaemonSpawnAgent(agent),
+    resolvedAgent,
     "--happy-starting-mode",
     startingMode,
     "--started-by",
     startedBy
   ];
   const providerSessionId = typeof options.resume?.providerSessionId === "string" ? options.resume.providerSessionId.trim() : "";
-  if (providerSessionId.length > 0) {
+  if (providerSessionId.length > 0 && supportsProviderResumeArg(resolvedAgent)) {
     args.push("--resume", providerSessionId);
+    const providerSessionCwd = typeof options.resume?.providerSessionCwd === "string" ? options.resume.providerSessionCwd.trim() : "";
+    if (providerSessionCwd.length > 0 && resolvedAgent === "codex") {
+      args.push("--resume-cwd", providerSessionCwd);
+    }
   }
   return args;
 }
+function supportsProviderResumeArg(agent) {
+  return agent === "claude" || agent === "codex";
+}
 function buildTerminalWindowSpawnArgs(agent, resume) {
   return buildDaemonSpawnArgs(agent, {
     resume,
@@ -9064,6 +9072,69 @@ class AcpBackend {
     }
     return resolvePostPromptNoUpdatesTimeoutMs(this.transport);
   }
+  getResponseWaitTimeoutMs(timeoutMs) {
+    if (typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0) {
+      return Math.trunc(timeoutMs);
+    }
+    return readPositiveIntegerEnv("HAPPY_ACP_RESPONSE_WAIT_TIMEOUT_MS") ?? readPositiveIntegerEnv("HAPPIER_ACP_RESPONSE_WAIT_TIMEOUT_MS") ?? resolveAcpResponseWaitTimeoutMs(this.sessionPreferences.timeoutProfile);
+  }
+  createPromptCompletionWatchdog(timeoutMs) {
+    let timeoutHandle = null;
+    let cancelled = false;
+    const promise = new Promise((resolve, reject) => {
+      const schedule = () => {
+        if (cancelled) {
+          return;
+        }
+        if (this.responseCompletionError) {
+          reject(this.responseCompletionError);
+          return;
+        }
+        if (!this.waitingForResponse) {
+          resolve();
+          return;
+        }
+        const lastProgressAt = this.responseLastProgressAt ?? Date.now();
+        const elapsedMs = Math.max(0, Date.now() - lastProgressAt);
+        const remainingMs = Math.max(1, timeoutMs - elapsedMs);
+        timeoutHandle = setTimeout(() => {
+          timeoutHandle = null;
+          if (cancelled) {
+            return;
+          }
+          if (this.responseCompletionError) {
+            reject(this.responseCompletionError);
+            return;
+          }
+          if (!this.waitingForResponse) {
+            resolve();
+            return;
+          }
+          const latestProgressAt = this.responseLastProgressAt ?? Date.now();
+          const latestElapsedMs = Math.max(0, Date.now() - latestProgressAt);
+          if (latestElapsedMs < timeoutMs) {
+            schedule();
+            return;
+          }
+          const timeoutLabel = formatToolCallTimeoutLimit(timeoutMs);
+          const error = new Error(`Timeout waiting for Codex ACP prompt to complete after ${timeoutLabel} without response progress`);
+          this.failPendingResponseWait(error);
+          reject(error);
+        }, remainingMs);
+      };
+      schedule();
+    });
+    return {
+      promise,
+      cancel: () => {
+        cancelled = true;
+        if (timeoutHandle) {
+          clearTimeout(timeoutHandle);
+          timeoutHandle = null;
+        }
+      }
+    };
+  }
   clearIdleTimeoutState() {
     if (this.idleTimeout) {
       clearTimeout(this.idleTimeout);
@@ -9915,15 +9986,23 @@ Recent stderr: ${recentStderrSummaryLine}` : `Signal: ${signal}`;
         prompt: [contentBlock]
       };
       persistence.logger.debug(`[AcpBackend] Prompt request:`, JSON.stringify(promptRequest, null, 2));
-      await raceWithProcessExit(
-        this.process,
-        () => this.connection.prompt(promptRequest),
-        {
-          agentName: this.transport.agentName,
-          operationName: "prompt",
-          getStderrExcerpt: () => this.getRecentStderrExcerpt()
-        }
-      );
+      const promptWatchdog = this.createPromptCompletionWatchdog(this.getResponseWaitTimeoutMs());
+      try {
+        await raceWithProcessExit(
+          this.process,
+          () => Promise.race([
+            this.connection.prompt(promptRequest),
+            promptWatchdog.promise
+          ]),
+          {
+            agentName: this.transport.agentName,
+            operationName: "prompt",
+            getStderrExcerpt: () => this.getRecentStderrExcerpt()
+          }
+        );
+      } finally {
+        promptWatchdog.cancel();
+      }
       persistence.logger.debug("[AcpBackend] Prompt request sent to ACP connection");
       if (this.waitingForResponse && this.activeToolCalls.size === 0 && this.sawSessionUpdateSincePrompt === false) {
         const noUpdatesTimeoutMs = this.getPostPromptNoUpdatesTimeoutMs();
@@ -9986,7 +10065,7 @@ Recent stderr: ${recentStderrSummaryLine}` : `Signal: ${signal}`;
     if (!this.waitingForResponse) {
       return;
     }
-    const effectiveTimeoutMs = timeoutMs ?? resolveAcpResponseWaitTimeoutMs(this.sessionPreferences.timeoutProfile);
+    const effectiveTimeoutMs = this.getResponseWaitTimeoutMs(timeoutMs);
     return new Promise((resolve, reject) => {
       this.idleResolver = () => {
         this.idleResolver = null;
@@ -10320,7 +10399,7 @@ function registerGeminiAgent() {
   persistence.logger.debug("[Gemini] Registered with agent registry");
 }
 
-const DEFAULT_CODEX_ACP_NPX_PACKAGE = "@zed-industries/codex-acp@0.10.0";
+const DEFAULT_CODEX_ACP_NPX_PACKAGE = "@zed-industries/codex-acp@0.14.0";
 function readFirstEnv(...names) {
   for (const name of names) {
     const raw = process.env[name];
@@ -11169,7 +11248,7 @@ class AbortError extends Error {
   }
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-C8X1VlHZ.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CZJH0CUT.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -12494,23 +12573,24 @@ var launch = /*#__PURE__*/Object.freeze({
 const unifiedProviderExecutors = {
   claude: async (opts) => {
     const claudeOptions = opts.claudeOptions ?? {};
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-BkUbXE2F.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-B4eoG3Pu.cjs'); });
     await runClaude(opts.credentials, {
       ...claudeOptions,
       startingMode: claudeOptions.startingMode ?? (claudeOptions.startedBy === "daemon" ? "remote" : void 0)
     });
   },
   codex: async (opts) => {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CdgrZK7P.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-hDGeZAh5.cjs'); });
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
       startingMode: opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local"),
-      codexArgs: opts.codexArgs ?? []
+      codexArgs: opts.codexArgs ?? [],
+      resumeSessionCwd: opts.resumeSessionCwd
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-BE05R24D.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-CeA9aiD1.cjs'); });
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -12593,7 +12673,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-DDoz1Eky.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-DuKDmbdM.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -12676,12 +12756,15 @@ function shouldRunMainClaudeFlow(opts) {
     try {
       let startedBy = void 0;
       let startingMode = void 0;
+      let resumeSessionCwd = null;
       const codexArgs = [];
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
           startedBy = args[++i];
         } else if (args[i] === "--happy-starting-mode") {
           startingMode = z.z.enum(["local", "remote"]).parse(args[++i]);
+        } else if (args[i] === "--resume-cwd") {
+          resumeSessionCwd = args[++i] ?? null;
         } else {
           codexArgs.push(args[i]);
         }
@@ -12690,7 +12773,8 @@ function shouldRunMainClaudeFlow(opts) {
         provider: "codex",
         startedBy,
         startingMode,
-        codexArgs
+        codexArgs,
+        resumeSessionCwd
       });
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -12799,8 +12883,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./api-eaGKJjMt.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-eaGKJjMt.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./api-D4JOaMll.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-D4JOaMll.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/{index-BzsBo3_Z.mjs → index-CyGHrYHl.mjs}

@@ -1,5 +1,5 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
-import { l as logger, q as encodeBase64, c as configuration, t as readCredentials, u as ensureSigningCredentials, r as readSettings, v as updateSettings, w as encodeBase64Url, m as delay, x as buildClientHeaders, y as decodeBase64, z as writeCredentialsLegacy, B as writeCredentialsDataKey, C as readDaemonState, D as HAPPY_CLOUD_DAEMON_PORT, E as clearDaemonState, F as packageJson, i as isAuthenticationRequiredError, G as buildSessionRuntimeIndex, I as acquireDaemonLock, J as writeDaemonState, A as ApiClient, K as releaseDaemonLock, L as validateProfileForAgent, M as getProfileEnvironmentVariables, N as clearCredentials, O as clearMachineId, P as readHappyOrgDispatchTruthSnapshot, Q as processHappyOrgRepoRequests, R as readHappyOrgRepoTaskBoard, S as HappyOrgTurnReportSchema, T as recordHappyOrgTurnReport, U as MessageContentSchema, V as buildSocketAuth, W as encrypt, H as HeadTailPreviewBuffer, X as getLatestDaemonLog } from './api-CSjP-Z3Y.mjs';
+import { l as logger, q as encodeBase64, c as configuration, t as readCredentials, u as ensureSigningCredentials, r as readSettings, v as updateSettings, w as encodeBase64Url, m as delay, x as buildClientHeaders, y as decodeBase64, z as writeCredentialsLegacy, B as writeCredentialsDataKey, C as readDaemonState, D as HAPPY_CLOUD_DAEMON_PORT, E as clearDaemonState, F as packageJson, i as isAuthenticationRequiredError, G as buildSessionRuntimeIndex, I as acquireDaemonLock, J as writeDaemonState, A as ApiClient, K as releaseDaemonLock, L as validateProfileForAgent, M as getProfileEnvironmentVariables, N as clearCredentials, O as clearMachineId, P as readHappyOrgDispatchTruthSnapshot, Q as processHappyOrgRepoRequests, R as readHappyOrgRepoTaskBoard, S as HappyOrgTurnReportSchema, T as recordHappyOrgTurnReport, U as MessageContentSchema, V as buildSocketAuth, W as encrypt, H as HeadTailPreviewBuffer, X as getLatestDaemonLog } from './api-6B4EMs47.mjs';
 import { z } from 'zod';
 import fs, { writeFile as writeFile$1, rename, unlink as unlink$1 } from 'fs/promises';
 import os$1, { homedir as homedir$1 } from 'os';
@@ -2338,19 +2338,27 @@ function buildDaemonSpawnArgs(agent, optionsOrResume) {
   const options = isLegacyResumeOptions(optionsOrResume) ? { resume: optionsOrResume } : optionsOrResume ?? {};
   const startingMode = options.startingMode ?? "remote";
   const startedBy = options.startedBy ?? "daemon";
+  const resolvedAgent = resolveDaemonSpawnAgent(agent);
   const args = [
-    resolveDaemonSpawnAgent(agent),
+    resolvedAgent,
     "--happy-starting-mode",
     startingMode,
     "--started-by",
     startedBy
   ];
   const providerSessionId = typeof options.resume?.providerSessionId === "string" ? options.resume.providerSessionId.trim() : "";
-  if (providerSessionId.length > 0) {
+  if (providerSessionId.length > 0 && supportsProviderResumeArg(resolvedAgent)) {
     args.push("--resume", providerSessionId);
+    const providerSessionCwd = typeof options.resume?.providerSessionCwd === "string" ? options.resume.providerSessionCwd.trim() : "";
+    if (providerSessionCwd.length > 0 && resolvedAgent === "codex") {
+      args.push("--resume-cwd", providerSessionCwd);
+    }
   }
   return args;
 }
+function supportsProviderResumeArg(agent) {
+  return agent === "claude" || agent === "codex";
+}
 function buildTerminalWindowSpawnArgs(agent, resume) {
   return buildDaemonSpawnArgs(agent, {
     resume,
@@ -9061,6 +9069,69 @@ class AcpBackend {
     }
     return resolvePostPromptNoUpdatesTimeoutMs(this.transport);
   }
+  getResponseWaitTimeoutMs(timeoutMs) {
+    if (typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0) {
+      return Math.trunc(timeoutMs);
+    }
+    return readPositiveIntegerEnv("HAPPY_ACP_RESPONSE_WAIT_TIMEOUT_MS") ?? readPositiveIntegerEnv("HAPPIER_ACP_RESPONSE_WAIT_TIMEOUT_MS") ?? resolveAcpResponseWaitTimeoutMs(this.sessionPreferences.timeoutProfile);
+  }
+  createPromptCompletionWatchdog(timeoutMs) {
+    let timeoutHandle = null;
+    let cancelled = false;
+    const promise = new Promise((resolve, reject) => {
+      const schedule = () => {
+        if (cancelled) {
+          return;
+        }
+        if (this.responseCompletionError) {
+          reject(this.responseCompletionError);
+          return;
+        }
+        if (!this.waitingForResponse) {
+          resolve();
+          return;
+        }
+        const lastProgressAt = this.responseLastProgressAt ?? Date.now();
+        const elapsedMs = Math.max(0, Date.now() - lastProgressAt);
+        const remainingMs = Math.max(1, timeoutMs - elapsedMs);
+        timeoutHandle = setTimeout(() => {
+          timeoutHandle = null;
+          if (cancelled) {
+            return;
+          }
+          if (this.responseCompletionError) {
+            reject(this.responseCompletionError);
+            return;
+          }
+          if (!this.waitingForResponse) {
+            resolve();
+            return;
+          }
+          const latestProgressAt = this.responseLastProgressAt ?? Date.now();
+          const latestElapsedMs = Math.max(0, Date.now() - latestProgressAt);
+          if (latestElapsedMs < timeoutMs) {
+            schedule();
+            return;
+          }
+          const timeoutLabel = formatToolCallTimeoutLimit(timeoutMs);
+          const error = new Error(`Timeout waiting for Codex ACP prompt to complete after ${timeoutLabel} without response progress`);
+          this.failPendingResponseWait(error);
+          reject(error);
+        }, remainingMs);
+      };
+      schedule();
+    });
+    return {
+      promise,
+      cancel: () => {
+        cancelled = true;
+        if (timeoutHandle) {
+          clearTimeout(timeoutHandle);
+          timeoutHandle = null;
+        }
+      }
+    };
+  }
   clearIdleTimeoutState() {
     if (this.idleTimeout) {
       clearTimeout(this.idleTimeout);
@@ -9912,15 +9983,23 @@ Recent stderr: ${recentStderrSummaryLine}` : `Signal: ${signal}`;
         prompt: [contentBlock]
       };
       logger.debug(`[AcpBackend] Prompt request:`, JSON.stringify(promptRequest, null, 2));
-      await raceWithProcessExit(
-        this.process,
-        () => this.connection.prompt(promptRequest),
-        {
-          agentName: this.transport.agentName,
-          operationName: "prompt",
-          getStderrExcerpt: () => this.getRecentStderrExcerpt()
-        }
-      );
+      const promptWatchdog = this.createPromptCompletionWatchdog(this.getResponseWaitTimeoutMs());
+      try {
+        await raceWithProcessExit(
+          this.process,
+          () => Promise.race([
+            this.connection.prompt(promptRequest),
+            promptWatchdog.promise
+          ]),
+          {
+            agentName: this.transport.agentName,
+            operationName: "prompt",
+            getStderrExcerpt: () => this.getRecentStderrExcerpt()
+          }
+        );
+      } finally {
+        promptWatchdog.cancel();
+      }
       logger.debug("[AcpBackend] Prompt request sent to ACP connection");
       if (this.waitingForResponse && this.activeToolCalls.size === 0 && this.sawSessionUpdateSincePrompt === false) {
         const noUpdatesTimeoutMs = this.getPostPromptNoUpdatesTimeoutMs();
@@ -9983,7 +10062,7 @@ Recent stderr: ${recentStderrSummaryLine}` : `Signal: ${signal}`;
     if (!this.waitingForResponse) {
       return;
     }
-    const effectiveTimeoutMs = timeoutMs ?? resolveAcpResponseWaitTimeoutMs(this.sessionPreferences.timeoutProfile);
+    const effectiveTimeoutMs = this.getResponseWaitTimeoutMs(timeoutMs);
     return new Promise((resolve, reject) => {
       this.idleResolver = () => {
         this.idleResolver = null;
@@ -10317,7 +10396,7 @@ function registerGeminiAgent() {
   logger.debug("[Gemini] Registered with agent registry");
 }
 
-const DEFAULT_CODEX_ACP_NPX_PACKAGE = "@zed-industries/codex-acp@0.10.0";
+const DEFAULT_CODEX_ACP_NPX_PACKAGE = "@zed-industries/codex-acp@0.14.0";
 function readFirstEnv(...names) {
   for (const name of names) {
     const raw = process.env[name];
@@ -12491,23 +12570,24 @@ var launch = /*#__PURE__*/Object.freeze({
 const unifiedProviderExecutors = {
   claude: async (opts) => {
     const claudeOptions = opts.claudeOptions ?? {};
-    const { runClaude } = await import('./runClaude-D3CBLW5o.mjs');
+    const { runClaude } = await import('./runClaude-jDr3i0bO.mjs');
     await runClaude(opts.credentials, {
       ...claudeOptions,
       startingMode: claudeOptions.startingMode ?? (claudeOptions.startedBy === "daemon" ? "remote" : void 0)
     });
   },
   codex: async (opts) => {
-    const { runCodex } = await import('./runCodex-DqzdgDwZ.mjs');
+    const { runCodex } = await import('./runCodex-e_D1Jd_w.mjs');
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
       startingMode: opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local"),
-      codexArgs: opts.codexArgs ?? []
+      codexArgs: opts.codexArgs ?? [],
+      resumeSessionCwd: opts.resumeSessionCwd
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await import('./runGemini-UZuiKe59.mjs');
+    const { runGemini } = await import('./runGemini-Cur84FvO.mjs');
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -12590,7 +12670,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-BzPI4N1n.mjs');
+      const { renderRuntimeProviders } = await import('./command-BbJCdR2t.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -12673,12 +12753,15 @@ function shouldRunMainClaudeFlow(opts) {
     try {
       let startedBy = void 0;
       let startingMode = void 0;
+      let resumeSessionCwd = null;
       const codexArgs = [];
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
           startedBy = args[++i];
         } else if (args[i] === "--happy-starting-mode") {
           startingMode = z.enum(["local", "remote"]).parse(args[++i]);
+        } else if (args[i] === "--resume-cwd") {
+          resumeSessionCwd = args[++i] ?? null;
         } else {
           codexArgs.push(args[i]);
         }
@@ -12687,7 +12770,8 @@ function shouldRunMainClaudeFlow(opts) {
         provider: "codex",
         startedBy,
         startingMode,
-        codexArgs
+        codexArgs,
+        resumeSessionCwd
       });
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -12796,8 +12880,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./api-CSjP-Z3Y.mjs').then(function (n) { return n.Y; });
-        const { ApiClient: ApiClient2 } = await import('./api-CSjP-Z3Y.mjs').then(function (n) { return n.Z; });
+        const { readCredentials: readCredentials2 } = await import('./api-6B4EMs47.mjs').then(function (n) { return n.Y; });
+        const { ApiClient: ApiClient2 } = await import('./api-6B4EMs47.mjs').then(function (n) { return n.Z; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
 require('chalk');
-require('./api-eaGKJjMt.cjs');
+require('./api-D4JOaMll.cjs');
 require('zod');
-require('./index-C8X1VlHZ.cjs');
+require('./index-CZJH0CUT.cjs');
 require('node:child_process');
 require('node:fs');
 require('cross-spawn');

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import 'chalk';
-import './api-CSjP-Z3Y.mjs';
+import './api-6B4EMs47.mjs';
 import 'zod';
-import './index-BzsBo3_Z.mjs';
+import './index-CyGHrYHl.mjs';
 import 'node:child_process';
 import 'node:fs';
 import 'cross-spawn';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var persistence = require('./api-eaGKJjMt.cjs');
+var persistence = require('./api-D4JOaMll.cjs');
 var types = require('./types-DVk3crez.cjs');
 require('axios');
 require('chalk');

package/dist/lib.d.cts

@@ -3614,6 +3614,7 @@ type Metadata = {
     claudeSessionId?: string;
     claudeTranscriptPath?: string;
     codexSessionId?: string;
+    codexSessionCwd?: string;
     tools?: string[];
     slashCommands?: string[];
     homeDir: string;
@@ -4032,6 +4033,7 @@ interface SpawnSessionOptions {
 }
 interface SpawnSessionResumeOptions {
     providerSessionId: string;
+    providerSessionCwd?: string;
 }
 type SpawnSessionResult = {
     type: 'success';

package/dist/lib.d.mts

@@ -3614,6 +3614,7 @@ type Metadata = {
     claudeSessionId?: string;
     claudeTranscriptPath?: string;
     codexSessionId?: string;
+    codexSessionCwd?: string;
     tools?: string[];
     slashCommands?: string[];
     homeDir: string;
@@ -4032,6 +4033,7 @@ interface SpawnSessionOptions {
 }
 interface SpawnSessionResumeOptions {
     providerSessionId: string;
+    providerSessionCwd?: string;
 }
 type SpawnSessionResult = {
     type: 'success';

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-CSjP-Z3Y.mjs';
+export { A as ApiClient, a as ApiSessionClient, c as configuration, l as logger } from './api-6B4EMs47.mjs';
 export { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
 import 'axios';
 import 'chalk';

package/dist/{registerKillSessionHandler-CLCYBgZX.cjs → registerKillSessionHandler-Bo_MMbdY.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-C8X1VlHZ.cjs');
-var persistence = require('./api-eaGKJjMt.cjs');
+var index = require('./index-CZJH0CUT.cjs');
+var persistence = require('./api-D4JOaMll.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
 require('axios');