sam-coder-cli 1.0.16 → 1.0.17

package/bin/multiplayer-client.js

@@ -446,26 +446,25 @@ class MultiplayerClient extends EventEmitter {
       
       console.log(chalk.blue(`\n🔄 [${this.role}] Working on: ${this.currentTask.prompt}`));
       
-      // Simulate work with progress updates
-      const totalSteps = 5;
-      for (let i = 0; i < totalSteps; i++) {
-        await new Promise(resolve => setTimeout(resolve, 500));
-        const progress = Math.floor(((i + 1) / totalSteps) * 100);
-        
-        // Update progress
+      // Process the task using the completeTask method
+      const completedTask = await this.completeTask(taskId);
+      
+      if (completedTask) {
+        // Task completed successfully
         this.send({
           type: 'task_progress',
           sessionId: this.sessionId,
           taskId,
-          status: 'in_progress',
-          progress,
+          status: 'completed',
+          progress: 100,
           timestamp: new Date().toISOString()
         });
+        
+        console.log(chalk.green(`\n✅ [${this.role}] Completed task: ${this.currentTask.prompt}`));
+      }
+      if (this.taskQueue.length > 0) {
+        this.processTaskQueue();
       }
-      
-      // Complete the task
-      await this.completeTask(taskId);
-      
     } catch (error) {
       console.error('Error processing task:', error);
       this.send({
@@ -477,69 +476,96 @@ class MultiplayerClient extends EventEmitter {
       });
     } finally {
       this.currentTask = null;
-      // Process next task if available
-      if (this.taskQueue.length > 0) {
-        this.processTaskQueue();
-      }
     }
   }
   
   async completeTask(taskId) {
     const task = this.pendingTasks.get(taskId);
-    if (!task) return null;
+    if (!task) {
+      console.error('Task not found:', taskId);
+      return null;
+    }
+
+    try {
+      // Process the task using the same logic as the normal mode
+      const { processQuery } = require('./agi-cli');
+      const result = await processQuery(task.prompt, [], this.model);
+      
+      // Update task status
+      const completedTask = {
+        ...task,
+        status: 'completed',
+        completedAt: new Date().toISOString(),
+        result: typeof result === 'string' ? result : JSON.stringify(result, null, 2)
+      };
+      
+      this.pendingTasks.set(taskId, completedTask);
+      this.taskResults.set(taskId, completedTask.result);
+      
+      // Notify server and other clients
+      this.send({
+        type: 'task_completed',
+        sessionId: this.sessionId,
+        taskId,
+        result: completedTask.result,
+        timestamp: new Date().toISOString()
+      });
+      
+      console.log(chalk.green(`\n✅ [${this.role}] Completed: ${task.prompt}`));
+      this.emit('task_completed', completedTask);
+      
+      return completedTask;
+    } catch (error) {
+      console.error('Error completing task:', error);
+      
+      // Update task with error status
+      const failedTask = {
+        ...task,
+        status: 'failed',
+        completedAt: new Date().toISOString(),
+        error: error.message
+      };
+      
+      this.pendingTasks.set(taskId, failedTask);
+      this.emit('task_failed', { taskId, error: error.message });
+      
+      return null;
+    }
+  }
+
+  handleTaskCompleted(data) {
+    const task = this.pendingTasks.get(data.taskId);
+    if (!task) {
+      console.error('Task not found for completion:', data.taskId);
+      return;
+    }
     
-    // Generate task result based on task type
-    let result;
-    switch (task.taskType) {
-      case 'research':
-        result = `Research completed on: ${task.prompt}\nSummary: This is a simulated research result.`;
-        break;
-      case 'code':
-        result = `Code implementation for: ${task.prompt}\n// Simulated code implementation\nfunction ${task.prompt.split(' ')[0].toLowerCase()}() {\n  // TODO: Implement\n}`;
-        break;
-      case 'debug':
-        result = `Debugging analysis for: ${task.prompt}\n- Issue identified: Simulated issue\n- Solution: Simulated fix`;
-        break;
-      default:
-        result = `Completed: ${task.prompt}`;
+    console.log(chalk.green(`\n✅ Task completed by all agents!`));
+    console.log(chalk.blue(`Task: ${task.prompt || 'Unknown task'}`));
+    
+    if (data.results && data.results.length > 0) {
+      console.log(chalk.cyan('Results:'));
+      data.results.forEach(result => {
+        console.log(chalk.yellow(`- ${this.getClientName(result.clientId) || 'Unknown'}:`));
+        console.log(result.result);
+      });
+    } else if (data.result) {
+      console.log(chalk.cyan('Result:'));
+      console.log(data.result);
     }
     
-    // Update task status
+    // Update the task with the final result
     const completedTask = {
       ...task,
       status: 'completed',
       completedAt: new Date().toISOString(),
-      result
+      result: data.result || 'No result provided'
     };
     
-    this.pendingTasks.set(taskId, completedTask);
-    this.taskResults.set(taskId, result);
+    this.pendingTasks.set(data.taskId, completedTask);
+    this.taskResults.set(data.taskId, completedTask.result);
     
-    // Notify server and other clients
-    this.send({
-      type: 'task_completed',
-      sessionId: this.sessionId,
-      taskId,
-      result,
-      timestamp: new Date().toISOString()
-    });
-    
-    console.log(chalk.green(`\n✅ [${this.role}] Completed: ${task.prompt}`));
     this.emit('task_completed', completedTask);
-    
-    return completedTask;
-  }
-
-  handleTaskCompleted(data) {
-    console.log(`\n Task completed by all agents!`);
-    console.log(`Task: ${this.tasks.get(data.taskId)?.prompt || 'Unknown task'}`);
-    console.log('Results:');
-    
-    data.results.forEach(result => {
-      console.log(`- ${this.getClientName(result.clientId)}: ${result.result}`);
-    });
-    
-    this.emit('task_completed', data);
   }
 
   async updateWork(work) {
@@ -618,6 +644,12 @@ class MultiplayerClient extends EventEmitter {
       this.ws.close();
     }
   }
+  
+  getClientName(clientId) {
+    if (!clientId) return 'Unknown';
+    const client = this.clients.find(c => c.clientId === clientId || c.id === clientId);
+    return client ? (client.name || client.clientInfo?.name || 'Unknown') : 'Unknown';
+  }
 }
 
 module.exports = MultiplayerClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sam-coder-cli",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "SAM-CODER: An animated command-line AI assistant with agency capabilities.",
   "main": "bin/agi-cli.js",
   "bin": {