npm - @bitkyc08/opencodex - Versions diffs - 2.5.5-preview.2 → 2.5.6 - Mend

@bitkyc08/opencodex 2.5.5-preview.2 → 2.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/README.ko.md +6 -10
package/README.md +9 -10
package/README.zh-CN.md +6 -10
package/bin/ocx.mjs +85 -0
package/gui/dist/assets/index-CKqUwc02.css +1 -0
package/gui/dist/assets/index-CSUvRNAX.js +9 -0
package/gui/dist/index.html +2 -2
package/package.json +9 -4
package/src/bun-runtime.ts +64 -0
package/src/cli.ts +19 -4
package/src/codex-auth-api.ts +11 -11
package/src/codex-auth-collision.ts +14 -21
package/src/codex-inject.ts +5 -3
package/src/codex-journal.ts +63 -0
package/src/codex-shim.ts +9 -1
package/src/ports.ts +7 -0
package/src/router.ts +42 -5
package/src/server.ts +26 -6
package/src/service.ts +10 -2
package/src/update.ts +13 -5
package/gui/dist/assets/index-CJF4_jax.css +0 -1
package/gui/dist/assets/index-mmIPacc3.js +0 -9

package/gui/dist/index.html CHANGED Viewed

@@ -16,8 +16,8 @@
         } catch (e) {}
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-mmIPacc3.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CJF4_jax.css">
+    <script type="module" crossorigin src="/assets/index-CSUvRNAX.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CKqUwc02.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,22 +1,26 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "2.5.5-preview.2",
+  "version": "2.5.6",
   "description": "Universal provider proxy for OpenAI Codex — use any LLM with Codex CLI/App/SDK",
   "type": "module",
   "main": "src/index.ts",
   "bin": {
-    "opencodex": "./src/cli.ts",
-    "ocx": "./src/cli.ts"
+    "opencodex": "./bin/ocx.mjs",
+    "ocx": "./bin/ocx.mjs"
   },
   "files": [
+    "bin",
     "src",
     "gui/dist",
     "README.md",
     "LICENSE"
   ],
   "engines": {
-    "bun": ">=1.1.0"
+    "node": ">=18"
   },
