@leo000001/codex-mcp 2.1.3 → 2.1.4

package/dist/index.js

@@ -392,7 +392,7 @@ var DEFAULT_TERMINAL_CLEANUP_MS = 5 * 60 * 1e3;
 var CLEANUP_INTERVAL_MS = 6e4;
 
 // src/app-server/client.ts
-var CLIENT_VERSION = true ? "2.1.3" : "0.0.0-dev";
+var CLIENT_VERSION = true ? "2.1.4" : "0.0.0-dev";
 var DEFAULT_REQUEST_TIMEOUT = 3e4;
 var STARTUP_REQUEST_TIMEOUT = 9e4;
 var MAX_WRITE_QUEUE_BYTES = 5 * 1024 * 1024;
@@ -814,7 +814,7 @@ function resolveAndValidateCwd(inputCwd, baseCwd) {
 function redactPaths(message) {
   const uncPath = /(^|[\s'"(])\\\\[^\s\\/:]+\\[^\s:]+(?:\\[^\s:]+)*/g;
   const windowsPath = /\b[A-Za-z]:\\[^\s:]+/g;
-  const posixPath = /(^|[\s'"(])\/[^\s:'")]+/g;
+  const posixPath = /(^|[\s'"(])\/[^\s:'")]*\/[^\s:'")]+/g;
   return message.replace(uncPath, (_m, prefix) => `${prefix}<path>`).replace(windowsPath, "<path>").replace(posixPath, (_m, prefix) => `${prefix}<path>`);
 }
 
@@ -1464,10 +1464,10 @@ var SessionManager = class {
         `Error [${"INTERNAL" /* INTERNAL */}]: Failed to build approval response for request '${requestId}'`
       );
     }
-    sendPendingRequestResponseOrThrow(req, response, sessionId, requestId);
     req.resolved = true;
     req.decision = decision;
     if (req.timeoutHandle) clearTimeout(req.timeoutHandle);
+    sendPendingRequestResponseOrThrow(req, response, sessionId, requestId);
     pushEvent(
       session.eventBuffer,
       "approval_result",
@@ -1494,14 +1494,14 @@ var SessionManager = class {
         `Error [${"REQUEST_NOT_FOUND" /* REQUEST_NOT_FOUND */}]: User input request '${requestId}' not found`
       );
     }
+    req.resolved = true;
+    if (req.timeoutHandle) clearTimeout(req.timeoutHandle);
     sendPendingRequestResponseOrThrow(
       req,
       { answers },
       sessionId,
       requestId
     );
-    req.resolved = true;
-    if (req.timeoutHandle) clearTimeout(req.timeoutHandle);
     pushEvent(
       session.eventBuffer,
       "approval_result",
@@ -2018,6 +2018,14 @@ function clearSessionPendingRequests(session) {
   session.pendingRequests.clear();
   for (const [, req] of entries) {
     if (req.timeoutHandle) clearTimeout(req.timeoutHandle);
+    if (!req.resolved && req.respond) {
+      try {
+        if (req.kind === "command") req.respond({ decision: "cancel" });
+        else if (req.kind === "fileChange") req.respond({ decision: "cancel" });
+        else if (req.kind === "user_input") req.respond({ answers: {} });
+      } catch {
+      }
+    }
     req.resolved = true;
   }
 }
@@ -2299,15 +2307,27 @@ function tryCoalesceProgressDelta(buf, type, data, pinned) {
   return true;
 }
 function evictEvents(buf) {
-  while (buf.events.length > buf.maxSize) {
-    const idx = buf.events.findIndex((e) => !e.pinned);
-    if (idx === -1) break;
-    buf.events.splice(idx, 1);
-  }
-  while (buf.events.length > buf.maxSize) {
-    const idx = buf.events.findIndex((e) => e.type === "approval_result");
-    if (idx === -1) break;
-    buf.events.splice(idx, 1);
+  if (buf.events.length > buf.maxSize) {
+    const overflow2 = buf.events.length - buf.maxSize;
+    const unpinnedIdx = [];
+    const approvalResultIdx2 = [];
+    for (let i = 0; i < buf.events.length; i++) {
+      const event = buf.events[i];
+      if (!event.pinned) unpinnedIdx.push(i);
+      else if (event.type === "approval_result") approvalResultIdx2.push(i);
+    }
+    const drop2 = /* @__PURE__ */ new Set();
+    for (const idx of unpinnedIdx) {
+      if (drop2.size >= overflow2) break;
+      drop2.add(idx);
+    }
+    for (const idx of approvalResultIdx2) {
+      if (drop2.size >= overflow2) break;
+      drop2.add(idx);
+    }
+    if (drop2.size > 0) {
+      buf.events = buf.events.filter((_, idx) => !drop2.has(idx));
+    }
   }
   if (buf.events.length <= buf.hardMaxSize) return;
   const overflow = buf.events.length - buf.hardMaxSize;
@@ -2833,7 +2853,8 @@ function asTextResource(uri, text, mimeType) {
 }
 function detectCodexCliVersion(timeoutMs = 1500) {
   try {
-    const run = spawnSync("codex", ["--version"], {
+    const executable = getDefaultCodexExecutable();
+    const run = spawnSync(executable.command, ["--version"], {
       encoding: "utf8",
       timeout: timeoutMs,
       windowsHide: true
@@ -3240,7 +3261,7 @@ function registerResources(server, deps) {
 }
 
 // src/server.ts
-var SERVER_VERSION = true ? "2.1.3" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.1.4" : "0.0.0-dev";
 function formatErrorMessage(err) {
   const message = err instanceof Error ? err.message : String(err);
   const m = /^Error \[([A-Z_]+)\]:\s*(.*)$/.exec(message);
@@ -3768,6 +3789,15 @@ function probeAppServer(codexCommand, codexIsPath, env) {
         proc.kill("SIGTERM");
       } catch {
       }
+      const forceKill = setTimeout(() => {
+        try {
+          if (!proc.killed && proc.exitCode === null) {
+            proc.kill("SIGKILL");
+          }
+        } catch {
+        }
+      }, 2e3);
+      if (forceKill.unref) forceKill.unref();
       settle(false);
     }, DETECTION_TIMEOUT_MS);
     if (timer.unref) timer.unref();
@@ -3776,7 +3806,7 @@ function probeAppServer(codexCommand, codexIsPath, env) {
 
 // src/app-server/exec-client.ts
 import { spawn as spawn3 } from "child_process";
-import { writeFileSync, mkdtempSync } from "fs";
+import { writeFileSync, mkdtempSync, rmSync } from "fs";
 import { EventEmitter as EventEmitter2 } from "events";
 import { randomUUID as randomUUID2 } from "crypto";
 import { tmpdir } from "os";
@@ -3873,6 +3903,7 @@ var ExecClient = class extends EventEmitter2 {
   threadStartParams = null;
   lastAgentMessageText = "";
   turnCompleted = false;
+  schemaTmpDirs = [];
   // Handlers
   notificationHandler = null;
   serverRequestHandler = null;
@@ -3959,6 +3990,7 @@ var ExecClient = class extends EventEmitter2 {
     });
     proc.on("exit", (code, signal) => {
       if (this.turnId && !this._destroyed && !this.turnCompleted) {
+        this.turnCompleted = true;
         if (code !== 0 && code !== null) {
           this.emitNotification(Methods.ERROR, {
             threadId: this.threadId,
@@ -3967,6 +3999,17 @@ var ExecClient = class extends EventEmitter2 {
             willRetry: false
           });
         }
+        const turnId2 = this.turnId ?? "";
+        this.emitNotification(Methods.TURN_COMPLETED, {
+          threadId: this.threadId,
+          turn: {
+            id: turnId2,
+            status: code === 0 ? "completed" : "failed",
+            output: this.lastAgentMessageText || void 0,
+            ...code !== 0 && code !== null ? { error: { message: `exec process exited with code ${code}` } } : signal ? { error: { message: `exec process killed by signal ${signal}` } } : {}
+          }
+        });
+        this.turnId = null;
       }
       if (!this._destroyed) {
         this.emit("exit", code, signal);
@@ -4030,6 +4073,13 @@ var ExecClient = class extends EventEmitter2 {
     }
     this.process = null;
     this.removeAllListeners();
+    for (const dir of this.schemaTmpDirs) {
+      try {
+        rmSync(dir, { recursive: true, force: true });
+      } catch {
+      }
+    }
+    this.schemaTmpDirs = [];
   }
   // ── Private helpers ─────────────────────────────────────────────
   /**
@@ -4057,6 +4107,7 @@ var ExecClient = class extends EventEmitter2 {
     if (params.outputSchema && Object.keys(params.outputSchema).length > 0) {
       try {
         const tmpDir = mkdtempSync(join(tmpdir(), "codex-mcp-schema-"));
+        this.schemaTmpDirs.push(tmpDir);
         const schemaPath = join(tmpDir, "output-schema.json");
         writeFileSync(schemaPath, JSON.stringify(params.outputSchema));
         args.push("--output-schema", schemaPath);
@@ -4143,7 +4194,7 @@ var ExecClient = class extends EventEmitter2 {
     const type = event.type;
     switch (type) {
       case "thread.started": {
-        const cliThreadId = event.thread_id;
+        const cliThreadId = event.thread_id ?? event.threadId;
         if (cliThreadId) {
           this.threadId = cliThreadId;
           this.realThreadId = cliThreadId;