copilot-hub 0.1.25 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copilot-hub",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "Copilot Hub CLI and runtime bundle",
   "license": "MIT",
   "repository": {

package/scripts/dist/cli.mjs

@@ -5,6 +5,7 @@ import process, { stdin as input, stdout as output } from "node:process";
 import { spawnSync } from "node:child_process";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
+import { spawnCodexSync } from "./codex-spawn.mjs";
 import { codexInstallPackageSpec } from "./codex-version.mjs";
 import { initializeCopilotHubLayout, resolveCopilotHubLayout } from "./install-layout.mjs";
 import { buildCodexCompatibilityError, buildCodexCompatibilityNotice, probeCodexVersion, resolveCodexBinForStart, resolveCompatibleInstalledCodexBin, } from "./codex-runtime.mjs";
@@ -367,22 +368,13 @@ async function ensureCompatibleCodexBinary({ autoInstall, purpose, }) {
 }
 function runCodex(codexBin, args, stdioMode) {
     const stdio = stdioMode === "inherit" ? "inherit" : ["ignore", "pipe", "pipe"];
-    const result = process.platform === "win32" && /\.(cmd|bat)$/i.test(String(codexBin ?? ""))
-        ? spawnSync([
-            quoteWindowsShellValue(codexBin),
-            ...args.map((arg) => quoteWindowsShellValue(arg)),
-        ].join(" "), {
-            cwd: repoRoot,
-            stdio,
-            shell: true,
-            encoding: "utf8",
-        })
-        : spawnSync(codexBin, args, {
-            cwd: repoRoot,
-            stdio,
-            shell: false,
-            encoding: "utf8",
-        });
+    const result = spawnCodexSync({
+        codexBin,
+        args,
+        cwd: repoRoot,
+        stdio,
+        encoding: "utf8",
+    });
     if (result.error) {
         return {
             ok: false,
@@ -401,9 +393,6 @@ function runCodex(codexBin, args, stdioMode) {
         errorCode: "",
     };
 }
-function quoteWindowsShellValue(value) {
-    return `"${String(value ?? "").replace(/"/g, '\\"')}"`;
-}
 function runNpm(args, stdioMode) {
     const stdio = stdioMode === "inherit" ? "inherit" : ["ignore", "pipe", "pipe"];
     const result = spawnNpm(args, {

package/scripts/dist/codex-runtime.mjs

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { spawnSync } from "node:child_process";
+import { spawnCodexSync } from "./codex-spawn.mjs";
 import { compareSemver, codexVersionRequirementLabel, extractSemver, isCodexVersionCompatible, } from "./codex-version.mjs";
 export function resolveCodexBinForStart({ repoRoot, agentEngineEnvPath, controlPlaneEnvPath, env = process.env, }) {
     const fromEnv = nonEmpty(env.CODEX_BIN);
@@ -262,30 +263,11 @@ function runCodex({ codexBin, args, repoRoot, }) {
     };
 }
 function spawnCodex(codexBin, args, repoRoot) {
-    if (/\.(cjs|mjs|js)$/i.test(codexBin)) {
-        return spawnSync(process.execPath, [codexBin, ...args], {
-            cwd: repoRoot,
-            stdio: ["ignore", "pipe", "pipe"],
-            shell: false,
-            encoding: "utf8",
-        });
-    }
-    if (process.platform === "win32" && /\.(cmd|bat)$/i.test(codexBin)) {
-        const commandLine = [
-            quoteWindowsShellValue(codexBin),
-            ...args.map(quoteWindowsShellValue),
-        ].join(" ");
-        return spawnSync(commandLine, {
-            cwd: repoRoot,
-            stdio: ["ignore", "pipe", "pipe"],
-            shell: true,
-            encoding: "utf8",
-        });
-    }
-    return spawnSync(codexBin, args, {
+    return spawnCodexSync({
+        codexBin,
+        args,
         cwd: repoRoot,
         stdio: ["ignore", "pipe", "pipe"],
-        shell: false,
         encoding: "utf8",
     });
 }
@@ -346,9 +328,6 @@ function normalizeErrorCode(error) {
 function dedupe(values) {
     return [...new Set(values.map((value) => String(value ?? "").trim()).filter(Boolean))];
 }
-function quoteWindowsShellValue(value) {
-    return `"${String(value ?? "").replace(/"/g, '\\"')}"`;
-}
 function spawnNpm(args, repoRoot) {
     if (process.platform === "win32") {
         const comspec = process.env.ComSpec || "cmd.exe";

package/scripts/dist/codex-spawn.mjs

@@ -0,0 +1,42 @@
+import process from "node:process";
+import { spawnSync } from "node:child_process";
+export function requiresNodeScriptCodexBin(command) {
+    return /\.(cjs|mjs|js)$/i.test(String(command ?? "").trim());
+}
+export function requiresShellWrappedCodexBin(command, platform = process.platform) {
+    return platform === "win32" && /\.(cmd|bat)$/i.test(String(command ?? "").trim());
+}
+export function buildCodexSpawnSpec({ codexBin, args, platform = process.platform, nodeBin = process.execPath, }) {
+    if (requiresNodeScriptCodexBin(codexBin)) {
+        return {
+            command: nodeBin,
+            args: [codexBin, ...args],
+            shell: false,
+        };
+    }
+    if (requiresShellWrappedCodexBin(codexBin, platform)) {
+        return {
+            command: [quoteWindowsShellValue(codexBin), ...args.map(quoteWindowsShellValue)].join(" "),
+            args: [],
+            shell: true,
+        };
+    }
+    return {
+        command: codexBin,
+        args: [...args],
+        shell: false,
+    };
+}
+export function spawnCodexSync({ codexBin, args, cwd, stdio, encoding = "utf8", input, }) {
+    const spec = buildCodexSpawnSpec({ codexBin, args });
+    return spawnSync(spec.command, spec.args, {
+        cwd,
+        stdio,
+        shell: spec.shell,
+        encoding,
+        ...(input !== undefined ? { input } : {}),
+    });
+}
+function quoteWindowsShellValue(value) {
+    return `"${String(value ?? "").replace(/"/g, '\\"')}"`;
+}

package/scripts/src/cli.mts

@@ -5,6 +5,7 @@ import process, { stdin as input, stdout as output } from "node:process";
 import { spawnSync } from "node:child_process";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
+import { spawnCodexSync } from "./codex-spawn.mjs";
 import { codexInstallPackageSpec } from "./codex-version.mjs";
 import { initializeCopilotHubLayout, resolveCopilotHubLayout } from "./install-layout.mjs";
 import {
@@ -443,26 +444,13 @@ async function ensureCompatibleCodexBinary({
 
 function runCodex(codexBin, args, stdioMode) {
   const stdio: any = stdioMode === "inherit" ? "inherit" : ["ignore", "pipe", "pipe"];
-  const result =
-    process.platform === "win32" && /\.(cmd|bat)$/i.test(String(codexBin ?? ""))
-      ? spawnSync(
-          [
-            quoteWindowsShellValue(codexBin),
-            ...args.map((arg) => quoteWindowsShellValue(arg)),
-          ].join(" "),
-          {
-            cwd: repoRoot,
-            stdio,
-            shell: true,
-            encoding: "utf8",
-          },
-        )
-      : spawnSync(codexBin, args, {
-          cwd: repoRoot,
-          stdio,
-          shell: false,
-          encoding: "utf8",
-        });
+  const result = spawnCodexSync({
+    codexBin,
+    args,
+    cwd: repoRoot,
+    stdio,
+    encoding: "utf8",
+  });
 
   if (result.error) {
     return {
@@ -484,10 +472,6 @@ function runCodex(codexBin, args, stdioMode) {
   };
 }
 
-function quoteWindowsShellValue(value) {
-  return `"${String(value ?? "").replace(/"/g, '\\"')}"`;
-}
-
 function runNpm(args, stdioMode) {
   const stdio = stdioMode === "inherit" ? "inherit" : ["ignore", "pipe", "pipe"];
   const result = spawnNpm(args, {

package/scripts/src/codex-runtime.mts

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { spawnSync } from "node:child_process";
+import { spawnCodexSync } from "./codex-spawn.mjs";
 import {
   compareSemver,
   codexVersionRequirementLabel,
@@ -395,32 +396,11 @@ function runCodex({
 }
 
 function spawnCodex(codexBin: string, args: string[], repoRoot: string) {
-  if (/\.(cjs|mjs|js)$/i.test(codexBin)) {
-    return spawnSync(process.execPath, [codexBin, ...args], {
-      cwd: repoRoot,
-      stdio: ["ignore", "pipe", "pipe"],
-      shell: false,
-      encoding: "utf8",
-    });
-  }
-
-  if (process.platform === "win32" && /\.(cmd|bat)$/i.test(codexBin)) {
-    const commandLine = [
-      quoteWindowsShellValue(codexBin),
-      ...args.map(quoteWindowsShellValue),
-    ].join(" ");
-    return spawnSync(commandLine, {
-      cwd: repoRoot,
-      stdio: ["ignore", "pipe", "pipe"],
-      shell: true,
-      encoding: "utf8",
-    });
-  }
-
-  return spawnSync(codexBin, args, {
+  return spawnCodexSync({
+    codexBin,
+    args,
     cwd: repoRoot,
     stdio: ["ignore", "pipe", "pipe"],
-    shell: false,
     encoding: "utf8",
   });
 }
@@ -493,10 +473,6 @@ function dedupe(values: Array<string | null | undefined>): string[] {
   return [...new Set(values.map((value) => String(value ?? "").trim()).filter(Boolean))];
 }
 
-function quoteWindowsShellValue(value: string): string {
-  return `"${String(value ?? "").replace(/"/g, '\\"')}"`;
-}
-
 function spawnNpm(args: string[], repoRoot: string) {
   if (process.platform === "win32") {
     const comspec = process.env.ComSpec || "cmd.exe";

package/scripts/src/codex-spawn.mts

@@ -0,0 +1,84 @@
+import process from "node:process";
+import { spawnSync } from "node:child_process";
+
+type StdioMode = "pipe" | "inherit" | ["ignore", "pipe", "pipe"];
+
+type CodexSpawnSpec = {
+  command: string;
+  args: string[];
+  shell: boolean;
+};
+
+export function requiresNodeScriptCodexBin(command: string): boolean {
+  return /\.(cjs|mjs|js)$/i.test(String(command ?? "").trim());
+}
+
+export function requiresShellWrappedCodexBin(
+  command: string,
+  platform: NodeJS.Platform = process.platform,
+): boolean {
+  return platform === "win32" && /\.(cmd|bat)$/i.test(String(command ?? "").trim());
+}
+
+export function buildCodexSpawnSpec({
+  codexBin,
+  args,
+  platform = process.platform,
+  nodeBin = process.execPath,
+}: {
+  codexBin: string;
+  args: string[];
+  platform?: NodeJS.Platform;
+  nodeBin?: string;
+}): CodexSpawnSpec {
+  if (requiresNodeScriptCodexBin(codexBin)) {
+    return {
+      command: nodeBin,
+      args: [codexBin, ...args],
+      shell: false,
+    };
+  }
+
+  if (requiresShellWrappedCodexBin(codexBin, platform)) {
+    return {
+      command: [quoteWindowsShellValue(codexBin), ...args.map(quoteWindowsShellValue)].join(" "),
+      args: [],
+      shell: true,
+    };
+  }
+
+  return {
+    command: codexBin,
+    args: [...args],
+    shell: false,
+  };
+}
+
+export function spawnCodexSync({
+  codexBin,
+  args,
+  cwd,
+  stdio,
+  encoding = "utf8",
+  input,
+}: {
+  codexBin: string;
+  args: string[];
+  cwd: string;
+  stdio: StdioMode;
+  encoding?: BufferEncoding;
+  input?: string;
+}) {
+  const spec = buildCodexSpawnSpec({ codexBin, args });
+  return spawnSync(spec.command, spec.args, {
+    cwd,
+    stdio,
+    shell: spec.shell,
+    encoding,
+    ...(input !== undefined ? { input } : {}),
+  });
+}
+
+function quoteWindowsShellValue(value: string): string {
+  return `"${String(value ?? "").replace(/"/g, '\\"')}"`;
+}

package/scripts/test/codex-spawn.test.mjs

@@ -0,0 +1,60 @@
+import assert from "node:assert/strict";
+import process from "node:process";
+import test from "node:test";
+import {
+  buildCodexSpawnSpec,
+  requiresNodeScriptCodexBin,
+  requiresShellWrappedCodexBin,
+} from "../dist/codex-spawn.mjs";
+
+test("requiresNodeScriptCodexBin matches js entrypoints only", () => {
+  assert.equal(requiresNodeScriptCodexBin("C:/tools/codex.js"), true);
+  assert.equal(requiresNodeScriptCodexBin("C:/tools/codex.mjs"), true);
+  assert.equal(requiresNodeScriptCodexBin("C:/tools/codex.cjs"), true);
+  assert.equal(requiresNodeScriptCodexBin("C:/tools/codex.exe"), false);
+  assert.equal(requiresNodeScriptCodexBin("C:/tools/codex.cmd"), false);
+});
+
+test("requiresShellWrappedCodexBin matches Windows batch launchers only", () => {
+  assert.equal(requiresShellWrappedCodexBin("C:/tools/codex.cmd", "win32"), true);
+  assert.equal(requiresShellWrappedCodexBin("C:/tools/codex.bat", "win32"), true);
+  assert.equal(requiresShellWrappedCodexBin("C:/tools/codex.exe", "win32"), false);
+  assert.equal(requiresShellWrappedCodexBin("C:/tools/codex.js", "win32"), false);
+});
+
+test("buildCodexSpawnSpec routes js entrypoints through node", () => {
+  const spec = buildCodexSpawnSpec({
+    codexBin: "C:/Users/amine/AppData/Roaming/npm/node_modules/@openai/codex/bin/codex.js",
+    args: ["login", "status"],
+    platform: "win32",
+    nodeBin: process.execPath,
+  });
+
+  assert.equal(spec.command, process.execPath);
+  assert.deepEqual(spec.args, [
+    "C:/Users/amine/AppData/Roaming/npm/node_modules/@openai/codex/bin/codex.js",
+    "login",
+    "status",
+  ]);
+  assert.equal(spec.shell, false);
+});
+
+test("buildCodexSpawnSpec keeps exe direct and cmd shell-wrapped", () => {
+  const exeSpec = buildCodexSpawnSpec({
+    codexBin: "C:/tools/codex.exe",
+    args: ["--version"],
+    platform: "win32",
+  });
+  assert.equal(exeSpec.command, "C:/tools/codex.exe");
+  assert.deepEqual(exeSpec.args, ["--version"]);
+  assert.equal(exeSpec.shell, false);
+
+  const cmdSpec = buildCodexSpawnSpec({
+    codexBin: "C:/tools/codex.cmd",
+    args: ["login", "status"],
+    platform: "win32",
+  });
+  assert.equal(cmdSpec.shell, true);
+  assert.equal(cmdSpec.args.length, 0);
+  assert.match(cmdSpec.command, /^"C:\/tools\/codex\.cmd" "login" "status"$/);
+});