groove-dev 0.27.61 → 0.27.62

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

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

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

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

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

@@ -2,10 +2,10 @@
 // FSL-1.1-Apache-2.0 — see LICENSE
 
 import express from 'express';
-import { resolve, dirname, join, sep } from 'path';
+import { resolve, dirname, join, sep, relative } from 'path';
 import { fileURLToPath } from 'url';
 import { existsSync, readFileSync, readdirSync, statSync, writeFileSync, mkdirSync, unlinkSync, renameSync, rmSync, createReadStream, copyFileSync, realpathSync } from 'fs';
-import { spawn, execFile } from 'child_process';
+import { spawn, execFile, execFileSync } from 'child_process';
 import { createHash, randomUUID } from 'crypto';
 import { hostname, networkInterfaces, homedir } from 'os';
 import { lookup as mimeLookup } from './mimetypes.js';
@@ -2914,6 +2914,18 @@ Keep responses concise. Help them think, don't lecture them about the system the
         console.log(`[Groove] Project directory: ${projectWorkingDir}`);
       }
 
+      function normalizeScope(patterns, baseDir) {
+        if (!patterns || !Array.isArray(patterns)) return patterns;
+        return patterns.map((p) => {
+          if (typeof p === 'string' && p.startsWith('/')) {
+            const rel = relative(baseDir, p);
+            if (!rel.startsWith('..')) return rel;
+            return p.slice(1);
+          }
+          return p;
+        });
+      }
+
       // Separate phase 1 (builders) and phase 2 (QC/finisher)
       const phase1 = agentConfigs.filter((a) => !a.phase || a.phase === 1);
       let phase2 = agentConfigs.filter((a) => a.phase === 2);