+  "trustedDependencies": [
+    "bun"
+  ],
   "scripts": {
     "dev": "bun run src/cli.ts start",
     "start": "bun run src/cli.ts start",
@@ -30,6 +34,7 @@
     "release:watch": "bun scripts/release.ts watch"
   },
   "dependencies": {
+    "bun": "1.3.14",
     "zod": "^4.0.0"
   },
   "devDependencies": {

package/src/bun-runtime.ts ADDED Viewed

@@ -0,0 +1,64 @@
+/**
+ * Bundled Bun runtime resolution.
+ *
+ * opencodex ships the Bun runtime via the `bun` npm dependency (esbuild-style:
+ * a tiny main package + platform-specific `@oven/bun-*` optionalDependencies,
+ * finalized by the package's own postinstall `node install.js`). The npm `bin`
+ * launcher (bin/ocx.mjs) and the durable service/shim integrations both need a
+ * stable path to that binary. This module is the single source of truth.
+ *
+ * In a from-source dev checkout the `bun` dependency may be absent; callers fall
+ * back to `process.execPath` (which is itself Bun when run via `bun src/cli.ts`).
+ */
+import { createRequire } from "node:module";
+import { existsSync, statSync } from "node:fs";
+import { dirname, join } from "node:path";
+const require = createRequire(import.meta.url);
+// The `bun` package leaves a tiny ASCII placeholder at bin/bun.exe until its
+// postinstall downloads the real ~60MB binary; reject the stub by size so we
+// never bake a non-executable path into durable artifacts.
+const REAL_BUN_MIN_BYTES = 1_000_000;
+/**
+ * True only for a real, downloaded Bun binary — not the ~450-byte ASCII
+ * placeholder stub left by `--ignore-scripts` / pnpm. A size gate cleanly
+ * separates the two on every platform (real binary is tens of MB).
+ */
+export function isRealBunBinary(path: string): boolean {
+  try {
+    return existsSync(path) && statSync(path).size >= REAL_BUN_MIN_BYTES;
+  } catch {
+    return false;
+  }
+}
+/**
+ * Absolute path to the bundled Bun binary, or null if the `bun` dependency is
+ * not installed/resolvable (or only the un-downloaded placeholder is present).
+ * The npm `bun` package ships the binary as `bin/bun.exe` on every platform;
+ * we also probe `bin/bun` for forward compatibility.
+ */
+export function bundledBunPath(): string | null {
+  try {
+    const bunDir = dirname(require.resolve("bun/package.json"));
+    for (const name of ["bun.exe", "bun"]) {
+      const p = join(bunDir, "bin", name);
+      if (isRealBunBinary(p)) return p;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+/**
+ * Bun path to bake into durable artifacts (launchd/systemd/Task Scheduler and
+ * the Codex auto-start shim). Prefer the bundled binary — it lives under the
+ * npm global prefix and survives across `ocx update` — and fall back to the
+ * current runtime, which is Bun when launched normally.
+ */
+export function durableBunPath(): string {
+  return bundledBunPath() ?? process.execPath;
+}

package/src/cli.ts CHANGED Viewed

@@ -3,8 +3,9 @@ import { execFileSync, spawn } from "node:child_process";
 import { rmSync } from "node:fs";
 import { restoreNativeCodex } from "./codex-inject";
 import { restoreLegacyOpenaiHistory } from "./codex-history-provider";
+import { writeJournal, reconcileJournal } from "./codex-journal";
 import { codexAutoStartEnabled, getConfigDir, getConfigPath, loadConfig, readPid, removePid, saveConfig, writePid } from "./config";
-import { findAvailablePort } from "./ports";
+import { findAvailablePort, shouldPersistSelectedPort } from "./ports";
 import { serviceCommand, serviceStatusSummary, stopServiceIfInstalled, uninstallServiceIfInstalled } from "./service";
 import { drainAndShutdown, startServer } from "./server";
 import { maybeShowStarPrompt } from "./star-prompt";
@@ -176,7 +177,7 @@ async function chooseListenPort(requestedPort?: number): Promise<number> {
   if (selected !== preferred) {
     console.log(`⚠️  Port ${preferred} is busy; starting opencodex on ${selected}.`);
   }
-  if (config.port !== selected) {
+  if (shouldPersistSelectedPort(config.port, selected, preferred)) {
     config.port = selected;
     saveConfig(config);
   }
@@ -184,6 +185,7 @@ async function chooseListenPort(requestedPort?: number): Promise<number> {
 }
 async function handleStart(options: { block?: boolean } = {}) {
+  reconcileJournal();
   const existingPid = readPid();
   if (existingPid) {
     const config = loadConfig();
@@ -199,20 +201,30 @@ async function handleStart(options: { block?: boolean } = {}) {
   const server = startServer(port);
   writePid(process.pid);
+  writeJournal();
   const config = loadConfig();
+  let cleaned = false;
+  const syncCleanup = () => {
+    if (cleaned) return;
+    cleaned = true;
+    removePid(process.pid);
+    if (!process.env.OCX_SERVICE) { try { restoreNativeCodex(); } catch { /* best-effort restore */ } }
+  };
   const shutdown = () => {
     console.log("\n🛑 Shutting down opencodex proxy...");
     void (async () => {
       await drainAndShutdown(server, config.shutdownTimeoutMs ?? 5000);
-      removePid(process.pid);
-      if (!process.env.OCX_SERVICE) { try { restoreNativeCodex(); } catch { /* best-effort restore */ } }
+      syncCleanup();
       process.exit(0);
     })();
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
+  process.on("exit", syncCleanup);
   await maybeShowStarPrompt(); // once-only [Y/n] GitHub-star prompt on first interactive start
   await syncModelsToCodex(port).catch(() => {});
@@ -223,6 +235,7 @@ async function handleStart(options: { block?: boolean } = {}) {
 }
 async function handleEnsure() {
+  reconcileJournal();
   let config = loadConfig();
   if (!codexAutoStartEnabled(config)) {
     console.log("Codex autostart is disabled.");
@@ -239,6 +252,7 @@ async function handleEnsure() {
   const child = spawn(process.execPath, [process.argv[1], "start"], {
     detached: true,
     stdio: "ignore",
+    windowsHide: true,
     env: { ...process.env, OCX_SERVICE: "1" },
   });
   child.unref();
@@ -489,6 +503,7 @@ switch (command) {
       const child = spawn(process.execPath, [process.argv[1], "start"], {
         detached: true,
         stdio: "ignore",
+        windowsHide: true,
         env: process.env,
       });
       child.unref();

package/src/codex-auth-api.ts CHANGED Viewed

@@ -214,9 +214,9 @@ export async function handleCodexAuthAPI(
     if (accounts.some(a => a.id === body.id) || getCodexAccountCredential(body.id)) {
       return jsonResponse({ error: `Account id already exists: ${body.id}` }, 400);
     }
-    // 1.1: JWT-derived account ID is authoritative; collision check
+    // 1.1: Duplicate check is scoped by personal vs workspace plan bucket.
     const derivedAccountId = extractAccountId(undefined, body.accessToken) ?? body.chatgptAccountId;
-    const collision = checkAccountIdCollision(derivedAccountId, body.email);
+    const collision = checkAccountIdCollision(derivedAccountId, body.email, body.plan);
     if (collision.collision) {
       return jsonResponse({ error: collision.reason }, 400);
     }
@@ -414,7 +414,6 @@ export async function handleCodexAuthAPI(
             const { getCredential } = await import("./oauth/store");
             const cred = getCredential("chatgpt");
             if (cred) {
-              // 1.2: account-ID-based collision check (JWT-derived, not email)
               const oauthAccountId = cred.accountId;
               if (!oauthAccountId) {
                 codexAuthLoginState.set(flowId, {
@@ -425,14 +424,6 @@ export async function handleCodexAuthAPI(
                 completed = true;
                 break;
               }
-              const collision = checkAccountIdCollision(oauthAccountId, cred.email);
-              if (collision.collision) {
-                codexAuthLoginState.set(flowId, {
-                  status: "error", error: collision.reason, doneAt: Date.now(),
-                });
-                completed = true;
-                break;
-              }
               let email = cred.email || accountId;
               let plan: string | undefined;
@@ -450,6 +441,15 @@ export async function handleCodexAuthAPI(
                   quota = parseUsageQuota(data);
                 }
               } catch { /* wham fetch is non-blocking */ }
+              // 1.2: Duplicate check is scoped by personal vs workspace plan bucket.
+              const collision = checkAccountIdCollision(oauthAccountId, email, plan);
+              if (collision.collision) {
+                codexAuthLoginState.set(flowId, {
+                  status: "error", error: collision.reason, doneAt: Date.now(),
+                });
+                completed = true;
+                break;
+              }
               saveCodexAccountCredential(accountId, {
                 accessToken: cred.access,

package/src/codex-auth-collision.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import os from "node:os";
-import { getCodexAccountCredential, listCodexAccountIds } from "./codex-account-store";
+import { getCodexAccountCredential } from "./codex-account-store";
 import { loadConfig } from "./config";
-import { extractAccountId, extractEmail } from "./oauth/chatgpt";
+import { extractAccountId } from "./oauth/chatgpt";
 export function readCodexTokens(): { access_token: string; account_id: string; id_token?: string } | null {
   try {
@@ -28,38 +28,31 @@ export function getMainChatgptAccountId(): string | null {
   return extractAccountId(tokens.id_token, tokens.access_token) ?? (tokens.account_id || null);
 }
-function getMainChatgptEmail(): string | null {
-  const tokens = readCodexTokens();
-  if (!tokens) return null;
-  return extractEmail(tokens.id_token, tokens.access_token) ?? null;
-}
 function normalizedEmail(email: string | undefined | null): string | null {
   const trimmed = email?.trim().toLowerCase();
   return trimmed || null;
 }
-function poolEmailForId(id: string): string | null {
-  const account = (loadConfig().codexAccounts ?? []).find(a => a.id === id);
-  return normalizedEmail(account?.email);
+function isWorkspacePlan(plan: string | undefined | null): boolean {
+  return !!plan && /team|business|enterprise|workspace|edu/i.test(plan);
 }
-// Business/Team members can share chatgpt_account_id, so require email match too.
+// Personal and workspace subscriptions are separate duplicate buckets.
+// Within each bucket, keep the original ChatGPT account id + email collision guard.
 export function checkAccountIdCollision(
   chatgptAccountId: string,
   email?: string | null,
+  plan?: string | null,
 ): { collision: true; reason: string } | { collision: false } {
   const candidateEmail = normalizedEmail(email);
-  const mainId = getMainChatgptAccountId();
-  const mainEmail = getMainChatgptEmail();
-  if (mainId && mainId === chatgptAccountId && (!candidateEmail || !mainEmail || mainEmail === candidateEmail)) {
-    return { collision: true, reason: "This account is your main Codex login. Use a different account for the pool." };
-  }
-  for (const poolId of listCodexAccountIds()) {
-    const cred = getCodexAccountCredential(poolId);
-    const poolEmail = poolEmailForId(poolId);
+  const candidateWorkspace = isWorkspacePlan(plan);
+  for (const account of loadConfig().codexAccounts ?? []) {
+    if (account.isMain) continue;
+    if (isWorkspacePlan(account.plan) !== candidateWorkspace) continue;
+    const cred = getCodexAccountCredential(account.id);
+    const poolEmail = normalizedEmail(account.email);
     if (cred && cred.chatgptAccountId === chatgptAccountId && (!candidateEmail || !poolEmail || poolEmail === candidateEmail)) {
-      return { collision: true, reason: `Account is already in the pool (${poolId}).` };
+      return { collision: true, reason: `Account is already in the pool (${account.id}).` };
     }
   }
   return { collision: false };

package/src/codex-inject.ts CHANGED Viewed

@@ -1,5 +1,6 @@
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, unlinkSync } from "node:fs";
 import { atomicWriteFile, websocketsEnabled } from "./config";
+import { removeJournal } from "./codex-journal";
 import { restoreCodexCatalog } from "./codex-catalog";
 import { syncCodexHistoryProvider } from "./codex-history-provider";
 import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH, DEFAULT_CATALOG_PATH, parseTomlString, readRootTomlString, resolveCodexConfigPath, tomlString } from "./codex-paths";
@@ -242,8 +243,8 @@ export async function injectCodexConfig(port: number, config?: OcxConfig, option
   // 2) Provider table appended at EOF (position-independent).
   content = content.trimEnd() + "\n" + buildProviderTableBlock(port, websocketsEnabled(config ?? {}));
-  writeFileSync(CODEX_CONFIG_PATH, content, "utf-8");
-  writeFileSync(CODEX_PROFILE_PATH, buildProfileFile(port, catalogPath), "utf-8");
+  atomicWriteFile(CODEX_CONFIG_PATH, content);
+  atomicWriteFile(CODEX_PROFILE_PATH, buildProfileFile(port, catalogPath));
   const history = config?.syncResumeHistory !== false
     ? syncCodexHistoryProvider("opencodex")
     : { rows: 0, files: 0 };
@@ -336,6 +337,7 @@ export function restoreNativeCodex(): { success: boolean; message: string } {
   const cfg = removeCodexConfig();
   const cat = restoreCodexCatalog();
   const history = syncCodexHistoryProvider("openai");
+  removeJournal();
   const msg = cat.removed > 0
     ? `${cfg.message} Catalog restored to ${cat.kept} native model(s) (dropped ${cat.removed} proxy-routed).`
     : cfg.message;

package/src/codex-journal.ts ADDED Viewed

@@ -0,0 +1,63 @@
+import { existsSync, readFileSync, unlinkSync } from "node:fs";
+import { join } from "node:path";
+import { atomicWriteFile } from "./config";
+import { CODEX_HOME, CODEX_CONFIG_PATH, CODEX_PROFILE_PATH } from "./codex-paths";
+const JOURNAL_PATH = join(CODEX_HOME, "opencodex-journal.json");
+interface Journal {
+  version: 1;
+  originalConfig: string;
+  originalProfile: string | null;
+  pid: number;
+  timestamp: string;
+}
+export function writeJournal(): void {
+  if (!existsSync(CODEX_CONFIG_PATH)) return;
+  const config = readFileSync(CODEX_CONFIG_PATH, "utf-8");
+  const profile = existsSync(CODEX_PROFILE_PATH)
+    ? readFileSync(CODEX_PROFILE_PATH, "utf-8")
+    : null;
+  const journal: Journal = {
+    version: 1,
+    originalConfig: Buffer.from(config).toString("base64"),
+    originalProfile: profile ? Buffer.from(profile).toString("base64") : null,
+    pid: process.pid,
+    timestamp: new Date().toISOString(),
+  };
+  atomicWriteFile(JOURNAL_PATH, JSON.stringify(journal));
+}
+export function removeJournal(): void {
+  try { unlinkSync(JOURNAL_PATH); } catch { /* ignore */ }
+}
+export function reconcileJournal(): boolean {
+  if (!existsSync(JOURNAL_PATH)) return false;
+  let journal: Journal;
+  try {
+    journal = JSON.parse(readFileSync(JOURNAL_PATH, "utf-8"));
+    if (journal.version !== 1) throw new Error("unknown version");
+  } catch {
+    removeJournal();
+    return false;
+  }
+  try {
+    process.kill(journal.pid, 0);
+    return false;
+  } catch (e: unknown) {
+    if ((e as NodeJS.ErrnoException).code === "EPERM") {
+      return false;
+    }
+  }
+  atomicWriteFile(CODEX_CONFIG_PATH, Buffer.from(journal.originalConfig, "base64").toString("utf-8"));
+  if (journal.originalProfile !== null) {
+    atomicWriteFile(CODEX_PROFILE_PATH, Buffer.from(journal.originalProfile, "base64").toString("utf-8"));
+  } else if (existsSync(CODEX_PROFILE_PATH)) {
+    try { unlinkSync(CODEX_PROFILE_PATH); } catch { /* ignore */ }
+  }
+  removeJournal();
+  console.error(`⚠️  Previous session (PID ${journal.pid}) did not shut down cleanly. Codex config restored from journal.`);
+  return true;
+}

package/src/codex-shim.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { delimiter, dirname, extname, join } from "node:path";
 import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { getConfigDir } from "./config";
+import { durableBunPath } from "./bun-runtime";
 const SHIM_MARKER = "opencodex codex autostart shim";
 const CODEX_INTERNAL_COMMANDS = [
@@ -43,7 +44,9 @@ interface ShimFileState {
 }
 function cliEntry(): { bun: string; cli: string } {
-  return { bun: process.execPath, cli: join(import.meta.dir, "cli.ts") };
+  // Bundled Bun path (survives `ocx update`); all three shim builders
+  // (Unix / Windows cmd / Windows PowerShell) receive it via this entry.
+  return { bun: durableBunPath(), cli: join(import.meta.dir, "cli.ts") };
 }
 function commandNames(name: string): string[] {
@@ -291,6 +294,11 @@ export function uninstallCodexShim(): { removed: boolean; message: string } {
   return { removed: true, message: `Codex autostart shim removed. Restored ${files.map(f => f.originalPath).join(", ")}.` };
 }
+/** True if a Codex autostart shim is currently installed (state file present). */
+export function isCodexShimInstalled(): boolean {
+  return readState() !== null;
+}
 export function codexShimStatus(): string {
   const state = readState();
   if (!state) return "Codex autostart shim is not installed.";

package/src/ports.ts CHANGED Viewed

@@ -28,3 +28,10 @@ export async function findAvailablePort(preferredPort: number, hostname = "127.0
   });
 }
+export function shouldPersistSelectedPort(
+  configPort: number | undefined,
+  selectedPort: number,
+  preferredPort: number,
+): boolean {
+  return selectedPort === preferredPort && configPort !== selectedPort;
+}

package/src/router.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { OcxConfig, OcxProviderConfig } from "./types";
 import { resolveEnvValue } from "./config";
+import { PROVIDER_REGISTRY } from "./providers/registry";
 interface RouteResult {
   providerName: string;
@@ -19,6 +20,42 @@ const MODEL_PROVIDER_PATTERNS: Record<string, string[]> = {
   ],
 };
+// Merge registry-default effort maps under user values so persisted built-in provider configs
+// that predate reasoningEffortMap/modelReasoningEffortMap still get correct wire translations
+// (e.g. ollama-cloud xhigh -> max) without a disk migration. User overrides win per-key.
+function mergeRecord(
+  seed: Record<string, string> | undefined,
+  user: Record<string, string> | undefined,
+): Record<string, string> | undefined {
+  if (!seed && !user) return undefined;
+  return { ...(seed ?? {}), ...(user ?? {}) };
+}
+function mergeNestedRecord(
+  seed: Record<string, Record<string, string>> | undefined,
+  user: Record<string, Record<string, string>> | undefined,
+): Record<string, Record<string, string>> | undefined {
+  if (!seed && !user) return undefined;
+  const out: Record<string, Record<string, string>> = {};
+  for (const [key, value] of Object.entries(seed ?? {})) out[key] = { ...value };
+  for (const [key, value] of Object.entries(user ?? {})) out[key] = { ...(out[key] ?? {}), ...value };
+  return out;
+}
+function routedProviderConfig(providerName: string, provider: OcxProviderConfig): OcxProviderConfig {
+  const registryEntry = PROVIDER_REGISTRY.find(entry => entry.id === providerName);
+  if (!registryEntry) return { ...provider, apiKey: resolveEnvValue(provider.apiKey) };
+  const reasoningEffortMap = mergeRecord(registryEntry.reasoningEffortMap, provider.reasoningEffortMap);
+  const modelReasoningEffortMap = mergeNestedRecord(registryEntry.modelReasoningEffortMap, provider.modelReasoningEffortMap);
+  return {
+    ...provider,
+    apiKey: resolveEnvValue(provider.apiKey),
+    ...(reasoningEffortMap ? { reasoningEffortMap } : {}),
+    ...(modelReasoningEffortMap ? { modelReasoningEffortMap } : {}),
+  };
+}
 export function routeModel(config: OcxConfig, modelId: string): RouteResult {
   // 0. Explicit "<provider>/<model>" namespace (e.g. "opencode-go/deepseek-v4-pro").
   //    Only triggers when the prefix matches a CONFIGURED provider, so genuine
@@ -31,7 +68,7 @@ export function routeModel(config: OcxConfig, modelId: string): RouteResult {
     if (prov) {
       return {
         providerName: provName,
-        provider: { ...prov, apiKey: resolveEnvValue(prov.apiKey) },
+        provider: routedProviderConfig(provName, prov),
         modelId: modelId.slice(slash + 1),
       };
     }
@@ -41,7 +78,7 @@ export function routeModel(config: OcxConfig, modelId: string): RouteResult {
     if (prov.defaultModel === modelId) {
       return {
         providerName: provName,
-        provider: { ...prov, apiKey: resolveEnvValue(prov.apiKey) },
+        provider: routedProviderConfig(provName, prov),
         modelId,
       };
     }
@@ -51,7 +88,7 @@ export function routeModel(config: OcxConfig, modelId: string): RouteResult {
     if (prov.models && Array.isArray(prov.models) && (prov.models as string[]).includes(modelId)) {
       return {
         providerName: provName,
-        provider: { ...prov, apiKey: resolveEnvValue(prov.apiKey) },
+        provider: routedProviderConfig(provName, prov),
         modelId,
       };
     }
@@ -66,7 +103,7 @@ export function routeModel(config: OcxConfig, modelId: string): RouteResult {
         const [provName, prov] = matchingProvider;
         return {
           providerName: provName,
-          provider: { ...prov, apiKey: resolveEnvValue(prov.apiKey) },
+          provider: routedProviderConfig(provName, prov),
           modelId,
         };
       }
@@ -77,7 +114,7 @@ export function routeModel(config: OcxConfig, modelId: string): RouteResult {
   if (defaultProv) {
     return {
       providerName: config.defaultProvider,
-      provider: { ...defaultProv, apiKey: resolveEnvValue(defaultProv.apiKey) },
+      provider: routedProviderConfig(config.defaultProvider, defaultProv),
       modelId,
     };
   }

package/src/server.ts CHANGED Viewed

@@ -144,17 +144,16 @@ function findGuiDist(): string | null {
   return null;
 }
-const GUI_DIST = findGuiDist();
 function serveGuiFile(pathname: string): Response | null {
-  if (!GUI_DIST) return null;
+  const guiDist = findGuiDist();
+  if (!guiDist) return null;
   const filePath = pathname === "/" || pathname === ""
-    ? join(GUI_DIST, "index.html")
-    : join(GUI_DIST, pathname);
+    ? join(guiDist, "index.html")
+    : join(guiDist, pathname);
   if (!existsSync(filePath)) {
     if (!extname(pathname)) {
-      const indexPath = join(GUI_DIST, "index.html");
+      const indexPath = join(guiDist, "index.html");
       if (existsSync(indexPath)) {
         return new Response(Bun.file(indexPath), {
           headers: { "Content-Type": "text/html" },
@@ -171,6 +170,24 @@ function serveGuiFile(pathname: string): Response | null {
   });
 }
+export function rootFallbackPayload() {
+  return {
+    status: "ok",
+    service: "opencodex",
+    version: VERSION,
+    dashboard: {
+      available: false,
+      reason: "GUI build not found. Run `bun run build:gui` from the opencodex repo, or use `ocx gui` from a packaged install.",
+    },
+    endpoints: {
+      health: "/healthz",
+      models: "/v1/models",
+      responses: "/v1/responses",
+      management: "/api/*",
+    },
+  };
+}
 const ANTHROPIC_WIRE_MODELS: Record<string, Set<string>> = {
   "opencode-go": new Set(["minimax-m2.5", "minimax-m2.7", "minimax-m3", "qwen3.5-plus", "qwen3.6-plus", "qwen3.7-max", "qwen3.7-plus"]),
 };
@@ -1290,6 +1307,9 @@ export function startServer(port?: number) {
       const guiFile = serveGuiFile(url.pathname);
       if (guiFile) return guiFile;
+      if (url.pathname === "/" && req.method === "GET") {
+        return jsonResponse(rootFallbackPayload());
+      }
       return formatErrorResponse(404, "not_found", `Unknown endpoint: ${req.method} ${url.pathname}`);
     },

package/src/service.ts CHANGED Viewed

@@ -11,13 +11,16 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { getConfigDir } from "./config";
 import { restoreNativeCodex } from "./codex-inject";
+import { durableBunPath } from "./bun-runtime";
 const LABEL = "com.opencodex.proxy";
 const TASK = "opencodex-proxy";
 function cliEntry(): { bun: string; cli: string } {
-  // process.execPath = the bun binary; cli.ts sits next to this module.
-  return { bun: process.execPath, cli: join(import.meta.dir, "cli.ts") };
+  // Bake the bundled Bun (npm global prefix, survives `ocx update`) rather than
+  // a transient system Bun, so launchd/systemd/schtasks keep resolving even if a
+  // standalone Bun is later removed. cli.ts sits next to this module.
+  return { bun: durableBunPath(), cli: join(import.meta.dir, "cli.ts") };
 }
 function plistPath(): string {
@@ -300,6 +303,11 @@ export function uninstallServiceIfInstalled(): boolean {
   return false;
 }
+/** True if a background service (launchd/systemd/Task Scheduler) is installed. */
+export function isServiceInstalled(): boolean {
+  return serviceStatusSummary().startsWith("installed");
+}
 export function serviceStatusSummary(): string {
   if (process.platform === "darwin") {
     if (!existsSync(plistPath())) return "not installed";

package/src/update.ts CHANGED Viewed

@@ -57,15 +57,23 @@ export async function runUpdate(): Promise<void> {
   const r = spawnSync(bin, cmdArgs, { stdio: "inherit", timeout: 180000, windowsHide: true });
   if (r.status === 0) {
     console.log(`\n✅ Updated${latest ? ` to v${latest}` : ""}.`);
-    if (process.platform === "win32") {
-      try {
-        const { installCodexShim } = await import("./codex-shim");
+    // Re-bake the bundled Bun path into the Codex autostart shim on every
+    // platform when one is installed (refresh-only; never installs fresh).
+    try {
+      const { isCodexShimInstalled, installCodexShim } = await import("./codex-shim");
+      if (isCodexShimInstalled()) {
         const result = installCodexShim();
         if (result.installed) console.log(`🔧 ${result.message}`);
-      } catch (e) {
-        console.warn(`⚠️  Shim repair skipped: ${e instanceof Error ? e.message : e}`);
       }
+    } catch (e) {
+      console.warn(`⚠️  Shim repair skipped: ${e instanceof Error ? e.message : e}`);
     }
+    // The launchd/systemd/Task Scheduler service bakes an absolute Bun path;
+    // advise refreshing it (reinstall is heavier, so we don't auto-run it).
+    try {
+      const { isServiceInstalled } = await import("./service");
+      if (isServiceInstalled()) console.log("Service detected — refresh its baked path:  ocx service install");
+    } catch { /* best-effort advisory */ }
     console.log("Restart the proxy:  ocx stop && ocx start");
   } else {
     console.error(`\n⚠️  Update failed (${bin} exit ${r.status ?? "?"}). Try manually:  ${bin} ${cmdArgs.join(" ")}`);