@agentclientprotocol/codex-acp 2.5.1-preview.12 → 2.5.1-preview.14

package/dist/index.js

@@ -36416,6 +36416,56 @@ function withSubagentUserAction(sessionId, request, itemId, signal) {
   return context.foreground ? context.foreground.withUserAction(itemId ?? context.itemId, send, cancellation) : send();
 }
 
+// src/PathUtils.ts
+import path5 from "node:path";
+function isAbsoluteProtocolPath(value) {
+  return !value.includes("\0") && (path5.posix.isAbsolute(value) || isWindowsAbsolutePath(value));
+}
+function isAbsolutePathLike(value) {
+  return isAbsoluteProtocolPath(value.trim());
+}
+function arePathsEqual(left, right) {
+  return normalizePathForComparison(left) === normalizePathForComparison(right);
+}
+function arePathBasenamesEqual(left, right) {
+  const leftBase = path5.posix.basename(normalizePathForComparison(left));
+  const rightBase = path5.posix.basename(normalizePathForComparison(right));
+  if (shouldComparePathCaseInsensitive(left) || shouldComparePathCaseInsensitive(right)) {
+    return leftBase.toLowerCase() === rightBase.toLowerCase();
+  }
+  return leftBase === rightBase;
+}
+function normalizePathForComparison(value) {
+  const trimmed = value.trim();
+  if (trimmed.length === 0) {
+    return "";
+  }
+  if (isWindowsAbsolutePath(trimmed)) {
+    const normalized2 = path5.win32.normalize(trimmed).replace(/\\/g, "/");
+    return trimTrailingPathSeparators(normalized2).toLowerCase();
+  }
+  const pathForComparison = path5.isAbsolute(trimmed) ? trimmed : trimmed.replace(/\\/g, "/");
+  const normalized = path5.posix.normalize(pathForComparison);
+  return trimTrailingPathSeparators(normalized);
+}
+function isWindowsAbsolutePath(value) {
+  const portableValue = value.replace(/\\/g, "/");
+  return /^[A-Za-z]:\//.test(portableValue) || /^\/\/[^/]+\/[^/]+/.test(portableValue);
+}
+function shouldComparePathCaseInsensitive(value) {
+  return isWindowsAbsolutePath(value) || /^[A-Za-z]:/.test(value) || value.includes("\\");
+}
+function trimTrailingPathSeparators(value) {
+  let trimmed = value;
+  while (trimmed.endsWith("/") && !isRootPath(trimmed)) {
+    trimmed = trimmed.slice(0, -1);
+  }
+  return trimmed;
+}
+function isRootPath(value) {
+  return value === "/" || /^[A-Za-z]:\/$/.test(value) || /^\/\/[^/]+\/[^/]+\/$/.test(value);
+}
+
 // src/subagents/StandardSubagentEventRouter.ts
 var StandardSubagentEventRouter = class {
   constructor(rootSessionId, session, associations, onChildWorkEnded, capabilities = ClientCapabilities.DEFAULT, deferLive = false, ready = Promise.resolve(), runningTurnId = () => void 0, rootModels = () => null, configurationRuntime) {
@@ -36471,7 +36521,11 @@ var StandardSubagentEventRouter = class {
     if (notification.method === "thread/settings/updated" && !this.appliedSettings.has(notification.params)) {
       this.appliedSettings.add(notification.params);
       const settings = notification.params.threadSettings;
-      await this.observeConfiguration(threadId, { model: settings.model, effort: settings.effort }, "settings");
+      await this.observeConfiguration(threadId, {
+        model: settings.model,
+        effort: settings.effort,
+        ...this.children.has(threadId) ? { cwd: settings.cwd } : {}
+      }, "settings");
     }
     if (this.deferLive) {
       this.deferredLive.push(notification);
@@ -36757,10 +36811,14 @@ var StandardSubagentEventRouter = class {
   }
   async observeConfiguration(threadId, observed, source) {
     const previous = this.configurations.get(threadId);
-    if (this.retired || !previous && !observed.model && observed.effort === null && source !== "settings") return;
+    const cwd = observed.cwd !== void 0 && isAbsoluteProtocolPath(observed.cwd) ? observed.cwd : null;
+    if (this.retired || !previous && !observed.model && observed.effort === null && cwd === null && source !== "settings") return;
     this.configurationRequests.delete(threadId);
     const next = { ...previous };
     if (observed.model) next.model = preferredModel(previous?.model, { model: observed.model, source });
+    if (cwd !== null && (!previous?.cwd || MODEL_SOURCE_RANK[source] >= MODEL_SOURCE_RANK[previous.cwd.source])) {
+      next.cwd = { value: cwd, source };
+    }
     const changedModel = next.model?.model !== previous?.model?.model;
     if (changedModel || !previous?.effort || MODEL_SOURCE_RANK[source] >= MODEL_SOURCE_RANK[previous.effort.source]) {
       next.effort = { value: observed.effort, source };
@@ -36776,6 +36834,14 @@ var StandardSubagentEventRouter = class {
     await this.ensureAnnounced(child);
     const configuration = this.configurations.get(child.threadId);
     if (!configuration || this.retired) return;
+    if (configuration.cwd && configuration.cwd.value !== configuration.publishedCwd) {
+      await this.session.update({
+        sessionUpdate: "subagent_update",
+        sessionId: child.sessionId,
+        cwd: configuration.cwd.value
+      }, child.parentSessionId);
+      configuration.publishedCwd = configuration.cwd.value;
+    }
     const options = subagentConfigurationOptions(this.rootModels(), {
       model: configuration.model?.model ?? null,
       effort: configuration.effort?.value ?? null
@@ -37175,7 +37241,7 @@ function mergeRateLimitSnapshot(previous, update) {
 
 // src/AgentFileChangeReport.ts
 import fs2 from "node:fs";
-import path5 from "node:path";
+import path6 from "node:path";
 var AGENT_FILE_CHANGE_REPORT_VERSION = 1;
 var AGENT_FILE_CHANGE_REPORT_MAX_PATHS = 1024;
 var AGENT_FILE_CHANGE_REPORT_MAX_PATH_LENGTH = 4096;
@@ -37362,37 +37428,37 @@ function parseWorkspaceRoot(value) {
   if (!isValidPathText(trimmed)) {
     return null;
   }
-  if (isWindowsAbsolutePath(trimmed)) {
+  if (isWindowsAbsolutePath2(trimmed)) {
     return {
-      value: path5.win32.normalize(trimmed.replace(/\//g, "\\")),
+      value: path6.win32.normalize(trimmed.replace(/\//g, "\\")),
       flavor: "windows"
     };
   }
-  if (path5.posix.isAbsolute(trimmed)) {
+  if (path6.posix.isAbsolute(trimmed)) {
     return {
-      value: path5.posix.normalize(trimmed.replace(/\\/g, "/")),
+      value: path6.posix.normalize(trimmed.replace(/\\/g, "/")),
       flavor: "posix"
     };
   }
   return null;
 }
 function normalizeReportedPath(value, relativeRoot, roots) {
-  if (!isValidPathText(value) || /^[A-Za-z]:[^\\/]/.test(value) || /^\\\\[?.]\\/.test(value) || /^(?:\\\\|\/\/)/.test(value) && !isWindowsAbsolutePath(value) || relativeRoot.flavor === "windows" && /^\\(?!\\)/.test(value) || /^[A-Za-z][A-Za-z0-9+.-]*:\/\//.test(value)) {
+  if (!isValidPathText(value) || /^[A-Za-z]:[^\\/]/.test(value) || /^\\\\[?.]\\/.test(value) || /^(?:\\\\|\/\/)/.test(value) && !isWindowsAbsolutePath2(value) || relativeRoot.flavor === "windows" && /^\\(?!\\)/.test(value) || /^[A-Za-z][A-Za-z0-9+.-]*:\/\//.test(value)) {
     return null;
   }
   let candidate;
-  if (isWindowsAbsolutePath(value)) {
-    candidate = { value: path5.win32.normalize(value.replace(/\//g, "\\")), flavor: "windows" };
-  } else if (path5.posix.isAbsolute(value)) {
-    candidate = { value: path5.posix.normalize(value.replace(/\\/g, "/")), flavor: "posix" };
+  if (isWindowsAbsolutePath2(value)) {
+    candidate = { value: path6.win32.normalize(value.replace(/\//g, "\\")), flavor: "windows" };
+  } else if (path6.posix.isAbsolute(value)) {
+    candidate = { value: path6.posix.normalize(value.replace(/\\/g, "/")), flavor: "posix" };
   } else if (relativeRoot.flavor === "windows") {
     candidate = {
-      value: path5.win32.resolve(relativeRoot.value, value.replace(/\//g, "\\")),
+      value: path6.win32.resolve(relativeRoot.value, value.replace(/\//g, "\\")),
       flavor: "windows"
     };
   } else {
     candidate = {
-      value: path5.posix.resolve(relativeRoot.value, value.replace(/\\/g, "/")),
+      value: path6.posix.resolve(relativeRoot.value, value.replace(/\\/g, "/")),
       flavor: "posix"
     };
   }
@@ -37401,7 +37467,7 @@ function normalizeReportedPath(value, relativeRoot, roots) {
 }
 function findDiffDisplayRoot(cwd) {
   if (!isNativePathFlavor(cwd.flavor)) return cwd;
-  const pathImplementation = cwd.flavor === "windows" ? path5.win32 : path5.posix;
+  const pathImplementation = cwd.flavor === "windows" ? path6.win32 : path6.posix;
   let current = cwd.value;
   while (true) {
     if (fs2.existsSync(pathImplementation.join(current, ".git"))) {
@@ -37422,23 +37488,23 @@ function canonicalizeReportedPath(candidate) {
   if (!isNativePathFlavor(candidate.flavor)) {
     return candidate;
   }
-  const parent = canonicalizeFromExistingAncestor(path5.dirname(candidate.value));
-  return { ...candidate, value: path5.resolve(parent, path5.basename(candidate.value)) };
+  const parent = canonicalizeFromExistingAncestor(path6.dirname(candidate.value));
+  return { ...candidate, value: path6.resolve(parent, path6.basename(candidate.value)) };
 }
 function canonicalizeFromExistingAncestor(value) {
-  const original = path5.resolve(value);
+  const original = path6.resolve(value);
   let current = original;
   const missingSegments = [];
   while (true) {
     try {
       const canonical = fs2.realpathSync.native(current);
-      return path5.resolve(canonical, ...missingSegments.reverse());
+      return path6.resolve(canonical, ...missingSegments.reverse());
     } catch (error62) {
       if (!isMissingPathError(error62)) return original;
     }
-    const parent = path5.dirname(current);
+    const parent = path6.dirname(current);
     if (parent === current) return original;
-    missingSegments.push(path5.basename(current));
+    missingSegments.push(path6.basename(current));
     current = parent;
   }
 }
@@ -37453,11 +37519,11 @@ function pathIsStrictlyInside(root, candidate) {
   if (root.flavor !== candidate.flavor) {
     return false;
   }
-  const pathImplementation = root.flavor === "windows" ? path5.win32 : path5.posix;
+  const pathImplementation = root.flavor === "windows" ? path6.win32 : path6.posix;
   const relative = pathImplementation.relative(root.value, candidate.value);
   return relative.length > 0 && !pathImplementation.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${pathImplementation.sep}`);
 }
-function isWindowsAbsolutePath(value) {
+function isWindowsAbsolutePath2(value) {
   const portable = value.replace(/\\/g, "/");
   return /^[A-Za-z]:\//.test(portable) || /^\/\/[^/]+\/[^/]+(?:\/|$)/.test(portable);
 }
@@ -37487,7 +37553,7 @@ function createSessionNotice(severity, title, description) {
 }
 
 // src/SessionIndexMutations.ts
-import path6 from "node:path";
+import path7 from "node:path";
 var ARCHIVED_SESSIONS_DIR = "archived_sessions";
 function isMissingThreadError(err) {
   return isUnknownThreadError(err) || isThreadNotFoundError(err);
@@ -37553,8 +37619,8 @@ async function readThreadArchived(client, threadId, codexHome) {
 }
 function isArchivedRolloutPath(threadPath, codexHome) {
   if (codexHome !== null) {
-    const relative = path6.relative(path6.join(codexHome, ARCHIVED_SESSIONS_DIR), threadPath);
-    if (relative !== "" && !relative.startsWith("..") && !path6.isAbsolute(relative)) return true;
+    const relative = path7.relative(path7.join(codexHome, ARCHIVED_SESSIONS_DIR), threadPath);
+    if (relative !== "" && !relative.startsWith("..") && !path7.isAbsolute(relative)) return true;
   }
   return threadPath.replace(/\\/g, "/").split("/").includes(ARCHIVED_SESSIONS_DIR);
 }
@@ -40409,13 +40475,13 @@ function parseMcpStartupAwaitTimeoutMs(meta3) {
 
 // node_modules/open/index.js
 import process10 from "node:process";
-import path8 from "node:path";
+import path9 from "node:path";
 import { fileURLToPath } from "node:url";
 import childProcess4 from "node:child_process";
 import fs7, { constants as fsConstants2 } from "node:fs/promises";
 
 // node_modules/wsl-utils/index.js
-import path7 from "node:path";
+import path8 from "node:path";
 import { promisify as promisify2 } from "node:util";
 import childProcess2 from "node:child_process";
 import fs6, { constants as fsConstants } from "node:fs/promises";
@@ -40595,7 +40661,7 @@ var wslDefaultBrowser = async () => {
   const command = String.raw`(Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice").ProgId`;
   const { stdout } = await executePowerShell(command, {
     powerShellPath: psPath,
-    cwd: path7.dirname(psPath)
+    cwd: path8.dirname(psPath)
   });
   return stdout.trim();
 };
@@ -40803,8 +40869,8 @@ var is_in_ssh_default = isInSsh;
 
 // node_modules/open/index.js
 var fallbackAttemptSymbol = /* @__PURE__ */ Symbol("fallbackAttempt");
-var __dirname = import.meta.url ? path8.dirname(fileURLToPath(import.meta.url)) : "";
-var localXdgOpenPath = path8.join(__dirname, "xdg-open");
+var __dirname = import.meta.url ? path9.dirname(fileURLToPath(import.meta.url)) : "";
+var localXdgOpenPath = path9.join(__dirname, "xdg-open");
 var { platform, arch } = process10;
 var tryEachApp = async (apps2, opener) => {
   if (apps2.length === 0) {
@@ -40947,7 +41013,7 @@ var baseOpen = async (options) => {
       childProcessOptions.stdio = "ignore";
     }
     if (is_wsl_default) {
-      childProcessOptions.cwd = path8.dirname(command);
+      childProcessOptions.cwd = path9.dirname(command);
     }
   } else {
     if (app) {
@@ -41256,7 +41322,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.12",
+  version: "2.5.1-preview.14",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -41366,56 +41432,6 @@ function createCodexCollaborationMode(mode, currentModelId) {
   };
 }
 
-// src/PathUtils.ts
-import path9 from "node:path";
-function isAbsoluteProtocolPath(value) {
-  return !value.includes("\0") && (path9.posix.isAbsolute(value) || isWindowsAbsolutePath2(value));
-}
-function isAbsolutePathLike(value) {
-  return isAbsoluteProtocolPath(value.trim());
-}
-function arePathsEqual(left, right) {
-  return normalizePathForComparison(left) === normalizePathForComparison(right);
-}
-function arePathBasenamesEqual(left, right) {
-  const leftBase = path9.posix.basename(normalizePathForComparison(left));
-  const rightBase = path9.posix.basename(normalizePathForComparison(right));
-  if (shouldComparePathCaseInsensitive(left) || shouldComparePathCaseInsensitive(right)) {
-    return leftBase.toLowerCase() === rightBase.toLowerCase();
-  }
-  return leftBase === rightBase;
-}
-function normalizePathForComparison(value) {
-  const trimmed = value.trim();
-  if (trimmed.length === 0) {
-    return "";
-  }
-  if (isWindowsAbsolutePath2(trimmed)) {
-    const normalized2 = path9.win32.normalize(trimmed).replace(/\\/g, "/");
-    return trimTrailingPathSeparators(normalized2).toLowerCase();
-  }
-  const pathForComparison = path9.isAbsolute(trimmed) ? trimmed : trimmed.replace(/\\/g, "/");
-  const normalized = path9.posix.normalize(pathForComparison);
-  return trimTrailingPathSeparators(normalized);
-}
-function isWindowsAbsolutePath2(value) {
-  const portableValue = value.replace(/\\/g, "/");
-  return /^[A-Za-z]:\//.test(portableValue) || /^\/\/[^/]+\/[^/]+/.test(portableValue);
-}
-function shouldComparePathCaseInsensitive(value) {
-  return isWindowsAbsolutePath2(value) || /^[A-Za-z]:/.test(value) || value.includes("\\");
-}
-function trimTrailingPathSeparators(value) {
-  let trimmed = value;
-  while (trimmed.endsWith("/") && !isRootPath(trimmed)) {
-    trimmed = trimmed.slice(0, -1);
-  }
-  return trimmed;
-}
-function isRootPath(value) {
-  return value === "/" || /^[A-Za-z]:\/$/.test(value) || /^\/\/[^/]+\/[^/]+\/$/.test(value);
-}
-
 // src/subagents/CodexSubagentSubscriptions.ts
 var CodexSubagentSubscriptions = class {
   constructor(client) {
@@ -50206,7 +50222,7 @@ var CodexAcpServer = class {
   async readSubagentConfiguration(threadId, parentThreadId) {
     const thread = await this.codexAcpClient.readSubagentThread(threadId);
     if (!thread || thread.id !== threadId || thread.parentThreadId !== parentThreadId || thread.status.type === "notLoaded") return null;
-    return { model: thread.model, effort: thread.reasoningEffort };
+    return { model: thread.model, effort: thread.reasoningEffort, cwd: thread.cwd };
   }
   getSubagentInteractionHandlers(router, rootSessionId) {
     const existing = this.subagentInteractionHandlers.get(router);
@@ -53373,12 +53389,14 @@ You have been logged out. Please try again.`);
     cancellers.clear();
   }
   async interruptPromptTurn(sessionState, turn, requestName) {
+    const activePrompt = this.activePrompts.get(sessionState.sessionId);
     this.codexAcpClient.markTurnStale({
       threadId: turn.threadId,
       turnId: turn.turnId
     });
     try {
       await this.interruptStandardChildren(sessionState);
+      if (this.activePrompts.get(sessionState.sessionId) !== activePrompt) return;
       await this.requestTurnInterrupt(sessionState, turn.threadId, turn.turnId, requestName);
     } finally {
       this.codexAcpClient.resolveTurnInterrupted({
@@ -53393,13 +53411,17 @@ You have been logged out. Please try again.`);
    * interrupt", and once it registers a later turn under a different id, "expected active turn
    * id <completionTurnId> but found <Y>". Both are retried, with the id recomputed on every
    * attempt so a `turn/started` that arrives between retries is picked up.
+   * Retries belong to that prompt, not to a newer prompt that starts while a reply is pending.
    */
   async requestTurnInterrupt(sessionState, threadId, completionTurnId, requestName) {
     if (this.recovery !== null && !this.turnAppServerIsLive(threadId)) {
       logger.log(`${requestName} - turnInterrupt skipped: the app-server of the turn is gone`, { sessionId: threadId });
       return;
     }
-    let turnId = codexRunningTurnId(sessionState, completionTurnId);
+    const activePrompt = this.activePrompts.get(sessionState.sessionId);
+    const ownsRegisteredTurn = activePrompt?.currentTurn?.threadId === threadId && activePrompt.currentTurn.turnId === completionTurnId;
+    const stillOwnsPrompt = () => ownsRegisteredTurn && activePrompt !== void 0 && this.activePrompts.get(sessionState.sessionId) === activePrompt;
+    let turnId = ownsRegisteredTurn ? codexRunningTurnId(sessionState, completionTurnId) : completionTurnId;
     for (let attempt = 0; ; attempt++) {
       try {
         await this.runWithProcessCheck(() => this.codexAcpClient.turnInterrupt({
@@ -53412,15 +53434,15 @@ You have been logged out. Please try again.`);
         });
         return;
       } catch (err) {
-        const promptStillActive = this.activePrompts.has(threadId);
         const mismatch = parseExpectedActiveTurnMismatch(err);
         const isMismatch = mismatch !== null && mismatch.expected === sessionState.currentTurnId && mismatch.found !== "";
-        const retryable = promptStillActive && (isNoActiveTurnError(err) || isMismatch) && attempt < NO_ACTIVE_TURN_RETRY_DELAYS_MS.length;
+        const retryable = stillOwnsPrompt() && (isNoActiveTurnError(err) || isMismatch) && attempt < NO_ACTIVE_TURN_RETRY_DELAYS_MS.length;
         if (!retryable) {
           logger.error(`${requestName} - turnInterrupt failed`, err);
           return;
         }
         await new Promise((resolve) => setTimeout(resolve, NO_ACTIVE_TURN_RETRY_DELAYS_MS[attempt]));
+        if (!stillOwnsPrompt()) return;
         turnId = sessionState.interruptTurnId ?? (isMismatch ? mismatch.found : completionTurnId);
         logger.log(`${requestName} - turn not interruptible yet, retrying`, {
           sessionId: threadId,
@@ -53442,9 +53464,11 @@ You have been logged out. Please try again.`);
     return activePrompt.signal.aborted || this.activePrompts.get(sessionId) !== activePrompt || this.sessionIsClosing(sessionId);
   }
   async interruptSessionTurn(sessionState, requestName, resolveInterruptedTurn) {
+    const activePrompt = this.activePrompts.get(sessionState.sessionId);
     await this.interruptStandardChildren(sessionState);
+    if (this.activePrompts.get(sessionState.sessionId) !== activePrompt) return;
     const turnId = await this.getInterruptibleTurnId(sessionState, requestName);
-    if (!turnId) {
+    if (!turnId || this.activePrompts.get(sessionState.sessionId) !== activePrompt) {
       return;
     }
     logger.log(`${requestName} session requested`, {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.5.1-preview.12",
+  "version": "2.5.1-preview.14",
   "description": "",
   "main": "dist/index.js",
   "bin": {