@xagent-ai/cli 1.2.2 → 1.3.1

package/src/smart-approval.ts

@@ -1,9 +1,12 @@
-import inquirer from 'inquirer';
-import { AIClient, Message } from './ai-client.js';
+import { confirm } from '@clack/prompts';
+import { Message } from './ai-client/types.js';
+import { createAIClient, AIClientInterface } from './ai-client-factory.js';
 import { getConfigManager } from './config.js';
 import { AuthType } from './types.js';
 import { getLogger } from './logger.js';
 import { colors, icons } from './theme.js';
+import { getCancellationManager } from './cancellation.js';
+import { SdkOutputAdapter } from './sdk-output-adapter.js';
 
 const logger = getLogger();
 
@@ -14,7 +17,7 @@ export enum ApprovalDecision {
   APPROVED = 'approved',
   REJECTED = 'rejected',
   REQUIRES_CONFIRMATION = 'requires_confirmation',
-  AI_REVIEW = 'ai_review'
+  AI_REVIEW = 'ai_review',
 }
 
 /**
@@ -24,7 +27,7 @@ export enum RiskLevel {
   LOW = 'LOW',
   MEDIUM = 'MEDIUM',
   HIGH = 'HIGH',
-  CRITICAL = 'CRITICAL'
+  CRITICAL = 'CRITICAL',
 }
 
 /**
@@ -77,7 +80,7 @@ export class WhitelistChecker {
     'ask_user_question',
     'save_memory',
     'xml_escape',
-    'Skill'
+    'Skill',
   ]);
 
   /**
@@ -115,31 +118,31 @@ export class BlacklistChecker {
       pattern: /rm\s+-rf\s+\/$/,
       category: 'System destruction',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Delete root directory'
+      description: 'Delete root directory',
     },
     {
       pattern: /rm\s+-rf\s+(\/etc|\/usr|\/bin|\/sbin|\/lib|\/lib64)/,
       category: 'System destruction',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Delete system directories'
+      description: 'Delete system directories',
     },
     {
       pattern: /rm\s+-rf\s+.*\*/,
       category: 'System destruction',
       riskLevel: RiskLevel.HIGH,
-      description: 'Batch delete files'
+      description: 'Batch delete files',
     },
     {
       pattern: /(mkfs|format)\s+/,
       category: 'System destruction',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Format disk'
+      description: 'Format disk',
     },
     {
       pattern: /dd\s+.*of=\/dev\/(sd[a-z]|nvme[0-9]n[0-9])/,
       category: 'System destruction',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Overwrite disk data'
+      description: 'Overwrite disk data',
     },
 
     // Privilege escalation
@@ -147,25 +150,25 @@ export class BlacklistChecker {
       pattern: /chmod\s+777\s+/,
       category: 'Privilege escalation',
       riskLevel: RiskLevel.HIGH,
-      description: 'Set file permissions to 777'
+      description: 'Set file permissions to 777',
     },
     {
       pattern: /chmod\s+[45][0-9]{3}\s+/,
       category: 'Privilege escalation',
       riskLevel: RiskLevel.HIGH,
-      description: 'Set SUID/SGID permissions'
+      description: 'Set SUID/SGID permissions',
     },
     {
       pattern: /vi\s+\/etc\/sudoers/,
       category: 'Privilege escalation',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Modify sudo permissions'
+      description: 'Modify sudo permissions',
     },
     {
       pattern: /echo.*>>.*\/etc\/sudoers/,
       category: 'Privilege escalation',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Modify sudo permissions'
+      description: 'Modify sudo permissions',
     },
 
     // Data theft
