@ycodium-ai/agent-codex 0.2.2974 → 0.2.2978

package/dist/index.js

@@ -2999,83 +2999,20 @@ function mapServerRequestToEvents(input) {
 }
 
 // src/openCommands.ts
+import {
+  isPosixShellCommandFlag,
+  isPowerShellExecutableName,
+  posixShellCommandMatches,
+  sameArgv,
+  splitPosixCommand
+} from "@ycodium-ai/plugin-api/executor";
 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));
+  if (flag === void 0 || !isPosixShellCommandFlag(flag)) return false;
+  return posixShellCommandMatches({ shell, script }, argv);
 }
 var windowsPath = (path) => path.replaceAll("/", "\\").toLowerCase();
 function basename(path) {
@@ -3096,7 +3033,7 @@ function codexCommandMatcher(display) {
     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;
+      return index === lastIndex && index >= 1 && expectedRest[index - 1]?.toLowerCase() === "-command" && isPowerShellExecutableName(basename(expectedExe)) && actual === WINDOWS_POWERSHELL_PREFIX + arg;
     });
   };
 }
@@ -6270,7 +6207,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-codex",
-  apiVersion: 3,
+  apiVersion: 5,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

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