tabby-ai-assistant 1.0.5 → 1.0.6

package/src/components/terminal/command-preview.component.ts

@@ -1,140 +1,13 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
 import { CommandResponse } from '../../types/ai.types';
 import { RiskLevel } from '../../types/security.types';
+import { TerminalManagerService, TerminalInfo } from '../../services/terminal/terminal-manager.service';
+import { LoggerService } from '../../services/core/logger.service';
 
 @Component({
     selector: 'app-command-preview',
-    template: `
-        <div class="command-preview" *ngIf="command">
-            <div class="preview-header">
-                <h4>
-                    <i class="icon-terminal"></i>
-                    命令预览
-                </h4>
-                <button class="btn-close" (click)="close()">
-                    <i class="icon-x"></i>
-                </button>
-            </div>
-
-            <div class="preview-content">
-                <!-- 风险级别 -->
-                <div class="risk-indicator" [ngClass]="'risk-' + riskLevel.toLowerCase()">
-                    <i [class]="getRiskIcon()"></i>
-                    <span>{{ getRiskText() }}</span>
-                </div>
-
-                <!-- 命令 -->
-                <div class="command-section">
-                    <label>将要执行的命令:</label>
-                    <div class="command-display">
-                        <code>{{ command.command }}</code>
-                        <button class="btn-copy" (click)="copyCommand()" title="复制">
-                            <i class="icon-copy"></i>
-                        </button>
-                    </div>
-                </div>
-
-                <!-- 解释 -->
-                <div class="explanation-section">
-                    <label>命令解释:</label>
-                    <p>{{ command.explanation }}</p>
-                </div>
-
-                <!-- 置信度 -->
-                <div class="confidence-section" *ngIf="command.confidence">
-                    <label>AI置信度:</label>
-                    <div class="confidence-meter">
-                        <div class="confidence-bar" [style.width.%]="command.confidence * 100"></div>
-                        <span class="confidence-text">{{ (command.confidence * 100).toFixed(0) }}%</span>
-                    </div>
-                </div>
-
-                <!-- 替代方案 -->
-                <div class="alternatives-section" *ngIf="command.alternatives && command.alternatives.length > 0">
-                    <label>替代方案:</label>
-                    <div class="alternatives-list">
-                        <div
-                            *ngFor="let alt of command.alternatives"
-                            class="alternative-item"
-                            (click)="selectAlternative(alt)">
-                            <code>{{ alt.command }}</code>
-                            <span class="alt-confidence">{{ (alt.confidence * 100).toFixed(0) }}%</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="preview-footer">
-                <button class="btn btn-secondary" (click)="close()">取消</button>
-                <button class="btn btn-primary" (click)="execute()">执行命令</button>
-            </div>
-        </div>
-    `,
-    styles: [`
-        .command-preview {
-            background: var(--ai-bg-primary);
-            border: 1px solid var(--ai-border);
-            border-radius: 0.5rem;
-            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-            max-width: 600px;
-        }
-        .preview-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 1rem;
-            background: var(--ai-bg-secondary);
-            border-bottom: 1px solid var(--ai-border);
-        }
-        .preview-content {
-            padding: 1rem;
-            max-height: 50vh;
-            overflow-y: auto;
-        }
-        .risk-indicator {
-            display: flex;
-            align-items: center;
-            gap: 0.5rem;
-            padding: 0.5rem;
-            margin-bottom: 1rem;
-            border-radius: 0.375rem;
-        }
-        .command-section, .explanation-section, .confidence-section, .alternatives-section {
-            margin-bottom: 1rem;
-        }
-        .command-display {
-            display: flex;
-            align-items: center;
-            gap: 0.5rem;
-            background: var(--ai-bg-secondary);
-            padding: 0.75rem;
-            border-radius: 0.375rem;
-        }
-        .alternatives-list {
-            background: var(--ai-bg-secondary);
-            border-radius: 0.375rem;
-            overflow: hidden;
-        }
-        .alternative-item {
-            padding: 0.75rem;
-            border-bottom: 1px solid var(--ai-border);
-            cursor: pointer;
-            transition: background-color 0.2s;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        .alternative-item:hover {
-            background-color: var(--ai-border);
-        }
-        .preview-footer {
-            padding: 1rem;
-            display: flex;
-            justify-content: flex-end;
-            gap: 0.5rem;
-            border-top: 1px solid var(--ai-border);
-        }
-    `]
+    templateUrl: './command-preview.component.html',
+    styleUrls: ['./command-preview.component.scss']
 })
 export class CommandPreviewComponent {
     @Input() command: CommandResponse | null = null;
@@ -143,43 +16,157 @@ export class CommandPreviewComponent {
     @Output() executed = new EventEmitter<CommandResponse>();
     @Output() closed = new EventEmitter<void>();
 
+    // 终端选择
+    terminals: TerminalInfo[] = [];
+    selectedTerminalIndex = 0;
+    showTerminalSelector = false;
+    executionStatus: 'idle' | 'executing' | 'success' | 'error' = 'idle';
+    statusMessage = '';
+
+    constructor(
+        private terminalManager: TerminalManagerService,
+        private logger: LoggerService
+    ) {
+        this.loadTerminals();
+    }
+
+    /**
+     * 加载可用终端列表
+     */
+    loadTerminals(): void {
+        this.terminals = this.terminalManager.getAllTerminalInfo();
+        // 默认选择当前活动终端
+        const activeIndex = this.terminals.findIndex(t => t.isActive);
+        if (activeIndex >= 0) {
+            this.selectedTerminalIndex = activeIndex;
+        }
+    }
+
     getRiskText(): string {
         switch (this.riskLevel) {
             case RiskLevel.LOW: return '低风险';
             case RiskLevel.MEDIUM: return '中风险';
             case RiskLevel.HIGH: return '高风险';
-            case RiskLevel.CRITICAL: return '极风险';
+            case RiskLevel.CRITICAL: return '极高风险';
             default: return '未知风险';
         }
     }
 
     getRiskIcon(): string {
         switch (this.riskLevel) {
-            case RiskLevel.LOW: return 'icon-check-circle';
-            case RiskLevel.MEDIUM: return 'icon-warning';
-            case RiskLevel.HIGH: return 'icon-alert-triangle';
-            case RiskLevel.CRITICAL: return 'icon-alert-octagon';
-            default: return 'icon-help-circle';
+            case RiskLevel.LOW: return 'fa fa-check-circle';
+            case RiskLevel.MEDIUM: return 'fa fa-exclamation-triangle';
+            case RiskLevel.HIGH: return 'fa fa-exclamation-circle';
+            case RiskLevel.CRITICAL: return 'fa fa-ban';
+            default: return 'fa fa-question-circle';
         }
     }
 
+    /**
+     * 复制命令到剪贴板
+     */
     copyCommand(): void {
         if (this.command) {
             navigator.clipboard.writeText(this.command.command);
+            this.statusMessage = '已复制到剪贴板';
+            setTimeout(() => this.statusMessage = '', 2000);
         }
     }
 
+    /**
+     * 执行命令到终端
+     */
     execute(): void {
-        if (this.command) {
-            this.executed.emit(this.command);
+        if (!this.command) return;
+
+        // 检查是否有可用终端
+        if (!this.terminalManager.hasTerminal()) {
+            this.executionStatus = 'error';
+            this.statusMessage = '没有可用的终端，请先打开一个终端标签';
+            return;
         }
+
+        this.executionStatus = 'executing';
+        this.statusMessage = '正在执行...';
+
+        try {
+            // 如果选择了特定终端，先切换到该终端
+            if (this.selectedTerminalIndex >= 0 && this.terminals.length > 0) {
+                this.terminalManager.focusTerminal(this.selectedTerminalIndex);
+            }
+
+            // 发送命令到终端
+            const success = this.terminalManager.sendCommand(this.command.command, true);
+
+            if (success) {
+                this.executionStatus = 'success';
+                this.statusMessage = '命令已发送到终端';
+                this.logger.info('Command executed', { command: this.command.command });
+
+                // 触发执行事件
+                this.executed.emit(this.command);
+
+                // 2秒后关闭预览
+                setTimeout(() => this.close(), 2000);
+            } else {
+                this.executionStatus = 'error';
+                this.statusMessage = '发送命令失败';
+            }
+        } catch (error) {
+            this.executionStatus = 'error';
+            this.statusMessage = `执行错误: ${error instanceof Error ? error.message : '未知错误'}`;
+            this.logger.error('Failed to execute command', error);
+        }
+    }
+
+    /**
+     * 仅插入命令（不执行）
+     */
+    insertOnly(): void {
+        if (!this.command) return;
+
+        if (!this.terminalManager.hasTerminal()) {
+            this.statusMessage = '没有可用的终端';
+            return;
+        }
+
+        const success = this.terminalManager.sendCommand(this.command.command, false);
+        if (success) {
+            this.statusMessage = '命令已插入终端（未执行）';
+            setTimeout(() => this.close(), 1500);
+        }
+    }
+
+    /**
+     * 切换终端选择器
+     */
+    toggleTerminalSelector(): void {
+        this.loadTerminals();
+        this.showTerminalSelector = !this.showTerminalSelector;
     }
 
+    /**
+     * 选择终端
+     */
+    selectTerminal(index: number): void {
+        this.selectedTerminalIndex = index;
+        this.showTerminalSelector = false;
+    }
+
+    /**
+     * 关闭预览
+     */
     close(): void {
         this.closed.emit();
     }
 
+    /**
+     * 选择替代命令
+     */
     selectAlternative(alt: any): void {
-        // TODO: 实现选择替代方案
+        if (this.command && alt) {
+            this.command = { ...this.command, command: alt.command || alt };
+        }
     }
 }
+

package/src/components/terminal/command-suggestion.component.html

@@ -0,0 +1,23 @@
+<div class="command-suggestion" *ngIf="suggestions.length > 0">
+    <div class="suggestion-header">
+        <i class="fa fa-lightbulb-o"></i>
+        <span>AI命令建议</span>
+        <button class="btn-close" (click)="close()">
+            <i class="fa fa-times"></i>
+        </button>
+    </div>
+    <div class="suggestion-list">
+        <div *ngFor="let suggestion of suggestions" class="suggestion-item" (click)="selectSuggestion(suggestion)">
+            <div class="suggestion-command">
+                <code>{{ suggestion.command }}</code>
+            </div>
+            <div class="suggestion-explanation">
+                {{ suggestion.explanation }}
+            </div>
+            <div class="suggestion-confidence">
+                <span class="confidence-bar" [style.width.%]="suggestion.confidence * 100"></span>
+                <span class="confidence-text">{{ (suggestion.confidence * 100).toFixed(0) }}%</span>
+            </div>
+        </div>
+    </div>
+</div>

package/src/components/terminal/command-suggestion.component.scss

@@ -0,0 +1,55 @@
+.command-suggestion {
+    background: var(--ai-bg-primary);
+    border: 1px solid var(--ai-border);
+    border-radius: 0.5rem;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+    max-width: 600px;
+    margin: 0.5rem auto;
+}
+
+.suggestion-header {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.75rem 1rem;
+    background: var(--ai-bg-secondary);
+    border-bottom: 1px solid var(--ai-border);
+}
+
+.suggestion-list {
+    max-height: 300px;
+    overflow-y: auto;
+}
+
+.suggestion-item {
+    padding: 1rem;
+    border-bottom: 1px solid var(--ai-border);
+    cursor: pointer;
+    transition: background-color 0.2s;
+}
+
+.suggestion-item:hover {
+    background-color: var(--ai-bg-secondary);
+}
+
+.suggestion-item:last-child {
+    border-bottom: none;
+}
+
+.suggestion-command {
+    font-family: monospace;
+    margin-bottom: 0.5rem;
+}
+
+.suggestion-confidence {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    margin-top: 0.5rem;
+}
+
+.confidence-bar {
+    height: 4px;
+    background: var(--ai-primary);
+    border-radius: 2px;
+}

package/src/components/terminal/command-suggestion.component.ts

@@ -5,83 +5,8 @@ import { CommandResponse } from '../../types/ai.types';
 
 @Component({
     selector: 'app-command-suggestion',
-    template: `
-        <div class="command-suggestion" *ngIf="suggestions.length > 0">
-            <div class="suggestion-header">
-                <i class="icon-lightbulb"></i>
-                <span>AI命令建议</span>
-                <button class="btn-close" (click)="close()">
-                    <i class="icon-x"></i>
-                </button>
-            </div>
-            <div class="suggestion-list">
-                <div
-                    *ngFor="let suggestion of suggestions"
-                    class="suggestion-item"
-                    (click)="selectSuggestion(suggestion)">
-                    <div class="suggestion-command">
-                        <code>{{ suggestion.command }}</code>
-                    </div>
-                    <div class="suggestion-explanation">
-                        {{ suggestion.explanation }}
-                    </div>
-                    <div class="suggestion-confidence">
-                        <span class="confidence-bar" [style.width.%]="suggestion.confidence * 100"></span>
-                        <span class="confidence-text">{{ (suggestion.confidence * 100).toFixed(0) }}%</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    `,
-    styles: [`
-        .command-suggestion {
-            background: var(--ai-bg-primary);
-            border: 1px solid var(--ai-border);
-            border-radius: 0.5rem;
-            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-            max-width: 600px;
-            margin: 0.5rem auto;
-        }
-        .suggestion-header {
-            display: flex;
-            align-items: center;
-            gap: 0.5rem;
-            padding: 0.75rem 1rem;
-            background: var(--ai-bg-secondary);
-            border-bottom: 1px solid var(--ai-border);
-        }
-        .suggestion-list {
-            max-height: 300px;
-            overflow-y: auto;
-        }
-        .suggestion-item {
-            padding: 1rem;
-            border-bottom: 1px solid var(--ai-border);
-            cursor: pointer;
-            transition: background-color 0.2s;
-        }
-        .suggestion-item:hover {
-            background-color: var(--ai-bg-secondary);
-        }
-        .suggestion-item:last-child {
-            border-bottom: none;
-        }
-        .suggestion-command {
-            font-family: monospace;
-            margin-bottom: 0.5rem;
-        }
-        .suggestion-confidence {
-            display: flex;
-            align-items: center;
-            gap: 0.5rem;
-            margin-top: 0.5rem;
-        }
-        .confidence-bar {
-            height: 4px;
-            background: var(--ai-primary);
-            border-radius: 2px;
-        }
-    `]
+    templateUrl: './command-suggestion.component.html',
+    styleUrls: ['./command-suggestion.component.scss']
 })
 export class CommandSuggestionComponent implements OnInit, OnDestroy {
     @Input() inputText = '';

package/src/index-minimal.ts

@@ -0,0 +1,32 @@
+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';
+
+@NgModule({
+    imports: [
+        CommonModule,
+        FormsModule,
+        TabbyCoreModule,
+        TabbyTerminalModule,
+        NgbModule
+    ],
+    providers: [
+        { provide: ToolbarButtonProvider, useClass: (class {}), multi: true },
+        { provide: SettingsTabProvider, useClass: (class {}), multi: true },
+        { provide: ConfigProvider, useClass: (class {}), multi: true },
+        { provide: HotkeyProvider, useClass: (class {}), multi: true }
+    ],
+    declarations: [],
+    entryComponents: []
+})
+export default class AiAssistantModule {
+    constructor() {
+        console.log('AiAssistantModule initialized (minimal version)');
+    }
+}