@xagent-ai/cli 1.1.0 → 1.2.0

package/src/session.ts

@@ -169,8 +169,8 @@ export class InteractiveSession {
     console.log('');
     console.log(colors.gradient('╔════════════════════════════════════════════════════════════╗'));
     console.log(colors.gradient('║') + ' '.repeat(58) + colors.gradient('  ║'));
-    console.log(' '.repeat(14) + '🤖 ' + colors.gradient('XAGENT CLI') + ' '.repeat(32) + colors.gradient('  ║'));
-    console.log(' '.repeat(17) + colors.textMuted(`v${packageJson.version}`) + ' '.repeat(36) + colors.gradient('  ║'));
+    console.log(colors.gradient('║') + ' '.repeat(13) + '🤖 ' + colors.gradient('XAGENT CLI') + ' '.repeat(32) + colors.gradient('  ║'));
+    console.log(colors.gradient('║') + ' '.repeat(16) + colors.textMuted(`v${packageJson.version}`) + ' '.repeat(36) + colors.gradient('  ║'));
     console.log(colors.gradient('║') + ' '.repeat(58) + colors.gradient('  ║'));
     console.log(colors.gradient('╚════════════════════════════════════════════════════════════╝'));
     console.log(colors.textMuted('  AI-powered command-line assistant'));
@@ -204,12 +204,15 @@ export class InteractiveSession {
     logger.debug('\n[SESSION] ========== initialize() 开始 ==========\n');
 
     try {
-      const spinner = ora({
-        text: colors.textMuted('Initializing XAGENT CLI...'),
-        spinner: 'dots',
-        color: 'cyan'
-      }).start();
-
+            // Custom spinner for initialization (like Thinking...)
+            const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+            let frameIndex = 0;
+            const validatingText = colors.textMuted('Validating authentication...');
+      
+            const spinnerInterval = setInterval(() => {
+              process.stdout.write(`\r${colors.primary(frames[frameIndex])} ${validatingText}`);
+              frameIndex = (frameIndex + 1) % frames.length;
+            }, 120);
       logger.debug('[SESSION] 调用 configManager.load()...');
       await this.configManager.load();
 
@@ -225,14 +228,24 @@ export class InteractiveSession {
 
       // Only validate OAuth tokens, skip validation for third-party API keys
       if (authConfig.apiKey && selectedAuthType === AuthType.OAUTH_XAGENT) {
-        spinner.text = colors.textMuted('Validating authentication...');
+        clearInterval(spinnerInterval);
+        process.stdout.write('\r' + ' '.repeat(50) + '\r'); // Clear the line
+        
         const baseUrl = authConfig.xagentApiBaseUrl || 'https://154.8.140.52:443';
         let isValid = await this.validateToken(baseUrl, authConfig.apiKey);
 
         // Try refresh token if validation failed
         if (!isValid && authConfig.refreshToken) {
-          spinner.text = colors.textMuted('Refreshing authentication...');
+          const refreshingText = colors.textMuted('Refreshing authentication...');
+          frameIndex = 0;
+          const refreshInterval = setInterval(() => {
+            process.stdout.write(`\r${colors.primary(frames[frameIndex])} ${refreshingText}`);
+            frameIndex = (frameIndex + 1) % frames.length;
+          }, 120);
+          
           const newToken = await this.refreshToken(baseUrl, authConfig.refreshToken);
+          clearInterval(refreshInterval);
+          process.stdout.write('\r' + ' '.repeat(50) + '\r');
 
           if (newToken) {
             // Save new token and persist
@@ -244,10 +257,9 @@ export class InteractiveSession {
         }
 
         if (!isValid) {
-          spinner.stop();
           console.log('');
-          console.log(colors.warning('⚠️  Authentication expired or invalid'));
-          console.log(colors.info('Please log in again to continue.'));
+          console.log(colors.warning('Your xAgent session has expired or is not configured'));
+          console.log(colors.info('Please select an authentication method to continue.'));
           console.log('');
 
           // Clear invalid credentials and persist
@@ -271,11 +283,11 @@ export class InteractiveSession {
           this.rl.on('close', () => {
             // readline closed
           });
-          spinner.start();
         }
       } else if (!authConfig.apiKey) {
         // No API key configured, need to set up authentication
-        spinner.stop();
+        clearInterval(spinnerInterval);
+        process.stdout.write('\r' + ' '.repeat(50) + '\r');
         await this.setupAuthentication();
         authConfig = this.configManager.getAuthConfig();
         selectedAuthType = this.configManager.get('selectedAuthType');
@@ -290,7 +302,9 @@ export class InteractiveSession {
         this.rl.on('close', () => {
           // readline closed
         });
-        spinner.start();
+      } else {
+        clearInterval(spinnerInterval);
+        process.stdout.write('\r' + ' '.repeat(50) + '\r');
       }
       // For OPENAI_COMPATIBLE with API key, skip validation and proceed directly
 
@@ -328,7 +342,6 @@ export class InteractiveSession {
       this.slashCommandHandler.setConversationHistory(this.conversation);
 
       const mcpServers = this.configManager.getMcpServers();
-      console.log(`📋 Loading ${Object.keys(mcpServers).length} MCP servers from config`);
       Object.entries(mcpServers).forEach(([name, config]) => {
         console.log(`📝 Registering MCP server: ${name} (${config.transport})`);
         this.mcpManager.registerServer(name, config);
@@ -364,7 +377,7 @@ export class InteractiveSession {
 
       this.currentAgent = this.agentManager.getAgent('general-purpose');
 
-      spinner.succeed(colors.success('Initialization complete'));
+      console.log(colors.success('✔ Initialization complete'));
     } catch (error: any) {
       const spinner = ora({ text: '', spinner: 'dots', color: 'red' }).start();
       spinner.fail(colors.error(`Initialization failed: ${error.message}`));
@@ -459,11 +472,14 @@ export class InteractiveSession {
 
     const authConfig = authService.getAuthConfig();
 
-    // VLM configuration is optional - skip for now, can be configured later with /vlm command
-    console.log('');
-    console.log(colors.info(`${icons.info} VLM configuration is optional.`));
-    console.log(colors.info(`You can configure it later using the /vlm command if needed.`));
-    console.log('');
+    // VLM configuration is optional - only show for non-OAuth (local) mode
+    // Remote mode uses backend VLM configuration
+    if (authType !== AuthType.OAUTH_XAGENT) {
+      console.log('');
+      console.log(colors.info(`${icons.info} VLM configuration is optional.`));
+      console.log(colors.info(`You can configure it later using the /vlm command if needed.`));
+      console.log('');
+    }
 
     // Save LLM config only, skip VLM for now
     await this.configManager.setAuthConfig(authConfig);
@@ -951,11 +967,7 @@ export class InteractiveSession {
 
       const messages: ChatMessage[] = [
         { role: 'system', content: `${enhancedSystemPrompt}\n\n${memory}`, timestamp: Date.now() },
-        ...this.conversation.map(msg => ({
-          role: msg.role,
-          content: msg.content,
-          timestamp: msg.timestamp
-        }))
+        ...this.conversation
       ];
 
       const operationId = `ai-response-${Date.now()}`;
@@ -1131,11 +1143,7 @@ export class InteractiveSession {
       // Build messages with system prompt (与本地模式一致)
       const messages: ChatMessage[] = [
         { role: 'system', content: `${enhancedSystemPrompt}\n\n${memory}`, timestamp: Date.now() },
-        ...this.conversation.map(msg => ({
-          role: msg.role,
-          content: msg.content,
-          timestamp: msg.timestamp
-        }))
+        ...this.conversation
       ];
 
       // Call unified LLM API with cancellation support
@@ -1312,7 +1320,7 @@ export class InteractiveSession {
         parsedParams = params;
       }
 
-      return { name, params: parsedParams, index };
+      return { name, params: parsedParams, index, id: toolCall.id };
     });
 
     // Display all tool calls info
@@ -1355,6 +1363,7 @@ export class InteractiveSession {
         this.conversation.push({
           role: 'tool',
           content: JSON.stringify({ error }),
+          tool_call_id: toolCall.id,
           timestamp: Date.now()
         });
       } else {
@@ -1407,6 +1416,7 @@ export class InteractiveSession {
         this.conversation.push({
           role: 'tool',
           content: JSON.stringify(result),
+          tool_call_id: toolCall.id,
           timestamp: Date.now()
         });
       }
@@ -1478,7 +1488,7 @@ export class InteractiveSession {
     const showToolDetails = this.configManager.get('showToolDetails') || false;
     const indent = this.getIndent();
 
-    // Prepare all tool calls
+    // Prepare all tool calls (include id for tool result matching)
     const preparedToolCalls = toolCalls.map((toolCall, index) => {
       const { name, arguments: params } = toolCall.function;
 
@@ -1489,7 +1499,7 @@ export class InteractiveSession {
         parsedParams = params;
       }
 
-      return { name, params: parsedParams, index };
+      return { name, params: parsedParams, index, id: toolCall.id };
     });
 
     // Display all tool calls info
@@ -1535,6 +1545,7 @@ export class InteractiveSession {
         this.conversation.push({
           role: 'tool',
           content: JSON.stringify({ error }),
+          tool_call_id: toolCall.id,
           timestamp: Date.now()
         });
       } else {
@@ -1585,6 +1596,7 @@ export class InteractiveSession {
         this.conversation.push({
           role: 'tool',
           content: JSON.stringify(result),
+          tool_call_id: toolCall.id,
           timestamp: Date.now()
         });
       }