groove-dev 0.27.140 → 0.27.142

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

@@ -1976,6 +1976,10 @@ For normal file edits within your scope, proceed without review.
    * Resume a completed agent's session with a new message.
    * Uses --resume SESSION_ID for zero cold-start continuation.
    * Falls back to full spawn if no session ID available.
+   *
+   * If the agent has been idle for longer than IDLE_CONTEXT_THRESHOLD,
+   * spawns fresh with the full conversation thread instead of --resume.
+   * This avoids degraded context from internal compaction.
    */
   async resume(agentId, message) {
     const { registry, locks } = this.daemon;
@@ -1996,6 +2000,12 @@ For normal file edits within your scope, proceed without review.
       return this.daemon.rotator.rotate(agentId, { additionalPrompt: message });
     }
 
+    // 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) {
       return this.daemon.rotator.rotate(agentId, { additionalPrompt: message });
@@ -2125,6 +2135,61 @@ For normal file edits within your scope, proceed without review.
     return newAgent;
   }
 
+  /**
+   * Conversation-thread resume: spawns a fresh agent with the full
+   * user↔assistant conversation as context instead of using --resume
+   * on a potentially compacted session. Used when idle > threshold.
+   */
+  async _conversationResume(agentId, agent, resumePrompt) {
+    const { registry, locks } = this.daemon;
+    const config = { ...agent };
+
+    if (this.handles.has(agentId)) {
+      await this.kill(agentId);
+    }
+    registry.remove(agentId);
+    locks.release(agentId);
+
+    const newAgent = await this.spawn({
+      role: config.role,
+      scope: config.scope,
+      provider: config.provider,
+      model: config.model,
+      prompt: resumePrompt,
+      permission: config.permission || 'full',
+      workingDir: config.workingDir,
+      name: config.name,
+      teamId: config.teamId,
+      isRotation: true,
+    });
+
+    // Carry cumulative token count for tracking
+    if (config.tokensUsed > 0) {
+      registry.update(newAgent.id, { tokensUsed: config.tokensUsed });
+    }
+
+    if (this.daemon.timeline) {
+      this.daemon.timeline.recordEvent('conversation_resume', {
+        agentId: newAgent.id,
+        oldAgentId: agentId,
+        agentName: newAgent.name,
+        role: config.role,
+        idleMinutes: Math.round((Date.now() - new Date(config.lastActivity).getTime()) / 60000),
+      });
+    }
+
+    this.daemon.broadcast({
+      type: 'rotation:complete',
+      agentId: newAgent.id,
+      agentName: newAgent.name,
+      oldAgentId: agentId,
+      reason: 'conversation_resume',
+      tokensSaved: 0,
+    });
+
+    return newAgent;
+  }
+
   async _resumeAgentLoop(agentId, agent, message, provider) {
     const { registry, locks } = this.daemon;
     const config = { ...agent };

package/node_modules/@groove-dev/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')) {

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

@@ -112,6 +112,12 @@ export function validateAgentConfig(config) {
     if (!isNaN(v) && v >= 0 && v <= 100) verbosity = Math.round(v);
   }
 
+  const validEffort = ['min', 'low', 'default', 'high', 'max'];
+  const effort = validEffort.includes(config.effort) ? config.effort : undefined;
+
+  const validRouting = ['fixed', 'auto', 'auto-floor'];
+  const routingMode = validRouting.includes(config.routingMode) ? config.routingMode : undefined;
+
   // Return sanitized config (only known fields)
   return {
     role: config.role,
@@ -131,6 +137,8 @@ export function validateAgentConfig(config) {
     reasoningEffort: numericReasoningEffort ?? reasoningEffort,
     temperature,
     verbosity,
+    effort,
+    routingMode,
     labPresetId: (typeof config.labPresetId === 'string' && config.labPresetId.length <= 64) ? config.labPresetId : undefined,
     keeperTags: Array.isArray(config.keeperTags) ? config.keeperTags.filter(t => typeof t === 'string').slice(0, 20) : undefined,
   };