tabby-ai-assistant 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tabby-ai-assistant",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "description": "Tabby终端AI助手插件 - 支持多AI提供商（OpenAI、Anthropic、Minimax、GLM、Ollama、vLLM）",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",

package/src/services/core/config-provider.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Subject, Observable } from 'rxjs';
 import { LoggerService } from './logger.service';
 import { SecurityConfig } from '../../types/security.types';
-import { ProviderConfig } from '../../types/provider.types';
+import { ProviderConfig, PROVIDER_DEFAULTS, ProviderConfigUtils } from '../../types/provider.types';
 import { ContextConfig } from '../../types/ai.types';
 
 /**
@@ -217,17 +217,9 @@ export class ConfigProviderService {
         if (contextWindow && contextWindow > 0) {
             return contextWindow;
         }
-        // 返回供应商默认值
-        const defaults: { [key: string]: number } = {
-            'openai': 128000,
-            'anthropic': 200000,
-            'minimax': 128000,
-            'glm': 128000,
-            'ollama': 8192,
-            'vllm': 8192,
-            'openai-compatible': 128000
-        };
-        return defaults[activeProvider] || 200000;
+        // 从统一默认值获取
+        const defaults = PROVIDER_DEFAULTS[activeProvider];
+        return defaults?.contextWindow || 200000;
     }
 
     /**

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

@@ -208,10 +208,6 @@ export class AnthropicProviderService extends BaseAiProvider {
         return result;
     }
 
-    protected getDefaultBaseURL(): string {
-        return 'https://api.anthropic.com';
-    }
-
     protected transformMessages(messages: any[]): any[] {
         return messages.map(msg => ({
             role: msg.role,
@@ -237,172 +233,4 @@ export class AnthropicProviderService extends BaseAiProvider {
             } : undefined
         };
     }
-
-    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"（不调用工具）`;
-    }
 }

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

@@ -1,15 +1,15 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { BaseAiProvider as IBaseAiProvider, ProviderConfig, AuthConfig, ProviderCapability, HealthStatus, ValidationResult } from '../../types/provider.types';
+import { IBaseAiProvider, ProviderConfig, AuthConfig, ProviderCapability, HealthStatus, ValidationResult, ProviderInfo, PROVIDER_DEFAULTS } from '../../types/provider.types';
 import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, StreamEvent } from '../../types/ai.types';
 import { LoggerService } from '../core/logger.service';
 
 /**
  * 基础AI提供商抽象类
- * 所有AI提供商都应该继承此类
+ * 所有AI提供商都应该实现此接口
  */
 @Injectable()
-export abstract class BaseAiProvider extends IBaseAiProvider {
+export abstract class BaseAiProvider implements IBaseAiProvider {
     abstract readonly name: string;
     abstract readonly displayName: string;
     abstract readonly capabilities: ProviderCapability[];
@@ -19,9 +19,7 @@ export abstract class BaseAiProvider extends IBaseAiProvider {
     protected isInitialized = false;
     protected lastHealthCheck: { status: HealthStatus; timestamp: Date } | null = null;
 
-    constructor(protected logger: LoggerService) {
-        super();
-    }
+    constructor(protected logger: LoggerService) {}
 
     /**
      * 配置提供商
@@ -135,7 +133,7 @@ export abstract class BaseAiProvider extends IBaseAiProvider {
     /**
      * 获取提供商信息
      */
-    getInfo(): any {
+    getInfo(): ProviderInfo {
         return {
             name: this.name,
             displayName: this.displayName,
@@ -145,7 +143,7 @@ export abstract class BaseAiProvider extends IBaseAiProvider {
             authConfig: this.authConfig,
             supportedModels: this.config?.model ? [this.config.model] : [],
             configured: this.isInitialized,
-            lastHealthCheck: this.lastHealthCheck
+            lastHealthCheck: this.lastHealthCheck ?? undefined
         };
     }
 
@@ -306,19 +304,40 @@ export abstract class BaseAiProvider extends IBaseAiProvider {
      * 获取基础URL
      */
     protected getBaseURL(): string {
-        return this.config?.baseURL || this.getDefaultBaseURL();
+        if (this.config?.baseURL) {
+            return this.config.baseURL;
+        }
+        // 从统一默认值获取
+        const defaults = PROVIDER_DEFAULTS[this.name];
+        return defaults?.baseURL || '';
+    }
+
+    /**
+     * 获取默认模型
+     */
+    protected getDefaultModel(): string {
+        if (this.config?.model) {
+            return this.config.model;
+        }
+        // 从统一默认值获取
+        const defaults = PROVIDER_DEFAULTS[this.name];
+        return defaults?.model || 'default';
     }
 
     /**
-     * 获取默认基础URL - 子类必须实现
+     * 获取默认超时时间
      */
-    protected abstract getDefaultBaseURL(): string;
+    protected getDefaultTimeout(): number {
+        const defaults = PROVIDER_DEFAULTS[this.name];
+        return defaults?.timeout || 30000;
+    }
 
     /**
-     * 获取默认模型 - 子类可以重写
+     * 获取默认重试次数
      */
-    protected getDefaultModel(): string {
-        return this.config?.model || 'default';
+    protected getDefaultRetries(): number {
+        const defaults = PROVIDER_DEFAULTS[this.name];
+        return defaults?.retries || 3;
     }
 
     /**
@@ -372,4 +391,196 @@ export abstract class BaseAiProvider extends IBaseAiProvider {
         }
         return 'Unknown error';
     }
+
+    // ==================== 通用命令处理方法 ====================
+
+    /**
+     * 构建命令生成提示 - 通用实现
+     */
+    protected 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;
+    }
+
+    /**
+     * 构建命令解释提示 - 通用实现
+     */
+    protected 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;
+    }
+
+    /**
+     * 构建结果分析提示 - 通用实现
+     */
+    protected 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;
+    }
+
+    /**
+     * 解析命令响应 - 通用实现
+     */
+    protected 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
+        };
+    }
+
+    /**
+     * 解析解释响应 - 通用实现
+     */
+    protected 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: []
+        };
+    }
+
+    /**
+     * 解析分析响应 - 通用实现
+     */
+    protected 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
+        };
+    }
+
+    /**
+     * 获取默认系统提示 - 子类可重写
+     */
+    protected 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"（不调用工具）`;
+    }
 }