@ljoukov/llm 5.0.4 → 6.0.0

package/dist/index.js

@@ -6,6 +6,8 @@ import path5 from "path";
 import {
   FinishReason,
   FunctionCallingConfigMode,
+  MediaResolution,
+  PartMediaResolutionLevel,
   ThinkingLevel,
   createPartFromBase64,
   createPartFromFunctionResponse,
@@ -204,11 +206,6 @@ function getGeminiImagePricing(modelId) {
 }
 
 // src/openai/pricing.ts
-var OPENAI_GPT_52_PRICING = {
-  inputRate: 1.75 / 1e6,
-  cachedRate: 0.175 / 1e6,
-  outputRate: 14 / 1e6
-};
 var OPENAI_GPT_54_PRICING = {
   inputRate: 2.5 / 1e6,
   cachedRate: 0.25 / 1e6,
@@ -219,37 +216,31 @@ var OPENAI_GPT_54_PRIORITY_PRICING = {
   cachedRate: 0.5 / 1e6,
   outputRate: 30 / 1e6
 };
-var OPENAI_GPT_53_CODEX_PRICING = {
-  inputRate: 1.25 / 1e6,
-  cachedRate: 0.125 / 1e6,
-  outputRate: 10 / 1e6
-};
-var OPENAI_GPT_5_MINI_PRICING = {
+var OPENAI_GPT_54_MINI_PRICING = {
   inputRate: 0.25 / 1e6,
   cachedRate: 0.025 / 1e6,
   outputRate: 2 / 1e6
 };
+var OPENAI_GPT_54_NANO_PRICING = {
+  inputRate: 0.05 / 1e6,
+  cachedRate: 5e-3 / 1e6,
+  outputRate: 0.4 / 1e6
+};
 function getOpenAiPricing(modelId) {
   if (modelId.includes("gpt-5.4-fast")) {
     return OPENAI_GPT_54_PRIORITY_PRICING;
   }
-  if (modelId.includes("gpt-5.4")) {
-    return OPENAI_GPT_54_PRICING;
-  }
-  if (modelId.includes("gpt-5.3-codex-spark")) {
-    return OPENAI_GPT_5_MINI_PRICING;
-  }
-  if (modelId.includes("gpt-5.3-codex")) {
-    return OPENAI_GPT_53_CODEX_PRICING;
+  if (modelId.includes("gpt-5.4-mini")) {
+    return OPENAI_GPT_54_MINI_PRICING;
   }
-  if (modelId.includes("gpt-5.2")) {
-    return OPENAI_GPT_52_PRICING;
+  if (modelId.includes("gpt-5.4-nano")) {
+    return OPENAI_GPT_54_NANO_PRICING;
   }
-  if (modelId.includes("gpt-5-mini")) {
-    return OPENAI_GPT_5_MINI_PRICING;
+  if (modelId.includes("gpt-5.3-codex-spark")) {
+    return OPENAI_GPT_54_MINI_PRICING;
   }
-  if (modelId.includes("gpt-5.1-codex-mini")) {
-    return OPENAI_GPT_5_MINI_PRICING;
+  if (modelId.includes("gpt-5.4")) {
+    return OPENAI_GPT_54_PRICING;
   }
   return void 0;
 }
@@ -2718,22 +2709,15 @@ async function runOpenAiCall(fn, modelId, runOptions) {
 }
 
 // src/openai/models.ts
-var OPENAI_MODEL_IDS = [
-  "gpt-5.4",
-  "gpt-5.3-codex",
-  "gpt-5.2",
-  "gpt-5.1-codex-mini"
-];
+var OPENAI_MODEL_IDS = ["gpt-5.4", "gpt-5.4-mini", "gpt-5.4-nano"];
 function isOpenAiModelId(value) {
   return OPENAI_MODEL_IDS.includes(value);
 }
 var CHATGPT_MODEL_IDS = [
   "chatgpt-gpt-5.4",
   "chatgpt-gpt-5.4-fast",
-  "chatgpt-gpt-5.3-codex",
-  "chatgpt-gpt-5.3-codex-spark",
-  "chatgpt-gpt-5.2",
-  "chatgpt-gpt-5.1-codex-mini"
+  "chatgpt-gpt-5.4-mini",
+  "chatgpt-gpt-5.3-codex-spark"
 ];
 function isChatGptModelId(value) {
   return CHATGPT_MODEL_IDS.includes(value);
@@ -4417,6 +4401,72 @@ function parseCanonicalGeminiFileId(fileUri) {
   const fileId = fileUri.slice(CANONICAL_GEMINI_FILE_URI_PREFIX.length).trim();
   return fileId.length > 0 ? fileId : void 0;
 }
+function isLlmMediaResolution(value) {
+  return value === "auto" || value === "low" || value === "medium" || value === "high" || value === "original";
+}
+function resolveEffectiveMediaResolution(detail, fallback) {
+  return detail ?? fallback;
+}
+function supportsOpenAiOriginalImageDetail(model) {
+  if (!model) {
+    return false;
+  }
+  const providerModel = isChatGptModelId(model) ? resolveChatGptProviderModel(model) : model;
+  const match = /^gpt-(\d+)(?:\.(\d+))?/u.exec(providerModel);
+  if (!match) {
+    return false;
+  }
+  const major = Number(match[1]);
+  const minor = Number(match[2] ?? "0");
+  if (!Number.isFinite(major) || !Number.isFinite(minor)) {
+    return false;
+  }
+  return major > 5 || major === 5 && minor >= 4;
+}
+function toOpenAiImageDetail(mediaResolution, model) {
+  switch (mediaResolution) {
+    case "low":
+      return "low";
+    case "medium":
+      return "high";
+    case "high":
+      return "high";
+    case "original":
+      return supportsOpenAiOriginalImageDetail(model) ? "original" : "high";
+    case "auto":
+    default:
+      return "auto";
+  }
+}
+function toGeminiMediaResolution(mediaResolution) {
+  switch (mediaResolution) {
+    case "low":
+      return MediaResolution.MEDIA_RESOLUTION_LOW;
+    case "medium":
+      return MediaResolution.MEDIA_RESOLUTION_MEDIUM;
+    case "high":
+    case "original":
+      return MediaResolution.MEDIA_RESOLUTION_HIGH;
+    case "auto":
+    default:
+      return void 0;
+  }
+}
+function toGeminiPartMediaResolution(mediaResolution) {
+  switch (mediaResolution) {
+    case "low":
+      return PartMediaResolutionLevel.MEDIA_RESOLUTION_LOW;
+    case "medium":
+      return PartMediaResolutionLevel.MEDIA_RESOLUTION_MEDIUM;
+    case "high":
+      return PartMediaResolutionLevel.MEDIA_RESOLUTION_HIGH;
+    case "original":
+      return PartMediaResolutionLevel.MEDIA_RESOLUTION_ULTRA_HIGH;
+    case "auto":
+    default:
+      return void 0;
+  }
+}
 function cloneContentPart(part) {
   switch (part.type) {
     case "text":
@@ -4545,7 +4595,8 @@ function convertGeminiContentToLlmContent(content) {
     parts: convertGooglePartsToLlmParts(content.parts ?? [])
   };
 }
-function toGeminiPart(part) {
+function toGeminiPart(part, options) {
+  const defaultMediaResolution = options?.defaultMediaResolution;
   switch (part.type) {
     case "text":
       return {
@@ -4553,6 +4604,18 @@ function toGeminiPart(part) {
         thought: part.thought === true ? true : void 0
       };
     case "inlineData": {
+      if (isInlineImageMime(part.mimeType)) {
+        const mimeType = part.mimeType ?? "application/octet-stream";
+        const geminiPart = createPartFromBase64(
+          part.data,
+          mimeType,
+          toGeminiPartMediaResolution(defaultMediaResolution)
+        );
+        if (part.filename && geminiPart.inlineData) {
+          geminiPart.inlineData.displayName = part.filename;
+        }
+        return geminiPart;
+      }
       const inlineData = {
         data: part.data,
         mimeType: part.mimeType
@@ -4565,31 +4628,35 @@ function toGeminiPart(part) {
       };
     }
     case "input_image": {
+      const mediaResolution = resolveEffectiveMediaResolution(part.detail, defaultMediaResolution);
+      const geminiPartMediaResolution = toGeminiPartMediaResolution(mediaResolution);
       if (part.file_id) {
-        return {
-          fileData: {
-            fileUri: buildCanonicalGeminiFileUri(part.file_id),
-            mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream"
-          }
-        };
+        return createPartFromUri(
+          buildCanonicalGeminiFileUri(part.file_id),
+          inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream",
+          geminiPartMediaResolution
+        );
       }
       if (typeof part.image_url !== "string" || part.image_url.trim().length === 0) {
         throw new Error("input_image requires image_url or file_id.");
       }
       const parsed = parseDataUrlPayload(part.image_url);
       if (parsed) {
-        const geminiPart = createPartFromBase64(parsed.dataBase64, parsed.mimeType);
+        const geminiPart = createPartFromBase64(
+          parsed.dataBase64,
+          parsed.mimeType,
+          geminiPartMediaResolution
+        );
         if (part.filename && geminiPart.inlineData) {
           geminiPart.inlineData.displayName = part.filename;
         }
         return geminiPart;
       }
-      return {
-        fileData: {
-          fileUri: part.image_url,
-          mimeType: inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream"
-        }
-      };
+      return createPartFromUri(
+        part.image_url,
+        inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream",
+        geminiPartMediaResolution
+      );
     }
     case "input_file": {
       if (part.file_id) {
@@ -4632,11 +4699,11 @@ function toGeminiPart(part) {
       throw new Error("Unsupported LLM content part");
   }
 }
-function convertLlmContentToGeminiContent(content) {
+function convertLlmContentToGeminiContent(content, options) {
   const role = content.role === "assistant" ? "model" : "user";
   return {
     role,
-    parts: content.parts.map(toGeminiPart)
+    parts: content.parts.map((part) => toGeminiPart(part, options))
   };
 }
 function resolveProvider(model) {
@@ -4817,7 +4884,7 @@ async function storeCanonicalPromptFile(options) {
     mimeType: options.mimeType
   };
 }
-async function prepareOpenAiPromptContentItem(item) {
+async function prepareOpenAiPromptContentItem(item, options) {
   if (!isOpenAiNativeContentItem(item)) {
     return item;
   }
@@ -4836,7 +4903,10 @@ async function prepareOpenAiPromptContentItem(item) {
     });
     return {
       type: "input_image",
-      detail: item.detail === "high" || item.detail === "low" ? item.detail : "auto",
+      detail: toOpenAiImageDetail(
+        isLlmMediaResolution(item.detail) ? item.detail : void 0,
+        options?.model
+      ),
       file_id: uploaded.fileId
     };
   }
@@ -4873,7 +4943,7 @@ async function prepareOpenAiPromptContentItem(item) {
   }
   return item;
 }
-async function prepareOpenAiPromptInput(input) {
+async function prepareOpenAiPromptInput(input, options) {
   const prepareItem = async (item) => {
     if (!item || typeof item !== "object") {
       return item;
@@ -4883,7 +4953,7 @@ async function prepareOpenAiPromptInput(input) {
       return {
         ...record,
         content: await Promise.all(
-          record.content.map((part) => prepareOpenAiPromptContentItem(part))
+          record.content.map((part) => prepareOpenAiPromptContentItem(part, options))
         )
       };
     }
@@ -4891,19 +4961,19 @@ async function prepareOpenAiPromptInput(input) {
       return {
         ...record,
         output: await Promise.all(
-          record.output.map((part) => prepareOpenAiPromptContentItem(part))
+          record.output.map((part) => prepareOpenAiPromptContentItem(part, options))
         )
       };
     }
-    return await prepareOpenAiPromptContentItem(item);
+    return await prepareOpenAiPromptContentItem(item, options);
   };
   return await Promise.all(input.map((item) => prepareItem(item)));
 }
-async function maybePrepareOpenAiPromptInput(input) {
+async function maybePrepareOpenAiPromptInput(input, options) {
   if (estimateOpenAiInlinePromptBytes(input) <= INLINE_ATTACHMENT_PROMPT_THRESHOLD_BYTES) {
     return Array.from(input);
   }
-  return await prepareOpenAiPromptInput(input);
+  return await prepareOpenAiPromptInput(input, options);
 }
 function estimateGeminiInlinePromptBytes(contents) {
   let total = 0;
@@ -4934,22 +5004,25 @@ async function prepareGeminiPromptContents(contents) {
     for (const part of content.parts ?? []) {
       const canonicalFileId = parseCanonicalGeminiFileId(part.fileData?.fileUri);
       if (canonicalFileId) {
+        const mediaResolution = part.mediaResolution?.level;
         await getCanonicalFileMetadata(canonicalFileId);
         if (backend === "api") {
           const mirrored = await ensureGeminiFileMirror(canonicalFileId);
-          parts.push(createPartFromUri(mirrored.uri, mirrored.mimeType));
+          parts.push(createPartFromUri(mirrored.uri, mirrored.mimeType, mediaResolution));
         } else {
           const mirrored = await ensureVertexFileMirror(canonicalFileId);
           parts.push({
             fileData: {
               fileUri: mirrored.fileUri,
               mimeType: mirrored.mimeType
-            }
+            },
+            ...mediaResolution ? { mediaResolution: { level: mediaResolution } } : {}
           });
         }
         continue;
       }
       if (part.inlineData?.data) {
+        const mediaResolution = part.mediaResolution?.level;
         const mimeType = part.inlineData.mimeType ?? "application/octet-stream";
         const filename = normaliseAttachmentFilename(
           getInlineAttachmentFilename(part.inlineData) ?? part.inlineData.displayName ?? guessInlineDataFilename(mimeType),
@@ -4962,14 +5035,15 @@ async function prepareGeminiPromptContents(contents) {
         });
         if (backend === "api") {
           const mirrored = await ensureGeminiFileMirror(stored.fileId);
-          parts.push(createPartFromUri(mirrored.uri, mirrored.mimeType));
+          parts.push(createPartFromUri(mirrored.uri, mirrored.mimeType, mediaResolution));
         } else {
           const mirrored = await ensureVertexFileMirror(stored.fileId);
           parts.push({
             fileData: {
               fileUri: mirrored.fileUri,
               mimeType: mirrored.mimeType
-            }
+            },
+            ...mediaResolution ? { mediaResolution: { level: mediaResolution } } : {}
           });
         }
         continue;
@@ -5432,7 +5506,7 @@ function resolveTextContents(input) {
   }
   return contents;
 }
-function toOpenAiInput(contents) {
+function toOpenAiInput(contents, options) {
   const OPENAI_ROLE_FROM_LLM = {
     user: "user",
     assistant: "assistant",
@@ -5440,6 +5514,8 @@ function toOpenAiInput(contents) {
     developer: "developer",
     tool: "assistant"
   };
+  const defaultMediaResolution = options?.defaultMediaResolution;
+  const model = options?.model;
   return contents.map((content) => {
     const parts = [];
     for (const part of content.parts) {
@@ -5454,7 +5530,7 @@ function toOpenAiInput(contents) {
             const imagePart = {
               type: "input_image",
               image_url: dataUrl,
-              detail: "auto"
+              detail: toOpenAiImageDetail(defaultMediaResolution, model)
             };
             setInlineAttachmentFilename(
               imagePart,
@@ -5471,11 +5547,15 @@ function toOpenAiInput(contents) {
           break;
         }
         case "input_image": {
+          const mediaResolution = resolveEffectiveMediaResolution(
+            part.detail,
+            defaultMediaResolution
+          );
           const imagePart = {
             type: "input_image",
             ...part.file_id ? { file_id: part.file_id } : {},
             ...part.image_url ? { image_url: part.image_url } : {},
-            detail: part.detail === "high" || part.detail === "low" ? part.detail : "auto"
+            detail: toOpenAiImageDetail(mediaResolution, model)
           };
           if (part.filename) {
             setInlineAttachmentFilename(imagePart, part.filename);
@@ -5508,9 +5588,11 @@ function toOpenAiInput(contents) {
     };
   });
 }
-function toChatGptInput(contents) {
+function toChatGptInput(contents, options) {
   const instructionsParts = [];
   const input = [];
+  const defaultMediaResolution = options?.defaultMediaResolution;
+  const model = options?.model;
   for (const content of contents) {
     if (content.role === "system" || content.role === "developer") {
       for (const part of content.parts) {
@@ -5546,7 +5628,7 @@ function toChatGptInput(contents) {
             parts.push({
               type: "input_image",
               image_url: dataUrl,
-              detail: "auto"
+              detail: toOpenAiImageDetail(defaultMediaResolution, model)
             });
           } else {
             parts.push({
@@ -5560,14 +5642,19 @@ function toChatGptInput(contents) {
           }
           break;
         }
-        case "input_image":
+        case "input_image": {
+          const mediaResolution = resolveEffectiveMediaResolution(
+            part.detail,
+            defaultMediaResolution
+          );
           parts.push({
             type: "input_image",
             ...part.file_id ? { file_id: part.file_id } : {},
             ...part.image_url ? { image_url: part.image_url } : {},
-            detail: part.detail === "high" || part.detail === "low" ? part.detail : "auto"
+            detail: toOpenAiImageDetail(mediaResolution, model)
           });
           break;
+        }
         case "input_file":
           parts.push({
             type: "input_file",
@@ -5960,6 +6047,9 @@ function isLlmToolOutputContentItem(value) {
         return false;
       }
     }
+    if (value.detail !== void 0 && value.detail !== null && !isLlmMediaResolution(value.detail)) {
+      return false;
+    }
     return value.image_url !== void 0 || value.file_id !== void 0;
   }
   if (itemType === "input_file") {
@@ -5974,17 +6064,30 @@ function isLlmToolOutputContentItem(value) {
   }
   return false;
 }
-function toOpenAiToolOutput(value) {
+function toOpenAiToolOutput(value, options) {
+  const normalizeImageItem = (item) => {
+    if (item.type !== "input_image") {
+      return item;
+    }
+    const mediaResolution = resolveEffectiveMediaResolution(
+      item.detail,
+      options?.defaultMediaResolution
+    );
+    return {
+      ...item,
+      detail: toOpenAiImageDetail(mediaResolution, options?.model)
+    };
+  };
   if (isLlmToolOutputContentItem(value)) {
-    return [value];
+    return [normalizeImageItem(value)];
   }
   if (Array.isArray(value) && value.every((item) => isLlmToolOutputContentItem(item))) {
-    return value;
+    return value.map((item) => normalizeImageItem(item));
   }
   return mergeToolOutput(value);
 }
-function toChatGptToolOutput(value) {
-  const toolOutput = toOpenAiToolOutput(value);
+function toChatGptToolOutput(value, options) {
+  const toolOutput = toOpenAiToolOutput(value, options);
   if (typeof toolOutput === "string") {
     return toolOutput;
   }
@@ -5996,7 +6099,12 @@ function toChatGptToolOutput(value) {
       type: "input_image",
       ...item.file_id ? { file_id: item.file_id } : {},
       ...item.image_url ? { image_url: item.image_url } : {},
-      ...item.detail ? { detail: item.detail } : {}
+      ...item.detail ? {
+        detail: toOpenAiImageDetail(
+          resolveEffectiveMediaResolution(item.detail, options?.defaultMediaResolution),
+          options?.model
+        )
+      } : {}
     };
   });
 }
@@ -6255,34 +6363,41 @@ async function maybeSpillCombinedToolCallOutputs(callResults, options) {
     })
   );
 }
-function buildGeminiToolOutputMediaPart(item) {
+function buildGeminiToolOutputMediaPart(item, options) {
   if (item.type === "input_image") {
+    const mediaResolution = resolveEffectiveMediaResolution(
+      item.detail,
+      options?.defaultMediaResolution
+    );
+    const geminiPartMediaResolution = toGeminiPartMediaResolution(mediaResolution);
     if (typeof item.file_id === "string" && item.file_id.trim().length > 0) {
-      return {
-        fileData: {
-          fileUri: buildCanonicalGeminiFileUri(item.file_id),
-          mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream"
-        }
-      };
+      return createPartFromUri(
+        buildCanonicalGeminiFileUri(item.file_id),
+        inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream",
+        geminiPartMediaResolution
+      );
     }
     if (typeof item.image_url !== "string" || item.image_url.trim().length === 0) {
       return null;
     }
     const parsed = parseDataUrlPayload(item.image_url);
     if (parsed) {
-      const part = createPartFromBase64(parsed.dataBase64, parsed.mimeType);
+      const part = createPartFromBase64(
+        parsed.dataBase64,
+        parsed.mimeType,
+        geminiPartMediaResolution
+      );
       const displayName = item.filename?.trim();
       if (displayName && part.inlineData) {
         part.inlineData.displayName = displayName;
       }
       return part;
     }
-    return {
-      fileData: {
-        fileUri: item.image_url,
-        mimeType: inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream"
-      }
-    };
+    return createPartFromUri(
+      item.image_url,
+      inferToolOutputMimeTypeFromFilename(item.filename) ?? "application/octet-stream",
+      geminiPartMediaResolution
+    );
   }
   if (item.type === "input_file") {
     if (typeof item.file_id === "string" && item.file_id.trim().length > 0) {
@@ -6360,7 +6475,9 @@ function buildGeminiFunctionResponseParts(options) {
   }
   const responseOutput = outputItems.map((item) => toGeminiToolOutputPlaceholder(item));
   const responseParts = outputItems.flatMap((item) => {
-    const mediaPart = buildGeminiToolOutputMediaPart(item);
+    const mediaPart = buildGeminiToolOutputMediaPart(item, {
+      defaultMediaResolution: options.defaultMediaResolution
+    });
     return mediaPart ? [mediaPart] : [];
   });
   const responsePayload = { output: responseOutput };
@@ -7127,6 +7244,7 @@ function startLlmCallLoggerFromContents(options) {
       ...options.request.imageAspectRatio ? { imageAspectRatio: options.request.imageAspectRatio } : {},
       ...options.request.imageSize ? { imageSize: options.request.imageSize } : {},
       ...options.request.thinkingLevel ? { thinkingLevel: options.request.thinkingLevel } : {},
+      ...options.request.mediaResolution ? { mediaResolution: options.request.mediaResolution } : {},
       ...options.request.openAiTextFormat ? { openAiTextFormat: sanitiseLogValue(options.request.openAiTextFormat) } : {},
       ...getCurrentToolCallContext() ? { toolContext: getCurrentToolCallContext() } : {}
     },
@@ -7237,7 +7355,13 @@ async function runTextCall(params) {
   const { result } = await collectFileUploadMetrics(async () => {
     try {
       if (provider === "openai") {
-        const openAiInput = await maybePrepareOpenAiPromptInput(toOpenAiInput(contents));
+        const openAiInput = await maybePrepareOpenAiPromptInput(
+          toOpenAiInput(contents, {
+            defaultMediaResolution: request.mediaResolution,
+            model: request.model
+          }),
+          { model: request.model }
+        );
         const openAiTools = toOpenAiTools(request.tools);
         const reasoningEffort = resolveOpenAiReasoningEffort(
           modelForProvider,
@@ -7311,7 +7435,10 @@ async function runTextCall(params) {
           }
         }, modelForProvider);
       } else if (provider === "chatgpt") {
-        const chatGptInput = toChatGptInput(contents);
+        const chatGptInput = toChatGptInput(contents, {
+          defaultMediaResolution: request.mediaResolution,
+          model: request.model
+        });
         const reasoningEffort = resolveOpenAiReasoningEffort(request.model, request.thinkingLevel);
         const openAiTools = toOpenAiTools(request.tools);
         const requestPayload = {
@@ -7408,12 +7535,18 @@ async function runTextCall(params) {
         }, modelForProvider);
       } else {
         const geminiContents = await maybePrepareGeminiPromptContents(
-          contents.map(convertLlmContentToGeminiContent)
+          contents.map(
+            (content2) => convertLlmContentToGeminiContent(content2, {
+              defaultMediaResolution: request.mediaResolution
+            })
+          )
         );
         const thinkingConfig = resolveGeminiThinkingConfig(modelForProvider, request.thinkingLevel);
+        const mediaResolution = toGeminiMediaResolution(request.mediaResolution);
         const config = {
           maxOutputTokens: 32e3,
           ...thinkingConfig ? { thinkingConfig } : {},
+          ...mediaResolution ? { mediaResolution } : {},
           ...request.responseMimeType ? { responseMimeType: request.responseMimeType } : {},
           ...request.responseJsonSchema ? { responseJsonSchema: request.responseJsonSchema } : {},
           ...request.responseModalities ? { responseModalities: Array.from(request.responseModalities) } : {},
@@ -8091,7 +8224,10 @@ async function runToolLoop(request) {
         summary: "detailed"
       };
       let previousResponseId;
-      let input = toOpenAiInput(contents);
+      let input = toOpenAiInput(contents, {
+        defaultMediaResolution: request.mediaResolution,
+        model: request.model
+      });
       for (let stepIndex = 0; stepIndex < maxSteps; stepIndex += 1) {
         const turn = stepIndex + 1;
         const stepStartedAtMs = Date.now();
@@ -8118,7 +8254,9 @@ async function runToolLoop(request) {
         let reasoningSummary = "";
         let stepToolCallText;
         let stepToolCallPayload;
-        const preparedInput = await maybePrepareOpenAiPromptInput(input);
+        const preparedInput = await maybePrepareOpenAiPromptInput(input, {
+          model: request.model
+        });
         const stepRequestPayload = {
           model: providerInfo.model,
           input: preparedInput,
@@ -8249,7 +8387,10 @@ async function runToolLoop(request) {
           const stepToolCalls = [];
           if (responseToolCalls.length === 0) {
             const steeringInput2 = steeringInternal?.drainPendingContents() ?? [];
-            const steeringItems2 = steeringInput2.length > 0 ? toOpenAiInput(steeringInput2) : [];
+            const steeringItems2 = steeringInput2.length > 0 ? toOpenAiInput(steeringInput2, {
+              defaultMediaResolution: request.mediaResolution,
+              model: request.model
+            }) : [];
             finalText = responseText;
             finalThoughts = reasoningSummary;
             const stepCompletedAtMs2 = Date.now();
@@ -8380,13 +8521,19 @@ async function runToolLoop(request) {
               toolOutputs.push({
                 type: "custom_tool_call_output",
                 call_id: entry.call.call_id,
-                output: toOpenAiToolOutput(outputPayload)
+                output: toOpenAiToolOutput(outputPayload, {
+                  defaultMediaResolution: request.mediaResolution,
+                  model: request.model
+                })
               });
             } else {
               toolOutputs.push({
                 type: "function_call_output",
                 call_id: entry.call.call_id,
-                output: toOpenAiToolOutput(outputPayload)
+                output: toOpenAiToolOutput(outputPayload, {
+                  defaultMediaResolution: request.mediaResolution,
+                  model: request.model
+                })
               });
             }
           }
@@ -8411,7 +8558,10 @@ async function runToolLoop(request) {
             timing
           });
           const steeringInput = steeringInternal?.drainPendingContents() ?? [];
-          const steeringItems = steeringInput.length > 0 ? toOpenAiInput(steeringInput) : [];
+          const steeringItems = steeringInput.length > 0 ? toOpenAiInput(steeringInput, {
+            defaultMediaResolution: request.mediaResolution,
+            model: request.model
+          }) : [];
           stepCallLogger?.complete({
             responseText,
             toolCallText: stepToolCallText,
@@ -8456,7 +8606,10 @@ async function runToolLoop(request) {
       const openAiNativeTools = toOpenAiTools(request.modelTools);
       const openAiTools = openAiNativeTools ? [...openAiNativeTools, ...openAiAgentTools] : [...openAiAgentTools];
       const reasoningEffort = resolveOpenAiReasoningEffort(request.model, request.thinkingLevel);
-      const toolLoopInput = toChatGptInput(contents);
+      const toolLoopInput = toChatGptInput(contents, {
+        defaultMediaResolution: request.mediaResolution,
+        model: request.model
+      });
       const conversationId = `tool-loop-${randomBytes(8).toString("hex")}`;
       const promptCacheKey = conversationId;
       let input = [...toolLoopInput.input];
@@ -8560,7 +8713,10 @@ async function runToolLoop(request) {
           stepToolCallText = serialiseLogArtifactText(stepToolCallPayload);
           if (responseToolCalls.length === 0) {
             const steeringInput2 = steeringInternal?.drainPendingContents() ?? [];
-            const steeringItems2 = steeringInput2.length > 0 ? toChatGptInput(steeringInput2).input : [];
+            const steeringItems2 = steeringInput2.length > 0 ? toChatGptInput(steeringInput2, {
+              defaultMediaResolution: request.mediaResolution,
+              model: request.model
+            }).input : [];
             finalText = responseText;
             finalThoughts = reasoningSummaryText;
             const stepCompletedAtMs2 = Date.now();
@@ -8692,7 +8848,10 @@ async function runToolLoop(request) {
               toolOutputs.push({
                 type: "custom_tool_call_output",
                 call_id: entry.ids.callId,
-                output: toChatGptToolOutput(outputPayload)
+                output: toChatGptToolOutput(outputPayload, {
+                  defaultMediaResolution: request.mediaResolution,
+                  model: request.model
+                })
               });
             } else {
               toolOutputs.push({
@@ -8706,7 +8865,10 @@ async function runToolLoop(request) {
               toolOutputs.push({
                 type: "function_call_output",
                 call_id: entry.ids.callId,
-                output: toChatGptToolOutput(outputPayload)
+                output: toChatGptToolOutput(outputPayload, {
+                  defaultMediaResolution: request.mediaResolution,
+                  model: request.model
+                })
               });
             }
           }
@@ -8730,7 +8892,10 @@ async function runToolLoop(request) {
             timing
           });
           const steeringInput = steeringInternal?.drainPendingContents() ?? [];
-          const steeringItems = steeringInput.length > 0 ? toChatGptInput(steeringInput).input : [];
+          const steeringItems = steeringInput.length > 0 ? toChatGptInput(steeringInput, {
+            defaultMediaResolution: request.mediaResolution,
+            model: request.model
+          }).input : [];
           stepCallLogger?.complete({
             responseText,
             toolCallText: stepToolCallText,
@@ -9061,7 +9226,11 @@ async function runToolLoop(request) {
     const geminiFunctionTools = buildGeminiFunctionDeclarations(request.tools);
     const geminiNativeTools = toGeminiTools(request.modelTools);
     const geminiTools = geminiNativeTools ? geminiNativeTools.concat(geminiFunctionTools) : geminiFunctionTools;
-    const geminiContents = contents.map(convertLlmContentToGeminiContent);
+    const geminiContents = contents.map(
+      (content) => convertLlmContentToGeminiContent(content, {
+        defaultMediaResolution: request.mediaResolution
+      })
+    );
     for (let stepIndex = 0; stepIndex < maxSteps; stepIndex += 1) {
       const turn = stepIndex + 1;
       const stepStartedAtMs = Date.now();
@@ -9079,6 +9248,7 @@ async function runToolLoop(request) {
         }
       };
       const thinkingConfig = resolveGeminiThinkingConfig(request.model, request.thinkingLevel);
+      const mediaResolution = toGeminiMediaResolution(request.mediaResolution);
       const config = {
         maxOutputTokens: 32e3,
         tools: geminiTools,
@@ -9087,7 +9257,8 @@ async function runToolLoop(request) {
             mode: FunctionCallingConfigMode.VALIDATED
           }
         },
-        ...thinkingConfig ? { thinkingConfig } : {}
+        ...thinkingConfig ? { thinkingConfig } : {},
+        ...mediaResolution ? { mediaResolution } : {}
       };
       const onEvent = request.onEvent;
       const preparedGeminiContents = await maybePrepareGeminiPromptContents(geminiContents);
@@ -9243,7 +9414,13 @@ async function runToolLoop(request) {
           } else if (response.responseText.length > 0) {
             geminiContents.push({ role: "model", parts: [{ text: response.responseText }] });
           }
-          geminiContents.push(...steeringInput2.map(convertLlmContentToGeminiContent));
+          geminiContents.push(
+            ...steeringInput2.map(
+              (content) => convertLlmContentToGeminiContent(content, {
+                defaultMediaResolution: request.mediaResolution
+              })
+            )
+          );
           continue;
         }
         const toolCalls = [];
@@ -9335,7 +9512,8 @@ async function runToolLoop(request) {
             ...buildGeminiFunctionResponseParts({
               toolName: entry.toolName,
               callId: entry.call.id,
-              outputPayload
+              outputPayload,
+              defaultMediaResolution: request.mediaResolution
             })
           );
         }
@@ -9380,7 +9558,13 @@ async function runToolLoop(request) {
         geminiContents.push({ role: "user", parts: responseParts });
         const steeringInput = steeringInternal?.drainPendingContents() ?? [];
         if (steeringInput.length > 0) {
-          geminiContents.push(...steeringInput.map(convertLlmContentToGeminiContent));
+          geminiContents.push(
+            ...steeringInput.map(
+              (content) => convertLlmContentToGeminiContent(content, {
+                defaultMediaResolution: request.mediaResolution
+              })
+            )
+          );
         }
       } catch (error) {
         stepCallLogger?.fail(error, {
@@ -9636,7 +9820,7 @@ async function generateImages(request) {
                     }
                     return image;
                   })(),
-                  model: "gpt-5.2"
+                  model: "gpt-5.4-mini"
                 })
               )
             );
@@ -9942,7 +10126,6 @@ function resolveSubagentToolConfig(selection, currentDepth) {
     maxWaitTimeoutMs,
     promptPattern,
     ...instructions ? { instructions } : {},
-    ...config.model ? { model: config.model } : {},
     ...maxSteps ? { maxSteps } : {},
     inheritTools: config.inheritTools !== false,
     inheritFilesystemTool: config.inheritFilesystemTool !== false
@@ -9994,7 +10177,6 @@ function createSubagentToolController(options) {
             `Subagent depth limit reached (${options.config.maxDepth}). Cannot spawn at depth ${childDepth}.`
           );
         }
-        const model = options.config.model ?? options.parentModel;
         const id = `agent_${randomBytes2(6).toString("hex")}`;
         const now = Date.now();
         const { roleName, roleInstructions } = resolveAgentType(input.agent_type);
@@ -10014,7 +10196,7 @@ function createSubagentToolController(options) {
         const agent = {
           id,
           depth: childDepth,
-          model,
+          model: options.parentModel,
           ...nickname ? { nickname } : {},
           agentRole: roleName,
           status: "idle",
@@ -11769,7 +11951,8 @@ async function viewImageCodex(input, options) {
   return [
     {
       type: "input_image",
-      image_url: `data:${mimeType};base64,${bytes.toString("base64")}`
+      image_url: `data:${mimeType};base64,${bytes.toString("base64")}`,
+      ...options.mediaResolution ? { detail: options.mediaResolution } : {}
     }
   ];
 }
@@ -12449,7 +12632,11 @@ async function runAgentLoopInternal(request, context) {
   const toolLoopRequestWithSteering = toolLoopRequest.steering === steeringChannel ? toolLoopRequest : { ...toolLoopRequest, steering: steeringChannel };
   const filesystemSelection = filesystemTool ?? filesystem_tool;
   const subagentSelection = subagentTool ?? subagent_tool ?? subagents;
-  const filesystemTools = resolveFilesystemTools(request.model, filesystemSelection);
+  const filesystemTools = resolveFilesystemTools(
+    request.model,
+    filesystemSelection,
+    request.mediaResolution
+  );
   const resolvedSubagentConfig = resolveSubagentToolConfig(subagentSelection, context.depth);
   const subagentController = createSubagentController({
     runId,
@@ -12601,24 +12788,47 @@ async function runAgentLoopInternal(request, context) {
     await subagentController?.closeAll();
   }
 }
-function resolveFilesystemTools(model, selection) {
+function resolveFilesystemTools(model, selection, defaultMediaResolution) {
+  const withDefaultMediaResolution = (options) => {
+    if (defaultMediaResolution === void 0) {
+      return options;
+    }
+    return {
+      mediaResolution: defaultMediaResolution,
+      ...options ?? {}
+    };
+  };
   if (selection === void 0 || selection === false) {
     return {};
   }
   if (selection === true) {
-    return createFilesystemToolSetForModel(model, "auto");
+    return createFilesystemToolSetForModel(model, withDefaultMediaResolution(void 0) ?? {});
   }
   if (typeof selection === "string") {
-    return createFilesystemToolSetForModel(model, selection);
+    return createFilesystemToolSetForModel(model, selection, withDefaultMediaResolution(void 0));
   }
   if (selection.enabled === false) {
     return {};
   }
   if (selection.options && selection.profile !== void 0) {
-    return createFilesystemToolSetForModel(model, selection.profile, selection.options);
+    return createFilesystemToolSetForModel(
+      model,
+      selection.profile,
+      withDefaultMediaResolution(selection.options)
+    );
   }
   if (selection.options) {
-    return createFilesystemToolSetForModel(model, selection.options);
+    return createFilesystemToolSetForModel(
+      model,
+      withDefaultMediaResolution(selection.options) ?? {}
+    );
+  }
+  if (defaultMediaResolution !== void 0) {
+    return createFilesystemToolSetForModel(
+      model,
+      selection.profile ?? "auto",
+      withDefaultMediaResolution(void 0)
+    );
   }
   return createFilesystemToolSetForModel(model, selection.profile ?? "auto");
 }
@@ -12641,7 +12851,7 @@ function createSubagentController(params) {
   return createSubagentToolController({
     config: params.resolvedSubagentConfig,
     parentDepth: params.depth,
-    parentModel: params.resolvedSubagentConfig.model ?? params.model,
+    parentModel: params.model,
     forkContextMessages: normalizeForkContextMessages(params.toolLoopRequest.input),
     onBackgroundMessage: (message) => {
       params.steering?.append({ role: "user", content: message });
@@ -12661,6 +12871,7 @@ function createSubagentController(params) {
           modelTools: params.toolLoopRequest.modelTools,
           maxSteps: subagentRequest.maxSteps,
           thinkingLevel: params.toolLoopRequest.thinkingLevel,
+          mediaResolution: params.toolLoopRequest.mediaResolution,
           signal: subagentRequest.signal
         },
         {