dominds 1.17.7 → 1.18.2

package/dist/llm/gen/codex.js

@@ -309,18 +309,157 @@ function chatMessageToCodexItems(msg) {
         }
     }
 }
-async function buildCodexFunctionCallOutput(msg, limitChars, requestContext, allowedImageKeys, onToolResultImageIngest) {
+async function userLikeMessageToCodexItemsWithImages(msg, requestContext, providerConfig, allowedImageKeys, onUserImageIngest) {
+    const items = msg.contentItems;
+    if (!Array.isArray(items) || items.length === 0) {
+        return chatMessageToCodexItems(msg);
+    }
+    const content = [{ type: 'input_text', text: msg.content }];
+    const supportsImageInput = (0, tool_result_image_ingest_1.resolveModelImageInputSupport)(requestContext.modelKey === undefined
+        ? undefined
+        : providerConfig?.models[requestContext.modelKey], true);
+    for (const [itemIndex, item] of items.entries()) {
+        if (item.type === 'input_text') {
+            content.push({ type: 'input_text', text: item.text });
+            continue;
+        }
+        if (item.type === 'input_image') {
+            if (!supportsImageInput) {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_model_unsupported',
+                        providerPathLabel: 'Codex Responses path',
+                    }));
+                }
+                content.push({
+                    type: 'input_text',
+                    text: `[image not sent: current model does not support image input]`,
+                });
+                continue;
+            }
+            if (!(0, artifacts_1.isVisionImageMimeType)(item.mimeType)) {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_mime_unsupported',
+                        mimeType: item.mimeType,
+                        providerPathLabel: 'Codex Responses path',
+                    }));
+                }
+                content.push({
+                    type: 'input_text',
+                    text: `[image not sent: unsupported mimeType=${item.mimeType}]`,
+                });
+                continue;
+            }
+            if (!allowedImageKeys.has((0, tool_result_image_ingest_1.buildImageBudgetKeyForContentItem)({ msg, itemIndex, artifact: item.artifact }))) {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_size_limit',
+                        detail: (0, tool_result_image_ingest_1.buildImageBudgetLimitDetail)({
+                            byteLength: item.byteLength,
+                            budgetBytes: tool_result_image_ingest_1.CODEX_TOOL_RESULT_IMAGE_BUDGET_BYTES,
+                        }),
+                        providerPathLabel: 'Codex Responses path',
+                    }));
+                }
+                content.push({
+                    type: 'input_text',
+                    text: `[image not sent: request image budget exceeded bytes=${String(item.byteLength)} budget=${String(tool_result_image_ingest_1.CODEX_TOOL_RESULT_IMAGE_BUDGET_BYTES)}]`,
+                });
+                continue;
+            }
+            const bytesResult = await (0, tool_result_image_ingest_1.readToolResultImageBytesSafe)(item.artifact);
+            if (bytesResult.kind === 'missing') {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_missing',
+                        providerPathLabel: 'Codex Responses path',
+                    }));
+                }
+                content.push({ type: 'input_text', text: `[image missing: ${item.artifact.relPath}]` });
+                continue;
+            }
+            if (bytesResult.kind === 'read_failed') {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_read_failed',
+                        detail: bytesResult.detail,
+                        providerPathLabel: 'Codex Responses path',
+                    }));
+                }
+                content.push({ type: 'input_text', text: `[image unreadable: ${item.artifact.relPath}]` });
+                continue;
+            }
+            if (onUserImageIngest) {
+                await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                    requestContext,
+                    ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                    artifact: item.artifact,
+                    disposition: 'fed_native',
+                    providerPathLabel: 'Codex Responses path',
+                }));
+            }
+            content.push({
+                type: 'input_image',
+                image_url: (0, artifacts_1.bytesToDataUrl)({ mimeType: item.mimeType, bytes: bytesResult.bytes }),
+            });
+            continue;
+        }
+        const _exhaustive = item;
+        throw new Error(`Unsupported user content item: ${String(_exhaustive)}`);
+    }
+    return [
+        {
+            type: 'message',
+            role: 'user',
+            content,
+        },
+    ];
+}
+async function buildCodexFunctionCallOutput(msg, limitChars, requestContext, allowedImageKeys, supportsImageInput, onToolResultImageIngest) {
     const items = msg.contentItems;
     if (!Array.isArray(items) || items.length === 0) {
         return limitCodexToolOutputText(msg.content, msg, limitChars);
     }
     const out = [];
-    for (const item of items) {
+    for (const [itemIndex, item] of items.entries()) {
         if (item.type === 'input_text') {
             out.push({ type: 'input_text', text: item.text });
             continue;
         }
         if (item.type === 'input_image') {
+            if (!supportsImageInput) {
+                if (onToolResultImageIngest) {
+                    await onToolResultImageIngest((0, tool_result_image_ingest_1.buildToolResultImageIngest)({
+                        requestContext,
+                        toolCallId: msg.id,
+                        toolName: msg.name,
+                        artifact: item.artifact,
+                        disposition: 'filtered_model_unsupported',
+                        providerPathLabel: 'Codex path',
+                    }));
+                }
+                out.push({
+                    type: 'input_text',
+                    text: `[image not sent: current model does not support image input]`,
+                });
+                continue;
+            }
             if (!(0, artifacts_1.isVisionImageMimeType)(item.mimeType)) {
                 if (onToolResultImageIngest) {
                     await onToolResultImageIngest((0, tool_result_image_ingest_1.buildToolResultImageIngest)({
@@ -339,7 +478,7 @@ async function buildCodexFunctionCallOutput(msg, limitChars, requestContext, all
                 });
                 continue;
             }
-            if (!allowedImageKeys.has((0, tool_result_image_ingest_1.buildToolResultImageBudgetKeyForMsg)(msg, item.artifact))) {
+            if (!allowedImageKeys.has((0, tool_result_image_ingest_1.buildImageBudgetKeyForContentItem)({ msg, itemIndex, artifact: item.artifact }))) {
                 if (onToolResultImageIngest) {
                     await onToolResultImageIngest((0, tool_result_image_ingest_1.buildToolResultImageIngest)({
                         requestContext,
@@ -347,7 +486,7 @@ async function buildCodexFunctionCallOutput(msg, limitChars, requestContext, all
                         toolName: msg.name,
                         artifact: item.artifact,
                         disposition: 'filtered_size_limit',
-                        detail: (0, tool_result_image_ingest_1.buildToolResultImageBudgetLimitDetail)({
+                        detail: (0, tool_result_image_ingest_1.buildImageBudgetLimitDetail)({
                             byteLength: item.byteLength,
                             budgetBytes: tool_result_image_ingest_1.CODEX_TOOL_RESULT_IMAGE_BUDGET_BYTES,
                         }),
@@ -414,7 +553,7 @@ async function buildCodexFunctionCallOutput(msg, limitChars, requestContext, all
         ? limitCodexToolOutputItems(out, msg, limitChars)
         : limitCodexToolOutputText(msg.content, msg, limitChars);
 }
-async function buildCodexInput(context, requestContext, providerConfig, onToolResultImageIngest) {
+async function buildCodexInput(context, requestContext, providerConfig, onToolResultImageIngest, onUserImageIngest) {
     const normalized = (0, tool_call_context_1.normalizeToolCallPairs)(context);
     const violation = (0, tool_call_context_1.findFirstToolCallAdjacencyViolation)(normalized);
     if (violation) {
@@ -429,8 +568,19 @@ async function buildCodexInput(context, requestContext, providerConfig, onToolRe
     }
     const input = [];
     const toolResultMaxChars = (0, tool_output_limit_1.resolveProviderToolResultMaxChars)(providerConfig);
-    const allowedImageKeys = (0, tool_result_image_ingest_1.selectLatestToolResultImagesWithinBudget)(normalized, tool_result_image_ingest_1.CODEX_TOOL_RESULT_IMAGE_BUDGET_BYTES);
+    const allowedImageKeys = (0, tool_result_image_ingest_1.selectLatestImagesWithinBudget)(normalized, tool_result_image_ingest_1.CODEX_TOOL_RESULT_IMAGE_BUDGET_BYTES);
+    const supportsImageInput = (0, tool_result_image_ingest_1.resolveModelImageInputSupport)(requestContext.modelKey === undefined
+        ? undefined
+        : providerConfig?.models[requestContext.modelKey], true);
     for (const msg of normalized) {
+        if ((msg.type === 'prompting_msg' ||
+            msg.type === 'tellask_result_msg' ||
+            msg.type === 'tellask_carryover_msg') &&
+            Array.isArray(msg.contentItems) &&
+            msg.contentItems.length > 0) {
+            input.push(...(await userLikeMessageToCodexItemsWithImages(msg, requestContext, providerConfig, allowedImageKeys, onUserImageIngest)));
+            continue;
+        }
         if (msg.type === 'func_call_msg') {
             input.push({
                 type: 'function_call',
@@ -444,7 +594,7 @@ async function buildCodexInput(context, requestContext, providerConfig, onToolRe
             input.push({
                 type: 'function_call_output',
                 call_id: msg.id,
-                output: await buildCodexFunctionCallOutput(msg, toolResultMaxChars, requestContext, allowedImageKeys, onToolResultImageIngest),
+                output: await buildCodexFunctionCallOutput(msg, toolResultMaxChars, requestContext, allowedImageKeys, supportsImageInput, onToolResultImageIngest),
             });
             continue;
         }
@@ -455,11 +605,11 @@ async function buildCodexInput(context, requestContext, providerConfig, onToolRe
     }
     return input;
 }
-async function buildCodexRequest(providerConfig, agent, instructions, funcTools, requestContext, context, onToolResultImageIngest) {
+async function buildCodexRequest(providerConfig, agent, instructions, funcTools, requestContext, context, onToolResultImageIngest, onUserImageIngest) {
     if (!agent.model) {
         throw new Error(`Internal error: Model is undefined for agent '${agent.id}'`);
     }
-    const input = await buildCodexInput(context, requestContext, providerConfig, onToolResultImageIngest);
+    const input = await buildCodexInput(context, requestContext, providerConfig, onToolResultImageIngest, onUserImageIngest);
     // Provider isolation rule: request construction must only read Codex-native params here.
     const codexParams = agent.model_params?.codex;
     const parallelToolCalls = codexParams?.parallel_tool_calls ?? true;
@@ -512,7 +662,7 @@ class CodexGen {
             throw new Error(`Internal error: Model is undefined for agent '${agent.id}'`);
         }
         const instructions = resolveCodexInstructions(systemPrompt);
-        const payload = await buildCodexRequest(providerConfig, agent, instructions, funcTools, requestContext, context, receiver.toolResultImageIngest);
+        const payload = await buildCodexRequest(providerConfig, agent, instructions, funcTools, requestContext, context, receiver.toolResultImageIngest, receiver.userImageIngest);
         let sayingStarted = false;
         let thinkingStarted = false;
         let sawOutputText = false;

package/dist/llm/gen/openai-compatible.js

@@ -185,6 +185,125 @@ function chatMessageToChatCompletionMessage(msg) {
         }
     }
 }
+async function userLikeMessageToChatCompletionMessageWithImages(msg, requestContext, providerConfig, allowedImageKeys, onUserImageIngest) {
+    const items = msg.contentItems;
+    if (!Array.isArray(items) || items.length === 0) {
+        return chatMessageToChatCompletionMessage(msg);
+    }
+    const content = [{ type: 'text', text: msg.content }];
+    const supportsImageInput = (0, tool_result_image_ingest_1.resolveModelImageInputSupport)(requestContext.modelKey === undefined
+        ? undefined
+        : providerConfig?.models[requestContext.modelKey], false);
+    for (const [itemIndex, item] of items.entries()) {
+        if (item.type === 'input_text') {
+            content.push({ type: 'text', text: item.text });
+            continue;
+        }
+        if (item.type === 'input_image') {
+            if (!supportsImageInput) {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_model_unsupported',
+                        providerPathLabel: 'OpenAI-compatible Chat Completions path',
+                    }));
+                }
+                content.push({
+                    type: 'text',
+                    text: `[image not sent: current model does not support image input]`,
+                });
+                continue;
+            }
+            if (!(0, artifacts_1.isVisionImageMimeType)(item.mimeType)) {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_mime_unsupported',
+                        mimeType: item.mimeType,
+                        providerPathLabel: 'OpenAI-compatible Chat Completions path',
+                    }));
+                }
+                content.push({
+                    type: 'text',
+                    text: `[image not sent: unsupported mimeType=${item.mimeType}]`,
+                });
+                continue;
+            }
+            if (!allowedImageKeys.has((0, tool_result_image_ingest_1.buildImageBudgetKeyForContentItem)({ msg, itemIndex, artifact: item.artifact }))) {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_size_limit',
+                        detail: (0, tool_result_image_ingest_1.buildImageBudgetLimitDetail)({
+                            byteLength: item.byteLength,
+                            budgetBytes: tool_result_image_ingest_1.OPENAI_COMPATIBLE_TOOL_RESULT_IMAGE_BUDGET_BYTES,
+                        }),
+                        providerPathLabel: 'OpenAI-compatible Chat Completions path',
+                    }));
+                }
+                content.push({
+                    type: 'text',
+                    text: `[image not sent: request image budget exceeded bytes=${String(item.byteLength)} budget=${String(tool_result_image_ingest_1.OPENAI_COMPATIBLE_TOOL_RESULT_IMAGE_BUDGET_BYTES)}]`,
+                });
+                continue;
+            }
+            const bytesResult = await (0, tool_result_image_ingest_1.readToolResultImageBytesSafe)(item.artifact);
+            if (bytesResult.kind === 'missing') {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_missing',
+                        providerPathLabel: 'OpenAI-compatible Chat Completions path',
+                    }));
+                }
+                content.push({ type: 'text', text: `[image missing: ${item.artifact.relPath}]` });
+                continue;
+            }
+            if (bytesResult.kind === 'read_failed') {
+                if (onUserImageIngest) {
+                    await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                        requestContext,
+                        ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                        artifact: item.artifact,
+                        disposition: 'filtered_read_failed',
+                        detail: bytesResult.detail,
+                        providerPathLabel: 'OpenAI-compatible Chat Completions path',
+                    }));
+                }
+                content.push({ type: 'text', text: `[image unreadable: ${item.artifact.relPath}]` });
+                continue;
+            }
+            if (onUserImageIngest) {
+                await onUserImageIngest((0, tool_result_image_ingest_1.buildUserImageIngest)({
+                    requestContext,
+                    ...(msg.type === 'prompting_msg' ? { msgId: msg.msgId } : {}),
+                    artifact: item.artifact,
+                    disposition: 'fed_provider_transformed',
+                    providerPathLabel: 'OpenAI-compatible Chat Completions path',
+                }));
+            }
+            content.push({
+                type: 'image_url',
+                image_url: {
+                    url: (0, artifacts_1.bytesToDataUrl)({ mimeType: item.mimeType, bytes: bytesResult.bytes }),
+                    detail: 'auto',
+                },
+            });
+            continue;
+        }
+        const _exhaustive = item;
+        throw new Error(`Unsupported user content item: ${String(_exhaustive)}`);
+    }
+    return { role: 'user', content };
+}
 async function funcResultToChatCompletionMessages(msg, limitChars, requestContext, providerConfig, allowedImageKeys, onToolResultImageIngest) {
     const items = msg.contentItems;
     if (!Array.isArray(items) || items.length === 0) {
@@ -209,14 +328,13 @@ async function funcResultToChatCompletionMessages(msg, limitChars, requestContex
         type: 'text',
         text: `Tool output images (${msg.name}, call_id=${msg.id}):`,
     });
-    const supportsImageInput = (() => {
-        if (!providerConfig)
-            return false;
-        const modelKey = typeof requestContext.modelKey === 'string' ? requestContext.modelKey.trim() : '';
-        const modelInfo = modelKey.length > 0 ? providerConfig.models[modelKey] : undefined;
-        return isRecord(modelInfo) && modelInfo['supports_image_input'] === true;
-    })();
-    for (const item of items) {
+    const modelKey = typeof requestContext.modelKey === 'string' ? requestContext.modelKey.trim() : '';
+    const modelInfo = modelKey.length > 0 && providerConfig ? providerConfig.models[modelKey] : undefined;
+    const supportsImageInput = (0, tool_result_image_ingest_1.resolveModelImageInputSupport)(modelInfo, false);
+    const imageUnsupportedDisposition = modelInfo?.['supports_image_input'] === false
+        ? 'filtered_model_unsupported'
+        : 'filtered_provider_unsupported';
+    for (const [itemIndex, item] of items.entries()) {
         if (item.type === 'input_text')
             continue;
         if (item.type === 'input_image') {
@@ -228,7 +346,7 @@ async function funcResultToChatCompletionMessages(msg, limitChars, requestContex
                         toolCallId: msg.id,
                         toolName: msg.name,
                         artifact: item.artifact,
-                        disposition: 'filtered_provider_unsupported',
+                        disposition: imageUnsupportedDisposition,
                         providerPathLabel: 'OpenAI-compatible path',
                     }));
                 }
@@ -256,7 +374,7 @@ async function funcResultToChatCompletionMessages(msg, limitChars, requestContex
                 });
                 continue;
             }
-            if (!allowedImageKeys.has((0, tool_result_image_ingest_1.buildToolResultImageBudgetKeyForMsg)(msg, item.artifact))) {
+            if (!allowedImageKeys.has((0, tool_result_image_ingest_1.buildImageBudgetKeyForContentItem)({ msg, itemIndex, artifact: item.artifact }))) {
                 if (onToolResultImageIngest) {
                     await onToolResultImageIngest((0, tool_result_image_ingest_1.buildToolResultImageIngest)({
                         requestContext,
@@ -264,7 +382,7 @@ async function funcResultToChatCompletionMessages(msg, limitChars, requestContex
                         toolName: msg.name,
                         artifact: item.artifact,
                         disposition: 'filtered_size_limit',
-                        detail: (0, tool_result_image_ingest_1.buildToolResultImageBudgetLimitDetail)({
+                        detail: (0, tool_result_image_ingest_1.buildImageBudgetLimitDetail)({
                             byteLength: item.byteLength,
                             budgetBytes: tool_result_image_ingest_1.OPENAI_COMPATIBLE_TOOL_RESULT_IMAGE_BUDGET_BYTES,
                         }),
@@ -354,74 +472,6 @@ async function funcResultToChatCompletionMessages(msg, limitChars, requestContex
     }
     return out;
 }
-async function orphanedFuncResultToChatCompletionMessages(msg, limitChars) {
-    const items = msg.contentItems;
-    if (!Array.isArray(items) || items.length === 0) {
-        return [
-            {
-                role: 'user',
-                content: limitOpenAiCompatibleToolOutputText(`[orphaned_tool_output:${msg.name}:${msg.id}] ${msg.content}`, msg, limitChars),
-            },
-        ];
-    }
-    const parts = [
-        {
-            type: 'text',
-            text: limitOpenAiCompatibleToolOutputText(`[orphaned_tool_output:${msg.name}:${msg.id}] ${msg.content}`, msg, limitChars),
-        },
-    ];
-    let sawImageUrl = false;
-    let sawAnyImage = false;
-    for (const item of items) {
-        if (item.type === 'input_text')
-            continue;
-        if (item.type === 'input_image') {
-            sawAnyImage = true;
-            if (!(0, artifacts_1.isVisionImageMimeType)(item.mimeType)) {
-                parts.push({
-                    type: 'text',
-                    text: `[image omitted: unsupported mimeType=${item.mimeType}]`,
-                });
-                continue;
-            }
-            const bytes = await (0, artifacts_1.readDialogArtifactBytes)({
-                rootId: item.artifact.rootId,
-                selfId: item.artifact.selfId,
-                status: item.artifact.status,
-                relPath: item.artifact.relPath,
-            });
-            if (!bytes) {
-                parts.push({
-                    type: 'text',
-                    text: `[image missing: ${item.artifact.relPath}]`,
-                });
-                continue;
-            }
-            parts.push({
-                type: 'image_url',
-                image_url: { url: (0, artifacts_1.bytesToDataUrl)({ mimeType: item.mimeType, bytes }), detail: 'auto' },
-            });
-            sawImageUrl = true;
-            continue;
-        }
-        const _exhaustive = item;
-        parts.push({ type: 'text', text: `[unknown content item: ${String(_exhaustive)}]` });
-    }
-    if (sawImageUrl) {
-        return [{ role: 'user', content: parts }];
-    }
-    if (sawAnyImage) {
-        const text = parts
-            .filter((p) => p.type === 'text')
-            .map((p) => p.text)
-            .join('\n')
-            .trim();
-        return [{ role: 'user', content: text }];
-    }
-    return [
-        { role: 'user', content: limitOpenAiCompatibleToolOutputText(msg.content, msg, limitChars) },
-    ];
-}
 function mergeAdjacentMessages(input) {
     // Some proxies behave poorly with long runs of same-role messages (Dominds persists thinking/saying
     // as separate msgs). Merge adjacent user/assistant/system messages where safe.
@@ -472,7 +522,7 @@ async function buildChatCompletionMessages(systemPrompt, context, requestContext
     const input = [];
     const reasoningContentMode = options?.reasoningContentMode === true;
     const toolResultMaxChars = (0, tool_output_limit_1.resolveProviderToolResultMaxChars)(options?.providerConfig);
-    const allowedImageKeys = (0, tool_result_image_ingest_1.selectLatestToolResultImagesWithinBudget)(normalized, tool_result_image_ingest_1.OPENAI_COMPATIBLE_TOOL_RESULT_IMAGE_BUDGET_BYTES);
+    const allowedImageKeys = (0, tool_result_image_ingest_1.selectLatestImagesWithinBudget)(normalized, tool_result_image_ingest_1.OPENAI_COMPATIBLE_TOOL_RESULT_IMAGE_BUDGET_BYTES);
     let pendingReasoningContent;
     const takePendingReasoningContent = () => {
         const current = pendingReasoningContent;
@@ -514,7 +564,13 @@ async function buildChatCompletionMessages(systemPrompt, context, requestContext
             input.push(...(await funcResultToChatCompletionMessages(msg, toolResultMaxChars, requestContext, options?.providerConfig, allowedImageKeys, options?.onToolResultImageIngest)));
             continue;
         }
-        const mapped = chatMessageToChatCompletionMessage(msg);
+        const mapped = (msg.type === 'prompting_msg' ||
+            msg.type === 'tellask_result_msg' ||
+            msg.type === 'tellask_carryover_msg') &&
+            Array.isArray(msg.contentItems) &&
+            msg.contentItems.length > 0
+            ? await userLikeMessageToChatCompletionMessageWithImages(msg, requestContext, options?.providerConfig, allowedImageKeys, options?.onUserImageIngest)
+            : chatMessageToChatCompletionMessage(msg);
         input.push(attachReasoningContent(mapped, takePendingReasoningContent()));
     }
     flushPendingReasoningAsAssistantMessage();
@@ -630,6 +686,7 @@ class OpenAiCompatibleGen {
             reasoningContentMode,
             providerConfig,
             onToolResultImageIngest: receiver.toolResultImageIngest,
+            onUserImageIngest: receiver.userImageIngest,
         });
         const openAiParams = agent.model_params?.openai || {};
         const maxTokens = agent.model_params?.max_tokens;
@@ -834,6 +891,9 @@ class OpenAiCompatibleGen {
             onToolResultImageIngest: async (ingest) => {
                 outputs.push({ kind: 'tool_result_image_ingest', ingest });
             },
+            onUserImageIngest: async (ingest) => {
+                outputs.push({ kind: 'user_image_ingest', ingest });
+            },
         });
         const openAiParams = agent.model_params?.openai || {};
         const maxTokens = agent.model_params?.max_tokens;