@4yi-dev/cli 0.1.12 → 0.1.13

package/README.md

@@ -38,6 +38,10 @@ On macOS, `4yi connect claude` also configures an installed Claude Desktop throu
 
 `--scope project` changes only the project's Claude Code settings and never changes the global Claude Desktop profile.
 
+Codex CLI and Codex App share the same Codex home on native Windows (`%USERPROFILE%\\.codex`). After `4yi connect codex`, finish active App tasks, fully quit and reopen the App, and start a new chat so its embedded Codex process loads the new provider. Microsoft Store/AppX installations may not expose a conventional executable path, but that detection does not gate the shared configuration update.
+
+The Codex provider uses the official command-backed authentication configuration. Its helper reads the current token from `~/.4yi/config.json`; `config.toml` and the model catalog do not contain the bearer token.
+
 For local development:
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4yi-dev/cli",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "4YI command-line launcher for OAuth login and OpenCode runtime",
   "type": "module",
   "bin": {

package/src/connect.mjs

@@ -65,6 +65,7 @@ export function connectionPaths({
     claudeProject: path.join(cwd, ".claude", "settings.local.json"),
     codexConfig: path.join(codexDir, "config.toml"),
     codexCatalog: path.join(codexDir, "model-catalogs", "4yi.json"),
+    codexCredentialHelper: path.join(home, ".4yi", "helpers", "codex-credential.mjs"),
   };
   if (platform === "darwin") {
     const desktopDir = path.join(home, "Library", "Application Support", "Claude-3p");
@@ -154,17 +155,37 @@ async function ensureToolCli(target, {
 function desktopAppCandidates(target, { home = os.homedir(), platform = process.platform, env = process.env } = {}) {
   const appName = target === "claude" ? "Claude" : "Codex";
   if (platform === "darwin") {
-    return [
+    const candidates = [
       path.join("/Applications", `${appName}.app`),
       path.join(home, "Applications", `${appName}.app`),
     ];
+    if (target === "codex") {
+      candidates.push(
+        path.join("/Applications", "ChatGPT.app"),
+        path.join(home, "Applications", "ChatGPT.app"),
+      );
+    }
+    return candidates;
   }
   if (platform === "win32") {
-    const localAppData = env.LOCALAPPDATA || path.join(home, "AppData", "Local");
-    return [
-      path.join(localAppData, "Programs", appName, `${appName}.exe`),
-      path.join(localAppData, appName, `${appName}.exe`),
+    const localAppData = env.LOCALAPPDATA || path.win32.join(home, "AppData", "Local");
+    const candidates = [
+      path.win32.join(localAppData, "Programs", appName, `${appName}.exe`),
+      path.win32.join(localAppData, appName, `${appName}.exe`),
     ];
+    if (target === "codex") {
+      // Microsoft Store/AppX builds keep their mutable runtime under this
+      // directory and commonly expose only an execution alias in WindowsApps.
+      // Checking both covers the Store build without traversing the protected
+      // C:\Program Files\WindowsApps package directory.
+      candidates.push(
+        path.win32.join(localAppData, "OpenAI", "Codex"),
+        path.win32.join(localAppData, "OpenAI", "ChatGPT"),
+        path.win32.join(localAppData, "Microsoft", "WindowsApps", "Codex.exe"),
+        path.win32.join(localAppData, "Microsoft", "WindowsApps", "ChatGPT.exe"),
+      );
+    }
+    return candidates;
   }
   return [];
 }
@@ -179,6 +200,14 @@ function reportDesktopApp(target, {
   const meta = TOOL_METADATA[target];
   const candidates = desktopAppCandidates(target, { home, platform, env });
   const detected = candidates.some((candidate) => exists(candidate));
+  if (target === "codex" && platform === "win32") {
+    if (detected) {
+      stdout("Codex App detected. 4YI updated the shared Windows Codex home. Finish active tasks, fully quit and reopen the App, then start a new chat to load the new provider.");
+    } else {
+      stdout("4YI updated the shared Windows Codex home. A Microsoft Store/AppX install may not expose a standard executable path; finish active tasks, fully quit and reopen any running Codex App, then start a new chat.");
+    }
+    return detected;
+  }
   if (detected) {
     stdout(`${meta.appLabel} detected. Quit and reopen it to use the new connection.`);
   } else if (candidates.length > 0) {
@@ -268,6 +297,25 @@ printf '%s' "$token"
 `;
 }
 
+function codexCredentialHelper() {
+  return `#!/usr/bin/env node
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+try {
+  const configFile = path.join(os.homedir(), ".4yi", "config.json");
+  const config = JSON.parse(fs.readFileSync(configFile, "utf8"));
+  const token = typeof config.token === "string" ? config.token.trim() : "";
+  if (!token) throw new Error("4YI session is missing a token.");
+  process.stdout.write(token);
+} catch (error) {
+  process.stderr.write((error.message || "4YI session is invalid.") + " Run: 4yi login\\n");
+  process.exit(1);
+}
+`;
+}
+
 function configureClaudeDesktop({
   home,
   claudeBaseUrl,
@@ -494,7 +542,8 @@ async function checkCodex(session, codexBaseUrl, model) {
 }
 
 async function connectCodex({ session, home, codexHome, codexBaseUrl, stdout, skipCheck = false, tooling = {} }) {
-  const paths = connectionPaths({ home, codexHome });
+  const platform = tooling.platform || process.platform;
+  const paths = connectionPaths({ home, codexHome, platform });
   const { models, defaultModel } = await loadCodexModels(session);
   if (!skipCheck) await checkCodex(session, codexBaseUrl, defaultModel);
   ensureDir(path.dirname(paths.codexConfig));
@@ -502,17 +551,26 @@ async function connectCodex({ session, home, codexHome, codexBaseUrl, stdout, sk
   const catalog = buildCodexCatalog(models, template);
   atomicWrite(paths.codexCatalog, `${JSON.stringify(catalog, null, 2)}\n`);
 
-  const backup = backupFile("codex", paths.codexConfig, home);
+  const backupGroup = timestamp();
+  const backup = backupFile("codex", paths.codexConfig, home, backupGroup);
+  const helperBackup = backupFile("codex", paths.codexCredentialHelper, home, backupGroup);
   let existing = fs.existsSync(paths.codexConfig) ? fs.readFileSync(paths.codexConfig, "utf8") : "";
   existing = removeManagedBlock(existing, CODEX_ROOT_START, CODEX_ROOT_END);
   existing = removeManagedBlock(existing, CODEX_PROVIDER_START, CODEX_PROVIDER_END);
   existing = removeCodexRootAssignments(existing);
   const root = `${CODEX_ROOT_START}\nmodel = ${JSON.stringify(defaultModel)}\nmodel_provider = "4yi"\nmodel_catalog_json = ${JSON.stringify(paths.codexCatalog)}\n${CODEX_ROOT_END}`;
-  const provider = `${CODEX_PROVIDER_START}\n[model_providers."4yi"]\nname = "4YI Gateway"\nbase_url = ${JSON.stringify(codexBaseUrl.replace(/\/+$/, ""))}\nwire_api = "responses"\nexperimental_bearer_token = ${JSON.stringify(session.token)}\n${CODEX_PROVIDER_END}`;
+  const nodeExecutable = tooling.nodeExecutable || process.execPath;
+  const provider = `${CODEX_PROVIDER_START}\n[model_providers."4yi"]\nname = "4YI Gateway"\nbase_url = ${JSON.stringify(codexBaseUrl.replace(/\/+$/, ""))}\nwire_api = "responses"\n\n[model_providers."4yi".auth]\ncommand = ${JSON.stringify(nodeExecutable)}\nargs = [${JSON.stringify(paths.codexCredentialHelper)}]\ntimeout_ms = 5000\n${CODEX_PROVIDER_END}`;
+  // Codex loads the provider when its process starts. Make the command-backed
+  // credential durable before activating the provider in config.toml, and
+  // never copy the bearer token into Codex-owned files.
+  atomicWrite(paths.codexCredentialHelper, codexCredentialHelper(), 0o700);
   atomicWrite(paths.codexConfig, `${root}\n\n${existing ? `${existing}\n\n` : ""}${provider}\n`);
   stdout(`Connected Codex: ${paths.codexConfig}`);
+  stdout(`Codex credential helper: ${paths.codexCredentialHelper}`);
   stdout(`Available Codex models: ${models.map((model) => model.id).join(", ")}`);
   stdout(`Backup: ${backup}`);
+  stdout(`Backup: ${helperBackup}`);
 }
 
 function resolveUrls(session, options) {
@@ -641,6 +699,7 @@ export const __testing = {
   reportDesktopApp,
   configureClaudeDesktop,
   claudeDesktopCredentialHelper,
+  codexCredentialHelper,
   readClaudeDesktopStatus,
   removeManagedBlock,
   removeCodexRootAssignments,