groove-dev 0.27.156 → 0.27.157

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

@@ -1,6 +1,6 @@
 {
   "name": "@groove-dev/cli",
-  "version": "0.27.156",
+  "version": "0.27.157",
   "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.156",
+  "version": "0.27.157",
   "description": "GROOVE daemon — agent orchestration engine",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",

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

@@ -483,6 +483,9 @@ export class Journalist {
       'Be specific. Name files, functions, and line numbers. Do not summarize vaguely.',
       'Preserve the investigation narrative — the next agent needs to understand the',
       'journey, not just the destination.',
+      'IMPORTANT: Focus on what the user ASKED the agent to do (the original task).',
+      'Do NOT include observations about unrelated code issues, potential improvements,',
+      'or things the agent noticed but did not act on. The next agent must stay on task.',
       'Keep your response under 4000 characters.',
       '',
       '---',
@@ -1024,7 +1027,13 @@ export class Journalist {
       originalTask ? `## Original Task\n\n${originalTask}\n` : '',
       ``,
       agent.role === 'planner' ? 'CRITICAL: You are a PLANNING ONLY agent. Do NOT implement code. Route all work to your team via .groove/recommended-team.json.\n' : '',
-      `Continue seamlessly — finish the work and deliver the output.`,
+      `## Instructions`,
+      ``,
+      `Continue and finish the in-progress task — deliver the output. Stay focused on that specific task only.`,
+      `- Do NOT explore the codebase looking for other things to fix or improve`,
+      `- Do NOT start new work outside the original task scope`,
+      `- Do NOT act on TODO comments, code quality issues, or improvements you notice in passing`,
+      `- If the task is already complete, report what was accomplished and STOP — await new instructions from the user`,
     ].filter(Boolean).join('\n');
 
     // Hard cap: 16000 chars — investigation context needs room to preserve the full narrative
@@ -1142,34 +1151,60 @@ export class Journalist {
    * Build a full context-resume prompt that preserves the conversation
    * thread so a fresh agent picks up where the previous session left off.
    */
-  buildConversationResumePrompt(agent, userMessage) {
+  buildConversationResumePrompt(agent, userMessage, { isRotation = false, reason } = {}) {
     const thread = this.extractConversationThread(agent);
     if (!thread) return null;
 
     const constraints = this.daemon.memory?.getConstraintsMarkdown(2000) || '';
     const discoveries = this.daemon.memory?.getDiscoveriesMarkdown(agent.role, 5, 1000, agent.scope, agent.teamId) || '';
 
+    // Extract the user's original task from the conversation — the first substantial
+    // user message is almost always the task assignment. This anchors the new agent.
+    const originalTask = this._extractOriginalTask(thread);
+
+    // Rotation and idle-resume need very different framing. During rotation the agent
+    // has no new user message — it must continue the exact in-progress task without
+    // drifting. During idle-resume the user explicitly sent a message to continue.
+    const isIdleResume = !isRotation && userMessage && userMessage.trim().length > 0;
+
+    const taskFocusBlock = isRotation ? [
+      `## CRITICAL: Task Focus`,
+      ``,
+      `You were auto-rotated (reason: ${reason || 'context_management'}) — this is a routine context refresh, NOT a new assignment.`,
+      originalTask ? `Your task: ${originalTask}` : '',
+      ``,
+      `Rules:`,
+      `- Continue ONLY the task described in the conversation below`,
+      `- Do NOT explore the codebase looking for other things to fix or improve`,
+      `- Do NOT start new work that was not part of the original task`,
+      `- Do NOT act on TODO comments, code quality issues, or improvements you notice in passing`,
+      `- If the task is complete, report what was done and STOP — await new instructions from the user`,
+      `- If the task is in progress, pick up exactly where the previous session left off`,
+      ``,
+    ] : [];
+
     let prompt = [
       `# Session Context Resume`,
       ``,
-      `You are continuing a session that went idle. Below is the full conversation`,
-      `from your previous session — your actual exchanges with the user. Pick up`,
-      `exactly where you left off. The user's new message follows at the end.`,
+      isRotation
+        ? `You are continuing a session after an automatic context rotation. Your context was refreshed but your task has NOT changed. The conversation below is your previous session — continue the same work.`
+        : `You are continuing a session that went idle. Below is the full conversation from your previous session — your actual exchanges with the user. Pick up exactly where you left off. The user's new message follows at the end.`,
       ``,
       `Role: ${agent.role} | Provider: ${agent.provider} | Scope: ${agent.scope?.join(', ') || 'unrestricted'}`,
       agent.workingDir ? `Working directory: ${agent.workingDir}` : '',
       ``,
+      ...taskFocusBlock,
       constraints ? `## Project Constraints\n\n${constraints}\n` : '',
       discoveries ? `## Known Issues & Fixes\n\n${discoveries}\n` : '',
       `## Previous Conversation\n\n${thread}`,
       ``,
       `---`,
       ``,
-      `## New Message From User`,
-      ``,
-      userMessage,
+      isIdleResume ? `## New Message From User\n\n${userMessage}` : '',
       ``,
-      `Continue seamlessly from the conversation above. You have the full context of what was discussed, what was tried, what worked and what didn't. Do not ask the user to repeat anything.`,
+      isRotation
+        ? `Continue the in-progress task from the conversation above. Stay focused on that task only. Do not ask the user to repeat anything. If the task was already completed, state that and wait for new instructions.`
+        : `Continue seamlessly from the conversation above. You have the full context of what was discussed, what was tried, what worked and what didn't. Do not ask the user to repeat anything.`,
     ].filter(Boolean).join('\n');
 
     // Hard cap at 80K chars (~20K tokens) to leave plenty of room in context window
@@ -1180,23 +1215,24 @@ export class Journalist {
         prompt = [
           `# Session Context Resume`,
           ``,
-          `You are continuing a session that went idle. Below is the conversation`,
-          `from your previous session (older turns summarized to fit). Pick up`,
-          `exactly where you left off.`,
+          isRotation
+            ? `You are continuing after an automatic context rotation. Your task has NOT changed.`
+            : `You are continuing a session that went idle (older turns summarized to fit). Pick up exactly where you left off.`,
           ``,
           `Role: ${agent.role} | Scope: ${agent.scope?.join(', ') || 'unrestricted'}`,
           agent.workingDir ? `Working directory: ${agent.workingDir}` : '',
           ``,
+          ...taskFocusBlock,
           constraints ? `## Project Constraints\n\n${constraints}\n` : '',
           `## Previous Conversation\n\n${smallerThread}`,
           ``,
           `---`,
           ``,
-          `## New Message From User`,
-          ``,
-          userMessage,
+          isIdleResume ? `## New Message From User\n\n${userMessage}` : '',
           ``,
-          `Continue seamlessly. Do not ask the user to repeat anything.`,
+          isRotation
+            ? `Continue the in-progress task only. Do not explore or start new work. If done, state that and wait.`
+            : `Continue seamlessly. Do not ask the user to repeat anything.`,
         ].filter(Boolean).join('\n');
       }
     }
@@ -1204,6 +1240,15 @@ export class Journalist {
     return prompt;
   }
 
+  _extractOriginalTask(thread) {
+    // Find the first substantial USER message in the thread — that's the task.
+    const match = thread.match(/\[USER\]:\n([\s\S]*?)(?=\n\n---|\n\[CLAUDE\]:|$)/);
+    if (!match) return '';
+    const firstMsg = match[1].trim();
+    if (firstMsg.length < 10) return '';
+    return firstMsg.length > 500 ? firstMsg.slice(0, 500) + '...' : firstMsg;
+  }
+
   // --- Workspace Grouping ---
 
   /**

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

@@ -367,7 +367,8 @@ export class Rotator extends EventEmitter {
       if (typeof journalist.buildConversationResumePrompt === 'function') {
         const conversationPrompt = journalist.buildConversationResumePrompt(
           agent,
-          options.additionalPrompt || ''
+          options.additionalPrompt || '',
+          { isRotation: true, reason: options.reason || 'auto' }
         );
         if (conversationPrompt && conversationPrompt.length > 500) {
           brief = conversationPrompt;

package/node_modules/@groove-dev/daemon/src/routes/files.js

@@ -665,24 +665,46 @@ export function registerFileRoutes(app, daemon) {
     const rawFiles = daemon.registry.getFilesTouched(req.params.id);
     const rootDir = agent.workingDir || daemon.projectDir;
 
-    // Build git diff numstat for line-level +/- counts
+    // Build git diff numstat for line-level +/- counts (unstaged + staged + untracked)
     let numstatMap = {};
     const writtenPaths = rawFiles.filter(f => f.writes > 0).map(f => f.path);
     if (writtenPaths.length > 0) {
-      try {
-        const out = execFileSync('git', ['diff', '--numstat', '--', ...writtenPaths], {
-          cwd: rootDir, timeout: 10000, maxBuffer: 2 * 1024 * 1024,
-        }).toString();
+      const parseNumstat = (out) => {
         for (const line of out.split('\n')) {
           const m = line.match(/^(\d+|-)\t(\d+|-)\t(.+)$/);
-          if (m) {
+          if (m && !numstatMap[m[3]]) {
             numstatMap[m[3]] = {
               additions: m[1] === '-' ? 0 : Number(m[1]),
               deletions: m[2] === '-' ? 0 : Number(m[2]),
             };
           }
         }
+      };
+      try {
+        const unstaged = execFileSync('git', ['diff', '--numstat', '--', ...writtenPaths], {
+          cwd: rootDir, timeout: 10000, maxBuffer: 2 * 1024 * 1024,
+        }).toString();
+        parseNumstat(unstaged);
       } catch { /* git not available or not a repo */ }
+      try {
+        const staged = execFileSync('git', ['diff', '--cached', '--numstat', '--', ...writtenPaths], {
+          cwd: rootDir, timeout: 10000, maxBuffer: 2 * 1024 * 1024,
+        }).toString();
+        parseNumstat(staged);
+      } catch { /* ignore */ }
+      // For untracked files not covered by diff, count lines as all additions
+      for (const p of writtenPaths) {
+        if (numstatMap[p]) continue;
+        const full = isAbsolute(p) ? p : resolve(rootDir, p);
+        try {
+          const stat = statSync(full);
+          if (stat.isFile()) {
+            const content = readFileSync(full, 'utf8');
+            const lineCount = content.split('\n').length;
+            numstatMap[p] = { additions: lineCount, deletions: 0 };
+          }
+        } catch { /* file may not exist */ }
+      }
     }
 
     const files = rawFiles.map(f => {

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

@@ -37,6 +37,18 @@ function sshCmd(cmd) {
   return `bash -lc '${nvmProbe}${cmd}'`;
 }
 
+function npmGlobalInstall(pkg, user) {
+  const base = `npm i -g --prefer-online ${pkg}`;
+  if (user === 'root') return base;
+  return `${base} || sudo -n ${base}`;
+}
+
+function isPermissionError(output) {
+  return /EACCES|permission denied|sudo.*password/i.test(output);
+}
+
+const PERMISSION_HINT = 'npm global install requires write access. Either install Node via nvm (recommended) or configure passwordless sudo for npm on the remote server.';
+
 export class TunnelManager {
   constructor(daemon) {
     this.daemon = daemon;
@@ -446,7 +458,7 @@ export class TunnelManager {
       const keyArgs = config.sshKeyPath ? ['-i', config.sshKeyPath] : [];
       const sshBase = [...keyArgs, '-p', String(config.port || 22), '-o', 'ConnectTimeout=10', '-o', 'BatchMode=yes', target];
       const pinnedPkg = `groove-dev@${localVer}`;
-      const installCmd = config.user === 'root' ? `npm i -g --prefer-online ${pinnedPkg}` : `sudo npm i -g --prefer-online ${pinnedPkg}`;
+      const installCmd = npmGlobalInstall(pinnedPkg, config.user);
 
       try {
         execFileSync('ssh', [...sshBase, sshCmd(installCmd)], {
@@ -455,8 +467,7 @@ export class TunnelManager {
           stdio: ['pipe', 'pipe', 'pipe'],
         });
       } catch {
-        const fallbackPkg = 'groove-dev';
-        const fallbackCmd = config.user === 'root' ? `npm i -g --prefer-online ${fallbackPkg}` : `sudo npm i -g --prefer-online ${fallbackPkg}`;
+        const fallbackCmd = npmGlobalInstall('groove-dev', config.user);
         execFileSync('ssh', [...sshBase, sshCmd(fallbackCmd)], {
           encoding: 'utf8',
           timeout: 120000,
@@ -533,7 +544,7 @@ export class TunnelManager {
     const sshBase = [...keyArgs, '-p', String(config.port || 22), '-o', 'ConnectTimeout=10', '-o', 'BatchMode=yes', target];
     const localVer = getLocalVersion();
     const pkg = localVer !== '0.0.0' ? `groove-dev@${localVer}` : 'groove-dev';
-    const installCmd = config.user === 'root' ? `npm i -g --prefer-online ${pkg}` : `sudo npm i -g --prefer-online ${pkg}`;
+    const installCmd = npmGlobalInstall(pkg, config.user);
 
     let usedFallback = false;
     try {
@@ -554,7 +565,7 @@ export class TunnelManager {
         }
       } 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';
+          const fallbackCmd = npmGlobalInstall('groove-dev', config.user);
           try {
             execFileSync('ssh', [...sshBase, sshCmd(fallbackCmd)], {
               encoding: 'utf8',
@@ -565,6 +576,7 @@ export class TunnelManager {
           } catch { /* fall through to original error */ }
         }
         if (!usedFallback) {
+          if (isPermissionError(errOutput)) throw new Error(PERMISSION_HINT);
           throw new Error(`Remote upgrade failed: ${errOutput.slice(-400)}`);
         }
       }
@@ -670,12 +682,10 @@ export class TunnelManager {
       throw new Error(`Failed to check remote environment: ${err.message}`);
     }
 
-    // Step 2: Install groove-dev globally (use sudo if not root)
+    // Step 2: Install groove-dev globally (try user-space first, sudo fallback)
     const localVer = getLocalVersion();
     const pkg = localVer !== '0.0.0' ? `groove-dev@${localVer}` : 'groove-dev';
-    const installCmd = config.user === 'root'
-      ? `npm i -g --prefer-online ${pkg}`
-      : `sudo npm i -g --prefer-online ${pkg}`;
+    const installCmd = npmGlobalInstall(pkg, config.user);
 
     try {
       execFileSync('ssh', [
@@ -697,7 +707,7 @@ export class TunnelManager {
           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';
+        const fallbackCmd = npmGlobalInstall('groove-dev', config.user);
         try {
           execFileSync('ssh', [...sshBase, remoteCmd(fallbackCmd)], {
             encoding: 'utf8',
@@ -706,9 +716,11 @@ export class TunnelManager {
           });
         } catch (err2) {
           const output = err2.stdout?.toString() || err2.stderr?.toString() || err2.message;
+          if (isPermissionError(output)) throw new Error(PERMISSION_HINT);
           throw new Error(`npm install failed: ${output.slice(-400)}`);
         }
       } else {
+        if (isPermissionError(errOutput)) throw new Error(PERMISSION_HINT);
         throw new Error(`npm install failed: ${errOutput.slice(-400)}`);
       }
     }
@@ -752,7 +764,7 @@ export class TunnelManager {
     const keyArgs = config.sshKeyPath ? ['-i', config.sshKeyPath] : [];
     const sshBase = [...keyArgs, '-p', String(config.port || 22), '-o', 'ConnectTimeout=10', '-o', 'BatchMode=yes', target];
     const pinnedPkg = `groove-dev@${localVer}`;
-    const installCmd = config.user === 'root' ? `npm i -g --prefer-online ${pinnedPkg}` : `sudo npm i -g --prefer-online ${pinnedPkg}`;
+    const installCmd = npmGlobalInstall(pinnedPkg, config.user);
 
     try {
       execFileSync('ssh', [...sshBase, sshCmd(installCmd)], {
@@ -771,7 +783,7 @@ export class TunnelManager {
           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';
+        const fallbackCmd = npmGlobalInstall('groove-dev', config.user);
         execFileSync('ssh', [...sshBase, sshCmd(fallbackCmd)], {
           encoding: 'utf8',
           timeout: 120000,