@ljoukov/llm 5.0.3 → 6.0.0

package/dist/index.cjs

@@ -318,11 +318,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,
@@ -333,37 +328,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;
 }
@@ -2832,22 +2821,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);
@@ -4531,6 +4513,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 import_genai2.MediaResolution.MEDIA_RESOLUTION_LOW;
+    case "medium":
+      return import_genai2.MediaResolution.MEDIA_RESOLUTION_MEDIUM;
+    case "high":
+    case "original":
+      return import_genai2.MediaResolution.MEDIA_RESOLUTION_HIGH;
+    case "auto":
+    default:
+      return void 0;
+  }
+}
+function toGeminiPartMediaResolution(mediaResolution) {
+  switch (mediaResolution) {
+    case "low":
+      return import_genai2.PartMediaResolutionLevel.MEDIA_RESOLUTION_LOW;
+    case "medium":
+      return import_genai2.PartMediaResolutionLevel.MEDIA_RESOLUTION_MEDIUM;
+    case "high":
+      return import_genai2.PartMediaResolutionLevel.MEDIA_RESOLUTION_HIGH;
+    case "original":
+      return import_genai2.PartMediaResolutionLevel.MEDIA_RESOLUTION_ULTRA_HIGH;
+    case "auto":
+    default:
+      return void 0;
+  }
+}
 function cloneContentPart(part) {
   switch (part.type) {
     case "text":
@@ -4659,7 +4707,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 {
@@ -4667,6 +4716,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 = (0, import_genai2.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
@@ -4679,31 +4740,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 (0, import_genai2.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 = (0, import_genai2.createPartFromBase64)(parsed.dataBase64, parsed.mimeType);
+        const geminiPart = (0, import_genai2.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 (0, import_genai2.createPartFromUri)(
+        part.image_url,
+        inferToolOutputMimeTypeFromFilename(part.filename) ?? "application/octet-stream",
+        geminiPartMediaResolution
+      );
     }
     case "input_file": {
       if (part.file_id) {
@@ -4746,11 +4811,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) {
@@ -4931,7 +4996,7 @@ async function storeCanonicalPromptFile(options) {
     mimeType: options.mimeType
   };
 }
-async function prepareOpenAiPromptContentItem(item) {
+async function prepareOpenAiPromptContentItem(item, options) {
   if (!isOpenAiNativeContentItem(item)) {
     return item;
   }
@@ -4950,7 +5015,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
     };
   }
@@ -4987,7 +5055,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;
@@ -4997,7 +5065,7 @@ async function prepareOpenAiPromptInput(input) {
       return {
         ...record,
         content: await Promise.all(
-          record.content.map((part) => prepareOpenAiPromptContentItem(part))
+          record.content.map((part) => prepareOpenAiPromptContentItem(part, options))
         )
       };
     }
@@ -5005,19 +5073,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;
@@ -5048,22 +5116,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((0, import_genai2.createPartFromUri)(mirrored.uri, mirrored.mimeType));
+          parts.push((0, import_genai2.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),
@@ -5076,14 +5147,15 @@ async function prepareGeminiPromptContents(contents) {
         });
         if (backend === "api") {
           const mirrored = await ensureGeminiFileMirror(stored.fileId);
-          parts.push((0, import_genai2.createPartFromUri)(mirrored.uri, mirrored.mimeType));
+          parts.push((0, import_genai2.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;
@@ -5546,7 +5618,7 @@ function resolveTextContents(input) {
   }
   return contents;
 }
-function toOpenAiInput(contents) {
+function toOpenAiInput(contents, options) {
   const OPENAI_ROLE_FROM_LLM = {
     user: "user",
     assistant: "assistant",
@@ -5554,6 +5626,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) {
@@ -5568,7 +5642,7 @@ function toOpenAiInput(contents) {
             const imagePart = {
               type: "input_image",
               image_url: dataUrl,
-              detail: "auto"
+              detail: toOpenAiImageDetail(defaultMediaResolution, model)
             };
             setInlineAttachmentFilename(
               imagePart,
@@ -5585,11 +5659,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);
@@ -5622,9 +5700,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) {
@@ -5660,7 +5740,7 @@ function toChatGptInput(contents) {
             parts.push({
               type: "input_image",
               image_url: dataUrl,
-              detail: "auto"
+              detail: toOpenAiImageDetail(defaultMediaResolution, model)
             });
           } else {
             parts.push({
@@ -5674,14 +5754,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",
@@ -6074,6 +6159,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") {
@@ -6088,17 +6176,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;
   }
@@ -6110,7 +6211,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
+        )
+      } : {}
     };
   });
 }
@@ -6369,34 +6475,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 (0, import_genai2.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 = (0, import_genai2.createPartFromBase64)(parsed.dataBase64, parsed.mimeType);
+      const part = (0, import_genai2.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 (0, import_genai2.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) {
@@ -6474,7 +6587,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 };
@@ -7241,6 +7356,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() } : {}
     },
@@ -7351,7 +7467,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,
@@ -7425,7 +7547,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 = {
@@ -7522,12 +7647,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) } : {},
@@ -8205,7 +8336,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();
@@ -8232,7 +8366,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,
@@ -8363,7 +8499,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();
@@ -8494,13 +8633,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
+                })
               });
             }
           }
@@ -8525,7 +8670,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,
@@ -8570,7 +8718,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-${(0, import_node_crypto2.randomBytes)(8).toString("hex")}`;
       const promptCacheKey = conversationId;
       let input = [...toolLoopInput.input];
@@ -8674,7 +8825,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();
@@ -8806,7 +8960,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({
@@ -8820,7 +8977,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
+                })
               });
             }
           }
@@ -8844,7 +9004,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,
@@ -9175,7 +9338,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();
@@ -9193,6 +9360,7 @@ async function runToolLoop(request) {
         }
       };
       const thinkingConfig = resolveGeminiThinkingConfig(request.model, request.thinkingLevel);
+      const mediaResolution = toGeminiMediaResolution(request.mediaResolution);
       const config = {
         maxOutputTokens: 32e3,
         tools: geminiTools,
@@ -9201,7 +9369,8 @@ async function runToolLoop(request) {
             mode: import_genai2.FunctionCallingConfigMode.VALIDATED
           }
         },
-        ...thinkingConfig ? { thinkingConfig } : {}
+        ...thinkingConfig ? { thinkingConfig } : {},
+        ...mediaResolution ? { mediaResolution } : {}
       };
       const onEvent = request.onEvent;
       const preparedGeminiContents = await maybePrepareGeminiPromptContents(geminiContents);
@@ -9357,7 +9526,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 = [];
@@ -9449,7 +9624,8 @@ async function runToolLoop(request) {
             ...buildGeminiFunctionResponseParts({
               toolName: entry.toolName,
               callId: entry.call.id,
-              outputPayload
+              outputPayload,
+              defaultMediaResolution: request.mediaResolution
             })
           );
         }
@@ -9494,7 +9670,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, {
@@ -9750,7 +9932,7 @@ async function generateImages(request) {
                     }
                     return image;
                   })(),
-                  model: "gpt-5.2"
+                  model: "gpt-5.4-mini"
                 })
               )
             );
@@ -9966,7 +10148,6 @@ var spawnAgentInputSchema = import_zod4.z.object({
     "When true, fork the current thread history into the new agent before sending the initial prompt. This must be used when you want the new agent to have exactly the same context as you."
   ),
   instructions: import_zod4.z.string().nullish().describe("Optional extra instructions for this subagent instance."),
-  model: import_zod4.z.string().nullish().describe("Optional model override. Must be one of this package's supported text model ids."),
   max_steps: import_zod4.z.number().int().min(1).max(MAX_SUBAGENT_MAX_STEPS).nullish().describe("Optional max step budget for each subagent run.")
 });
 var sendInputSchema = import_zod4.z.object({
@@ -10057,7 +10238,6 @@ function resolveSubagentToolConfig(selection, currentDepth) {
     maxWaitTimeoutMs,
     promptPattern,
     ...instructions ? { instructions } : {},
-    ...config.model ? { model: config.model } : {},
     ...maxSteps ? { maxSteps } : {},
     inheritTools: config.inheritTools !== false,
     inheritFilesystemTool: config.inheritFilesystemTool !== false
@@ -10109,13 +10289,6 @@ function createSubagentToolController(options) {
             `Subagent depth limit reached (${options.config.maxDepth}). Cannot spawn at depth ${childDepth}.`
           );
         }
-        let model = options.config.model ?? options.parentModel;
-        if (input.model) {
-          if (!isLlmTextModelId(input.model)) {
-            throw new Error(`Unsupported subagent model id: ${input.model}`);
-          }
-          model = input.model;
-        }
         const id = `agent_${(0, import_node_crypto3.randomBytes)(6).toString("hex")}`;
         const now = Date.now();
         const { roleName, roleInstructions } = resolveAgentType(input.agent_type);
@@ -10135,7 +10308,7 @@ function createSubagentToolController(options) {
         const agent = {
           id,
           depth: childDepth,
-          model,
+          model: options.parentModel,
           ...nickname ? { nickname } : {},
           agentRole: roleName,
           status: "idle",
@@ -11890,7 +12063,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 } : {}
     }
   ];
 }
@@ -12570,7 +12744,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,
@@ -12722,24 +12900,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");
 }
@@ -12762,7 +12963,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 });
@@ -12782,6 +12983,7 @@ function createSubagentController(params) {
           modelTools: params.toolLoopRequest.modelTools,
           maxSteps: subagentRequest.maxSteps,
           thinkingLevel: params.toolLoopRequest.thinkingLevel,
+          mediaResolution: params.toolLoopRequest.mediaResolution,
           signal: subagentRequest.signal
         },
         {