thatgfsj-code 0.3.0 → 0.4.1

package/src/config/providers.ts

@@ -1,6 +1,6 @@
 /**
  * Provider definitions and model catalogs
- * Consolidated from old types.ts PROVIDERS + welcome.ts model lists
+ * Updated with correct API formats and more providers
  */
 
 import type { ProviderConfig, ProviderName, ModelInfo } from './types.js';
@@ -12,16 +12,9 @@ export const PROVIDERS: Record<ProviderName, ProviderConfig> = {
     name: 'SiliconFlow (硅基流动)',
     baseUrl: 'https://api.siliconflow.cn/v1',
     defaultModel: 'Qwen/Qwen2.5-7B-Instruct',
-    envKeys: ['SILICONFLOW_API_KEY', 'OPENAI_API_KEY'],
+    envKeys: ['SILICONFLOW_API_KEY'],
     format: 'openai',
   },
-  minimax: {
-    name: 'MiniMax',
-    baseUrl: 'https://api.minimax.io/anthropic/v1',
-    defaultModel: 'MiniMax-M2.5',
-    envKeys: ['MINIMAX_API_KEY', 'OPENAI_API_KEY'],
-    format: 'anthropic',
-  },
   openai: {
     name: 'OpenAI',
     baseUrl: 'https://api.openai.com/v1',
@@ -29,132 +22,213 @@ export const PROVIDERS: Record<ProviderName, ProviderConfig> = {
     envKeys: ['OPENAI_API_KEY'],
     format: 'openai',
   },
+  deepseek: {
+    name: 'DeepSeek (深度求索)',
+    baseUrl: 'https://api.deepseek.com',
+    defaultModel: 'deepseek-chat',
+    envKeys: ['DEEPSEEK_API_KEY'],
+    format: 'openai',
+  },
+  kimi: {
+    name: 'Kimi (月之暗面)',
+    baseUrl: 'https://api.moonshot.cn/v1',
+    defaultModel: 'kimi-k2.6',
+    envKeys: ['KIMI_API_KEY', 'MOONSHOT_API_KEY'],
+    format: 'openai',
+  },
+  zhipu: {
+    name: 'Zhipu GLM (智谱)',
+    baseUrl: 'https://open.bigmodel.cn/api/paas/v4',
+    defaultModel: 'glm-4-flash',
+    envKeys: ['ZHIPU_API_KEY', 'GLM_API_KEY'],
+    format: 'openai',
+  },
+  minimax: {
+    name: 'MiniMax',
+    baseUrl: 'https://api.minimax.chat/v1',
+    defaultModel: 'MiniMax-Text-01',
+    envKeys: ['MINIMAX_API_KEY'],
+    format: 'openai',
+  },
+  baichuan: {
+    name: 'Baichuan (百川)',
+    baseUrl: 'https://api.baichuan-ai.com/v1',
+    defaultModel: 'Baichuan4',
+    envKeys: ['BAICHUAN_API_KEY'],
+    format: 'openai',
+  },
+  stepfun: {
+    name: 'Stepfun (阶跃星辰)',
+    baseUrl: 'https://api.stepfun.com/v1',
+    defaultModel: 'step-1-flash',
+    envKeys: ['STEPFUN_API_KEY'],
+    format: 'openai',
+  },
+  doubao: {
+    name: 'Doubao (火山引擎豆包)',
+    baseUrl: 'https://ark.cn-beijing.volces.com/api/v3',
+    defaultModel: 'doubao-1.5-pro-32k',
+    envKeys: ['DOUBAO_API_KEY', 'ARK_API_KEY'],
+    format: 'openai',
+  },
   anthropic: {
-    name: 'Anthropic',
+    name: 'Anthropic (Claude)',
     baseUrl: 'https://api.anthropic.com/v1',
-    defaultModel: 'claude-3-haiku-20240307',
+    defaultModel: 'claude-sonnet-4-20250514',
     envKeys: ['ANTHROPIC_API_KEY'],
     format: 'anthropic',
   },
-  ollama: {
-    name: 'Ollama (Local)',
-    baseUrl: process.env.OLLAMA_BASE_URL || 'http://localhost:11434',
-    defaultModel: 'llama2',
-    envKeys: [],
-    format: 'openai',
-  },
   gemini: {
     name: 'Google Gemini',
     baseUrl: 'https://generativelanguage.googleapis.com/v1beta',
-    defaultModel: 'gemini-1.5-flash',
+    defaultModel: 'gemini-2.0-flash',
     envKeys: ['GEMINI_API_KEY'],
     format: 'gemini',
   },
-  kimi: {
-    name: 'Kimi (Moonshot AI)',
-    baseUrl: 'https://api.moonshot.cn/v1',
-    defaultModel: 'moonshot-v1-8k',
-    envKeys: ['KIMI_API_KEY', 'MOONSHOT_API_KEY'],
+  ollama: {
+    name: 'Ollama (本地)',
+    baseUrl: 'http://localhost:11434/v1',
+    defaultModel: 'llama3.1',
+    envKeys: [],
     format: 'openai',
   },
-  deepseek: {
-    name: 'DeepSeek',
-    baseUrl: 'https://api.deepseek.com/v1',
-    defaultModel: 'deepseek-chat',
-    envKeys: ['DEEPSEEK_API_KEY'],
+  ernie: {
+    name: 'ERNIE (百度文心)',
+    baseUrl: 'https://qianfan.baidubce.com/v2',
+    defaultModel: 'ernie-4.5-8k',
+    envKeys: ['ERNIE_API_KEY', 'QIANFAN_API_KEY'],
     format: 'openai',
   },
-  ernie: {
-    name: 'Baidu ERNIE (文心一言)',
-    baseUrl: 'https://aip.baidubce.com/rpc/2.0/ai_custom/v1',
-    defaultModel: 'ernie-4.0-8k',
-    envKeys: ['ERNIE_API_KEY', 'BAIDU_API_KEY'],
+  custom_openai: {
+    name: '自定义 OpenAI 兼容 (中转站)',
+    baseUrl: '',
+    defaultModel: 'gpt-4o-mini',
+    envKeys: ['CUSTOM_API_KEY'],
     format: 'openai',
   },
+  custom_anthropic: {
+    name: '自定义 Anthropic 兼容 (中转站)',
+    baseUrl: '',
+    defaultModel: 'claude-sonnet-4-20250514',
+    envKeys: ['CUSTOM_API_KEY'],
+    format: 'anthropic',
+  },
 };
 
 // ==================== Model Catalogs ====================
 
 export const MODEL_CATALOGS: Record<ProviderName, ModelInfo[]> = {
   siliconflow: [
-    { id: 'Qwen/Qwen2.5-7B-Instruct', name: 'Qwen2.5-7B (推荐)', desc: '性价比高，适合日常编程' },
-    { id: 'Qwen/Qwen2.5-32B-Instruct', name: 'Qwen2.5-32B', desc: '更强性能，适合复杂任务' },
+    { id: 'Qwen/Qwen2.5-7B-Instruct', name: 'Qwen2.5-7B', desc: '免费，日常编程' },
+    { id: 'Qwen/Qwen2.5-32B-Instruct', name: 'Qwen2.5-32B', desc: '更强性能' },
     { id: 'Qwen/Qwen2.5-72B-Instruct', name: 'Qwen2.5-72B', desc: '旗舰模型' },
-    { id: 'Pro/moonshotai/Kimi-K2.5', name: 'Kimi-K2.5 (私有)', desc: 'Moonshot 强力模型' },
-    { id: 'Pro/deepseek-ai/DeepSeek-V3', name: 'DeepSeek-V3', desc: '深度求索最新模型' },
-    { id: 'Pro/deepseek-ai/DeepSeek-R1', name: 'DeepSeek-R1', desc: '推理能力强' },
+    { id: 'Qwen/Qwen3-8B', name: 'Qwen3-8B', desc: '最新 Qwen3' },
+    { id: 'Pro/deepseek-ai/DeepSeek-V3', name: 'DeepSeek-V3', desc: '深度求索' },
+    { id: 'Pro/deepseek-ai/DeepSeek-R1', name: 'DeepSeek-R1', desc: '推理模型' },
+    { id: 'deepseek-ai/DeepSeek-V3', name: 'DeepSeek-V3 (免费)', desc: '免费版' },
     { id: 'THUDM/glm-4-9b-chat', name: 'GLM-4-9B', desc: '智谱模型' },
-    { id: 'THUDM/glm-4-32b-chat', name: 'GLM-4-32B', desc: '智谱大模型' },
-    { id: '01-ai/Yi-1.5-34B-Chat', name: 'Yi-1.5-34B', desc: '零一万物' },
-    { id: 'microsoft/WizardLM-2-8x22B', name: 'WizardLM-2', desc: '微软开源' },
-  ],
-  minimax: [
-    { id: 'MiniMax-M2.5', name: 'MiniMax-M2.5 (推荐)', desc: 'Agent 能力最强' },
-    { id: 'MiniMax-M2.1', name: 'MiniMax-M2.1', desc: '稳定版本' },
+    { id: 'internlm/internlm2_5-7b-chat', name: 'InternLM2.5-7B', desc: '书生模型' },
   ],
   openai: [
-    { id: 'gpt-4o-mini', name: 'GPT-4o-mini (推荐)', desc: '性价比高' },
-    { id: 'gpt-4o', name: 'GPT-4o', desc: '最新旗舰' },
+    { id: 'gpt-4o-mini', name: 'GPT-4o-mini', desc: '性价比高' },
+    { id: 'gpt-4o', name: 'GPT-4o', desc: '旗舰多模态' },
     { id: 'gpt-4-turbo', name: 'GPT-4-Turbo', desc: '强性能' },
+    { id: 'o3-mini', name: 'o3-mini', desc: '推理模型' },
   ],
-  anthropic: [
-    { id: 'claude-3-haiku-20240307', name: 'Claude-3-Haiku (推荐)', desc: '快速响应' },
-    { id: 'claude-3.5-sonnet-20241022', name: 'Claude-3.5-Sonnet', desc: '最新旗舰' },
-    { id: 'claude-3-opus-20240229', name: 'Claude-3-Opus', desc: '最强性能' },
+  deepseek: [
+    { id: 'deepseek-chat', name: 'DeepSeek-Chat', desc: '通用对话' },
+    { id: 'deepseek-reasoner', name: 'DeepSeek-Reasoner', desc: '推理增强' },
   ],
-  ollama: [
-    { id: 'llama2', name: 'Llama 2', desc: 'Meta 开源模型' },
-    { id: 'codellama', name: 'Code Llama', desc: '编程专用' },
-    { id: 'mistral', name: 'Mistral', desc: '高性能开源' },
+  kimi: [
+    { id: 'kimi-k2.6', name: 'Kimi K2.6', desc: '最新旗舰，支持思考' },
+    { id: 'kimi-k2.5', name: 'Kimi K2.5', desc: '稳定版' },
+    { id: 'moonshot-v1-128k', name: 'Moonshot-128K', desc: '超长上下文' },
+    { id: 'moonshot-v1-32k', name: 'Moonshot-32K', desc: '长上下文' },
+    { id: 'moonshot-v1-8k', name: 'Moonshot-8K', desc: '基础版' },
   ],
-  gemini: [
-    { id: 'gemini-1.5-flash-8b', name: 'Gemini-1.5-Flash-8B (推荐)', desc: '免费快速' },
-    { id: 'gemini-1.5-flash', name: 'Gemini-1.5-Flash', desc: '性价比高' },
-    { id: 'gemini-1.5-pro', name: 'Gemini-1.5-Pro', desc: '最新旗舰' },
+  zhipu: [
+    { id: 'glm-4-plus', name: 'GLM-4-Plus', desc: '旗舰模型' },
+    { id: 'glm-4-flash', name: 'GLM-4-Flash', desc: '快速免费' },
+    { id: 'glm-4-long', name: 'GLM-4-Long', desc: '超长上下文 1M' },
+    { id: 'glm-4-flashx', name: 'GLM-4-FlashX', desc: '加速版' },
+    { id: 'glm-4-air', name: 'GLM-4-Air', desc: '轻量版' },
   ],
-  kimi: [
-    { id: 'moonshot-v1-8k', name: 'Moonshot-V1-8K (推荐)', desc: '日常编程' },
-    { id: 'moonshot-v1-32k', name: 'Moonshot-V1-32K', desc: '更长上下文' },
-    { id: 'moonshot-v1-128k', name: 'Moonshot-V1-128K', desc: '超长上下文' },
+  minimax: [
+    { id: 'MiniMax-Text-01', name: 'MiniMax-Text-01', desc: '旗舰模型' },
+    { id: 'abab6.5s-chat', name: 'abab6.5s', desc: '轻量版' },
   ],
-  deepseek: [
-    { id: 'deepseek-chat', name: 'DeepSeek-Chat (推荐)', desc: '性价比高' },
-    { id: 'deepseek-coder', name: 'DeepSeek-Coder', desc: '编程专用' },
+  baichuan: [
+    { id: 'Baichuan4', name: 'Baichuan4', desc: '最新旗舰' },
+    { id: 'Baichuan3-Turbo', name: 'Baichuan3-Turbo', desc: '快速版' },
+  ],
+  stepfun: [
+    { id: 'step-1-flash', name: 'Step-1-Flash', desc: '快速免费' },
+    { id: 'step-1-8k', name: 'Step-1-8K', desc: '基础版' },
+    { id: 'step-2-16k', name: 'Step-2-16K', desc: '增强版' },
+  ],
+  doubao: [
+    { id: 'doubao-1.5-pro-32k', name: 'Doubao-1.5-Pro-32K', desc: '旗舰版' },
+    { id: 'doubao-1.5-lite-32k', name: 'Doubao-1.5-Lite-32K', desc: '轻量版' },
+    { id: 'doubao-pro-256k', name: 'Doubao-Pro-256K', desc: '超长上下文' },
+  ],
+  anthropic: [
+    { id: 'claude-sonnet-4-20250514', name: 'Claude Sonnet 4', desc: '最新旗舰' },
+    { id: 'claude-3-5-haiku-20241022', name: 'Claude 3.5 Haiku', desc: '快速便宜' },
+    { id: 'claude-3-opus-20240229', name: 'Claude 3 Opus', desc: '最强性能' },
+  ],
+  gemini: [
+    { id: 'gemini-2.0-flash', name: 'Gemini 2.0 Flash', desc: '最新快速' },
+    { id: 'gemini-2.5-pro-preview-05-06', name: 'Gemini 2.5 Pro', desc: '最强推理' },
+    { id: 'gemini-1.5-flash', name: 'Gemini 1.5 Flash', desc: '经典版' },
+  ],
+  ollama: [
+    { id: 'llama3.1', name: 'Llama 3.1', desc: 'Meta 开源' },
+    { id: 'qwen2.5', name: 'Qwen 2.5', desc: '通义千问' },
+    { id: 'deepseek-coder-v2', name: 'DeepSeek Coder V2', desc: '编程专用' },
+    { id: 'codellama', name: 'Code Llama', desc: 'Meta 编程' },
+    { id: 'mistral', name: 'Mistral', desc: '高性能' },
   ],
   ernie: [
-    { id: 'ernie-4.0-8k', name: 'ERNIE-4.0-8K (推荐)', desc: '百度旗舰' },
+    { id: 'ernie-4.5-8k', name: 'ERNIE-4.5-8K', desc: '最新旗舰' },
+    { id: 'ernie-4.0-8k', name: 'ERNIE-4.0-8K', desc: '强性能' },
     { id: 'ernie-3.5-8k', name: 'ERNIE-3.5-8K', desc: '性价比高' },
   ],
+  custom_openai: [
+    { id: 'gpt-4o-mini', name: 'GPT-4o-mini', desc: '默认模型，可自定义' },
+    { id: 'gpt-4o', name: 'GPT-4o', desc: '可自定义' },
+    { id: 'claude-sonnet-4-20250514', name: 'Claude Sonnet 4', desc: '可自定义' },
+  ],
+  custom_anthropic: [
+    { id: 'claude-sonnet-4-20250514', name: 'Claude Sonnet 4', desc: '默认模型，可自定义' },
+    { id: 'claude-3-5-haiku-20241022', name: 'Claude 3.5 Haiku', desc: '可自定义' },
+  ],
 };
 
 // ==================== Helpers ====================
 
-/**
- * Get models for a specific provider
- */
 export function getModelsForProvider(provider: ProviderName): ModelInfo[] {
-  return MODEL_CATALOGS[provider] || MODEL_CATALOGS.siliconflow;
+  return MODEL_CATALOGS[provider] || [];
 }
 
-/**
- * Get API key for a provider from environment variables
- */
 export function getApiKeyFromEnv(provider: ProviderName): string {
   const providerConfig = PROVIDERS[provider];
   if (!providerConfig) return '';
-
   for (const envKey of providerConfig.envKeys) {
     if (process.env[envKey]) return process.env[envKey];
   }
   return '';
 }
 
-/**
- * List all provider names
- */
 export function listProviders(): Array<{ key: ProviderName; name: string }> {
   return Object.entries(PROVIDERS).map(([key, val]) => ({
     key: key as ProviderName,
     name: val.name,
   }));
 }
+
+/**
+ * Check if a provider name is a custom/relay provider
+ */
+export function isCustomProvider(provider: ProviderName): boolean {
+  return provider === 'custom_openai' || provider === 'custom_anthropic';
+}

package/src/config/types.ts

@@ -4,14 +4,20 @@
 
 export type ProviderName =
   | 'siliconflow'
-  | 'minimax'
   | 'openai'
+  | 'deepseek'
+  | 'kimi'
+  | 'zhipu'
+  | 'minimax'
+  | 'baichuan'
+  | 'stepfun'
+  | 'doubao'
   | 'anthropic'
-  | 'ollama'
   | 'gemini'
-  | 'kimi'
-  | 'deepseek'
-  | 'ernie';
+  | 'ollama'
+  | 'ernie'
+  | 'custom_openai'
+  | 'custom_anthropic';
 
 export interface ProviderConfig {
   name: string;

package/src/llm/anthropic.ts

@@ -1,15 +1,26 @@
 /**
  * Anthropic Provider
- * Works with: Anthropic Claude, MiniMax (Anthropic mode)
+ * Works with: Anthropic Claude API
+ * Also works with any Anthropic-compatible relay station (中转站)
+ *
+ * API: POST {baseUrl}/messages
+ * Auth: x-api-key: {apiKey}, anthropic-version: 2023-06-01
+ * Streaming: SSE with "event: ..." and "data: {...}" lines
+ *
+ * Key differences from OpenAI:
+ * - System message is separate (top-level "system" field)
+ * - No "system" role in messages array
+ * - Tool use blocks have type "tool_use" with "input" (not "arguments")
+ * - Tool results use role "tool_result" (not "tool")
  */
 
-import type { ChatMessage, ChatResponse, ChatOptions } from '../types.js';
+import type { ChatMessage, ChatResponse, ChatOptions, ToolCall } from '../types.js';
 import type { Tool } from '../tools/types.js';
-import type { LLMProvider, ProviderConfig } from './provider.js';
+import type { LLMProvider, StreamChunk, ProviderConfig } from './provider.js';
 
 export class AnthropicProvider implements LLMProvider {
   readonly name = 'anthropic';
-  private config: ProviderConfig;
+  protected config: ProviderConfig;
 
   constructor(config: ProviderConfig) {
     this.config = config;
@@ -29,18 +40,9 @@ export class AnthropicProvider implements LLMProvider {
     }));
   }
 
-  async chat(messages: ChatMessage[], options?: ChatOptions): Promise<ChatResponse> {
-    const body = this.buildRequest(messages, false, options);
-
-    const response = await fetch(`${this.config.baseUrl}/messages`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': this.config.apiKey,
-        'anthropic-version': '2023-06-01',
-      },
-      body: JSON.stringify(body),
-    });
+  async chat(messages: ChatMessage[], options?: ChatOptions, tools?: Tool[]): Promise<ChatResponse> {
+    const body = this.buildRequest(messages, false, options, tools);
+    const response = await this.doRequest(body);
 
     if (!response.ok) {
       const text = await response.text().catch(() => '');
@@ -48,41 +50,37 @@ export class AnthropicProvider implements LLMProvider {
     }
 
     const data = await response.json();
-    const contentBlock = data.content?.find((b: any) => b.type === 'text');
+
+    // Extract text content
+    const textBlocks = data.content?.filter((b: any) => b.type === 'text') || [];
+    const content = textBlocks.map((b: any) => b.text).join('');
+
+    // Extract tool calls
     const toolUseBlocks = data.content?.filter((b: any) => b.type === 'tool_use') || [];
+    const toolCalls = toolUseBlocks.length > 0 ? toolUseBlocks.map((b: any) => ({
+      id: b.id,
+      type: 'function' as const,
+      function: {
+        name: b.name,
+        arguments: JSON.stringify(b.input),
+      },
+    })) : undefined;
 
     return {
-      content: contentBlock?.text || '',
+      content,
       role: 'assistant',
       usage: data.usage ? {
         prompt_tokens: data.usage.input_tokens || 0,
         completion_tokens: data.usage.output_tokens || 0,
         total_tokens: (data.usage.input_tokens || 0) + (data.usage.output_tokens || 0),
       } : undefined,
-      tool_calls: toolUseBlocks.length > 0 ? toolUseBlocks.map((b: any) => ({
-        id: b.id,
-        type: 'function' as const,
-        function: {
-          name: b.name,
-          arguments: JSON.stringify(b.input),
-        },
-      })) : undefined,
+      tool_calls: toolCalls,
     };
   }
 
-  async *chatStream(messages: ChatMessage[], options?: ChatOptions): AsyncGenerator<string, ChatResponse> {
-    const body = this.buildRequest(messages, true, options);
-
-    const response = await fetch(`${this.config.baseUrl}/messages`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': this.config.apiKey,
-        'anthropic-version': '2023-06-01',
-        'anthropic-dangerous-direct-browser-access': 'true',
-      },
-      body: JSON.stringify(body),
-    });
+  async *chatStream(messages: ChatMessage[], options?: ChatOptions, tools?: Tool[]): AsyncGenerator<StreamChunk, ChatResponse> {
+    const body = this.buildRequest(messages, true, options, tools);
+    const response = await this.doRequest(body);
 
     if (!response.ok || !response.body) {
       const text = await response.text().catch(() => '');
@@ -93,6 +91,10 @@ export class AnthropicProvider implements LLMProvider {
     const decoder = new TextDecoder();
     let fullContent = '';
     let buffer = '';
+    // Track tool use blocks
+    const toolUseBlocks: Map<number, { id: string; name: string; input: string }> = new Map();
+    let currentBlockIndex = -1;
+    let currentBlockType = '';
 
     try {
       while (true) {
@@ -109,10 +111,32 @@ export class AnthropicProvider implements LLMProvider {
 
           try {
             const data = JSON.parse(trimmed.slice(6));
-            if (data.type === 'content_block_delta' && data.delta?.type === 'text_delta') {
-              const text = data.delta.text;
-              fullContent += text;
-              yield text;
+
+            // content_block_start: track block types
+            if (data.type === 'content_block_start') {
+              currentBlockIndex = data.index ?? 0;
+              currentBlockType = data.content_block?.type || '';
+              if (currentBlockType === 'tool_use') {
+                toolUseBlocks.set(currentBlockIndex, {
+                  id: data.content_block.id || '',
+                  name: data.content_block.name || '',
+                  input: '',
+                });
+              }
+            }
+
+            // content_block_delta: incremental text or tool input
+            if (data.type === 'content_block_delta') {
+              if (data.delta?.type === 'text_delta') {
+                const text = data.delta.text;
+                fullContent += text;
+                yield { type: 'text', content: text };
+              } else if (data.delta?.type === 'input_json_delta') {
+                const buf = toolUseBlocks.get(currentBlockIndex);
+                if (buf) {
+                  buf.input += data.delta.partial_json || '';
+                }
+              }
             }
           } catch {
             // Skip invalid JSON
@@ -123,24 +147,97 @@ export class AnthropicProvider implements LLMProvider {
       reader.releaseLock();
     }
 
-    return { content: fullContent, role: 'assistant' };
+    // Convert tool use blocks to ToolCall[]
+    const toolCalls: ToolCall[] = [];
+    for (const [, buf] of toolUseBlocks) {
+      if (buf.id && buf.name) {
+        toolCalls.push({
+          id: buf.id,
+          type: 'function',
+          function: { name: buf.name, arguments: buf.input },
+        });
+      }
+    }
+
+    if (toolCalls.length > 0) {
+      yield { type: 'tool_calls', toolCalls };
+    }
+
+    return { content: fullContent, role: 'assistant', tool_calls: toolCalls.length > 0 ? toolCalls : undefined };
   }
 
-  private buildRequest(messages: ChatMessage[], stream: boolean, options?: ChatOptions) {
+  /**
+   * Build request body for Anthropic API
+   */
+  protected buildRequest(messages: ChatMessage[], stream: boolean, options?: ChatOptions, tools?: Tool[]) {
     // Anthropic uses separate system message
     const systemMsg = messages.find(m => m.role === 'system');
     const nonSystemMsgs = messages.filter(m => m.role !== 'system');
 
-    return {
+    // Convert messages to Anthropic format
+    const anthropicMessages = nonSystemMsgs.map(m => {
+      if (m.role === 'tool') {
+        // Tool result message
+        return {
+          role: 'user',
+          content: [{
+            type: 'tool_result',
+            tool_use_id: m.tool_call_id,
+            content: m.content,
+          }],
+        };
+      }
+      if (m.tool_calls && m.tool_calls.length > 0) {
+        // Assistant message with tool calls
+        const blocks: any[] = [];
+        if (m.content) {
+          blocks.push({ type: 'text', text: m.content });
+        }
+        for (const tc of m.tool_calls) {
+          blocks.push({
+            type: 'tool_use',
+            id: tc.id,
+            name: tc.function.name,
+            input: JSON.parse(tc.function.arguments || '{}'),
+          });
+        }
+        return { role: 'assistant', content: blocks };
+      }
+      return {
+        role: m.role === 'assistant' ? 'assistant' : 'user',
+        content: m.content,
+      };
+    });
+
+    const body: any = {
       model: this.config.model,
-      max_tokens: options?.maxTokens ?? this.config.maxTokens,
+      max_tokens: options?.maxTokens ?? this.config.maxTokens ?? 4096,
       temperature: options?.temperature ?? this.config.temperature,
       ...(systemMsg && { system: systemMsg.content }),
-      messages: nonSystemMsgs.map(m => ({
-        role: m.role === 'assistant' ? 'assistant' : 'user',
-        content: m.content,
-      })),
+      messages: anthropicMessages,
       stream,
     };
+
+    if (tools && tools.length > 0) {
+      body.tools = this.buildTools(tools);
+    }
+
+    return body;
+  }
+
+  /**
+   * Execute the HTTP request
+   */
+  protected async doRequest(body: any): Promise<Response> {
+    const url = `${this.config.baseUrl}/messages`;
+    return fetch(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-api-key': this.config.apiKey,
+        'anthropic-version': '2023-06-01',
+      },
+      body: JSON.stringify(body),
+    });
   }
 }