@ycodium-ai/agent-codex 0.2.2972 → 0.2.2974

package/dist/index.js

@@ -2998,6 +2998,150 @@ function mapServerRequestToEvents(input) {
   ];
 }
 
+// src/openCommands.ts
+var WINDOWS_POWERSHELL_PREFIX = "try { [Console]::OutputEncoding=[System.Text.Encoding]::UTF8 } catch {}\n";
+var POWERSHELL_EXECUTABLES = /* @__PURE__ */ new Set(["powershell.exe", "pwsh.exe", "powershell", "pwsh"]);
+function splitPosixCommand(display) {
+  const argv = [];
+  let current = "";
+  let inWord = false;
+  let index = 0;
+  while (index < display.length) {
+    const char = display[index] ?? "";
+    if (char === "'") {
+      const end = display.indexOf("'", index + 1);
+      if (end === -1) return null;
+      current += display.slice(index + 1, end);
+      inWord = true;
+      index = end + 1;
+      continue;
+    }
+    if (char === '"') {
+      index += 1;
+      let closed = false;
+      while (index < display.length) {
+        const inner = display[index] ?? "";
+        if (inner === '"') {
+          closed = true;
+          index += 1;
+          break;
+        }
+        const next = display[index + 1];
+        if (inner === "\\" && next !== void 0 && '$`"\\\n'.includes(next)) {
+          current += next;
+          index += 2;
+          continue;
+        }
+        current += inner;
+        index += 1;
+      }
+      if (!closed) return null;
+      inWord = true;
+      continue;
+    }
+    if (char === "\\") {
+      const next = display[index + 1];
+      if (next === void 0) return null;
+      current += next;
+      inWord = true;
+      index += 2;
+      continue;
+    }
+    if (char === " " || char === "	" || char === "\n") {
+      if (inWord) argv.push(current);
+      current = "";
+      inWord = false;
+      index += 1;
+      continue;
+    }
+    current += char;
+    inWord = true;
+    index += 1;
+  }
+  if (inWord) argv.push(current);
+  return argv;
+}
+var sameArgv = (left, right) => left.length === right.length && left.every((arg, index) => arg === right[index]);
+var SHELL_COMMAND_FLAGS = /* @__PURE__ */ new Set(["-lc", "-c"]);
+var posixBasename = (path) => path.slice(path.lastIndexOf("/") + 1);
+function posixCommandMatches(expected, argv) {
+  if (sameArgv(argv, expected)) return true;
+  const [shell, flag, script] = expected;
+  if (expected.length !== 3 || shell === void 0 || script === void 0) return false;
+  if (flag === void 0 || !SHELL_COMMAND_FLAGS.has(flag)) return false;
+  if (argv.length === 3 && argv[0] === shell && SHELL_COMMAND_FLAGS.has(argv[1] ?? "") && argv[2] === script) {
+    return true;
+  }
+  const words = splitPosixCommand(script);
+  if (words === null || words.length === 0) return false;
+  if (sameArgv(argv, words)) return true;
+  return argv.length === words.length + 1 && posixBasename(argv[1] ?? "") === posixBasename(words[0] ?? "") && sameArgv(argv.slice(2), words.slice(1));
+}
+var windowsPath = (path) => path.replaceAll("/", "\\").toLowerCase();
+function basename(path) {
+  const parts = path.split(/[\\/]/);
+  return (parts[parts.length - 1] ?? "").toLowerCase();
+}
+function codexCommandMatcher(display) {
+  const expected = splitPosixCommand(display);
+  if (expected === null || expected.length === 0) return void 0;
+  return (argv, platform2) => {
+    if (platform2 !== "win32") return posixCommandMatches(expected, argv);
+    if (argv.length !== expected.length) return false;
+    const [actualExe, ...actualRest] = argv;
+    const [expectedExe, ...expectedRest] = expected;
+    if (actualExe === void 0 || expectedExe === void 0) return false;
+    if (windowsPath(actualExe) !== windowsPath(expectedExe)) return false;
+    const lastIndex = expectedRest.length - 1;
+    return expectedRest.every((arg, index) => {
+      const actual = actualRest[index];
+      if (actual === arg) return true;
+      return index === lastIndex && index >= 1 && expectedRest[index - 1]?.toLowerCase() === "-command" && POWERSHELL_EXECUTABLES.has(basename(expectedExe)) && actual === WINDOWS_POWERSHELL_PREFIX + arg;
+    });
+  };
+}
+function trackOpenCommand(open, method, params) {
+  if (!isRecord3(params)) return;
+  const turnId = turnIdOf(params);
+  if (method === "turn/completed") {
+    for (const [id2, entry] of open) {
+      if (turnId === void 0 || entry.turnId === turnId) open.delete(id2);
+    }
+    return;
+  }
+  const item = params["item"];
+  if (!isRecord3(item) || item["type"] !== "commandExecution") return;
+  const id = item["id"];
+  if (typeof id !== "string") return;
+  if (method === "item/completed") {
+    open.delete(id);
+    return;
+  }
+  if (method !== "item/started") return;
+  const startedAtMs = params["startedAtMs"];
+  const command = item["command"];
+  if (typeof startedAtMs !== "number" || typeof command !== "string") return;
+  open.set(id, { turnId, startedAtMs, command });
+}
+function codexSessionProcessMatcher(appServerArgs) {
+  return (argv) => argv.length === appServerArgs.length + 1 && sameArgv(argv.slice(1), appServerArgs);
+}
+function openCommandsOf(booked) {
+  if (booked === void 0) return void 0;
+  const activeTurn = booked.runtime.activeTurnId;
+  const commands = [...booked.runtime.openCommands].flatMap(([toolCallId, entry]) => {
+    if (activeTurn !== void 0 && entry.turnId !== activeTurn) return [];
+    const matches = codexCommandMatcher(entry.command);
+    return matches === void 0 ? [] : [{ toolCallId, startedAtMs: entry.startedAtMs, matches }];
+  });
+  if (commands.length === 0) return void 0;
+  return {
+    rootPid: booked.handle.pid,
+    sessionProcess: codexSessionProcessMatcher(booked.runtime.appServerArgs),
+    commands
+  };
+}
+
 // src/sessionRuntime.ts
 var COLLAB_META_LOOKUP_TIMEOUT_MS = 5e3;
 function metaValue(value) {
@@ -3057,6 +3201,7 @@ var CodexSessionRuntime = class {
   collabChildren = /* @__PURE__ */ new Map();
   collabChildMeta = /* @__PURE__ */ new Map();
   liveForeignTurns = /* @__PURE__ */ new Map();
+  openCommands = /* @__PURE__ */ new Map();
   collabReceiverTurns = /* @__PURE__ */ new Map();
   memoryThreadIds = /* @__PURE__ */ new Set();
   /** 这个会话见过的主额度快照（按字段合并），额度用尽停轮时点名窗口用。 */
@@ -3217,6 +3362,7 @@ var CodexSessionRuntime = class {
       });
       return;
     }