@@ -2973,7 +2985,7 @@ Keep responses concise. Help them think, don't lecture them about the system the
             // Spawn fresh with the same name/team but new prompt + full context
             const validated = validateAgentConfig({
               role: existing.role,
-              scope: config.scope || existing.scope || [],
+              scope: normalizeScope(config.scope || existing.scope || [], existing.workingDir || projectWorkingDir),
               prompt,
               provider: config.provider || existing.provider || undefined,
               model: config.model || existing.model || daemon.config?.defaultModel || 'auto',
@@ -2995,7 +3007,7 @@ Keep responses concise. Help them think, don't lecture them about the system the
           try {
             const validated = validateAgentConfig({
               role: config.role,
-              scope: config.scope || [],
+              scope: normalizeScope(config.scope || [], config.workingDir || projectWorkingDir),
               prompt,
               provider: config.provider || undefined,
               model: config.model || daemon.config?.defaultModel || 'auto',
@@ -3015,6 +3027,10 @@ Keep responses concise. Help them think, don't lecture them about the system the
         }
       }
 
+      if (failed.length > 0) {
+        console.warn(`[Groove] Team launch had ${failed.length} failure(s):`, failed.map((f) => `${f.role}: ${f.error}`).join(', '));
+      }
+
       // Phase 2 agents also scoped to projectWorkingDir
       if (phase2.length > 0 && phase1Ids.length > 0) {
         // Dedup: if a running idle fullstack already exists in this team,
@@ -4619,9 +4635,37 @@ Keep responses concise. Help them think, don't lecture them about the system the
       : join(base, 'venv', 'bin', 'python3');
   }
 
+  let _cachedGitBash = undefined;
+  function findGitBash() {
+    if (_cachedGitBash !== undefined) return _cachedGitBash;
+    try {
+      const gitPath = execFileSync('where', ['git'], { timeout: 5000, stdio: ['ignore', 'pipe', 'ignore'] })
+        .toString().trim().split('\n')[0].trim();
+      // git.exe is typically at <Git>\cmd\git.exe — navigate up to Git root
+      const gitDir = dirname(dirname(gitPath));
+      const candidate = join(gitDir, 'bin', 'bash.exe');
+      if (existsSync(candidate)) { _cachedGitBash = candidate; return _cachedGitBash; }
+    } catch { /* where failed — try common paths */ }
+    const fallbacks = [
+      'C:\\Program Files\\Git\\bin\\bash.exe',
+      'C:\\Program Files (x86)\\Git\\bin\\bash.exe',
+    ];
+    for (const p of fallbacks) {
+      if (existsSync(p)) { _cachedGitBash = p; return _cachedGitBash; }
+    }
+    _cachedGitBash = null;
+    return null;
+  }
+
   function spawnSetupSh(cwd) {
     if (IS_WIN) {
-      return spawn('cmd.exe', ['/c', 'bash setup.sh --json'], {
+      const bashPath = findGitBash();
+      if (!bashPath) {
+        const err = new Error('Could not find bash. Ensure Git for Windows is installed from https://git-scm.com');
+        err.code = 'BASH_NOT_FOUND';
+        throw err;
+      }
+      return spawn(bashPath, ['setup.sh', '--json'], {
         cwd,
         stdio: ['ignore', 'pipe', 'pipe'],
         env: { ...process.env, PYTHONUNBUFFERED: '1' },
@@ -4728,7 +4772,7 @@ Keep responses concise. Help them think, don't lecture them about the system the
       };
 
       try {
-        const pat = daemon.credentials?.getKey?.('github-pat') || null;
+        const pat = daemon.credentials?.getKey?.('github') || daemon.credentials?.getKey?.('github-pat') || null;
 
         let installVersion;
         try {
@@ -4739,6 +4783,14 @@ Keep responses concise. Help them think, don't lecture them about the system the
 
         broadcastInstallProgress('cloning', `Cloning network package ${installVersion}...`, 0);
 
+        // Pre-flight: verify git is installed before attempting clone.
+        const gitInstalled = await new Promise((resolveGit) => {
+          execFile('git', ['--version'], { timeout: 5000 }, (err) => resolveGit(!err));
+        });
+        if (!gitInstalled) {
+          return fail('Git is not installed. Install Git from https://git-scm.com and restart Groove.');
+        }
+
         const cloneArgs = ['clone', '--branch', installVersion, '--depth', '1', NETWORK_REPO_URL, installPath];
         const cloneEnv = { ...process.env, GIT_TERMINAL_PROMPT: '0' };
         if (pat) {
@@ -4768,14 +4820,30 @@ Keep responses concise. Help them think, don't lecture them about the system the
         });
 
         if (cloneCode.code !== 0) {
-          const hint = stripCredentials(cloneErr.trim().split('\n').slice(-1)[0] || 'git clone failed');
+          let hint;
+          const errMsg = cloneCode.err || '';
+          const lastLine = cloneErr.trim().split('\n').slice(-1)[0] || '';
+          if (errMsg.includes('ENOENT')) {
+            hint = 'Git is not installed. Install Git from https://git-scm.com and restart Groove.';
+          } else if (/Authentication failed|could not read Username/i.test(cloneErr)) {
+            hint = 'Authentication failed — run "groove set-key github-pat <token>" to set a GitHub PAT.';
+          } else if (/not found/i.test(cloneErr)) {
+            hint = `Repository or tag not found (${installVersion}). Check NETWORK_REPO_URL and tag.`;
+          } else {
+            hint = stripCredentials(lastLine || errMsg || 'git clone failed');
+          }
           return fail(`Clone failed: ${hint}`);
         }
 
         broadcastInstallProgress('cloned', 'Repository cloned', 10);
 
         // Run setup.sh --json from the install directory
-        const setup = spawnSetupSh(installPath);
+        let setup;
+        try {
+          setup = spawnSetupSh(installPath);
+        } catch (spawnErr) {
+          return fail(`Setup failed: ${spawnErr.message}`);
+        }
 
         daemon.networkInstall.proc = setup;
 
@@ -4809,7 +4877,12 @@ Keep responses concise. Help them think, don't lecture them about the system the
         });
 
         if (setupResult.code !== 0) {
-          const hint = stderrBuf.trim().split('\n').slice(-1)[0] || `setup.sh exited ${setupResult.code}`;
+          let hint;
+          if (setupResult.code === -1 || setupResult.err?.includes('ENOENT')) {
+            hint = 'bash not found — ensure Git for Windows is installed from https://git-scm.com';
+          } else {
+            hint = stderrBuf.trim().split('\n').slice(-1)[0] || `setup.sh exited ${setupResult.code}`;
+          }
           return fail(`Setup failed: ${hint}`);
         }
 
@@ -4883,9 +4956,16 @@ Keep responses concise. Help them think, don't lecture them about the system the
   // surface that. Uses spawn with array args — no shell interpolation.
   function fetchLatestNetworkTag() {
     return new Promise((resolvePromise) => {
+      const tagEnv = { ...process.env, GIT_TERMINAL_PROMPT: '0' };
+      const tagPat = daemon.credentials?.getKey?.('github') || daemon.credentials?.getKey?.('github-pat') || null;
+      if (tagPat) {
+        tagEnv.GIT_CONFIG_COUNT = '1';
+        tagEnv.GIT_CONFIG_KEY_0 = 'http.extraHeader';
+        tagEnv.GIT_CONFIG_VALUE_0 = `Authorization: token ${tagPat}`;
+      }
       const proc = spawn('git', ['ls-remote', '--tags', NETWORK_REPO_URL], {
         stdio: ['ignore', 'pipe', 'pipe'],
-        env: { ...process.env, GIT_TERMINAL_PROMPT: '0' },
+        env: tagEnv,
       });
       let stdout = '';
       let stderr = '';
@@ -5023,7 +5103,12 @@ Keep responses concise. Help them think, don't lecture them about the system the
 
         broadcastUpdateProgress('deps', 'Updating dependencies...', 30);
 
-        const setup = spawnSetupSh(installPath);
+        let setup;
+        try {
+          setup = spawnSetupSh(installPath);
+        } catch (spawnErr) {
+          return fail(`Setup failed: ${spawnErr.message}`);
+        }
 
         daemon.networkInstall.proc = setup;
 
@@ -5054,7 +5139,12 @@ Keep responses concise. Help them think, don't lecture them about the system the
         });
 
         if (setupResult.code !== 0) {
-          const hint = stderrBuf.trim().split('\n').slice(-1)[0] || `setup.sh exited ${setupResult.code}`;
+          let hint;
+          if (setupResult.code === -1 || setupResult.err?.includes('ENOENT')) {
+            hint = 'bash not found — ensure Git for Windows is installed from https://git-scm.com';
+          } else {
+            hint = stderrBuf.trim().split('\n').slice(-1)[0] || `setup.sh exited ${setupResult.code}`;
+          }
           return fail(`Setup failed: ${hint}`);
         }