sam-coder-cli 1.0.34 → 1.0.35

package/bin/ai-team.js

@@ -80,14 +80,32 @@ class AITeam {
   }
   
   async start(sessionId = null) {
-    if (sessionId) {
-      console.log(`Joining session ${sessionId}...`);
-      await this.client.joinSession(sessionId);
-    } else {
-      console.log('Creating new session...');
-      const newSessionId = await this.client.createSession();
-      console.log(`Created new session: ${newSessionId}`);
-      console.log('Share this ID with others to collaborate!');
+    let serverId = null;
+    let actualSessionId = sessionId;
+    
+    // Check if sessionId contains server information (format: serverId:sessionId)
+    if (sessionId && sessionId.includes(':')) {
+      [serverId, actualSessionId] = sessionId.split(':');
+      console.log(chalk.blue(`Attempting to connect to server: ${serverId}`));
+    }
+    
+    // Connect to the server first
+    try {
+      await this.client.connect(serverId);
+      
+      if (actualSessionId) {
+        console.log(`Joining session ${actualSessionId}...`);
+        await this.client.joinSession(actualSessionId);
+      } else {
+        console.log('Creating new session...');
+        const newSessionId = await this.client.createSession();
+        console.log(chalk.green(`✅ Created new session: ${newSessionId}`));
+        console.log('Share this ID with others to collaborate!');
+        console.log(chalk.yellow(`To join this session, use: ${serverId || 'localhost:8080'}:${newSessionId}`));
+      }
+    } catch (error) {
+      console.error(chalk.red('Failed to connect to server:'), error.message);
+      process.exit(1);
     }
     
     // Start chat input loop

package/bin/multiplayer-client.js

@@ -34,7 +34,32 @@ async function findAvailablePort(startPort = 8080, maxAttempts = 10) {
   throw new Error(`Could not find an available port after ${maxAttempts} attempts`);
 }
 
-async function ensureServerRunning(port = 8080) {
+async function ensureServerRunning(port = 8080, serverId = null) {
+  // First try to connect to an existing server by ID if provided
+  if (serverId) {
+    try {
+      console.log(chalk.blue(`Attempting to connect to existing server ${serverId}...`));
+      // Try to connect to the server
+      const ws = new WebSocket(`ws://${serverId}`);
+      
+      // Wait for connection or timeout
+      const connectionResult = await Promise.race([
+        new Promise(resolve => ws.once('open', () => resolve(true))),
+        new Promise(resolve => setTimeout(() => resolve(false), 2000))
+      ]);
+      
+      if (connectionResult) {
+        console.log(chalk.green(`✅ Connected to existing server at ${serverId}`));
+        ws.terminate();
+        return `ws://${serverId}`;
+      }
+      ws.terminate();
+    } catch (error) {
+      console.log(chalk.yellow(`Could not connect to server ${serverId}, starting a new server...`));
+    }
+  }
+  
+  // If no server ID provided or connection failed, start a new server
   try {
     const availablePort = await findAvailablePort(port);
     const isDefaultPort = (availablePort === port);
@@ -271,14 +296,14 @@ class MultiplayerClient extends EventEmitter {
     this.completeTask = this.completeTask.bind(this);
   }
 
-  async connect() {
+  async connect(serverId = null) {
     return new Promise((resolve, reject) => {
       const connectWithRetry = async () => {
         try {
-          // If no server URL is provided, try to start a local server
+          // If no server URL is provided, try to start a local server or connect to the specified server ID
           if (this.serverUrl === 'ws://localhost:8080') {
             try {
-              this.serverUrl = await ensureServerRunning(8080);
+              this.serverUrl = await ensureServerRunning(8080, serverId);
             } catch (error) {
               console.error(chalk.red('Failed to start local server:'), error.message);
               reject(error);

package/package.json

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