tabby-ai-assistant 1.0.12 → 1.0.15

package/src/services/providers/minimax-provider.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Observable, Observer } from 'rxjs';
 import { Anthropic } from '@anthropic-ai/sdk';
 import { BaseAiProvider } from './base-provider.service';
-import { ProviderCapability, HealthStatus, ValidationResult } from '../../types/provider.types';
+import { ProviderCapability, ValidationResult } from '../../types/provider.types';
 import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, MessageRole, StreamEvent } from '../../types/ai.types';
 import { LoggerService } from '../core/logger.service';
 
@@ -116,12 +116,16 @@ export class MinimaxProviderService extends BaseAiProvider {
     chatStream(request: ChatRequest): Observable<StreamEvent> {
         return new Observable<StreamEvent>((subscriber: Observer<StreamEvent>) => {
             if (!this.client) {
-                subscriber.error(new Error('Minimax client not initialized'));
+                const error = new Error('Minimax client not initialized');
+                subscriber.next({ type: 'error', error: error.message });
+                subscriber.error(error);
                 return;
             }
 
             this.logRequest(request);
 
+            const abortController = new AbortController();
+
             const runStream = async () => {
                 try {
                     // 注意：SDK 类型定义可能不包含 tools，但 API 实际支持
@@ -141,6 +145,10 @@ export class MinimaxProviderService extends BaseAiProvider {
                     let currentToolInput = '';
 
                     for await (const event of stream) {
+                        if (abortController.signal.aborted) break;
+
+                        this.logger.debug('Stream event', { type: event.type });
+
                         if (event.type === 'content_block_delta') {
                             const delta = event.delta as any;
                             // 文本增量
@@ -162,7 +170,15 @@ export class MinimaxProviderService extends BaseAiProvider {
                                 currentToolId = block.id;
                                 currentToolName = block.name;
                                 currentToolInput = '';
-                                subscriber.next({ type: 'tool_use_start' });
+                                subscriber.next({
+                                    type: 'tool_use_start',
+                                    toolCall: {
+                                        id: currentToolId,
+                                        name: currentToolName,
+                                        input: {}
+                                    }
+                                });
+                                this.logger.debug('Stream event', { type: 'tool_use_start', name: currentToolName });
                             }
                         }
                         // 内容块结束
@@ -183,6 +199,7 @@ export class MinimaxProviderService extends BaseAiProvider {
                                         input: parsedInput
                                     }
                                 });
+                                this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolName });
                                 // 重置
                                 currentToolId = '';
                                 currentToolName = '';
@@ -197,19 +214,22 @@ export class MinimaxProviderService extends BaseAiProvider {
                         type: 'message_end',
                         message: this.transformChatResponse(finalMessage).message
                     });
+                    this.logger.debug('Stream event', { type: 'message_end' });
                     subscriber.complete();
                 } catch (error) {
-                    this.logError(error, { request });
-                    subscriber.error(new Error(`Minimax stream failed: ${error instanceof Error ? error.message : String(error)}`));
+                    if ((error as any).name !== 'AbortError') {
+                        const errorMessage = `Minimax stream failed: ${error instanceof Error ? error.message : String(error)}`;
+                        this.logError(error, { request });
+                        subscriber.next({ type: 'error', error: errorMessage });
+                        subscriber.error(new Error(errorMessage));
+                    }
                 }
             };
 
             runStream();
 
             // 返回取消订阅的处理函数
-            return () => {
-                this.logger.debug('Stream subscription cancelled');
-            };
+            return () => abortController.abort();
         });
     }
 
@@ -282,35 +302,19 @@ export class MinimaxProviderService extends BaseAiProvider {
         return this.parseAnalysisResponse(response.message.content);
     }
 
