tabby-ai-assistant 1.0.12 → 1.0.13

package/src/types/provider.types.ts

@@ -2,6 +2,7 @@
  * AI提供商相关类型定义
  */
 
+import { Observable } from 'rxjs';
 import { ProviderCapability, HealthStatus, ValidationResult } from './ai.types';
 import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse } from './ai.types';
 
@@ -9,14 +10,18 @@ import { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequ
 export { ProviderCapability, HealthStatus, ValidationResult };
 export { ChatRequest, ChatResponse, CommandRequest, CommandResponse, ExplainRequest, ExplainResponse, AnalysisRequest, AnalysisResponse };
 
-// 认证配置
+// ==================== 认证配置 ====================
+
+export type AuthType = 'apiKey' | 'bearer' | 'basic' | 'oauth' | 'none';
+
 export interface AuthConfig {
-    type: 'apiKey' | 'bearer' | 'basic' | 'oauth' | 'none';
+    type: AuthType;
     credentials: Record<string, string>;
     requiresEncryption?: boolean;
 }
 
-// 提供商配置
+// ==================== 提供商配置 ====================
+
 export interface ProviderConfig {
     name: string;
     displayName: string;
@@ -32,111 +37,234 @@ export interface ProviderConfig {
     contextWindow?: number;  // 供应商上下文窗口限制
 }
 
-// 提供商信息
-export interface ProviderInfo {
-    name: string;
-    displayName: string;
-    version: string;
-    description: string;
-    capabilities: ProviderCapability[];
+// 提供商默认配置
+export interface ProviderDefaults {
+    baseURL: string;
+    model: string;
+    maxTokens: number;
+    temperature: number;
+    timeout: number;
+    retries: number;
+    contextWindow: number;
     authConfig: AuthConfig;
-    supportedModels: string[];
-    pricing?: {
-        type: 'free' | 'paid' | 'freemium';
-        currency: string;
-        unit: string;
-        costPerUnit?: number;
-    };
-    documentation?: string;
 }
 
-// 基础AI提供商接口
-export abstract class BaseAiProvider {
-    abstract readonly name: string;
-    abstract readonly displayName: string;
-    abstract readonly capabilities: ProviderCapability[];
-    abstract readonly authConfig: AuthConfig;
-
-    protected config: ProviderConfig | null = null;
-
-    /**
-     * 配置提供商
-     */
-    abstract configure(config: ProviderConfig): void;
-
-    /**
-     * 聊天功能
-     */
-    abstract chat(request: ChatRequest): Promise<ChatResponse>;
-
-    /**
-     * 生成命令
-     */
-    abstract generateCommand(request: CommandRequest): Promise<CommandResponse>;
+// 所有已知提供商及其默认配置
+export const PROVIDER_DEFAULTS: Record<string, ProviderDefaults> = {
+    openai: {
+        baseURL: 'https://api.openai.com/v1',
+        model: 'gpt-4',
+        maxTokens: 1000,
+        temperature: 0.7,
+        timeout: 30000,
+        retries: 3,
+        contextWindow: 128000,
+        authConfig: { type: 'bearer', credentials: {} }
+    },
+    anthropic: {
+        baseURL: 'https://api.anthropic.com',
+        model: 'claude-3-sonnet',
+        maxTokens: 1000,
+        temperature: 1.0,
+        timeout: 30000,
+        retries: 3,
+        contextWindow: 200000,
+        authConfig: { type: 'bearer', credentials: {} }
+    },
+    minimax: {
+        baseURL: 'https://api.minimaxi.com/anthropic',
+        model: 'MiniMax-M2',
+        maxTokens: 1000,
+        temperature: 1.0,
+        timeout: 30000,
+        retries: 3,
+        contextWindow: 128000,
+        authConfig: { type: 'bearer', credentials: {} }
+    },
+    glm: {
+        baseURL: 'https://open.bigmodel.cn/api/anthropic',
+        model: 'glm-4.6',
+        maxTokens: 1000,
+        temperature: 0.95,
+        timeout: 30000,
+        retries: 3,
+        contextWindow: 128000,
+        authConfig: { type: 'bearer', credentials: {} }
+    },
+    ollama: {
+        baseURL: 'http://localhost:11434/v1',
+        model: 'llama3.1',
+        maxTokens: 1000,
+        temperature: 0.7,
+        timeout: 30000,
+        retries: 3,
+        contextWindow: 8192,
+        authConfig: { type: 'none', credentials: {} }
+    },
+    vllm: {
+        baseURL: 'http://localhost:8000/v1',
+        model: 'meta-llama/Llama-3.1-8B',
+        maxTokens: 1000,
+        temperature: 0.7,
+        timeout: 30000,
+        retries: 3,
+        contextWindow: 8192,
+        authConfig: { type: 'bearer', credentials: {} }
+    },
+    'openai-compatible': {
+        baseURL: 'http://localhost:11434/v1',
+        model: 'gpt-3.5-turbo',
+        maxTokens: 1000,
+        temperature: 0.7,
+        timeout: 30000,
+        retries: 3,
+        contextWindow: 128000,
+        authConfig: { type: 'bearer', credentials: {} }
+    }
+};
 
+// 配置工具函数
+export namespace ProviderConfigUtils {
     /**
-     * 解释命令
+     * 使用默认值填充配置
      */
-    abstract explainCommand(request: ExplainRequest): Promise<ExplainResponse>;
+    export function fillDefaults(config: Partial<ProviderConfig>, providerName: string): ProviderConfig {
+        const defaults = PROVIDER_DEFAULTS[providerName];
+        if (!defaults) {
+            throw new Error(`Unknown provider: ${providerName}`);
+        }
 
-    /**
-     * 分析结果
-     */
-    abstract analyzeResult(request: AnalysisRequest): Promise<AnalysisResponse>;
+        return {
+            name: config.name || providerName,
+            displayName: config.displayName || providerName,
+            apiKey: config.apiKey,
+            baseURL: config.baseURL || defaults.baseURL,
+            model: config.model || defaults.model,
+            maxTokens: config.maxTokens ?? defaults.maxTokens,
+            temperature: config.temperature ?? defaults.temperature,
+            timeout: config.timeout ?? defaults.timeout,
+            retries: config.retries ?? defaults.retries,
+            authConfig: config.authConfig || defaults.authConfig,
+            enabled: config.enabled ?? true,
+            contextWindow: config.contextWindow ?? defaults.contextWindow
+        };
+    }
 
     /**
-     * 健康检查
+     * 检查配置是否完整（可用于API调用）
      */
-    abstract healthCheck(): Promise<HealthStatus>;
+    export function isConfigComplete(config: ProviderConfig): boolean {
+        return !!(
+            config.name &&
+            config.displayName &&
+            // API key 不是必需的（如本地服务）
+            (config.apiKey || config.authConfig?.type === 'none') &&
+            config.baseURL
+        );
+    }
 
     /**
-     * 验证配置
+     * 克隆配置（深拷贝，移除敏感信息）
      */
-    abstract validateConfig(): ValidationResult;
+    export function cloneConfig(config: ProviderConfig, maskApiKey = true): ProviderConfig {
+        const clone = { ...config };
+        if (maskApiKey && clone.apiKey) {
+            clone.apiKey = '***MASKED***';
+        }
+        return clone;
+    }
 
     /**
-     * 获取提供商信息
+     * 获取提供商默认配置
      */
-    getInfo(): ProviderInfo {
-        return {
-            name: this.name,
-            displayName: this.displayName,
-            version: '1.0.0',
-            description: `${this.displayName} AI Provider`,
-            capabilities: this.capabilities,
-            authConfig: this.authConfig,
-            supportedModels: this.config?.model ? [this.config.model] : []
-        };
+    export function getDefaults(providerName: string): ProviderDefaults | undefined {
+        return PROVIDER_DEFAULTS[providerName];
     }
 
     /**
-     * 检查是否支持指定能力
+     * 获取所有已知提供商名称
      */
-    supportsCapability(capability: ProviderCapability): boolean {
-        return this.capabilities.includes(capability);
+    export function getKnownProviders(): string[] {
+        return Object.keys(PROVIDER_DEFAULTS);
     }
 
     /**
-     * 获取当前配置
+     * 检查是否为已知提供商
      */
-    getConfig(): ProviderConfig | null {
-        return this.config;
+    export function isKnownProvider(name: string): boolean {
+        return name in PROVIDER_DEFAULTS;
     }
 }
 
-// 提供商管理器
+// ==================== 提供商信息 ====================
+
+export interface ProviderPricing {
+    type: 'free' | 'paid' | 'freemium';
+    currency: string;
+    unit: string;
+    costPerUnit?: number;
+}
+
+export interface ProviderInfo {
+    name: string;
+    displayName: string;
+    version: string;
+    description: string;
+    capabilities: ProviderCapability[];
+    authConfig: AuthConfig;
+    supportedModels: string[];
+    configured?: boolean;
+    lastHealthCheck?: { status: HealthStatus; timestamp: Date };
+    pricing?: ProviderPricing;
+    documentation?: string;
+    defaults?: ProviderDefaults;
+}
+
+// ==================== 基础AI提供商接口 ====================
+
+export interface IBaseAiProvider {
+    readonly name: string;
+    readonly displayName: string;
+    readonly capabilities: ProviderCapability[];
+    readonly authConfig: AuthConfig;
+
+    // 配置与状态
+    configure(config: ProviderConfig): void;
+    getConfig(): ProviderConfig | null;
+    isConfigured(): boolean;
+    isEnabled(): boolean;
+
+    // 核心功能
+    chat(request: ChatRequest): Promise<ChatResponse>;
+    chatStream(request: ChatRequest): Observable<any>;
+    generateCommand(request: CommandRequest): Promise<CommandResponse>;
+    explainCommand(request: ExplainRequest): Promise<ExplainResponse>;
+    analyzeResult(request: AnalysisRequest): Promise<AnalysisResponse>;
+
+    // 健康与验证
+    healthCheck(): Promise<HealthStatus>;
+    validateConfig(): ValidationResult;
+
+    // 信息查询
+    getInfo(): ProviderInfo;
+    supportsCapability(capability: ProviderCapability): boolean;
+}
+
+// ==================== 提供商管理器 ====================
+
 export interface ProviderManager {
-    registerProvider(provider: BaseAiProvider): void;
+    registerProvider(provider: IBaseAiProvider): void;
     unregisterProvider(name: string): void;
-    getProvider(name: string): BaseAiProvider | undefined;
-    getAllProviders(): BaseAiProvider[];
-    getActiveProvider(): BaseAiProvider | undefined;
+    getProvider(name: string): IBaseAiProvider | undefined;
+    getAllProviders(): IBaseAiProvider[];
+    getActiveProvider(): IBaseAiProvider | undefined;
     setActiveProvider(name: string): boolean;
     getProviderInfo(name: string): ProviderInfo | undefined;
     getAllProviderInfo(): ProviderInfo[];
 }
 
-// 提供商事件
+// ==================== 提供商事件 ====================
+
 export interface ProviderEvent {
     type: 'connected' | 'disconnected' | 'error' | 'config_changed' | 'health_changed';
     provider: string;
@@ -144,5 +272,8 @@ export interface ProviderEvent {
     data?: any;
 }
 
-// 提供商事件监听器
 export type ProviderEventListener = (event: ProviderEvent) => void;
+
+// ==================== 便利类型 ====================
+
+export type BaseAiProvider = IBaseAiProvider;

package/src/index.ts.backup

@@ -1,165 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-// Tabby modules
-import TabbyCoreModule, { ToolbarButtonProvider, ConfigProvider, HotkeyProvider } from 'tabby-core';
-import TabbyTerminalModule from 'tabby-terminal';
-import { SettingsTabProvider } from 'tabby-settings';
-
-// Core Services
-import { AiAssistantService } from './services/core/ai-assistant.service';
-import { AiProviderManagerService } from './services/core/ai-provider-manager.service';
-import { ConfigProviderService } from './services/core/config-provider.service';
-import { LoggerService } from './services/core/logger.service';
-
-// Providers
-import { BaseAiProvider } from './services/providers/base-provider.service';
-import { OpenAiProviderService } from './services/providers/openai-provider.service';
-import { AnthropicProviderService } from './services/providers/anthropic-provider.service';
-import { MinimaxProviderService } from './services/providers/minimax-provider.service';
-import { GlmProviderService } from './services/providers/glm-provider.service';
-import { OpenAiCompatibleProviderService } from './services/providers/openai-compatible.service';
-
-// Security Services
-import { SecurityValidatorService } from './services/security/security-validator.service';
-import { RiskAssessmentService } from './services/security/risk-assessment.service';
-import { PasswordManagerService } from './services/security/password-manager.service';
-import { ConsentManagerService } from './services/security/consent-manager.service';
-
-// Chat Services
-import { ChatSessionService } from './services/chat/chat-session.service';
-import { ChatHistoryService } from './services/chat/chat-history.service';
-import { CommandGeneratorService } from './services/chat/command-generator.service';
-
-// Terminal Services
-import { CommandAnalyzerService } from './services/terminal/command-analyzer.service';
-import { ContextMenuService } from './services/terminal/context-menu.service';
-import { HotkeyService } from './services/terminal/hotkey.service';
-
-// Tabby Providers (enabled for proper integration)
-
-// Components
-import { ChatInterfaceComponent } from './components/chat/chat-interface.component';
-import { ChatMessageComponent } from './components/chat/chat-message.component';
-import { ChatInputComponent } from './components/chat/chat-input.component';
-import { ChatSettingsComponent } from './components/chat/chat-settings.component';
-
-import { AiSettingsTabComponent } from './components/settings/ai-settings-tab.component';
-import { ProviderConfigComponent } from './components/settings/provider-config.component';
-import { SecuritySettingsComponent } from './components/settings/security-settings.component';
-import { GeneralSettingsComponent } from './components/settings/general-settings.component';
-
-import { RiskConfirmDialogComponent } from './components/security/risk-confirm-dialog.component';
-import { PasswordPromptComponent } from './components/security/password-prompt.component';
-import { ConsentDialogComponent } from './components/security/consent-dialog.component';
-
-import { CommandSuggestionComponent } from './components/terminal/command-suggestion.component';
-import { CommandPreviewComponent } from './components/terminal/command-preview.component';
-import { AiToolbarButtonComponent } from './components/terminal/ai-toolbar-button.component';
-
-import { LoadingSpinnerComponent } from './components/common/loading-spinner.component';
-import { ErrorMessageComponent } from './components/common/error-message.component';
-
-// Tabby Integration Providers (enabled for proper integration)
-import { AiToolbarButtonProvider } from './providers/tabby/ai-toolbar-button.provider';
-import { AiSettingsTabProvider } from './providers/tabby/ai-settings-tab.provider';
-import { AiConfigProvider } from './providers/tabby/ai-config.provider';
-import { AiHotkeyProvider } from './providers/tabby/ai-hotkey.provider';
-
-@NgModule({
-    imports: [
-        CommonModule,
-        FormsModule,
-        TabbyCoreModule,  // Enabled for Tabby integration
-        TabbyTerminalModule,  // Required for terminal integration
-        NgbModule
-    ],
-    providers: [
-        // Core Services
-        AiAssistantService,
-        AiProviderManagerService,
-        ConfigProviderService,
-        LoggerService,
-
-        // AI Providers
-        OpenAiProviderService,
-        AnthropicProviderService,
-        MinimaxProviderService,
-        GlmProviderService,
-        OpenAiCompatibleProviderService,
-
-        // Security Services
-        SecurityValidatorService,
-        RiskAssessmentService,
-        PasswordManagerService,
-        ConsentManagerService,
-
-        // Chat Services
-        ChatSessionService,
-        ChatHistoryService,
-        CommandGeneratorService,
-
-        // Terminal Services
-        CommandAnalyzerService,
-        ContextMenuService,
-        HotkeyService,
-
-        // Tabby Integration Providers (enabled for proper integration)
-        { provide: ToolbarButtonProvider, useClass: AiToolbarButtonProvider, multi: true },
-        { provide: SettingsTabProvider, useClass: AiSettingsTabProvider, multi: true },
-        { provide: ConfigProvider, useClass: AiConfigProvider, multi: true },
-        { provide: HotkeyProvider, useClass: AiHotkeyProvider, multi: true },
-        // { provide: TabContextMenuItemProvider, useClass: AiContextMenuProvider, multi: true }
-    ],
-    declarations: [
-        // Chat Components
-        ChatInterfaceComponent,
-        ChatMessageComponent,
-        ChatInputComponent,
-        ChatSettingsComponent,
-
-        // Settings Components
-        AiSettingsTabComponent,
-        ProviderConfigComponent,
-        SecuritySettingsComponent,
-        GeneralSettingsComponent,
-
-        // Security Components
-        RiskConfirmDialogComponent,
-        PasswordPromptComponent,
-        ConsentDialogComponent,
-
-        // Terminal Components
-        CommandSuggestionComponent,
-        CommandPreviewComponent,
-        AiToolbarButtonComponent,
-
-        // Common Components
-        LoadingSpinnerComponent,
-        ErrorMessageComponent
-    ],
-    entryComponents: [
-        ChatInterfaceComponent,
-        RiskConfirmDialogComponent,
-        PasswordPromptComponent,
-        ConsentDialogComponent,
-        CommandSuggestionComponent,
-        CommandPreviewComponent
-    ]
-})
-export default class AiAssistantModule {
-    constructor(
-        private app: any,
-        private aiService: AiAssistantService,
-        private config: ConfigProviderService
-    ) {
-        // Wait for Tabby to be ready
-        if (this.app && this.app.ready$) {
-            this.app.ready$.subscribe(() => {
-                this.aiService.initialize();
-            });
-        }
-    }
-}