groove-dev 0.27.141 → 0.27.143

package/packages/daemon/src/memory.js

@@ -261,7 +261,7 @@ export class MemoryStore {
 
   // --- Discoveries (error → fix pairs) ---
 
-  addDiscovery({ agentId, role, trigger, fix, outcome = 'success' }) {
+  addDiscovery({ agentId, role, trigger, fix, outcome = 'success', teamId }) {
     if (!trigger || !fix) return { added: false, error: 'trigger and fix required' };
     if (outcome !== 'success') return { added: false, reason: 'only successes stored' };
 
@@ -277,6 +277,7 @@ export class MemoryStore {
       ts: new Date().toISOString(),
       agentId: agentId || null,
       role: role || 'unknown',
+      teamId: teamId || null,
       trigger: truncate(String(trigger).trim(), 300),
       fix: truncate(String(fix).trim(), 500),
       outcome,
@@ -298,7 +299,7 @@ export class MemoryStore {
     }
   }
 
-  listDiscoveries({ role, limit = 100 } = {}) {
+  listDiscoveries({ role, teamId, limit = 100 } = {}) {
     if (!existsSync(this.discoveriesPath)) return [];
     try {
       const lines = readFileSync(this.discoveriesPath, 'utf8').split('\n').filter(Boolean);
@@ -306,7 +307,9 @@ export class MemoryStore {
       for (const line of lines) {
         try {
           const e = JSON.parse(line);
-          if (!role || e.role === role) entries.push(e);
+          if (role && e.role !== role) continue;
+          if (teamId && e.teamId && e.teamId !== teamId) continue;
+          entries.push(e);
         } catch { /* skip malformed */ }
       }
       return entries.slice(-limit).reverse(); // newest first
@@ -328,8 +331,8 @@ export class MemoryStore {
     } catch { /* best-effort */ }
   }
 
-  getDiscoveriesMarkdown(role, limit = 20, maxChars = 4000, scope) {
-    let entries = this.listDiscoveries({ role, limit: limit * 3 });
+  getDiscoveriesMarkdown(role, limit = 20, maxChars = 4000, scope, teamId) {
+    let entries = this.listDiscoveries({ role, teamId, limit: limit * 3 });
     if (entries.length === 0) return '';
 
     if (scope && Array.isArray(scope) && scope.length > 0) {

package/packages/daemon/src/process.js

@@ -2000,22 +2000,11 @@ For normal file edits within your scope, proceed without review.
       return this.daemon.rotator.rotate(agentId, { additionalPrompt: message });
     }
 
-    // Context-aware idle resume: if the agent has been idle long enough for
-    // internal compaction to degrade context, spawn fresh with the full
-    // conversation thread instead of resuming the compacted session.
-    const IDLE_CONTEXT_THRESHOLD_MS = 5 * 60_000; // 5 minutes (matches prompt cache TTL)
-    const idleMs = agent.lastActivity
-      ? Date.now() - new Date(agent.lastActivity).getTime()
-      : Infinity;
-
-    if (idleMs > IDLE_CONTEXT_THRESHOLD_MS && this.daemon.journalist) {
-      const resumePrompt = this.daemon.journalist.buildConversationResumePrompt(agent, message);
-      if (resumePrompt) {
-        console.log(`[Groove] Agent ${agent.name} idle ${Math.round(idleMs / 60000)}min — using conversation-thread resume`);
-        // Use rotation machinery but with our richer prompt instead of handoff brief
-        return this._conversationResume(agentId, agent, resumePrompt);
-      }
-    }
+    // Conversation-thread resume: available via explicit API call (conversationResume=true)
+    // but NOT automatic. The old 5-min idle threshold was too aggressive — it replaced
+    // every normal --resume with a full re-spawn, losing the Claude Code session.
+    // Normal --resume preserves the actual CC session; conversation-resume is for when
+    // the user explicitly wants a fresh context with the dialogue replayed.
 
     const provider = getProvider(agent.provider || 'claude-code');
     if (!provider?.buildResumeCommand) {

package/packages/daemon/src/rotator.js

@@ -346,14 +346,31 @@ export class Rotator extends EventEmitter {
       delete this.scoreHistory[agentId];
       this.compactionCounts.delete(agentId);
 
-      let brief = await journalist.generateHandoffBrief(agent, {
-        reason: options.reason,
-        qualityScore: options.qualityScore,
-        signals: options.signals,
-      });
-
-      if (options.additionalPrompt) {
-        brief = brief + '\n\n## User Instruction\n\n' + options.additionalPrompt;
+      // Try conversation-thread resume first: replays the actual user↔assistant
+      // dialogue from stream-json logs so the new agent picks up with full context
+      // instead of a lossy journalist summary. Falls back to the brief if logs are
+      // empty or the thread is too short to be useful.
+      let brief;
+      let usedConversationThread = false;
+      if (typeof journalist.buildConversationResumePrompt === 'function') {
+        const conversationPrompt = journalist.buildConversationResumePrompt(
+          agent,
+          options.additionalPrompt || ''
+        );
+        if (conversationPrompt && conversationPrompt.length > 500) {
+          brief = conversationPrompt;
+          usedConversationThread = true;
+        }
+      }
+      if (!usedConversationThread) {
+        brief = await journalist.generateHandoffBrief(agent, {
+          reason: options.reason,
+          qualityScore: options.qualityScore,
+          signals: options.signals,
+        });
+        if (options.additionalPrompt) {
+          brief = brief + '\n\n## User Instruction\n\n' + options.additionalPrompt;
+        }
       }
 
       if (agent.role === 'planner' && !brief.includes('PLANNING ONLY')) {