+    trackOpenCommand(this.openCommands, method, params);
     if (method === "account/rateLimits/updated" && isRecord3(params)) {
       this.rateLimits = mergeCodexRateLimits(this.rateLimits, params["rateLimits"]);
     }
@@ -3230,7 +3376,7 @@ var CodexSessionRuntime = class {
       this.emit(event);
     }
     if (method === "turn/started") {
-      const turnId = isRecord3(params) ? asString(params["turnId"]) ?? (isRecord3(params["turn"]) ? asString(params["turn"]["id"]) : null) : null;
+      const turnId = turnIdOf(params);
       if (turnId) this.activeTurnId = turnId;
     }
     if (method === "turn/completed") {
@@ -3283,7 +3429,7 @@ var CodexSessionRuntime = class {
     const child = this.collabChildren.get(conversationId);
     if (method === "turn/started") {
       this.reopenCollabChildMeta(conversationId);
-      const turnId = isRecord3(params) ? asString(params["turnId"]) ?? (isRecord3(params["turn"]) ? asString(params["turn"]["id"]) : null) : null;
+      const turnId = turnIdOf(params);
       if (turnId) this.liveForeignTurns.set(conversationId, turnId);
     }
     if (method === "turn/completed" || method === "thread/closed") {
@@ -5749,9 +5895,7 @@ var createCodexInstance = (config, host, attachments, cache) => {
   };
   const trackHandle = (handle, command, threadId) => {
     live.set(handle.pid, { command, ...threadId === void 0 ? {} : { threadId } });
-    void handle.exited.finally(() => {
-      live.delete(handle.pid);
-    });
+    void handle.exited.finally(() => live.delete(handle.pid));
   };
   const stopBooked = async (booked) => {
     await booked.runtime.close().catch(() => void 0);
@@ -6081,6 +6225,7 @@ var createCodexInstance = (config, host, attachments, cache) => {
       ...entry.threadId === void 0 ? {} : { threadId: entry.threadId },
       bindingId: host.bindingId
     })),
+    openCommandProcesses: async (threadId) => openCommandsOf(threads.get(threadId)),
     drain: async (signal) => {
       const waiters = [...live.keys()].map((pid) => {
         const booked = [...threads.values()].find((entry) => entry.handle.pid === pid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-codex",
-  "version": "0.2.2972",
+  "version": "0.2.2974",
   "description": "Codex executor: Codex CLI over the app-server JSON-RPC protocol.",
   "keywords": [
     "ycodium",
@@ -29,8 +29,8 @@
     "tailwindcss": "^4.0.0",
     "typescript": "~6.0.3",
     "vite-plus": "0.2.2",
-    "ycodium-executor-testing": "0.0.0",
-    "@ycodium-ai/plugin-api": "0.2.2972"
+    "@ycodium-ai/plugin-api": "0.2.2974",
+    "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",