-    /**
-     * 健康检查
-     */
-    async healthCheck(): Promise<HealthStatus> {
-        try {
-            if (!this.client) {
-                return HealthStatus.UNHEALTHY;
-            }
-
-            // 简单的测试请求
-            const _response = await this.client.messages.create({
-                model: this.config?.model || 'MiniMax-M2',
-                max_tokens: 1,
-                messages: [
-                    {
-                        role: 'user',
-                        content: 'Hi'
-                    }
-                ]
-            });
+    protected async sendTestRequest(request: ChatRequest): Promise<ChatResponse> {
+        if (!this.client) {
+            throw new Error('Minimax client not initialized');
+        }
 
-            this.lastHealthCheck = { status: HealthStatus.HEALTHY, timestamp: new Date() };
-            return HealthStatus.HEALTHY;
+        const response = await this.client.messages.create({
+            model: this.config?.model || 'MiniMax-M2',
+            max_tokens: request.maxTokens || 1,
+            messages: this.transformMessages(request.messages),
+            temperature: request.temperature || 0
+        });
 
-        } catch (error) {
-            this.logger.error('Minimax health check failed', error);
-            this.lastHealthCheck = { status: HealthStatus.UNHEALTHY, timestamp: new Date() };
-            return HealthStatus.UNHEALTHY;
-        }
+        return this.transformChatResponse(response);
     }
 
     /**
@@ -334,14 +338,6 @@ export class MinimaxProviderService extends BaseAiProvider {
         return result;
     }
 
-    /**
-     * 获取默认基础URL
-     */
-    protected getDefaultBaseURL(): string {
-        // 支持中国和国际端点
-        return 'https://api.minimaxi.com/anthropic';
-    }
-
     /**
      * 转换消息格式
      * Anthropic API 支持两种格式：
@@ -351,8 +347,9 @@ export class MinimaxProviderService extends BaseAiProvider {
      */
     protected transformMessages(messages: any[]): any[] {
         // 过滤掉系统消息（system role 不应该在 messages 数组中）
+        // 保留 user, assistant, tool 角色的消息
         const filteredMessages = messages.filter(msg =>
-            msg.role === 'user' || msg.role === 'assistant'
+            msg.role === 'user' || msg.role === 'assistant' || msg.role === 'tool'
         );
 
         this.logger.info('Transforming messages', {
@@ -361,10 +358,20 @@ export class MinimaxProviderService extends BaseAiProvider {
             roles: messages.map(m => m.role)
         });
 
-        return filteredMessages.map(msg => ({
-            role: msg.role === 'user' ? 'user' : 'assistant',
-            content: String(msg.content || '')
-        }));
+        return filteredMessages.map(msg => {
+            // tool 角色消息转换为 user 角色（Anthropic API 不直接支持 tool 角色）
+            // 但内容保留工具结果标识，让 AI 理解这是工具执行结果
+            if (msg.role === 'tool') {
+                return {
+                    role: 'user',
+                    content: String(msg.content || '')
+                };
+            }
+            return {
+                role: msg.role === 'user' ? 'user' : 'assistant',
+                content: String(msg.content || '')
+            };
+        });
     }
 
     /**
@@ -440,194 +447,4 @@ export class MinimaxProviderService extends BaseAiProvider {
 
         return result;
     }
-
-    /**
-     * 构建命令生成提示
-     */
-    private buildCommandPrompt(request: CommandRequest): string {
-        let prompt = `请将以下自然语言描述转换为准确的终端命令：\n\n"${request.naturalLanguage}"\n\n`;
-
-        if (request.context) {
-            prompt += `当前环境：\n`;
-            if (request.context.currentDirectory) {
-                prompt += `- 当前目录：${request.context.currentDirectory}\n`;
-            }
-            if (request.context.operatingSystem) {
-                prompt += `- 操作系统：${request.context.operatingSystem}\n`;
-            }
-            if (request.context.shell) {
-                prompt += `- Shell：${request.context.shell}\n`;
-            }
-        }
-
-        prompt += `\n请直接返回JSON格式：\n`;
-        prompt += `{\n`;
-        prompt += `  "command": "具体命令",\n`;
-        prompt += `  "explanation": "命令解释",\n`;
-        prompt += `  "confidence": 0.95\n`;
-        prompt += `}\n`;
-
-        return prompt;
-    }
-
-    /**
-     * 构建命令解释提示
-     */
-    private buildExplainPrompt(request: ExplainRequest): string {
-        let prompt = `请详细解释以下终端命令：\n\n\`${request.command}\`\n\n`;
-
-        if (request.context?.currentDirectory) {
-            prompt += `当前目录：${request.context.currentDirectory}\n`;
-        }
-        if (request.context?.operatingSystem) {
-            prompt += `操作系统：${request.context.operatingSystem}\n`;
-        }
-
-        prompt += `\n请按以下JSON格式返回：\n`;
-        prompt += `{\n`;
-        prompt += `  "explanation": "整体解释",\n`;
-        prompt += `  "breakdown": [\n`;
-        prompt += `    {"part": "命令部分", "description": "说明"}\n`;
-        prompt += `  ],\n`;
-        prompt += `  "examples": ["使用示例"]\n`;
-        prompt += `}\n`;
-
-        return prompt;
-    }
-
-    /**
-     * 构建结果分析提示
-     */
-    private buildAnalysisPrompt(request: AnalysisRequest): string {
-        let prompt = `请分析以下命令执行结果：\n\n`;
-        prompt += `命令：${request.command}\n`;
-        prompt += `退出码：${request.exitCode}\n`;
-        prompt += `输出：\n${request.output}\n\n`;
-
-        if (request.context?.workingDirectory) {
-            prompt += `工作目录：${request.context.workingDirectory}\n`;
-        }
-
-        prompt += `\n请按以下JSON格式返回：\n`;
-        prompt += `{\n`;
-        prompt += `  "summary": "结果总结",\n`;
-        prompt += `  "insights": ["洞察1", "洞察2"],\n`;
-        prompt += `  "success": true/false,\n`;
-        prompt += `  "issues": [\n`;
-        prompt += `    {"severity": "warning|error|info", "message": "问题描述", "suggestion": "建议"}\n`;
-        prompt += `  ]\n`;
-        prompt += `}\n`;
-
-        return prompt;
-    }
-
-    /**
-     * 解析命令响应
-     */
-    private parseCommandResponse(content: string): CommandResponse {
-        try {
-            const match = content.match(/\{[\s\S]*\}/);
-            if (match) {
-                const parsed = JSON.parse(match[0]);
-                return {
-                    command: parsed.command || '',
-                    explanation: parsed.explanation || '',
-                    confidence: parsed.confidence || 0.5
-                };
-            }
-        } catch (error) {
-            this.logger.warn('Failed to parse command response as JSON', error);
-        }
-
-        // 备用解析
-        const lines = content.split('\n').map(l => l.trim()).filter(l => l);
-        return {
-            command: lines[0] || '',
-            explanation: lines.slice(1).join(' ') || 'AI生成的命令',
-            confidence: 0.5
-        };
-    }
-
-    /**
-     * 解析解释响应
-     */
-    private parseExplainResponse(content: string): ExplainResponse {
-        try {
-            const match = content.match(/\{[\s\S]*\}/);
-            if (match) {
-                const parsed = JSON.parse(match[0]);
-                return {
-                    explanation: parsed.explanation || '',
-                    breakdown: parsed.breakdown || [],
-                    examples: parsed.examples || []
-                };
-            }
-        } catch (error) {
-            this.logger.warn('Failed to parse explain response as JSON', error);
-        }
-
-        return {
-            explanation: content,
-            breakdown: []
-        };
-    }
-
-    /**
-     * 解析分析响应
-     */
-    private parseAnalysisResponse(content: string): AnalysisResponse {
-        try {
-            const match = content.match(/\{[\s\S]*\}/);
-            if (match) {
-                const parsed = JSON.parse(match[0]);
-                return {
-                    summary: parsed.summary || '',
-                    insights: parsed.insights || [],
-                    success: parsed.success !== false,
-                    issues: parsed.issues || []
-                };
-            }
-        } catch (error) {
-            this.logger.warn('Failed to parse analysis response as JSON', error);
-        }
-
-        return {
-            summary: content,
-            insights: [],
-            success: true
-        };
-    }
-
-    /**
-     * 获取默认系统提示
-     */
-    private getDefaultSystemPrompt(): string {
-        return `你是一个专业的终端命令助手，运行在 Tabby 终端中。
-
-## 核心能力
-你可以通过以下工具直接操作终端：
-- write_to_terminal: 向终端写入并执行命令
-- read_terminal_output: 读取终端输出
-- get_terminal_list: 获取所有终端列表
-- get_terminal_cwd: 获取当前工作目录
-- focus_terminal: 切换到指定索引的终端（需要参数 terminal_index）
-- get_terminal_selection: 获取终端中选中的文本
-
-## 重要规则
-1. 当用户请求执行命令（如"查看当前目录"、"列出文件"等），你必须使用 write_to_terminal 工具来执行
-2. **当用户请求切换终端（如"切换到终端0"、"打开终端4"等），你必须使用 focus_terminal 工具**
-3. 不要只是描述你"将要做什么"，而是直接调用工具执行
-4. 执行命令后，使用 read_terminal_output 读取结果并报告给用户
-5. 如果不确定当前目录或终端状态，先使用 get_terminal_cwd 或 get_terminal_list 获取信息
-6. **永远不要假装执行了操作，必须真正调用工具**
-
-## 示例
-用户："查看当前目录的文件"
-正确做法：调用 write_to_terminal 工具，参数 { "command": "dir", "execute": true }
-错误做法：仅回复文字"我将执行 dir 命令"
-
-用户："切换到终端4"
-正确做法：调用 focus_terminal 工具，参数 { "terminal_index": 4 }
-错误做法：仅回复文字"已切换到终端4"（不调用工具）`;
-    }
 }