ima2-gen 1.1.13 → 1.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ima2-gen",
-  "version": "1.1.13",
+  "version": "1.1.16",
   "description": "Local OAuth image generation studio with classic and node workflows",
   "type": "module",
   "bin": {
@@ -20,7 +20,7 @@
     "setup": "node bin/ima2.js setup",
     "prepack": "npm run ui:build && npm run build:server && npm run build:cli",
     "prepublishOnly": "npm run typecheck && npm run typecheck:tests && npm run test:inventory && npm run ui:build && npm run build:server && npm run build:cli && npm run lint:pkg && npm run test:package-install",
-    "lint:pkg": "node -e \"const p=require('./package.json'); const req=['name','version','bin']; for(const k of req){if(!p[k])throw new Error('missing '+k)} const mustInclude=['bin/','lib/','routes/','skills/','integrations/comfyui/ima2_gen_bridge/__init__.py','integrations/comfyui/ima2_gen_bridge/nodes.py','integrations/comfyui/ima2_gen_bridge/README.md','assets/card-news/templates/','server.js','LICENSE']; for(const f of mustInclude){if(!p.files.includes(f))throw new Error('files[] must include '+f)}\"",
+    "lint:pkg": "node -e \"const p=require('./package.json'); const req=['name','version','bin']; for(const k of req){if(!p[k])throw new Error('missing '+k)} const mustInclude=['bin/','lib/','routes/','skills/','integrations/comfyui/ima2_gen_bridge/__init__.py','integrations/comfyui/ima2_gen_bridge/nodes.py','integrations/comfyui/ima2_gen_bridge/README.md','assets/card-news/templates/','vendor/','server.js','LICENSE']; for(const f of mustInclude){if(!p.files.includes(f))throw new Error('files[] must include '+f)}\"",
     "publish:dry-run": "node scripts/publish-dry-run.mjs",
     "release:patch": "npm version patch && npm publish && git push origin main --tags",
     "release:minor": "npm version minor && npm publish && git push origin main --tags",
@@ -52,6 +52,7 @@
     "integrations/comfyui/ima2_gen_bridge/README.md",
     "ui/dist/",
     "docs/",
+    "vendor/",
     "assets/card-news/templates/",
     "server.ts",
     "config.ts",
@@ -70,10 +71,14 @@
     "express": "^5.1.0",
     "openai": "^5.8.2",
     "openai-oauth": "^1.0.2",
+    "progrok": "file:vendor/progrok-0.1.0.tgz",
     "sharp": "^0.34.5",
     "trash": "^10.1.1",
     "ulid": "^3.0.2"
   },
+  "bundleDependencies": [
+    "progrok"
+  ],
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
     "@types/express": "^5.0.6",

package/routes/edit.js

@@ -1,10 +1,12 @@
 import { mkdir, writeFile } from "fs/promises";
 import { join } from "path";
 import { randomBytes } from "crypto";
+import { detectImageMimeFromB64 } from "../lib/refs.js";
 import { classifyUpstreamError } from "../lib/errorClassify.js";
 import { normalizeOAuthParams } from "../lib/oauthNormalize.js";
 import { resolveProviderOptions } from "../lib/providerOptions.js";
 import { editViaResponses } from "../lib/responsesImageAdapter.js";
+import { editViaGrok } from "../lib/grokImageAdapter.js";
 import { startJob, finishJob, registerJobAbortController, isJobCanceled } from "../lib/inflight.js";
 import { isGenerationCanceledError, makeGenerationCanceledError, throwIfJobCanceled, } from "../lib/generationCancel.js";
 import { logEvent, logError } from "../lib/logger.js";
@@ -18,6 +20,13 @@ function validateModeration(ctx, moderation) {
     }
     return { moderation };
 }
