@jambonz/llm 0.6.2 → 0.6.4

package/dist/test-kit/index.cjs

@@ -271,10 +271,11 @@ async function* streamFromOpenAI(client, req, options) {
   }
   yield endEvent;
 }
-function appendOpenAIAssistantToolCall(history, toolCalls) {
+function appendOpenAIAssistantToolCall(history, toolCalls, assistantText) {
+  const text = assistantText?.trim() ? assistantText : null;
   const wireMessage = {
     role: "assistant",
-    content: null,
+    content: text,
     tool_calls: toolCalls.map((tc) => ({
       id: tc.id,
       type: "function",
@@ -288,7 +289,7 @@ function appendOpenAIAssistantToolCall(history, toolCalls) {
     ...history,
     {
       role: "assistant",
-      content: "",
+      content: text ?? "",
       vendorRaw: wireMessage
     }
   ];
@@ -559,8 +560,8 @@ var OpenAIAdapter = class {
       includeCacheKey: this.forwardCacheKey()
     });
   }
-  appendAssistantToolCall(history, toolCalls) {
-    return appendOpenAIAssistantToolCall(history, toolCalls);
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    return appendOpenAIAssistantToolCall(history, toolCalls, assistantText);
   }
   appendToolResult(history, toolCallId, result) {
     return appendOpenAIToolResult(history, toolCallId, result);
@@ -1526,21 +1527,25 @@ var AnthropicAdapter = class {
     }
     yield endEvent;
   }
-  appendAssistantToolCall(history, toolCalls) {
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    const text = assistantText?.trim() ? assistantText : null;
     const wireMessage = {
       role: "assistant",
-      content: toolCalls.map((tc) => ({
-        type: "tool_use",
-        id: tc.id,
-        name: tc.name,
-        input: tc.arguments ?? {}
-      }))
+      content: [
+        ...text ? [{ type: "text", text }] : [],
+        ...toolCalls.map((tc) => ({
+          type: "tool_use",
+          id: tc.id,
+          name: tc.name,
+          input: tc.arguments ?? {}
+        }))
+      ]
     };
     return [
       ...history,
       {
         role: "assistant",
-        content: "",
+        content: text ?? "",
         vendorRaw: wireMessage
       }
     ];
@@ -1792,21 +1797,25 @@ async function* streamFromGemini(client, req) {
   };
   yield endEvent;
 }
-function appendGeminiAssistantToolCall(history, toolCalls) {
+function appendGeminiAssistantToolCall(history, toolCalls, assistantText) {
+  const text = assistantText?.trim() ? assistantText : null;
   const wireMessage = {
     role: "model",
-    parts: toolCalls.map((tc) => ({
-      functionCall: {
-        name: parseToolName(tc.id),
-        args: tc.arguments ?? {}
-      }
-    }))
+    parts: [
+      ...text ? [{ text }] : [],
+      ...toolCalls.map((tc) => ({
+        functionCall: {
+          name: parseToolName(tc.id),
+          args: tc.arguments ?? {}
+        }
+      }))
+    ]
   };
   return [
     ...history,
     {
       role: "assistant",
-      content: "",
+      content: text ?? "",
       vendorRaw: wireMessage
     }
   ];
@@ -2066,8 +2075,8 @@ var GoogleAdapter = class {
   stream(req) {
     return streamFromGemini(this.ensureClient(), req);
   }
-  appendAssistantToolCall(history, toolCalls) {
-    return appendGeminiAssistantToolCall(history, toolCalls);
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    return appendGeminiAssistantToolCall(history, toolCalls, assistantText);
   }
   appendToolResult(history, toolCallId, result) {
     return appendGeminiToolResult(history, toolCallId, result);
@@ -2272,8 +2281,8 @@ var VertexGeminiAdapter = class {
   stream(req) {
     return streamFromGemini(this.ensureClient(), req);
   }
-  appendAssistantToolCall(history, toolCalls) {
-    return appendGeminiAssistantToolCall(history, toolCalls);
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    return appendGeminiAssistantToolCall(history, toolCalls, assistantText);
   }
   appendToolResult(history, toolCallId, result) {
     return appendGeminiToolResult(history, toolCallId, result);
@@ -2470,8 +2479,8 @@ var VertexOpenAIAdapter = class {
       vendorMetadataExtractor: VERTEX_OPENAI_METADATA_EXTRACTOR
     });
   }
-  appendAssistantToolCall(history, toolCalls) {
-    return appendOpenAIAssistantToolCall(history, toolCalls);
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    return appendOpenAIAssistantToolCall(history, toolCalls, assistantText);
   }
   appendToolResult(history, toolCallId, result) {
     return appendOpenAIToolResult(history, toolCallId, result);
@@ -2816,11 +2825,12 @@ var BedrockAdapter = class {
     if (Object.keys(inferenceConfig).length > 0) {
       commandInput.inferenceConfig = inferenceConfig;
     }
-    if (req.cacheKey) {
+    const caching = req.cacheKey ? cachePointSupport(req.model) : void 0;
+    if (caching) {
       if (commandInput.system) {
         commandInput.system.push({ cachePoint: { type: "default" } });
       }
-      if (tools) {
+      if (tools && caching.tools) {
         tools.tools.push({ cachePoint: { type: "default" } });
       }
       markLastMessageForCaching2(messages);
@@ -2957,22 +2967,26 @@ var BedrockAdapter = class {
     }
     yield endEvent;
   }
-  appendAssistantToolCall(history, toolCalls) {
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    const text = assistantText?.trim() ? assistantText : null;
     const wireMessage = {
       role: "assistant",
-      content: toolCalls.map((tc) => ({
-        toolUse: {
-          toolUseId: tc.id,
-          name: tc.name,
-          input: tc.arguments ?? {}
-        }
-      }))
+      content: [
+        ...text ? [{ text }] : [],
+        ...toolCalls.map((tc) => ({
+          toolUse: {
+            toolUseId: tc.id,
+            name: tc.name,
+            input: tc.arguments ?? {}
+          }
+        }))
+      ]
     };
     return [
       ...history,
       {
         role: "assistant",
-        content: "",
+        content: text ?? "",
         vendorRaw: wireMessage
       }
     ];
@@ -3040,6 +3054,11 @@ function buildWireMessages3(req) {
   }
   return out;
 }
+function cachePointSupport(model) {
+  if (model.includes("anthropic.claude")) return { tools: true };
+  if (model.includes("amazon.nova")) return { tools: false };
+  return void 0;
+}
 function markLastMessageForCaching2(messages) {
   if (messages.length === 0) return;
   const last = messages[messages.length - 1];
@@ -3262,8 +3281,8 @@ var AzureOpenAIAdapter = class {
       vendorMetadataExtractor: AZURE_OPENAI_METADATA_EXTRACTOR
     });
   }
-  appendAssistantToolCall(history, toolCalls) {
-    return appendOpenAIAssistantToolCall(history, toolCalls);
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    return appendOpenAIAssistantToolCall(history, toolCalls, assistantText);
   }
   appendToolResult(history, toolCallId, result) {
     return appendOpenAIToolResult(history, toolCallId, result);
@@ -3918,6 +3937,55 @@ function runContractTests(harness) {
       (0, import_vitest.expect)(appended.role).toBe("assistant");
       (0, import_vitest.expect)(appended.vendorRaw).toBeDefined();
     });
+    (0, import_vitest.it)("[22] appendAssistantToolCall carries pre-tool assistant text onto the wire", async () => {
+      await harness.mockScenario("tool-call");
+      const adapter = await init(harness);
+      const first = await drainStream(adapter, {
+        model: harness.toolCapableModel,
+        messages: [{ role: "user", content: "go" }],
+        tools: [
+          { name: "test_tool", description: "x", parameters: { type: "object" } }
+        ]
+      });
+      const tc = first.find(
+        (e) => e.type === "toolCall"
+      );
+      (0, import_vitest.expect)(tc).toBeDefined();
+      const preToolText = "Checking that now.";
+      const history = adapter.appendAssistantToolCall(
+        [{ role: "user", content: "go" }],
+        [tc],
+        preToolText
+      );
+      const appended = history[history.length - 1];
+      (0, import_vitest.expect)(appended.content).toBe(preToolText);
+      (0, import_vitest.expect)(JSON.stringify(appended.vendorRaw)).toContain(preToolText);
+    });
+    (0, import_vitest.it)("[23] appendAssistantToolCall omits empty pre-tool text from the wire", async () => {
+      await harness.mockScenario("tool-call");
+      const adapter = await init(harness);
+      const first = await drainStream(adapter, {
+        model: harness.toolCapableModel,
+        messages: [{ role: "user", content: "go" }],
+        tools: [
+          { name: "test_tool", description: "x", parameters: { type: "object" } }
+        ]
+      });
+      const tc = first.find(
+        (e) => e.type === "toolCall"
+      );
+      (0, import_vitest.expect)(tc).toBeDefined();
+      for (const blank of [void 0, "", "   "]) {
+        const history = adapter.appendAssistantToolCall(
+          [{ role: "user", content: "go" }],
+          [tc],
+          blank
+        );
+        const appended = history[history.length - 1];
+        (0, import_vitest.expect)(appended.content).toBe("");
+        (0, import_vitest.expect)(JSON.stringify(appended.vendorRaw)).not.toContain('"text":""');
+      }
+    });
   });
 }
 async function init(harness) {
@@ -3982,13 +4050,15 @@ var FakeAdapter = class {
         throw new Error(`FakeAdapter: unknown scenario '${scenario}'`);
     }
   }
-  appendAssistantToolCall(history, toolCalls) {
+  appendAssistantToolCall(history, toolCalls, assistantText) {
+    const text = assistantText?.trim() ? assistantText : null;
     return [
       ...history,
       {
         role: "assistant",
-        content: "",
+        content: text ?? "",
         vendorRaw: {
+          ...text ? { text } : {},
           role: "assistant",
           toolCalls: toolCalls.map((tc) => ({
             id: tc.id,