@@ -173,31 +176,31 @@ export class BlacklistChecker {
       pattern: /cat\s+\/etc\/passwd/,
       category: 'Data theft',
       riskLevel: RiskLevel.HIGH,
-      description: 'Read password file'
+      description: 'Read password file',
     },
     {
       pattern: /cat\s+\/etc\/shadow/,
       category: 'Data theft',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Read shadow file'
+      description: 'Read shadow file',
     },
     {
       pattern: /cat\s+.*\/\.ssh\/id_rsa/,
       category: 'Data theft',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Read SSH private key'
+      description: 'Read SSH private key',
     },
     {
       pattern: /grep\s+-[rRi].*password/,
       category: 'Data theft',
       riskLevel: RiskLevel.HIGH,
-      description: 'Search for password information'
+      description: 'Search for password information',
     },
     {
       pattern: /(curl|wget).*\|(sh|bash|python|perl)/,
       category: 'Data theft',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Remote code execution'
+      description: 'Remote code execution',
     },
 
     // Network attacks
@@ -205,19 +208,19 @@ export class BlacklistChecker {
       pattern: /nmap\s+-[sS].*/,
       category: 'Network attacks',
       riskLevel: RiskLevel.MEDIUM,
-      description: 'Network scanning'
+      description: 'Network scanning',
     },
     {
       pattern: /nc\s+.*-l/,
       category: 'Network attacks',
       riskLevel: RiskLevel.HIGH,
-      description: 'Create network listener'
+      description: 'Create network listener',
     },
     {
       pattern: /iptables\s+-F/,
       category: 'Network attacks',
       riskLevel: RiskLevel.HIGH,
-      description: 'Clear firewall rules'
+      description: 'Clear firewall rules',
     },
 
     // Resource exhaustion
@@ -225,14 +228,14 @@ export class BlacklistChecker {
       pattern: /:\)\s*{\s*:\s*\|\s*:&\s*};/,
       category: 'Resource exhaustion',
       riskLevel: RiskLevel.CRITICAL,
-      description: 'Fork bomb'
+      description: 'Fork bomb',
     },
     {
       pattern: /while\s+true\s*;\s*do\s+.*done/,
       category: 'Resource exhaustion',
       riskLevel: RiskLevel.HIGH,
-      description: 'Infinite loop'
-    }
+      description: 'Infinite loop',
+    },
   ];
 
   /**
@@ -262,8 +265,8 @@ export class BlacklistChecker {
             pattern: /system-path/,
             category: 'System destruction',
             riskLevel: RiskLevel.HIGH,
-            description: 'Modify system files'
-          }
+            description: 'Modify system files',
+          },
         };
       }
     }
@@ -285,11 +288,11 @@ export class BlacklistChecker {
       '/boot',
       '/sys',
       '/proc',
-      '/dev'
+      '/dev',
     ];
 
     const normalizedPath = filePath.toLowerCase().replace(/\\/g, '/');
-    return systemPaths.some(sysPath => normalizedPath.startsWith(sysPath));
+    return systemPaths.some((sysPath) => normalizedPath.startsWith(sysPath));
   }
 
   /**
@@ -304,7 +307,7 @@ export class BlacklistChecker {
  * AI approval checker
  */
 export class AIApprovalChecker {
-  private aiClient: AIClient | null = null;
+  private aiClient: AIClientInterface | null = null;
   private isRemoteMode: boolean = false;
 
   constructor() {
@@ -325,24 +328,29 @@ export class AIApprovalChecker {
       // Remote mode: AI review handled by remote LLM, no local AIClient needed
       // Local mode: use local AIClient
       if (!this.isRemoteMode && authConfig.apiKey) {
-        this.aiClient = new AIClient(authConfig);
+        this.aiClient = createAIClient(authConfig);
       }
     } catch (error) {
-      logger.error('Failed to initialize AI approval checker', error instanceof Error ? error.message : String(error));
+      logger.error(
+        'Failed to initialize AI approval checker',
+        error instanceof Error ? error.message : String(error)
+      );
     }
   }
 
   /**
    * Use AI for intelligent review
    */
-  async check(context: ToolCallContext): Promise<{ approved: boolean; analysis: string; riskLevel: RiskLevel }> {
+  async check(
+    context: ToolCallContext
+  ): Promise<{ approved: boolean; analysis: string; riskLevel: RiskLevel }> {
     // In Remote mode, the remote LLM has already approved the tool_calls
     // Local AI review approves directly, no need to repeat
     if (this.isRemoteMode) {
       return {
         approved: true,
         analysis: 'Remote mode: tool approval handled by remote LLM',
-        riskLevel: RiskLevel.LOW
+        riskLevel: RiskLevel.LOW,
       };
     }
 
@@ -350,8 +358,9 @@ export class AIApprovalChecker {
       // If AI client is not initialized, default to medium risk, requires user confirmation
       return {
         approved: false,
-        analysis: 'AI review not available (no local LLM configured), requires manual user confirmation',
-        riskLevel: RiskLevel.MEDIUM
+        analysis:
+          'AI review not available (no local LLM configured), requires manual user confirmation',
+        riskLevel: RiskLevel.MEDIUM,
       };
     }
 
@@ -374,22 +383,27 @@ Please return results in JSON format:
   "approved": boolean,
   "riskLevel": "LOW" | "MEDIUM" | "HIGH" | "CRITICAL",
   "analysis": "Detailed analysis description"
-}`
+}`,
         },
         {
           role: 'user',
-          content: prompt
-        }
+          content: prompt,
+        },
       ];
 
