ima2-gen 1.1.7 → 1.1.9

package/lib/imageMetadata.js

@@ -2,110 +2,107 @@ export const IMA2_METADATA_SCHEMA = "ima2.generation.v1";
 export const IMA2_XMP_NAMESPACE = "https://github.com/lidge-jun/ima2-gen/ns/1.0/";
 export const IMA2_XMP_PROPERTY = "GenerationMetadata";
 export const MAX_EMBEDDED_METADATA_CHARS = 64 * 1024;
-
 function isPlainObject(value) {
-  return value != null && typeof value === "object" && !Array.isArray(value);
+    return value != null && typeof value === "object" && !Array.isArray(value);
 }
-
 function stringOrNull(value, max = 4000) {
-  if (typeof value !== "string") return null;
-  return value.slice(0, max);
+    if (typeof value !== "string")
+        return null;
+    return value.slice(0, max);
 }
-
 function numberOrNull(value) {
-  return Number.isFinite(value) ? value : null;
+    return Number.isFinite(value) ? value : null;
 }
-
 function xmlEscape(value) {
-  return String(value)
-    .replace(/&/g, "&")
-    .replace(/"/g, """)
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;");
+    return String(value)
+        .replace(/&/g, "&amp;")
+        .replace(/"/g, "&quot;")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;");
 }
-
 function xmlUnescape(value) {
-  return String(value)
-    .replace(/&quot;/g, "\"")
-    .replace(/&lt;/g, "<")
-    .replace(/&gt;/g, ">")
-    .replace(/&amp;/g, "&");
+    return String(value)
+        .replace(/&quot;/g, "\"")
+        .replace(/&lt;/g, "<")
+        .replace(/&gt;/g, ">")
+        .replace(/&amp;/g, "&");
 }
-
 export function buildIma2MetadataPayload(meta = {}, context = {}) {
-  const payload = {
-    schema: IMA2_METADATA_SCHEMA,
-    app: "ima2-gen",
-    version: stringOrNull(context.version, 80) || null,
-    createdAt: numberOrNull(meta.createdAt) || Date.now(),
-    kind: stringOrNull(meta.kind, 80),
-    canvasVersion: Boolean(meta.canvasVersion),
-    canvasSourceFilename: stringOrNull(meta.canvasSourceFilename, 240),
-    canvasEditableFilename: stringOrNull(meta.canvasEditableFilename, 240),
-    canvasMergedAt: numberOrNull(meta.canvasMergedAt),
-    prompt: stringOrNull(meta.prompt),
-    userPrompt: stringOrNull(meta.userPrompt) || stringOrNull(meta.prompt),
-    revisedPrompt: stringOrNull(meta.revisedPrompt),
-    promptMode: meta.promptMode === "direct" ? "direct" : "auto",
-    quality: stringOrNull(meta.quality, 40),
-    size: stringOrNull(meta.size, 40),
-    format: stringOrNull(meta.format, 20),
-    moderation: stringOrNull(meta.moderation, 40),
-    model: stringOrNull(meta.model, 80),
-    provider: stringOrNull(meta.provider, 40),
-    sessionId: stringOrNull(meta.sessionId, 120),
-    nodeId: stringOrNull(meta.nodeId, 120),
-    parentNodeId: stringOrNull(meta.parentNodeId, 120),
-    clientNodeId: stringOrNull(meta.clientNodeId, 120),
-    requestId: stringOrNull(meta.requestId, 160),
-    refsCount: Number.isFinite(meta.refsCount) ? meta.refsCount : 0,
-    webSearchCalls: Number.isFinite(meta.webSearchCalls) ? meta.webSearchCalls : 0,
-    styleSheetApplied: Boolean(meta.styleSheetApplied),
-  };
-  return Object.fromEntries(Object.entries(payload).filter(([, value]) => value !== undefined));
+    const payload = {
+        schema: IMA2_METADATA_SCHEMA,
+        app: "ima2-gen",
+        version: stringOrNull(context.version, 80) || null,
+        createdAt: numberOrNull(meta.createdAt) || Date.now(),
+        kind: stringOrNull(meta.kind, 80),
+        canvasVersion: Boolean(meta.canvasVersion),
+        canvasSourceFilename: stringOrNull(meta.canvasSourceFilename, 240),
+        canvasEditableFilename: stringOrNull(meta.canvasEditableFilename, 240),
+        canvasMergedAt: numberOrNull(meta.canvasMergedAt),
+        prompt: stringOrNull(meta.prompt),
+        userPrompt: stringOrNull(meta.userPrompt) || stringOrNull(meta.prompt),
+        revisedPrompt: stringOrNull(meta.revisedPrompt),
+        promptMode: meta.promptMode === "direct" ? "direct" : "auto",
+        quality: stringOrNull(meta.quality, 40),
+        size: stringOrNull(meta.size, 40),
+        format: stringOrNull(meta.format, 20),
+        moderation: stringOrNull(meta.moderation, 40),
+        model: stringOrNull(meta.model, 80),
+        provider: stringOrNull(meta.provider, 40),
+        sessionId: stringOrNull(meta.sessionId, 120),
+        nodeId: stringOrNull(meta.nodeId, 120),
+        parentNodeId: stringOrNull(meta.parentNodeId, 120),
+        clientNodeId: stringOrNull(meta.clientNodeId, 120),
+        requestId: stringOrNull(meta.requestId, 160),
+        refsCount: Number.isFinite(meta.refsCount) ? meta.refsCount : 0,
+        webSearchCalls: Number.isFinite(meta.webSearchCalls) ? meta.webSearchCalls : 0,
+        styleSheetApplied: Boolean(meta.styleSheetApplied),
+    };
+    return Object.fromEntries(Object.entries(payload).filter(([, value]) => value !== undefined));
 }
