ima2-gen 1.1.0 → 1.1.2

package/routes/nodes.js

@@ -12,6 +12,7 @@ import { classifyUpstreamError } from "../lib/errorClassify.js";
 import { normalizeOAuthParams } from "../lib/oauthNormalize.js";
 import { normalizeImageModel } from "../lib/imageModels.js";
 import { generateViaOAuth, editViaOAuth } from "../lib/oauthProxy.js";
+import { normalizeGenerationFailure } from "../lib/generationErrors.js";
 import { getStyleSheet } from "../lib/sessionStore.js";
 import { renderStyleSheetPrefix } from "../lib/styleSheet.js";
 import { logEvent, logError } from "../lib/logger.js";
@@ -33,12 +34,13 @@ function writeSse(res, event, data) {
   res.write(`data: ${JSON.stringify(data)}\n\n`);
 }
 
-function writeNodeError(res, status, code, message, parentNodeId) {
+function writeNodeError(res, status, code, message, parentNodeId, details = {}) {
   if (res.headersSent) {
     writeSse(res, "error", {
       error: { code, message },
       parentNodeId,
       status,
+      ...details,
     });
     res.end();
     return;
@@ -46,6 +48,7 @@ function writeNodeError(res, status, code, message, parentNodeId) {
   res.status(status).json({
     error: { code, message },
     parentNodeId,
+    ...details,
   });
 }
 
@@ -58,7 +61,7 @@ export function registerNodeRoutes(app, ctx) {
     const body = req.body || {};
     const streamResponse = wantsSse(req);
     const parentNodeId = body.parentNodeId ?? null;
-    const requestId = typeof body.requestId === "string" ? body.requestId : null;
+    const requestId = typeof body.requestId === "string" ? body.requestId : req.id;
     const sessionId = typeof body.sessionId === "string" ? body.sessionId : null;
     const clientNodeId = typeof body.clientNodeId === "string" ? body.clientNodeId : null;
     let finishMeta = {};
@@ -82,6 +85,8 @@ export function registerNodeRoutes(app, ctx) {
         references = [],
         externalSrc = null,
         mode: promptMode = "auto",
+        contextMode: rawContextMode = "parent-plus-refs",
+        searchMode: rawSearchMode = "off",
         model: rawModel,
       } = body;
       const { provider = "oauth" } = body;
@@ -98,6 +103,19 @@ export function registerNodeRoutes(app, ctx) {
       }
       const imageModel = modelCheck.model;
       const normalizedPromptMode = promptMode === "direct" ? "direct" : "auto";
+      const contextMode = ["parent-plus-refs", "parent-only", "ancestry"].includes(rawContextMode)
+        ? rawContextMode
+        : "parent-plus-refs";
+      const searchMode = ["off", "auto", "on"].includes(rawSearchMode) ? rawSearchMode : "off";
+      if (contextMode === "ancestry") {
+        finishStatus = "error";
+        finishHttpStatus = 400;
+        finishErrorCode = "CONTEXT_MODE_UNSUPPORTED";
+        return res.status(400).json({
+          error: { code: "CONTEXT_MODE_UNSUPPORTED", message: "Ancestry context is not supported yet." },
+          parentNodeId,
+        });
+      }
 
       if (provider === "api") {
         finishStatus = "error";
@@ -128,18 +146,6 @@ export function registerNodeRoutes(app, ctx) {
           parentNodeId,
         });
       }
-      if ((parentNodeId || externalSrc) && refCheck.refs.length > 0) {
-        finishStatus = "error";
-        finishHttpStatus = 400;
-        finishErrorCode = "NODE_REFS_UNSUPPORTED_FOR_EDIT";
-        return res.status(400).json({
-          error: {
-            code: "NODE_REFS_UNSUPPORTED_FOR_EDIT",
-            message: "Extra references are only supported for root node generation.",
-          },
-          parentNodeId,
-        });
-      }
       const moderationCheck = validateModeration(ctx, moderation);
       if (moderationCheck.error) {
         finishStatus = "error";
@@ -173,9 +179,14 @@ export function registerNodeRoutes(app, ctx) {
       } else if (typeof externalSrc === "string" && externalSrc.length > 0) {
         parentB64 = await loadAssetB64(ctx.rootDir, externalSrc, ctx.config.storage.generatedDir);
       }
+      const operation = parentB64 ? "edit" : "generate";
+      const refsForRequest = contextMode === "parent-only" ? [] : refCheck.refs;
+      const webSearchEnabled = !parentB64 || searchMode === "on";
+      const parentImagePresent = !!parentB64;
+      const inputImageCount = (parentImagePresent ? 1 : 0) + refsForRequest.length;
       logEvent("node", "request", {
         requestId,
-        operation: parentB64 ? "edit" : "generate",
+        operation,
         sessionId,
         parentNodeId,
         clientNodeId,
@@ -183,7 +194,12 @@ export function registerNodeRoutes(app, ctx) {
         model: imageModel,
         size,
         moderation,
-        refs: refCheck.refs.length,
+        refs: refsForRequest.length,
+        inputImageCount,
+        parentImagePresent,
+        contextMode,
+        searchMode,
+        webSearchEnabled,
         promptChars: prompt.length,
         promptMode: normalizedPromptMode,
         styleSheetApplied: !!styleSheetApplied,
@@ -203,14 +219,32 @@ export function registerNodeRoutes(app, ctx) {
       let lastErr;
       for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
         try {
+          logEvent("node", "attempt", {
+            requestId,
+            attempt,
+            operation,
+            sessionId,
+            parentNodeId,
+            clientNodeId,
+            model: imageModel,
+            moderation,
+            quality,
+            size,
+            refs: refsForRequest.length,
+            inputImageCount,
+            parentImagePresent,
+            contextMode,
+            searchMode,
+            webSearchEnabled,
+          });
           const r = parentB64
-            ? await editViaOAuth(effectivePrompt, parentB64, quality, size, moderation, normalizedPromptMode, ctx, requestId, { model: imageModel })
+            ? await editViaOAuth(effectivePrompt, parentB64, quality, size, moderation, normalizedPromptMode, ctx, requestId, { model: imageModel, references: refsForRequest, searchMode: searchMode === "on" ? "on" : "off" })
             : await generateViaOAuth(
                 effectivePrompt,
                 quality,
                 size,
                 moderation,
-                refCheck.refs,
+                refsForRequest,
                 requestId,
                 normalizedPromptMode,
                 ctx,
@@ -239,20 +273,48 @@ export function registerNodeRoutes(app, ctx) {
           lastErr = e;
         }
         if (attempt < MAX_RETRIES) {
-          logEvent("node", "retry", { requestId, attempt: attempt + 1, errorCode: lastErr?.code });
+          logEvent("node", "retry", {
+            requestId,
+            attempt: attempt + 1,
+            operation,
+            parentNodeId,
+            clientNodeId,
+            errorCode: lastErr?.code,
+            errorEventType: lastErr?.eventType,
+            errorEventCount: lastErr?.eventCount,
+          });
         }
       }
 
       if (!b64) {
+        const finalErr = normalizeGenerationFailure(lastErr, {
+          safetyMessage: lastErr?.message || "Empty response after retry",
+        });
         finishStatus = "error";
-        finishHttpStatus = 422;
-        finishErrorCode = "SAFETY_REFUSAL";
+        finishHttpStatus = finalErr.status || 500;
+        finishErrorCode = finalErr.code || "NODE_GEN_FAILED";
+        logEvent("node", "final_error", {
+          requestId,
+          operation,
+          finalCode: finishErrorCode,
+          upstreamCode: lastErr?.code,
+          errorEventType: lastErr?.eventType,
+          errorEventCount: lastErr?.eventCount,
+          attempts: MAX_RETRIES + 1,
+          outerHttpAlreadyCommitted: res.headersSent,
+          sseErrorSent: streamResponse,
+        });
         return writeNodeError(
           res,
-          422,
-          "SAFETY_REFUSAL",
-          lastErr?.message || "Empty response after retry",
+          finishHttpStatus,
+          finishErrorCode,
+          finalErr.message,
           parentNodeId,
+          {
+            upstreamCode: lastErr?.code || null,
+            errorEventType: lastErr?.eventType || null,
+            errorEventCount: lastErr?.eventCount ?? null,
+          },
         );
       }
 
@@ -276,10 +338,12 @@ export function registerNodeRoutes(app, ctx) {
         elapsed,
         usage: usage || null,
         webSearchCalls,
+        contextMode,
+        searchMode,
         provider: "oauth",
         kind: parentB64 ? "edit" : "generate",
         requestId,
-        refsCount: refCheck.refs.length,
+        refsCount: refsForRequest.length,
         quality,
         size,
         format,
@@ -315,8 +379,11 @@ export function registerNodeRoutes(app, ctx) {
         webSearchCalls,
         provider: "oauth",
         model: imageModel,
+        size,
         moderation,
-        refsCount: refCheck.refs.length,
+        refsCount: refsForRequest.length,
+        contextMode,
+        searchMode,
         warnings: qualityWarnings,
         revisedPrompt,
         promptMode: normalizedPromptMode,

package/server.js

@@ -14,8 +14,12 @@ import { onShutdown } from "./bin/lib/platform.js";
 import { ensureDefaultSession } from "./lib/sessionStore.js";
 import { startOAuthProxy } from "./lib/oauthLauncher.js";
 import { migrateGeneratedStorage } from "./lib/storageMigration.js";
+import { purgeStaleJobs } from "./lib/inflight.js";
+import { configureLogger } from "./lib/logger.js";
+import { createRequestLogger } from "./lib/requestLogger.js";
 import { configureRoutes } from "./routes/index.js";
 import { config } from "./config.js";
+import { getServerPort, listenWithPortFallback } from "./lib/runtimePorts.js";
 
 const rootDir = dirname(fileURLToPath(import.meta.url));
 
@@ -51,10 +55,28 @@ function readPackageVersion() {
   }
 }
 
+function setUiStaticHeaders(res, filePath) {
+  const normalized = filePath.replace(/\\/g, "/");
+  if (normalized.endsWith("/index.html")) {
+    res.setHeader("Cache-Control", "no-store, max-age=0");
+    return;
+  }
+  if (normalized.includes("/assets/")) {
+    res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
+  }
+}
+
 export function buildApp(ctx) {
   const app = express();
+  configureLogger({ level: ctx.config.log.level });
+  app.use(createRequestLogger());
   app.use(express.json({ limit: ctx.config.server.bodyLimit }));
-  app.use(express.static(join(ctx.rootDir, "ui", "dist")));
+  app.use(express.static(join(ctx.rootDir, "ui", "dist"), {
+    setHeaders: setUiStaticHeaders,
+  }));
+  app.use("/assets", (_req, res) => {
+    res.status(404).type("text/plain").send("Asset not found");
+  });
   app.use("/generated", express.static(ctx.config.storage.generatedDir, {
     maxAge: ctx.config.storage.staticMaxAge,
     immutable: true,
@@ -63,16 +85,33 @@ export function buildApp(ctx) {
   return app;
 }
 
+function runtimeHostUrl(host) {
+  if (!host || host === "0.0.0.0" || host === "::") return "localhost";
+  return host;
+}
+
 function advertise(ctx) {
   try {
     mkdirSync(dirname(ctx.config.storage.advertiseFile), { recursive: true });
     writeFileSync(
       ctx.config.storage.advertiseFile,
       JSON.stringify({
-        port: Number(ctx.config.server.port),
+        port: Number(ctx.serverActualPort || ctx.config.server.port),
+        url: ctx.serverUrl,
         pid: process.pid,
         startedAt: ctx.startedAt,
         version: ctx.packageVersion,
+        backend: {
+          configuredPort: Number(ctx.serverConfiguredPort || ctx.config.server.port),
+          actualPort: Number(ctx.serverActualPort || ctx.config.server.port),
+          url: ctx.serverUrl,
+        },
+        oauth: {
+          configuredPort: Number(ctx.oauthPort),
+          actualPort: Number(ctx.oauthActualPort || ctx.oauthPort),
+          url: ctx.oauthUrl,
+          status: ctx.oauthReadyState,
+        },
       }),
     );
   } catch (e) {
@@ -99,11 +138,16 @@ export async function createRuntimeContext(overrides = {}) {
   const apiKey = loadedKey.apiKey;
   const openai = overrides.openai ?? await createOpenAI(apiKey);
   const oauthPort = config.oauth.proxyPort;
-  return {
+  const ctx = {
     rootDir,
     config,
+    serverConfiguredPort: config.server.port,
+    serverActualPort: null,
+    serverUrl: `http://${runtimeHostUrl(config.server.host)}:${config.server.port}`,
     oauthPort,
+    oauthActualPort: oauthPort,
     oauthUrl: `http://127.0.0.1:${oauthPort}`,
+    oauthReadyState: config.oauth.autoStart ? "starting" : "disabled",
     hasApiKey: !!apiKey,
     apiKey,
     apiKeySource: loadedKey.apiKeySource,
@@ -111,11 +155,28 @@ export async function createRuntimeContext(overrides = {}) {
     startedAt: overrides.startedAt ?? Date.now(),
     packageVersion: overrides.packageVersion ?? readPackageVersion(),
   };
+  let resolveOAuthReady;
+  ctx.oauthReadyPromise = new Promise((resolve) => {
+    resolveOAuthReady = resolve;
+  });
+  ctx.markOAuthReady = ({ url, port } = {}) => {
+    if (url) ctx.oauthUrl = url;
+    if (port) ctx.oauthActualPort = port;
+    ctx.oauthReadyState = "ready";
+    resolveOAuthReady(ctx.oauthUrl);
+  };
+  ctx.markOAuthFailed = () => {
+    ctx.oauthReadyState = "failed";
+    resolveOAuthReady(null);
+  };
+  if (!config.oauth.autoStart) ctx.markOAuthReady({ url: ctx.oauthUrl, port: ctx.oauthPort });
+  return ctx;
 }
 
 export async function startServer(overrides = {}) {
   const ctx = await createRuntimeContext(overrides);
   await migrateGeneratedStorage(ctx);
+  purgeStaleJobs();
   const app = buildApp(ctx);
   const oauthChild =
     overrides.oauthChild !== undefined
@@ -125,31 +186,43 @@ export async function startServer(overrides = {}) {
         : startOAuthProxy({
             oauthPort: ctx.oauthPort,
             restartDelayMs: ctx.config.oauth.restartDelayMs,
+            onReady: ({ url, port }) => {
+              ctx.markOAuthReady({ url, port });
+              advertise(ctx);
+            },
+            onExit: () => ctx.markOAuthFailed(),
           });
+  if (overrides.oauthChild !== undefined || !ctx.config.oauth.autoStart) {
+    ctx.markOAuthReady({ url: ctx.oauthUrl, port: ctx.oauthPort });
+  }
 
   onShutdown(() => {
     unadvertise(ctx);
-    try { oauthChild?.kill(); } catch {}
+    try { oauthChild?.stop?.(); } catch {}
+    try { oauthChild?.kill?.(); } catch {}
   });
   process.on("exit", () => unadvertise(ctx));
 
-  const server = app.listen(ctx.config.server.port, () => {
-    console.log(`Image Gen running at http://localhost:${ctx.config.server.port}`);
-    console.log(`Provider policy: OAuth only (API key hard-disabled). OAuth proxy port ${ctx.oauthPort}.`);
-    advertise(ctx);
-    try {
-      const s = ensureDefaultSession();
-      console.log(`[db] default session: ${s.id} (${s.title})`);
-    } catch (err) {
-      console.error("[db] bootstrap failed:", err.message);
-    }
+  const server = await listenWithPortFallback(app, ctx.config.server.port, {
+    host: ctx.config.server.host,
+    label: "server",
+    onFallback: ({ requestedPort, actualPort }) => {
+      console.log(`[server.port] requested=${requestedPort} actual=${actualPort} reason=EADDRINUSE`);
+    },
   });
+  ctx.serverActualPort = getServerPort(server) || ctx.config.server.port;
+  ctx.serverUrl = `http://${runtimeHostUrl(ctx.config.server.host)}:${ctx.serverActualPort}`;
+  console.log(`Image Gen running at ${ctx.serverUrl}`);
+  console.log(`Provider policy: OAuth only (API key hard-disabled). OAuth proxy port ${ctx.oauthPort}.`);
+  advertise(ctx);
+  try {
+    const s = ensureDefaultSession();
+    console.log(`[db] default session: ${s.id} (${s.title})`);
+  } catch (err) {
+    console.error("[db] bootstrap failed:", err.message);
+  }
 
   server.on("error", (err) => {
-    if (err?.code === "EADDRINUSE") {
-      console.error(`[server] Port ${ctx.config.server.port} is already in use. Stop the existing image_gen server before starting another dev server.`);
-      process.exit(1);
-    }
     console.error("[server] Failed to start:", err?.message || err);
     process.exit(1);
   });