tabby-ai-assistant 1.0.13 → 1.0.16

package/src/services/core/toast.service.ts

@@ -1,106 +1,106 @@
-import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
-
-export interface ToastMessage {
-    id: string;
-    type: 'success' | 'error' | 'warning' | 'info';
-    message: string;
-    duration?: number;
-}
-
-@Injectable({ providedIn: 'root' })
-export class ToastService {
-    private toastSubject = new Subject<ToastMessage>();
-    toast$ = this.toastSubject.asObservable();
-
-    show(type: ToastMessage['type'], message: string, duration = 3000): void {
-        const id = `toast-${Date.now()}`;
-
-        // 确保容器存在
-        let container = document.getElementById('ai-toast-container');
-        if (!container) {
-            container = document.createElement('div');
-            container.id = 'ai-toast-container';
-            container.className = 'ai-toast-container';
-            container.style.cssText = `
-                position: fixed;
-                bottom: 20px;
-                right: 20px;
-                z-index: 99999;
-                display: flex;
-                flex-direction: column;
-                gap: 10px;
-                pointer-events: none;
-            `;
-            document.body.appendChild(container);
-        }
-
-        // 创建 Toast 元素
-        const toast = document.createElement('div');
-        toast.id = id;
-        toast.className = `ai-toast ai-toast-${type}`;
-        toast.style.cssText = `
-            padding: 12px 16px;
-            border-radius: 8px;
-            color: white;
-            font-size: 14px;
-            display: flex;
-            align-items: center;
-            gap: 8px;
-            animation: toastSlideIn 0.3s ease;
-            cursor: pointer;
-            box-shadow: 0 4px 12px rgba(0,0,0,0.3);
-            pointer-events: auto;
-            min-width: 200px;
-            max-width: 350px;
-            ${type === 'success' ? 'background: linear-gradient(135deg, #22c55e, #16a34a);' : ''}
-            ${type === 'error' ? 'background: linear-gradient(135deg, #ef4444, #dc2626);' : ''}
-            ${type === 'warning' ? 'background: linear-gradient(135deg, #f59e0b, #d97706);' : ''}
-            ${type === 'info' ? 'background: linear-gradient(135deg, #3b82f6, #2563eb);' : ''}
-        `;
-
-        const icon = type === 'success' ? '✓' : type === 'error' ? '✗' : type === 'warning' ? '⚠' : 'ℹ';
-        toast.innerHTML = `<span style="font-size: 16px;">${icon}</span><span>${message}</span>`;
-
-        toast.onclick = () => {
-            this.removeToast(toast);
-        };
-
-        container.appendChild(toast);
-
-        // 自动消失
-        setTimeout(() => {
-            this.removeToast(toast);
-        }, duration);
-
-        // 发射事件（兼容现有订阅）
-        this.toastSubject.next({ id, type, message, duration });
-    }
-
-    private removeToast(toast: HTMLElement): void {
-        if (toast && toast.parentNode) {
-            toast.style.animation = 'toastSlideOut 0.3s ease forwards';
-            setTimeout(() => {
-                if (toast.parentNode) {
-                    toast.remove();
-                }
-            }, 300);
-        }
-    }
-
-    success(message: string, duration = 3000): void {
-        this.show('success', message, duration);
-    }
-
-    error(message: string, duration = 5000): void {
-        this.show('error', message, duration);
-    }
-
-    warning(message: string, duration = 4000): void {
-        this.show('warning', message, duration);
-    }
-
-    info(message: string, duration = 3000): void {
-        this.show('info', message, duration);
-    }
-}
+import { Injectable } from '@angular/core';
+import { Subject } from 'rxjs';
+
+export interface ToastMessage {
+    id: string;
+    type: 'success' | 'error' | 'warning' | 'info';
+    message: string;
+    duration?: number;
+}
+
+@Injectable({ providedIn: 'root' })
+export class ToastService {
+    private toastSubject = new Subject<ToastMessage>();
+    toast$ = this.toastSubject.asObservable();
+
+    show(type: ToastMessage['type'], message: string, duration = 3000): void {
+        const id = `toast-${Date.now()}`;
+
+        // 确保容器存在
+        let container = document.getElementById('ai-toast-container');
+        if (!container) {
+            container = document.createElement('div');
+            container.id = 'ai-toast-container';
+            container.className = 'ai-toast-container';
+            container.style.cssText = `
+                position: fixed;
+                bottom: 20px;
+                right: 20px;
+                z-index: 99999;
+                display: flex;
+                flex-direction: column;
+                gap: 10px;
+                pointer-events: none;
+            `;
+            document.body.appendChild(container);
+        }
+
+        // 创建 Toast 元素
+        const toast = document.createElement('div');
+        toast.id = id;
+        toast.className = `ai-toast ai-toast-${type}`;
+        toast.style.cssText = `
+            padding: 12px 16px;
+            border-radius: 8px;
+            color: white;
+            font-size: 14px;
+            display: flex;
+            align-items: center;
+            gap: 8px;
+            animation: toastSlideIn 0.3s ease;
+            cursor: pointer;
+            box-shadow: 0 4px 12px rgba(0,0,0,0.3);
+            pointer-events: auto;
+            min-width: 200px;
+            max-width: 350px;
+            ${type === 'success' ? 'background: linear-gradient(135deg, #22c55e, #16a34a);' : ''}
+            ${type === 'error' ? 'background: linear-gradient(135deg, #ef4444, #dc2626);' : ''}
+            ${type === 'warning' ? 'background: linear-gradient(135deg, #f59e0b, #d97706);' : ''}
+            ${type === 'info' ? 'background: linear-gradient(135deg, #3b82f6, #2563eb);' : ''}
+        `;
+
+        const icon = type === 'success' ? '✓' : type === 'error' ? '✗' : type === 'warning' ? '⚠' : 'ℹ';
+        toast.innerHTML = `<span style="font-size: 16px;">${icon}</span><span>${message}</span>`;
+
+        toast.onclick = () => {
+            this.removeToast(toast);
+        };
+
+        container.appendChild(toast);
+
+        // 自动消失
+        setTimeout(() => {
+            this.removeToast(toast);
+        }, duration);
+
+        // 发射事件（兼容现有订阅）
+        this.toastSubject.next({ id, type, message, duration });
+    }
+
+    private removeToast(toast: HTMLElement): void {
+        if (toast && toast.parentNode) {
+            toast.style.animation = 'toastSlideOut 0.3s ease forwards';
+            setTimeout(() => {
+                if (toast.parentNode) {
+                    toast.remove();
+                }
+            }, 300);
+        }
+    }
+
+    success(message: string, duration = 3000): void {
+        this.show('success', message, duration);
+    }
+
+    error(message: string, duration = 5000): void {
+        this.show('error', message, duration);
+    }
+
+    warning(message: string, duration = 4000): void {
+        this.show('warning', message, duration);
+    }
+
+    info(message: string, duration = 3000): void {
+        this.show('info', message, duration);
+    }
+}

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

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Observable, from } from 'rxjs';
+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 { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, MessageRole } from '../../types/ai.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';
 
 /**
@@ -93,11 +93,119 @@ export class AnthropicProviderService extends BaseAiProvider {
     }
 
     /**
-     * 流式聊天功能 - 暂未实现，回退到非流式
+     * 流式聊天功能 - 支持工具调用事件
      */