-
 export function normalizeEmbeddedMetadata(value) {
-  if (!isPlainObject(value)) return null;
-  if (value.schema !== IMA2_METADATA_SCHEMA || value.app !== "ima2-gen") return null;
-  return buildIma2MetadataPayload(value, { version: value.version });
+    if (!isPlainObject(value))
+        return null;
+    if (value.schema !== IMA2_METADATA_SCHEMA || value.app !== "ima2-gen")
+        return null;
+    return buildIma2MetadataPayload(value, { version: value.version });
 }
-
 export function buildIma2Xmp(metadataPayload) {
-  const normalized = normalizeEmbeddedMetadata(metadataPayload);
-  if (!normalized) {
-    const err = new Error("Invalid ima2 metadata payload");
-    err.code = "IMAGE_METADATA_INVALID";
-    throw err;
-  }
-  const json = JSON.stringify(normalized);
-  if (json.length > MAX_EMBEDDED_METADATA_CHARS) {
-    const err = new Error("ima2 metadata payload is too large");
-    err.code = "IMAGE_METADATA_TOO_LARGE";
-    throw err;
-  }
-  const escaped = xmlEscape(json);
-  return [
-    "<?xpacket begin=\"\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>",
-    "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\">",
-    "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">",
-    `<rdf:Description xmlns:ima2="${IMA2_XMP_NAMESPACE}" ima2:${IMA2_XMP_PROPERTY}="${escaped}"/>`,
-    "</rdf:RDF>",
-    "</x:xmpmeta>",
-    "<?xpacket end=\"w\"?>",
-  ].join("");
+    const normalized = normalizeEmbeddedMetadata(metadataPayload);
+    if (!normalized) {
+        const err = new Error("Invalid ima2 metadata payload");
+        err.code = "IMAGE_METADATA_INVALID";
+        throw err;
+    }
+    const json = JSON.stringify(normalized);
+    if (json.length > MAX_EMBEDDED_METADATA_CHARS) {
+        const err = new Error("ima2 metadata payload is too large");
+        err.code = "IMAGE_METADATA_TOO_LARGE";
+        throw err;
+    }
+    const escaped = xmlEscape(json);
+    return [
+        "<?xpacket begin=\"\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>",
+        "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\">",
+        "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">",
+        `<rdf:Description xmlns:ima2="${IMA2_XMP_NAMESPACE}" ima2:${IMA2_XMP_PROPERTY}="${escaped}"/>`,
+        "</rdf:RDF>",
+        "</x:xmpmeta>",
+        "<?xpacket end=\"w\"?>",
+    ].join("");
 }
