@childclm/codexx 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@childclm/codexx",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Cross-platform launcher for Codex CLI with project-scoped session trees and provider switching.",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -97,6 +97,14 @@ function loadSettings() {
   });
 }
 
+function fileExists(p) {
+  try {
+    return fs.existsSync(p);
+  } catch {
+    return false;
+  }
+}
+
 function loadProject(cwd = process.cwd()) {
   const { root, projectFile } = getProjectPaths(cwd);
   return readJson(projectFile, {
@@ -132,10 +140,170 @@ function detectCodex() {
   return settings.codexCommand || "codex";
 }
 
+function resolveWindowsCodexCandidates() {
+  const candidates = [];
+  const appData = process.env.APPDATA || path.join(HOME, "AppData", "Roaming");
+  const npmRoot = path.join(appData, "npm");
+  const localShims = [
+    path.join(npmRoot, "codex.exe"),
+    path.join(npmRoot, "codex.cmd"),
+    path.join(npmRoot, "codex"),
+  ];
+  candidates.push(...localShims);
+
+  const openaiCodexRoot = path.join(
+    npmRoot,
+    "node_modules",
+    "@openai",
+    "codex",
+    "node_modules",
+  );
+  if (fileExists(openaiCodexRoot)) {
+    try {
+      const children = fs.readdirSync(openaiCodexRoot);
+      for (const child of children) {
+        if (!child.startsWith("@openai\\codex-win32-") && !child.startsWith("@openai/codex-win32-")) {
+          continue;
+        }
+      }
+    } catch {}
+  }
+
+  const finder = spawnSync("where", ["codex.exe"], { encoding: "utf8" });
+  const foundExe = (finder.stdout || "")
+    .trim()
+    .split(/\r?\n/)
+    .filter(Boolean);
+  candidates.push(...foundExe);
+
+  const foundCmd = spawnSync("where", ["codex.cmd"], { encoding: "utf8" });
+  const cmdHits = (foundCmd.stdout || "")
+    .trim()
+    .split(/\r?\n/)
+    .filter(Boolean);
+  candidates.push(...cmdHits);
+
+  const vendorGlobRoot = path.join(
+    npmRoot,
+    "node_modules",
+    "@openai",
+    "codex",
+    "node_modules",
+  );
+  if (fileExists(vendorGlobRoot)) {
+    try {
+      const dirs = fs.readdirSync(vendorGlobRoot);
+      for (const dir of dirs) {
+        if (!dir.startsWith("@openai")) continue;
+      }
+    } catch {}
+  }
+
+  const packageRoot = path.join(
+    npmRoot,
+    "node_modules",
+    "@openai",
+    "codex",
+    "node_modules",
+  );
+  if (fileExists(packageRoot)) {
+    try {
+      const entries = fs.readdirSync(packageRoot);
+      for (const entry of entries) {
+        if (!entry.startsWith("@openai")) continue;
+      }
+    } catch {}
+  }
+
+  const openaiNodeModules = path.join(
+    npmRoot,
+    "node_modules",
+    "@openai",
+    "codex",
+    "node_modules",
+  );
+  if (fileExists(openaiNodeModules)) {
+    try {
+      const entries = fs.readdirSync(openaiNodeModules);
+      for (const entry of entries) {
+        if (!entry.startsWith("@openai")) continue;
+      }
+    } catch {}
+  }
+
+  const codexNodeModules = path.join(
+    npmRoot,
+    "node_modules",
+    "@openai",
+    "codex",
+    "node_modules",
+  );
+  if (fileExists(codexNodeModules)) {
+    try {
+      const entries = fs.readdirSync(codexNodeModules);
+      for (const entry of entries) {
+        if (!entry.startsWith("@openai")) continue;
+      }
+    } catch {}
+  }
+
+  const directVendorParent = path.join(
+    npmRoot,
+    "node_modules",
+    "@openai",
+    "codex",
+    "node_modules",
+  );
+  if (fileExists(directVendorParent)) {
+    try {
+      const dirs = fs.readdirSync(directVendorParent);
+      for (const dir of dirs) {
+        if (!dir.includes("codex-win32-")) continue;
+        const vendorRoot = path.join(directVendorParent, dir, "vendor");
+        if (!fileExists(vendorRoot)) continue;
+        const vendorDirs = fs.readdirSync(vendorRoot);
+        for (const vendorDir of vendorDirs) {
+          const exePath = path.join(vendorRoot, vendorDir, "bin", "codex.exe");
+          candidates.push(exePath);
+        }
+      }
+    } catch {}
+  }
+
+  return [...new Set(candidates)].filter(Boolean);
+}
+
+function resolveCodexCommand() {
+  const configured = detectCodex();
+  if (path.isAbsolute(configured) && fileExists(configured)) {
+    return configured;
+  }
+
+  if (process.platform === "win32") {
+    const candidates = [];
+    if (configured && configured !== "codex") {
+      candidates.push(configured);
+      if (!path.extname(configured)) {
+        candidates.push(`${configured}.exe`, `${configured}.cmd`);
+      }
+    }
+    candidates.push(...resolveWindowsCodexCandidates());
+
+    for (const candidate of candidates) {
+      if (candidate && fileExists(candidate)) {
+        return candidate;
+      }
+    }
+    return configured;
+  }
+
+  const finder = spawnSync("which", [configured], { encoding: "utf8" });
+  const found = (finder.stdout || "").trim().split(/\r?\n/)[0] || "";
+  return found || configured;
+}
+
 function codexPath() {
-  const finder = process.platform === "win32" ? "where" : "which";
-  const out = spawnSync(finder, ["codex"], { encoding: "utf8" });
-  return (out.stdout || "").trim().split(/\r?\n/)[0] || "";
+  return resolveCodexCommand();
 }
 
 function clearScreen() {
@@ -353,11 +521,12 @@ function buildCodexEnv(provider) {
 
 function runCodex(args, env, cwd = process.cwd()) {
   return new Promise((resolve, reject) => {
-    const cmd = detectCodex();
+    const cmd = resolveCodexCommand();
     const child = spawn(cmd, args, {
       cwd,
       stdio: "inherit",
       env: { ...process.env, ...env },
+      shell: false,
     });
     child.on("error", reject);
     child.on("exit", (code) => resolve(code ?? 0));