+function imageFormatFromMime(mime) {
+    if (mime === "image/jpeg")
+        return "jpeg";
+    if (mime === "image/webp")
+        return "webp";
+    return "png";
+}
 const MAX_EDIT_MASK_BYTES = 16 * 1024 * 1024;
 const BASE64_RE = /^[A-Za-z0-9+/]+={0,2}$/;
 function stripPngDataUrl(value) {
@@ -114,6 +123,12 @@ export function registerEditRoutes(app, ctxRaw) {
                 finishErrorCode = "INVALID_EDIT_INPUT";
                 return res.status(400).json({ error: "Prompt and image are required" });
             }
+            if (activeProvider === "grok" && rawMask) {
+                finishStatus = "error";
+                finishHttpStatus = 400;
+                finishErrorCode = "GROK_MASK_UNSUPPORTED";
+                return res.status(400).json({ error: "Grok provider does not support mask editing", code: "GROK_MASK_UNSUPPORTED" });
+            }
             const maskCheck = validateEditMask(imageB64, rawMask);
             if (maskCheck.error) {
                 finishStatus = "error";
@@ -145,18 +160,47 @@ export function registerEditRoutes(app, ctxRaw) {
                 maskBytes: maskCheck.maskBytes ?? 0,
             });
             const startTime = Date.now();
-            const { b64: resultB64, usage, revisedPrompt, webSearchCalls = 0 } = await editViaResponses(activeProvider, prompt, imageB64, quality, effectiveSize, moderation, normalizedPromptMode, ctx, requestId, {
-                model: imageModel,
-                reasoningEffort,
-                webSearchEnabled,
-                mask: maskCheck.mask,
-                signal: cancelController.signal,
-            });
+            let resultB64;
+            let usage;
+            let revisedPrompt;
+            let webSearchCalls = 0;
+            let resultMimeFromProvider;
+            if (activeProvider === "grok") {
+                const grokModel = quality === "high" ? "grok-imagine-image-quality" : imageModel;
+                const r = await editViaGrok(prompt, imageB64, ctx, {
+                    model: grokModel,
+                    size: effectiveSize,
+                    signal: cancelController.signal,
+                    requestId,
+                });
+                resultB64 = r.b64;
+                usage = r.usage;
+                revisedPrompt = r.revisedPrompt;
+                webSearchCalls = r.webSearchCalls;
+                resultMimeFromProvider = r.mime;
+            }
+            else {
+                const r = await editViaResponses(activeProvider, prompt, imageB64, quality, effectiveSize, moderation, normalizedPromptMode, ctx, requestId, {
+                    model: imageModel,
+                    reasoningEffort,
+                    webSearchEnabled,
+                    mask: maskCheck.mask,
+                    signal: cancelController.signal,
+                });
+                resultB64 = r.b64;
+                usage = r.usage ?? null;
+                revisedPrompt = r.revisedPrompt ?? undefined;
+                webSearchCalls = r.webSearchCalls ?? 0;
+            }
             throwIfJobCanceled(requestId);
-            const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+            const elapsed = +((Date.now() - startTime) / 1000).toFixed(1);
             await mkdir(ctx.config.storage.generatedDir, { recursive: true });
             throwIfJobCanceled(requestId);
-            const filename = `${Date.now()}_${randomBytes(ctx.config.ids.generatedHexBytes).toString("hex")}.png`;
+            const editMime = activeProvider === "grok"
+                ? (resultMimeFromProvider || detectImageMimeFromB64(resultB64) || "image/png")
+                : "image/png";
+            const editExt = activeProvider === "grok" ? imageFormatFromMime(editMime) : "png";
+            const filename = `${Date.now()}_${randomBytes(ctx.config.ids.generatedHexBytes).toString("hex")}.${editExt}`;
             await writeFile(join(ctx.config.storage.generatedDir, filename), Buffer.from(resultB64, "base64"));
             const meta = {
                 prompt,
@@ -167,7 +211,9 @@ export function registerEditRoutes(app, ctxRaw) {
                 size: effectiveSize,
                 moderation,
                 model: imageModel,
-                format: "png",
+                reasoningEffort,
+                elapsed,
+                format: editExt,
                 provider: activeProvider,
                 kind: "edit",
                 requestId,
@@ -187,12 +233,13 @@ export function registerEditRoutes(app, ctxRaw) {
                 elapsedMs: Date.now() - startTime,
             });
             res.json({
-                image: `data:image/png;base64,${resultB64}`,
+                image: `data:${editMime};base64,${resultB64}`,
                 elapsed,
+                reasoningEffort,
                 filename,
                 usage,
                 provider: activeProvider,
-                model: imageModel,
+                model: activeProvider === "grok" ? (quality === "high" ? "grok-imagine-image-quality" : imageModel) : imageModel,
                 moderation,
                 warnings: qualityWarnings,
                 revisedPrompt: revisedPrompt || null,
@@ -203,6 +250,7 @@ export function registerEditRoutes(app, ctxRaw) {
         }
         catch (e) {
             const err = errInfo(e);
+            const ext = (err.raw && typeof err.raw === "object" ? err.raw : {});
             const fallbackCode = err.code || classifyUpstreamError(err.message);
             if (isGenerationCanceledError(err.raw) || isJobCanceled(requestId)) {
                 const canceled = makeGenerationCanceledError();
@@ -219,7 +267,31 @@ export function registerEditRoutes(app, ctxRaw) {
             finishHttpStatus = err.status || 500;
             finishErrorCode = fallbackCode || "EDIT_FAILED";
             logError("edit", "error", err.raw, { requestId, code: finishErrorCode });
-            res.status(err.status || 500).json({ error: err.message, code: fallbackCode });
+            res.status(err.status || 500).json({
+                error: err.message,
+                code: fallbackCode,
+                upstreamCode: ext.upstreamCode || null,
+                upstreamType: ext.upstreamType || null,
+                upstreamParam: ext.upstreamParam || null,
+                diagnosticReason: ext.diagnosticReason || null,
+                retryKind: ext.retryKind || null,
+                initialEventCount: ext.initialEventCount ?? null,
+                initialEventTypes: ext.initialEventTypes || null,
+                referencesDroppedOnRetry: ext.referencesDroppedOnRetry ?? null,
+                developerPromptDroppedOnRetry: ext.developerPromptDroppedOnRetry ?? null,
+                webSearchDroppedOnRetry: ext.webSearchDroppedOnRetry ?? null,
+                fallbackEventCount: ext.fallbackEventCount ?? null,
+                fallbackEventTypes: ext.fallbackEventTypes || null,
+                fallbackImageCallSeen: ext.fallbackImageCallSeen ?? null,
+                fallbackImageResultCount: ext.fallbackImageResultCount ?? null,
+                errorEventCount: ext.eventCount ?? null,
+                eventTypes: ext.eventTypes || null,
+                webSearchCalls: ext.webSearchCalls ?? null,
+                responseDiagnostics: ext.responseDiagnostics || null,
+                toolTypes: ext.toolTypes || null,
+                toolChoiceKind: ext.toolChoiceKind || null,
+                requestId,
+            });
         }
         finally {
             finishJob(requestId, {

package/routes/edit.ts

@@ -2,10 +2,12 @@ import { mkdir, writeFile } from "fs/promises";
 import { join } from "path";
 import { randomBytes } from "crypto";
 import type { Express, Request, Response } from "express";
+import { detectImageMimeFromB64 } from "../lib/refs.js";
 import { classifyUpstreamError } from "../lib/errorClassify.js";
 import { normalizeOAuthParams } from "../lib/oauthNormalize.js";
 import { resolveProviderOptions } from "../lib/providerOptions.js";
 import { editViaResponses } from "../lib/responsesImageAdapter.js";
+import { editViaGrok } from "../lib/grokImageAdapter.js";
 import { startJob, finishJob, registerJobAbortController, isJobCanceled } from "../lib/inflight.js";
 import {
   isGenerationCanceledError,
@@ -25,6 +27,12 @@ function validateModeration(ctx: RuntimeContext, moderation: unknown) {
   return { moderation };
 }
 
+function imageFormatFromMime(mime: string | null | undefined): "png" | "jpeg" | "webp" {
+  if (mime === "image/jpeg") return "jpeg";
+  if (mime === "image/webp") return "webp";
+  return "png";
+}
+
 const MAX_EDIT_MASK_BYTES = 16 * 1024 * 1024;
 const BASE64_RE = /^[A-Za-z0-9+/]+={0,2}$/;
 
@@ -149,6 +157,12 @@ export function registerEditRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
         finishErrorCode = "INVALID_EDIT_INPUT";
         return res.status(400).json({ error: "Prompt and image are required" });
       }
+      if (activeProvider === "grok" && rawMask) {
+        finishStatus = "error";
+        finishHttpStatus = 400;
+        finishErrorCode = "GROK_MASK_UNSUPPORTED";
+        return res.status(400).json({ error: "Grok provider does not support mask editing", code: "GROK_MASK_UNSUPPORTED" });
+      }
       const maskCheck: any = validateEditMask(imageB64, rawMask);
       if (maskCheck.error) {
         finishStatus = "error";
@@ -181,30 +195,59 @@ export function registerEditRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
         maskBytes: maskCheck.maskBytes ?? 0,
       });
       const startTime = Date.now();
-      const { b64: resultB64, usage, revisedPrompt, webSearchCalls = 0 } = await editViaResponses(
-        activeProvider,
-        prompt,
-        imageB64,
-        quality,
-        effectiveSize,
-        moderation,
-        normalizedPromptMode,
-        ctx,
-        requestId,
-        {
-          model: imageModel,
-          reasoningEffort,
-          webSearchEnabled,
-          mask: maskCheck.mask,
+      let resultB64: string;
+      let usage: Record<string, number> | null;
+      let revisedPrompt: string | undefined;
+      let webSearchCalls = 0;
+      let resultMimeFromProvider: string | undefined;
+
+      if (activeProvider === "grok") {
+        const grokModel = quality === "high" ? "grok-imagine-image-quality" : imageModel;
+        const r = await editViaGrok(prompt, imageB64, ctx, {
+          model: grokModel,
+          size: effectiveSize,
           signal: cancelController.signal,
-        },
-      );
+          requestId,
+        });
+        resultB64 = r.b64;
+        usage = r.usage;
+        revisedPrompt = r.revisedPrompt;
+        webSearchCalls = r.webSearchCalls;
+        resultMimeFromProvider = r.mime;
+      } else {
+        const r = await editViaResponses(
+          activeProvider,
+          prompt,
+          imageB64,
+          quality,
+          effectiveSize,
+          moderation,
+          normalizedPromptMode,
+          ctx,
+          requestId,
+          {
+            model: imageModel,
+            reasoningEffort,
+            webSearchEnabled,
+            mask: maskCheck.mask,
+            signal: cancelController.signal,
+          },
+        );
+        resultB64 = r.b64;
+        usage = r.usage ?? null;
+        revisedPrompt = r.revisedPrompt ?? undefined;
+        webSearchCalls = r.webSearchCalls ?? 0;
+      }
       throwIfJobCanceled(requestId);
 
-      const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+      const elapsed = +((Date.now() - startTime) / 1000).toFixed(1);
       await mkdir(ctx.config.storage.generatedDir, { recursive: true });
       throwIfJobCanceled(requestId);
-      const filename = `${Date.now()}_${randomBytes(ctx.config.ids.generatedHexBytes).toString("hex")}.png`;
+      const editMime = activeProvider === "grok"
+        ? (resultMimeFromProvider || detectImageMimeFromB64(resultB64) || "image/png")
+        : "image/png";
+      const editExt = activeProvider === "grok" ? imageFormatFromMime(editMime) : "png";
+      const filename = `${Date.now()}_${randomBytes(ctx.config.ids.generatedHexBytes).toString("hex")}.${editExt}`;
       await writeFile(join(ctx.config.storage.generatedDir, filename), Buffer.from(resultB64, "base64"));
       const meta = {
         prompt,
@@ -215,7 +258,9 @@ export function registerEditRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
         size: effectiveSize,
         moderation,
         model: imageModel,
-        format: "png",
+        reasoningEffort,
+        elapsed,
+        format: editExt,
         provider: activeProvider,
         kind: "edit",
         requestId,
@@ -236,12 +281,13 @@ export function registerEditRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
       });
 
       res.json({
-        image: `data:image/png;base64,${resultB64}`,
+        image: `data:${editMime};base64,${resultB64}`,
         elapsed,
+        reasoningEffort,
         filename,
         usage,
         provider: activeProvider,
-        model: imageModel,
+        model: activeProvider === "grok" ? (quality === "high" ? "grok-imagine-image-quality" : imageModel) : imageModel,
         moderation,
         warnings: qualityWarnings,
         revisedPrompt: revisedPrompt || null,
@@ -251,6 +297,7 @@ export function registerEditRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
       });
     } catch (e) {
       const err = errInfo(e);
+      const ext = (err.raw && typeof err.raw === "object" ? err.raw as Record<string, unknown> : {});
       const fallbackCode = err.code || classifyUpstreamError(err.message);
       if (isGenerationCanceledError(err.raw) || isJobCanceled(requestId)) {
         const canceled = makeGenerationCanceledError();
@@ -267,7 +314,31 @@ export function registerEditRoutes(app: Express, ctxRaw: RouteRuntimeContext) {
       finishHttpStatus = err.status || 500;
       finishErrorCode = fallbackCode || "EDIT_FAILED";
       logError("edit", "error", err.raw, { requestId, code: finishErrorCode });
-      res.status(err.status || 500).json({ error: err.message, code: fallbackCode });
+      res.status(err.status || 500).json({
+        error: err.message,
+        code: fallbackCode,
+        upstreamCode: ext.upstreamCode || null,
+        upstreamType: ext.upstreamType || null,
+        upstreamParam: ext.upstreamParam || null,
+        diagnosticReason: ext.diagnosticReason || null,
+        retryKind: ext.retryKind || null,
+        initialEventCount: ext.initialEventCount ?? null,
+        initialEventTypes: ext.initialEventTypes || null,
+        referencesDroppedOnRetry: ext.referencesDroppedOnRetry ?? null,
+        developerPromptDroppedOnRetry: ext.developerPromptDroppedOnRetry ?? null,
+        webSearchDroppedOnRetry: ext.webSearchDroppedOnRetry ?? null,
+        fallbackEventCount: ext.fallbackEventCount ?? null,
+        fallbackEventTypes: ext.fallbackEventTypes || null,
+        fallbackImageCallSeen: ext.fallbackImageCallSeen ?? null,
+        fallbackImageResultCount: ext.fallbackImageResultCount ?? null,
+        errorEventCount: ext.eventCount ?? null,
+        eventTypes: ext.eventTypes || null,
+        webSearchCalls: ext.webSearchCalls ?? null,
+        responseDiagnostics: ext.responseDiagnostics || null,
+        toolTypes: ext.toolTypes || null,
+        toolChoiceKind: ext.toolChoiceKind || null,
+        requestId,
+      });
     } finally {
       finishJob(requestId, {
         canceled: finishCanceled,

package/routes/generate.js

@@ -1,11 +1,12 @@
-import { mkdir, writeFile } from "fs/promises";
+import { mkdir, readFile, writeFile } from "fs/promises";
 import { join } from "path";
 import { randomBytes } from "crypto";
-import { summarizeReferencePayload, validateAndNormalizeRefs } from "../lib/refs.js";
+import { detectImageMimeFromB64, summarizeReferencePayload, validateAndNormalizeRefs } from "../lib/refs.js";
 import { classifyUpstreamError } from "../lib/errorClassify.js";
 import { normalizeOAuthParams } from "../lib/oauthNormalize.js";
 import { resolveProviderOptions } from "../lib/providerOptions.js";
 import { generateViaResponses } from "../lib/responsesImageAdapter.js";
+import { generateViaGrok, planGrokImage } from "../lib/grokImageAdapter.js";
 import { isNonRetryableGenerationError, normalizeGenerationFailure } from "../lib/generationErrors.js";
 import { startJob, finishJob, registerJobAbortController, isJobCanceled } from "../lib/inflight.js";
 import { isGenerationCanceledError, makeGenerationCanceledError, throwIfJobCanceled, } from "../lib/generationCancel.js";
@@ -21,6 +22,13 @@ function validateModeration(ctx, moderation) {
     }
     return { moderation };
 }
+function imageFormatFromMime(mime) {
+    if (mime === "image/jpeg")
+        return "jpeg";
+    if (mime === "image/webp")
+        return "webp";
+    return "png";
+}
 export function registerGenerateRoutes(app, ctxRaw) {
     const ctx = requireRuntimeContext(ctxRaw);
     app.post("/api/generate", async (req, res) => {
@@ -93,6 +101,16 @@ export function registerGenerateRoutes(app, ctxRaw) {
                 return res.status(400).json({ error: refCheckResult.error, code: refCheckResult.code });
             }
             const refCheck = refCheckResult;
+            if (activeProvider === "grok" && refCheck.refs.length > 3) {
+                finishStatus = "error";
+                finishHttpStatus = 400;
+                finishErrorCode = "GROK_REF_TOO_MANY";
+                return res.status(400).json({
+                    error: "Grok image editing supports up to 3 reference images",
+                    code: "GROK_REF_TOO_MANY",
+                    requestId,
+                });
+            }
             const client = req.get("x-ima2-client") || "ui";
             const referenceDiagnostics = refCheck.referenceDiagnostics || [];
             const referenceMismatchCount = referenceDiagnostics.filter((ref) => ref.warnings?.includes("mime_mismatch")).length;
@@ -118,9 +136,34 @@ export function registerGenerateRoutes(app, ctxRaw) {
             });
             const startTime = Date.now();
             const mimeMap = { png: "image/png", jpeg: "image/jpeg", webp: "image/webp" };
-            const mime = mimeMap[String(format)] || "image/png";
+            const effectiveFormat = activeProvider === "grok" ? "jpeg" : String(format);
+            const mime = mimeMap[effectiveFormat] || "image/png";
             await mkdir(ctx.config.storage.generatedDir, { recursive: true });
+            const sharedGrokPlan = activeProvider === "grok"
+                ? await planGrokImage(prompt, ctx, {
+                    model: quality === "high" ? "grok-imagine-image-quality" : imageModel,
+                    size: effectiveSize,
+                    signal: cancelController.signal,
+                    requestId,
+                    referenceCount: refCheck.refs.length,
+                    references: refCheck.refDetails,
+                })
+                : null;
             const generateOne = async () => {
+                if (activeProvider === "grok") {
+                    const grokModel = quality === "high" ? "grok-imagine-image-quality" : imageModel;
+                    const r = await generateViaGrok(prompt, ctx, {
+                        model: grokModel,
+                        size: effectiveSize,
+                        signal: cancelController.signal,
+                        requestId,
+                        plannedPrompt: sharedGrokPlan?.prompt,
+                        webSearchCalls: sharedGrokPlan?.webSearchCalls,
+                        references: refCheck.refDetails,
+                    });
+                    throwIfJobCanceled(requestId);
+                    return r;
+                }
                 const MAX_RETRIES = 1;
                 let lastErr;
                 for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -130,6 +173,7 @@ export function registerGenerateRoutes(app, ctxRaw) {
                             reasoningEffort,
                             webSearchEnabled,
                             signal: cancelController.signal,
+                            allowPromptOnlyOAuthFallback: activeProvider !== "api",
                         });
                         throwIfJobCanceled(requestId);
                         if (r.b64)
@@ -157,11 +201,28 @@ export function registerGenerateRoutes(app, ctxRaw) {
             const images = [];
             let totalUsage = null;
             let totalWebSearchCalls = 0;
+            let firstRetryMeta = null;
             for (const r of results) {
                 if (r.status === "fulfilled" && r.value.b64) {
                     throwIfJobCanceled(requestId);
+                    const valueWithMime = r.value;
+                    const resultMime = activeProvider === "grok"
+                        ? (valueWithMime.mime || detectImageMimeFromB64(r.value.b64) || mime)
+                        : mime;
+                    const resultFormat = activeProvider === "grok" ? imageFormatFromMime(resultMime) : effectiveFormat;
+                    const retryValue = r.value;
+                    if (!firstRetryMeta && retryValue.retryKind) {
+                        firstRetryMeta = {
+                            retryKind: retryValue.retryKind,
+                            initialEventCount: retryValue.initialEventCount ?? null,
+                            initialEventTypes: retryValue.initialEventTypes || null,
+                            referencesDroppedOnRetry: retryValue.referencesDroppedOnRetry ?? null,
+                            developerPromptDroppedOnRetry: retryValue.developerPromptDroppedOnRetry ?? null,
+                            webSearchDroppedOnRetry: retryValue.webSearchDroppedOnRetry ?? null,
+                        };
+                    }
                     const rand = randomBytes(ctx.config.ids.generatedHexBytes).toString("hex");
-                    const filename = `${Date.now()}_${rand}_${images.length}.${format}`;
+                    const filename = `${Date.now()}_${rand}_${images.length}.${resultFormat}`;
                     const meta = {
                         kind: "classic",
                         requestId,
@@ -175,9 +236,10 @@ export function registerGenerateRoutes(app, ctxRaw) {
                         composerInsertedPrompts,
                         quality,
                         size: effectiveSize,
-                        format,
+                        format: resultFormat,
                         moderation,
-                        model: imageModel,
+                        model: activeProvider === "grok" ? (quality === "high" ? "grok-imagine-image-quality" : imageModel) : imageModel,
+                        reasoningEffort,
                         provider: activeProvider,
                         createdAt: Date.now(),
                         usage: r.value.usage || null,
@@ -186,7 +248,7 @@ export function registerGenerateRoutes(app, ctxRaw) {
                         refsCount: refCheck.refs.length,
                     };
                     const rawBuffer = Buffer.from(r.value.b64, "base64");
-                    const embedded = await embedImageMetadataBestEffort(rawBuffer, format, meta, {
+                    const embedded = await embedImageMetadataBestEffort(rawBuffer, resultFormat, meta, {
                         version: ctx.packageVersion,
                     });
                     if (!embedded.embedded) {
@@ -201,7 +263,7 @@ export function registerGenerateRoutes(app, ctxRaw) {
                     await writeFile(join(ctx.config.storage.generatedDir, filename + ".json"), JSON.stringify(meta)).catch(() => { });
                     invalidateHistoryIndex();
                     images.push({
-                        image: `data:${mime};base64,${r.value.b64}`,
+                        image: `data:${resultMime};base64,${r.value.b64}`,
                         filename,
                         revisedPrompt: r.value.revisedPrompt || null,
                     });
@@ -217,8 +279,11 @@ export function registerGenerateRoutes(app, ctxRaw) {
                             });
                         }
                     }
-                    if (typeof r.value.webSearchCalls === "number")
-                        totalWebSearchCalls += r.value.webSearchCalls;
+                    if (typeof r.value.webSearchCalls === "number") {
+                        totalWebSearchCalls = activeProvider === "grok"
+                            ? Math.max(totalWebSearchCalls, r.value.webSearchCalls)
+                            : totalWebSearchCalls + r.value.webSearchCalls;
+                    }
                 }
                 else if (r.status === "rejected") {
                     logError("generate", "parallel_failed", r.reason, { requestId });
@@ -249,8 +314,21 @@ export function registerGenerateRoutes(app, ctxRaw) {
                         upstreamParam: firstErr.upstreamParam || null,
                         diagnosticReason: firstErr.diagnosticReason || null,
                         retryKind: firstErr.retryKind || null,
+                        initialEventCount: firstErr.initialEventCount ?? null,
+                        initialEventTypes: firstErr.initialEventTypes || null,
                         referencesDroppedOnRetry: firstErr.referencesDroppedOnRetry ?? null,
+                        developerPromptDroppedOnRetry: firstErr.developerPromptDroppedOnRetry ?? null,
+                        webSearchDroppedOnRetry: firstErr.webSearchDroppedOnRetry ?? null,
+                        fallbackEventCount: firstErr.fallbackEventCount ?? null,
+                        fallbackEventTypes: firstErr.fallbackEventTypes || null,
+                        fallbackImageCallSeen: firstErr.fallbackImageCallSeen ?? null,
+                        fallbackImageResultCount: firstErr.fallbackImageResultCount ?? null,
                         errorEventCount: firstErr.eventCount ?? null,
+                        eventTypes: firstErr.eventTypes || null,
+                        webSearchCalls: firstErr.webSearchCalls ?? null,
+                        responseDiagnostics: firstErr.responseDiagnostics || null,
+                        toolTypes: firstErr.toolTypes || null,
+                        toolChoiceKind: firstErr.toolChoiceKind || null,
                         requestId,
                     });
                 }
@@ -259,11 +337,26 @@ export function registerGenerateRoutes(app, ctxRaw) {
                 finishErrorCode = "GENERATE_ALL_FAILED";
                 return res.status(500).json({ error: "All generation attempts failed" });
             }
-            const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+            const elapsed = +((Date.now() - startTime) / 1000).toFixed(1);
+            // Persist elapsed (computed after the generation loop) into each image's sidecar.
+            // forward-fix: only newly generated items get elapsed. The embedded XMP is written
+            // earlier in the loop (before elapsed exists), so history reload relies on this sidecar patch.
+            await Promise.all(images.map(async ({ filename }) => {
+                try {
+                    const sidecarPath = join(ctx.config.storage.generatedDir, filename + ".json");
+                    const sidecarMeta = JSON.parse(await readFile(sidecarPath, "utf-8"));
+                    sidecarMeta.elapsed = elapsed;
+                    await writeFile(sidecarPath, JSON.stringify(sidecarMeta));
+                }
+                catch {
+                    /* best-effort, matches the sidecar write .catch(() => {}) above */
+                }
+            }));
             const firstRevised = images[0]?.revisedPrompt || null;
             const extra = {
                 usage: totalUsage,
                 provider: activeProvider,
+                reasoningEffort,
                 webSearchCalls: totalWebSearchCalls,
                 quality,
                 size: effectiveSize,
@@ -273,6 +366,7 @@ export function registerGenerateRoutes(app, ctxRaw) {
                 revisedPrompt: firstRevised,
                 promptMode: normalizedPromptMode,
                 webSearchEnabled,
+                ...(firstRetryMeta || {}),
             };
             if (count === 1) {
                 finishHttpStatus = 200;
@@ -323,8 +417,21 @@ export function registerGenerateRoutes(app, ctxRaw) {
                 upstreamParam: ext.upstreamParam || null,
                 diagnosticReason: ext.diagnosticReason || null,
                 retryKind: ext.retryKind || null,
+                initialEventCount: ext.initialEventCount ?? null,
+                initialEventTypes: ext.initialEventTypes || null,
                 referencesDroppedOnRetry: ext.referencesDroppedOnRetry ?? null,
+                developerPromptDroppedOnRetry: ext.developerPromptDroppedOnRetry ?? null,
+                webSearchDroppedOnRetry: ext.webSearchDroppedOnRetry ?? null,
+                fallbackEventCount: ext.fallbackEventCount ?? null,
+                fallbackEventTypes: ext.fallbackEventTypes || null,
+                fallbackImageCallSeen: ext.fallbackImageCallSeen ?? null,
+                fallbackImageResultCount: ext.fallbackImageResultCount ?? null,
                 errorEventCount: ext.eventCount ?? null,
+                eventTypes: ext.eventTypes || null,
+                webSearchCalls: ext.webSearchCalls ?? null,
+                responseDiagnostics: ext.responseDiagnostics || null,
+                toolTypes: ext.toolTypes || null,
+                toolChoiceKind: ext.toolChoiceKind || null,
                 requestId,
             });
         }