copilot-hub 0.1.26 → 0.1.28

package/apps/agent-engine/dist/config.js

@@ -146,7 +146,7 @@ function resolveCodexBin(rawValue) {
     const value = String(rawValue ?? "").trim();
     const normalized = value.toLowerCase();
     if (value && normalized !== "codex") {
-        return value;
+        return normalizeConfiguredCodexBin(value);
     }
     if (process.platform === "win32") {
         const npmGlobalCodex = findWindowsNpmGlobalCodexBin();
@@ -160,6 +160,24 @@ function resolveCodexBin(rawValue) {
     }
     return value || "codex";
 }
+function normalizeConfiguredCodexBin(value) {
+    const normalizedValue = String(value ?? "").trim();
+    if (process.platform !== "win32" || !normalizedValue) {
+        return normalizedValue;
+    }
+    const basename = path.win32.basename(normalizedValue).toLowerCase();
+    if (basename !== "codex.cmd" && basename !== "codex.bat") {
+        return normalizedValue;
+    }
+    if (path.win32.isAbsolute(normalizedValue)) {
+        const wrapperDir = path.win32.dirname(normalizedValue);
+        const entrypoint = path.win32.join(wrapperDir, "node_modules", "@openai", "codex", "bin", "codex.js");
+        if (fs.existsSync(entrypoint)) {
+            return entrypoint;
+        }
+    }
+    return findWindowsNpmGlobalCodexBin() || normalizedValue;
+}
 function findVscodeCodexExe() {
     const userProfile = process.env.USERPROFILE;
     if (!userProfile) {

package/apps/control-plane/dist/config.js

@@ -153,7 +153,7 @@ function resolveCodexBin(rawValue) {
     const value = String(rawValue ?? "").trim();
     const normalized = value.toLowerCase();
     if (value && normalized !== "codex") {
-        return value;
+        return normalizeConfiguredCodexBin(value);
     }
     if (process.platform === "win32") {
         const npmGlobalCodex = findWindowsNpmGlobalCodexBin();
@@ -167,6 +167,24 @@ function resolveCodexBin(rawValue) {
     }
     return value || "codex";
 }
+function normalizeConfiguredCodexBin(value) {
+    const normalizedValue = String(value ?? "").trim();
+    if (process.platform !== "win32" || !normalizedValue) {
+        return normalizedValue;
+    }
+    const basename = path.win32.basename(normalizedValue).toLowerCase();
+    if (basename !== "codex.cmd" && basename !== "codex.bat") {
+        return normalizedValue;
+    }
+    if (path.win32.isAbsolute(normalizedValue)) {
+        const wrapperDir = path.win32.dirname(normalizedValue);
+        const entrypoint = path.win32.join(wrapperDir, "node_modules", "@openai", "codex", "bin", "codex.js");
+        if (fs.existsSync(entrypoint)) {
+            return entrypoint;
+        }
+    }
+    return findWindowsNpmGlobalCodexBin() || normalizedValue;
+}
 function findVscodeCodexExe() {
     const userProfile = process.env.USERPROFILE;
     if (!userProfile) {

package/package.json

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

package/scripts/dist/codex-runtime.mjs

@@ -42,9 +42,9 @@ export function resolveCodexBinForStart({ repoRoot, agentEngineEnvPath, controlP
         userConfigured: false,
     };
 }
-export function resolveCompatibleInstalledCodexBin({ repoRoot, env = process.env, }) {
+export function resolveCompatibleInstalledCodexBin({ repoRoot, env = process.env, platform = process.platform, }) {
     const matches = [];
-    for (const candidate of listCodexBinCandidates(env, repoRoot)) {
+    for (const candidate of listCodexBinCandidates(env, repoRoot, platform)) {
         const probe = probeCodexVersion({
             codexBin: candidate,
             repoRoot,
@@ -55,7 +55,7 @@ export function resolveCompatibleInstalledCodexBin({ repoRoot, env = process.env
         matches.push({
             candidate,
             version: probe.version,
-            priority: getCodexCandidatePriority(candidate, env, repoRoot),
+            priority: getCodexCandidatePriority(candidate, env, repoRoot, platform),
         });
     }
     if (matches.length === 0) {
@@ -134,12 +134,17 @@ export function buildCodexCompatibilityError({ resolved, probe, includeInstallHi
     return lines.join("\n");
 }
 function buildResolvedCodexBin({ value, source, env, repoRoot, }) {
-    const normalized = String(value ?? "")
+    const normalizedValue = normalizeConfiguredCodexBin({
+        value,
+        env,
+        repoRoot,
+    });
+    const normalized = String(normalizedValue ?? "")
         .trim()
         .toLowerCase();
     if (normalized && normalized !== "codex") {
         return {
-            bin: value,
+            bin: normalizedValue,
             source,
             userConfigured: true,
         };
@@ -151,20 +156,43 @@ function buildResolvedCodexBin({ value, source, env, repoRoot, }) {
         userConfigured: false,
     };
 }
+export function normalizeConfiguredCodexBin({ value, env = process.env, repoRoot, platform = process.platform, }) {
+    const normalizedValue = String(value ?? "").trim();
+    if (!normalizedValue || platform !== "win32") {
+        return normalizedValue;
+    }
+    const normalizedBasename = path.win32.basename(normalizedValue).toLowerCase();
+    if (normalizedBasename !== "codex.cmd" && normalizedBasename !== "codex.bat") {
+        return normalizedValue;
+    }
+    if (path.win32.isAbsolute(normalizedValue)) {
+        const pathModule = selectPathModule(normalizedValue);
+        const wrapperDir = pathModule.dirname(normalizedValue);
+        const entrypoint = pathModule.join(wrapperDir, "node_modules", "@openai", "codex", "bin", "codex.js");
+        if (fs.existsSync(entrypoint)) {
+            return entrypoint;
+        }
+    }
+    return findWindowsNpmGlobalCodexBin(env, repoRoot, platform) || normalizedValue;
+}
 function findDetectedCodexBin(env, repoRoot) {
     if (process.platform !== "win32") {
         return "";
     }
-    return findWindowsNpmGlobalCodexBin(env, repoRoot) || findVscodeCodexExe(env) || "";
+    return (findWindowsNpmGlobalCodexBin(env, repoRoot, process.platform) || findVscodeCodexExe(env) || "");
 }
-function listCodexBinCandidates(env, repoRoot) {
-    return dedupe(["codex", findWindowsNpmGlobalCodexBin(env, repoRoot), findVscodeCodexExe(env)]);
+function listCodexBinCandidates(env, repoRoot, platform) {
+    return dedupe([
+        "codex",
+        findWindowsNpmGlobalCodexBin(env, repoRoot, platform),
+        findVscodeCodexExe(env),
+    ]);
 }
-function getCodexCandidatePriority(candidate, env, repoRoot) {
+function getCodexCandidatePriority(candidate, env, repoRoot, platform) {
     if (candidate === "codex") {
         return 0;
     }
-    const npmGlobal = findWindowsNpmGlobalCodexBin(env, repoRoot);
+    const npmGlobal = findWindowsNpmGlobalCodexBin(env, repoRoot, platform);
     if (npmGlobal && candidate === npmGlobal) {
         return 1;
     }
@@ -198,8 +226,8 @@ function findVscodeCodexExe(env) {
     }
     return "";
 }
-function findWindowsNpmGlobalCodexBin(env, repoRoot) {
-    if (process.platform !== "win32") {
+function findWindowsNpmGlobalCodexBin(env, repoRoot, platform) {
+    if (platform !== "win32") {
         return "";
     }
     const packageRoots = [];
@@ -231,6 +259,13 @@ function findWindowsNpmGlobalCodexBin(env, repoRoot) {
     }
     return "";
 }
+function selectPathModule(filePath) {
+    const normalized = String(filePath ?? "").trim();
+    if (/^[A-Za-z]:[\\/]/.test(normalized) || normalized.includes("\\")) {
+        return path.win32;
+    }
+    return path.posix;
+}
 function readNpmPrefix(repoRoot) {
     const result = spawnNpm(["config", "get", "prefix"], repoRoot);
     if (result.error || result.status !== 0) {

package/scripts/src/codex-runtime.mts

@@ -82,13 +82,15 @@ export function resolveCodexBinForStart({
 export function resolveCompatibleInstalledCodexBin({
   repoRoot,
   env = process.env,
+  platform = process.platform,
 }: {
   repoRoot: string;
   env?: NodeJS.ProcessEnv;
+  platform?: NodeJS.Platform;
 }): string {
   const matches: Array<{ candidate: string; version: string; priority: number }> = [];
 
-  for (const candidate of listCodexBinCandidates(env, repoRoot)) {
+  for (const candidate of listCodexBinCandidates(env, repoRoot, platform)) {
     const probe = probeCodexVersion({
       codexBin: candidate,
       repoRoot,
@@ -100,7 +102,7 @@ export function resolveCompatibleInstalledCodexBin({
     matches.push({
       candidate,
       version: probe.version,
-      priority: getCodexCandidatePriority(candidate, env, repoRoot),
+      priority: getCodexCandidatePriority(candidate, env, repoRoot, platform),
     });
   }
 
@@ -230,12 +232,17 @@ function buildResolvedCodexBin({
   env: NodeJS.ProcessEnv;
   repoRoot: string;
 }): ResolvedCodexBin {
-  const normalized = String(value ?? "")
+  const normalizedValue = normalizeConfiguredCodexBin({
+    value,
+    env,
+    repoRoot,
+  });
+  const normalized = String(normalizedValue ?? "")
     .trim()
     .toLowerCase();
   if (normalized && normalized !== "codex") {
     return {
-      bin: value,
+      bin: normalizedValue,
       source,
       userConfigured: true,
     };
@@ -249,28 +256,79 @@ function buildResolvedCodexBin({
   };
 }
 
+export function normalizeConfiguredCodexBin({
+  value,
+  env = process.env,
+  repoRoot,
+  platform = process.platform,
+}: {
+  value: string;
+  env?: NodeJS.ProcessEnv;
+  repoRoot: string;
+  platform?: NodeJS.Platform;
+}): string {
+  const normalizedValue = String(value ?? "").trim();
+  if (!normalizedValue || platform !== "win32") {
+    return normalizedValue;
+  }
+
+  const normalizedBasename = path.win32.basename(normalizedValue).toLowerCase();
+  if (normalizedBasename !== "codex.cmd" && normalizedBasename !== "codex.bat") {
+    return normalizedValue;
+  }
+
+  if (path.win32.isAbsolute(normalizedValue)) {
+    const pathModule = selectPathModule(normalizedValue);
+    const wrapperDir = pathModule.dirname(normalizedValue);
+    const entrypoint = pathModule.join(
+      wrapperDir,
+      "node_modules",
+      "@openai",
+      "codex",
+      "bin",
+      "codex.js",
+    );
+    if (fs.existsSync(entrypoint)) {
+      return entrypoint;
+    }
+  }
+
+  return findWindowsNpmGlobalCodexBin(env, repoRoot, platform) || normalizedValue;
+}
+
 function findDetectedCodexBin(env: NodeJS.ProcessEnv, repoRoot: string): string {
   if (process.platform !== "win32") {
     return "";
   }
 
-  return findWindowsNpmGlobalCodexBin(env, repoRoot) || findVscodeCodexExe(env) || "";
+  return (
+    findWindowsNpmGlobalCodexBin(env, repoRoot, process.platform) || findVscodeCodexExe(env) || ""
+  );
 }
 
-function listCodexBinCandidates(env: NodeJS.ProcessEnv, repoRoot: string): string[] {
-  return dedupe(["codex", findWindowsNpmGlobalCodexBin(env, repoRoot), findVscodeCodexExe(env)]);
+function listCodexBinCandidates(
+  env: NodeJS.ProcessEnv,
+  repoRoot: string,
+  platform: NodeJS.Platform,
+): string[] {
+  return dedupe([
+    "codex",
+    findWindowsNpmGlobalCodexBin(env, repoRoot, platform),
+    findVscodeCodexExe(env),
+  ]);
 }
 
 function getCodexCandidatePriority(
   candidate: string,
   env: NodeJS.ProcessEnv,
   repoRoot: string,
+  platform: NodeJS.Platform,
 ): number {
   if (candidate === "codex") {
     return 0;
   }
 
-  const npmGlobal = findWindowsNpmGlobalCodexBin(env, repoRoot);
+  const npmGlobal = findWindowsNpmGlobalCodexBin(env, repoRoot, platform);
   if (npmGlobal && candidate === npmGlobal) {
     return 1;
   }
@@ -312,8 +370,12 @@ function findVscodeCodexExe(env: NodeJS.ProcessEnv): string {
   return "";
 }
 
-function findWindowsNpmGlobalCodexBin(env: NodeJS.ProcessEnv, repoRoot: string): string {
-  if (process.platform !== "win32") {
+function findWindowsNpmGlobalCodexBin(
+  env: NodeJS.ProcessEnv,
+  repoRoot: string,
+  platform: NodeJS.Platform,
+): string {
+  if (platform !== "win32") {
     return "";
   }
 
@@ -351,6 +413,14 @@ function findWindowsNpmGlobalCodexBin(env: NodeJS.ProcessEnv, repoRoot: string):
   return "";
 }
 
+function selectPathModule(filePath: string): typeof path.posix | typeof path.win32 {
+  const normalized = String(filePath ?? "").trim();
+  if (/^[A-Za-z]:[\\/]/.test(normalized) || normalized.includes("\\")) {
+    return path.win32;
+  }
+  return path.posix;
+}
+
 function readNpmPrefix(repoRoot: string): string {
   const result = spawnNpm(["config", "get", "prefix"], repoRoot);
   if (result.error || result.status !== 0) {

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

@@ -0,0 +1,59 @@
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import test from "node:test";
+import { normalizeConfiguredCodexBin } from "../dist/codex-runtime.mjs";
+
+test("normalizeConfiguredCodexBin remaps absolute Windows npm wrappers to codex.js", () => {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "copilot-hub-codex-bin-"));
+  const wrapperDir = path.join(tempDir, "npm");
+  const packageDir = path.join(wrapperDir, "node_modules", "@openai", "codex", "bin");
+  fs.mkdirSync(packageDir, { recursive: true });
+
+  const wrapperPath = path.join(wrapperDir, "codex.cmd");
+  const entrypointPath = path.join(packageDir, "codex.js");
+  fs.writeFileSync(wrapperPath, "@echo off\r\n", "utf8");
+  fs.writeFileSync(entrypointPath, "console.log('ok');\n", "utf8");
+
+  const resolved = normalizeConfiguredCodexBin({
+    value: wrapperPath,
+    env: {},
+    repoRoot: tempDir,
+    platform: "win32",
+  });
+
+  assert.equal(resolved, entrypointPath);
+});
+
+test("normalizeConfiguredCodexBin resolves bare codex.cmd through detected npm install", () => {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "copilot-hub-codex-bin-"));
+  const appDataDir = path.join(tempDir, "AppData", "Roaming");
+  const packageDir = path.join(appDataDir, "npm", "node_modules", "@openai", "codex", "bin");
+  fs.mkdirSync(packageDir, { recursive: true });
+
+  const entrypointPath = path.join(packageDir, "codex.js");
+  fs.writeFileSync(entrypointPath, "console.log('ok');\n", "utf8");
+
+  const resolved = normalizeConfiguredCodexBin({
+    value: "codex.cmd",
+    env: {
+      APPDATA: appDataDir,
+    },
+    repoRoot: tempDir,
+    platform: "win32",
+  });
+
+  assert.equal(resolved, entrypointPath);
+});
+
+test("normalizeConfiguredCodexBin preserves non-wrapper commands", () => {
+  const resolved = normalizeConfiguredCodexBin({
+    value: "C:/tools/codex.exe",
+    env: {},
+    repoRoot: process.cwd(),
+    platform: "win32",
+  });
+
+  assert.equal(resolved, "C:/tools/codex.exe");
+});