ima2-gen 1.1.13 → 1.1.16

package/lib/agentRuntime.js

@@ -1,12 +1,15 @@
 import { randomBytes } from "node:crypto";
-import { mkdir, writeFile } from "node:fs/promises";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { ulid } from "ulid";
 import { embedImageMetadataBestEffort } from "./imageMetadataStore.js";
 import { invalidateHistoryIndex } from "./historyIndex.js";
 import { logEvent } from "./logger.js";
+import { detectImageMimeFromB64 } from "./refs.js";
+import { resolveProviderOptions } from "./providerOptions.js";
 import { generateViaResponses } from "./responsesImageAdapter.js";
-import { appendAgentTurn, buildImageContextManifest, getAgentSession, importAgentImage, recordAgentWebFinding, restartAgentRuntimeSession, } from "./agentStore.js";
+import { generateViaGrok } from "./grokImageAdapter.js";
+import { appendAgentTurn, buildImageContextManifest, getAgentImages, getAgentSession, importAgentImage, recordAgentWebFinding, restartAgentRuntimeSession, } from "./agentStore.js";
 import { AGENT_ALLOWED_TOOLS, } from "./agentTypes.js";
 import { errInfo } from "./errInfo.js";
 export function assertAgentAllowedTools(tools) {
@@ -40,7 +43,7 @@ export async function runAgentGenerationPlan(ctx, sessionId, prompt, plan, optio
     const session = getAgentSession(sessionId);
     if (!session)
         throw notFound(sessionId);
-    const webSearchEnabled = options.webSearchEnabled ?? session.webSearchEnabled;
+    const webSearchEnabled = options.provider === "grok" ? true : options.webSearchEnabled ?? session.webSearchEnabled;
     const enabledTools = webSearchEnabled
         ? [...AGENT_ALLOWED_TOOLS]
         : ["ima2.get_image_context", "ima2.generate_image"];
@@ -87,7 +90,7 @@ export async function runAgentGenerationPlan(ctx, sessionId, prompt, plan, optio
             ...options,
             requestId,
         });
-        const findingIds = recordSearchFindings(sessionId, generationPrompt, result.webSearchCalls);
+        const findingIds = recordSearchFindings(sessionId, generationPrompt, result.webSearchCalls, result.provider ?? "oauth");
         const finishedAt = Date.now();
         return {
             prompt: generationPrompt,
@@ -187,7 +190,9 @@ async function generateAgentImageWithRetry(ctx, sessionId, prompt, manifest, web
         }
         catch (error) {
             lastError = error;
-            if (!isTextOnlyResult(error) || attempt === 1)
+            if (!isTextOnlyResult(error))
+                throw error;
+            if (attempt === 1)
                 break;
             appendAgentTurn({
                 sessionId,
@@ -201,17 +206,74 @@ async function generateAgentImageWithRetry(ctx, sessionId, prompt, manifest, web
 }
 async function generateAgentImage(ctx, sessionId, prompt, manifest, webSearchEnabled, options) {
     const requestId = options.requestId ?? `agent_${ulid()}`;
-    const format = options.format ?? "png";
-    const response = await generateViaResponses(options.provider ?? "oauth", `${manifest}\n\nUser request:\n${prompt}`, options.quality ?? "medium", options.size ?? "1024x1024", options.moderation ?? "low", [], requestId, "auto", ctx, {
-        model: options.model,
-        reasoningEffort: options.reasoningEffort,
-        webSearchEnabled,
-        signal: options.signal,
+    const providerOptions = resolveProviderOptions(ctx, {
+        provider: options.provider ?? "oauth",
+        rawModel: options.model,
+        rawReasoningEffort: options.reasoningEffort,
+        rawSize: options.size ?? "1024x1024",
+        rawWebSearchEnabled: webSearchEnabled,
+        searchMode: webSearchEnabled ? "on" : "off",
     });
-    const image = await persistAgentImage(ctx, sessionId, prompt, format, requestId, response);
-    return { image, webSearchCalls: response.webSearchCalls || 0, text: response.text ?? null };
+    if (providerOptions.error) {
+        const err = new Error(providerOptions.error);
+        err.code = providerOptions.code;
+        err.status = providerOptions.status;
+        throw err;
+    }
+    const activeProvider = providerOptions.provider;
+    const effectiveModel = activeProvider === "grok" && options.quality === "high"
+        ? "grok-imagine-image-quality"
+        : providerOptions.model;
+    const response = activeProvider === "grok"
+        ? await generateViaGrok(`${manifest}\n\nUser request:\n${prompt}`, ctx, {
+            model: effectiveModel,
+            size: providerOptions.size,
+            requestId,
+            signal: options.signal ?? undefined,
+            references: await loadAgentCurrentImageReferences(ctx, sessionId),
+        })
+        : await generateViaResponses(activeProvider, `${manifest}\n\nUser request:\n${prompt}`, options.quality ?? "medium", providerOptions.size, options.moderation ?? "low", [], requestId, "auto", ctx, {
+            model: providerOptions.model,
+            reasoningEffort: providerOptions.reasoningEffort,
+            webSearchEnabled,
+            signal: options.signal,
+        });
+    const format = activeProvider === "grok"
+        ? imageFormatFromMime(("mime" in response ? response.mime : undefined) || detectImageMimeFromB64(response.b64) || "image/jpeg")
+        : options.format ?? "png";
+    const image = await persistAgentImage(ctx, sessionId, prompt, format, requestId, response, {
+        provider: String(activeProvider),
+        model: String(effectiveModel),
+    });
+    const responseText = "text" in response && typeof response.text === "string" ? response.text : null;
+    return { image, webSearchCalls: response.webSearchCalls || 0, text: responseText, provider: activeProvider };
+}
+async function loadAgentCurrentImageReferences(ctx, sessionId) {
+    const session = getAgentSession(sessionId);
+    const currentImage = session?.lastImageId
+        ? getAgentImages(sessionId).find((image) => image.id === session.lastImageId)
+        : null;
+    if (!currentImage?.filename)
+        return [];
+    try {
+        const b64 = (await readFile(join(ctx.config.storage.generatedDir, currentImage.filename))).toString("base64");
+        const mime = detectImageMimeFromB64(b64);
+        return [{ b64, declaredMime: mime, detectedMime: mime }];
+    }
+    catch (error) {
+        const err = errInfo(error);
+        logEvent("agent", "grok_ref_missing", { sessionId, filename: currentImage.filename, code: err.code, message: err.message });
+        return [];
+    }
 }
-async function persistAgentImage(ctx, sessionId, prompt, format, requestId, response) {
+function imageFormatFromMime(mime) {
+    if (mime === "image/jpeg")
+        return "jpeg";
+    if (mime === "image/webp")
+        return "webp";
+    return "png";
+}
+async function persistAgentImage(ctx, sessionId, prompt, format, requestId, response, generation) {
     await mkdir(ctx.config.storage.generatedDir, { recursive: true });
     const rand = randomBytes(ctx.config.ids.generatedHexBytes).toString("hex");
     const filename = `${Date.now()}_${rand}_agent.${format}`;
@@ -222,7 +284,8 @@ async function persistAgentImage(ctx, sessionId, prompt, format, requestId, resp
         prompt,
         userPrompt: prompt,
         revisedPrompt: response.revisedPrompt ?? null,
-        provider: "agent",
+        provider: generation.provider,
+        model: generation.model,
         createdAt: Date.now(),
         usage: response.usage ?? null,
         webSearchCalls: response.webSearchCalls ?? 0,
@@ -243,15 +306,16 @@ async function persistAgentImage(ctx, sessionId, prompt, format, requestId, resp
         createdAt: Date.now(),
     });
 }
-function recordSearchFindings(sessionId, prompt, count) {
+function recordSearchFindings(sessionId, prompt, count, provider) {
     if (!count)
         return [];
+    const isGrok = provider === "grok";
     return [
         recordAgentWebFinding({
             sessionId,
             query: prompt,
-            title: "Responses web_search",
-            snippet: `Responses reported ${count} web search call${count === 1 ? "" : "s"}.`,
+            title: isGrok ? "Grok visual research" : "Responses web_search",
+            snippet: `${isGrok ? "Grok" : "Responses"} reported ${count} web search call${count === 1 ? "" : "s"}.`,
         }),
     ];
 }
@@ -264,7 +328,12 @@ function forceImagePrompt(prompt) {
 }
 function isTextOnlyResult(error) {
     const err = errInfo(error);
-    return err.code === "EMPTY_RESPONSE" || err.message.includes("No image data");
+    return [
+        "EMPTY_RESPONSE",
+        "IMAGE_TOOL_NOT_CALLED",
+        "WEB_SEARCH_ONLY_RESPONSE",
+        "IMAGE_TOOL_COMPLETED_WITHOUT_RESULT",
+    ].includes(err.code || "") || err.message.includes("No image data");
 }
 function textOnlyError(cause) {
     const err = new Error("Agent result did not include an image artifact.");

package/lib/agentRuntime.ts

@@ -1,14 +1,18 @@
 import { randomBytes } from "node:crypto";
-import { mkdir, writeFile } from "node:fs/promises";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { ulid } from "ulid";
 import { embedImageMetadataBestEffort } from "./imageMetadataStore.js";
 import { invalidateHistoryIndex } from "./historyIndex.js";
 import { logEvent } from "./logger.js";
+import { detectImageMimeFromB64 } from "./refs.js";
+import { resolveProviderOptions } from "./providerOptions.js";
 import { generateViaResponses } from "./responsesImageAdapter.js";
+import { generateViaGrok, type GrokReferenceImage } from "./grokImageAdapter.js";
 import {
   appendAgentTurn,
   buildImageContextManifest,
+  getAgentImages,
   getAgentSession,
   importAgentImage,
   recordAgentWebFinding,
@@ -88,7 +92,7 @@ export async function runAgentGenerationPlan(
 ) {
   const session = getAgentSession(sessionId);
   if (!session) throw notFound(sessionId);
-  const webSearchEnabled = options.webSearchEnabled ?? session.webSearchEnabled;
+  const webSearchEnabled = options.provider === "grok" ? true : options.webSearchEnabled ?? session.webSearchEnabled;
   const enabledTools: AgentToolName[] = webSearchEnabled
     ? [...AGENT_ALLOWED_TOOLS]
     : ["ima2.get_image_context", "ima2.generate_image"];
@@ -135,7 +139,7 @@ export async function runAgentGenerationPlan(
       ...options,
       requestId,
     });
-    const findingIds = recordSearchFindings(sessionId, generationPrompt, result.webSearchCalls);
+    const findingIds = recordSearchFindings(sessionId, generationPrompt, result.webSearchCalls, result.provider ?? "oauth");
     const finishedAt = Date.now();
     return {
       prompt: generationPrompt,
@@ -252,7 +256,8 @@ async function generateAgentImageWithRetry(
       if (result.image) return result;
     } catch (error) {
       lastError = error;
-      if (!isTextOnlyResult(error) || attempt === 1) break;
+      if (!isTextOnlyResult(error)) throw error;
+      if (attempt === 1) break;
       appendAgentTurn({
         sessionId,
         role: "tool",
@@ -273,26 +278,81 @@ async function generateAgentImage(
   options: AgentRunOptions,
 ) {
   const requestId = options.requestId ?? `agent_${ulid()}`;
-  const format = options.format ?? "png";
-  const response = await generateViaResponses(
-    options.provider ?? "oauth",
-    `${manifest}\n\nUser request:\n${prompt}`,
-    options.quality ?? "medium",
-    options.size ?? "1024x1024",
-    options.moderation ?? "low",
-    [],
-    requestId,
-    "auto",
-    ctx,
-    {
-      model: options.model,
-      reasoningEffort: options.reasoningEffort,
-      webSearchEnabled,
-      signal: options.signal,
-    },
-  );
-  const image = await persistAgentImage(ctx, sessionId, prompt, format, requestId, response);
-  return { image, webSearchCalls: response.webSearchCalls || 0, text: response.text ?? null };
+  const providerOptions = resolveProviderOptions(ctx, {
+    provider: options.provider ?? "oauth",
+    rawModel: options.model,
+    rawReasoningEffort: options.reasoningEffort,
+    rawSize: options.size ?? "1024x1024",
+    rawWebSearchEnabled: webSearchEnabled,
+    searchMode: webSearchEnabled ? "on" : "off",
+  });
+  if (providerOptions.error) {
+    const err = new Error(providerOptions.error) as Error & { code?: string; status?: number };
+    err.code = providerOptions.code;
+    err.status = providerOptions.status;
+    throw err;
+  }
+  const activeProvider = providerOptions.provider;
+  const effectiveModel = activeProvider === "grok" && options.quality === "high"
+    ? "grok-imagine-image-quality"
+    : providerOptions.model;
+  const response = activeProvider === "grok"
+    ? await generateViaGrok(`${manifest}\n\nUser request:\n${prompt}`, ctx, {
+        model: effectiveModel,
+        size: providerOptions.size,
+        requestId,
+        signal: options.signal ?? undefined,
+        references: await loadAgentCurrentImageReferences(ctx, sessionId),
+      })
+    : await generateViaResponses(
+        activeProvider,
+        `${manifest}\n\nUser request:\n${prompt}`,
+        options.quality ?? "medium",
+        providerOptions.size,
+        options.moderation ?? "low",
+        [],
+        requestId,
+        "auto",
+        ctx,
+        {
+          model: providerOptions.model,
+          reasoningEffort: providerOptions.reasoningEffort,
+          webSearchEnabled,
+          signal: options.signal,
+        },
+      );
+  const format = activeProvider === "grok"
+    ? imageFormatFromMime(("mime" in response ? response.mime : undefined) || detectImageMimeFromB64(response.b64) || "image/jpeg")
+    : options.format ?? "png";
+  const image = await persistAgentImage(ctx, sessionId, prompt, format, requestId, response, {
+    provider: String(activeProvider),
+    model: String(effectiveModel),
+  });
+  const responseText = "text" in response && typeof response.text === "string" ? response.text : null;
+  return { image, webSearchCalls: response.webSearchCalls || 0, text: responseText, provider: activeProvider };
+}
+
+async function loadAgentCurrentImageReferences(ctx: RuntimeContext, sessionId: string): Promise<GrokReferenceImage[]> {
+  const session = getAgentSession(sessionId);
+  const currentImage = session?.lastImageId
+    ? getAgentImages(sessionId).find((image) => image.id === session.lastImageId)
+    : null;
+  if (!currentImage?.filename) return [];
+  try {
+    const b64 = (await readFile(join(ctx.config.storage.generatedDir, currentImage.filename))).toString("base64");
+    const mime = detectImageMimeFromB64(b64);
+    return [{ b64, declaredMime: mime, detectedMime: mime }];
+  } catch (error) {
+    const err = errInfo(error);
+    logEvent("agent", "grok_ref_missing", { sessionId, filename: currentImage.filename, code: err.code, message: err.message });
+    return [];
+  }
+}
+
+function imageFormatFromMime(mime: string | null | undefined): "png" | "jpeg" | "webp" {
+  if (mime === "image/jpeg") return "jpeg";
+  if (mime === "image/webp") return "webp";
+  return "png";
 }
 
 async function persistAgentImage(
@@ -302,6 +362,7 @@ async function persistAgentImage(
   format: string,
   requestId: string,
   response: { b64: string; revisedPrompt?: string | null; usage?: unknown; webSearchCalls?: number },
+  generation: { provider: string; model: string },
 ) {
   await mkdir(ctx.config.storage.generatedDir, { recursive: true });
   const rand = randomBytes(ctx.config.ids.generatedHexBytes).toString("hex");
@@ -313,7 +374,8 @@ async function persistAgentImage(
     prompt,
     userPrompt: prompt,
     revisedPrompt: response.revisedPrompt ?? null,
-    provider: "agent",
+    provider: generation.provider,
+    model: generation.model,
     createdAt: Date.now(),
     usage: response.usage ?? null,
     webSearchCalls: response.webSearchCalls ?? 0,
@@ -335,14 +397,15 @@ async function persistAgentImage(
   });
 }
 
-function recordSearchFindings(sessionId: string, prompt: string, count: number) {
+function recordSearchFindings(sessionId: string, prompt: string, count: number, provider: string) {
   if (!count) return [];
+  const isGrok = provider === "grok";
   return [
     recordAgentWebFinding({
       sessionId,
       query: prompt,
-      title: "Responses web_search",
-      snippet: `Responses reported ${count} web search call${count === 1 ? "" : "s"}.`,
+      title: isGrok ? "Grok visual research" : "Responses web_search",
+      snippet: `${isGrok ? "Grok" : "Responses"} reported ${count} web search call${count === 1 ? "" : "s"}.`,
     }),
   ];
 }
@@ -357,7 +420,12 @@ function forceImagePrompt(prompt: string) {
 
 function isTextOnlyResult(error: unknown) {
   const err = errInfo(error);
-  return err.code === "EMPTY_RESPONSE" || err.message.includes("No image data");
+  return [
+    "EMPTY_RESPONSE",
+    "IMAGE_TOOL_NOT_CALLED",
+    "WEB_SEARCH_ONLY_RESPONSE",
+    "IMAGE_TOOL_COMPLETED_WITHOUT_RESULT",
+  ].includes(err.code || "") || err.message.includes("No image data");
 }
 
 function textOnlyError(cause: unknown) {

package/lib/agentSettings.js

@@ -1,4 +1,4 @@
-const PROVIDERS = new Set(["oauth", "api"]);
+const PROVIDERS = new Set(["oauth", "api", "grok"]);
 const QUALITIES = new Set(["low", "medium", "high"]);
 const FORMATS = new Set(["png", "jpeg", "webp"]);
 const MODERATIONS = new Set(["auto", "low"]);

package/lib/agentSettings.ts

@@ -1,6 +1,6 @@
 import type { AgentGenerationSettings } from "./agentTypes.js";
 
-const PROVIDERS = new Set(["oauth", "api"]);
+const PROVIDERS = new Set(["oauth", "api", "grok"]);
 const QUALITIES = new Set(["low", "medium", "high"]);
 const FORMATS = new Set(["png", "jpeg", "webp"]);
 const MODERATIONS = new Set(["auto", "low"]);

package/lib/agentTypes.ts

@@ -16,7 +16,7 @@ export type AgentGenerationPlanSource = "auto-default" | "auto-request" | "manua
 export type AgentSlashCommandName = "question" | "help" | "variants" | "generate" | "parallelism";
 
 export interface AgentGenerationSettings {
-  provider: "oauth" | "api";
+  provider: "oauth" | "api" | "grok";
   model: string;
   quality: "low" | "medium" | "high";
   size: string;

package/lib/capabilities.js

@@ -3,7 +3,7 @@ import { KEY_TO_ENV, WRITABLE_CONFIG_KEYS } from "./configKeys.js";
 import { DEFAULT_IMAGE_QUALITY, VALID_IMAGE_QUALITIES } from "./oauthNormalize.js";
 const MAX_GENERATED_IMAGES = 8;
 const VALID_MODES = ["auto", "direct"];
-const VALID_PROVIDERS = ["auto", "oauth", "api"];
+const VALID_PROVIDERS = ["auto", "oauth", "api", "grok"];
 const AGENT_COMMANDS = [
     "skill",
     "capabilities",
@@ -15,7 +15,8 @@ const AGENT_COMMANDS = [
     "inflight ls",
     "providers",
     "oauth status",
-    "agent",
+    "grok status",
+    "prompt build",
 ];
 function toArray(value) {
     if (!value)
@@ -43,11 +44,16 @@ export function buildIma2Capabilities({ appConfig = runtimeConfigDefault, packag
                 size: appConfig.apiProvider.defaultSize,
                 webSearchEnabled: appConfig.apiProvider.allowWebSearch,
             },
+            grok: {
+                model: appConfig.grokProvider.defaultImageModel,
+                plannerModel: appConfig.grokProvider.plannerModel,
+            },
         },
         valid: {
             imageModels: {
                 supported: toArray(appConfig.imageModels.valid),
                 unsupported: toArray(appConfig.imageModels.unsupported),
+                grokSupported: ["grok-imagine-image", "grok-imagine-image-quality"],
             },
             reasoningEfforts: toArray(appConfig.imageModels.validReasoningEfforts),
             quality: toArray(VALID_IMAGE_QUALITIES),
@@ -83,6 +89,8 @@ export function buildIma2Capabilities({ appConfig = runtimeConfigDefault, packag
             route: "/api/agent/sessions",
             allowedTools: ["ima2.get_image_context", "ima2.web_search", "ima2.generate_image"],
             finalArtifact: "image",
+            uiOnly: true,
+            cliCommand: null,
         },
         guidance: {
             highQuality: "Use --quality high for requests where output fidelity matters.",

package/lib/capabilities.ts

@@ -7,7 +7,7 @@ type CapabilitySource = "local" | "server";
 
 const MAX_GENERATED_IMAGES = 8;
 const VALID_MODES = ["auto", "direct"] as const;
-const VALID_PROVIDERS = ["auto", "oauth", "api"] as const;
+const VALID_PROVIDERS = ["auto", "oauth", "api", "grok"] as const;
 const AGENT_COMMANDS = [
   "skill",
   "capabilities",
@@ -19,7 +19,8 @@ const AGENT_COMMANDS = [
   "inflight ls",
   "providers",
   "oauth status",
-  "agent",
+  "grok status",
+  "prompt build",
 ];
 
 function toArray<T>(value: Iterable<T> | T[] | undefined): T[] {
@@ -57,11 +58,16 @@ export function buildIma2Capabilities({
         size: appConfig.apiProvider.defaultSize,
         webSearchEnabled: appConfig.apiProvider.allowWebSearch,
       },
+      grok: {
+        model: appConfig.grokProvider.defaultImageModel,
+        plannerModel: appConfig.grokProvider.plannerModel,
+      },
     },
     valid: {
       imageModels: {
         supported: toArray(appConfig.imageModels.valid),
         unsupported: toArray(appConfig.imageModels.unsupported),
+        grokSupported: ["grok-imagine-image", "grok-imagine-image-quality"],
       },
       reasoningEfforts: toArray(appConfig.imageModels.validReasoningEfforts),
       quality: toArray(VALID_IMAGE_QUALITIES),
@@ -97,6 +103,8 @@ export function buildIma2Capabilities({
       route: "/api/agent/sessions",
       allowedTools: ["ima2.get_image_context", "ima2.web_search", "ima2.generate_image"],
       finalArtifact: "image",
+      uiOnly: true,
+      cliCommand: null,
     },
     guidance: {
       highQuality: "Use --quality high for requests where output fidelity matters.",

package/lib/configKeys.js

@@ -10,6 +10,9 @@ export const WRITABLE_CONFIG_KEYS = new Set([
     "cardNewsPlanner.model",
     "cardNewsPlanner.timeoutMs",
     "cardNewsPlanner.deterministicFallback",
+    "grokProvider.plannerModel",
+    "grokProvider.plannerTimeoutMs",
+    "grokProvider.defaultImageModel",
     "comfy.defaultUrl",
     "comfy.uploadTimeoutMs",
     "comfy.maxUploadBytes",
@@ -41,6 +44,9 @@ export const KEY_TO_ENV = {
     "cardNewsPlanner.enabled": "IMA2_CARD_NEWS_PLANNER",
     "cardNewsPlanner.model": "IMA2_CARD_NEWS_PLANNER_MODEL",
     "cardNewsPlanner.timeoutMs": "IMA2_CARD_NEWS_PLANNER_TIMEOUT_MS",
+    "grokProvider.plannerModel": "IMA2_GROK_PLANNER_MODEL",
+    "grokProvider.plannerTimeoutMs": "IMA2_GROK_PLANNER_TIMEOUT_MS",
+    "grokProvider.defaultImageModel": "IMA2_GROK_IMAGE_MODEL_DEFAULT",
     "limits.maxParallel": "IMA2_MAX_PARALLEL",
     "limits.maxRefCount": "IMA2_MAX_REF_COUNT",
     "history.defaultPageSize": "IMA2_HISTORY_PAGE_SIZE",

package/lib/configKeys.ts

@@ -11,6 +11,9 @@ export const WRITABLE_CONFIG_KEYS = new Set([
   "cardNewsPlanner.model",
   "cardNewsPlanner.timeoutMs",
   "cardNewsPlanner.deterministicFallback",
+  "grokProvider.plannerModel",
+  "grokProvider.plannerTimeoutMs",
+  "grokProvider.defaultImageModel",
   "comfy.defaultUrl",
   "comfy.uploadTimeoutMs",
   "comfy.maxUploadBytes",
@@ -43,6 +46,9 @@ export const KEY_TO_ENV: Record<string, string> = {
   "cardNewsPlanner.enabled": "IMA2_CARD_NEWS_PLANNER",
   "cardNewsPlanner.model": "IMA2_CARD_NEWS_PLANNER_MODEL",
   "cardNewsPlanner.timeoutMs": "IMA2_CARD_NEWS_PLANNER_TIMEOUT_MS",
+  "grokProvider.plannerModel": "IMA2_GROK_PLANNER_MODEL",
+  "grokProvider.plannerTimeoutMs": "IMA2_GROK_PLANNER_TIMEOUT_MS",
+  "grokProvider.defaultImageModel": "IMA2_GROK_IMAGE_MODEL_DEFAULT",
   "limits.maxParallel": "IMA2_MAX_PARALLEL",
   "limits.maxRefCount": "IMA2_MAX_REF_COUNT",
   "history.defaultPageSize": "IMA2_HISTORY_PAGE_SIZE",
@@ -54,4 +60,3 @@ const ALWAYS_REDACT = new Set(["provider", "apiKey", "oauth.token", "oauth.refre
 export function isSensitiveConfigKey(key: string): boolean {
   return ALWAYS_REDACT.has(key) || REDACT_PATTERN.test(key);
 }
-

package/lib/errorClassify.js

@@ -1,7 +1,7 @@
 // 0.09.8 — upstream error classifier.
 // Pattern-match upstream OpenAI / OAuth / network errors into stable ImaErrorCode
 // values so the UI can surface localized, actionable messages with CTAs.
-/** @typedef {"REF_TOO_LARGE"|"REF_NOT_BASE64"|"REF_EMPTY"|"REF_TOO_MANY"|"MODERATION_REFUSED"|"UPSTREAM_5XX"|"AUTH_CHATGPT_EXPIRED"|"AUTH_API_KEY_INVALID"|"NETWORK_FAILED"|"OAUTH_UNAVAILABLE"|"INVALID_REQUEST"|"INVALID_MODERATION"|"APIKEY_DISABLED"|"SAFETY_REFUSAL"|"EMPTY_RESPONSE"|"OAUTH_UPSTREAM_ERROR"|"DB_ERROR"|"UNKNOWN"} ImaErrorCode */
+/** @typedef {"REF_TOO_LARGE"|"REF_NOT_BASE64"|"REF_EMPTY"|"REF_TOO_MANY"|"MODERATION_REFUSED"|"UPSTREAM_5XX"|"AUTH_CHATGPT_EXPIRED"|"AUTH_API_KEY_INVALID"|"NETWORK_FAILED"|"OAUTH_UNAVAILABLE"|"INVALID_REQUEST"|"INVALID_MODERATION"|"APIKEY_DISABLED"|"SAFETY_REFUSAL"|"EMPTY_RESPONSE"|"STREAM_PARSE_FAILED"|"IMAGE_TOOL_NOT_CALLED"|"WEB_SEARCH_ONLY_RESPONSE"|"IMAGE_TOOL_FAILED"|"IMAGE_TOOL_COMPLETED_WITHOUT_RESULT"|"OAUTH_IMAGE_CAPABILITY_UNAVAILABLE"|"RESPONSES_STREAM_ERROR"|"OAUTH_UPSTREAM_ERROR"|"DB_ERROR"|"UNKNOWN"} ImaErrorCode */
 const INVALID_REQUEST_CODES = new Set([
     "bad_request",
     "invalid_request",

package/lib/errorClassify.ts

@@ -2,7 +2,7 @@
 // Pattern-match upstream OpenAI / OAuth / network errors into stable ImaErrorCode
 // values so the UI can surface localized, actionable messages with CTAs.
 
-/** @typedef {"REF_TOO_LARGE"|"REF_NOT_BASE64"|"REF_EMPTY"|"REF_TOO_MANY"|"MODERATION_REFUSED"|"UPSTREAM_5XX"|"AUTH_CHATGPT_EXPIRED"|"AUTH_API_KEY_INVALID"|"NETWORK_FAILED"|"OAUTH_UNAVAILABLE"|"INVALID_REQUEST"|"INVALID_MODERATION"|"APIKEY_DISABLED"|"SAFETY_REFUSAL"|"EMPTY_RESPONSE"|"OAUTH_UPSTREAM_ERROR"|"DB_ERROR"|"UNKNOWN"} ImaErrorCode */
+/** @typedef {"REF_TOO_LARGE"|"REF_NOT_BASE64"|"REF_EMPTY"|"REF_TOO_MANY"|"MODERATION_REFUSED"|"UPSTREAM_5XX"|"AUTH_CHATGPT_EXPIRED"|"AUTH_API_KEY_INVALID"|"NETWORK_FAILED"|"OAUTH_UNAVAILABLE"|"INVALID_REQUEST"|"INVALID_MODERATION"|"APIKEY_DISABLED"|"SAFETY_REFUSAL"|"EMPTY_RESPONSE"|"STREAM_PARSE_FAILED"|"IMAGE_TOOL_NOT_CALLED"|"WEB_SEARCH_ONLY_RESPONSE"|"IMAGE_TOOL_FAILED"|"IMAGE_TOOL_COMPLETED_WITHOUT_RESULT"|"OAUTH_IMAGE_CAPABILITY_UNAVAILABLE"|"RESPONSES_STREAM_ERROR"|"OAUTH_UPSTREAM_ERROR"|"DB_ERROR"|"UNKNOWN"} ImaErrorCode */
 
 const INVALID_REQUEST_CODES = new Set([
   "bad_request",