ima2-gen 3.18.0 → 3.19.0

package/routes/health.js

@@ -1,6 +1,8 @@
 import { abortJob, listJobs, listTerminalJobs } from "../lib/inflight.js";
 import { errInfo } from "../lib/errInfo.js";
 import { loadGrokCredentials } from "../lib/xaiAuth.js";
+import { gptAuthStatus, grokAuthStatus } from "../lib/authStatus.js";
+import { resolveChatgptSession } from "../lib/chatgptAuth.js";
 import { requireRuntimeContext } from "../lib/runtimeContext.js";
 export function registerHealthRoutes(app, ctxRaw) {
     const ctx = requireRuntimeContext(ctxRaw);
@@ -44,27 +46,39 @@ export function registerHealthRoutes(app, ctxRaw) {
             runtime: runtimePorts(),
         });
     });
+    // `auth` is the session verdict (lib/authStatus.ts): account, health, and the action that
+    // fixes it. `status` stays the proxy's live verdict the UI already switches on.
     app.get("/api/oauth/status", async (_req, res) => {
-        if (ctx.oauthReadyState === "starting") {
-            return res.json({ status: "starting", runtime: runtimePorts() });
-        }
-        if (ctx.oauthReadyState === "failed") {
-            return res.json({ status: "offline", runtime: runtimePorts() });
-        }
+        ctx.syncOAuthProxySession?.();
+        const session = resolveChatgptSession();
+        const reply = (status, extra = {}) => res.json({
+            status,
+            ...extra,
+            auth: gptAuthStatus(session, { proxyStatus: status }),
+            grokAuth: grokAuthStatus(loadGrokCredentials(ctx.grokAuthHomeDir)),
+            runtime: runtimePorts(),
+        });
+        // With IMA2_NO_OAUTH_PROXY an external proxy owns its own session; local files say nothing.
+        const missingSession = ctx.config.oauth.autoStart && !session;
+        if (ctx.oauthReadyState === "starting")
+            return reply("starting");
+        // The proxy exits at boot when there is no session file; that is a login problem, not an outage.
+        if (ctx.oauthReadyState === "failed")
+            return reply(missingSession ? "auth_required" : "offline");
         try {
             const r = await fetch(`${ctx.oauthUrl}/v1/models`, {
                 signal: AbortSignal.timeout(ctx.config.oauth.statusTimeoutMs),
             });
             if (r.ok) {
                 const data = (await r.json());
-                res.json({ status: "ready", models: data.data?.map((m) => m.id) || [], runtime: runtimePorts() });
+                reply("ready", { models: data.data?.map((m) => m.id) || [] });
             }
             else {
-                res.json({ status: "auth_required", runtime: runtimePorts() });
+                reply("auth_required");
             }
         }
         catch {
-            res.json({ status: "offline", runtime: runtimePorts() });
+            reply(missingSession ? "auth_required" : "offline");
         }
     });
     app.get("/api/inflight", (req, res) => {

package/routes/quota.js

@@ -3,16 +3,11 @@ import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { fetchNaiSubscription } from "../lib/naiSubscription.js";
+import { readChatgptAccess } from "../lib/chatgptAuth.js";
+/** Same file the GPT OAuth proxy reads (ima2 store first, then Codex CLI files). */
 function readCodexTokens() {
-    const codexHome = process.env.CODEX_HOME || join(homedir(), ".codex");
-    try {
-        const j = JSON.parse(readFileSync(join(codexHome, "auth.json"), "utf8"));
-        if (j?.tokens?.access_token) {
-            return { access_token: j.tokens.access_token, account_id: j.tokens.account_id ?? "" };
-        }
-    }
-    catch { }
-    return null;
+    const access = readChatgptAccess();
+    return access ? { access_token: access.accessToken, account_id: access.accountId } : null;
 }
 async function fetchCodexUsage(tokens) {
     try {

package/server.js

@@ -8,6 +8,7 @@ import { fileURLToPath, pathToFileURL } from "url";
 import { onShutdown } from "./bin/lib/platform.js";
 import { ensureDefaultSession } from "./lib/sessionStore.js";
 import { startOAuthProxy } from "./lib/oauthLauncher.js";
+import { detectCodexAuth } from "./lib/codexDetect.js";
 import { migrateGeneratedStorage } from "./lib/storageMigration.js";
 import { purgeStaleJobs } from "./lib/inflight.js";
 import { configureLogger, logError } from "./lib/logger.js";
@@ -366,9 +367,10 @@ export async function createRuntimeContext(overrides = {}) {
     const openai = overrides.openai ?? await createOpenAI(apiKey);
     const oauthPort = config.oauth.proxyPort;
     let resolveOAuthReady = () => { };
-    const oauthReadyPromise = new Promise((resolve) => {
+    const newOAuthReadyPromise = () => new Promise((resolve) => {
         resolveOAuthReady = resolve;
     });
+    const oauthReadyPromise = newOAuthReadyPromise();
     const ctx = {
         rootDir,
         config,
@@ -418,6 +420,11 @@ export async function createRuntimeContext(overrides = {}) {
             ctx.oauthReadyState = "failed";
             resolveOAuthReady(null);
         },
+        markOAuthStarting: () => {
+            resolveOAuthReady(null);
+            ctx.oauthReadyPromise = newOAuthReadyPromise();
+            ctx.oauthReadyState = "starting";
+        },
     };
     if (!config.oauth.autoStart)
         ctx.markOAuthReady({ url: ctx.oauthUrl, port: ctx.oauthPort });
@@ -444,19 +451,57 @@ export async function startServer(overrides = {}) {
     }
     purgeStaleJobs();
     const app = buildApp(ctx);
-    const oauthChild = overrides.oauthChild !== undefined
+    const launchOAuthProxy = () => startOAuthProxy({
+        oauthPort: ctx.oauthPort,
+        restartDelayMs: ctx.config.oauth.restartDelayMs,
+        onReady: ({ url, port }) => {
+            ctx.markOAuthReady({ url, port });
+            advertise(ctx);
+        },
+        onExit: () => ctx.markOAuthFailed(),
+    });
+    let oauthChild = overrides.oauthChild !== undefined
         ? overrides.oauthChild
         : !ctx.config.oauth.autoStart
             ? null
-            : startOAuthProxy({
-                oauthPort: ctx.oauthPort,
-                restartDelayMs: ctx.config.oauth.restartDelayMs,
-                onReady: ({ url, port }) => {
-                    ctx.markOAuthReady({ url, port });
-                    advertise(ctx);
-                },
-                onExit: () => ctx.markOAuthFailed(),
-            });
+            : launchOAuthProxy();
+    if (overrides.oauthChild === undefined && ctx.config.oauth.autoStart) {
+        // A login (web or CLI) writes a new session file; the running proxy only read the old one
+        // (or none, and exited), so the new session was invisible until a server restart.
+        let restarting = null;
+        ctx.restartOAuthProxy = () => {
+            ctx.markOAuthStarting();
+            if (!restarting) {
+                const previous = oauthChild;
+                restarting = (async () => {
+                    try {
+                        await previous?.stopAndWait?.();
+                    }
+                    catch (error) {
+                        console.error(`[gpt-oauth] restart aborted: ${error.message}`);
+                        ctx.markOAuthFailed();
+                        return;
+                    }
+                    oauthChild = launchOAuthProxy();
+                })().finally(() => { restarting = null; });
+            }
+            return { restarted: true };
+        };
+        // A CLI login (or logout) can change which session file the proxy should read without
+        // being able to reach this server (e.g. a LAN-bound server the CLI cannot authenticate to).
+        // Status polls and generation admission call this to catch up on their own.
+        ctx.syncOAuthProxySession = () => {
+            if (restarting)
+                return false;
+            const wanted = detectCodexAuth({ probe: false }).proxyAuthFile;
+            const launched = oauthChild?.authFile ?? null;
+            if (wanted === launched)
+                return false;
+            console.log(`[gpt-oauth] session file changed (${launched ?? "none"} -> ${wanted ?? "none"}); restarting proxy`);
+            ctx.restartOAuthProxy?.();
+            return true;
+        };
+    }
     if (overrides.oauthChild !== undefined || !ctx.config.oauth.autoStart) {
         ctx.markOAuthReady({ url: ctx.oauthUrl, port: ctx.oauthPort });
     }

package/ui/dist/.vite/manifest.json

@@ -1,6 +1,6 @@
 {
-  "_App-x_fzCXKb.js": {
-    "file": "assets/App-x_fzCXKb.js",
+  "_App-pMN1OjNW.js": {
+    "file": "assets/App-pMN1OjNW.js",
     "name": "App",
     "isDynamicEntry": true,
     "imports": [
@@ -17,7 +17,7 @@
       "src/components/card-news/CardNewsWorkspace.tsx",
       "src/components/agent/AgentWorkspace.tsx",
       "src/components/assets/AssetsWorkspace.tsx",
-      "_AssetGenWorkspace-BIYh26wL.js",
+      "_AssetGenWorkspace-DzEfpUy_.js",
       "src/components/home/HomeWorkspace.tsx",
       "src/components/PromptLibraryPanel.tsx"
     ]
@@ -26,15 +26,15 @@
     "file": "assets/AssetGenWorkspace-B7tTK0Sx.css",
     "src": "_AssetGenWorkspace-B7tTK0Sx.css"
   },
-  "_AssetGenWorkspace-BIYh26wL.js": {
-    "file": "assets/AssetGenWorkspace-BIYh26wL.js",
+  "_AssetGenWorkspace-DzEfpUy_.js": {
+    "file": "assets/AssetGenWorkspace-DzEfpUy_.js",
     "name": "AssetGenWorkspace",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
-      "_AssetMediaLightbox-ordAqhjX.js",
-      "_KeyingPanel-SsAIeDy3.js"
+      "_App-pMN1OjNW.js",
+      "_AssetMediaLightbox-Bx0azN0S.js",
+      "_KeyingPanel-8J_RMrxg.js"
     ],
     "dynamicImports": [
       "src/components/assetgen/SpriteRecipeWorkspace.tsx"
@@ -43,21 +43,21 @@
       "assets/AssetGenWorkspace-B7tTK0Sx.css"
     ]
   },
-  "_AssetMediaLightbox-ordAqhjX.js": {
-    "file": "assets/AssetMediaLightbox-ordAqhjX.js",
+  "_AssetMediaLightbox-Bx0azN0S.js": {
+    "file": "assets/AssetMediaLightbox-Bx0azN0S.js",
     "name": "AssetMediaLightbox",
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
-      "_useAgentDialogFocus-ALfcs_Em.js"
+      "_App-pMN1OjNW.js",
+      "_useAgentDialogFocus-DAeS9IWG.js"
     ]
   },
-  "_KeyingPanel-SsAIeDy3.js": {
-    "file": "assets/KeyingPanel-SsAIeDy3.js",
+  "_KeyingPanel-8J_RMrxg.js": {
+    "file": "assets/KeyingPanel-8J_RMrxg.js",
     "name": "KeyingPanel",
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ]
   },
   "__vite-browser-external": {
@@ -70,34 +70,34 @@
     "file": "assets/clipboard-DirTPLEi.js",
     "name": "clipboard"
   },
-  "_promptBuilderStore-CQxHJQz4.js": {
-    "file": "assets/promptBuilderStore-CQxHJQz4.js",
+  "_promptBuilderStore-DQR29LwN.js": {
+    "file": "assets/promptBuilderStore-DQR29LwN.js",
     "name": "promptBuilderStore",
     "imports": [
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ]
   },
-  "_useAgentDialogFocus-ALfcs_Em.js": {
-    "file": "assets/useAgentDialogFocus-ALfcs_Em.js",
+  "_useAgentDialogFocus-DAeS9IWG.js": {
+    "file": "assets/useAgentDialogFocus-DAeS9IWG.js",
     "name": "useAgentDialogFocus",
     "imports": [
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ]
   },
   "index.html": {
-    "file": "assets/index-B-iNVdeL.js",
+    "file": "assets/index-CHeVGnoy.js",
     "name": "index",
     "src": "index.html",
     "isEntry": true,
     "dynamicImports": [
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ],
     "css": [
       "assets/index-CxX85A3B.css"
     ]
   },
   "node_modules/pptxgenjs/dist/pptxgen.es.js": {
-    "file": "assets/pptxgen.es-D6s2Ip8Q.js",
+    "file": "assets/pptxgen.es-s4xfPXLT.js",
     "name": "pptxgen.es",
     "src": "node_modules/pptxgenjs/dist/pptxgen.es.js",
     "isDynamicEntry": true,
@@ -111,40 +111,40 @@
     ]
   },
   "src/components/GenerationRequestLogPanel.tsx": {
-    "file": "assets/GenerationRequestLogPanel-CaVBCWhI.js",
+    "file": "assets/GenerationRequestLogPanel-EYEiHIr9.js",
     "name": "GenerationRequestLogPanel",
     "src": "src/components/GenerationRequestLogPanel.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
+      "_App-pMN1OjNW.js",
       "_clipboard-DirTPLEi.js"
     ]
   },
   "src/components/NodeCanvas.tsx": {
-    "file": "assets/NodeCanvas-B1R-fOYq.js",
+    "file": "assets/NodeCanvas-DmjbNcTa.js",
     "name": "NodeCanvas",
     "src": "src/components/NodeCanvas.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
+      "_App-pMN1OjNW.js",
       "_clipboard-DirTPLEi.js",
-      "_AssetMediaLightbox-ordAqhjX.js",
-      "_useAgentDialogFocus-ALfcs_Em.js"
+      "_AssetMediaLightbox-Bx0azN0S.js",
+      "_useAgentDialogFocus-DAeS9IWG.js"
     ],
     "css": [
       "assets/NodeCanvas-BnuhLJ6X.css"
     ]
   },
   "src/components/PromptImportDialog.tsx": {
-    "file": "assets/PromptImportDialog-B5Wv2cie.js",
+    "file": "assets/PromptImportDialog-B24cvEkK.js",
     "name": "PromptImportDialog",
     "src": "src/components/PromptImportDialog.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ],
     "dynamicImports": [
       "src/components/PromptImportDiscoverySection.tsx",
@@ -152,132 +152,132 @@
     ]
   },
   "src/components/PromptImportDiscoverySection.tsx": {
-    "file": "assets/PromptImportDiscoverySection-B5AdpMnV.js",
+    "file": "assets/PromptImportDiscoverySection-Bbw1_J_3.js",
     "name": "PromptImportDiscoverySection",
     "src": "src/components/PromptImportDiscoverySection.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ]
   },
   "src/components/PromptImportFolderSection.tsx": {
-    "file": "assets/PromptImportFolderSection-DgIWI0j2.js",
+    "file": "assets/PromptImportFolderSection-CMpxuE8e.js",
     "name": "PromptImportFolderSection",
     "src": "src/components/PromptImportFolderSection.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ]
   },
   "src/components/PromptLibraryPanel.tsx": {
-    "file": "assets/PromptLibraryPanel-CGcqRRsJ.js",
+    "file": "assets/PromptLibraryPanel-Ct98TJ61.js",
     "name": "PromptLibraryPanel",
     "src": "src/components/PromptLibraryPanel.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ],
     "dynamicImports": [
       "src/components/PromptImportDialog.tsx"
     ]
   },
   "src/components/SettingsWorkspace.tsx": {
-    "file": "assets/SettingsWorkspace-BhbAnrYw.js",
+    "file": "assets/SettingsWorkspace-DL9Tm90P.js",
     "name": "SettingsWorkspace",
     "src": "src/components/SettingsWorkspace.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
-      "_promptBuilderStore-CQxHJQz4.js"
+      "_App-pMN1OjNW.js",
+      "_promptBuilderStore-DQR29LwN.js"
     ]
   },
   "src/components/agent/AgentWorkspace.tsx": {
-    "file": "assets/AgentWorkspace-CxbtxZYs.js",
+    "file": "assets/AgentWorkspace-C6ke6Eo4.js",
     "name": "AgentWorkspace",
     "src": "src/components/agent/AgentWorkspace.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
-      "_useAgentDialogFocus-ALfcs_Em.js"
+      "_App-pMN1OjNW.js",
+      "_useAgentDialogFocus-DAeS9IWG.js"
     ]
   },
   "src/components/assetgen/SpriteRecipeWorkspace.tsx": {
-    "file": "assets/SpriteRecipeWorkspace-ghZGUlM8.js",
+    "file": "assets/SpriteRecipeWorkspace-BJUH1ddP.js",
     "name": "SpriteRecipeWorkspace",
     "src": "src/components/assetgen/SpriteRecipeWorkspace.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
-      "_AssetGenWorkspace-BIYh26wL.js",
-      "_AssetMediaLightbox-ordAqhjX.js",
-      "_useAgentDialogFocus-ALfcs_Em.js",
-      "_KeyingPanel-SsAIeDy3.js"
+      "_App-pMN1OjNW.js",
+      "_AssetGenWorkspace-DzEfpUy_.js",
+      "_AssetMediaLightbox-Bx0azN0S.js",
+      "_useAgentDialogFocus-DAeS9IWG.js",
+      "_KeyingPanel-8J_RMrxg.js"
     ]
   },
   "src/components/assets/AssetsWorkspace.tsx": {
-    "file": "assets/AssetsWorkspace-BuiwpbQQ.js",
+    "file": "assets/AssetsWorkspace-CHw1u9VC.js",
     "name": "AssetsWorkspace",
     "src": "src/components/assets/AssetsWorkspace.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
-      "_AssetMediaLightbox-ordAqhjX.js",
-      "_KeyingPanel-SsAIeDy3.js",
-      "_useAgentDialogFocus-ALfcs_Em.js"
+      "_App-pMN1OjNW.js",
+      "_AssetMediaLightbox-Bx0azN0S.js",
+      "_KeyingPanel-8J_RMrxg.js",
+      "_useAgentDialogFocus-DAeS9IWG.js"
     ],
     "css": [
       "assets/AssetsWorkspace-BdptASFf.css"
     ]
   },
   "src/components/canvas-mode/index.ts": {
-    "file": "assets/index-Co3ZHk9P.js",
+    "file": "assets/index-D_LpLGWV.js",
     "name": "index",
     "src": "src/components/canvas-mode/index.ts",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ],
     "dynamicImports": [
       "node_modules/pptxgenjs/dist/pptxgen.es.js"
     ]
   },
   "src/components/card-news/CardNewsWorkspace.tsx": {
-    "file": "assets/CardNewsWorkspace-BfR-FMwo.js",
+    "file": "assets/CardNewsWorkspace-DsjqhaYO.js",
     "name": "CardNewsWorkspace",
     "src": "src/components/card-news/CardNewsWorkspace.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ]
   },
   "src/components/home/HomeWorkspace.tsx": {
-    "file": "assets/HomeWorkspace-x-oJypd7.js",
+    "file": "assets/HomeWorkspace-DbnY1YF2.js",
     "name": "HomeWorkspace",
     "src": "src/components/home/HomeWorkspace.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js"
+      "_App-pMN1OjNW.js"
     ]
   },
   "src/components/prompt-builder/PromptBuilderPanel.tsx": {
-    "file": "assets/PromptBuilderPanel-gGHOSb6l.js",
+    "file": "assets/PromptBuilderPanel-CL34Jpso.js",
     "name": "PromptBuilderPanel",
     "src": "src/components/prompt-builder/PromptBuilderPanel.tsx",
     "isDynamicEntry": true,
     "imports": [
       "index.html",
-      "_App-x_fzCXKb.js",
-      "_promptBuilderStore-CQxHJQz4.js"
+      "_App-pMN1OjNW.js",
+      "_promptBuilderStore-DQR29LwN.js"
     ]
   }
 }