@jambonz/llm 0.1.0 → 0.2.1

package/dist/test-kit/index.cjs

@@ -212,6 +212,28 @@ async function* streamFromOpenAI(client, req, options) {
   };
   yield endEvent;
 }
+function appendOpenAIAssistantToolCall(history, toolCalls) {
+  const wireMessage = {
+    role: "assistant",
+    content: null,
+    tool_calls: toolCalls.map((tc) => ({
+      id: tc.id,
+      type: "function",
+      function: {
+        name: tc.name,
+        arguments: typeof tc.arguments === "string" ? tc.arguments : JSON.stringify(tc.arguments ?? {})
+      }
+    }))
+  };
+  return [
+    ...history,
+    {
+      role: "assistant",
+      content: "",
+      vendorRaw: wireMessage
+    }
+  ];
+}
 function appendOpenAIToolResult(history, toolCallId, result) {
   const content = typeof result === "string" ? result : JSON.stringify(result);
   const wireMessage = {
@@ -433,6 +455,9 @@ var OpenAIAdapter = class {
       knownModels: openAIManifest.knownModels
     });
   }
+  appendAssistantToolCall(history, toolCalls) {
+    return appendOpenAIAssistantToolCall(history, toolCalls);
+  }
   appendToolResult(history, toolCallId, result) {
     return appendOpenAIToolResult(history, toolCallId, result);
   }
@@ -783,6 +808,25 @@ var AnthropicAdapter = class {
     };
     yield endEvent;
   }
