@xagent-ai/cli 1.3.0 → 1.3.2

package/src/mcp.ts

@@ -1,10 +1,13 @@
 import { spawn, ChildProcess } from 'child_process';
 import { MCPServerConfig } from './types.js';
+import { getSingletonSession } from './session.js';
+import { output as logOutput } from './output-util.js';
+import { icons } from './theme.js';
 
 export interface MCPTool {
   name: string;
   description: string;
-  inputSchema: any;
+  inputSchema: Record<string, unknown>;
 }
 
 export class MCPServer {
@@ -44,9 +47,14 @@ export class MCPServer {
       await this.waitForTools(10000);
 
       this.isConnected = true;
-      console.log(`✅ MCP Server connected`);
+      const session = getSingletonSession();
+      if (session?.getIsSdkMode()) {
+        // SDK 模式下不输出
+      } else {
+        await logOutput('success', `MCP Server connected`);
+      }
     } catch (error) {
-      console.error(`❌ [mcp] Failed to connect MCP Server: ${error instanceof Error ? error.message : String(error)}`);
+      await logOutput('error', `[mcp] Failed to connect MCP Server`, { error: error instanceof Error ? error.message : String(error) });
       throw error;
     }
   }
@@ -60,7 +68,7 @@ export class MCPServer {
       return;  // Tools already loaded
     }
 
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, _reject) => {
       const checkInterval = 100;
       const startTime = Date.now();
 
@@ -70,14 +78,14 @@ export class MCPServer {
           resolve();
         } else if (Date.now() - startTime > timeoutMs) {
           clearInterval(checkInterval);
-          console.warn(`[MCP] Timeout waiting for tools (${timeoutMs}ms), proceeding anyway`);
+          logOutput('warning', `[MCP] Timeout waiting for tools (${timeoutMs}ms), proceeding anyway`);
           resolve();  // Don't reject, just proceed without tools
         } else {
           // Continue checking
         }
       };
 
-      const intervalId = setInterval(check, checkInterval);
+      const _intervalId = setInterval(check, checkInterval);
       check();  // Check immediately first
     });
   }
@@ -96,12 +104,12 @@ export class MCPServer {
       });
 
       this.process.on('error', (error) => {
-        console.error('MCP Server error:', error);
+        logOutput('error', 'MCP Server error', { error: error.message });
         reject(error);
       });
 
       this.process.on('exit', (code, signal) => {
-        console.log(`MCP Server exited with code ${code}, signal ${signal}`);
+        logOutput('info', `MCP Server exited with code ${code}, signal ${signal}`);
         this.isConnected = false;
       });
 
