@childclm/codexx 0.1.1 → 0.1.3

package/package.json

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

package/src/index.js

@@ -137,38 +137,39 @@ function saveProjectSessionsMeta(data, cwd = process.cwd()) {
 
 function detectCodex() {
   const settings = loadSettings();
-  return settings.codexCommand || "codex";
+  return String(settings.codexCommand || "codex").trim().replace(/^"(.*)"$/, "$1");
 }
 
 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(
+
+  const nativePackageScope = path.join(
     npmRoot,
     "node_modules",
     "@openai",
     "codex",
     "node_modules",
+    "@openai",
   );
-  if (fileExists(openaiCodexRoot)) {
+  if (fileExists(nativePackageScope)) {
     try {
-      const children = fs.readdirSync(openaiCodexRoot);
-      for (const child of children) {
-        if (!child.startsWith("@openai\\codex-win32-") && !child.startsWith("@openai/codex-win32-")) {
-          continue;
+      const dirs = fs.readdirSync(nativePackageScope);
+      for (const dir of dirs) {
+        if (!dir.startsWith("codex-win32-")) continue;
+        const vendorRoot = path.join(nativePackageScope, dir, "vendor");
+        if (!fileExists(vendorRoot)) continue;
+        const vendorDirs = fs.readdirSync(vendorRoot);
+        for (const vendorDir of vendorDirs) {
+          candidates.push(path.join(vendorRoot, vendorDir, "bin", "codex.exe"));
         }
       }
     } catch {}
   }
 
+  candidates.push(path.join(npmRoot, "codex.cmd"), path.join(npmRoot, "codex"));
+
   const finder = spawnSync("where", ["codex.exe"], { encoding: "utf8" });
   const foundExe = (finder.stdout || "")
     .trim()
@@ -183,93 +184,6 @@ function resolveWindowsCodexCandidates() {
     .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);
 }
 
@@ -306,10 +220,74 @@ function codexPath() {
   return resolveCodexCommand();
 }
 
+function buildCodexLaunch(cmd, args) {
+  const ext = path.extname(cmd).toLowerCase();
+  if (process.platform !== "win32") {
+    return {
+      command: cmd,
+      args,
+      shell: false,
+    };
+  }
+
+  if (ext === ".ps1") {
+    return {
+      command: "powershell.exe",
+      args: [
+        "-NoProfile",
+        "-ExecutionPolicy",
+        "Bypass",
+        "-File",
+        cmd,
+        ...args,
+      ],
+      shell: false,
+    };
+  }
+
+  if (ext === ".cmd" || ext === ".bat") {
+    return {
+      command: "cmd.exe",
+      args: ["/d", "/s", "/c", cmd, ...args],
+      shell: false,
+    };
+  }
+
+  return {
+    command: cmd,
+    args,
+    shell: false,
+  };
+}
+
 function clearScreen() {
   process.stdout.write("\x1b[2J\x1b[0f");
 }
 
+function resetTerminalForChild() {
+  process.stdout.write("\x1b[0m\x1b[2J\x1b[3J\x1b[H");
+}
+
+function suspendTerminalForChild(rl) {
+  setRawMode(false);
+  if (rl && typeof rl.pause === "function") {
+    rl.pause();
+  }
+  if (typeof process.stdin.pause === "function") {
+    process.stdin.pause();
+  }
+}
+
+function resumeTerminalAfterChild(rl) {
+  if (typeof process.stdin.resume === "function") {
+    process.stdin.resume();
+  }
+  if (rl && typeof rl.resume === "function") {
+    rl.resume();
+  }
+  setRawMode(true);
+}
+
 function prompt(rl, text) {
   return new Promise((resolve) => rl.question(text, resolve));
 }
@@ -519,17 +497,29 @@ function buildCodexEnv(provider) {
   };
 }
 
-function runCodex(args, env, cwd = process.cwd()) {
+function runCodex(args, env, cwd = process.cwd(), rl = null) {
   return new Promise((resolve, reject) => {
     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));
+    const launch = buildCodexLaunch(cmd, args);
+    const settle = (done, value) => {
+      resumeTerminalAfterChild(rl);
+      done(value);
+    };
+
+    try {
+      suspendTerminalForChild(rl);
+      resetTerminalForChild();
+      const child = spawn(launch.command, launch.args, {
+        cwd,
+        stdio: "inherit",
+        env: { ...process.env, ...env },
+        shell: launch.shell,
+      });
+      child.on("error", (error) => settle(reject, error));
+      child.on("exit", (code) => settle(resolve, code ?? 0));
+    } catch (error) {
+      settle(reject, error);
+    }
   });
 }
 
@@ -889,10 +879,8 @@ async function launchNewSession(rl, cwd = process.cwd()) {
   console.log(`准备启动新主线会话 · provider=${provider.name}`);
   await pause(rl, "按回车进入 Codex...");
 
-  setRawMode(false);
   const startedAtMs = Date.now();
-  await runCodex([], buildCodexEnv(provider), projectState.root);
-  setRawMode(true);
+  await runCodex([], buildCodexEnv(provider), projectState.root, rl);
 
   const linkedSessionId = await maybeLinkLatestSession(
     projectState.root,
@@ -980,9 +968,7 @@ async function resumeSpecificSession(rl, sessionId, cwd = process.cwd()) {
   console.log(`provider=${provider.name}`);
   await pause(rl, "按回车进入 Codex...");
 
-  setRawMode(false);
-  await runCodex(["resume", sessionId], buildCodexEnv(provider), projectState.root);
-  setRawMode(true);
+  await runCodex(["resume", sessionId], buildCodexEnv(provider), projectState.root, rl);
 }
 
 async function pickSessionAndResume(rl, cwd = process.cwd()) {
@@ -1128,10 +1114,8 @@ async function forkFromSession(rl, source, cwd = process.cwd()) {
   console.log(`provider=${provider.name}`);
   await pause(rl, "按回车进入 Codex...");
 
-  setRawMode(false);
   const startedAtMs = Date.now();
-  await runCodex(["fork", source.sessionId], buildCodexEnv(provider), projectState.root);
-  setRawMode(true);
+  await runCodex(["fork", source.sessionId], buildCodexEnv(provider), projectState.root, rl);
 
   const linkedSessionId = await maybeLinkLatestSession(
     projectState.root,
@@ -1184,13 +1168,12 @@ async function deleteSpecificSession(rl, target, cwd = process.cwd()) {
     };
   }
 
-  setRawMode(false);
   const exitCode = await runCodex(
     ["delete", "--force", target.sessionId],
     {},
     projectState.root,
+    rl,
   );
-  setRawMode(true);
 
   const stillExists = hasOfficialSession(target.sessionId, projectState.root);
   if (exitCode !== 0 || stillExists) {