@cartanova/qgrid-cli 2.10.4 → 2.10.6

package/bundle/dist/utils/providers/openai/openai-image-generation.js

@@ -17,10 +17,11 @@ const PNG_SIGNATURE = Buffer.from([
 	10
 ]);
 function buildStandaloneImageRequest(options) {
-	if (options.outputSchema || options.tools?.length) throw new OpenAIProtocolError("Transparent image generation does not support tools or structured output");
-	const controls = options.imageGeneration;
-	if (!controls || controls === true || controls.background !== "transparent") throw new OpenAIProtocolError("Standalone images require an explicit transparent background request");
-	if (controls.output_format && controls.output_format !== "png") throw new OpenAIProtocolError("Transparent image generation only supports PNG output");
+	if (options.outputSchema || options.tools?.length) throw new OpenAIProtocolError("Standalone image generation does not support tools or structured output");
+	if (!options.imageGeneration) throw new OpenAIProtocolError("Standalone images require image generation to be enabled");
+	const controls = typeof options.imageGeneration === "object" ? options.imageGeneration : {};
+	if (options.model !== "gpt-image-2" && controls.background !== "transparent") throw new OpenAIProtocolError("Standalone images require an explicit transparent background request");
+	if (controls.output_format && controls.output_format !== "png") throw new OpenAIProtocolError("Standalone image generation only supports PNG output");
 	const text = [];
 	const images = [];
 	if (options.instructions) text.push(`System instructions:\n${options.instructions}`);
@@ -30,14 +31,14 @@ function buildStandaloneImageRequest(options) {
 			images.push({ image_url: `data:${imageMimeType(item.result, item.output_format)};base64,${item.result}` });
 			continue;
 		}
-		if (item.type !== "message" && typeof item.role !== "string") throw new OpenAIProtocolError("Unsupported conversation item for transparent image generation");
+		if (item.type !== "message" && typeof item.role !== "string") throw new OpenAIProtocolError("Unsupported conversation item for standalone image generation");
 		if (typeof item.content === "string") {
 			text.push(`${item.role ?? "user"}:\n${item.content}`);
 			continue;
 		}
-		if (!Array.isArray(item.content)) throw new OpenAIProtocolError("Unsupported message content for transparent image generation");
+		if (!Array.isArray(item.content)) throw new OpenAIProtocolError("Unsupported message content for standalone image generation");
 		for (const part of item.content) {
-			if (!part || typeof part !== "object") throw new OpenAIProtocolError("Unsupported message part for transparent image generation");
+			if (!part || typeof part !== "object") throw new OpenAIProtocolError("Unsupported message part for standalone image generation");
 			if ([
 				"input_text",
 				"output_text",
@@ -47,24 +48,24 @@ function buildStandaloneImageRequest(options) {
 				const url = typeof part.image_url === "string" ? part.image_url : part.image_url?.url;
 				if (typeof url !== "string" || !/^(https:\/\/|data:image\/)/i.test(url)) throw new OpenAIProtocolError("Image references must be HTTPS URLs or image data URLs");
 				images.push({ image_url: url });
-			} else throw new OpenAIProtocolError("Unsupported message part for transparent image generation");
+			} else throw new OpenAIProtocolError("Unsupported message part for standalone image generation");
 		}
 	}
-	if (images.length > 5) throw new OpenAIProtocolError("Transparent image editing supports at most 5 reference images");
+	if (images.length > 5) throw new OpenAIProtocolError("Standalone image editing supports at most 5 reference images");
 	if (!text.some((part) => part.trim())) throw new OpenAIProtocolError("Image prompt is empty");
 	return {
 		url: CHATGPT_CODEX_RESPONSES_URL.replace(/\/responses$/, `/images/${images.length ? "edits" : "generations"}`),
 		body: {
 			model: "gpt-image-2",
 			prompt: text.join("\n\n"),
-			background: "transparent",
+			...controls.background ? { background: controls.background } : {},
 			...controls.quality ? { quality: controls.quality } : {},
 			...controls.size ? { size: controls.size } : {},
 			...images.length ? { images } : {}
 		}
 	};
 }
-function inspectTransparentPng(base64) {
+function inspectGeneratedPng(base64, requireTransparency) {
 	if (base64.length > Math.ceil(MAX_PNG_BYTES / 3) * 4 || !/^[A-Za-z0-9+/]+={0,2}$/.test(base64)) throw new OpenAIProtocolError("Invalid or oversized generated PNG");
 	const bytes = Buffer.from(base64, "base64");
 	if (bytes.length < 33 || !bytes.subarray(0, 8).equals(PNG_SIGNATURE) || bytes.toString("ascii", 12, 16) !== "IHDR") throw new OpenAIProtocolError("Image generation did not return a PNG");
@@ -77,6 +78,10 @@ function inspectTransparentPng(base64) {
 	} catch {
 		throw new OpenAIProtocolError("Image generation returned an invalid PNG");
 	}
+	if (!requireTransparency) return {
+		width: image.width,
+		height: image.height
+	};
 	let transparent = false;
 	let visible = false;
 	for (let i = 3; i < image.data.length; i += 4) {
@@ -89,7 +94,7 @@ function inspectTransparentPng(base64) {
 	}
 	throw new OpenAIProtocolError("Image generation did not return visible content on a transparent background");
 }
-async function readStandaloneImageResponse(response) {
+async function readStandaloneImageResponse(response, requireTransparency) {
 	if (!response.body) throw new OpenAIProtocolError("Image response had no body");
 	const reader = response.body.getReader();
 	const chunks = [];
@@ -114,6 +119,8 @@ async function readStandaloneImageResponse(response) {
 			revised_prompt: z.string().nullish()
 		})).min(1).max(16),
 		quality: z.string().optional(),
+		model: z.string().optional(),
+		background: z.string().optional(),
 		usage: ImageGenerationMetadata.shape.usage
 	});
 	let parsed;