-
 export function parseIma2Xmp(xmpString) {
-  if (typeof xmpString !== "string" || xmpString.length === 0) return null;
-  const attrPattern = new RegExp(`ima2:${IMA2_XMP_PROPERTY}="([^"]*)"`);
-  const attrMatch = attrPattern.exec(xmpString);
-  const raw = attrMatch?.[1];
-  if (!raw) return null;
-  try {
-    const parsed = JSON.parse(xmlUnescape(raw));
-    return normalizeEmbeddedMetadata(parsed);
-  } catch {
-    return null;
-  }
+    if (typeof xmpString !== "string" || xmpString.length === 0)
+        return null;
+    const attrPattern = new RegExp(`ima2:${IMA2_XMP_PROPERTY}="([^"]*)"`);
+    const attrMatch = attrPattern.exec(xmpString);
+    const raw = attrMatch?.[1];
+    if (!raw)
+        return null;
+    try {
+        const parsed = JSON.parse(xmlUnescape(raw));
+        return normalizeEmbeddedMetadata(parsed);
+    }
+    catch {
+        return null;
+    }
 }

package/lib/imageMetadata.ts

@@ -0,0 +1,111 @@
+export const IMA2_METADATA_SCHEMA = "ima2.generation.v1";
+export const IMA2_XMP_NAMESPACE = "https://github.com/lidge-jun/ima2-gen/ns/1.0/";
+export const IMA2_XMP_PROPERTY = "GenerationMetadata";
+export const MAX_EMBEDDED_METADATA_CHARS = 64 * 1024;
+
+function isPlainObject(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value);
+}
+
+function stringOrNull(value, max = 4000) {
+  if (typeof value !== "string") return null;
+  return value.slice(0, max);
+}
+
+function numberOrNull(value) {
+  return Number.isFinite(value) ? value : null;
+}
+
+function xmlEscape(value) {
+  return String(value)
+    .replace(/&/g, "&")
+    .replace(/"/g, """)
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;");
+}
+
+function xmlUnescape(value) {
+  return String(value)
+    .replace(/&quot;/g, "\"")
+    .replace(/&lt;/g, "<")
+    .replace(/&gt;/g, ">")
+    .replace(/&amp;/g, "&");
+}
+
+export function buildIma2MetadataPayload(meta: any = {}, context: any = {}) {
+  const payload = {
+    schema: IMA2_METADATA_SCHEMA,
+    app: "ima2-gen",
+    version: stringOrNull(context.version, 80) || null,
+    createdAt: numberOrNull(meta.createdAt) || Date.now(),
+    kind: stringOrNull(meta.kind, 80),
+    canvasVersion: Boolean(meta.canvasVersion),
+    canvasSourceFilename: stringOrNull(meta.canvasSourceFilename, 240),
+    canvasEditableFilename: stringOrNull(meta.canvasEditableFilename, 240),
+    canvasMergedAt: numberOrNull(meta.canvasMergedAt),
+    prompt: stringOrNull(meta.prompt),
+    userPrompt: stringOrNull(meta.userPrompt) || stringOrNull(meta.prompt),
+    revisedPrompt: stringOrNull(meta.revisedPrompt),
+    promptMode: meta.promptMode === "direct" ? "direct" : "auto",
+    quality: stringOrNull(meta.quality, 40),
+    size: stringOrNull(meta.size, 40),
+    format: stringOrNull(meta.format, 20),
+    moderation: stringOrNull(meta.moderation, 40),
+    model: stringOrNull(meta.model, 80),
+    provider: stringOrNull(meta.provider, 40),
+    sessionId: stringOrNull(meta.sessionId, 120),
+    nodeId: stringOrNull(meta.nodeId, 120),
+    parentNodeId: stringOrNull(meta.parentNodeId, 120),
+    clientNodeId: stringOrNull(meta.clientNodeId, 120),
+    requestId: stringOrNull(meta.requestId, 160),
+    refsCount: Number.isFinite(meta.refsCount) ? meta.refsCount : 0,
+    webSearchCalls: Number.isFinite(meta.webSearchCalls) ? meta.webSearchCalls : 0,
+    styleSheetApplied: Boolean(meta.styleSheetApplied),
+  };
+  return Object.fromEntries(Object.entries(payload).filter(([, value]) => value !== undefined));
+}
+
+export function normalizeEmbeddedMetadata(value: any) {
+  if (!isPlainObject(value)) return null;
+  if (value.schema !== IMA2_METADATA_SCHEMA || value.app !== "ima2-gen") return null;
+  return buildIma2MetadataPayload(value, { version: value.version });
+}
+
+export function buildIma2Xmp(metadataPayload) {
+  const normalized = normalizeEmbeddedMetadata(metadataPayload);
+  if (!normalized) {
+    const err: any = new Error("Invalid ima2 metadata payload");
+    err.code = "IMAGE_METADATA_INVALID";
+    throw err;
+  }
+  const json = JSON.stringify(normalized);
+  if (json.length > MAX_EMBEDDED_METADATA_CHARS) {
+    const err: any = new Error("ima2 metadata payload is too large");
+    err.code = "IMAGE_METADATA_TOO_LARGE";
+    throw err;
+  }
+  const escaped = xmlEscape(json);
+  return [
+    "<?xpacket begin=\"\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>",
+    "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\">",
+    "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">",
+    `<rdf:Description xmlns:ima2="${IMA2_XMP_NAMESPACE}" ima2:${IMA2_XMP_PROPERTY}="${escaped}"/>`,
+    "</rdf:RDF>",
+    "</x:xmpmeta>",
+    "<?xpacket end=\"w\"?>",
+  ].join("");
+}
+
+export function parseIma2Xmp(xmpString) {
+  if (typeof xmpString !== "string" || xmpString.length === 0) return null;
+  const attrPattern = new RegExp(`ima2:${IMA2_XMP_PROPERTY}="([^"]*)"`);
+  const attrMatch = attrPattern.exec(xmpString);
+  const raw = attrMatch?.[1];
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(xmlUnescape(raw));
+    return normalizeEmbeddedMetadata(parsed);
+  } catch {
+    return null;
+  }
+}