-      const response = await this.aiClient.chatCompletion(messages, {
-        temperature: 0.3,
-        // maxTokens: 500
-      });
+      const controller = new AbortController();
+      const response = await getCancellationManager().withCancellation(
+        this.aiClient.chatCompletion(messages, {
+          temperature: 0.3,
+          signal: controller.signal,
+        }),
+        'smart-approval'
+      );
 
-      const content = typeof response.choices[0].message.content === 'string'
-        ? response.choices[0].message.content
-        : '{}';
+      const content =
+        typeof response.choices[0].message.content === 'string'
+          ? response.choices[0].message.content
+          : '{}';
 
       // Parse AI response
       const jsonMatch = content.match(/\{[\s\S]*\}/);
@@ -398,7 +412,7 @@ Please return results in JSON format:
         return {
           approved: result.approved || false,
           analysis: result.analysis || 'No detailed analysis',
-          riskLevel: result.riskLevel || RiskLevel.MEDIUM
+          riskLevel: result.riskLevel || RiskLevel.MEDIUM,
         };
       }
 
@@ -406,10 +420,22 @@ Please return results in JSON format:
       return {
         approved: false,
         analysis: 'Unable to parse AI response, requires manual confirmation',
-        riskLevel: RiskLevel.MEDIUM
+        riskLevel: RiskLevel.MEDIUM,
       };
     } catch (error: any) {
-      logger.error('AI approval check failed', error instanceof Error ? error.message : String(error));
+      // Check if it was cancelled by user first - don't log error for cancellations
+      const isCancelled = error.message === 'Operation cancelled by user' ||
+                         error.message.includes('cancelled') ||
+                         error.message.includes('aborted');
+
+      if (isCancelled) {
+        throw new Error('Operation cancelled by user');
+      }
+
+      logger.error(
+        'AI approval check failed',
+        error instanceof Error ? error.message : String(error)
+      );
 
       // In Remote mode, remote LLM already approved, local failure means auto-approve
       const configManager = getConfigManager();
@@ -420,14 +446,21 @@ Please return results in JSON format:
         return {
           approved: true,
           analysis: 'Remote mode: approved (remote LLM handled approval)',
-          riskLevel: RiskLevel.LOW
+          riskLevel: RiskLevel.LOW,
         };
       }
 
+      // If user cancelled the AI review, directly cancel the entire task
+      // instead of just canceling the AI review and continuing
+      if (isCancelled) {
+        throw new Error('Operation cancelled by user');
+      }
+
+      // Other errors require manual confirmation
       return {
         approved: false,
         analysis: `AI review failed: ${error.message}, requires manual confirmation`,
-        riskLevel: RiskLevel.MEDIUM
+        riskLevel: RiskLevel.MEDIUM,
       };
     }
   }
