@toothfairyai/cli 1.0.7 → 1.0.9

package/bin/toothfairy.js

@@ -244,18 +244,51 @@ program
       let finalResponse = null;
       let processingStatus = null;
 
-      const formatStatusMessage = (status) => {
-        const statusMessages = {
-          connected: '🔗 Connected to streaming server',
-          init: '🚀 Initializing agent...',
-          initial_setup_completed: '✅ Agent setup completed',
-          tools_processing_completed: '🛠️  Tools processing finished',
-          replying: '💭 Agent is thinking and responding...',
-          updating_memory: '💾 Updating conversation memory...',
-          memory_updated: '✅ Memory updated successfully',
-          complete: '🎉 Response complete!',
-        };
-        return statusMessages[status] || `📊 Status: ${status}`;
+      const mapStateWithLabel = (state) => {
+        switch (state) {
+          case 'data_processing_completed':
+            return '📊 **Retrieving data**';
+          case 'tools_processing_completed':
+            return '🛠️ **Choosing tools**';
+          case 'replying':
+            return '🧚 **Responding**';
+          case 'main_generation_completed':
+            return '✨ **Generation completed**';
+          case 'memory_updated':
+            return '💾 Memory updated';
+          case 'updating_memory':
+            return '💾 Updating memory...';
+          case 'init':
+            return '🚀 Initializing...';
+          case 'initial_setup_completed':
+            return '✅ Setup completed';
+          case 'image_analysis_in_progress':
+            return '🖼️ Analyzing image...';
+          case 'video_analysis_in_progress':
+            return '🎥 Analyzing video...';
+          case 'audio_analysis_in_progress':
+            return '🎵 Analyzing audio...';
+          case 'image_generation_in_progress':
+            return '🎨 Generating image...';
+          case 'video_generation_in_progress':
+            return '🎬 Generating video...';
+          case '3D_model_generation_in_progress':
+            return '🏗️ Creating 3D model...';
+          case 'code_generation_in_progress':
+            return '💻 Generating code...';
+          case 'code_execution_in_progress':
+            return '⚡ Executing code...';
+          case 'internet_search_in_progress':
+            return '🔍 Searching internet...';
+          case 'planning_in_progress':
+            return '🗺️ Planning response...';
+          case 'handed_off_to_human':
+            return '👤 Handed off to human';
+          case 'completed':
+            return '🎉 Completed';
+          default:
+            return `📊 ${state}`;
+        }
       };
 
       if (options.output === 'json') {
@@ -287,18 +320,22 @@ program
         // Text mode: show live streaming
         let currentSpinner = null;
 
-        // Function to update display
-        const updateDisplay = (text, type = 'response') => {
+        // Function to update display with status filtering
+        const updateDisplay = (text, agentStatus, messageId, type = 'response') => {
           if (currentSpinner) {
             currentSpinner.stop();
             currentSpinner = null;
           }
 
-          // Clear previous lines if we're updating the same response
-          if (text && type === 'response') {
-            // For real-time streaming, we overwrite the current line
-            process.stdout.write('\r\x1b[K'); // Clear current line
-            process.stdout.write(chalk.green('🧚 Response: ') + text);
+          // Only show text when agent is actually replying
+          if (text && type === 'response' && agentStatus === 'replying') {
+            // Check if text is actually new/different
+            if (text !== currentText) {
+              // For real-time streaming, we overwrite the current line
+              process.stdout.write('\r\x1b[K'); // Clear current line
+              process.stdout.write(chalk.green('🧚 Response: ') + text.trim());
+              currentText = text;
+            }
           }
         };
 
@@ -324,52 +361,90 @@ program
                 );
               }
 
-              if (eventType === 'status') {
-                if (eventData.status === 'connected') {
-                  if (options.showProgress) {
-                    console.log(
-                      chalk.green('🔗 Connected to streaming server')
-                    );
-                  }
-                } else if (eventData.status === 'complete') {
-                  if (options.showProgress) {
-                    console.log(
-                      chalk.green('\n🎉 Stream completed successfully!')
-                    );
+              // Handle connection status events
+              if (eventData.status === 'connected') {
+                if (options.showProgress) {
+                  console.log(chalk.green('🔗 Connected to streaming server'));
+                }
+                return;
+              }
+
+              if (eventData.status === 'complete') {
+                if (options.showProgress) {
+                  console.log(chalk.green('\n🎉 Stream completed successfully!'));
+                }
+                return;
+              }
+
+              // Handle message events
+              if (eventData.type === 'message') {
+                let metadata = {};
+                let agentStatus = null;
+
+                // Parse metadata if available
+                if (eventData.metadata) {
+                  try {
+                    metadata = JSON.parse(eventData.metadata);
+                    agentStatus = metadata.agent_processing_status;
+                  } catch (e) {
+                    // Metadata parsing failed, continue without it
                   }
                 }
-              } else if (eventType === 'progress') {
-                // Agent processing status updates
-                const newStatus = eventData.processing_status;
-                if (newStatus && newStatus !== processingStatus) {
-                  processingStatus = newStatus;
+
+                // Handle status changes
+                if (agentStatus && agentStatus !== processingStatus) {
+                  processingStatus = agentStatus;
                   if (options.showProgress) {
-                    const statusMsg = formatStatusMessage(processingStatus);
+                    const statusMsg = mapStateWithLabel(processingStatus);
                     if (currentSpinner) {
                       currentSpinner.stop();
                     }
                     currentSpinner = ora(chalk.yellow(statusMsg)).start();
                   }
                 }
-              } else if (eventType === 'data') {
-                // Streaming text data
-                if (eventData.text) {
-                  currentText = eventData.text;
-                  updateDisplay(currentText.trim());
+
+                // Handle progressive text streaming
+                if (eventData.text && agentStatus === 'replying') {
+                  updateDisplay(
+                    eventData.text,
+                    agentStatus,
+                    eventData.message_id,
+                    'response'
+                  );
                 }
-              } else if (eventType === 'complete') {
-                // Final response with all metadata
-                finalResponse = eventData;
-                if (currentText) {
-                  // Ensure we have a clean final display - just add the final emoji
-                  if (currentSpinner) {
-                    currentSpinner.stop();
-                    currentSpinner = null;
+
+                // Handle fulfilled status (final response)
+                if (eventData.status === 'fulfilled') {
+                  finalResponse = eventData;
+                  if (currentText) {
+                    // Clean final display with magic wand emoji
+                    if (currentSpinner) {
+                      currentSpinner.stop();
+                      currentSpinner = null;
+                    }
+                    process.stdout.write('\r\x1b[K'); // Clear current line
+                    process.stdout.write(chalk.blue('🪄 ') + currentText.trim());
                   }
-                  process.stdout.write('\r\x1b[K'); // Clear current line
-                  process.stdout.write(chalk.blue('🪄 ') + currentText.trim());
                 }
-              } else if (eventType === 'error') {
+
+                // Handle additional metadata events (images, files, callback metadata)
+                if (eventData.images !== undefined || eventData.files !== undefined) {
+                  // These are attachment events - could show notification if needed
+                  if (options.verbose) {
+                    console.log(chalk.dim('\n📎 Attachments processed'));
+                  }
+                }
+
+                if (eventData.callbackMetadata) {
+                  // Function execution metadata
+                  if (options.verbose) {
+                    console.log(chalk.dim('\n⚙️ Function execution metadata received'));
+                  }
+                }
+              }
+
+              // Handle errors
+              if (eventType === 'error') {
                 const errorMsg = eventData.message || 'Unknown streaming error';
                 if (currentSpinner) {
                   currentSpinner.stop();
@@ -389,19 +464,38 @@ program
 
           if (options.verbose && finalResponse) {
             // Show final response metadata in verbose mode
-            console.log(chalk.cyan.bold('📊 Final Response Metadata'));
-            console.log('─'.repeat(40));
-
-            if (finalResponse.metadata_parsed) {
-              const metadata = finalResponse.metadata_parsed;
-              for (const [key, value] of Object.entries(metadata)) {
-                if (key !== 'agent_processing_status') {
-                  // Already shown during streaming
-                  console.log(chalk.cyan(`${key}:`), String(value));
+            console.log(chalk.cyan.bold('\n📊 Final Response Metadata'));
+            console.log('─'.repeat(50));
+
+            // Parse and display metadata from the final response
+            if (finalResponse.metadata) {
+              try {
+                const metadata = JSON.parse(finalResponse.metadata);
+                for (const [key, value] of Object.entries(metadata)) {
+                  if (key === 'agent_processing_status') {
+                    console.log(chalk.cyan(`${key}:`), chalk.green(value));
+                  } else if (key === 'duration') {
+                    console.log(chalk.cyan(`${key}:`), chalk.yellow(`${value}s`));
+                  } else if (key === 'sources' && Array.isArray(value)) {
+                    console.log(chalk.cyan(`${key}:`), value.length > 0 ? value.join(', ') : 'None');
+                  } else {
+                    console.log(chalk.cyan(`${key}:`), String(value));
+                  }
                 }
+              } catch (e) {
+                console.log(chalk.red('Could not parse metadata'));
               }
             }
-            console.log('─'.repeat(40));
+
+            // Show additional response fields
+            if (finalResponse.message_id) {
+              console.log(chalk.cyan('message_id:'), finalResponse.message_id);
+            }
+            if (finalResponse.t_text_summary) {
+              console.log(chalk.cyan('summary:'), finalResponse.t_text_summary);
+            }
+
+            console.log('─'.repeat(50));
           }
 
           if (!currentText) {
@@ -683,7 +777,7 @@ program
 program
   .command('config-show')
   .description('Show current configuration')
-  .action(async (options, command) => {
+  .action(async (command) => {
     try {
       const globalOptions = command.parent.opts();
       const config = loadConfig(globalOptions.config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toothfairyai/cli",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Command-line interface for ToothFairy AI API",
   "main": "index.js",
   "bin": {