@xalia/agent 0.6.4 → 0.6.6

package/src/test/agent.test.ts

@@ -1,4 +1,3 @@
-import { OpenAI } from "openai";
 import { expect } from "vitest";
 import { strict as assert } from "assert";
 
@@ -12,10 +11,12 @@ import {
   completionToAssistantMessageParam,
 } from "../agent/agent";
 import {
-  ChatCompletionAssistantMessageParam,
-  ChatCompletionMessageParam,
-  ChatCompletionMessageToolCall,
-  ChatCompletionToolMessageParam,
+  AssistantMessageParam,
+  Choice,
+  MessageParam,
+  MessageToolCall,
+  ToolDescriptor,
+  ToolMessageParam,
 } from "../agent/llm";
 import { ContextManager } from "../agent/context";
 import { LOCAL_SERVER_URL, SkillManager } from "../agent/sudoMcpServerManager";
@@ -26,12 +27,13 @@ import {
   TestDummyLLM,
   TestErrorLLM,
 } from "./testTools";
+import { DummyLLMScriptEntry } from "../agent/dummyLLM";
 
 function clone<T>(a: T): T {
   return JSON.parse(JSON.stringify(a)) as T;
 }
 
-const DUMMY_SCRIPT: OpenAI.Chat.Completions.ChatCompletion.Choice[] = [
+const DUMMY_SCRIPT: Choice[] = [
   {
     index: 0,
     finish_reason: "stop",
@@ -59,13 +61,13 @@ function createCallTestToolScript(
   param1: string,
   param2: number
 ): {
-  script: OpenAI.Chat.Completions.ChatCompletion.Choice[];
-  expectCompletions: ChatCompletionAssistantMessageParam[];
+  script: Choice[];
+  expectCompletions: AssistantMessageParam[];
   expectAgentMessages: string[];
-  expectToolResults: ChatCompletionToolMessageParam[];
-  tool0_descriptor: OpenAI.ChatCompletionTool;
+  expectToolResults: ToolMessageParam[];
+  tool0_descriptor: ToolDescriptor;
   tool0_fn: (agent: Agent, args: unknown) => Promise<ToolCallResult>;
-  test_tool_descriptor: OpenAI.ChatCompletionTool;
+  test_tool_descriptor: ToolDescriptor;
   test_tool_fn: (agent: Agent, args: unknown) => Promise<ToolCallResult>;
 } {
   // A tool with no args
@@ -75,7 +77,7 @@ function createCallTestToolScript(
     properties: {},
   };
 
-  const tool0_descriptor: OpenAI.ChatCompletionTool = {
+  const tool0_descriptor: ToolDescriptor = {
     type: "function",
     function: {
       name: "tool0",
@@ -103,7 +105,7 @@ function createCallTestToolScript(
     required: ["param1", "param2"],
   };
 
-  const test_tool_descriptor: OpenAI.ChatCompletionTool = {
+  const test_tool_descriptor: ToolDescriptor = {
     type: "function",
     function: {
       name: "test_tool",
@@ -120,13 +122,13 @@ function createCallTestToolScript(
     return new Promise((r) => {
       r({
         response: `tool_result: '${param1}' '${String(param2)}'`,
-        metadata: { type: "text/plain" },
+        _meta: { type: "text/plain" },
       });
     });
   };
 
-  const tool_calls: OpenAI.ChatCompletionMessageToolCall[] = [];
-  const expectToolResults: ChatCompletionToolMessageParam[] = [];
+  const tool_calls: MessageToolCall[] = [];
+  const expectToolResults: ToolMessageParam[] = [];
 
   // First tool call (if requested) is test_tool
   if (tool_call_ids.length > 0) {
@@ -143,7 +145,7 @@ function createCallTestToolScript(
       content: `tool_result: '${param1}' '${String(param2)}'`,
       role: "tool",
       tool_call_id: id,
-      metadata: { type: "text/plain" },
+      _meta: { type: "text/plain" },
     });
   }
 
@@ -172,7 +174,7 @@ function createCallTestToolScript(
 
   // A script that uses the tools
 
-  const script: OpenAI.Chat.Completions.ChatCompletion.Choice[] = [
+  const script: Choice[] = [
     {
       index: 0,
       finish_reason: "tool_calls",
@@ -218,9 +220,7 @@ function createCallTestToolScript(
 }
 
 /// Return a dummy agent and a TestAgentEventHandler for tracking messages.
-async function createTestAgent(
-  script: OpenAI.Chat.Completions.ChatCompletion.Choice[]
-): Promise<{
+async function createTestAgent(script: Choice[]): Promise<{
   agent: Agent;
   skillManager: SkillManager;
   eventHandler: TestAgentEventHandler;
@@ -423,8 +423,7 @@ describe("Agent", () => {
     // Take a copy of the script now, since this will be updated when the
     // tools redacted their args.
 
-    const scriptCopy: OpenAI.Chat.Completions.ChatCompletion.Choice[] =
-      clone(script);
+    const scriptCopy: Choice[] = clone(script);
 
     // Define the tool to update the arg.  The transform is to up-case
     // `param1: string` and add 100 to `param2: number`.
@@ -455,9 +454,7 @@ describe("Agent", () => {
     // Check the event handler was called with all completions and tool
     // results, in the correct order.
 
-    const transformToolCall = (
-      toolCall: ChatCompletionMessageToolCall
-    ): ChatCompletionMessageToolCall => {
+    const transformToolCall = (toolCall: MessageToolCall): MessageToolCall => {
       return {
         ...toolCall,
         function: {
@@ -476,7 +473,7 @@ describe("Agent", () => {
       ],
     });
 
-    const allExpect: ChatCompletionMessageParam[] = [
+    const allExpect: MessageParam[] = [
       transformedFirstMsg,
       ...expectToolResults,
       completionToAssistantMessageParam(scriptCopy[1].message),
@@ -527,16 +524,17 @@ describe("Agent", () => {
     // Check the event handler was called with all completions and tool
     // results as expected.
 
-    const expectToolCallResults: ChatCompletionMessageParam[] =
-      expectToolResults.map((tr) => {
+    const expectToolCallResults: MessageParam[] = expectToolResults.map(
+      (tr) => {
         assert(typeof tr.content === "string");
         return {
           ...tr,
           content: transformResult(tr.content),
         };
-      });
+      }
+    );
 
-    const allExpect: ChatCompletionMessageParam[] = [
+    const allExpect: MessageParam[] = [
       completionToAssistantMessageParam(script[0].message),
       ...expectToolCallResults,
       completionToAssistantMessageParam(script[1].message),
@@ -561,4 +559,31 @@ describe("Agent", () => {
     // Check the Agent has not added the user messages.
     expect(ctxMgr.getLLMContext().length).eql(1);
   });
+
+  it("supports reasoning token callbacks", async function () {
+    const script: DummyLLMScriptEntry[] = [
+      {
+        finish_reason: "reasoning",
+        message: "Some reasoning tokens...",
+      },
+      {
+        index: 0,
+        finish_reason: "stop",
+        message: {
+          content: "Agent Message",
+          refusal: null,
+          role: "assistant",
+        },
+        logprobs: null,
+      },
+    ];
+
+    const llm = new TestDummyLLM(script);
+    const eventHandler = new TestAgentEventHandler();
+    const ctxMgr = new ContextManager("SYSTEM_PROMPT", []);
+    const agent = Agent.initializeWithLLM(eventHandler, llm, ctxMgr);
+
+    await agent.userMessageEx("user message 1");
+    expect(eventHandler.getReasoning()).eql([script[0].message, ""]);
+  });
 });

package/src/test/approvalManager.test.ts

@@ -9,7 +9,7 @@ import {
   ServerToClient,
 } from "../chat/protocol/messages";
 import { ISessionMessageSender } from "../chat/server/openSessionMessageSender";
-import { ChatCompletionMessageToolCall } from "../agent/llm";
+import { MessageToolCall } from "../agent/llm";
 
 export class TestAgentPreferencesWriter implements IAgentPreferencesWriter {
   public prefs: Record<string, AgentPreferences | undefined> = {};
@@ -41,7 +41,7 @@ export class TestMessageSender
   }
 }
 
-const tc: ChatCompletionMessageToolCall = {
+const tc: MessageToolCall = {
   type: "function",
   id: "tool_call_0",
   function: { name: "fn0", arguments: "" },

package/src/test/chatContextManager.test.ts

@@ -7,10 +7,7 @@ import {
   resolveConversationWithCheckpoint,
 } from "../chat/server/chatContextManager";
 import { createUserMessageEnsure } from "../agent/agent";
-import {
-  ChatCompletionAssistantMessageParam,
-  ChatCompletionToolMessageParam,
-} from "../agent/llm";
+import { AssistantMessageParam, ToolMessageParam } from "../agent/llm";
 import { createCheckpointMessage } from "../agent/compressingContextManager";
 import {
   MESSAGE_INDEX_FULL_INCREMENT,
@@ -58,7 +55,7 @@ const MESSAGES: SessionMessage[] = [
       role: "tool",
       content: "msg501",
       tool_call_id: "tool_call_0",
-      metadata: { type: "text/plain" },
+      _meta: { type: "text/plain" },
     },
   },
   {
@@ -115,7 +112,7 @@ function testSuccessfulAgentLoop(cm: ChatContextManager, startIdx: number) {
     userMsgs.map((su) => {
       return {
         role: "user",
-        name: su.user_nickname,
+        name: su.user_uuid,
         content: su.message,
       };
     })
@@ -142,7 +139,7 @@ function testSuccessfulAgentLoop(cm: ChatContextManager, startIdx: number) {
 
   // A full response (with toolcall) is returned
 
-  const agentResponseWithToolCall: ChatCompletionAssistantMessageParam = {
+  const agentResponseWithToolCall: AssistantMessageParam = {
     role: "assistant",
     tool_calls: [
       {
@@ -188,7 +185,7 @@ function testSuccessfulAgentLoop(cm: ChatContextManager, startIdx: number) {
   // - 2*MESSAGE_INDEX_FULL_INCREMENT + 1*MESSAGE_INDEX_SUB_INCREMENT
   // - 2*MESSAGE_INDEX_FULL_INCREMENT + 2*MESSAGE_INDEX_SUB_INCREMENT
 
-  const toolCallResults: ChatCompletionToolMessageParam[] = [
+  const toolCallResults: ToolMessageParam[] = [
     {
       role: "tool",
       tool_call_id: "tool_call_0",
@@ -218,7 +215,7 @@ function testSuccessfulAgentLoop(cm: ChatContextManager, startIdx: number) {
 
   // Final agent response
 
-  const finalAgentResponse: ChatCompletionAssistantMessageParam = {
+  const finalAgentResponse: AssistantMessageParam = {
     role: "assistant",
     content: "AgentMessage2",
   };
@@ -246,7 +243,7 @@ function testSuccessfulAgentLoop(cm: ChatContextManager, startIdx: number) {
       content: createUserMessageEnsure(
         userMsgs[0].message,
         userMsgs[0].imageB64,
-        "User0"
+        "user0"
       ),
     },
     {
@@ -256,7 +253,7 @@ function testSuccessfulAgentLoop(cm: ChatContextManager, startIdx: number) {
       content: createUserMessageEnsure(
         userMsgs[1].message,
         userMsgs[1].imageB64,
-        "User1"
+        "user1"
       ),
     },
     // agent response with tool calls
@@ -448,14 +445,14 @@ describe("IndexingCompressingContextManager", () => {
     expect(llmUserMessages).eql([
       {
         role: "user",
-        name: serverUserMessage0.user_nickname,
+        name: serverUserMessage0.user_uuid,
         content: serverUserMessage0.message,
       },
     ]);
 
     // A full response (with toolcall) is returned
 
-    const agentResponseWithToolCall: ChatCompletionAssistantMessageParam = {
+    const agentResponseWithToolCall: AssistantMessageParam = {
       role: "assistant",
       tool_calls: [
         {
@@ -488,7 +485,7 @@ describe("IndexingCompressingContextManager", () => {
     // - 1*MESSAGE_INDEX_FULL_INCREMENT + 1*MESSAGE_INDEX_SUB_INCREMENT
     // - 1*MESSAGE_INDEX_FULL_INCREMENT + 2*MESSAGE_INDEX_SUB_INCREMENT
 
-    const toolCallResults: ChatCompletionToolMessageParam[] = [
+    const toolCallResults: ToolMessageParam[] = [
       {
         role: "tool",
         tool_call_id: "tool_call_0",

package/src/test/compressingContextManager.test.ts

@@ -4,9 +4,9 @@ import {
   CompressingContextManager,
   createCheckpointMessage,
 } from "../agent/compressingContextManager";
-import { ChatCompletionMessageParam } from "../agent/llm";
+import { MessageParam } from "../agent/llm";
 
-const MESSAGES: ChatCompletionMessageParam[] = [
+const MESSAGES: MessageParam[] = [
   { role: "user", content: "msg200" },
   { role: "assistant", content: "msg300" },
   { role: "user", content: "msg400" },
@@ -59,7 +59,7 @@ describe("Compression context", () => {
     //   - new context is as expected
 
     const expectSummary = "Message number 0";
-    const expectContext: ChatCompletionMessageParam[] = [
+    const expectContext: MessageParam[] = [
       {
         role: "system",
         content: "New system prompt",

package/src/test/context.test.ts

@@ -3,11 +3,11 @@ import { strict as assert } from "assert";
 
 import { ContextManagerWithWorkspace } from "../agent/context";
 import { createUserMessage } from "../agent/agent";
-import { ChatCompletionMessageParam } from "../agent/llm";
+import { MessageParam } from "../agent/llm";
 import { SystemPromptProvider } from "../agent/promptProvider";
 
 describe("ContextManagerWithWorkspace", () => {
-  const msgs: ChatCompletionMessageParam[] = [
+  const msgs: MessageParam[] = [
     { role: "user", content: "message A" },
     { role: "assistant", content: "message B" },
     { role: "user", content: "message C" },
@@ -30,7 +30,7 @@ describe("ContextManagerWithWorkspace", () => {
     ]);
 
     // context with new message and workspace
-    const lastMsg: ChatCompletionMessageParam = {
+    const lastMsg: MessageParam = {
       role: "user",
       content: "hello",
     };

package/src/test/conversation.test.ts

@@ -1,8 +1,8 @@
 import { expect } from "vitest";
 import {
-  ChatCompletionAssistantMessageParam,
-  ChatCompletionMessageParam,
-  ChatCompletionUserMessageParam,
+  AssistantMessageParam,
+  MessageParam,
+  UserMessageParam,
 } from "../agent/llm";
 import {
   MESSAGE_INDEX_FULL_INCREMENT,
@@ -13,13 +13,13 @@ import {
 import { SessionMessage } from "../chat/data/dataModels";
 
 // Fake conversation values.
-const AGENT: ChatCompletionAssistantMessageParam[] = [
+const AGENT: AssistantMessageParam[] = [
   { role: "assistant", content: "Message 0" },
   { role: "assistant", content: "Message 1" },
   { role: "assistant", content: "Message 2" },
 ];
 
-const USER: ChatCompletionUserMessageParam[] = [
+const USER: UserMessageParam[] = [
   { role: "user", content: "Message 0", name: "userA" },
   { role: "user", content: "Message 1", name: "userA" },
   { role: "user", content: "Message 2", name: "userA" },
@@ -45,7 +45,7 @@ describe("Conversation tools", () => {
       },
       {
         message_idx: 100,
-        content: {} as unknown as ChatCompletionMessageParam,
+        content: {} as unknown as MessageParam,
         is_for_llm: false,
       },
       {
@@ -85,7 +85,7 @@ describe("Conversation tools", () => {
       },
       {
         message_idx: 5 * MESSAGE_INDEX_FULL_INCREMENT,
-        content: {} as unknown as ChatCompletionMessageParam,
+        content: {} as unknown as MessageParam,
         is_for_llm: false,
       },
       {

package/src/test/dbSessionMessages.test.ts

@@ -1,7 +1,7 @@
 import { expect, beforeEach, afterEach, describe, it } from "vitest";
 import { Database } from "../chat/data/database";
 import { SessionMessage } from "../chat/data/dataModels";
-import { ChatCompletionMessageParam } from "../agent/llm";
+import { MessageParam } from "../agent/llm";
 import {
   TestUserSpec,
   cleanupTestUser,
@@ -31,11 +31,11 @@ describe("DB Session Messages", () => {
   it("should update conversations", async () => {
     const { sessionId } = await createTestSession(db, testUsers[0]);
 
-    const CONV_0: ChatCompletionMessageParam[] = [
+    const CONV_0: MessageParam[] = [
       { role: "user", content: "message 0" },
       { role: "assistant", content: "message 1" },
     ];
-    const CONV_1: ChatCompletionMessageParam[] = [
+    const CONV_1: MessageParam[] = [
       { role: "user", content: "message 2" },
       { role: "assistant", content: "message 3" },
     ];

package/src/test/mcpServerManager.test.ts

@@ -1,7 +1,10 @@
 /* eslint-disable @typescript-eslint/require-await */
 import { describe, it, expect, afterAll } from "vitest";
+import { strict as assert } from "assert";
+
 import {
   computeQualifiedName,
+  isMcpServerToolCallMetaData,
   McpServerManager,
   splitQualifiedName,
 } from "../agent/mcpServerManager";
@@ -42,6 +45,7 @@ describe("McpServerManager", () => {
     expect(availableTools.length).toBeGreaterThan(0);
 
     // Initially, no tools are enabled.
+
     expect(tm.getOpenAITools().length).toBe(0);
 
     // Enable a tool and check we get a description for it.
@@ -59,7 +63,12 @@ describe("McpServerManager", () => {
       const r = await tm.invoke(
         tm.verifyToolCall(qualifiedName, { a: 1000, b: 10 })
       );
-      console.log(`response: ${r}`);
+
+      assert(r._meta);
+      assert(isMcpServerToolCallMetaData(r._meta));
+      expect(r._meta["xalia/mcpServerName"]).eql("simplecalc");
+
+      console.log(`response: ${JSON.stringify(r)}`);
     }
 
     // Disable and check we don't get the spec anymore

package/src/test/testTools.ts

@@ -1,14 +1,15 @@
-import { OpenAI } from "openai";
-
 import {
-  ChatCompletionAssistantMessageParam,
-  ChatCompletionMessageParam,
-  ChatCompletionMessageToolCall,
-  ChatCompletionToolMessageParam,
+  AssistantMessageParam,
+  MessageParam,
+  MessageToolCall,
+  ToolMessageParam,
+  ContentPartImage,
+  ToolDescriptor,
+  Completion,
 } from "../agent/llm";
 import { IAgentEventHandler } from "../agent/iAgentEventHandler";
 import { IPlatform } from "../agent/iplatform";
-import { DummyLLM } from "../agent/dummyLLM";
+import { DummyLLM, DummyLLMScriptEntry } from "../agent/dummyLLM";
 import { ILLM } from "../agent/llm";
 
 export const DUMMY_PLATFORM: IPlatform = {
@@ -27,25 +28,25 @@ export const DUMMY_PLATFORM: IPlatform = {
  * IAgentEventHandler which records all calls, for testing.
  */
 export class TestAgentEventHandler implements IAgentEventHandler {
-  private all: ChatCompletionMessageParam[] = [];
-  private completions: ChatCompletionAssistantMessageParam[] = [];
-  private images: OpenAI.Chat.Completions.ChatCompletionContentPartImage[] = [];
+  private all: MessageParam[] = [];
+  private completions: AssistantMessageParam[] = [];
+  private images: ContentPartImage[] = [];
   private agentMessages: string[] = [""];
   private reasoning: string[] = [""];
-  private toolCalls: ChatCompletionMessageToolCall[] = [];
-  private agentToolCalls: ChatCompletionMessageToolCall[] = [];
-  private toolCallResults: OpenAI.ChatCompletionToolMessageParam[] = [];
+  private toolCalls: MessageToolCall[] = [];
+  private agentToolCalls: MessageToolCall[] = [];
+  private toolCallResults: ToolMessageParam[] = [];
 
-  onCompletion(result: ChatCompletionAssistantMessageParam) {
+  onCompletion(result: AssistantMessageParam) {
     this.completions.push(result);
     this.all.push(result);
   }
 
-  onImage(image: OpenAI.Chat.Completions.ChatCompletionContentPartImage) {
+  onImage(image: ContentPartImage) {
     this.images.push(image);
   }
 
-  onToolCallResult(result: ChatCompletionToolMessageParam): void {
+  onToolCallResult(result: ToolMessageParam): void {
     this.toolCallResults.push(result);
     this.all.push(result);
   }
@@ -69,7 +70,7 @@ export class TestAgentEventHandler implements IAgentEventHandler {
   }
 
   onToolCall(
-    toolCall: ChatCompletionMessageToolCall,
+    toolCall: MessageToolCall,
     isAgentTool: boolean
   ): Promise<boolean> {
     return new Promise<boolean>((r) => {
@@ -81,11 +82,11 @@ export class TestAgentEventHandler implements IAgentEventHandler {
     });
   }
 
-  getAll(): ChatCompletionMessageParam[] {
+  getAll(): MessageParam[] {
     return this.all;
   }
 
-  getCompletions(): ChatCompletionAssistantMessageParam[] {
+  getCompletions(): AssistantMessageParam[] {
     return this.completions;
   }
 
@@ -93,22 +94,26 @@ export class TestAgentEventHandler implements IAgentEventHandler {
     return this.agentMessages.slice(0, this.agentMessages.length - 1);
   }
 
-  getToolCalls(): ChatCompletionMessageToolCall[] {
+  getToolCalls(): MessageToolCall[] {
     return this.toolCalls;
   }
 
-  getAgentToolCalls(): ChatCompletionMessageToolCall[] {
+  getAgentToolCalls(): MessageToolCall[] {
     return this.agentToolCalls;
   }
 
-  getToolCallResults(): OpenAI.ChatCompletionToolMessageParam[] {
+  getToolCallResults(): ToolMessageParam[] {
     return this.toolCallResults;
   }
+
+  getReasoning(): string[] {
+    return this.reasoning;
+  }
 }
 
 export type TestLLMRequest = {
-  messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[];
-  tools?: OpenAI.Chat.Completions.ChatCompletionTool[];
+  messages: MessageParam[];
+  tools?: ToolDescriptor[];
 };
 
 /**
@@ -118,18 +123,24 @@ export type TestLLMRequest = {
 export class TestDummyLLM extends DummyLLM {
   private readonly requests: TestLLMRequest[];
 
-  constructor(script: OpenAI.Chat.Completions.ChatCompletion.Choice[]) {
+  constructor(script: DummyLLMScriptEntry[]) {
     super(script);
     this.requests = [];
   }
 
   override getConversationResponse(
-    messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[],
-    tools?: OpenAI.Chat.Completions.ChatCompletionTool[],
-    onMessage?: (msg: string, end: boolean) => Promise<void>
-  ): Promise<OpenAI.Chat.Completions.ChatCompletion> {
+    messages: MessageParam[],
+    tools?: ToolDescriptor[],
+    onMessage?: (msg: string, end: boolean) => Promise<void>,
+    onReasoning?: (reasoning: string) => Promise<void>
+  ): Promise<Completion> {
     this.requests.push({ messages, tools });
-    return super.getConversationResponse(messages, tools, onMessage);
+    return super.getConversationResponse(
+      messages,
+      tools,
+      onMessage,
+      onReasoning
+    );
   }
 
   getRequests(): TestLLMRequest[] {
@@ -151,10 +162,10 @@ export class TestErrorLLM implements ILLM {
     throw new Error("cannot set model");
   }
   getConversationResponse(
-    _messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[],
-    _tools?: OpenAI.Chat.Completions.ChatCompletionTool[],
+    _messages: MessageParam[],
+    _tools?: ToolDescriptor[],
     _onMessage?: (msg: string, end: boolean) => Promise<void>
-  ): Promise<OpenAI.Chat.Completions.ChatCompletion> {
+  ): Promise<Completion> {
     throw new Error("LLM test error");
   }
 }

package/src/tool/agentChat.ts

@@ -1,6 +1,5 @@
 import yocto from "yocto-spinner";
 import { Spinner } from "yocto-spinner";
-import OpenAI from "openai";
 import chalk from "chalk";
 
 import { configuration, utils } from "@xalia/xmcp/tool";
@@ -15,7 +14,12 @@ import { NODE_PLATFORM } from "./nodePlatform";
 import { CommandPrompt } from "./commandPrompt";
 import { IPrompt, Prompt } from "./prompt";
 import { ContextManager } from "../agent/context";
-import { ChatCompletionMessageParam } from "../agent/llm";
+import {
+  ContentPartImage,
+  MessageParam,
+  MessageToolCall,
+  ToolMessageParam,
+} from "../agent/llm";
 
 const logger = getLogger();
 
@@ -37,7 +41,7 @@ async function write(msg: string): Promise<void> {
 export async function runChat(
   llmUrl: string,
   agentProfile: AgentProfile,
-  conversation: ChatCompletionMessageParam[] | undefined,
+  conversation: MessageParam[] | undefined,
   prompt: string | undefined,
   image: string | undefined,
   llmApiKey: string | undefined,
@@ -89,7 +93,7 @@ export async function runChat(
   const cmdPrompt = new CommandPrompt(repl);
 
   let remainingApprovedToolCalls = approveToolsUpTo;
-  const onToolCall = async (toolCall: OpenAI.ChatCompletionMessageToolCall) => {
+  const onToolCall = async (toolCall: MessageToolCall) => {
     if (remainingApprovedToolCalls !== 0) {
       --remainingApprovedToolCalls;
       return true;
@@ -101,14 +105,12 @@ export async function runChat(
     return result;
   };
 
-  const onToolCallResult = (result: OpenAI.ChatCompletionToolMessageParam) => {
+  const onToolCallResult = (result: ToolMessageParam) => {
     // CLI doesn't need to display tool results - they're handled internally
     logger.debug(`Tool call result: ${JSON.stringify(result)}`);
   };
 
-  const onImage = (
-    image: OpenAI.Chat.Completions.ChatCompletionContentPartImage
-  ) => {
+  const onImage = (image: ContentPartImage) => {
     const dataUrl = image.image_url.url;
     void NODE_PLATFORM.renderHTML(`<img src="${dataUrl}" />`);
   };