@@ -113,7 +121,7 @@ export class MCPServer {
 
       if (this.process.stderr) {
         this.process.stderr.on('data', (data) => {
-          console.error('MCP Server stderr:', data.toString());
+          logOutput('error', 'MCP Server stderr', { error: data.toString() });
         });
       }
 
@@ -140,7 +148,10 @@ export class MCPServer {
     }
 
     const transportType = this.getTransportType();
-    console.log(`Connecting to MCP Server at ${this.config.url} (${transportType})`);
+    const session = getSingletonSession();
+    if (!session?.getIsSdkMode()) {
+      console.log(`Connecting to MCP Server at ${this.config.url} (${transportType})`);
+    }
 
     // Build headers with auth token
     const headers: Record<string, string> = {
@@ -149,7 +160,8 @@ export class MCPServer {
       ...this.config.headers
     };
 
-    if (this.config.authToken) {
+    // Only add Authorization if not already present in headers
+    if (this.config.authToken && !headers['Authorization']) {
       if (this.config.authToken.startsWith('Bearer ')) {
         headers['Authorization'] = this.config.authToken;
       } else {
@@ -191,7 +203,8 @@ export class MCPServer {
         // which handles both regular JSON and SSE format responses
         await this.loadTools(headers);
       } catch (error: any) {
-        console.error(`HTTP connection failed: ${error.message}`);
+        const errorMsg = `HTTP connection failed: ${error.message}`;
+        await logOutput('error', errorMsg, { error: error.message });
         if (error.response) {
           console.error(`Response status: ${error.response.status}`);
           if (error.response.data?.message) {
@@ -247,6 +260,7 @@ export class MCPServer {
         const decoder = new TextDecoder();
         let buffer = '';
 
+        // eslint-disable-next-line no-constant-condition
         while (true) {
           const { done, value } = await reader.read();
           if (done) break;
@@ -260,7 +274,7 @@ export class MCPServer {
               try {
                 const data = JSON.parse(line.slice(6));
                 this.handleJsonRpcMessage(data);
-              } catch (e) {
+              } catch {
                 // Ignore parse errors
               }
             }
@@ -271,11 +285,11 @@ export class MCPServer {
       clearTimeout(timeoutId);
       const serverInfo = this.config.url || this.config.command || 'MCP server';
       if (error.name === 'AbortError') {
-        console.error(`\n❌ SSE connection timed out`);
+        console.error(`\n${icons.error} SSE connection timed out`);
         console.error(`   Server: ${serverInfo}`);
         console.error(`   The server is not responding. Please try again later.`);
       } else {
-        console.error(`\n❌ SSE connection failed`);
+        console.error(`\n${icons.error} SSE connection failed`);
         console.error(`   Server: ${serverInfo}`);
         console.error(`   ${error.message}`);
       }
@@ -308,6 +322,8 @@ export class MCPServer {
       this.handleToolsList(message.params);
     } else if (message.method === 'notifications/initialized') {
       console.log('MCP Server initialized');
+    } else if (message.method === 'notifications/tools_changed' || message.method === 'tools/list_changed') {
+      this.handleToolsChanged();
     }
   }
 
@@ -323,7 +339,53 @@ export class MCPServer {
         if (!tool.name || typeof tool.name !== 'string' || tool.name.trim() === '') continue;
         this.tools.set(tool.name, tool);
       }
-      console.log(`Loaded ${result.tools.length} tools from MCP Server`);
+      const session = getSingletonSession();
+      if (session?.getIsSdkMode()) {
+        // SDK 模式下不输出
+      } else {
+        console.log(`Loaded ${result.tools.length} tools from MCP Server`);
+      }
+    }
+  }
+
+  private async handleToolsChanged(): Promise<void> {
+    const session = getSingletonSession();
+    if (session && !session.getIsSdkMode()) {
+      console.log(`MCP Server tools changed, reloading...`);
+    }
+
+    const transportType = this.getTransportType();
+    if (transportType === 'http' || transportType === 'sse') {
+      try {
+        const headers: Record<string, string> = {
+          'Content-Type': 'application/json',
+          ...this.config.headers
+        };
+
+        if (this.config.authToken && !headers['Authorization']) {
+          if (this.config.authToken.startsWith('Bearer ')) {
+            headers['Authorization'] = this.config.authToken;
+          } else {
+            headers['Authorization'] = `Bearer ${this.config.authToken}`;
+          }
+        }
+
+        if (this.sessionId) {
+          headers['MCP-session-id'] = this.sessionId;
+        }
+
+        await this.loadTools(headers);
+
+        if (session && !session.getIsSdkMode()) {
+          console.log(`Reloaded ${this.tools.size} tools from MCP Server`);
+        }
+      } catch (error) {
+        if (session && !session.getIsSdkMode()) {
+          console.error(`Failed to reload tools: ${error instanceof Error ? error.message : String(error)}`);
+        }
+      }
+    } else {
+      await this.connectStdio();
     }
   }
 
@@ -387,12 +449,12 @@ export class MCPServer {
       } else if (resultData?.tools) {
         this.handleToolsList(resultData);
       } else if (resultData?.error) {
-        console.error(`\n❌ MCP server returned an error`);
+        console.error(`\n${icons.error} MCP server returned an error`);
         console.error(`   ${resultData.error.message || 'Unknown error'}`);
       }
     } catch (error: any) {
       const serverInfo = this.config.url || this.config.command || 'MCP server';
-      console.error(`\n❌ Failed to load MCP tools`);
+      console.error(`\n${icons.error} Failed to load MCP tools`);
       console.error(`   Server: ${serverInfo}`);
       console.error(`   ${error.message}`);
     }
@@ -436,7 +498,8 @@ export class MCPServer {
         ...this.config.headers
       };
 
-      if (this.config.authToken) {
+      // Only add Authorization if not already present in headers
+      if (this.config.authToken && !headers['Authorization']) {
         if (this.config.authToken.startsWith('Bearer ')) {
           headers['Authorization'] = this.config.authToken;
         } else {
@@ -482,26 +545,26 @@ export class MCPServer {
                 resultData = parsed;
                 break;
               }
-            } catch (e) {
+            } catch {
               continue;
             }
           }
         }
-        
+
         // Fallback: try to parse the last data block if no matching one found
         if (!resultData) {
           const dataMatch = responseStr.match(/data:({.*})/);
           if (dataMatch) {
             try {
               resultData = JSON.parse(dataMatch[1]);
-            } catch (e) {
+            } catch {
               throw new Error('Failed to parse SSE response');
             }
           } else if (!resultData) {
             // Try to parse the entire response as JSON
             try {
               resultData = JSON.parse(responseStr);
-            } catch (e) {
+            } catch {
               throw new Error('No valid data field found in SSE response');
             }
           }
@@ -728,3 +791,4 @@ export function getMCPManager(): MCPManager {
   }
   return mcpManagerInstance;
 }
+

package/src/memory.ts

@@ -2,7 +2,6 @@ import fs from 'fs/promises';
 import fsSync from 'fs';
 import path from 'path';
 import os from 'os';
-import { glob } from 'glob';
 import crypto from 'crypto';
 
 export interface MemoryFile {
@@ -35,7 +34,7 @@ export class MemoryManager {
 
   private getProjectMemoryPath(projectRoot: string): string {
     const hash = crypto.createHash('md5').update(projectRoot).digest('hex').substring(0, 16);
-    const sanitizedName = projectRoot.replace(/[:\\\/]/g, '_').replace(/[^a-zA-Z0-9_\-]/g, '');
+    const sanitizedName = projectRoot.replace(/[:/\\]/g, '_').replace(/[^a-zA-Z0-9_-]/g, '');
     const name = sanitizedName.length > 50 ? sanitizedName.substring(0, 50) : sanitizedName;
     return path.join(this.memoriesDir, `project_${name}_${hash}.md`);
   }
@@ -149,7 +148,7 @@ export class MemoryManager {
       }
     };
 
-    let maxIterations = 10;
+    const maxIterations = 10;
     let iterations = 0;
 
     while (importRegex.test(processedContent) && iterations < maxIterations) {
@@ -298,7 +297,7 @@ export class MemoryManager {
     try {
       const content = await fs.readFile(filePath, 'utf-8');
       return JSON.parse(content);
-    } catch (error) {
+    } catch {
       return null;
     }
   }

package/src/output-util.ts

@@ -0,0 +1,80 @@
+/**
+ * Unified Output Utility
+ * 
+ * Provides a centralized output function that automatically chooses between
+ * SDK adapter (JSON output) and console output based on the current mode.
+ */
+
+export type OutputType = 'info' | 'error' | 'success' | 'warning';
+
+let _sdkAdapter: any = null;
+let _isSdkMode: boolean = false;
+
+/**
+ * Initialize SDK mode (call this when session is available)
+ */
+export function initOutputMode(isSdkMode: boolean, adapter?: any): void {
+  _isSdkMode = isSdkMode;
+  _sdkAdapter = adapter;
+}
+
+/**
+ * Get current SDK mode status
+ */
+export function isSdkMode(): boolean {
+  return _isSdkMode;
+}
+
+/**
+ * Get current SDK adapter
+ */
+export function getSdkAdapter(): any {
+  return _sdkAdapter;
+}
+
+/**
+ * Unified output function that automatically chooses SDK or console
+ * @param type - Output type (info, error, success, warning)
+ * @param message - Message to output
+ * @param context - Optional context data (for error type)
+ */
+export async function output(type: OutputType, message: string, context?: Record<string, any>): Promise<void> {
+  // Try to use SDK adapter if available and in SDK mode
+  if (_isSdkMode && _sdkAdapter) {
+    try {
+      switch (type) {
+        case 'info':
+          _sdkAdapter.outputInfo(message);
+          break;
+        case 'error':
+          _sdkAdapter.outputError(message, context);
+          break;
+        case 'warning':
+          _sdkAdapter.outputWarning(message);
+          break;
+        case 'success':
+          _sdkAdapter.outputSuccess(message);
+          break;
+      }
+      return; // SDK output successful, don't use console
+    } catch {
+      // Fall through to console on error
+    }
+  }
+
+  // Console output
+  switch (type) {
+    case 'info':
+      console.log(message);
+      break;
+    case 'error':
+      console.error(message, context?.error || '');
+      break;
+    case 'warning':
+      console.warn(message);
+      break;
+    case 'success':
+      console.log(message);
+      break;
+  }
+}

package/src/retry.ts

@@ -132,7 +132,7 @@ export async function withRetry<T>(
   let lastError: Error | undefined;
 
   for (let attempt = 0; attempt <= mergedConfig.maxRetries; attempt++) {
-    const attemptStartTime = Date.now();
+    const _attemptStartTime = Date.now();
 
     try {
       const data = await fn();

package/src/ripgrep.ts

@@ -96,7 +96,7 @@ function execCommand(cmd: string, args: string[]): Promise<CmdResult> {
       resolve({ stdout, stderr, exitCode: code });
     });
 
-    child.on('error', (error) => {
+    child.on('error', (_error) => {
       resolve({ stdout, stderr, exitCode: null });
     });
   });
@@ -106,7 +106,7 @@ function execCommand(cmd: string, args: string[]): Promise<CmdResult> {
  * Download file from URL
  */
 async function downloadFile(url: string, dest: string): Promise<void> {
-  const { exec } = await import('child_process');
+  const { exec: _exec } = await import('child_process');
   const { finished } = await import('stream/promises');
   const { Readable } = await import('stream');
 
@@ -232,7 +232,9 @@ async function downloadTool(config: RgConfig | FdConfig, version: string): Promi
     try {
       if (existsSync(archivePath)) unlinkSync(archivePath);
       if (existsSync(extractDir)) rmSync(extractDir, { recursive: true });
-    } catch {}
+    } catch {
+      // Ignore cleanup errors
+    }
   }
 }