groove-dev 0.27.112 → 0.27.115

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

@@ -8,6 +8,7 @@ export class FileWatcher {
   constructor(daemon) {
     this.daemon = daemon;
     this.watchers = new Map(); // relPath → { watcher, timer }
+    this.dirWatchers = new Map(); // relPath → { watcher, timer }
   }
 
   watch(relPath) {
@@ -51,9 +52,53 @@ export class FileWatcher {
     this.watchers.delete(relPath);
   }
 
+  watchDir(relPath) {
+    if (typeof relPath !== 'string') return;
+    if (relPath && relPath.includes('..')) return;
+    if (this.dirWatchers.has(relPath)) return;
+
+    const fullPath = relPath ? resolve(this.daemon.projectDir, relPath) : this.daemon.projectDir;
+
+    try {
+      const watcher = watch(fullPath, () => {
+        const entry = this.dirWatchers.get(relPath);
+        if (!entry) return;
+
+        if (entry.timer) clearTimeout(entry.timer);
+        entry.timer = setTimeout(() => {
+          this.daemon.broadcast({
+            type: 'file:tree-changed',
+            path: relPath,
+            timestamp: Date.now(),
+          });
+        }, 300);
+      });
+
+      watcher.on('error', () => {
+        this.unwatchDir(relPath);
+      });
+
+      this.dirWatchers.set(relPath, { watcher, timer: null });
+    } catch {
+      // Directory doesn't exist or not watchable — ignore
+    }
+  }
+
+  unwatchDir(relPath) {
+    const entry = this.dirWatchers.get(relPath);
+    if (!entry) return;
+
+    if (entry.timer) clearTimeout(entry.timer);
+    try { entry.watcher.close(); } catch { /* already closed */ }
+    this.dirWatchers.delete(relPath);
+  }
+
   unwatchAll() {
     for (const [relPath] of this.watchers) {
       this.unwatch(relPath);
     }
+    for (const [relPath] of this.dirWatchers) {
+      this.unwatchDir(relPath);
+    }
   }
 }

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

@@ -290,11 +290,11 @@ export class Daemon {
     });
 
     // Debounced file I/O for registry changes (at most once per 2s)