+  appendAssistantToolCall(history, toolCalls) {
+    const wireMessage = {
+      role: "assistant",
+      content: toolCalls.map((tc) => ({
+        type: "tool_use",
+        id: tc.id,
+        name: tc.name,
+        input: tc.arguments ?? {}
+      }))
+    };
+    return [
+      ...history,
+      {
+        role: "assistant",
+        content: "",
+        vendorRaw: wireMessage
+      }
+    ];
+  }
   appendToolResult(history, toolCallId, result) {
     const content = typeof result === "string" ? result : JSON.stringify(result);
     const wireMessage = {
@@ -998,6 +1042,25 @@ async function* streamFromGemini(client, req) {
   };
   yield endEvent;
 }
+function appendGeminiAssistantToolCall(history, toolCalls) {
+  const wireMessage = {
+    role: "model",
+    parts: toolCalls.map((tc) => ({
+      functionCall: {
+        name: parseToolName(tc.id),
+        args: tc.arguments ?? {}
+      }
+    }))
+  };
+  return [
+    ...history,
+    {
+      role: "assistant",
+      content: "",
+      vendorRaw: wireMessage
+    }
+  ];
+}
 function appendGeminiToolResult(history, toolCallId, result) {
   const name = parseToolName(toolCallId);
   const content = typeof result === "string" ? result : JSON.stringify(result);
@@ -1220,6 +1283,9 @@ var GoogleAdapter = class {
   stream(req) {
     return streamFromGemini(this.ensureClient(), req);
   }
+  appendAssistantToolCall(history, toolCalls) {
+    return appendGeminiAssistantToolCall(history, toolCalls);
+  }
   appendToolResult(history, toolCallId, result) {
     return appendGeminiToolResult(history, toolCallId, result);
   }
@@ -1387,6 +1453,9 @@ var VertexGeminiAdapter = class {
   stream(req) {
     return streamFromGemini(this.ensureClient(), req);
   }
+  appendAssistantToolCall(history, toolCalls) {
+    return appendGeminiAssistantToolCall(history, toolCalls);
+  }
   appendToolResult(history, toolCallId, result) {
     return appendGeminiToolResult(history, toolCallId, result);
   }
@@ -1553,6 +1622,9 @@ var VertexOpenAIAdapter = class {
       knownModels: vertexOpenAIManifest.knownModels
     });
   }
+  appendAssistantToolCall(history, toolCalls) {
+    return appendOpenAIAssistantToolCall(history, toolCalls);
+  }
   appendToolResult(history, toolCallId, result) {
     return appendOpenAIToolResult(history, toolCallId, result);
   }
@@ -1584,30 +1656,30 @@ var import_client_bedrock_runtime = require("@aws-sdk/client-bedrock-runtime");
 // src/adapters/bedrock/manifest.ts
 var BEDROCK_KNOWN_MODELS = [
   {
-    id: "anthropic.claude-opus-4-v1:0",
-    displayName: "Claude Opus 4 (on Bedrock)",
+    id: "anthropic.claude-3-haiku-20240307-v1:0",
+    displayName: "Claude 3 Haiku (on Bedrock)",
     capabilities: {
       streaming: true,
       tools: true,
-      vision: true,
+      vision: false,
       systemPrompt: true,
       maxContextTokens: 2e5
     }
   },
   {
-    id: "anthropic.claude-sonnet-4-v1:0",
-    displayName: "Claude Sonnet 4 (on Bedrock)",
+    id: "anthropic.claude-3-5-haiku-20241022-v1:0",
+    displayName: "Claude 3.5 Haiku (on Bedrock)",
     capabilities: {
       streaming: true,
       tools: true,
-      vision: true,
+      vision: false,
       systemPrompt: true,
       maxContextTokens: 2e5
     }
   },
   {
-    id: "anthropic.claude-3-7-sonnet-20250219-v1:0",
-    displayName: "Claude 3.7 Sonnet (on Bedrock)",
+    id: "anthropic.claude-3-5-sonnet-20240620-v1:0",
+    displayName: "Claude 3.5 Sonnet (on Bedrock)",
     capabilities: {
       streaming: true,
       tools: true,
@@ -1628,19 +1700,19 @@ var BEDROCK_KNOWN_MODELS = [
     }
   },
   {
-    id: "anthropic.claude-3-5-haiku-20241022-v1:0",
-    displayName: "Claude 3.5 Haiku (on Bedrock)",
+    id: "anthropic.claude-3-7-sonnet-20250219-v1:0",
+    displayName: "Claude 3.7 Sonnet (on Bedrock)",
     capabilities: {
       streaming: true,
       tools: true,
-      vision: false,
+      vision: true,
       systemPrompt: true,
       maxContextTokens: 2e5
     }
   },
   {
-    id: "meta.llama3-3-70b-instruct-v1:0",
-    displayName: "Llama 3.3 70B Instruct (on Bedrock)",
+    id: "amazon.nova-micro-v1:0",
+    displayName: "Amazon Nova Micro",
     capabilities: {
       streaming: true,
       tools: true,
@@ -1650,14 +1722,14 @@ var BEDROCK_KNOWN_MODELS = [
     }
   },
   {
-    id: "mistral.mistral-large-2407-v1:0",
-    displayName: "Mistral Large (on Bedrock)",
+    id: "amazon.nova-lite-v1:0",
+    displayName: "Amazon Nova Lite",
     capabilities: {
       streaming: true,
       tools: true,
-      vision: false,
+      vision: true,
       systemPrompt: true,
-      maxContextTokens: 128e3
+      maxContextTokens: 3e5
     }
   },
   {
@@ -1672,19 +1744,19 @@ var BEDROCK_KNOWN_MODELS = [
     }
   },
   {
-    id: "amazon.nova-lite-v1:0",
-    displayName: "Amazon Nova Lite",
+    id: "meta.llama3-3-70b-instruct-v1:0",
+    displayName: "Llama 3.3 70B Instruct (on Bedrock)",
     capabilities: {
       streaming: true,
       tools: true,
-      vision: true,
+      vision: false,
       systemPrompt: true,
-      maxContextTokens: 3e5
+      maxContextTokens: 128e3
     }
   },
   {
-    id: "amazon.nova-micro-v1:0",
-    displayName: "Amazon Nova Micro",
+    id: "mistral.mistral-large-2407-v1:0",
+    displayName: "Mistral Large (on Bedrock)",
     capabilities: {
       streaming: true,
       tools: true,
@@ -1942,6 +2014,26 @@ var BedrockAdapter = class {
     };
     yield endEvent;
   }
+  appendAssistantToolCall(history, toolCalls) {
+    const wireMessage = {
+      role: "assistant",
+      content: toolCalls.map((tc) => ({
+        toolUse: {
+          toolUseId: tc.id,
+          name: tc.name,
+          input: tc.arguments ?? {}
+        }
+      }))
+    };
+    return [
+      ...history,
+      {
+        role: "assistant",
+        content: "",
+        vendorRaw: wireMessage
+      }
+    ];
+  }
   appendToolResult(history, toolCallId, result) {
     const text = typeof result === "string" ? result : JSON.stringify(result);
     const wireMessage = {
@@ -2269,12 +2361,11 @@ function runContractTests(harness) {
         (e) => e.type === "toolCall"
       );
       (0, import_vitest.expect)(tc).toBeDefined();
-      const history = [
-        { role: "user", content: "call it" },
-        harness.buildAssistantWithToolCall(tc)
-      ];
-      const withResult = adapter.appendToolResult(history, tc.id, { ok: true });
-      (0, import_vitest.expect)(withResult.length).toBe(history.length + 1);
+      const baseHistory = [{ role: "user", content: "call it" }];
+      const afterAssistant = adapter.appendAssistantToolCall(baseHistory, [tc]);
+      (0, import_vitest.expect)(afterAssistant.length).toBe(baseHistory.length + 1);
+      const withResult = adapter.appendToolResult(afterAssistant, tc.id, { ok: true });
+      (0, import_vitest.expect)(withResult.length).toBe(afterAssistant.length + 1);
       await harness.mockScenario("simple-stream");
       await (0, import_vitest.expect)(
         drainStream(adapter, {
@@ -2362,11 +2453,11 @@ function runContractTests(harness) {
         (e) => e.type === "toolCall"
       );
       (0, import_vitest.expect)(tc).toBeDefined();
-      const history = [
-        { role: "user", content: "go" },
-        harness.buildAssistantWithToolCall(tc)
-      ];
-      const withResult = adapter.appendToolResult(history, tc.id, { ok: true });
+      const afterAssistant = adapter.appendAssistantToolCall(
+        [{ role: "user", content: "go" }],
+        [tc]
+      );
+      const withResult = adapter.appendToolResult(afterAssistant, tc.id, { ok: true });
       await harness.mockScenario("simple-stream");
       await drainStream(adapter, {
         model: harness.toolCapableModel,
@@ -2376,6 +2467,28 @@ function runContractTests(harness) {
       (0, import_vitest.expect)(captured).not.toBeNull();
       (0, import_vitest.expect)(captured.vendorRawHonored).toBe(true);
     });
+    (0, import_vitest.it)("[21] appendAssistantToolCall output + appendToolResult re-stream preserves tool-call id on 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 history = adapter.appendAssistantToolCall(
+        [{ role: "user", content: "go" }],
+        [tc]
+      );
+      const appended = history[history.length - 1];
+      (0, import_vitest.expect)(appended.role).toBe("assistant");
+      (0, import_vitest.expect)(appended.vendorRaw).toBeDefined();
+    });
   });
 }
 async function init(harness) {
@@ -2440,6 +2553,23 @@ var FakeAdapter = class {
         throw new Error(`FakeAdapter: unknown scenario '${scenario}'`);
     }
   }
+  appendAssistantToolCall(history, toolCalls) {
+    return [
+      ...history,
+      {
+        role: "assistant",
+        content: "",
+        vendorRaw: {
+          role: "assistant",
+          toolCalls: toolCalls.map((tc) => ({
+            id: tc.id,
+            name: tc.name,
+            arguments: tc.arguments
+          }))
+        }
+      }
+    ];
+  }
   appendToolResult(history, toolCallId, result) {
     const content = typeof result === "string" ? result : JSON.stringify(result);
     return [
@@ -2622,17 +2752,7 @@ function createFakeHarness() {
     },
     toolCapableModel: "fake-tool-model",
     nonToolCapableModel: "fake-plain-model",
-    emitsToolCallStart: true,
-    buildAssistantWithToolCall(tc) {
-      return {
-        role: "assistant",
-        content: "",
-        vendorRaw: {
-          role: "assistant",
-          toolCall: { id: tc.id, name: tc.name, arguments: tc.arguments }
-        }
-      };
-    }
+    emitsToolCallStart: true
   };
 }
 // Annotate the CommonJS export names for ESM import in node: