ima2-gen 3.20.0 → 3.21.0

package/routes/github.js

@@ -0,0 +1,51 @@
+import { dismissStarPrompt, getStarStatus, starRepository } from "../lib/githubStar.js";
+import { isLoopbackPeer } from "../lib/localAccessPolicy.js";
+/**
+ * Star routes act with the host user's GitHub login, so they answer only to
+ * this computer. The global access guard already refuses cross-site browser
+ * requests (lib/localAccessPolicy.ts checkBrowserRequest); the peer check here
+ * keeps LAN clients from starring as the host. A same-host reverse proxy set up
+ * through server.publicOrigins arrives from loopback and is the operator's own
+ * exposure choice.
+ */
+export function createGithubStarHandlers(deps) {
+    const localOnly = (req, res) => {
+        if (isLoopbackPeer(req.socket?.remoteAddress))
+            return true;
+        res.status(403).json({ ok: false, code: "LOCAL_ONLY" });
+        return false;
+    };
+    return {
+        async status(req, res) {
+            if (!localOnly(req, res))
+                return;
+            res.json(await getStarStatus(deps));
+        },
+        async star(req, res) {
+            if (!localOnly(req, res))
+                return;
+            const result = await starRepository(deps);
+            if (result.ok) {
+                res.json({ ok: true, state: "starred" });
+                return;
+            }
+            if (result.code === "gh_unauthenticated")
+                res.status(409).json({ ok: false, code: "GH_UNAUTHENTICATED" });
+            else
+                res.status(502).json({ ok: false, code: "GH_FAILED" });
+        },
+        async dismiss(req, res) {
+            if (!localOnly(req, res))
+                return;
+            // Unwritable state only means the prompt may ask again next launch.
+            await dismissStarPrompt(deps).catch(() => { });
+            res.json({ ok: true });
+        },
+    };
+}
+export function registerGithubRoutes(app) {
+    const handlers = createGithubStarHandlers();
+    app.get("/api/github/star", handlers.status);
+    app.post("/api/github/star", handlers.star);
+    app.post("/api/github/star/dismiss", handlers.dismiss);
+}

package/routes/health.js

@@ -4,6 +4,7 @@ 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";
+import { oauthFetch } from "../lib/codexBackend/index.js";
 // Upstream auth refusals surfaced through the proxy's /v1/models error body. Kept narrow:
 // generic 5xx/network text must never read as "re-login needed" — status 401 covers
 // non-standard auth rejections regardless of wording.
@@ -17,9 +18,12 @@ export function registerHealthRoutes(app, ctxRaw) {
             url: ctx.serverUrl || `http://localhost:${ctx.serverActualPort || ctx.config.server.port}`,
         },
         oauth: {
+            // "native": GPT OAuth talks to the Codex backend in process; the port fields then only
+            // describe the legacy proxy setting and nothing listens on them.
+            mode: ctx.oauthTransport === "native" ? "native" : "proxy",
             configuredPort: Number(ctx.oauthPort),
             actualPort: Number(ctx.oauthActualPort || ctx.oauthPort),
-            url: ctx.oauthUrl,
+            url: ctx.oauthTransport === "native" ? ctx.config.oauth.codexBaseUrl : ctx.oauthUrl,
             status: ctx.oauthReadyState,
         },
         // Grok has no local endpoint any more: requests go to https://api.x.ai, so