-    let _registryIoTimer = null;
+    this._registryIoTimer = null;
     const _debouncedRegistryIo = () => {
-      if (_registryIoTimer) return;
-      _registryIoTimer = setTimeout(() => {
-        _registryIoTimer = null;
+      if (this._registryIoTimer) return;
+      this._registryIoTimer = setTimeout(() => {
+        this._registryIoTimer = null;
         this.introducer.writeRegistryFile(this.projectDir);
         this.introducer.injectGrooveSection(this.projectDir);
       }, 2000);
@@ -325,8 +325,9 @@ export class Daemon {
         data: enrichAgents(this.registry.getAll()),
       }));
 
-      // Track which files this client is watching (for cleanup on disconnect)
+      // Track which files/dirs this client is watching (for cleanup on disconnect)
       const watchedFiles = new Set();
+      const watchedDirs = new Set();
 
       ws.on('message', (raw) => {
         try {
@@ -335,7 +336,7 @@ export class Daemon {
           // Validate message type against whitelist
           const VALID_WS_TYPES = new Set([
             'terminal:spawn', 'terminal:resize', 'terminal:input', 'terminal:close', 'terminal:kill', 'terminal:rename',
-            'editor:watch', 'editor:unwatch', 'editor:save',
+            'editor:watch', 'editor:unwatch', 'editor:save', 'editor:watchdir', 'editor:unwatchdir',
             'ping'
           ]);
           if (!msg || typeof msg !== 'object' || !VALID_WS_TYPES.has(msg.type)) return;
@@ -351,6 +352,14 @@ export class Daemon {
             case 'editor:unwatch':
               if (msg.path) { this.fileWatcher.unwatch(msg.path); watchedFiles.delete(msg.path); }
               break;
+            case 'editor:watchdir':
+              if (typeof msg.path === 'string' && !msg.path.includes('..')) {
+                this.fileWatcher.watchDir(msg.path); watchedDirs.add(msg.path);
+              }
+              break;
+            case 'editor:unwatchdir':
+              if (typeof msg.path === 'string') { this.fileWatcher.unwatchDir(msg.path); watchedDirs.delete(msg.path); }
+              break;
             // Terminal
             case 'terminal:spawn': {
               if (msg.cwd !== undefined && (typeof msg.cwd !== 'string' || msg.cwd.includes('..'))) break;
@@ -389,6 +398,9 @@ export class Daemon {
         for (const path of watchedFiles) {
           this.fileWatcher.unwatch(path);
         }
+        for (const path of watchedDirs) {
+          this.fileWatcher.unwatchDir(path);
+        }
         this.terminalManager.cleanupClient(ws);
       });
     });
@@ -779,6 +791,11 @@ export class Daemon {
     if (this._stateSaveInterval) clearInterval(this._stateSaveInterval);
     if (this._classifierInterval) clearInterval(this._classifierInterval);
     if (this._subscriptionPollInterval) clearInterval(this._subscriptionPollInterval);
+    if (this._registryIoTimer) clearTimeout(this._registryIoTimer);
+    if (this._networkCheckProc) {
+      try { this._networkCheckProc.kill(); } catch { /* already exited */ }
+      this._networkCheckProc = null;
+    }
 
     // Clean up file watchers and terminal sessions
     this.fileWatcher.unwatchAll();
@@ -823,10 +840,19 @@ export class Daemon {
 
     // Close server
     return new Promise((resolvePromise) => {
-      this.wss.close(() => {
-        this.server.close(() => {
-          console.log('GROOVE daemon stopped.');
-          resolvePromise();
+      this.federationWss.close(() => {
+        this.wss.close(() => {
+          this.server.close(() => {
+            // Unref lingering handles (idle fetch/undici TLS pool connections,
+            // closed servers) so they don't prevent process exit in tests.
+            for (const h of process._getActiveHandles()) {
+              if (typeof h.unref === 'function' && h !== process.stdout && h !== process.stderr) {
+                h.unref();
+              }
+            }
+            console.log('GROOVE daemon stopped.');
+            resolvePromise();
+          });
         });
       });
     });

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

@@ -1,8 +1,8 @@
 // GROOVE — Teams (Live Agent Groups)
 // FSL-1.1-Apache-2.0 — see LICENSE
 
-import { readFileSync, writeFileSync, existsSync, mkdirSync, renameSync, rmSync } from 'fs';
-import { resolve } from 'path';
+import { readFileSync, writeFileSync, existsSync, mkdirSync, renameSync, rmSync, readdirSync, cpSync } from 'fs';
+import { resolve, basename } from 'path';
 import { randomUUID } from 'crypto';
 import { validateTeamName } from './validate.js';
 
@@ -162,17 +162,39 @@ export class Teams {
       this.daemon.registry.remove(agent.id);
     }
 
-    // Remove the team's working directory — refuse to nuke the project root
-    // (legacy default teams that were never migrated point there).
+    // Archive the team's working directory instead of deleting it
     if (
       team.workingDir &&
       team.workingDir !== this.daemon.projectDir &&
       existsSync(team.workingDir)
     ) {
       try {
-        rmSync(team.workingDir, { recursive: true, force: true });
+        const archiveDir = resolve(this.daemon.grooveDir, 'archived-teams');
+        mkdirSync(archiveDir, { recursive: true });
+        const slug = basename(team.workingDir);
+        const archiveName = `${slug}-${Date.now()}`;
+        const archivePath = resolve(archiveDir, archiveName);
+
+        try {
+          renameSync(team.workingDir, archivePath);
+        } catch (err) {
+          if (err.code === 'EXDEV') {
+            cpSync(team.workingDir, archivePath, { recursive: true });
+            rmSync(team.workingDir, { recursive: true, force: true });
+          } else {
+            throw err;
+          }
+        }
+
+        const metadata = {
+          originalName: team.name,
+          originalId: team.id,
+          deletedAt: new Date().toISOString(),
+          agentCount: agents.length,
+        };
+        writeFileSync(resolve(archivePath, 'metadata.json'), JSON.stringify(metadata, null, 2));
       } catch (err) {
-        console.log(`[Groove:Teams] Failed to remove directory: ${err.message}`);
+        console.log(`[Groove:Teams] Failed to archive directory: ${err.message}`);
       }
     }
 
@@ -193,6 +215,78 @@ export class Teams {
     return true;
   }
 
+  listArchived() {
+    const archiveDir = resolve(this.daemon.grooveDir, 'archived-teams');
+    if (!existsSync(archiveDir)) return [];
+    const entries = readdirSync(archiveDir, { withFileTypes: true });
+    const result = [];
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const metaPath = resolve(archiveDir, entry.name, 'metadata.json');
+      try {
+        const meta = JSON.parse(readFileSync(metaPath, 'utf8'));
+        result.push({ id: entry.name, ...meta });
+      } catch {
+        result.push({ id: entry.name, originalName: entry.name, deletedAt: null, agentCount: 0 });
+      }
+    }
+    return result;
+  }
+
+  restore(archivedId) {
+    const archiveDir = resolve(this.daemon.grooveDir, 'archived-teams');
+    const archivePath = resolve(archiveDir, archivedId);
+    if (!existsSync(archivePath)) throw new Error('Archived team not found');
+
+    let meta = {};
+    const metaPath = resolve(archivePath, 'metadata.json');
+    try { meta = JSON.parse(readFileSync(metaPath, 'utf8')); } catch { /* use defaults */ }
+
+    const name = meta.originalName || archivedId;
+    const dirName = slugify(name);
+    let workingDir = resolve(this.daemon.projectDir, dirName);
+
+    if (existsSync(workingDir)) {
+      workingDir = resolve(this.daemon.projectDir, `${dirName}-${Date.now()}`);
+    }
+
+    try {
+      renameSync(archivePath, workingDir);
+    } catch (err) {
+      if (err.code === 'EXDEV') {
+        cpSync(archivePath, workingDir, { recursive: true });
+        rmSync(archivePath, { recursive: true, force: true });
+      } else {
+        throw err;
+      }
+    }
+
+    // Remove the metadata file from the restored directory
+    const restoredMetaPath = resolve(workingDir, 'metadata.json');
+    try { rmSync(restoredMetaPath); } catch { /* may not exist */ }
+
+    const id = randomUUID().slice(0, 8);
+    const team = {
+      id,
+      name,
+      isDefault: false,
+      workingDir,
+      createdAt: new Date().toISOString(),
+    };
+    this.teams.set(id, team);
+    this._save();
+    this.daemon.broadcast({ type: 'team:created', team });
+    return team;
+  }
+
+  purge(archivedId) {
+    const archiveDir = resolve(this.daemon.grooveDir, 'archived-teams');
+    const archivePath = resolve(archiveDir, archivedId);
+    if (!existsSync(archivePath)) throw new Error('Archived team not found');
+    rmSync(archivePath, { recursive: true, force: true });
+    return true;
+  }
+
   // Migrate old agents (teamName but no teamId) to default team
   migrateAgents() {
     const defaultTeam = this.getDefault();

package/node_modules/@groove-dev/daemon/src/tunnel-manager.js

@@ -3,15 +3,13 @@
 
 import { execFileSync, spawn } from 'child_process';
 import { existsSync, writeFileSync, readFileSync, statSync } from 'fs';
-import { resolve, dirname, join } from 'path';
-import { fileURLToPath } from 'url';
+import { resolve } from 'path';
 import { createConnection } from 'net';
 import crypto from 'crypto';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
 function getLocalVersion() {
   try {
-    const pkg = JSON.parse(readFileSync(join(__dirname, '..', '..', '..', 'package.json'), 'utf8'));
+    const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
     return pkg.version || '0.0.0';
   } catch { return '0.0.0'; }
 }
@@ -34,6 +32,11 @@ function validateField(value, name) {
   }
 }
 
+function sshCmd(cmd) {
+  const nvmProbe = 'export NVM_DIR="${NVM_DIR:-$HOME/.nvm}"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; ';
+  return `bash -lc '${nvmProbe}${cmd}'`;
+}
+
 export class TunnelManager {
   constructor(daemon) {
     this.daemon = daemon;
@@ -217,7 +220,7 @@ export class TunnelManager {
         '-o', 'StrictHostKeyChecking=accept-new',
         '-o', 'BatchMode=yes',
         target,
-        `bash -lc 'S=$(curl -sf http://localhost:${REMOTE_PORT}/api/status 2>/dev/null); if [ -n "$S" ]; then echo "__GROOVE_RUNNING__$S__GROOVE_END__"; else which groove >/dev/null 2>&1 && echo __GROOVE_VER__$(groove --version 2>/dev/null || echo unknown)__GROOVE_STOPPED__ || echo __GROOVE_NOT_INSTALLED__; fi'`,
+        sshCmd(`S=$(curl -sf http://localhost:${REMOTE_PORT}/api/status 2>/dev/null); if [ -n "$S" ]; then echo "__GROOVE_RUNNING__$S__GROOVE_END__"; else which groove >/dev/null 2>&1 && echo __GROOVE_VER__$(groove --version 2>/dev/null || echo unknown)__GROOVE_STOPPED__ || echo __GROOVE_NOT_INSTALLED__; fi`),
       ], {
         encoding: 'utf8',
         timeout: 20000,
@@ -412,7 +415,7 @@ export class TunnelManager {
       const installCmd = config.user === 'root' ? `npm i -g --prefer-online ${pinnedPkg}` : `sudo npm i -g --prefer-online ${pinnedPkg}`;
 
       try {
-        execFileSync('ssh', [...sshBase, `bash -lc '${installCmd}'`], {
+        execFileSync('ssh', [...sshBase, sshCmd(installCmd)], {
           encoding: 'utf8',
           timeout: 120000,
           stdio: ['pipe', 'pipe', 'pipe'],
@@ -420,14 +423,14 @@ export class TunnelManager {
       } catch {
         const fallbackPkg = 'groove-dev';
         const fallbackCmd = config.user === 'root' ? `npm i -g --prefer-online ${fallbackPkg}` : `sudo npm i -g --prefer-online ${fallbackPkg}`;
-        execFileSync('ssh', [...sshBase, `bash -lc '${fallbackCmd}'`], {
+        execFileSync('ssh', [...sshBase, sshCmd(fallbackCmd)], {
           encoding: 'utf8',
           timeout: 120000,
           stdio: ['pipe', 'pipe', 'pipe'],
         });
       }
 
-      const verOutput = execFileSync('ssh', [...sshBase, `bash -lc 'groove --version'`], {
+      const verOutput = execFileSync('ssh', [...sshBase, sshCmd('groove --version')], {
         encoding: 'utf8',
         timeout: 10000,
         stdio: ['pipe', 'pipe', 'pipe'],
@@ -438,8 +441,8 @@ export class TunnelManager {
         this.daemon.broadcast({ type: 'tunnel.version-mismatch', data: { id, localVersion: localVer, remoteVersion: installedVer, message: 'Pinned version not available on npm, installed latest' } });
       }
 
-      const restartCmd = `kill $(lsof -t -i:${REMOTE_PORT}) 2>/dev/null || true; sleep 2; nohup groove start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; sleep 4; curl -sf http://localhost:${REMOTE_PORT}/api/status`;
-      const restartResult = execFileSync('ssh', [...sshBase, `bash -lc '${restartCmd}'`], {
+      const restartCmd = `kill $(lsof -t -i:${REMOTE_PORT}) 2>/dev/null || true; sleep 2; GROOVE_BIN=$(which groove) && nohup "$GROOVE_BIN" start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; sleep 4; curl -sf http://localhost:${REMOTE_PORT}/api/status`;
+      const restartResult = execFileSync('ssh', [...sshBase, sshCmd(restartCmd)], {
         encoding: 'utf8',
         timeout: 60000,
         stdio: ['pipe', 'pipe', 'pipe'],
@@ -484,30 +487,40 @@ export class TunnelManager {
 
     let usedFallback = false;
     try {
-      execFileSync('ssh', [...sshBase, `bash -lc '${installCmd}'`], {
+      execFileSync('ssh', [...sshBase, sshCmd(installCmd)], {
         encoding: 'utf8',
         timeout: 120000,
         stdio: ['pipe', 'pipe', 'pipe'],
       });
     } catch (err) {
-      if (localVer !== '0.0.0' && pkg.includes('@')) {
-        const fallbackCmd = config.user === 'root' ? 'npm i -g --prefer-online groove-dev' : 'sudo npm i -g --prefer-online groove-dev';
+      const errOutput = err.stdout?.toString() || err.stderr?.toString() || err.message;
+      if (errOutput.includes('ENOTEMPTY')) {
         try {
-          execFileSync('ssh', [...sshBase, `bash -lc '${fallbackCmd}'`], {
-            encoding: 'utf8',
-            timeout: 120000,
-            stdio: ['pipe', 'pipe', 'pipe'],
-          });
-          usedFallback = true;
-        } catch { /* fall through to original error */ }
-      }
-      if (!usedFallback) {
-        const output = err.stdout?.toString() || err.stderr?.toString() || err.message;
-        throw new Error(`Remote upgrade failed: ${output.slice(-400)}`);
+          execFileSync('ssh', [...sshBase, sshCmd('rm -rf $(npm root -g)/.groove-dev-* $(npm root -g)/groove-dev 2>/dev/null || true')], { encoding: 'utf8', timeout: 15000, stdio: ['pipe', 'pipe', 'pipe'] });
+          execFileSync('ssh', [...sshBase, sshCmd(installCmd)], { encoding: 'utf8', timeout: 120000, stdio: ['pipe', 'pipe', 'pipe'] });
+        } catch (retryErr) {
+          const retryOutput = retryErr.stdout?.toString() || retryErr.stderr?.toString() || retryErr.message;
+          throw new Error(`Remote upgrade failed after cleanup: ${retryOutput.slice(-400)}`);
+        }
+      } else {
+        if (localVer !== '0.0.0' && pkg.includes('@')) {
+          const fallbackCmd = config.user === 'root' ? 'npm i -g --prefer-online groove-dev' : 'sudo npm i -g --prefer-online groove-dev';
+          try {
+            execFileSync('ssh', [...sshBase, sshCmd(fallbackCmd)], {
+              encoding: 'utf8',
+              timeout: 120000,
+              stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            usedFallback = true;
+          } catch { /* fall through to original error */ }
+        }
+        if (!usedFallback) {
+          throw new Error(`Remote upgrade failed: ${errOutput.slice(-400)}`);
+        }
       }
     }
 
-    const verOutput = execFileSync('ssh', [...sshBase, `bash -lc 'groove --version'`], {
+    const verOutput = execFileSync('ssh', [...sshBase, sshCmd('groove --version')], {
       encoding: 'utf8',
       timeout: 10000,
       stdio: ['pipe', 'pipe', 'pipe'],
@@ -537,7 +550,7 @@ export class TunnelManager {
       ? `curl -sf -X POST -H 'Content-Type: application/json' --data '{"path":"${config.projectDir}"}' http://localhost:${REMOTE_PORT}/api/project-dir > /dev/null 2>&1 || true; `
       : '';
     const remoteCmd =
-      `${cdPrefix}nohup groove start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; ` +
+      `${cdPrefix}GROOVE_BIN=$(which groove) && nohup "$GROOVE_BIN" start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; ` +
       `sleep 5; ` +
       `curl -sf http://localhost:${REMOTE_PORT}/api/health > /dev/null ` +
       `&& (${setProjectDir}echo __DAEMON_OK__) ` +
@@ -550,7 +563,7 @@ export class TunnelManager {
         '-o', 'ConnectTimeout=10',
         '-o', 'BatchMode=yes',
         target,
-        `bash -lc '${remoteCmd}'`,
+        sshCmd(remoteCmd),
       ], {
         encoding: 'utf8',
         timeout: 45000,
@@ -585,7 +598,7 @@ export class TunnelManager {
 
     // Non-interactive SSH doesn't source shell profiles, so npm/node may not be on PATH.
     // Use a login shell (-l) to get the user's full environment.
-    const remoteCmd = (cmd) => `bash -lc '${cmd}'`;
+    const remoteCmd = (cmd) => sshCmd(cmd);
 
     // Step 1: Check if node/npm are available
     try {
@@ -623,7 +636,16 @@ export class TunnelManager {
         stdio: ['pipe', 'pipe', 'pipe'],
       });
     } catch (err) {
-      if (localVer !== '0.0.0' && pkg.includes('@')) {
+      const errOutput = err.stdout?.toString() || err.stderr?.toString() || err.message;
+      if (errOutput.includes('ENOTEMPTY')) {
+        try {
+          execFileSync('ssh', [...sshBase, remoteCmd('rm -rf $(npm root -g)/.groove-dev-* $(npm root -g)/groove-dev 2>/dev/null || true')], { encoding: 'utf8', timeout: 15000, stdio: ['pipe', 'pipe', 'pipe'] });
+          execFileSync('ssh', [...sshBase, remoteCmd(installCmd)], { encoding: 'utf8', timeout: 120000, stdio: ['pipe', 'pipe', 'pipe'] });
+        } catch (retryErr) {
+          const retryOutput = retryErr.stdout?.toString() || retryErr.stderr?.toString() || retryErr.message;
+          throw new Error(`npm install failed after cleanup: ${retryOutput.slice(-400)}`);
+        }
+      } else if (localVer !== '0.0.0' && pkg.includes('@')) {
         const fallbackCmd = config.user === 'root' ? 'npm i -g --prefer-online groove-dev' : 'sudo npm i -g --prefer-online groove-dev';
         try {
           execFileSync('ssh', [...sshBase, remoteCmd(fallbackCmd)], {
@@ -636,8 +658,7 @@ export class TunnelManager {
           throw new Error(`npm install failed: ${output.slice(-400)}`);
         }
       } else {
-        const output = err.stdout?.toString() || err.stderr?.toString() || err.message;
-        throw new Error(`npm install failed: ${output.slice(-400)}`);
+        throw new Error(`npm install failed: ${errOutput.slice(-400)}`);
       }
     }
 
@@ -645,7 +666,7 @@ export class TunnelManager {
     try {
       const result = execFileSync('ssh', [
         ...sshBase,
-        remoteCmd(`nohup groove start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; sleep 5; curl -sf http://localhost:${REMOTE_PORT}/api/health > /dev/null && echo __DAEMON_OK__ || (echo __DAEMON_FAIL__; tail -20 /tmp/groove-daemon.log 2>/dev/null)`),
+        remoteCmd(`GROOVE_BIN=$(which groove) && nohup "$GROOVE_BIN" start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; sleep 5; curl -sf http://localhost:${REMOTE_PORT}/api/health > /dev/null && echo __DAEMON_OK__ || (echo __DAEMON_FAIL__; tail -20 /tmp/groove-daemon.log 2>/dev/null)`),
       ], {
         encoding: 'utf8',
         timeout: 45000,
@@ -683,29 +704,40 @@ export class TunnelManager {
     const installCmd = config.user === 'root' ? `npm i -g --prefer-online ${pinnedPkg}` : `sudo npm i -g --prefer-online ${pinnedPkg}`;
 
     try {
-      execFileSync('ssh', [...sshBase, `bash -lc '${installCmd}'`], {
-        encoding: 'utf8',
-        timeout: 120000,
-        stdio: ['pipe', 'pipe', 'pipe'],
-      });
-    } catch {
-      const fallbackCmd = config.user === 'root' ? 'npm i -g --prefer-online groove-dev' : 'sudo npm i -g --prefer-online groove-dev';
-      execFileSync('ssh', [...sshBase, `bash -lc '${fallbackCmd}'`], {
+      execFileSync('ssh', [...sshBase, sshCmd(installCmd)], {
         encoding: 'utf8',
         timeout: 120000,
         stdio: ['pipe', 'pipe', 'pipe'],
       });
+    } catch (err) {
+      const errOutput = err.stdout?.toString() || err.stderr?.toString() || err.message;
+      if (errOutput.includes('ENOTEMPTY')) {
+        try {
+          execFileSync('ssh', [...sshBase, sshCmd('rm -rf $(npm root -g)/.groove-dev-* $(npm root -g)/groove-dev 2>/dev/null || true')], { encoding: 'utf8', timeout: 15000, stdio: ['pipe', 'pipe', 'pipe'] });
+          execFileSync('ssh', [...sshBase, sshCmd(installCmd)], { encoding: 'utf8', timeout: 120000, stdio: ['pipe', 'pipe', 'pipe'] });
+        } catch (retryErr) {
+          const retryOutput = retryErr.stdout?.toString() || retryErr.stderr?.toString() || retryErr.message;
+          throw new Error(`npm install failed after cleanup: ${retryOutput.slice(-400)}`);
+        }
+      } else {
+        const fallbackCmd = config.user === 'root' ? 'npm i -g --prefer-online groove-dev' : 'sudo npm i -g --prefer-online groove-dev';
+        execFileSync('ssh', [...sshBase, sshCmd(fallbackCmd)], {
+          encoding: 'utf8',
+          timeout: 120000,
+          stdio: ['pipe', 'pipe', 'pipe'],
+        });
+      }
     }
 
-    const verOutput = execFileSync('ssh', [...sshBase, `bash -lc 'groove --version'`], {
+    const verOutput = execFileSync('ssh', [...sshBase, sshCmd('groove --version')], {
       encoding: 'utf8',
       timeout: 10000,
       stdio: ['pipe', 'pipe', 'pipe'],
     }).trim();
     const installedVer = verOutput.replace(/[^0-9.]/g, '') || verOutput.trim();
 
-    const restartCmd = `kill $(lsof -t -i:${REMOTE_PORT}) 2>/dev/null || true; sleep 2; nohup groove start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; sleep 4; curl -sf http://localhost:${REMOTE_PORT}/api/status`;
-    const restartResult = execFileSync('ssh', [...sshBase, `bash -lc '${restartCmd}'`], {
+    const restartCmd = `kill $(lsof -t -i:${REMOTE_PORT}) 2>/dev/null || true; sleep 2; GROOVE_BIN=$(which groove) && nohup "$GROOVE_BIN" start > /tmp/groove-daemon.log 2>&1 < /dev/null & disown; sleep 4; curl -sf http://localhost:${REMOTE_PORT}/api/status`;
+    const restartResult = execFileSync('ssh', [...sshBase, sshCmd(restartCmd)], {
       encoding: 'utf8',
       timeout: 60000,
       stdio: ['pipe', 'pipe', 'pipe'],