groove-dev 0.8.1 → 0.8.3

package/node_modules/@groove-dev/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groove-dev/cli",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "GROOVE CLI — manage AI coding agents from your terminal",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",

package/node_modules/@groove-dev/cli/src/client.js

@@ -1,7 +1,23 @@
 // GROOVE CLI — HTTP client for daemon communication
 // FSL-1.1-Apache-2.0 — see LICENSE
 
-const BASE_URL = process.env.GROOVE_URL || 'http://localhost:31415';
+import { existsSync, readFileSync } from 'fs';
+import { resolve } from 'path';
+
+function getBaseUrl() {
+  if (process.env.GROOVE_URL) return process.env.GROOVE_URL;
+  // Read actual port from daemon's port file (supports auto-port rotation)
+  try {
+    const portFile = resolve(process.cwd(), '.groove', 'daemon.port');
+    if (existsSync(portFile)) {
+      const port = readFileSync(portFile, 'utf8').trim();
+      if (port) return `http://localhost:${port}`;
+    }
+  } catch { /* fallback */ }
+  return 'http://localhost:31415';
+}
+
+const BASE_URL = getBaseUrl();
 
 export async function apiCall(method, path, body) {
   const url = `${BASE_URL}${path}`;

package/node_modules/@groove-dev/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groove-dev/daemon",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "GROOVE daemon — agent orchestration engine",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",

package/node_modules/@groove-dev/daemon/src/index.js

@@ -1,7 +1,8 @@
 // GROOVE Daemon — Entry Point
 // FSL-1.1-Apache-2.0 — see LICENSE
 
-import { createServer } from 'http';
+import { createServer as createHttpServer } from 'http';
+import { createServer as createNetServer } from 'net';
 import { resolve } from 'path';
 import { readFileSync, writeFileSync, unlinkSync, existsSync, mkdirSync } from 'fs';
 import express from 'express';
@@ -71,7 +72,7 @@ export class Daemon {
 
     // HTTP + WebSocket server
     this.app = express();
-    this.server = createServer(this.app);
+    this.server = createHttpServer(this.app);
     this.wss = new WebSocketServer({
       server: this.server,
       maxPayload: 1024 * 1024, // 1MB max message
@@ -123,16 +124,44 @@ export class Daemon {
   }
 
   async start() {
-    // Check for existing daemon
+    // Kill any existing daemon on our port
     if (existsSync(this.pidFile)) {
       const existingPid = parseInt(readFileSync(this.pidFile, 'utf8'), 10);
       try {
         process.kill(existingPid, 0); // Signal 0 = check if alive
-        console.error(`GROOVE daemon already running (PID ${existingPid})`);
-        process.exit(1);
+        console.log(`  Stopping previous daemon (PID ${existingPid})...`);
+        process.kill(existingPid, 'SIGTERM');
+        // Wait briefly for clean shutdown
+        await new Promise((r) => setTimeout(r, 1000));
+        try { process.kill(existingPid, 'SIGKILL'); } catch { /* already dead */ }
       } catch {
-        // PID file is stale — previous daemon crashed
-        unlinkSync(this.pidFile);
+        // PID file is stale
+      }
+      try { unlinkSync(this.pidFile); } catch { /* ignore */ }
+    }
+
+    // Auto-find an open port if the default is taken
+    const checkPort = (port) => new Promise((res) => {
+      const tester = createNetServer();
+      tester.once('error', () => res(false));
+      tester.once('listening', () => { tester.close(); res(true); });
+      tester.listen(port, '127.0.0.1');
+    }).catch(() => false);
+
+    if (!(await checkPort(this.port))) {
+      const originalPort = this.port;
+      // Try next 10 ports
+      let found = false;
+      for (let i = 1; i <= 10; i++) {
+        if (await checkPort(this.port + i)) {
+          this.port = this.port + i;
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        console.error(`\n  Ports ${originalPort}-${originalPort + 10} are all in use. Free one and try again.\n`);
+        process.exit(1);
       }
     }
 
@@ -143,6 +172,8 @@ export class Daemon {
     return new Promise((resolvePromise) => {
       this.server.listen(this.port, '127.0.0.1', () => {
         writeFileSync(this.pidFile, String(process.pid));
+        // Write actual port so CLI can find us (supports auto-port rotation)
+        writeFileSync(resolve(this.grooveDir, 'daemon.port'), String(this.port));
 
         printWelcome(this.port);