@@ -122,8 +129,9 @@ async function readStandaloneImageResponse(response) {
 	} catch {
 		throw new OpenAIProtocolError("Invalid standalone image response");
 	}
+	const background = parsed.background ?? (requireTransparency ? "transparent" : void 0);
 	return parsed.data.map((item, index) => {
-		const dimensions = inspectTransparentPng(item.b64_json);
+		const dimensions = inspectGeneratedPng(item.b64_json, requireTransparency);
 		return {
 			type: "image",
 			base64: item.b64_json,
@@ -131,8 +139,8 @@ async function readStandaloneImageResponse(response) {
 			...item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {},
 			generation: {
 				route: "codex-images",
-				model: "gpt-image-2",
-				background: "transparent",
+				model: parsed.model ?? "gpt-image-2",
+				...background ? { background } : {},
 				size: `${dimensions.width}x${dimensions.height}`,
 				...parsed.quality ? { quality: parsed.quality } : {},
 				...index === 0 && parsed.usage ? { usage: parsed.usage } : {}
@@ -141,6 +149,6 @@ async function readStandaloneImageResponse(response) {
 	});
 }
 //#endregion
-export { buildStandaloneImageRequest, inspectTransparentPng, readStandaloneImageResponse };
+export { buildStandaloneImageRequest, readStandaloneImageResponse };
 
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-image-generation.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-image-generation.ts"],"sourcesContent":["import { PNG } from \"pngjs\";\nimport { z } from \"zod\";\n\nimport { ImageGenerationMetadata } from \"../../../application/qgrid/qgrid.types\";\nimport {\n  CHATGPT_CODEX_RESPONSES_URL,\n  imageMimeType,\n  OpenAIProtocolError,\n  type OpenAINormalizedEvent,\n  type OpenAIResponsesOptions,\n} from \"./openai-backend-protocol\";\n\nconst MAX_PNG_BYTES = 32 * 1024 * 1024;\nconst MAX_IMAGE_PIXELS = 4096 * 4096;\nconst MAX_RESPONSE_BYTES = 64 * 1024 * 1024;\nconst PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);\n\nexport function buildStandaloneImageRequest(options: OpenAIResponsesOptions) {\n  if (options.outputSchema || options.tools?.length) {\n    throw new OpenAIProtocolError(\n      \"Transparent image generation does not support tools or structured output\",\n    );\n  }\n  const controls = options.imageGeneration;\n  if (!controls || controls === true || controls.background !== \"transparent\") {\n    throw new OpenAIProtocolError(\n      \"Standalone images require an explicit transparent background request\",\n    );\n  }\n  if (controls.output_format && controls.output_format !== \"png\") {\n    throw new OpenAIProtocolError(\"Transparent image generation only supports PNG output\");\n  }\n  const text: string[] = [];\n  const images: Array<{ image_url: string }> = [];\n  if (options.instructions) text.push(`System instructions:\\n${options.instructions}`);\n  for (const item of options.history) {\n    if (item.type === \"reasoning\") continue;\n    if (item.type === \"image_generation_call\" && typeof item.result === \"string\") {\n      images.push({\n        image_url: `data:${imageMimeType(item.result, item.output_format)};base64,${item.result}`,\n      });\n      continue;\n    }\n    if (item.type !== \"message\" && typeof item.role !== \"string\") {\n      throw new OpenAIProtocolError(\n        \"Unsupported conversation item for transparent image generation\",\n      );\n    }\n    if (typeof item.content === \"string\") {\n      text.push(`${item.role ?? \"user\"}:\\n${item.content}`);\n      continue;\n    }\n    if (!Array.isArray(item.content)) {\n      throw new OpenAIProtocolError(\"Unsupported message content for transparent image generation\");\n    }\n    for (const part of item.content) {\n      if (!part || typeof part !== \"object\") {\n        throw new OpenAIProtocolError(\"Unsupported message part for transparent image generation\");\n      }\n      if (\n        [\"input_text\", \"output_text\", \"text\"].includes(part.type) &&\n        typeof part.text === \"string\"\n      ) {\n        text.push(`${item.role ?? \"user\"}:\\n${part.text}`);\n      } else if (part.type === \"input_image\" || part.type === \"image_url\") {\n        const url = typeof part.image_url === \"string\" ? part.image_url : part.image_url?.url;\n        if (typeof url !== \"string\" || !/^(https:\\/\\/|data:image\\/)/i.test(url)) {\n          throw new OpenAIProtocolError(\"Image references must be HTTPS URLs or image data URLs\");\n        }\n        images.push({ image_url: url });\n      } else {\n        throw new OpenAIProtocolError(\"Unsupported message part for transparent image generation\");\n      }\n    }\n  }\n  if (images.length > 5)\n    throw new OpenAIProtocolError(\"Transparent image editing supports at most 5 reference images\");\n  if (!text.some((part) => part.trim())) throw new OpenAIProtocolError(\"Image prompt is empty\");\n  return {\n    url: CHATGPT_CODEX_RESPONSES_URL.replace(\n      /\\/responses$/,\n      `/images/${images.length ? \"edits\" : \"generations\"}`,\n    ),\n    body: {\n      model: \"gpt-image-2\",\n      prompt: text.join(\"\\n\\n\"),\n      background: \"transparent\",\n      ...(controls.quality ? { quality: controls.quality } : {}),\n      ...(controls.size ? { size: controls.size } : {}),\n      ...(images.length ? { images } : {}),\n    },\n  };\n}\n\n// Decode before accepting the result: an alpha channel alone can still be fully opaque.\nexport function inspectTransparentPng(base64: string): { width: number; height: number } {\n  if (base64.length > Math.ceil(MAX_PNG_BYTES / 3) * 4 || !/^[A-Za-z0-9+/]+={0,2}$/.test(base64)) {\n    throw new OpenAIProtocolError(\"Invalid or oversized generated PNG\");\n  }\n  const bytes = Buffer.from(base64, \"base64\");\n  if (\n    bytes.length < 33 ||\n    !bytes.subarray(0, 8).equals(PNG_SIGNATURE) ||\n    bytes.toString(\"ascii\", 12, 16) !== \"IHDR\"\n  ) {\n    throw new OpenAIProtocolError(\"Image generation did not return a PNG\");\n  }\n  const width = bytes.readUInt32BE(16);\n  const height = bytes.readUInt32BE(20);\n  if (!width || !height || width * height > MAX_IMAGE_PIXELS) {\n    throw new OpenAIProtocolError(\"Generated PNG dimensions exceed the decoding limit\");\n  }\n  let image: PNG;\n  try {\n    image = PNG.sync.read(bytes);\n  } catch {\n    throw new OpenAIProtocolError(\"Image generation returned an invalid PNG\");\n  }\n  let transparent = false;\n  let visible = false;\n  for (let i = 3; i < image.data.length; i += 4) {\n    transparent ||= image.data[i] === 0;\n    visible ||= image.data[i]! > 0;\n    if (transparent && visible) return { width: image.width, height: image.height };\n  }\n  throw new OpenAIProtocolError(\n    \"Image generation did not return visible content on a transparent background\",\n  );\n}\n\nexport async function readStandaloneImageResponse(\n  response: Response,\n): Promise<OpenAINormalizedEvent[]> {\n  if (!response.body) throw new OpenAIProtocolError(\"Image response had no body\");\n  const reader = response.body.getReader();\n  const chunks: Uint8Array[] = [];\n  let size = 0;\n  try {\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      size += value.byteLength;\n      if (size > MAX_RESPONSE_BYTES) {\n        await reader.cancel();\n        throw new OpenAIProtocolError(\"Image response exceeded the size limit\");\n      }\n      chunks.push(value);\n    }\n  } finally {\n    reader.releaseLock();\n  }\n  const schema = z.object({\n    data: z\n      .array(z.object({ b64_json: z.string().min(1), revised_prompt: z.string().nullish() }))\n      .min(1)\n      .max(16),\n    quality: z.string().optional(),\n    usage: ImageGenerationMetadata.shape.usage,\n  });\n  let parsed: z.infer<typeof schema>;\n  try {\n    parsed = schema.parse(JSON.parse(Buffer.concat(chunks).toString(\"utf8\")));\n  } catch {\n    throw new OpenAIProtocolError(\"Invalid standalone image response\");\n  }\n  return parsed.data.map((item, index) => {\n    const dimensions = inspectTransparentPng(item.b64_json);\n    return {\n      type: \"image\",\n      base64: item.b64_json,\n      mimeType: \"image/png\",\n      ...(item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {}),\n      generation: {\n        route: \"codex-images\",\n        model: \"gpt-image-2\",\n        background: \"transparent\",\n        size: `${dimensions.width}x${dimensions.height}`,\n        ...(parsed.quality ? { quality: parsed.quality } : {}),\n        ...(index === 0 && parsed.usage ? { usage: parsed.usage } : {}),\n      },\n    };\n  });\n}\n"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"openai-image-generation.js","names":[],"sources":["../../../../src/utils/providers/openai/openai-image-generation.ts"],"sourcesContent":["import { PNG } from \"pngjs\";\nimport { z } from \"zod\";\n\nimport { ImageGenerationMetadata } from \"../../../application/qgrid/qgrid.types\";\nimport {\n  CHATGPT_CODEX_RESPONSES_URL,\n  imageMimeType,\n  OpenAIProtocolError,\n  type OpenAINormalizedEvent,\n  type OpenAIResponsesOptions,\n} from \"./openai-backend-protocol\";\n\nconst MAX_PNG_BYTES = 32 * 1024 * 1024;\nconst MAX_IMAGE_PIXELS = 4096 * 4096;\nconst MAX_RESPONSE_BYTES = 64 * 1024 * 1024;\nconst PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);\n\nexport function buildStandaloneImageRequest(options: OpenAIResponsesOptions) {\n  if (options.outputSchema || options.tools?.length) {\n    throw new OpenAIProtocolError(\n      \"Standalone image generation does not support tools or structured output\",\n    );\n  }\n  if (!options.imageGeneration) {\n    throw new OpenAIProtocolError(\"Standalone images require image generation to be enabled\");\n  }\n  const controls = typeof options.imageGeneration === \"object\" ? options.imageGeneration : {};\n  if (options.model !== \"gpt-image-2\" && controls.background !== \"transparent\") {\n    throw new OpenAIProtocolError(\n      \"Standalone images require an explicit transparent background request\",\n    );\n  }\n  if (controls.output_format && controls.output_format !== \"png\") {\n    throw new OpenAIProtocolError(\"Standalone image generation only supports PNG output\");\n  }\n  const text: string[] = [];\n  const images: Array<{ image_url: string }> = [];\n  if (options.instructions) text.push(`System instructions:\\n${options.instructions}`);\n  for (const item of options.history) {\n    if (item.type === \"reasoning\") continue;\n    if (item.type === \"image_generation_call\" && typeof item.result === \"string\") {\n      images.push({\n        image_url: `data:${imageMimeType(item.result, item.output_format)};base64,${item.result}`,\n      });\n      continue;\n    }\n    if (item.type !== \"message\" && typeof item.role !== \"string\") {\n      throw new OpenAIProtocolError(\n        \"Unsupported conversation item for standalone image generation\",\n      );\n    }\n    if (typeof item.content === \"string\") {\n      text.push(`${item.role ?? \"user\"}:\\n${item.content}`);\n      continue;\n    }\n    if (!Array.isArray(item.content)) {\n      throw new OpenAIProtocolError(\"Unsupported message content for standalone image generation\");\n    }\n    for (const part of item.content) {\n      if (!part || typeof part !== \"object\") {\n        throw new OpenAIProtocolError(\"Unsupported message part for standalone image generation\");\n      }\n      if (\n        [\"input_text\", \"output_text\", \"text\"].includes(part.type) &&\n        typeof part.text === \"string\"\n      ) {\n        text.push(`${item.role ?? \"user\"}:\\n${part.text}`);\n      } else if (part.type === \"input_image\" || part.type === \"image_url\") {\n        const url = typeof part.image_url === \"string\" ? part.image_url : part.image_url?.url;\n        if (typeof url !== \"string\" || !/^(https:\\/\\/|data:image\\/)/i.test(url)) {\n          throw new OpenAIProtocolError(\"Image references must be HTTPS URLs or image data URLs\");\n        }\n        images.push({ image_url: url });\n      } else {\n        throw new OpenAIProtocolError(\"Unsupported message part for standalone image generation\");\n      }\n    }\n  }\n  if (images.length > 5)\n    throw new OpenAIProtocolError(\"Standalone image editing supports at most 5 reference images\");\n  if (!text.some((part) => part.trim())) throw new OpenAIProtocolError(\"Image prompt is empty\");\n  return {\n    url: CHATGPT_CODEX_RESPONSES_URL.replace(\n      /\\/responses$/,\n      `/images/${images.length ? \"edits\" : \"generations\"}`,\n    ),\n    body: {\n      model: \"gpt-image-2\",\n      prompt: text.join(\"\\n\\n\"),\n      ...(controls.background ? { background: controls.background } : {}),\n      ...(controls.quality ? { quality: controls.quality } : {}),\n      ...(controls.size ? { size: controls.size } : {}),\n      ...(images.length ? { images } : {}),\n    },\n  };\n}\n\nfunction inspectGeneratedPng(\n  base64: string,\n  requireTransparency: boolean,\n): { width: number; height: number } {\n  if (base64.length > Math.ceil(MAX_PNG_BYTES / 3) * 4 || !/^[A-Za-z0-9+/]+={0,2}$/.test(base64)) {\n    throw new OpenAIProtocolError(\"Invalid or oversized generated PNG\");\n  }\n  const bytes = Buffer.from(base64, \"base64\");\n  if (\n    bytes.length < 33 ||\n    !bytes.subarray(0, 8).equals(PNG_SIGNATURE) ||\n    bytes.toString(\"ascii\", 12, 16) !== \"IHDR\"\n  ) {\n    throw new OpenAIProtocolError(\"Image generation did not return a PNG\");\n  }\n  const width = bytes.readUInt32BE(16);\n  const height = bytes.readUInt32BE(20);\n  if (!width || !height || width * height > MAX_IMAGE_PIXELS) {\n    throw new OpenAIProtocolError(\"Generated PNG dimensions exceed the decoding limit\");\n  }\n  let image: PNG;\n  try {\n    image = PNG.sync.read(bytes);\n  } catch {\n    throw new OpenAIProtocolError(\"Image generation returned an invalid PNG\");\n  }\n  if (!requireTransparency) return { width: image.width, height: image.height };\n  // An alpha channel alone can still be fully opaque or have no visible content.\n  let transparent = false;\n  let visible = false;\n  for (let i = 3; i < image.data.length; i += 4) {\n    transparent ||= image.data[i] === 0;\n    visible ||= image.data[i]! > 0;\n    if (transparent && visible) return { width: image.width, height: image.height };\n  }\n  throw new OpenAIProtocolError(\n    \"Image generation did not return visible content on a transparent background\",\n  );\n}\n\nexport async function readStandaloneImageResponse(\n  response: Response,\n  requireTransparency: boolean,\n): Promise<OpenAINormalizedEvent[]> {\n  if (!response.body) throw new OpenAIProtocolError(\"Image response had no body\");\n  const reader = response.body.getReader();\n  const chunks: Uint8Array[] = [];\n  let size = 0;\n  try {\n    while (true) {\n      const { done, value } = await reader.read();\n      if (done) break;\n      size += value.byteLength;\n      if (size > MAX_RESPONSE_BYTES) {\n        await reader.cancel();\n        throw new OpenAIProtocolError(\"Image response exceeded the size limit\");\n      }\n      chunks.push(value);\n    }\n  } finally {\n    reader.releaseLock();\n  }\n  const schema = z.object({\n    data: z\n      .array(z.object({ b64_json: z.string().min(1), revised_prompt: z.string().nullish() }))\n      .min(1)\n      .max(16),\n    quality: z.string().optional(),\n    model: z.string().optional(),\n    background: z.string().optional(),\n    usage: ImageGenerationMetadata.shape.usage,\n  });\n  let parsed: z.infer<typeof schema>;\n  try {\n    parsed = schema.parse(JSON.parse(Buffer.concat(chunks).toString(\"utf8\")));\n  } catch {\n    throw new OpenAIProtocolError(\"Invalid standalone image response\");\n  }\n  const background = parsed.background ?? (requireTransparency ? \"transparent\" : undefined);\n  return parsed.data.map((item, index) => {\n    const dimensions = inspectGeneratedPng(item.b64_json, requireTransparency);\n    return {\n      type: \"image\",\n      base64: item.b64_json,\n      mimeType: \"image/png\",\n      ...(item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {}),\n      generation: {\n        route: \"codex-images\",\n        model: parsed.model ?? \"gpt-image-2\",\n        ...(background ? { background } : {}),\n        size: `${dimensions.width}x${dimensions.height}`,\n        ...(parsed.quality ? { quality: parsed.quality } : {}),\n        ...(index === 0 && parsed.usage ? { usage: parsed.usage } : {}),\n      },\n    };\n  });\n}\n"],"mappings":"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"}

package/bundle/dist/utils/providers/openai/openai-refresh.js

@@ -1,6 +1,6 @@
 import { TokenModel } from "../../../application/token/token.model.js";
-import { OPENAI_CLIENT_ID, OPENAI_TOKEN_URL } from "./openai-constants.js";
 import { deactivateAuthDeadToken } from "../../../application/qgrid/token-death.js";
+import { OPENAI_CLIENT_ID, OPENAI_TOKEN_URL } from "./openai-constants.js";
 import { getLogger } from "@logtape/logtape";
 //#region src/utils/providers/openai/openai-refresh.ts
 /**

package/bundle/src/application/qgrid/qgrid-image-generation.test.ts

@@ -16,16 +16,35 @@ function result(content: QgridContent[]): QueryOutput {
   };
 }
 
-describe("standalone image cost estimates", () => {
+describe("image cost estimates", () => {
+  it("accepts size hints without promising public API resolution limits", () => {
+    for (const size of ["auto", "1152x2560", "841x1870", "2160x3840"]) {
+      expect(QueryInput.parse({ prompt: "draw", imageGenerationOptions: { size } }).imageGenerationOptions?.size).toBe(size);
+    }
+    for (const size of ["9:20", "0x1024", "1.5x1024", "-1x1024", "9007199254740992x1"]) {
+      expect(QueryInput.safeParse({ prompt: "draw", imageGenerationOptions: { size } }).success).toBe(false);
+    }
+  });
+
+  it("uses the default size price for custom/auto hints and prices hosted output without usage", () => {
+    const output = result([{ type: "image", data: "png" }]);
+    for (const size of ["auto", "1152x2560"] as const) {
+      expect(estimateImageGenerationCostMicroUsd(output, { size })).toBe(41_000);
+      expect(imageGenerationCostMethod({ size }, output)).toBe("assumed:gpt-image-2:medium:1536x1024:png");
+    }
+    expect(estimateImageGenerationCostMicroUsd(result([{ type: "image", data: "png", generation: {
+      route: "codex-responses", size: "841x1870", quality: "low",
+    } }]), options)).toBe(211_000);
+  });
   it("accepts automatic image mode while preserving boolean requests", () => {
     for (const imageGeneration of [true, false, "auto"] as const) {
       expect(QueryInput.parse({ prompt: "chat", imageGeneration }).imageGeneration).toBe(imageGeneration);
     }
     expect(QueryInput.safeParse({ prompt: "chat", imageGeneration: "required" }).success).toBe(false);
   });
-  it("uses response usage once for multiple outputs without pricing requested settings or driver tokens", () => {
+  it.each(["codex-images", "codex-responses"] as const)("uses %s usage once for multiple outputs instead of size or driver tokens", (route) => {
     const output = result([
-      { type: "image", data: "first", generation: { ...generation,
+      { type: "image", data: "first", generation: { ...generation, route,
         usage: { input_tokens: 100, output_tokens: 200, total_tokens: 300,
           input_tokens_details: { text_tokens: 40, image_tokens: 60, cached_tokens: 50 } },
       } },
@@ -37,8 +56,18 @@ describe("standalone image cost estimates", () => {
     );
   });
 
-  it("does not substitute requested size pricing when standalone usage is missing", () => {
-    expect(estimateImageGenerationCostMicroUsd(result([{ type: "image", data: "png", generation }]), options)).toBeNull();
+  it("falls back to per-image pricing when standalone usage is missing", () => {
+    const output = result([{ type: "image", data: "png", generation }]);
+    expect(estimateImageGenerationCostMicroUsd(output, options)).toBe(211_000);
+    expect(imageGenerationCostMethod(options, output)).toBe("assumed:gpt-image-2:high:1024x1024:png");
+  });
+
+  it("respects reported zero usage instead of applying a per-image price", () => {
+    const output = result([{ type: "image", data: "png", generation: { ...generation,
+      usage: { input_tokens: 0, output_tokens: 0, total_tokens: 0 },
+    } }]);
+    expect(estimateImageGenerationCostMicroUsd(output, options)).toBe(0);
+    expect(imageGenerationCostMethod(options, output)).toBe("estimated:gpt-image-2:reported-usage:public-prices:conservative");
   });
 
   it("prices unknown input remainder at the image rate and ignores inconsistent splits", () => {

package/bundle/src/application/qgrid/qgrid-image-generation.ts

@@ -1,24 +1,25 @@
 import {
   type ImageGenerationOptions,
   type ImageGenerationQuality,
-  type ImageGenerationSize,
   type QueryOutput,
 } from "./qgrid.types";
 
 export const CODEX_IMAGE_GENERATION_MODEL = "gpt-image-2";
 export const DEFAULT_IMAGE_GENERATION_QUALITY: ImageGenerationQuality = "medium";
-export const DEFAULT_IMAGE_GENERATION_SIZE: ImageGenerationSize = "1536x1024";
+export const DEFAULT_IMAGE_GENERATION_SIZE = "1536x1024";
+
+type PricedImageSize = "1024x1024" | "1024x1536" | "1536x1024";
 
 export type ResolvedImageGenerationOptions = {
   quality: ImageGenerationQuality;
-  size: ImageGenerationSize;
+  size: PricedImageSize;
 };
 
 // OpenAI gpt-image-2 image output cost estimates by quality/size:
 // https://developers.openai.com/api/docs/guides/image-generation#calculating-costs
 const IMAGE_OUTPUT_COST_MICRO_USD: Record<
   ImageGenerationQuality,
-  Record<ImageGenerationSize, number>
+  Record<PricedImageSize, number>
 > = {
   low: {
     "1024x1024": 6_000,
@@ -40,9 +41,14 @@ const IMAGE_OUTPUT_COST_MICRO_USD: Record<
 export function resolveImageGenerationOptions(
   options: ImageGenerationOptions | undefined,
 ): ResolvedImageGenerationOptions {
+  const size = options?.size;
   return {
     quality: options?.quality ?? DEFAULT_IMAGE_GENERATION_QUALITY,
-    size: options?.size ?? DEFAULT_IMAGE_GENERATION_SIZE,
+    // Unknown/custom sizes use the default price, without changing output hints.
+    size:
+      size === "1024x1024" || size === "1024x1536" || size === "1536x1024"
+        ? size
+        : DEFAULT_IMAGE_GENERATION_SIZE,
   };
 }
 
@@ -51,9 +57,7 @@ export function imageGenerationCostMethod(
   result?: QueryOutput,
 ): string {
   if (
-    result?.content.some(
-      (item) => item.type === "image" && item.generation?.route === "codex-images",
-    )
+    result?.content.some((item) => item.type === "image" && item.generation?.usage !== undefined)
   ) {
     return "estimated:gpt-image-2:reported-usage:public-prices:conservative";
   }
@@ -68,11 +72,10 @@ export function estimateImageGenerationCostMicroUsd(
   const images = result.content.filter((item) => item.type === "image");
   const imageCount = images.length;
   if (imageCount === 0) return null;
-  if (images.some((image) => image.generation?.route === "codex-images")) {
-    // The standalone response's aggregate usage is carried by its first image only.
+  const usage = images.find((image) => image.generation?.usage)?.generation?.usage;
+  if (usage) {
+    // Response-level image usage is carried by its first image only.
     // Do not multiply it by output count or price it as the requested text driver.
-    const usage = images.find((image) => image.generation?.usage)?.generation?.usage;
-    if (!usage) return null;
     // Public GPT Image 2 rates verified 2026-09-08: text input $5/M, image input
     // $8/M, output $30/M. Amounts below are microUSD, so no /1M conversion.
     // https://developers.openai.com/api/docs/pricing#image-generation
@@ -88,5 +91,6 @@ export function estimateImageGenerationCostMicroUsd(
     );
   }
   const resolved = resolveImageGenerationOptions(options);
-  return imageCount * IMAGE_OUTPUT_COST_MICRO_USD[resolved.quality][resolved.size];
+  const unitCost = IMAGE_OUTPUT_COST_MICRO_USD[resolved.quality][resolved.size];
+  return imageCount * unitCost;
 }

package/bundle/src/application/qgrid/qgrid-response-format.test.ts

@@ -19,6 +19,17 @@ it("logs observed standalone settings separately from requested controls without
 });
 
 describe("qgrid response log formatting", () => {
+  it("keeps custom requests and observations separate from fallback price assumptions", () => {
+    const args = { prompt: "draw in 9:20", imageGenerationOptions: { size: "1152x2560" } };
+    const generation = { route: "codex-responses" as const, size: "841x1870", quality: "low" };
+    const observed = JSON.parse(imageGenerationToolArgs(args, { generation }));
+    expect(observed.requestedOptions.size).toBe("1152x2560");
+    expect(observed.observedGeneration).toEqual(generation);
+    expect(observed).not.toHaveProperty("pricingAssumption");
+    expect(JSON.parse(imageGenerationToolArgs(args)).pricingAssumption).toEqual({
+      model: "gpt-image-2", quality: "medium", size: "1536x1024",
+    });
+  });
   it("logs the returned MIME and requested output format", () => {
     expect(formatImagePartForLog({ type: "image", data: "webp", mediaType: "image/webp" })).toContain("data:image/webp;base64,webp");
     expect(JSON.parse(imageGenerationToolArgs({ prompt: "draw", imageGenerationOptions: { outputFormat: "webp" } })).tool.outputFormat).toBe("webp");

package/bundle/src/application/qgrid/qgrid-run-lifecycle.test.ts

@@ -436,13 +436,15 @@ describe("qgrid run lifecycle TTFT", () => {
     );
   });
 
-  it("passes configured image generation cost estimate into finishRun", async () => {
+  it("stores the hosted per-image estimate when image usage is absent", async () => {
     await afterQuery(
       10,
       2,
       { prompt: "draw", imageGeneration: true },
       queryOutput({
-        content: [{ type: "image", data: "iVBORw0KGgoBAgM", revisedPrompt: "green triangle" }],
+        content: [{ type: "image", data: "iVBORw0KGgoBAgM", revisedPrompt: "green triangle",
+          generation: { route: "codex-responses", size: "841x1870" },
+        }],
       }),
     );
 
@@ -456,36 +458,67 @@ describe("qgrid run lifecycle TTFT", () => {
     );
   });
 
-  it("keeps standalone image accounting out of text usage and records response usage once", async () => {
+  it.each([
+    ["openai/gpt-5.5", "transparent"],
+    ["openai/gpt-image-2", "opaque"],
+  ] as const)("keeps standalone %s accounting out of text usage and records image usage once", async (model, background) => {
     const generation = {
       route: "codex-images" as const, model: "gpt-image-2" as const,
-      size: "1254x1254", quality: "medium", background: "transparent",
+      size: "1254x1254", quality: "medium", background,
     };
     aggregateStepUsageMock.mockResolvedValueOnce({
       input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, cache_creation_tokens: 0,
       duration_ms: 120, fallback_count: 0, cost_usd: 0, cost_source: "pricing_table",
     });
     await afterQuery(10, 0, {
-      prompt: "draw", model: "openai/gpt-5.5", imageGeneration: true,
-      imageGenerationOptions: { quality: "high", size: "1024x1024", background: "transparent" },
+      prompt: "draw", model, imageGeneration: true,
+      imageGenerationOptions: { quality: "high", size: "1024x1024", background },
     }, queryOutput({
-      model: "gpt-image-2", requestedModel: "gpt-5.5", costUsd: 0,
+      model: "gpt-image-2", costUsd: 0,
       usage: { input_tokens: 0, output_tokens: 0, reasoning_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 },
       content: [
         { type: "image", data: "first", generation: { ...generation, usage: {
           input_tokens: 10, output_tokens: 100, total_tokens: 110,
+          input_tokens_details: { text_tokens: 4, image_tokens: 6 },
         } } },
         { type: "image", data: "second", generation },
       ],
     }));
     expect(appendStepMock).toHaveBeenCalledWith(10, expect.objectContaining({
-      type: "generate", model_name: "openai/gpt-image-2", requested_model_name: "openai/gpt-5.5",
+      type: "generate", model_name: "openai/gpt-image-2", requested_model_name: model,
       input_tokens: 0, output_tokens: 0, cost_usd: 0,
     }));
     expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
-      input_tokens: 0, output_tokens: 0, cost_usd: 0, image_cost_usd: 3_080,
+      input_tokens: 0, output_tokens: 0, cost_usd: 0, image_cost_usd: 3_068,
+      image_cost_method: "estimated:gpt-image-2:reported-usage:public-prices:conservative",
+    }));
+  });
+
+  it("records auto chat driver cost and standalone image usage cost separately", async () => {
+    aggregateStepUsageMock.mockResolvedValueOnce({
+      input_tokens: 100, output_tokens: 20, cache_read_tokens: 0, cache_creation_tokens: 0,
+      duration_ms: 120, fallback_count: 0, cost_usd: 20, cost_source: "pricing_table",
+    });
+    await afterQuery(10, 0, {
+      prompt: "draw", model: "openai/gpt-6-luna", imageGeneration: "auto",
+    }, queryOutput({
+      model: "gpt-6-luna", costUsd: 0.00002,
+      usage: { input_tokens: 100, output_tokens: 20, reasoning_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 },
+      content: [{ type: "image", data: "image", generation: {
+        route: "codex-images", model: "gpt-image-2", background: "opaque",
+        usage: {
+          input_tokens: 10, output_tokens: 100, total_tokens: 110,
+          input_tokens_details: { text_tokens: 4, image_tokens: 6 },
+        },
+      } }],
+    }));
+    expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
+      model_name: "openai/gpt-6-luna", requested_model_name: "openai/gpt-6-luna",
+      input_tokens: 100, output_tokens: 20, cost_usd: 20, image_cost_usd: 3_068,
+      is_image_generation: true,
       image_cost_method: "estimated:gpt-image-2:reported-usage:public-prices:conservative",
     }));
+    expect(appendStepMock.mock.calls.filter(([, step]) => step.type === "generate")).toHaveLength(1);
   });
 
   it("uses requested image quality and size for cost estimate", async () => {
@@ -609,6 +642,7 @@ describe("qgrid run lifecycle TTFT", () => {
 
 describe("qgrid run lifecycle terminal rollup", () => {
   beforeEach(() => {
+    appendStepMock.mockReset().mockResolvedValue(1);
     aggregateStepUsageMock.mockReset().mockResolvedValue({
       input_tokens: 120,
       output_tokens: 30,
@@ -624,6 +658,50 @@ describe("qgrid run lifecycle terminal rollup", () => {
     finishRunMock.mockReset();
   });
 
+  it.each(["error", "aborted"] as const)("records a completed chat stage once before %s rollup", async (status) => {
+    const args = { prompt: "draw", model: "openai/gpt-6-astra", imageGeneration: "auto" as const };
+    const result = queryOutput({ model: "gpt-6-luna", requestedModel: "gpt-6-astra" });
+    const completedStep = { stepIndex: 2, result };
+    if (status === "error") await finishRunWithError(10, "image failed", args, completedStep);
+    else await finishRunAborted(10, args, completedStep);
+    expect(appendStepMock).toHaveBeenCalledOnce();
+    expect(appendStepMock).toHaveBeenCalledWith(10, expect.objectContaining({
+      step_index: 2, type: "generate", model_name: "openai/gpt-6-luna",
+      requested_model_name: "openai/gpt-6-astra", input_tokens: 5, output_tokens: 7,
+      cost_usd: 1_000, cost_source: "pricing_table", ttft_ms: 39,
+    }));
+    expect(appendStepMock.mock.invocationCallOrder[0]).toBeLessThan(aggregateStepUsageMock.mock.invocationCallOrder[0]!);
+    expect(finishRunMock).toHaveBeenCalledOnce();
+    expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
+      status, error_message: status === "error" ? "image failed" : "client disconnected",
+      token_name: "tok-A", model_name: "openai/gpt-6-luna", requested_model_name: "openai/gpt-6-astra",
+      // Existing steps and the final completed driver are rolled up together.
+      input_tokens: 120, output_tokens: 30, cost_usd: 7_500, cost_source: "mixed",
+    }));
+    const finish = finishRunMock.mock.calls[0]![1];
+    expect(finish.image_cost_usd).toBeUndefined();
+    expect(finish.image_cost_method).toBeUndefined();
+    expect(finish.is_image_generation).toBeUndefined();
+  });
+
+  it("still attempts aggregation and terminal status when the completed driver step cannot be logged", async () => {
+    appendStepMock.mockRejectedValueOnce(new Error("step write failed"));
+    await expect(finishRunWithError(10, "image failed", {
+      prompt: "draw", model: "openai/gpt-6-luna",
+    }, { stepIndex: 0, result: queryOutput({ model: "gpt-6-luna" }) })).resolves.toBeUndefined();
+    expect(aggregateStepUsageMock).toHaveBeenCalledWith(10);
+    expect(finishRunMock).toHaveBeenCalledWith(10, expect.objectContaining({
+      status: "error", error_message: "image failed", model_name: "openai/gpt-6-luna", token_name: "tok-A",
+    }));
+  });
+
+  it("does not replace the original failure when terminal persistence also fails", async () => {
+    finishRunMock.mockRejectedValueOnce(new Error("terminal write failed"));
+    await expect(finishRunWithError(10, "image failed", { prompt: "draw" }, {
+      stepIndex: 0, result: queryOutput(),
+    })).resolves.toBeUndefined();
+  });
+
   it("keeps incurred step usage and cost when a run ends in error", async () => {
     await finishRunWithError(10, "provider failed", {
       prompt: "continue",

package/bundle/src/application/qgrid/qgrid-run-lifecycle.ts

@@ -100,12 +100,12 @@ export async function beforeQuery(args: QueryInput): Promise<{
   return { requestLogId, stepIndex };
 }
 
-export async function afterQuery(
+async function appendGenerateStep(
   requestLogId: number,
   stepIndex: number,
   args: QueryInput,
   result: QueryOutput,
-): Promise<RunLifecycleResult> {
+) {
   // provider가 canonical model을 돌려줘도 요청 route 자체([1m] 등)는 보존한다.
   const requestedModelName = withProviderPrefix(
     args.model,
@@ -132,6 +132,21 @@ export async function afterQuery(
     ttft_ms: result.ttftMs,
     finish_reason: result.finishReason,
   });
+  return { requestedModelName, servedModelName };
+}
+
+export async function afterQuery(
+  requestLogId: number,
+  stepIndex: number,
+  args: QueryInput,
+  result: QueryOutput,
+): Promise<RunLifecycleResult> {
+  const { requestedModelName, servedModelName } = await appendGenerateStep(
+    requestLogId,
+    stepIndex,
+    args,
+    result,
+  );
 
   const imageParts = getImageParts(result);
   const imageCostMicroUsd = estimateImageGenerationCostMicroUsd(
@@ -200,12 +215,17 @@ export async function finishRunWithError(
   requestLogId: number,
   errorMessage: string,
   args?: QueryInput,
+  completedStep?: { stepIndex: number; result: QueryOutput },
 ): Promise<void> {
-  await finishTerminalRun(requestLogId, "error", errorMessage, args);
+  await finishTerminalRun(requestLogId, "error", errorMessage, args, completedStep);
 }
 
-export async function finishRunAborted(requestLogId: number, args?: QueryInput): Promise<void> {
-  await finishTerminalRun(requestLogId, "aborted", "client disconnected", args);
+export async function finishRunAborted(
+  requestLogId: number,
+  args?: QueryInput,
+  completedStep?: { stepIndex: number; result: QueryOutput },
+): Promise<void> {
+  await finishTerminalRun(requestLogId, "aborted", "client disconnected", args, completedStep);
 }
 
 async function finishTerminalRun(
@@ -213,8 +233,18 @@ async function finishTerminalRun(
   status: "error" | "aborted",
   errorMessage: string,
   args?: QueryInput,
+  completedStep?: { stepIndex: number; result: QueryOutput },
 ): Promise<void> {
   try {
+    if (completedStep && args) {
+      try {
+        await appendGenerateStep(requestLogId, completedStep.stepIndex, args, completedStep.result);
+      } catch (e) {
+        logger.error(
+          `appendGenerateStep failed while finishing ${status}: ${(e as Error).message}`,
+        );
+      }
+    }
     let aggregate: Awaited<ReturnType<typeof RequestLogModel.aggregateStepUsage>> | undefined;
     try {
       aggregate = await RequestLogModel.aggregateStepUsage(requestLogId);
@@ -226,6 +256,16 @@ async function finishTerminalRun(
       status,
       error_message: errorMessage,
       history: args ? filterHistoryForStorage(args.history) : undefined,
+      ...(completedStep
+        ? {
+            token_name: completedStep.result.tokenName,
+            requested_model_name: withProviderPrefix(
+              args?.model,
+              args?.model ?? completedStep.result.requestedModel ?? completedStep.result.model,
+            ),
+            model_name: withProviderPrefix(args?.model, completedStep.result.model),
+          }
+        : {}),
       ...(aggregate
         ? {
             input_tokens: aggregate.input_tokens,