fix: model store dual index, desktop UI fallback, dynamic port support

- Model store: replace O(n) plan map with dual index (planType→models + modelId→plans), both O(1)
- Desktop UI: fallback to web UI when desktop build missing, add startup path diagnostics
- Server: resolve actual bound port from server.address() to support port=0
- Model fetcher: fix log message (said 5s, actually 1s)
- Update Codex Desktop fingerprint to v26.311.21342 (build 993)

config/default.yaml

@@ -3,8 +3,8 @@ api:
   timeout_seconds: 60
 client:
   originator: Codex Desktop
-  app_version: 26.309.31024
-  build_number: "962"
+  app_version: 26.311.21342
+  build_number: "993"
   platform: darwin
   arch: arm64
   chromium_version: "144"

config/prompts/automation-response.md

@@ -48,4 +48,5 @@ Response MUST end with a remark-directive block.
 - Waiting on user decision:
   - \`::inbox-item{title="Choose API shape for filters" summary="Two options drafted; pick A vs B"}\`
 - Status update with next step:
-  - \`::inbox-item{title="PR comments addressed" summary="Ready for re-review; focus on auth edge case"}\
+  - \`::inbox-item{title="PR comments addressed" summary="Ready for re-review; focus on auth edge case"}\`
+`;

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "codex-proxy",
-  "version": "1.0.28",
+  "version": "1.0.39",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codex-proxy",
-      "version": "1.0.28",
+      "version": "1.0.39",
       "hasInstallScript": true,
       "dependencies": {
         "@hono/node-server": "^1.0.0",

scripts/extract-fingerprint.ts

@@ -123,7 +123,6 @@ function extractFromMainJs(
 ): {
   apiBaseUrl: string | null;
   originator: string | null;
-  models: string[];
   whamEndpoints: string[];
   userAgentContains: string;
 } {
@@ -157,17 +156,6 @@ function extractFromMainJs(
     throw new Error("Failed to extract critical field: originator");
   }
 
-  // Models — deduplicate, use capture group if specified
-  const models: Set<string> = new Set();
-  const modelPattern = patterns.models;
-  if (modelPattern?.pattern) {
-    const re = new RegExp(modelPattern.pattern, "g");
-    const groupIdx = modelPattern.group ?? 0;
-    for (const m of content.matchAll(re)) {
-      models.add(m[groupIdx] ?? m[0]);
-    }
-  }
-
   // WHAM endpoints — deduplicate, use capture group if specified
   const endpoints: Set<string> = new Set();
   const epPattern = patterns.wham_endpoints;
@@ -182,7 +170,6 @@ function extractFromMainJs(
   return {
     apiBaseUrl,
     originator,
-    models: [...models].sort(),
     whamEndpoints: [...endpoints].sort(),
     userAgentContains: "Codex Desktop/",
   };
@@ -440,7 +427,6 @@ async function main() {
   let mainJsResults = {
     apiBaseUrl: null as string | null,
     originator: null as string | null,
-    models: [] as string[],
     whamEndpoints: [] as string[],
     userAgentContains: "Codex Desktop/",
   };
@@ -484,21 +470,10 @@ async function main() {
         const m = mainJs.match(new RegExp(apiPattern.pattern));
         if (m) mainJsResults.apiBaseUrl = m[0];
       }
-      const modelPattern = patterns.main_js.models;
-      if (modelPattern?.pattern) {
-        const re = new RegExp(modelPattern.pattern, "g");
-        const groupIdx = modelPattern.group ?? 0;
-        const modelSet = new Set<string>();
-        for (const m of mainJs.matchAll(re)) {
-          modelSet.add(m[groupIdx] ?? m[0]);
-        }
-        mainJsResults.models = [...modelSet].sort();
-      }
     }
 
     console.log(`  API base URL:  ${mainJsResults.apiBaseUrl}`);
     console.log(`  originator:    ${mainJsResults.originator}`);
-    console.log(`  models:        ${mainJsResults.models.join(", ")}`);
     console.log(`  WHAM endpoints: ${mainJsResults.whamEndpoints.length} found`);
 
     // Extract system prompts
@@ -510,31 +485,6 @@ async function main() {
     console.log(`  automation-response: ${promptResults.automationResponse ? "found" : "NOT FOUND"}`);
   }
 
-  // Scan webview assets for additional model IDs
-  const webviewAssetsDir = join(asarRoot, "webview/assets");
-  if (existsSync(webviewAssetsDir)) {
-    console.log("[extract] Scanning webview assets for additional models...");
-    const modelPattern = patterns.main_js.models;
-    if (modelPattern?.pattern) {
-      const webviewFiles = readdirSync(webviewAssetsDir).filter((f) => f.endsWith(".js"));
-      const webviewModels = new Set<string>();
-      for (const file of webviewFiles) {
-        const content = readFileSync(join(webviewAssetsDir, file), "utf-8");
-        const re = new RegExp(modelPattern.pattern, "g");
-        const groupIdx = modelPattern.group ?? 0;
-        for (const m of content.matchAll(re)) {
-          webviewModels.add(m[groupIdx] ?? m[0]);
-        }
-      }
-      const existingModels = new Set(mainJsResults.models);
-      const newFromWebview = [...webviewModels].filter((m) => !existingModels.has(m));
-      if (newFromWebview.length > 0) {
-        console.log(`[extract] Webview: ${newFromWebview.length} additional models: ${newFromWebview.join(", ")}`);
-        mainJsResults.models = [...mainJsResults.models, ...newFromWebview].sort();
-      }
-    }
-  }
-
   // Save extracted prompts
   const dc = savePrompt("desktop-context", promptResults.desktopContext);
   const tg = savePrompt("title-generation", promptResults.titleGeneration);
@@ -549,7 +499,6 @@ async function main() {
     chromium_version: chromiumVersion,
     api_base_url: mainJsResults.apiBaseUrl,
     originator: mainJsResults.originator,
-    models: mainJsResults.models,
     wham_endpoints: mainJsResults.whamEndpoints,
     user_agent_contains: mainJsResults.userAgentContains,
     sparkle_feed_url: sparkleFeedUrl,

src/index.ts

@@ -132,6 +132,10 @@ export async function startServer(options?: StartOptions): Promise<ServerHandle>
     port,
   });
 
+  // Resolve actual port (may differ from requested when port=0)
+  const addr = server.address();
+  const actualPort = (addr && typeof addr === "object") ? addr.port : port;
+
   const close = (): Promise<void> => {
     return new Promise((resolve) => {
       server.close(() => {
@@ -150,7 +154,7 @@ export async function startServer(options?: StartOptions): Promise<ServerHandle>
   // Register close handler so self-update can attempt graceful shutdown before restart
   setCloseHandler(close);
 
-  return { close, port };
+  return { close, port: actualPort };
 }
 
 // ── CLI entry point ──────────────────────────────────────────────────

src/models/model-fetcher.ts

@@ -89,7 +89,7 @@ export function startModelRefresh(
     }
   }, INITIAL_DELAY_MS);
 
-  console.log("[ModelFetcher] Scheduled initial model fetch in 5s");
+  console.log("[ModelFetcher] Scheduled initial model fetch in 1s");
 }
 
 function scheduleNext(

src/models/model-store.ts

@@ -39,8 +39,10 @@ interface ModelsConfig {
 let _catalog: CodexModelInfo[] = [];
 let _aliases: Record<string, string> = {};
 let _lastFetchTime: string | null = null;
-/** modelId → Set<planType> — tracks which plans can access each model */
-let _modelPlanMap: Map<string, Set<string>> = new Map();
+/** planType → Set<modelId> — write path: bulk replace per plan */
+let _planModelMap: Map<string, Set<string>> = new Map();
+/** modelId → Set<planType> — read path: O(1) lookup for routing */
+let _modelPlanIndex: Map<string, Set<string>> = new Map();
 
 // ── Static loading ─────────────────────────────────────────────────
 
@@ -55,7 +57,8 @@ export function loadStaticModels(configDir?: string): void {
 
   _catalog = (raw.models ?? []).map((m) => ({ ...m, source: "static" as const }));
   _aliases = raw.aliases ?? {};
-  _modelPlanMap = new Map(); // Reset plan map on reload
+  _planModelMap = new Map(); // Reset plan maps on reload
+  _modelPlanIndex = new Map();
   console.log(`[ModelStore] Loaded ${_catalog.length} static models, ${Object.keys(_aliases).length} aliases`);
 }
 
@@ -214,30 +217,34 @@ export function applyBackendModels(backendModels: BackendModelEntry[]): void {
  * Clears old records for this planType, applies merge, then records plan→model mappings.
  */
 export function applyBackendModelsForPlan(planType: string, backendModels: BackendModelEntry[]): void {
-  // Clear old planType records
-  for (const [modelId, plans] of _modelPlanMap) {
-    plans.delete(planType);
-    if (plans.size === 0) _modelPlanMap.delete(modelId);
-  }
-
   // Merge into catalog (existing logic)
   applyBackendModels(backendModels);
 
-  // Record which models this plan can access (only admitted models)
-  const staticIds = new Set(_catalog.map((m) => m.id));
+  // Build new model set for this plan and replace atomically
+  const admittedIds = new Set<string>();
+  const catalogIds = new Set(_catalog.map((m) => m.id));
   for (const raw of backendModels) {
     const id = raw.slug ?? raw.id ?? raw.name ?? "";
-    if (staticIds.has(id) || isCodexCompatibleId(id)) {
-      let plans = _modelPlanMap.get(id);
+    if (catalogIds.has(id) || isCodexCompatibleId(id)) {
+      admittedIds.add(id);
+    }
+  }
+  _planModelMap.set(planType, admittedIds);
+
+  // Rebuild reverse index from scratch (plan types are few, this is cheap)
+  _modelPlanIndex = new Map();
+  for (const [plan, modelIds] of _planModelMap) {
+    for (const id of modelIds) {
+      let plans = _modelPlanIndex.get(id);
       if (!plans) {
         plans = new Set();
-        _modelPlanMap.set(id, plans);
+        _modelPlanIndex.set(id, plans);
       }
-      plans.add(planType);
+      plans.add(plan);
     }
   }
 
-  console.log(`[ModelStore] Plan "${planType}" has ${backendModels.length} backend models, ${_modelPlanMap.size} models tracked across plans`);
+  console.log(`[ModelStore] Plan "${planType}": ${admittedIds.size} admitted models, ${_planModelMap.size} plans tracked`);
 }
 
 /**
@@ -245,7 +252,7 @@ export function applyBackendModelsForPlan(planType: string, backendModels: Backe
  * Empty array means unknown (static-only or not yet fetched).
  */
 export function getModelPlanTypes(modelId: string): string[] {
-  return [...(_modelPlanMap.get(modelId) ?? [])];
+  return [...(_modelPlanIndex.get(modelId) ?? [])];
 }
 
 // ── Model name suffix parsing ───────────────────────────────────────
@@ -360,8 +367,8 @@ export function getModelStoreDebug(): {
 } {
   const backendCount = _catalog.filter((m) => m.source === "backend").length;
   const planMap: Record<string, string[]> = {};
-  for (const [modelId, plans] of _modelPlanMap) {
-    planMap[modelId] = [...plans];
+  for (const [planType, modelIds] of _planModelMap) {
+    planMap[planType] = [...modelIds];
   }
   return {
     totalModels: _catalog.length,

src/routes/web.ts

@@ -19,38 +19,46 @@ export function createWebRoutes(accountPool: AccountPool): Hono {
   const publicDir = getPublicDir();
   const desktopPublicDir = getDesktopPublicDir();
 
+  const desktopIndexPath = resolve(desktopPublicDir, "index.html");
+  const webIndexPath = resolve(publicDir, "index.html");
+  const hasDesktopUI = existsSync(desktopIndexPath);
+  const hasWebUI = existsSync(webIndexPath);
+
+  console.log(`[Web] publicDir: ${publicDir} (exists: ${hasWebUI})`);
+  console.log(`[Web] desktopPublicDir: ${desktopPublicDir} (exists: ${hasDesktopUI})`);
+
   // Serve Vite build assets (web)
   app.use("/assets/*", serveStatic({ root: publicDir }));
 
   app.get("/", (c) => {
     try {
-      const html = readFileSync(resolve(publicDir, "index.html"), "utf-8");
+      const html = readFileSync(webIndexPath, "utf-8");
       return c.html(html);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       console.error(`[Web] Failed to read HTML file: ${msg}`);
-      return c.html("<h1>Codex Proxy</h1><p>UI files not found. Run 'npm/pnpm/bun run build:web' first. The API is still available at /v1/chat/completions</p>");
+      return c.html("<h1>Codex Proxy</h1><p>UI files not found. Run 'npm run build:web' first. The API is still available at /v1/chat/completions</p>");
     }
   });
 
   // Desktop UI — served at /desktop for Electron
-  // Vite builds with base: "/desktop/" so request paths are /desktop/assets/...
-  // but files live at public-desktop/assets/..., so strip the /desktop prefix
-  app.use("/desktop/assets/*", serveStatic({
-    root: desktopPublicDir,
-    rewriteRequestPath: (path) => path.replace(/^\/desktop/, ""),
-  }));
-
-  app.get("/desktop", (c) => {
-    try {
-      const html = readFileSync(resolve(desktopPublicDir, "index.html"), "utf-8");
+  if (hasDesktopUI) {
+    app.use("/desktop/assets/*", serveStatic({
+      root: desktopPublicDir,
+      rewriteRequestPath: (path) => path.replace(/^\/desktop/, ""),
+    }));
+
+    app.get("/desktop", (c) => {
+      const html = readFileSync(desktopIndexPath, "utf-8");
       return c.html(html);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      console.error(`[Web] Failed to read desktop HTML: ${msg}`);
-      return c.html("<h1>Codex Proxy</h1><p>Desktop UI files not found. Run 'npm run build:desktop' first.</p>");
-    }
-  });
+    });
+  } else {
+    // Fallback: redirect /desktop to web UI so the app is still usable
+    app.get("/desktop", (c) => {
+      console.warn(`[Web] Desktop UI not found at ${desktopIndexPath}, falling back to web UI`);
+      return c.redirect("/");
+    });
+  }
 
   app.get("/health", async (c) => {
     const authenticated = accountPool.isAuthenticated();