n9router 0.4.43 → 0.4.45

package/app/open-sse/translator/request/openai-to-kiro.js

@@ -5,29 +5,194 @@
 import { register } from "../index.js";
 import { FORMATS } from "../formats.js";
 import { v4 as uuidv4 } from "uuid";
+import { resolveSessionId } from "../../utils/sessionManager.js";
 import {
   resolveKiroModel,
-  isThinkingEnabled,
+  resolveKiroThinkingBudget,
   buildThinkingSystemPrefix,
-  KIRO_AGENTIC_SYSTEM_PROMPT
+  KIRO_AGENTIC_SYSTEM_PROMPT,
+  resolveDefaultProfileArn
 } from "../../config/kiroConstants.js";
+import { parseDataUri } from "../concerns/image.js";
+import { DEFAULT_IMAGE_MIME } from "../schema/index.js";
+import { ROLE, OPENAI_BLOCK, CLAUDE_BLOCK } from "../schema/index.js";
+
+/** Render a single tool call as a readable text line. */
+function toolCallToText(name, input) {
+  let argStr;
+  try {
+    argStr = typeof input === "string" ? input : JSON.stringify(input ?? {});
+  } catch {
+    argStr = "{}";
+  }
+  return `[Tool call: ${name || "unknown"}(${argStr})]`;
+}
+
+/** Render a tool result (string or content-block array) as a text line. */
+function toolResultToText(content) {
+  const text = Array.isArray(content)
+    ? content.map(c => (typeof c === "string" ? c : c.text || "")).join("\n")
+    : (typeof content === "string" ? content : "");
+  return `[Tool result: ${text}]`;
+}
+
+/**
+ * Flatten all tool calls/results in a conversation into plain text.
+ *
+ * Kiro's schema validator requires a non-empty
+ * currentMessage.userInputMessageContext.tools array whenever the history
+ * references any tool use; otherwise it returns "Improperly formed request"
+ * (HTTP 400). A client can hit this by omitting the `tools` array on a
+ * follow-up request — typically after client-side compaction (e.g. OpenCode).
+ *
+ * Rather than fabricate stub tool specs — which would advertise tool-calling
+ * capability the client never requested and may not handle, risking a phantom
+ * tool call on an otherwise plain turn — we collapse the tool interaction into
+ * text. The request stays honest, and since no structured tool content
+ * remains, the validator's "tools required" rule never fires.
+ *
+ * Only invoked when the client did NOT send tools; when tools are present the
+ * structured form is preserved.
+ */
+function flattenToolInteractions(messages) {
+  const out = [];
+
+  for (const msg of messages) {
+    // OpenAI tool-result message → user text line
+    if (msg.role === ROLE.TOOL) {
+      out.push({ role: ROLE.USER, content: toolResultToText(msg.content) });
+      continue;
+    }
+
+    if (msg.role === ROLE.ASSISTANT) {
+      const parts = [];
+      if (Array.isArray(msg.content)) {
+        for (const c of msg.content) {
+          if (c.type === CLAUDE_BLOCK.TOOL_USE) {
+            parts.push(toolCallToText(c.name, c.input));
+          } else if (c.type === OPENAI_BLOCK.TEXT || c.text) {
+            parts.push(c.text || "");
+          }
+        }
+      } else if (typeof msg.content === "string") {
+        parts.push(msg.content);
+      }
+      for (const tc of msg.tool_calls || []) {
+        parts.push(toolCallToText(tc.function?.name, tc.function?.arguments));
+      }
+      out.push({ role: ROLE.ASSISTANT, content: parts.filter(Boolean).join("\n") });
+      continue;
+    }
+
+    // User messages: replace tool_result blocks with text, keep text + images.
+    if (msg.role === ROLE.USER && Array.isArray(msg.content)) {
+      const newContent = msg.content.map(c =>
+        c.type === CLAUDE_BLOCK.TOOL_RESULT
+          ? { type: OPENAI_BLOCK.TEXT, text: toolResultToText(c.content) }
+          : c
+      );
+      out.push({ ...msg, content: newContent });
+      continue;
+    }
+
+    out.push(msg);
+  }
+
+  return out;
+}
+
+/**
+ * Reconcile orphaned toolResults — those whose toolUseId has no matching
+ * toolUse in any assistant message. This happens when client-side compaction
+ * truncates the conversation and removes the assistant message containing the
+ * tool_use, but keeps the user message with the corresponding tool_result.
+ *
+ * A dangling structured reference makes Kiro return 400, so it must be removed.
+ * But the client deliberately kept the result content through compaction, so
+ * rather than discard it we fold it back into the user message as text — the
+ * same shape flattenToolInteractions() produces. The 400 trigger (the
+ * structured reference) is gone; the content survives.
+ *
+ * `messages` is every carrier that can hold toolResults — both history items
+ * and the popped-out currentMessage (orphans can land on either).
+ */
+function reconcileOrphanedToolResults(history, currentMessage) {
+  // Phase 1: collect all valid toolUseIds from assistant messages in history.
+  // (currentMessage is always a user turn, so it carries no toolUses.)
+  const validIds = new Set();
+  for (const h of history) {
+    const arm = h.assistantResponseMessage;
+    if (!arm) continue;
+    for (const tu of arm.toolUses || []) {
+      if (tu.toolUseId) validIds.add(tu.toolUseId);
+    }
+  }
+
+  // Phase 2: across history + currentMessage, keep results with a matching
+  // toolUse and salvage the rest as text.
+  const carriers = currentMessage ? [...history, currentMessage] : history;
+  for (const item of carriers) {
+    const uim = item.userInputMessage;
+    const ctx = uim?.userInputMessageContext;
+    if (!ctx?.toolResults?.length) continue;
+
+    const kept = [];
+    const salvaged = [];
+    for (const tr of ctx.toolResults) {
+      if (validIds.has(tr.toolUseId)) {
+        kept.push(tr);
+      } else {
+        salvaged.push(toolResultToText(tr.content));
+      }
+    }
+
+    if (salvaged.length === 0) continue; // no orphans — leave untouched
+
+    // Fold orphaned result content into the user text so it is not lost
+    const extra = salvaged.join("\n");
+    uim.content = uim.content ? `${uim.content}\n\n${extra}` : extra;
+
+    ctx.toolResults = kept;
+    if (kept.length === 0 && !ctx.tools?.length) {
+      delete uim.userInputMessageContext;
+    }
+  }
+}
+
+/**
+ * Safely parse JSON string, returning fallback on failure.
+ */
+function safeJSONParse(str, fallback) {
+  if (typeof str !== "string") return str ?? fallback;
+  try { return JSON.parse(str); } catch { return fallback; }
+}
 
 /**
  * Convert OpenAI messages to Kiro format
- * Rules: system/tool/user -> user role, merge consecutive same roles
+ * Rules: system/tool/user -> user role, merge consecutive same roles.
+ *
+ * Returns { history, currentMessage }.
  */
 function convertMessages(messages, tools, model) {
   let history = [];
   let currentMessage = null;
-  
+
+  const clientProvidedTools = tools && tools.length > 0;
+
+  // When the client did not send tools, flatten any tool calls/results in the
+  // history into plain text (see flattenToolInteractions). This keeps the
+  // request honest and sidesteps Kiro's "tools required" 400, since no
+  // structured tool content survives to trigger it.
+  if (!clientProvidedTools) {
+    messages = flattenToolInteractions(messages);
+  }
+
   let pendingUserContent = [];
   let pendingAssistantContent = [];
   let pendingToolResults = [];
   let pendingImages = [];
   let currentRole = null;
-
-  // Image support is pre-filtered by caps in translateRequest before reaching here
-  const supportsImages = true;
+  let toolsInjectedToFirstUserMsg = false;
 
   const flushPending = () => {
     if (currentRole === "user") {
@@ -49,20 +214,23 @@ function convertMessages(messages, tools, model) {
           toolResults: pendingToolResults
         };
       }
-      
-      // Add tools to first user message
-      if (tools && tools.length > 0 && history.length === 0) {
+
+      // Add tools to the user message that has no preceding assistant messages,
+      // OR the first user message (whichever comes first after any opening
+      // assistant messages). We track whether any user message has already
+      // received tools via a flag on the history array.
+      if (clientProvidedTools && !toolsInjectedToFirstUserMsg) {
         if (!userMsg.userInputMessage.userInputMessageContext) {
           userMsg.userInputMessage.userInputMessageContext = {};
         }
         userMsg.userInputMessage.userInputMessageContext.tools = tools.map(t => {
           const name = t.function?.name || t.name;
           let description = t.function?.description || t.description || "";
-          
+
           if (!description.trim()) {
             description = `Tool: ${name}`;
           }
-          
+
           const schema = t.function?.parameters || t.parameters || t.input_schema || {};
           // Normalize schema: Kiro requires required[] and proper type/properties
           const normalizedSchema = Object.keys(schema).length === 0
@@ -77,8 +245,9 @@ function convertMessages(messages, tools, model) {
             }
           };
         });
+        toolsInjectedToFirstUserMsg = true;
       }
-      
+
       history.push(userMsg);
       currentMessage = userMsg;
       pendingUserContent = [];
@@ -99,19 +268,19 @@ function convertMessages(messages, tools, model) {
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
     let role = msg.role;
-    
+
     // Normalize: system/tool -> user
-    if (role === "system" || role === "tool") {
-      role = "user";
+    if (role === ROLE.SYSTEM || role === ROLE.TOOL) {
+      role = ROLE.USER;
     }
-    
+
     // If role changes, flush pending
     if (role !== currentRole && currentRole !== null) {
       flushPending();
     }
     currentRole = role;
-    
-    if (role === "user") {
+
+    if (role === ROLE.USER) {
       // Extract content
       let content = "";
       if (typeof msg.content === "string") {
@@ -119,39 +288,38 @@ function convertMessages(messages, tools, model) {
       } else if (Array.isArray(msg.content)) {
         const textParts = [];
         for (const c of msg.content) {
-          if (c.type === "text" || c.text) {
+          if (c.type === OPENAI_BLOCK.TEXT || c.text) {
             textParts.push(c.text || "");
-          } else if (supportsImages && c.type === "image_url") {
+          } else if (c.type === OPENAI_BLOCK.IMAGE_URL) {
             // OpenAI format: image_url.url with data URI
             const url = c.image_url?.url || "";
-            const base64Match = url.match(/^data:([^;]+);base64,(.+)$/);
-            if (base64Match) {
-              const mediaType = base64Match[1];
-              const format = mediaType.split("/")[1] || mediaType;
-              pendingImages.push({ format, source: { bytes: base64Match[2] } });
+            const parsed = parseDataUri(url);
+            if (parsed) {
+              const format = parsed.mimeType.split("/")[1] || parsed.mimeType;
+              pendingImages.push({ format, source: { bytes: parsed.base64 } });
             } else if (url.startsWith("http://") || url.startsWith("https://")) {
               // Kiro only supports base64 — fallback to URL text
               textParts.push(`[Image: ${url}]`);
             }
-          } else if (supportsImages && c.type === "image") {
+          } else if (c.type === CLAUDE_BLOCK.IMAGE) {
             // Claude format: source.type = "base64", source.media_type, source.data
             if (c.source?.type === "base64" && c.source?.data) {
-              const mediaType = c.source.media_type || "image/png";
+              const mediaType = c.source.media_type || DEFAULT_IMAGE_MIME;
               const format = mediaType.split("/")[1] || mediaType;
               pendingImages.push({ format, source: { bytes: c.source.data } });
             }
           }
         }
         content = textParts.join("\n");
-        
+
         // Check for tool_result blocks
-        const toolResultBlocks = msg.content.filter(c => c.type === "tool_result");
+        const toolResultBlocks = msg.content.filter(c => c.type === CLAUDE_BLOCK.TOOL_RESULT);
         if (toolResultBlocks.length > 0) {
           toolResultBlocks.forEach(block => {
-            const text = Array.isArray(block.content) 
+            const text = Array.isArray(block.content)
               ? block.content.map(c => c.text || "").join("\n")
               : (typeof block.content === "string" ? block.content : "");
-            
+
             pendingToolResults.push({
               toolUseId: block.tool_use_id,
               status: "success",
@@ -160,9 +328,9 @@ function convertMessages(messages, tools, model) {
           });
         }
       }
-      
+
       // Handle tool role (from normalized)
-      if (msg.role === "tool") {
+      if (msg.role === ROLE.TOOL) {
         const toolContent = typeof msg.content === "string" ? msg.content : "";
         pendingToolResults.push({
           toolUseId: msg.tool_call_id,
@@ -172,38 +340,34 @@ function convertMessages(messages, tools, model) {
       } else if (content) {
         pendingUserContent.push(content);
       }
-    } else if (role === "assistant") {
+    } else if (role === ROLE.ASSISTANT) {
       // Extract text content and tool uses
       let textContent = "";
       let toolUses = [];
-      
+
       if (Array.isArray(msg.content)) {
-        const textBlocks = msg.content.filter(c => c.type === "text");
+        const textBlocks = msg.content.filter(c => c.type === OPENAI_BLOCK.TEXT);
         textContent = textBlocks.map(b => b.text).join("\n").trim();
-        
-        const toolUseBlocks = msg.content.filter(c => c.type === "tool_use");
+
+        const toolUseBlocks = msg.content.filter(c => c.type === CLAUDE_BLOCK.TOOL_USE);
         toolUses = toolUseBlocks;
       } else if (typeof msg.content === "string") {
         textContent = msg.content.trim();
       }
-      
+
       if (msg.tool_calls && msg.tool_calls.length > 0) {
         toolUses = msg.tool_calls;
       }
-      
+
       if (textContent) {
         pendingAssistantContent.push(textContent);
       }
-      
+
       // Store tool uses in last assistant message
       if (toolUses.length > 0) {
-        if (pendingAssistantContent.length === 0) {
-          // pendingAssistantContent.push("Call tools");
-        }
-        
         // Flush to create assistant message with toolUses
         flushPending();
-        
+
         const lastMsg = history[history.length - 1];
         if (lastMsg?.assistantResponseMessage) {
           lastMsg.assistantResponseMessage.toolUses = toolUses.map(tc => {
@@ -211,9 +375,7 @@ function convertMessages(messages, tools, model) {
               return {
                 toolUseId: tc.id || uuidv4(),
                 name: tc.function.name,
-                input: typeof tc.function.arguments === "string" 
-                  ? JSON.parse(tc.function.arguments) 
-                  : (tc.function.arguments || {})
+                input: safeJSONParse(tc.function.arguments, {})
               };
             } else {
               return {
@@ -224,17 +386,17 @@ function convertMessages(messages, tools, model) {
             }
           });
         }
-        
+
         currentRole = null;
       }
     }
   }
-  
+
   // Flush remaining
   if (currentRole !== null) {
     flushPending();
   }
-  
+
   // Pop last userInputMessage as currentMessage (search from end, skip trailing assistant messages)
   for (let i = history.length - 1; i >= 0; i--) {
     if (history[i].userInputMessage) {
@@ -261,6 +423,8 @@ function convertMessages(messages, tools, model) {
   });
 
   // Merge consecutive user messages (Kiro requires alternating user/assistant)
+  // When merging, also combine userInputMessageContext fields so toolResults
+  // and images from the second message are not silently dropped.
   const mergedHistory = [];
   for (let i = 0; i < history.length; i++) {
     const current = history[i];
@@ -269,18 +433,63 @@ function convertMessages(messages, tools, model) {
         mergedHistory[mergedHistory.length - 1].userInputMessage) {
       const prev = mergedHistory[mergedHistory.length - 1];
       prev.userInputMessage.content += "\n\n" + current.userInputMessage.content;
+      // Merge context: combine toolResults, images, etc.
+      const prevCtx = prev.userInputMessage.userInputMessageContext;
+      const curCtx = current.userInputMessage.userInputMessageContext;
+      if (curCtx) {
+        if (!prevCtx) {
+          prev.userInputMessage.userInputMessageContext = curCtx;
+        } else {
+          if (curCtx.toolResults?.length > 0) {
+            prevCtx.toolResults = [...(prevCtx.toolResults || []), ...curCtx.toolResults];
+          }
+          if (curCtx.tools?.length > 0) {
+            prevCtx.tools = [...(prevCtx.tools || []), ...curCtx.tools];
+          }
+        }
+      }
     } else {
       mergedHistory.push(current);
     }
   }
 
-  // Inject tools into currentMessage AFTER cleanup
-  if (firstHistoryTools && currentMessage?.userInputMessage &&
+  // When currentMessage is null (no user messages at all — edge case where
+  // input is only assistant messages), create a minimal currentMessage so
+  // tools and content can be injected.
+  if (!currentMessage) {
+    currentMessage = {
+      userInputMessage: {
+        content: "",
+        modelId: model,
+      }
+    };
+  }
+
+  // Reconcile orphaned toolResults across history AND currentMessage — when
+  // client-side compaction removes assistant messages containing tool_use but
+  // keeps the tool_result, the dangling reference triggers a Kiro 400. Fold the
+  // content back into the user text instead of discarding it. Run after
+  // currentMessage is finalized (an orphan can be merged into it) and before
+  // tool injection (which may re-add userInputMessageContext).
+  //
+  // Only needed on the tools-present path: when the client sent no tools,
+  // flattenToolInteractions already collapsed every toolResult to text, so
+  // there is nothing structured left to orphan.
+  if (clientProvidedTools) {
+    reconcileOrphanedToolResults(mergedHistory, currentMessage);
+  }
+
+  // Inject tools into currentMessage AFTER cleanup. Tools only exist here when
+  // the client explicitly sent them (otherwise flattenToolInteractions already
+  // collapsed all tool content to text upstream, so there is nothing to carry).
+  const resolvedTools = firstHistoryTools;
+
+  if (resolvedTools?.length > 0 &&
       !currentMessage.userInputMessage.userInputMessageContext?.tools) {
     if (!currentMessage.userInputMessage.userInputMessageContext) {
       currentMessage.userInputMessage.userInputMessageContext = {};
     }
-    currentMessage.userInputMessage.userInputMessageContext.tools = firstHistoryTools;
+    currentMessage.userInputMessage.userInputMessageContext.tools = resolvedTools;
   }
 
   return { history: mergedHistory, currentMessage };
@@ -303,29 +512,46 @@ function convertMessages(messages, tools, model) {
  *    `thinking`, OpenAI `reasoning_effort`, AMP/Cursor magic tags, and model
  *    name hints.
  */
-export function buildKiroPayload(model, body, stream, credentials) {
+export function openaiToKiroRequest(model, body, stream, credentials) {
   const messages = body.messages || [];
   const tools = body.tools || [];
   const maxTokens = 32000;
   const temperature = body.temperature;
   const topP = body.top_p;
 
-  const { upstream: upstreamModel, agentic, thinking: modelImpliesThinking } = resolveKiroModel(model);
-  const thinkingEnabled = modelImpliesThinking || isThinkingEnabled(body, null, model);
+  const { upstream: upstreamModel, agentic } = resolveKiroModel(model);
+  const thinkingBudget = resolveKiroThinkingBudget(body, credentials?.rawHeaders, model);
 
   const { history, currentMessage } = convertMessages(messages, tools, upstreamModel);
 
-  const profileArn = credentials?.providerSpecificData?.profileArn || "";
+  // API-key (headless) auth uses a raw CodeWhisperer credential whose profile is
+  // account-specific. Injecting the shared builder-id/social *default* placeholder
+  // ARN makes CodeWhisperer reject the request with 403 "bearer token invalid"
+  // (the ARN doesn't belong to the key's account). So for api_key, only send a
+  // profileArn that was actually resolved for this connection — never the default.
+  // OAuth/social keep the default fallback (their tokens accept it).
+  // api_key / idc / external_idp carry an account-specific (or token-bound)
+  // profile. The shared builder-id/social default ARN belongs to a different
+  // account and triggers 403 "bearer token invalid", so never fall back to it —
+  // send the resolved ARN, or an empty string so CodeWhisperer uses the token's
+  // own default profile. Only OAuth/social keep the shared placeholder.
+  const authMethod = credentials?.providerSpecificData?.authMethod;
+  const accountBoundAuth =
+    authMethod === "api_key" || authMethod === "idc" || authMethod === "external_idp";
+  const profileArn = accountBoundAuth
+    ? (credentials?.providerSpecificData?.profileArn || "")
+    : (credentials?.providerSpecificData?.profileArn || resolveDefaultProfileArn(authMethod));
 
   let finalContent = currentMessage?.userInputMessage?.content || "";
+
   const timestamp = new Date().toISOString();
 
   // Build the system-prompt prefix that goes ABOVE the user message body.
   // Order: thinking_mode tag first (so Kiro sees it before any user text),
   // then context/timestamp marker, then optional agentic chunked-write prompt.
   const prefixParts = [];
-  if (thinkingEnabled) {
-    prefixParts.push(buildThinkingSystemPrefix());
+  if (thinkingBudget !== null) {
+    prefixParts.push(buildThinkingSystemPrefix(thinkingBudget));
   }
   prefixParts.push(`[Context: Current time is ${timestamp}]`);
   if (agentic) {
@@ -336,7 +562,7 @@ export function buildKiroPayload(model, body, stream, credentials) {
   const payload = {
     conversationState: {
       chatTriggerType: "MANUAL",
-      conversationId: uuidv4(),
+      conversationId: resolveSessionId({ headers: credentials?.rawHeaders, body, connectionId: credentials?.connectionId, scope: "kiro" }),
       currentMessage: {
         userInputMessage: {
           content: finalContent,
@@ -374,4 +600,4 @@ export function buildKiroPayload(model, body, stream, credentials) {
   return payload;
 }
 
-register(FORMATS.OPENAI, FORMATS.KIRO, buildKiroPayload, null);
+register(FORMATS.OPENAI, FORMATS.KIRO, openaiToKiroRequest, null);

package/app/open-sse/translator/request/openai-to-ollama.js

@@ -1,5 +1,8 @@
 import { register } from "../index.js";
 import { FORMATS } from "../formats.js";
+import { parseDataUri } from "../concerns/image.js";
+import { safeParseJSON } from "../concerns/json.js";
+import { ROLE, OPENAI_BLOCK } from "../schema/index.js";
 
 /**
  * Convert OpenAI request to Ollama format
@@ -67,7 +70,7 @@ function normalizeMessages(messages) {
 
   // First pass: build tool_call_id -> tool_name map from assistant messages
   for (const msg of messages) {
-    if (msg.role === "assistant" && msg.tool_calls) {
+    if (msg.role === ROLE.ASSISTANT && msg.tool_calls) {
       for (const tc of msg.tool_calls) {
         if (tc.id && tc.function?.name) {
           toolCallMap.set(tc.id, tc.function.name);
@@ -79,7 +82,7 @@ function normalizeMessages(messages) {
   // Second pass: convert messages
   for (const msg of messages) {
     // Handle tool result messages (OpenAI format -> Ollama format)
-    if (msg.role === "tool") {
+    if (msg.role === ROLE.TOOL) {
       const toolResult = normalizeContent(msg.content);
       if (!toolResult) continue;
 
@@ -87,7 +90,7 @@ function normalizeMessages(messages) {
       const toolName = toolCallMap.get(msg.tool_call_id) || msg.name || "unknown_tool";
 
       result.push({
-        role: "tool",
+        role: ROLE.TOOL,
         tool_name: toolName,
         content: toolResult
       });
@@ -95,23 +98,23 @@ function normalizeMessages(messages) {
     }
 
     // Handle assistant messages with tool_calls
-    if (msg.role === "assistant" && msg.tool_calls) {
+    if (msg.role === ROLE.ASSISTANT && msg.tool_calls) {
       const content = normalizeContent(msg.content) || "";
       
       // Convert OpenAI tool_calls format to Ollama format
       const ollamaToolCalls = msg.tool_calls.map(tc => ({
-        type: "function",
+        type: OPENAI_BLOCK.FUNCTION,
         function: {
           index: tc.index || 0,
           name: tc.function?.name || "",
           arguments: typeof tc.function?.arguments === "string" 
-            ? JSON.parse(tc.function.arguments || "{}")
+            ? safeParseJSON(tc.function.arguments || "{}", {})
             : tc.function?.arguments || {}
         }
       }));
 
       result.push({
-        role: "assistant",
+        role: ROLE.ASSISTANT,
         content: content,
         tool_calls: ollamaToolCalls
       });
@@ -124,7 +127,7 @@ function normalizeMessages(messages) {
     const images = extractImagesFromContent(msg.content);
 
     // Skip empty messages (except assistant)
-    if (!content && role !== "assistant") continue;
+    if (!content && role !== ROLE.ASSISTANT) continue;
 
     const out = {
       role: role,
@@ -153,7 +156,7 @@ function normalizeContent(content) {
   if (Array.isArray(content)) {
     // Extract text from content array
     const textParts = content
-      .filter(block => block && block.type === "text" && block.text)
+      .filter(block => block && block.type === OPENAI_BLOCK.TEXT && block.text)
       .map(block => block.text);
 
     return textParts.join("\n") || "";
@@ -174,15 +177,15 @@ function extractImagesFromContent(content) {
   const images = [];
 
   for (const block of content) {
-    if (!block || block.type !== "image_url") continue;
+    if (!block || block.type !== OPENAI_BLOCK.IMAGE_URL) continue;
 
     const url = typeof block.image_url === "string" ? block.image_url : block.image_url?.url;
     if (typeof url !== "string" || !url) continue;
 
-    const m = url.match(/^data:[^;]+;base64,([\s\S]+)$/);
-    if (!m) continue;
+    const parsed = parseDataUri(url);
+    if (!parsed) continue;
 
-    images.push(m[1]);
+    images.push(parsed.base64);
   }
 
   return images;