@@ -70,7 +74,7 @@ export function registerHealthRoutes(app, ctxRaw) {
         if (ctx.oauthReadyState === "failed")
             return reply(missingSession ? "auth_required" : "offline");
         try {
-            const r = await fetch(`${ctx.oauthUrl}/v1/models`, {
+            const r = await oauthFetch(ctx, "/v1/models", {
                 signal: AbortSignal.timeout(ctx.config.oauth.statusTimeoutMs),
             });
             if (r.ok) {

package/routes/index.js

@@ -2,6 +2,7 @@ import { registerCapabilitiesRoutes } from "./capabilities.js";
 import { registerModelsRoutes } from "./models.js";
 import { registerEventsRoute } from "./events.js";
 import { registerHealthRoutes } from "./health.js";
+import { registerGithubRoutes } from "./github.js";
 import { registerAdminRoutes } from "./admin.js";
 import { registerHistoryRoutes } from "./history.js";
 import { registerAssetsRoutes } from "./assets.js";
@@ -46,6 +47,7 @@ export function configureRoutes(app, ctxRaw) {
     const ctx = requireRuntimeContext(ctxRaw);
     registerEventsRoute(app, ctx);
     registerHealthRoutes(app, ctx);
+    registerGithubRoutes(app);
     registerAdminRoutes(app, ctx);
     registerCapabilitiesRoutes(app, ctx);
     registerStorageRoutes(app, ctx);

package/routes/keys.js

@@ -234,7 +234,7 @@ export function mountKeyRoutes(app, ctx) {
         catch (e) {
             return res.status(400).json({
                 ok: false,
-                error: `API key validation failed: ${e.message || "unknown"}`,
+                error: `API key validation failed: ${(e instanceof Error ? e.message : "") || "unknown"}`,
                 code: "KEY_VALIDATION_FAILED",
             });
         }
@@ -278,9 +278,9 @@ export function mountKeyRoutes(app, ctx) {
             ctx.hasMinimaxApiKey = true;
         }
         else if (provider === "nai") {
-            ctx.naiApiKey = trimmed; // justified: RuntimeContext fields are readonly at the type level; every sibling key branch hot-updates through the same cast
-            ctx.naiApiKeySource = "config"; // justified: same hot-update path as the minimax branch above
-            ctx.hasNaiApiKey = true; // justified: same hot-update path as the minimax branch above
+            ctx.naiApiKey = trimmed;
+            ctx.naiApiKeySource = "config";
+            ctx.hasNaiApiKey = true;
         }
         return res.json({ ok: true, provider, source: "config", valid: true });
     });
@@ -324,9 +324,9 @@ export function mountKeyRoutes(app, ctx) {
             ctx.hasMinimaxApiKey = false;
         }
         else if (provider === "nai") {
-            ctx.naiApiKey = undefined; // justified: RuntimeContext fields are readonly at the type level; every sibling key branch clears through the same cast
-            ctx.naiApiKeySource = "none"; // justified: same clear path as the minimax branch above
-            ctx.hasNaiApiKey = false; // justified: same clear path as the minimax branch above
+            ctx.naiApiKey = undefined;
+            ctx.naiApiKeySource = "none";
+            ctx.hasNaiApiKey = false;
         }
         return res.json({ ok: true, provider, removed: true });
     });

package/routes/models.js

@@ -50,7 +50,7 @@ function lane(state, defaults, models) {
 }
 function oauthLane(ctx, image) {
     const ready = ctx.oauthReadyState === "ready";
-    const reason = ready ? undefined : `oauth proxy ${ctx.oauthReadyState ?? "not ready"}`;
+    const reason = ready ? undefined : `GPT OAuth ${ctx.oauthReadyState ?? "not ready"}`;
     return lane({ status: ready ? "ready" : "disconnected", ...(reason ? { reason } : {}) }, { image: ctx.config.imageModels.default }, { image, video: [] });
 }
 function apiLane(ctx, image) {
@@ -217,7 +217,7 @@ async function buildCoreLanes(ctx, agyInstalled, deps = {}) {
     const gptModels = entries("oauth", ctx.config.imageModels.valid);
     const lanes = {
         oauth: oauthLane(ctx, gptModels),
-        api: apiLane(ctx, entries("api", ctx.config.imageModels.valid)),
+        api: apiLane(ctx, entries("api", ctx.config.apiProvider.validImageModels)),
         grok: grokLane(ctx),
         "grok-api": grokApiLane(ctx),
         agy: agyLane(agyInstalled),

package/routes/quota.js

@@ -4,7 +4,8 @@ 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). */
+import { logWarn } from "../lib/logger.js";
+/** Same file GPT OAuth reads (ima2 store first, then Codex CLI files). */
 function readCodexTokens() {
     const access = readChatgptAccess();
     return access ? { access_token: access.accessToken, account_id: access.accountId } : null;
@@ -80,7 +81,7 @@ function readGrokTokenCandidates(homeDir = homedir()) {
             });
         }
     }
-    catch { }
+    catch { /* best-effort: auth.json is optional; fall back to the next source */ }
     try {
         // Same file lib/xaiAuth.ts owns; spelled out so quota keeps its narrow node:fs surface.
         const auth = JSON.parse(readFileSync(join(homeDir, ".progrok", "auth.json"), "utf8"));
@@ -95,7 +96,7 @@ function readGrokTokenCandidates(homeDir = homedir()) {
             });
         }
     }
-    catch { }
+    catch { /* best-effort: Grok auth.json is optional; fall back to the next source */ }
     const seen = new Set();
     return candidates.filter((candidate) => {
         if (seen.has(candidate.token))
@@ -116,7 +117,7 @@ function readGrokClientVersion(homeDir = homedir(), grokBinary = "grok") {
             if (typeof data[field] === "string" && data[field].trim())
                 return data[field].trim();
         }
-        catch { }
+        catch { /* best-effort: version files are optional; fall back to the CLI probe */ }
     }
     try {
         const output = execFileSync(grokBinary, ["version"], {
@@ -185,7 +186,8 @@ async function fetchGrokWeeklyCredits(candidate, clientVersion) {
             return null;
         return parseGrokCreditsResponse(await response.json());
     }
-    catch {
+    catch (err) {
+        logWarn("quota", "grok_weekly_credits_failed", { errorName: err instanceof Error ? err.name : typeof err });
         return null;
     }
 }
@@ -234,7 +236,9 @@ export async function fetchGrokBilling(homeDir = homedir(), grokBinary = "grok")
                 billing: { usedUsd: used / 100, limitUsd: limit / 100 },
             };
         }
-        catch { }
+        catch (err) {
+            logWarn("quota", "grok_billing_failed", { errorName: err instanceof Error ? err.name : typeof err });
+        }
     }
     return { provider: "grok", authenticated: true, windows: [] };
 }
@@ -273,7 +277,7 @@ export function registerQuotaRoutes(app, ctx) {
             ]);
             res.json({ codex, grok, nai });
         }
