@childclm/codexx 0.1.2 → 0.1.4

package/package.json

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

package/src/index.js

@@ -144,50 +144,46 @@ 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 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 directVendorParent = path.join(
+  const nativePackageScope = path.join(
     npmRoot,
     "node_modules",
     "@openai",
     "codex",
     "node_modules",
+    "@openai",
   );
-  if (fileExists(directVendorParent)) {
+  if (fileExists(nativePackageScope)) {
     try {
-      const dirs = fs.readdirSync(directVendorParent);
+      const dirs = fs.readdirSync(nativePackageScope);
       for (const dir of dirs) {
-        if (!dir.includes("codex-win32-")) continue;
-        const vendorRoot = path.join(directVendorParent, dir, "vendor");
+        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) {
-          const exePath = path.join(vendorRoot, vendorDir, "bin", "codex.exe");
-          candidates.push(exePath);
+          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()
+    .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);
+
   return [...new Set(candidates)].filter(Boolean);
 }
 
@@ -268,6 +264,30 @@ 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));
 }
@@ -472,23 +492,63 @@ function hasOfficialSession(sessionId, projectRoot) {
 
 function buildCodexEnv(provider) {
   return {
+    CODEXX_PROVIDER_API_KEY: provider.apiKey,
     OPENAI_API_KEY: provider.apiKey,
     OPENAI_BASE_URL: provider.baseUrl || process.env.OPENAI_BASE_URL,
   };
 }
 
-function runCodex(args, env, cwd = process.cwd()) {
+function tomlString(value) {
+  return JSON.stringify(String(value));
+}
+
+function buildCodexProviderArgs(provider) {
+  if (!provider || !provider.baseUrl) return [];
+
+  const providerKey = "codexx";
+  const providerDisplayName = provider.modelProvider || "OpenAI";
+  return [
+    "-c",
+    `model_provider=${tomlString(providerKey)}`,
+    "-c",
+    `model_providers.${providerKey}.name=${tomlString(providerDisplayName)}`,
+    "-c",
+    `model_providers.${providerKey}.base_url=${tomlString(provider.baseUrl)}`,
+    "-c",
+    `model_providers.${providerKey}.wire_api=${tomlString("responses")}`,
+    "-c",
+    `model_providers.${providerKey}.requires_openai_auth=false`,
+    "-c",
+    `model_providers.${providerKey}.env_key=${tomlString("CODEXX_PROVIDER_API_KEY")}`,
+  ];
+}
+
+function runCodex(args, env, cwd = process.cwd(), rl = null, provider = null) {
   return new Promise((resolve, reject) => {
     const cmd = resolveCodexCommand();
-    const launch = buildCodexLaunch(cmd, args);
-    const child = spawn(launch.command, launch.args, {
-      cwd,
-      stdio: "inherit",
-      env: { ...process.env, ...env },
-      shell: launch.shell,
-    });
-    child.on("error", reject);
-    child.on("exit", (code) => resolve(code ?? 0));
+    const launch = buildCodexLaunch(
+      cmd,
+      [...buildCodexProviderArgs(provider), ...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);
+    }
   });
 }
 
@@ -848,10 +908,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, provider);
 
   const linkedSessionId = await maybeLinkLatestSession(
     projectState.root,
@@ -939,9 +997,13 @@ 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,
+    provider,
+  );
 }
 
 async function pickSessionAndResume(rl, cwd = process.cwd()) {
@@ -1087,10 +1149,14 @@ 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,
+    provider,
+  );
 
   const linkedSessionId = await maybeLinkLatestSession(
     projectState.root,
@@ -1143,13 +1209,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) {