acp-kernel 0.0.69 → 0.0.70-pr.293.160

package/dist/wire/bili-message.d.ts

@@ -25,8 +25,9 @@ export interface BiliMessage extends CoreMessage {
     /** Anthropic: the original content block for an image or a structured
      *  tool_result. Restored verbatim by coreToAnthropic. */
     rawAnthropicBlock?: unknown;
-    /** OpenAI chat: the original content part for an image_url, or the
-     *  original message object for a developer-role message. */
+    /** OpenAI chat: the original content part for an image_url (data: or
+     *  remote URL) or the original message object for a developer-role
+     *  message. */
     rawOpenaiContent?: unknown;
     /** Responses API: the original input item (for input_image, or a raw
      *  function_call / function_call_output we pass through). */
@@ -40,6 +41,13 @@ export interface BiliMessage extends CoreMessage {
      *  back on subsequent requests or the API returns HTTP 400; stored so
      *  coreToOpenai can reattach it. */
     reasoningContent?: string;
+    /** OpenAI: the host's wire carried `reasoning_content` with a BLANK value.
+     *  Strict-echo thinking models (DeepSeek et al.) reject a replayed
+     *  assistant turn whose reasoning_content is MISSING but accept a blank
+     *  one, so "blank" and "absent" are different requests. openaiToCore sets
+     *  this when it found no reasoning text to store; coreToOpenai re-emits
+     *  the key (blank) instead of dropping it. */
+    reasoningPresent?: boolean;
     /** Anthropic tool_result.is_error. Marks the tool result as an error so
      *  the model knows the tool failed (not just returned an error string). */
     toolIsError?: boolean;
@@ -53,8 +61,8 @@ export interface BiliMessage extends CoreMessage {
     /** The base64 data of an image (without the data: prefix). Lets the
      *  reverse conversion rebuild the full image payload. */
     imageBase64?: string;
-    /** OpenAI chat: ALL original image_url content parts (each a data: URL
-     *  part) for a user message carrying more than one image, in wire order.
+    /** OpenAI chat: ALL original image_url content parts (data: or remote
+     *  URL) for a user message carrying more than one image, in wire order.
      *  coreToOpenai re-emits these verbatim (after the text part). The
      *  singular `rawOpenaiContent` still covers the single-image case and
      *  legacy persisted state. Typed as unknown[] (not OpenAIContentPart) to

package/dist/wire/bili-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bili-message.d.ts","sourceRoot":"","sources":["../../src/wire/bili-message.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;2DAE2D;AAC3D,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC5C;6DACyD;IACzD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;gEAC4D;IAC5D,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;iEAC6D;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;6DAEyD;IACzD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;wCAGoC;IACpC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;+EAC2E;IAC3E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;2EACuE;IACvE,YAAY,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;IACtC;;+CAE2C;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;6DACyD;IACzD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;yDAKqD;IACrD,qBAAqB,CAAC,EAAE,OAAO,EAAE,CAAC;CACrC;AAED;+EAC+E;AAC/E,wBAAgB,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAEjE;AAED;;8DAE8D;AAC9D,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAI3F"}
+{"version":3,"file":"bili-message.d.ts","sourceRoot":"","sources":["../../src/wire/bili-message.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;2DAE2D;AAC3D,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC5C;6DACyD;IACzD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;mBAEe;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;iEAC6D;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;6DAEyD;IACzD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;wCAGoC;IACpC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;;kDAK8C;IAC9C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;+EAC2E;IAC3E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;2EACuE;IACvE,YAAY,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;IACtC;;+CAE2C;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;6DACyD;IACzD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;yDAKqD;IACrD,qBAAqB,CAAC,EAAE,OAAO,EAAE,CAAC;CACrC;AAED;+EAC+E;AAC/E,wBAAgB,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAEjE;AAED;;8DAE8D;AAC9D,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAI3F"}

package/dist/wire/index.js

@@ -258,12 +258,19 @@ function openaiToCore(body) {
           role: "user",
           contentType: "text",
           text,
-          ...imgs.length === 1 && firstParsed ? { rawOpenaiContent: imgs[0], imageMediaType: firstParsed.mediaType, imageBase64: firstParsed.base64 } : imgs.length > 1 ? { rawOpenaiContentParts: imgs } : {}
+          ...imgs.length === 1 ? {
+            rawOpenaiContent: imgs[0],
+            // data: URLs only — remote URLs ride rawOpenaiContent
+            // verbatim (#187/#291)
+            ...firstParsed ? { imageMediaType: firstParsed.mediaType, imageBase64: firstParsed.base64 } : {}
+          } : imgs.length > 1 ? { rawOpenaiContentParts: imgs } : {}
         });
         break;
       }
       case "assistant": {
-        const fieldReasoning = typeof m.reasoning_content === "string" ? m.reasoning_content : "";
+        const rawReasoning = m.reasoning_content;
+        const fieldPresent = typeof rawReasoning === "string";
+        const fieldReasoning = fieldPresent ? rawReasoning : "";
         let reasoning = fieldReasoning;
         let text = stringContent(m.content);
         if (!reasoning) {
@@ -273,6 +280,7 @@ function openaiToCore(body) {
             text = split.text;
           }
         }
+        const blankEcho = fieldPresent && reasoning.length === 0;
         if (reasoning) {
           const base = deriveMessageId("assistant", "reasoning", reasoning);
           msgs.push({
@@ -285,7 +293,7 @@ function openaiToCore(body) {
         }
         if (text) {
           const base = deriveMessageId("assistant", "text", text);
-          msgs.push({ id: clusters.next(base), role: "assistant", contentType: "text", text });
+          msgs.push({ id: clusters.next(base), role: "assistant", contentType: "text", text, ...blankEcho ? { reasoningPresent: true } : {} });
         }
         if (Array.isArray(m.tool_calls)) {
           for (const tc of m.tool_calls) {
@@ -299,7 +307,8 @@ function openaiToCore(body) {
               contentType: "tool-call",
               toolName: tc.function.name,
               toolCallId: tc.id,
-              text: tc.function.arguments ?? ""
+              text: tc.function.arguments ?? "",
+              ...blankEcho ? { reasoningPresent: true } : {}
             });
             toolNames.set(tc.id, tc.function.name);
           }
@@ -331,15 +340,16 @@ function coreToOpenai(messages) {
   const flush = () => {
     if (!pending) return;
     const reasoning = pending.reasoning !== null && pending.reasoning.length > 0 ? pending.reasoning : void 0;
+    const reasoningField = reasoning !== void 0 ? { reasoning_content: reasoning } : pending.reasoningPresent ? { reasoning_content: "" } : {};
     if (pending.toolCalls.length > 0) {
       out.push({
         role: "assistant",
         content: pending.text ?? null,
         tool_calls: pending.toolCalls,
-        ...reasoning ? { reasoning_content: reasoning } : {}
+        ...reasoningField
       });
     } else if (pending.text !== null) {
-      out.push({ role: "assistant", content: pending.text, ...reasoning ? { reasoning_content: reasoning } : {} });
+      out.push({ role: "assistant", content: pending.text, ...reasoningField });
     } else if (reasoning) {
       out.push({ role: "assistant", content: null, reasoning_content: reasoning });
     }
@@ -347,7 +357,8 @@ function coreToOpenai(messages) {
   };
   for (const m of messages) {
     if (m.role === "assistant") {
-      if (!pending) pending = { text: null, toolCalls: [], reasoning: null };
+      if (!pending) pending = { text: null, toolCalls: [], reasoning: null, reasoningPresent: false };
+      if (m.reasoningPresent) pending.reasoningPresent = true;
       if (m.contentType === "reasoning") {
         pending.reasoning = (pending.reasoning ?? "") + (m.reasoningContent ?? m.text ?? "");
       } else if (m.contentType === "text") {
@@ -423,7 +434,7 @@ function allImageParts(content) {
     if (!("type" in p) || p.type !== "image_url" || !("image_url" in p)) continue;
     const imagePart = p;
     const url = imagePart.image_url?.url;
-    if (typeof url === "string" && parseDataUrl(url)) out.push(p);
+    if (typeof url === "string") out.push(p);
   }
   return out;
 }
@@ -456,6 +467,12 @@ function partText(part) {
 function messageContent(content) {
   return typeof content === "string" ? content : content.map(partText).join("\n");
 }
+function userDisplayText(content, text) {
+  if (typeof content === "string") return text;
+  const hasImage = content.some((part) => part.type === "input_image");
+  const hasTextPart = content.some((part) => part.type === "input_text" || part.type === "output_text");
+  return !text || hasImage && !hasTextPart ? "[image]" : text;
+}
 function reasoningText(item) {
   const fromParts = (parts, type) => {
     if (!Array.isArray(parts)) return "";
@@ -533,15 +550,17 @@ function responsesToCore(body) {
               effText = split.text;
             }
           }
-          if (effText) {
-            coreId = clusters.next(deriveMessageId(role, "text", effText));
+          const hasImage = Array.isArray(message.content) && message.content.some((part) => part.type === "input_image");
+          if (effText || role === "user" && hasImage) {
+            const displayText = role === "user" ? userDisplayText(message.content, effText) : effText;
+            coreId = clusters.next(deriveMessageId(role, "text", displayText));
             const imageUrl = Array.isArray(message.content) ? message.content.find((part) => part.type === "input_image" && typeof part.image_url === "string")?.image_url : void 0;
             const image = typeof imageUrl === "string" ? parseDataUrl(imageUrl) : void 0;
             msgs.push({
               id: coreId,
               role,
               contentType: "text",
-              text: effText,
+              text: displayText,
               rawResponsesItem: item,
               ...image ? { imageMediaType: image.mediaType, imageBase64: image.base64 } : {}
             });
@@ -701,7 +720,8 @@ function coreToResponses(messages, customToolCallIds = /* @__PURE__ */ new Set()
     if (message.role === "system") {
       out.push({ type: "message", role: "developer", content: message.text ?? "" });
     } else if (message.role === "user") {
-      if (raw?.type === "message" && messageContent(raw.content) === (message.text ?? "")) out.push(raw);
+      const rawMessage = raw?.type === "message" ? raw : void 0;
+      if (rawMessage && userDisplayText(rawMessage.content, messageContent(rawMessage.content)) === (message.text ?? "")) out.push(rawMessage);
       else out.push({ type: "message", role: "user", content: message.text ?? "" });
     } else if (message.role === "assistant") {
       if (message.contentType === "text") {