-    chatStream(request: ChatRequest): Observable<any> {
-        // 回退到非流式
-        return from(this.chat(request));
+    chatStream(request: ChatRequest): Observable<StreamEvent> {
+        return new Observable<StreamEvent>((subscriber: Observer<StreamEvent>) => {
+            if (!this.client) {
+                const error = new Error('Anthropic client not initialized');
+                subscriber.next({ type: 'error', error: error.message });
+                subscriber.error(error);
+                return;
+            }
+
+            let currentToolId = '';
+            let currentToolName = '';
+            let currentToolInput = '';
+            let fullContent = '';
+
+            const abortController = new AbortController();
+
+            const runStream = async () => {
+                try {
+                    const stream = await this.client!.messages.stream({
+                        model: this.config?.model || 'claude-3-sonnet',
+                        max_tokens: request.maxTokens || 1000,
+                        system: request.systemPrompt || this.getDefaultSystemPrompt(),
+                        messages: this.transformMessages(request.messages),
+                        temperature: request.temperature || 1.0,
+                    });
+
+                    for await (const event of stream) {
+                        if (abortController.signal.aborted) break;
+
+                        const eventAny = event as any;
+                        this.logger.debug('Stream event', { type: event.type });
+
+                        // 处理文本增量
+                        if (event.type === 'content_block_delta' && eventAny.delta?.type === 'text_delta') {
+                            const textDelta = eventAny.delta.text;
+                            fullContent += textDelta;
+                            subscriber.next({
+                                type: 'text_delta',
+                                textDelta
+                            });
+                        }
+                        // 处理工具调用开始
+                        else if (event.type === 'content_block_start' && eventAny.content_block?.type === 'tool_use') {
+                            currentToolId = eventAny.content_block.id || `tool_${Date.now()}`;
+                            currentToolName = eventAny.content_block.name;
+                            currentToolInput = '';
+                            subscriber.next({
+                                type: 'tool_use_start',
+                                toolCall: {
+                                    id: currentToolId,
+                                    name: currentToolName,
+                                    input: {}
+                                }
+                            });
+                            this.logger.debug('Stream event', { type: 'tool_use_start', name: currentToolName });
+                        }
+                        // 处理工具调用参数
+                        else if (event.type === 'content_block_delta' && eventAny.delta?.type === 'input_json_delta') {
+                            currentToolInput += eventAny.delta.partial_json || '';
+                        }
+                        // 处理工具调用结束
+                        else if (event.type === 'content_block_stop') {
+                            if (currentToolId && currentToolName) {
+                                let parsedInput = {};
+                                try {
+                                    parsedInput = JSON.parse(currentToolInput || '{}');
+                                } catch (e) {
+                                    // 使用原始输入
+                                }
+                                subscriber.next({
+                                    type: 'tool_use_end',
+                                    toolCall: {
+                                        id: currentToolId,
+                                        name: currentToolName,
+                                        input: parsedInput
+                                    }
+                                });
+                                this.logger.debug('Stream event', { type: 'tool_use_end', name: currentToolName });
+                                currentToolId = '';
+                                currentToolName = '';
+                                currentToolInput = '';
+                            }
+                        }
+                    }
+
+                    subscriber.next({
+                        type: 'message_end',
+                        message: {
+                            id: this.generateId(),
+                            role: MessageRole.ASSISTANT,
+                            content: fullContent,
+                            timestamp: new Date()
+                        }
+                    });
+                    this.logger.debug('Stream event', { type: 'message_end', contentLength: fullContent.length });
+                    subscriber.complete();
+
+                } catch (error) {
+                    if ((error as any).name !== 'AbortError') {
+                        const errorMessage = `Anthropic stream failed: ${error instanceof Error ? error.message : String(error)}`;
+                        this.logger.error('Stream error', error);
+                        subscriber.next({ type: 'error', error: errorMessage });
+                        subscriber.error(new Error(errorMessage));
+                    }
+                }
+            };
+
+            runStream();
+
+            return () => abortController.abort();
+        });
     }
 
     async generateCommand(request: CommandRequest): Promise<CommandResponse> {
@@ -160,31 +268,19 @@ export class AnthropicProviderService 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 || 'claude-3-sonnet',
-                max_tokens: 1,
-                messages: [
-                    {
-                        role: 'user',
-                        content: 'Hi'
-                    }
-                ]
-            });
+    protected async sendTestRequest(request: ChatRequest): Promise<ChatResponse> {
+        if (!this.client) {
+            throw new Error('Anthropic 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 || 'claude-3-sonnet',
+            max_tokens: request.maxTokens || 1,
+            messages: this.transformMessages(request.messages),
+            temperature: request.temperature || 0
+        });
 
-        } catch (error) {
-            this.logger.error('Anthropic health check failed', error);
-            this.lastHealthCheck = { status: HealthStatus.UNHEALTHY, timestamp: new Date() };
-            return HealthStatus.UNHEALTHY;
-        }
+        return this.transformChatResponse(response);
     }
 
     validateConfig(): ValidationResult {

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 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 { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse, StreamEvent, MessageRole } from '../../types/ai.types';
 import { LoggerService } from '../core/logger.service';
 
 /**
@@ -60,16 +60,22 @@ export abstract class BaseAiProvider implements IBaseAiProvider {
      */
     async healthCheck(): Promise<HealthStatus> {
         try {
-            // 简单的健康检查：验证配置和连接
+            // 1. 验证配置
             const validation = this.validateConfig();
             if (!validation.valid) {
                 this.lastHealthCheck = { status: HealthStatus.UNHEALTHY, timestamp: new Date() };
                 return HealthStatus.UNHEALTHY;
             }
 
-            // TODO: 实际的网络健康检查
-            this.lastHealthCheck = { status: HealthStatus.HEALTHY, timestamp: new Date() };
-            return HealthStatus.HEALTHY;
+            // 2. 执行网络健康检查
+            const networkStatus = await this.performNetworkHealthCheck();
+
+            this.lastHealthCheck = {
+                status: networkStatus,
+                timestamp: new Date()
+            };
+
+            return networkStatus;
 
         } catch (error) {
             this.logger.error(`Health check failed for ${this.name}`, error);
@@ -78,6 +84,64 @@ export abstract class BaseAiProvider implements IBaseAiProvider {
         }
     }
 
+    /**
+     * 执行网络健康检查 - 发送测试请求
+     */
+    protected async performNetworkHealthCheck(): Promise<HealthStatus> {
+        try {
+            // 发送一个简单的测试请求
+            const testRequest: ChatRequest = {
+                messages: [{
+                    id: 'health-check',
+                    role: MessageRole.USER,
+                    content: 'Hi',
+                    timestamp: new Date()
+                }],
+                maxTokens: 1,
+                temperature: 0
+            };
+
+            const response = await this.withRetry(() => this.sendTestRequest(testRequest));
+
+            if (this.isSuccessfulResponse(response)) {
+                return HealthStatus.HEALTHY;
+            } else {
+                this.logger.warn(`Health check returned unsuccessful response for ${this.name}`, {
+                    response: this.sanitizeResponse(response)
+                });
+                return HealthStatus.DEGRADED;
+            }
+
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+
+            // 根据错误类型判断状态
+            if (errorMessage.includes('timeout') || errorMessage.includes('Timed out')) {
+                this.logger.warn(`Health check timed out for ${this.name}`);
+                return HealthStatus.DEGRADED;
+            }
+
+            if (errorMessage.includes('401') || errorMessage.includes('Unauthorized') ||
+                errorMessage.includes('invalid') || errorMessage.includes('API key')) {
+                this.logger.warn(`Health check authentication failed for ${this.name}`);
+                return HealthStatus.UNHEALTHY;
+            }
+
+            if (errorMessage.includes('429') || errorMessage.includes('rate limit')) {
+                this.logger.warn(`Health check rate limited for ${this.name}`);
+                return HealthStatus.DEGRADED;
+            }
+
+            this.logger.error(`Health check network error for ${this.name}`, error);
+            return HealthStatus.UNHEALTHY;
+        }
+    }
+
+    /**
+     * 发送测试请求 - 子类必须实现
+     */
+    protected abstract sendTestRequest(request: ChatRequest): Promise<ChatResponse>;
+
     /**
      * 验证配置 - 默认实现，子类可以重写
      */
@@ -194,7 +258,10 @@ export abstract class BaseAiProvider implements IBaseAiProvider {
                 break;
 
             case 'oauth':
-                // TODO: 实现OAuth认证
+                // OAuth 认证预留
+                // 当前无提供商使用此认证方式
+                // 如需实现，可参考 OAuth 2.0 Authorization Code Flow
+                this.logger.debug('OAuth authentication not implemented');
                 break;
         }
 
@@ -574,6 +641,22 @@ export abstract class BaseAiProvider implements IBaseAiProvider {
 5. 如果不确定当前目录或终端状态，先使用 get_terminal_cwd 或 get_terminal_list 获取信息
 6. **永远不要假装执行了操作，必须真正调用工具**
 
+## 命令执行策略
+### 快速命令（无需额外等待）
+- dir, ls, cd, pwd, echo, cat, type, mkdir, rm, copy, move
+- 这些命令通常在 500ms 内完成
+
+### 慢速命令（需要等待完整输出）
+- systeminfo, ipconfig, netstat: 等待 3-8 秒
+- npm, yarn, pip, docker: 等待 5-10 秒
+- git: 等待 3 秒以上
+- ping, tracert: 可能需要 10+ 秒
+
+**对于慢速命令**：
+1. 执行命令后，系统会自动等待
+2. 如果输出不完整，可以再次调用 read_terminal_output 获取更新的内容
+3. **不要猜测或假设命令输出，始终以实际读取到的输出为准**
+
 ## 示例
 用户："查看当前目录的文件"
 正确做法：调用 write_to_terminal 工具，参数 { "command": "dir", "execute": true }