package/lib/imageMetadataStore.js

@@ -1,67 +1,62 @@
 import { readFile } from "node:fs/promises";
 import sharp from "sharp";
 import { buildIma2MetadataPayload, buildIma2Xmp, parseIma2Xmp } from "./imageMetadata.js";
-
 const SUPPORTED_FORMATS = new Set(["png", "jpeg", "jpg", "webp"]);
-
 export function normalizeImageMetadataFormat(format) {
-  const normalized = String(format || "").toLowerCase();
-  if (normalized === "jpg") return "jpeg";
-  return normalized;
+    const normalized = String(format || "").toLowerCase();
+    if (normalized === "jpg")
+        return "jpeg";
+    return normalized;
 }
-
 export function isSupportedMetadataFormat(format) {
-  return SUPPORTED_FORMATS.has(String(format || "").toLowerCase());
+    return SUPPORTED_FORMATS.has(String(format || "").toLowerCase());
 }
-
 export async function embedImageMetadata(buffer, format, metadata, context = {}) {
-  const normalizedFormat = normalizeImageMetadataFormat(format);
-  if (!isSupportedMetadataFormat(normalizedFormat)) {
-    const err = new Error(`Unsupported image metadata format: ${format}`);
-    err.code = "IMAGE_METADATA_UNSUPPORTED_FORMAT";
-    throw err;
-  }
-  const payload = buildIma2MetadataPayload(metadata, context);
-  const xmp = buildIma2Xmp(payload);
-  const next = await sharp(buffer)
-    .toFormat(normalizedFormat)
-    .withXmp(xmp)
-    .toBuffer();
-  return { buffer: next, embedded: true, metadata: payload };
+    const normalizedFormat = normalizeImageMetadataFormat(format);
+    if (!isSupportedMetadataFormat(normalizedFormat)) {
+        const err = new Error(`Unsupported image metadata format: ${format}`);
+        err.code = "IMAGE_METADATA_UNSUPPORTED_FORMAT";
+        throw err;
+    }
+    const payload = buildIma2MetadataPayload(metadata, context);
+    const xmp = buildIma2Xmp(payload);
+    const next = await sharp(buffer)
+        .toFormat(normalizedFormat)
+        .withXmp(xmp)
+        .toBuffer();
+    return { buffer: next, embedded: true, metadata: payload };
 }