-        catch (e) {
+        catch {
             res.status(500).json({ error: "Failed to fetch quota" });
         }
     });

package/routes/video.js

@@ -18,7 +18,7 @@ import { ACTIVE_VIDEO_PROMPT_GUIDANCE, appendVideoContinuityEntry, lineageFromVi
 import { extractGeneratedVideoFrameB64 } from "../lib/videoFrameExtract.js";
 import { errorEnvelopeFields } from "../lib/errors/envelope.js";
 import { normalizeGrokVideoModel, normalizeVideoResolution, normalizeVideoAspectRatio, normalizeVideoDuration, deriveVideoMode, MAX_REF2V_REFERENCES, MAX_REFERENCE_AUDIOS, validateVideoResolutionForRequest, validateVideoDurationForRequest, } from "../lib/imageModels.js";
-import { errInfo } from "../lib/errInfo.js";
+import { errInfo, numberField, stringField, thrownFields } from "../lib/errInfo.js";
 import { requireRuntimeContext } from "../lib/runtimeContext.js";
 import { generateVideoThumbnail } from "../lib/videoThumb.js";
 import { publish } from "../lib/eventBus.js";
@@ -92,7 +92,8 @@ async function trimStoryboardLeadIn(buffer, requestId) {
         return trimmed;
     }
     catch (trimError) {
-        logEvent("video", "storyboard:trim-exec-error", { requestId, error: trimError.message, stderr: trimError.stderr?.slice?.(0, 500) });
+        const trimErrorFields = thrownFields(trimError);
+        logEvent("video", "storyboard:trim-exec-error", { requestId, error: trimErrorFields.message, stderr: typeof trimErrorFields.stderr === "string" ? trimErrorFields.stderr.slice(0, 500) : undefined });
         throw trimError;
     }
     finally {
@@ -238,7 +239,8 @@ export function registerVideoRoutes(app, ctxRaw) {
                     parentLineage = lineageFromVideoMetadata(continueFromVideoFilename, parentMeta);
                 }
                 catch (e) {
-                    return fail(e?.status || 400, "GROK_VIDEO_INVALID_MODE", e?.message || "invalid continuation video");
+                    const eFields = thrownFields(e);
+                    return fail(numberField(eFields.status) || 400, "GROK_VIDEO_INVALID_MODE", stringField(eFields.message) || "invalid continuation video");
                 }
             }
             else {
@@ -253,7 +255,8 @@ export function registerVideoRoutes(app, ctxRaw) {
                     });
                 }
                 catch (e) {
-                    return fail(e?.status || 500, "GROK_VIDEO_FRAME_FAILED", e?.message || "failed to extract continuation frame");
+                    const eFields = thrownFields(e);
+                    return fail(numberField(eFields.status) || 500, "GROK_VIDEO_FRAME_FAILED", stringField(eFields.message) || "failed to extract continuation frame");
                 }
             }
             refInputs.push(...toArray(req.body?.referenceImages).map((image) => ({ image, source: "composer" })), ...toArray(req.body?.referenceFilenames).map((filename) => ({ filename, source: "composer" })), ...(req.body?.sourceImage || req.body?.sourceFilename
@@ -263,7 +266,7 @@ export function registerVideoRoutes(app, ctxRaw) {
                 ? req.body.elementIds.filter((id) => typeof id === "string" && id)
                 : [];
             let elementNotesFragment = "";
-            let elementResolvedRefs = [];
+            const elementResolvedRefs = [];
             let appliedElementIds = [];
             if (rawElementIds.length > 0) {
                 try {
@@ -326,7 +329,8 @@ export function registerVideoRoutes(app, ctxRaw) {
                 resolved = all.filter((r) => Boolean(r.b64));
             }
             catch (e) {
-                return fail(e?.status || 400, e?.code || "GROK_VIDEO_INVALID_MODE", e?.message || "invalid reference image");
+                const eFields = thrownFields(e);
+                return fail(numberField(eFields.status) || 400, stringField(eFields.code) || "GROK_VIDEO_INVALID_MODE", stringField(eFields.message) || "invalid reference image");
             }
             if (resolved.length > MAX_REF2V_REFERENCES)
                 return fail(400, "GROK_VIDEO_REF_TOO_MANY", `at most ${MAX_REF2V_REFERENCES} reference images`);
@@ -597,7 +601,8 @@ export function registerVideoRoutes(app, ctxRaw) {
                     finalBuffer = await trimStoryboardLeadIn(result.videoBuffer, requestId);
                 }
                 catch (trimErr) {
-                    logEvent("video", "storyboard:trim-failed", { requestId, error: trimErr.message });
+                    const trimErrFields = thrownFields(trimErr);
+                    logEvent("video", "storyboard:trim-failed", { requestId, error: trimErrFields.message });
                 }
             }
             await saveGeneratedVideoArtifact(ctx, filename, finalBuffer, meta);

package/routes/videoExtended.js

@@ -16,7 +16,7 @@ import { MAX_VIDEO_DURATION, MIN_VIDEO_DURATION, normalizeGrokVideoModel, normal
 import { persistVideoArtifact } from "../lib/videoArtifactPersistence.js";
 import { normalizeVideoLineage } from "../lib/videoLineage.js";
 import { getMotionFragment, MOTION_PRESETS } from "../lib/videoMotionPresets.js";
-import { errInfo } from "../lib/errInfo.js";
+import { errInfo, thrownFields } from "../lib/errInfo.js";
 import { codedVideoError as codedError, emitPhase, envDeadline, requestSignal, requirePrompt, retryableData } from "../lib/videoExtendedHelpers.js";
 import { DEFAULT_GROK_PLANNER_MODEL } from "../config.js";
 import { errorEnvelopeFields } from "../lib/errors/envelope.js";
@@ -65,17 +65,18 @@ function videoLane(body) {
 function routeError(message, status = 400) {
     return Object.assign(new Error(message), { status });
 }
-function sendError(res, err) {
-    if (err?.name === "TimeoutError") {
+function sendError(res, error) {
+    const err = thrownFields(error);
+    if (err.name === "TimeoutError") {
         res.status(504).json({ error: "Video operation timed out", code: "VIDEO_TIMEOUT" });
         return;
     }
-    if (err?.name === "AbortError") {
+    if (err.name === "AbortError") {
         if (!res.headersSent)
             res.status(499).json({ error: "Request canceled", code: "REQUEST_CANCELED" });
         return;
     }
-    res.status(typeof err?.status === "number" ? err.status : 500).json({ error: err?.message || String(err), ...(typeof err?.code === "string" ? { code: err.code } : {}), ...errorEnvelopeFields(err) });
+    res.status(typeof err.status === "number" ? err.status : 500).json({ error: err.message || String(error), ...(typeof err.code === "string" ? { code: err.code } : {}), ...errorEnvelopeFields(error) });
 }
 async function safeGeneratedFile(ctx, file, options = {}) {
     return safeGeneratedFilePath(ctx.config.storage.generatedDir, file, options);
@@ -159,7 +160,7 @@ function extractOutputText(data) {
     const output = Array.isArray(data.output) ? data.output : [];
     const texts = [];
     for (const item of output) {
-        const content = item?.content;
+        const content = item && typeof item === "object" ? item.content : undefined;
         if (!Array.isArray(content))
             continue;
         for (const part of content) {
@@ -429,7 +430,7 @@ export function registerVideoExtendedRoutes(app, ctxRaw, dependencies = {}) {
                 const frame = await readFile(tmpOut);
                 res.type("png").send(frame);
             }
-            catch (err) {
+            catch {
                 return res.status(500).json({ error: "ffmpeg failed" });
             }
             finally {

package/server.js

@@ -7,11 +7,10 @@ import { dirname, join } from "path";
 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 { resetCodexCaches } from "./lib/codexBackend/index.js";
 import { migrateGeneratedStorage } from "./lib/storageMigration.js";
 import { purgeStaleJobs } from "./lib/inflight.js";
-import { configureLogger, logError } from "./lib/logger.js";
+import { configureLogger, logError, logWarn } from "./lib/logger.js";
 import { createRequestLogger } from "./lib/requestLogger.js";
 import { configureApiCachePolicy } from "./lib/apiCachePolicy.js";
 import { configureRoutes } from "./routes/index.js";
@@ -25,12 +24,19 @@ import { closeDb } from "./lib/db.js";
 import { stopAgentQueueWorker } from "./lib/agentQueueWorker.js";
 import { reapCardNewsJobs } from "./lib/cardNewsJobStore.js";
 import { reapTerminalJobs } from "./lib/inflight.js";
-import { errInfo } from "./lib/errInfo.js";
+import { errInfo, thrownFields } from "./lib/errInfo.js";
 import { TEMPLATE_FILE_MAX_BYTES } from "./lib/nodeTemplateFile.js";
 import { templateImportBodyErrors } from "./routes/nodeTemplates.js";
 import { loadGrokCredentials } from "./lib/xaiAuth.js";
 import { cleanupExpiredMcpTempReferences, MCP_TEMP_REFERENCE_JSON_BODY_LIMIT_BYTES, MCP_TEMP_REFERENCE_SWEEP_INTERVAL_MS, } from "./lib/mcpTempReferenceStore.js";
 const rootDir = dirname(fileURLToPath(import.meta.url));
+const warnedConfigPaths = new Set();
+function warnConfigReadFailed(cfgPath, err) {
+    if (warnedConfigPaths.has(cfgPath))
+        return;
+    warnedConfigPaths.add(cfgPath);
+    logWarn("config", "config_read_failed", { path: cfgPath, errorName: err instanceof Error ? err.name : typeof err });
+}
 async function loadApiKey() {
     if (process.env.OPENAI_API_KEY) {
         return { apiKey: process.env.OPENAI_API_KEY, apiKeySource: "env" };
@@ -47,7 +53,9 @@ async function loadApiKey() {
             if (cfg.apiKey)
                 return { apiKey: cfg.apiKey, apiKeySource: "config" };
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return { apiKey: null, apiKeySource: "none" };
 }
@@ -67,7 +75,9 @@ async function loadXaiApiKey() {
             if (cfg.xaiApiKey)
                 return { apiKey: cfg.xaiApiKey, apiKeySource: "config" };
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return { apiKey: null, apiKeySource: "none" };
 }
@@ -87,7 +97,9 @@ async function loadGeminiApiKey() {
             if (cfg.geminiApiKey)
                 return { apiKey: cfg.geminiApiKey, apiKeySource: "config" };
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return { apiKey: null, apiKeySource: "none" };
 }
@@ -107,7 +119,9 @@ async function loadAtlasCloudApiKey() {
             if (cfg.atlasCloudApiKey)
                 return { apiKey: cfg.atlasCloudApiKey, apiKeySource: "config" };
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return { apiKey: null, apiKeySource: "none" };
 }
@@ -127,7 +141,9 @@ async function loadMinimaxApiKey() {
             if (cfg.minimaxApiKey)
                 return { apiKey: cfg.minimaxApiKey, apiKeySource: "config" };
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return { apiKey: null, apiKeySource: "none" };
 }
@@ -147,7 +163,9 @@ async function loadNaiApiKey() {
             if (cfg.naiApiKey)
                 return { apiKey: cfg.naiApiKey, apiKeySource: "config" };
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return { apiKey: null, apiKeySource: "none" };
 }
@@ -176,7 +194,9 @@ async function loadVertexKey() {
                 return { json: cfg.vertexServiceAccountJson, projectId: parsed.project_id || null, source: "config" };
             }
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return { json: null, projectId: null, source: "none" };
 }
@@ -193,7 +213,9 @@ async function loadGeminiAuthMode() {
             if (cfg.geminiAuthMode === "vertex" || cfg.geminiAuthMode === "apikey")
                 return cfg.geminiAuthMode;
         }
-        catch { }
+        catch (err) {
+            warnConfigReadFailed(cfgPath, err);
+        }
     }
     return undefined;
 }
@@ -270,7 +292,7 @@ export function buildApp(ctx) {
     app.use((error, _req, res, _next) => {
         const info = errInfo(error);
         const candidateStatus = Number(info.status);
-        const operational = Boolean(error?.isOperational)
+        const operational = Boolean(thrownFields(error).isOperational)
             || (Number.isInteger(candidateStatus) && candidateStatus >= 400 && candidateStatus < 500);
         const status = operational ? candidateStatus : 500;
         if (!operational)
@@ -311,9 +333,10 @@ export function buildAdvertisePayload(ctx) {
             url: ctx.serverUrl,
         },
         oauth: {
+            mode: ctx.oauthTransport === "native" ? "native" : "proxy",
             configuredPort: Number(ctx.oauthPort),
             actualPort: Number(ctx.oauthActualPort || ctx.oauthPort),
-            url: ctx.oauthUrl,
+            url: ctx.oauthTransport === "native" ? ctx.config.oauth.codexBaseUrl : ctx.oauthUrl,
             status: ctx.oauthReadyState,
         },
         grok: { auth: loadGrokCredentials(ctx.grokAuthHomeDir) ? "oauth" : "none" },
@@ -347,7 +370,7 @@ function unadvertise(ctx) {
         if (cur.pid === process.pid)
             unlinkSync(ctx.config.storage.advertiseFile);
     }
-    catch { }
+    catch { /* best-effort: advertise file cleanup during shutdown */ }
 }
 export async function createRuntimeContext(overrides = {}) {
     const loadedKey = overrides.apiKey !== undefined
@@ -371,6 +394,9 @@ export async function createRuntimeContext(overrides = {}) {
         resolveOAuthReady = resolve;
     });
     const oauthReadyPromise = newOAuthReadyPromise();
+    // GPT OAuth calls the Codex backend in process (lib/codexBackend). A stubbed proxy child
+    // (tests) or IMA2_NO_OAUTH_PROXY (an external proxy at oauthUrl) keeps the HTTP transport.
+    const oauthTransport = overrides.oauthChild !== undefined || !config.oauth.autoStart ? "proxy" : "native";
     const ctx = {
         rootDir,
         config,
@@ -380,7 +406,8 @@ export async function createRuntimeContext(overrides = {}) {
         oauthPort,
         oauthActualPort: oauthPort,
         oauthUrl: `http://127.0.0.1:${oauthPort}`,
-        oauthReadyState: config.oauth.autoStart ? "starting" : "disabled",
+        oauthTransport,
+        oauthReadyState: oauthTransport === "native" ? "ready" : config.oauth.autoStart ? "starting" : "disabled",
         hasApiKey: !!apiKey,
         apiKey: apiKey ?? undefined,
         apiKeySource: loadedKey.apiKeySource,
@@ -426,7 +453,7 @@ export async function createRuntimeContext(overrides = {}) {
             ctx.oauthReadyState = "starting";
         },
     };
-    if (!config.oauth.autoStart)
+    if (!config.oauth.autoStart || oauthTransport === "native")
         ctx.markOAuthReady({ url: ctx.oauthUrl, port: ctx.oauthPort });
     if (loadedVertexKey.json) {
         try {
@@ -451,60 +478,19 @@ export async function startServer(overrides = {}) {
     }
     purgeStaleJobs();
     const app = buildApp(ctx);
-    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
-            : 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;
+    // GPT OAuth calls the Codex backend in process and re-reads the session file on every
+    // request, so a login needs no restart: forgetting the cached model roster is enough for a
+    // different account to show up at once. An injected child (tests) or an external endpoint
+    // (IMA2_NO_OAUTH_PROXY) owns its own lifecycle.
+    const oauthChild = overrides.oauthChild ?? null;
+    if (ctx.oauthTransport === "native") {
         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; });
-            }
+            resetCodexCaches();
             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 });
+        ctx.syncOAuthProxySession = () => false;
     }
+    ctx.markOAuthReady({ url: ctx.oauthUrl, port: ctx.oauthPort });
     let server;
     let reapTimer;
     let tempReferenceReapTimer;
@@ -513,11 +499,11 @@ export async function startServer(overrides = {}) {
         try {
             oauthChild?.stop?.();
         }
-        catch { }
+        catch { /* best-effort: OAuth child may already be stopped */ }
         try {
             oauthChild?.kill?.();
         }
-        catch { }
+        catch { /* best-effort: OAuth child may already be stopped */ }
         stopAgentQueueWorker();
         clearInterval(reapTimer);
         if (tempReferenceReapTimer)
@@ -549,7 +535,7 @@ export async function startServer(overrides = {}) {
         console.warn(`[mcp.restore] code=${String(error?.message ?? error).split(":")[0]}`);
     });
     console.log(`Image Gen running at ${ctx.serverUrl}`);
-    console.log(`Provider policy: GPT OAuth, API-key Responses, and Grok (xAI OAuth or API key) providers. GPT OAuth proxy port ${ctx.oauthPort}.`);
+    console.log(`Provider policy: GPT OAuth, API-key Responses, and Grok (xAI OAuth or API key) providers. GPT OAuth ${ctx.oauthTransport === "native" ? "calls ChatGPT directly" : `uses ${ctx.oauthUrl}`}.`);
     advertise(ctx);
     try {
         const s = ensureDefaultSession();
@@ -562,7 +548,7 @@ export async function startServer(overrides = {}) {
     }
     // Background thumbnail backfill for updated users (recursive — covers video
     // series subdirectories like continuous_*/clip_NN.mp4, not just top level).
-    (async () => {
+    void (async () => {
         try {
             const { backfillThumbnails } = await import("./lib/thumbBackfill.js");
             const r = await backfillThumbnails(ctx.config.storage.generatedDir);

package/skills/ima2/SKILL.md

@@ -49,7 +49,7 @@ List ready image lanes, choose a persistent CLI target, then generate:
 
 ```bash
 ima2 models --kind image
-ima2 defaults set image oauth/gpt-5.6-luna
+ima2 defaults set image oauth/gpt-6-luna
 ima2 gen "a clean product photo of a red guitar pedal"
 ```
 
@@ -743,7 +743,7 @@ unreachable server returns `SERVER_UNREACHABLE` and exits 3.
 
 Persist the server-side model defaults shared by GPT OAuth and API provider paths:
 
-The built-in OAuth image default is `gpt-5.6-luna`; Grok image and video code
+The built-in GPT OAuth image default is `gpt-6-luna` (also `gpt-6-sol` and `gpt-6-astra`; legacy OAuth ids map to their GPT-6 tier); Grok image and video code
 defaults are `grok-imagine-image-quality` and `grok-imagine-video` respectively.
 For video, set `grok-imagine-video-1.5` as your default and leave the base model
 for edit and extension, which are the only things 1.5 cannot do.
@@ -755,7 +755,7 @@ ima2 defaults set model gpt-5.5
 Persist the fail-closed CLI image and video targets separately:
 
 ```bash
-ima2 defaults set image oauth/gpt-5.6-luna
+ima2 defaults set image oauth/gpt-6-luna
 ima2 defaults set video grok/grok-imagine-video
 ima2 defaults reset image
 ima2 defaults reset video