@jambonz/llm 0.1.0 → 0.2.1

package/dist/test-kit/index.d.cts

@@ -1,4 +1,4 @@
-import { a as AdapterFactory, d as AuthKind, A as AuthSpec, l as LlmEvent, M as Message, L as LlmAdapter, c as ApiKeyAuth, g as ClientOptions, P as PromptRequest, n as ModelInfo, b as AdapterManifest } from '../types-D8rgMCbi.cjs';
+import { a as AdapterFactory, d as AuthKind, A as AuthSpec, L as LlmAdapter, c as ApiKeyAuth, g as ClientOptions, P as PromptRequest, l as LlmEvent, M as Message, o as ToolCallEvent, n as ModelInfo, b as AdapterManifest } from '../types-bq1XMi_T.cjs';
 
 /**
  * Named scenarios the harness must be able to stage. Each scenario configures
@@ -88,19 +88,6 @@ interface ContractHarness {
      * (toolCallStart precedes toolCall) runs; if false, that check is skipped.
      */
     emitsToolCallStart: boolean;
-    /**
-     * Construct an assistant `Message` (with `vendorRaw` populated in the shape
-     * THIS adapter expects back on re-submission) given a `toolCall` event the
-     * adapter previously emitted. Used by checks #13 and #20 to round-trip a
-     * realistic history through a subsequent `stream()` call.
-     *
-     * Implementation tip: set `vendorRaw` to the full vendor-native assistant
-     * message — the same shape your adapter puts in history after emitting a
-     * tool call during streaming.
-     */
-    buildAssistantWithToolCall(tc: Extract<LlmEvent, {
-        type: 'toolCall';
-    }>): Message;
 }
 
 /**
@@ -142,6 +129,7 @@ declare class FakeAdapter implements LlmAdapter<ApiKeyAuth> {
     constructor(state: FakeState);
     init(auth: ApiKeyAuth, _client?: ClientOptions): void;
     stream(req: PromptRequest): AsyncIterable<LlmEvent>;
+    appendAssistantToolCall(history: Message[], toolCalls: ReadonlyArray<ToolCallEvent>): Message[];
     appendToolResult(history: Message[], toolCallId: string, result: unknown): Message[];
     listAvailableModels(): Promise<ModelInfo[]>;
     private ensureInitialized;

package/dist/test-kit/index.d.ts

@@ -1,4 +1,4 @@
-import { a as AdapterFactory, d as AuthKind, A as AuthSpec, l as LlmEvent, M as Message, L as LlmAdapter, c as ApiKeyAuth, g as ClientOptions, P as PromptRequest, n as ModelInfo, b as AdapterManifest } from '../types-D8rgMCbi.js';
+import { a as AdapterFactory, d as AuthKind, A as AuthSpec, L as LlmAdapter, c as ApiKeyAuth, g as ClientOptions, P as PromptRequest, l as LlmEvent, M as Message, o as ToolCallEvent, n as ModelInfo, b as AdapterManifest } from '../types-bq1XMi_T.js';
 
 /**
  * Named scenarios the harness must be able to stage. Each scenario configures
@@ -88,19 +88,6 @@ interface ContractHarness {
      * (toolCallStart precedes toolCall) runs; if false, that check is skipped.
      */
     emitsToolCallStart: boolean;
-    /**
-     * Construct an assistant `Message` (with `vendorRaw` populated in the shape
-     * THIS adapter expects back on re-submission) given a `toolCall` event the
-     * adapter previously emitted. Used by checks #13 and #20 to round-trip a
-     * realistic history through a subsequent `stream()` call.
-     *
-     * Implementation tip: set `vendorRaw` to the full vendor-native assistant
-     * message — the same shape your adapter puts in history after emitting a
-     * tool call during streaming.
-     */
-    buildAssistantWithToolCall(tc: Extract<LlmEvent, {
-        type: 'toolCall';
-    }>): Message;
 }
 
 /**
@@ -142,6 +129,7 @@ declare class FakeAdapter implements LlmAdapter<ApiKeyAuth> {
     constructor(state: FakeState);
     init(auth: ApiKeyAuth, _client?: ClientOptions): void;
     stream(req: PromptRequest): AsyncIterable<LlmEvent>;
+    appendAssistantToolCall(history: Message[], toolCalls: ReadonlyArray<ToolCallEvent>): Message[];
     appendToolResult(history: Message[], toolCallId: string, result: unknown): Message[];
     listAvailableModels(): Promise<ModelInfo[]>;
     private ensureInitialized;

package/dist/test-kit/index.js

@@ -173,6 +173,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 = {
@@ -394,6 +416,9 @@ var OpenAIAdapter = class {
       knownModels: openAIManifest.knownModels
     });
   }
+  appendAssistantToolCall(history, toolCalls) {
+    return appendOpenAIAssistantToolCall(history, toolCalls);
+  }
   appendToolResult(history, toolCallId, result) {
     return appendOpenAIToolResult(history, toolCallId, result);
   }
@@ -744,6 +769,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 = {
@@ -959,6 +1003,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);
@@ -1181,6 +1244,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);
   }
@@ -1348,6 +1414,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);
   }
@@ -1514,6 +1583,9 @@ var VertexOpenAIAdapter = class {
       knownModels: vertexOpenAIManifest.knownModels
     });
   }
+  appendAssistantToolCall(history, toolCalls) {
+    return appendOpenAIAssistantToolCall(history, toolCalls);
+  }
   appendToolResult(history, toolCallId, result) {
     return appendOpenAIToolResult(history, toolCallId, result);
   }
@@ -1548,30 +1620,30 @@ import {
 // 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,
@@ -1592,19 +1664,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,
@@ -1614,14 +1686,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
     }
   },
   {
@@ -1636,19 +1708,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,
@@ -1906,6 +1978,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 = {
@@ -2233,12 +2325,11 @@ function runContractTests(harness) {
         (e) => e.type === "toolCall"
       );
       expect(tc).toBeDefined();
-      const history = [
-        { role: "user", content: "call it" },
-        harness.buildAssistantWithToolCall(tc)
-      ];
-      const withResult = adapter.appendToolResult(history, tc.id, { ok: true });
-      expect(withResult.length).toBe(history.length + 1);
+      const baseHistory = [{ role: "user", content: "call it" }];
+      const afterAssistant = adapter.appendAssistantToolCall(baseHistory, [tc]);
+      expect(afterAssistant.length).toBe(baseHistory.length + 1);
+      const withResult = adapter.appendToolResult(afterAssistant, tc.id, { ok: true });
+      expect(withResult.length).toBe(afterAssistant.length + 1);
       await harness.mockScenario("simple-stream");
       await expect(
         drainStream(adapter, {
@@ -2326,11 +2417,11 @@ function runContractTests(harness) {
         (e) => e.type === "toolCall"
       );
       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,
@@ -2340,6 +2431,28 @@ function runContractTests(harness) {
       expect(captured).not.toBeNull();
       expect(captured.vendorRawHonored).toBe(true);
     });
+    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"
+      );
+      expect(tc).toBeDefined();
+      const history = adapter.appendAssistantToolCall(
+        [{ role: "user", content: "go" }],
+        [tc]
+      );
+      const appended = history[history.length - 1];
+      expect(appended.role).toBe("assistant");
+      expect(appended.vendorRaw).toBeDefined();
+    });
   });
 }
 async function init(harness) {
@@ -2404,6 +2517,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 [
@@ -2586,17 +2716,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
   };
 }
 export {