-
 export async function embedImageMetadataBestEffort(buffer, format, metadata, context = {}) {
-  try {
-    return await embedImageMetadata(buffer, format, metadata, context);
-  } catch (error) {
-    return {
-      buffer,
-      embedded: false,
-      warning: error?.message || "metadata embedding failed",
-      code: error?.code || "IMAGE_METADATA_EMBED_FAILED",
-    };
-  }
+    try {
+        return await embedImageMetadata(buffer, format, metadata, context);
+    }
+    catch (error) {
+        return {
+            buffer,
+            embedded: false,
+            warning: error?.message || "metadata embedding failed",
+            code: error?.code || "IMAGE_METADATA_EMBED_FAILED",
+        };
+    }
 }
-
 export async function readEmbeddedImageMetadata(buffer) {
-  const meta = await sharp(buffer, { failOn: "none" }).metadata();
-  const xmpString = meta.xmpAsString || (meta.xmp ? meta.xmp.toString("utf8") : "");
-  const xmp = parseIma2Xmp(xmpString);
-  if (xmp) return { metadata: xmp, source: "xmp", warnings: [] };
-
-  for (const comment of meta.comments || []) {
-    const text = comment?.text || "";
-    const parsed = parseIma2Xmp(text);
-    if (parsed) return { metadata: parsed, source: "png-comment", warnings: [] };
-  }
-
-  return {
-    metadata: null,
-    source: null,
-    warnings: ["No ima2 metadata found in this image."],
-  };
+    const meta = await sharp(buffer, { failOn: "none" }).metadata();
+    const xmpString = meta.xmpAsString || (meta.xmp ? meta.xmp.toString("utf8") : "");
+    const xmp = parseIma2Xmp(xmpString);
+    if (xmp)
+        return { metadata: xmp, source: "xmp", warnings: [] };
+    for (const comment of meta.comments || []) {
+        const text = comment?.text || "";
+        const parsed = parseIma2Xmp(text);
+        if (parsed)
+            return { metadata: parsed, source: "png-comment", warnings: [] };
+    }
+    return {
+        metadata: null,
+        source: null,
+        warnings: ["No ima2 metadata found in this image."],
+    };
 }
-
 export async function readEmbeddedImageMetadataFromFile(path) {
-  return readEmbeddedImageMetadata(await readFile(path));
+    return readEmbeddedImageMetadata(await readFile(path));
 }

package/lib/imageMetadataStore.ts