@@ -462,6 +495,8 @@ export class SmartApprovalEngine {
   private blacklistChecker: BlacklistChecker;
   private aiChecker: AIApprovalChecker;
   private debugMode: boolean;
+  private sdkAdapter: SdkOutputAdapter | null = null;
+  private isSdkMode: boolean = false;
 
   constructor(debugMode: boolean = false) {
     this.whitelistChecker = new WhitelistChecker();
@@ -470,6 +505,28 @@ export class SmartApprovalEngine {
     this.debugMode = debugMode;
   }
 
+  /**
+   * Set SDK mode and output adapter for SDK mode support
+   */
+  setSdkMode(enabled: boolean, adapter: SdkOutputAdapter | null): void {
+    this.isSdkMode = enabled;
+    this.sdkAdapter = adapter;
+  }
+
+  /**
+   * Check if in SDK mode
+   */
+  getIsSdkMode(): boolean {
+    return this.isSdkMode;
+  }
+
+  /**
+   * Get SDK adapter
+   */
+  getSdkAdapter(): SdkOutputAdapter | null {
+    return this.sdkAdapter;
+  }
+
   /**
    * Evaluate tool call
    */
@@ -485,7 +542,9 @@ export class SmartApprovalEngine {
     if (whitelistCheck) {
       const latency = Date.now() - startTime;
       if (this.debugMode) {
-        logger.debug(`[WhitelistChecker] Tool '${context.toolName}' in whitelist, latency: ${latency}ms`);
+        logger.debug(
+          `[WhitelistChecker] Tool '${context.toolName}' in whitelist, latency: ${latency}ms`
+        );
       }
 
       return {
@@ -493,7 +552,7 @@ export class SmartApprovalEngine {
         riskLevel: RiskLevel.LOW,
         detectionMethod: 'whitelist',
         description: `Tool '${context.toolName}' is in the whitelist, executing directly`,
-        latency
+        latency,
       };
     }
 
@@ -506,7 +565,9 @@ export class SmartApprovalEngine {
     if (blacklistCheck.matched && blacklistCheck.rule) {
       const latency = Date.now() - startTime;
       if (this.debugMode) {
-        logger.debug(`[BlacklistChecker] Matched rule: ${blacklistCheck.rule.description}, Risk: ${blacklistCheck.rule.riskLevel}, latency: ${latency}ms`);
+        logger.debug(
+          `[BlacklistChecker] Matched rule: ${blacklistCheck.rule.description}, Risk: ${blacklistCheck.rule.riskLevel}, latency: ${latency}ms`
+        );
       }
 
       return {
@@ -514,7 +575,7 @@ export class SmartApprovalEngine {
         riskLevel: blacklistCheck.rule.riskLevel,
         detectionMethod: 'blacklist',
         description: `Detected potentially risky operation: ${blacklistCheck.rule.description}`,
-        latency
+        latency,
       };
     }
 
@@ -527,30 +588,50 @@ export class SmartApprovalEngine {
     const latency = Date.now() - startTime;
 
     if (this.debugMode) {
-      logger.debug(`[AIApprovalChecker] AI review result: approved=${aiCheck.approved}, risk=${aiCheck.riskLevel}, latency: ${latency}ms`);
+      logger.debug(
+        `[AIApprovalChecker] AI review result: approved=${aiCheck.approved}, risk=${aiCheck.riskLevel}, latency: ${latency}ms`
+      );
     }
 
     return {
-      decision: aiCheck.approved ? ApprovalDecision.APPROVED : ApprovalDecision.REQUIRES_CONFIRMATION,
+      decision: aiCheck.approved
+        ? ApprovalDecision.APPROVED
+        : ApprovalDecision.REQUIRES_CONFIRMATION,
       riskLevel: aiCheck.riskLevel,
       detectionMethod: 'ai_review',
       description: aiCheck.analysis,
       latency,
-      aiAnalysis: aiCheck.analysis
+      aiAnalysis: aiCheck.analysis,
     };
   }
 
   /**
    * Request user confirmation
    */
-  async requestConfirmation(result: ApprovalResult): Promise<boolean> {
+  async requestConfirmation(
+    result: ApprovalResult,
+    toolName?: string,
+    toolParams?: Record<string, unknown>
+  ): Promise<boolean> {
+    // Check if in SDK mode with adapter
+    if (this.isSdkMode && this.sdkAdapter) {
+      return this.requestConfirmationSdk(result, toolName, toolParams);
+    }
+
+    // Regular TUI mode
     const separator = icons.separator.repeat(40);
     console.log('');
-    console.log(colors.warning(`${icons.warning} [Smart Mode] Detected potentially risky operation`));
+    console.log(
+      colors.warning(`${icons.warning} [Smart Mode] Detected potentially risky operation`)
+    );
     console.log(colors.border(separator));
     console.log('');
     console.log(colors.textMuted(`📊 Risk Level: ${this.getRiskLevelDisplay(result.riskLevel)}`));
-    console.log(colors.textMuted(`🔍 Detection Method: ${this.getDetectionMethodDisplay(result.detectionMethod)}`));
+    console.log(
+      colors.textMuted(
+        `🔍 Detection Method: ${this.getDetectionMethodDisplay(result.detectionMethod)}`
+      )
+    );
     console.log('');
 
     if (result.aiAnalysis) {
@@ -564,18 +645,56 @@ export class SmartApprovalEngine {
     console.log(colors.warning('Potentially risky operation detected, continue execution?'));
 
     try {
-      const { confirmed } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'confirmed',
-          message: 'Continue execution?',
-          default: false
-        }
-      ]);
+      const confirmed = await confirm({
+        message: 'Continue execution?',
+      });
 
-      return confirmed;
+      return confirmed === true;
     } catch (error) {
-      logger.error('Failed to get user confirmation', error instanceof Error ? error.message : String(error));
+      logger.error(
+        'Failed to get user confirmation',
+        error instanceof Error ? error.message : String(error)
+      );
+      return false;
+    }
+  }
+
+  /**
+   * Request user confirmation in SDK mode
+   */
+  private async requestConfirmationSdk(
+    result: ApprovalResult,
+    toolName?: string,
+    toolParams?: Record<string, unknown>
+  ): Promise<boolean> {
+    const requestId = `approval_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+
+    // Output approval request through SDK adapter
+    this.sdkAdapter!.outputApprovalRequest({
+      requestId,
+      toolName: toolName || 'unknown',
+      params: toolParams || {},
+      riskLevel: result.riskLevel,
+      description: result.description,
+      aiAnalysis: result.aiAnalysis
+    });
+
+    // Wait for SDK response using session
+    try {
+      const { getSingletonSession } = await import('./session.js');
+      const session = getSingletonSession();
+      if (!session) {
+        logger.error('SDK session not available');
+        return false;
+      }
+      const approved = await session.waitForApprovalResponse(requestId);
+      this.sdkAdapter!.outputApprovalResponse(requestId, approved);
+      return approved;
+    } catch (error) {
+      logger.error(
+        'Failed to get SDK approval response',
+        error instanceof Error ? error.message : String(error)
+      );
       return false;
     }
   }
@@ -588,7 +707,7 @@ export class SmartApprovalEngine {
       [RiskLevel.LOW]: colors.success('LOW'),
       [RiskLevel.MEDIUM]: colors.warning('MEDIUM'),
       [RiskLevel.HIGH]: colors.error('HIGH'),
-      [RiskLevel.CRITICAL]: colors.error('CRITICAL')
+      [RiskLevel.CRITICAL]: colors.error('CRITICAL'),
     };
     return displays[riskLevel];
   }
@@ -601,7 +720,7 @@ export class SmartApprovalEngine {
       whitelist: 'Whitelist rules',
       blacklist: 'Blacklist rules',
       ai_review: 'AI intelligent review',
-      manual: 'Manual review'
+      manual: 'Manual review',
     };
     return displays[method as keyof typeof displays] || method;
   }
@@ -624,4 +743,4 @@ export function getSmartApprovalEngine(debugMode: boolean = false): SmartApprova
     smartApprovalEngineInstance = new SmartApprovalEngine(debugMode);
   }
   return smartApprovalEngineInstance;
-}
+}