@xagent-ai/cli 1.3.1 → 1.3.3

package/src/checkpoint.ts

@@ -6,6 +6,7 @@ import { promisify } from 'util';
 import crypto from 'crypto';
 import { Checkpoint, ChatMessage, ToolCall } from './types.js';
 import { output as logOutput } from './output-util.js';
+import { icons } from './theme.js';
 
 const execAsync = promisify(exec);
 
@@ -95,7 +96,7 @@ export class CheckpointManager {
     this.checkpoints.set(checkpointId, checkpoint);
     await this.cleanupOldCheckpoints();
 
-    console.log(`�?Checkpoint created: ${checkpointId}`);
+    console.log(`${icons.success} Checkpoint created: ${checkpointId}`);
     await logOutput('success', `Checkpoint created: ${checkpointId}`);
     return checkpoint;
   }
@@ -130,7 +131,7 @@ export class CheckpointManager {
 
     await this.restoreGitSnapshot(checkpointId);
 
-    console.log('�?Checkpoint restored successfully');
+    console.log(`${icons.success} Checkpoint restored successfully`);
     await logOutput('success', `Checkpoint restored successfully: ${checkpointId}`);
   }
 
@@ -172,7 +173,7 @@ export class CheckpointManager {
       }
 
       this.checkpoints.delete(checkpointId);
-      console.log(`�?Checkpoint deleted: ${checkpointId}`);
+      console.log(`${icons.success} Checkpoint deleted: ${checkpointId}`);
       await logOutput('success', `Checkpoint deleted: ${checkpointId}`);
     } catch (error) {
       console.error('Failed to delete checkpoint:', error);
@@ -215,7 +216,7 @@ export class CheckpointManager {
         this.checkpoints.delete(checkpoint.id);
       }
 
-      console.log('�?Checkpoint data cleaned up');
+      console.log(`${icons.success} Checkpoint data cleaned up`);
       await logOutput('success', 'Checkpoint data cleaned up');
     } catch (error) {
       console.error('Failed to cleanup checkpoint data:', error);
@@ -236,7 +237,7 @@ export class CheckpointManager {
       await fs.rm(this.snapshotsDir, { recursive: true, force: true });
       await fs.rm(this.checkpointsDir, { recursive: true, force: true });
       this.checkpoints.clear();
-      console.log('�?Checkpoint data cleaned up');
+      console.log(`${icons.success} Checkpoint data cleaned up`);
     } catch (error) {
       console.error('Failed to cleanup checkpoint data:', error);
     }

package/src/cli.ts

@@ -57,6 +57,16 @@ setConfigProvider(() => {
   };
 });
 
+// Helper function to disconnect all MCP servers and exit
+function disconnectAndExit(mcpManager: any, code: number): void {
+  try {
+    mcpManager.disconnectAllServers();
+  } catch {
+    // Ignore cleanup errors
+  }
+  process.exit(code);
+}
+
 const program = new Command();
 
 /**
@@ -401,7 +411,7 @@ program
           console.log('');
         });
       }
-      process.exit(0);
+      disconnectAndExit(mcpManager, 0);
     } else if (options.get) {
       const server = mcpManager.getServer(options.get);
 
@@ -410,7 +420,8 @@ program
         console.log(colors.error(`MCP server '${options.get}' not found`));
         console.log(colors.textMuted('Use "xagent mcp --list" to see all configured servers'));
         console.log('');
-        process.exit(1);
+        disconnectAndExit(mcpManager, 1);
+        return;
       }
 
       const config = (server as any).config;
@@ -452,7 +463,7 @@ program
       }
 
       console.log('');
-      process.exit(0);
+      disconnectAndExit(mcpManager, 0);
     } else if (options.add !== undefined) {
       // Check if running in non-interactive mode (transport and required params provided)
       const hasTransport = options.transport;
@@ -562,12 +573,12 @@ program
             console.log(colors.success(`✅ MCP server '${name}' added successfully`));
           }
           console.log('');
-          process.exit(0);
+          disconnectAndExit(mcpManager, 0);
         } catch (error: any) {
           console.log('');
           console.log(colors.error(`Failed to add MCP server: ${error.message}`));
           console.log('');
-          process.exit(1);
+          disconnectAndExit(mcpManager, 1);
         }
       } else {
         // Interactive mode
@@ -751,14 +762,14 @@ program
         console.log('');
         console.log(colors.success(`MCP server ${options.remove} removed successfully`));
         console.log('');
-        process.exit(0);
+        disconnectAndExit(mcpManager, 0);
       } catch (error: any) {
         const { message, suggestion } = formatError(error);
         console.log('');
         console.log(colors.error(`Failed to remove MCP server: ${message}`));
         console.log(colors.textMuted(suggestion));
         console.log('');
-        process.exit(1);
+        disconnectAndExit(mcpManager, 1);
       }
     } else {
       console.log('');

package/src/context-compressor.ts

@@ -898,7 +898,7 @@ export class ContextCompressor {
       } else {
         // No user message in kept messages (rare case)
         // Insert summary as a user message, then add all kept messages
-        // This ensures valid message order: user �?assistant �?tool �?tool...
+        // This ensures valid message order: user → assistant → tool → tool...
         compressedMessages.push({
           role: 'user',
           content: `[Conversation Summary - ${messagesToSummarize.length} messages compressed]\n\n${summary}`,

package/src/mcp.ts

@@ -2,6 +2,7 @@ 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;
@@ -50,10 +51,10 @@ export class MCPServer {
       if (session?.getIsSdkMode()) {
         // SDK 模式下不输出
       } else {
-        await logOutput('success', `�?MCP Server connected`);
+        await logOutput('success', `MCP Server connected`);
       }
     } catch (error) {
-      await logOutput('error', `�?[mcp] Failed to connect MCP Server`, { error: 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;
     }
   }
@@ -284,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}`);
       }
@@ -448,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}`);
     }

package/src/session.ts

@@ -2922,8 +2922,6 @@ export async function startInteractiveSession(): Promise<void> {
   } catch {
     // Silently ignore update check failures
   }
-
-  await session.start();
 }
 
 // Singleton session instance for access from other modules

package/src/theme.ts

@@ -272,7 +272,7 @@ export const styleHelpers = {
   // Animation effects
   animation: {
     spinner: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],
-    dots: ['⠁', '⠂', '⠄', '⡀', '⡈', '⡐', '⡠', '⣀', '⣁', '⣂', '⣄', '⣌', '⣔', '⣤', '⣥', '�'],
+    dots: ['⠁', '⠂', '⠄', '⡀', '⡈', '⡐', '⡠', '⣀', '⣁', '⣂', '⣄', '⣌', '⣔', '⣤', '⣥', '⣿'],
     bars: ['▁', '▂', '▃', '▄', '▅', '▆', '▇', '█'],
     arrows: ['←', '↖', '↑', '↗', '→', '↘', '↓', '↙']
   },