@@ -0,0 +1,67 @@
+import { readFile } from "node:fs/promises";
+import sharp from "sharp";
+import { buildIma2MetadataPayload, buildIma2Xmp, parseIma2Xmp } from "./imageMetadata.js";
+
+const SUPPORTED_FORMATS = new Set(["png", "jpeg", "jpg", "webp"]);
+
+export function normalizeImageMetadataFormat(format) {
+  const normalized = String(format || "").toLowerCase();
+  if (normalized === "jpg") return "jpeg";
+  return normalized;
+}
+
+export function isSupportedMetadataFormat(format) {
+  return SUPPORTED_FORMATS.has(String(format || "").toLowerCase());
+}
+
+export async function embedImageMetadata(buffer, format, metadata, context = {}) {
+  const normalizedFormat = normalizeImageMetadataFormat(format);
+  if (!isSupportedMetadataFormat(normalizedFormat)) {
+    const err: any = new Error(`Unsupported image metadata format: ${format}`);
+    err.code = "IMAGE_METADATA_UNSUPPORTED_FORMAT";
+    throw err;
+  }
+  const payload = buildIma2MetadataPayload(metadata, context);
+  const xmp = buildIma2Xmp(payload);
+  const next = await sharp(buffer)
+    .toFormat(normalizedFormat as any)
+    .withXmp(xmp)
+    .toBuffer();
+  return { buffer: next, embedded: true, metadata: payload };
+}
+
+export async function embedImageMetadataBestEffort(buffer, format, metadata, context = {}) {
+  try {
+    return await embedImageMetadata(buffer, format, metadata, context);
+  } catch (error: any) {
+    return {
+      buffer,
+      embedded: false,
+      warning: error?.message || "metadata embedding failed",
+      code: error?.code || "IMAGE_METADATA_EMBED_FAILED",
+    };
+  }
+}
+
+export async function readEmbeddedImageMetadata(buffer) {
+  const meta = await sharp(buffer, { failOn: "none" }).metadata();
+  const xmpString = meta.xmpAsString || (meta.xmp ? meta.xmp.toString("utf8") : "");
+  const xmp = parseIma2Xmp(xmpString);
+  if (xmp) return { metadata: xmp, source: "xmp", warnings: [] };
+
+  for (const comment of meta.comments || []) {
+    const text = comment?.text || "";
+    const parsed = parseIma2Xmp(text);
+    if (parsed) return { metadata: parsed, source: "png-comment", warnings: [] };
+  }
+
+  return {
+    metadata: null,
+    source: null,
+    warnings: ["No ima2 metadata found in this image."],
+  };
+}
+
+export async function readEmbeddedImageMetadataFromFile(path) {
+  return readEmbeddedImageMetadata(await readFile(path));
+}

package/lib/imageModels.js

@@ -1,52 +1,45 @@
 const FALLBACK_IMAGE_MODEL = "gpt-5.4-mini";
 const VALID_IMAGE_MODELS = new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]);
 const UNSUPPORTED_IMAGE_MODELS = new Set(["gpt-5.3-codex-spark"]);
-const FALLBACK_REASONING_EFFORT = "medium";
-const VALID_REASONING_EFFORTS = new Set(["low", "medium", "high", "xhigh"]);
-
+const FALLBACK_REASONING_EFFORT = "none";
+const VALID_REASONING_EFFORTS = new Set(["none", "low", "medium", "high", "xhigh"]);
 export function normalizeReasoningEffort(ctx, rawEffort) {
-  const configured = ctx?.config?.imageModels;
-  const fallback = configured?.reasoningEffort ?? FALLBACK_REASONING_EFFORT;
-  const valid = configured?.validReasoningEfforts ?? VALID_REASONING_EFFORTS;
-
-  if (typeof rawEffort !== "string" || rawEffort.length === 0) {
-    return { effort: valid.has(fallback) ? fallback : FALLBACK_REASONING_EFFORT };
-  }
-  if (!valid.has(rawEffort)) {
-    return {
-      error: "reasoningEffort must be one of: low, medium, high, xhigh",
-      code: "INVALID_REASONING_EFFORT",
-      status: 400,
-    };
-  }
-  return { effort: rawEffort };
+    const configured = ctx?.config?.imageModels;
+    const fallback = configured?.reasoningEffort ?? FALLBACK_REASONING_EFFORT;
+    const valid = configured?.validReasoningEfforts ?? VALID_REASONING_EFFORTS;
+    if (typeof rawEffort !== "string" || rawEffort.length === 0) {
+        return { effort: valid.has(fallback) ? fallback : FALLBACK_REASONING_EFFORT };
+    }
+    if (!valid.has(rawEffort)) {
+        return {
+            error: "reasoningEffort must be one of: none, low, medium, high, xhigh",
+            code: "INVALID_REASONING_EFFORT",
+            status: 400,
+        };
+    }
+    return { effort: rawEffort };
 }
-
 export function normalizeImageModel(ctx, rawModel) {
-  const configured = ctx?.config?.imageModels;
-  const fallback = configured?.default ?? FALLBACK_IMAGE_MODEL;
-  const valid = configured?.valid ?? VALID_IMAGE_MODELS;
-  const unsupported = configured?.unsupported ?? UNSUPPORTED_IMAGE_MODELS;
-
-  if (typeof rawModel !== "string" || rawModel.length === 0) {
-    return { model: valid.has(fallback) ? fallback : FALLBACK_IMAGE_MODEL };
-  }
-
-  if (unsupported.has(rawModel)) {
-    return {
-      error: "model is listed by OAuth but does not support image_generation: gpt-5.3-codex-spark",
-      code: "IMAGE_MODEL_UNSUPPORTED",
-      status: 400,
-    };
-  }
-
-  if (!valid.has(rawModel)) {
-    return {
-      error: "model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini",
-      code: "INVALID_IMAGE_MODEL",
-      status: 400,
-    };
-  }
-
-  return { model: rawModel };
+    const configured = ctx?.config?.imageModels;
+    const fallback = configured?.default ?? FALLBACK_IMAGE_MODEL;
+    const valid = configured?.valid ?? VALID_IMAGE_MODELS;
+    const unsupported = configured?.unsupported ?? UNSUPPORTED_IMAGE_MODELS;
+    if (typeof rawModel !== "string" || rawModel.length === 0) {
+        return { model: valid.has(fallback) ? fallback : FALLBACK_IMAGE_MODEL };
+    }
+    if (unsupported.has(rawModel)) {
+        return {
+            error: "model is listed by OAuth but does not support image_generation: gpt-5.3-codex-spark",
+            code: "IMAGE_MODEL_UNSUPPORTED",
+            status: 400,
+        };
+    }
+    if (!valid.has(rawModel)) {
+        return {
+            error: "model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini",
+            code: "INVALID_IMAGE_MODEL",
+            status: 400,
+        };
+    }
+    return { model: rawModel };
 }

package/lib/imageModels.ts

@@ -0,0 +1,52 @@
+const FALLBACK_IMAGE_MODEL = "gpt-5.4-mini";
+const VALID_IMAGE_MODELS = new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]);
+const UNSUPPORTED_IMAGE_MODELS = new Set(["gpt-5.3-codex-spark"]);
+const FALLBACK_REASONING_EFFORT = "none";
+const VALID_REASONING_EFFORTS = new Set(["none", "low", "medium", "high", "xhigh"]);
+
+export function normalizeReasoningEffort(ctx, rawEffort) {
+  const configured = ctx?.config?.imageModels;
+  const fallback = configured?.reasoningEffort ?? FALLBACK_REASONING_EFFORT;
+  const valid = configured?.validReasoningEfforts ?? VALID_REASONING_EFFORTS;
+
+  if (typeof rawEffort !== "string" || rawEffort.length === 0) {
+    return { effort: valid.has(fallback) ? fallback : FALLBACK_REASONING_EFFORT };
+  }
+  if (!valid.has(rawEffort)) {
+    return {
+      error: "reasoningEffort must be one of: none, low, medium, high, xhigh",
+      code: "INVALID_REASONING_EFFORT",
+      status: 400,
+    };
+  }
+  return { effort: rawEffort };
+}
+
+export function normalizeImageModel(ctx, rawModel) {
+  const configured = ctx?.config?.imageModels;
+  const fallback = configured?.default ?? FALLBACK_IMAGE_MODEL;
+  const valid = configured?.valid ?? VALID_IMAGE_MODELS;
+  const unsupported = configured?.unsupported ?? UNSUPPORTED_IMAGE_MODELS;
+
+  if (typeof rawModel !== "string" || rawModel.length === 0) {
+    return { model: valid.has(fallback) ? fallback : FALLBACK_IMAGE_MODEL };
+  }
+
+  if (unsupported.has(rawModel)) {
+    return {
+      error: "model is listed by OAuth but does not support image_generation: gpt-5.3-codex-spark",
+      code: "IMAGE_MODEL_UNSUPPORTED",
+      status: 400,
+    };
+  }
+
+  if (!valid.has(rawModel)) {
+    return {
+      error: "model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini",
+      code: "INVALID_IMAGE_MODEL",
+      status: 400,
+    };
+  }
+
+  return { model: rawModel };
+}