groove-dev 0.27.181 → 0.27.183

package/packages/daemon/src/deliver.js

@@ -0,0 +1,130 @@
+// FSL-1.1-Apache-2.0 — see LICENSE
+
+import { wrapWithRoleReminder } from './process.js';
+import { getProvider } from './providers/index.js';
+
+// Reviving a >5M-token claude session has crashed the CLI mid-HTTP-parse
+// (V8 fatal in JsonStringifier) — past this ceiling the rotator's handoff
+// brief sidesteps the resume entirely.
+const SESSION_RESUME_CEILING = 5_000_000;
+
+/**
+ * Deliver a message to an agent, whatever state it's in.
+ *
+ * This is the single pipe every inbound message travels — user chat from the
+ * GUI and InnerChat relays alike. Handles agent-loop delivery, one-shot and
+ * non-interactive providers, queueing behind a running task, session resume,
+ * and full rotation when the session is too large to revive.
+ *
+ * Respawn paths mint a NEW agent id. Callers that track the agent afterwards
+ * (InnerChat keys response capture on it) must use the returned `agentId`,
+ * not the one they passed in.
+ *
+ * @returns {Promise<{agentId: string, status: string, resumed: boolean, agent: object|null}>}
+ */
+export async function deliverInstruction(daemon, agentId, message, opts = {}) {
+  const { recordFeedback = true } = opts;
+
+  const agent = daemon.registry.get(agentId);
+  if (!agent) throw new Error('Agent not found');
+
+  const finalMessage = message.trim();
+  if (!finalMessage) throw new Error('message is required');
+
+  // Journalist/rotator treat this as a human steering signal — InnerChat
+  // relays opt out so agent-to-agent chatter doesn't pollute user feedback.
+  if (recordFeedback) {
+    if (daemon.journalist) daemon.journalist.recordUserFeedback(agent, finalMessage);
+    if (daemon.rotator) daemon.rotator.recordUserMessage(agentId);
+  }
+
+  const wrappedMessage = wrapWithRoleReminder(agent.role, finalMessage);
+
+  // Agent loop path — send straight to the running loop.
+  if (daemon.processes.hasAgentLoop(agentId)) {
+    const sent = await daemon.processes.sendMessage(agentId, wrappedMessage);
+    if (sent) {
+      daemon.audit.log('agent.chat', { id: agentId });
+      return { agentId, status: 'message_sent', resumed: false, agent };
+    }
+    // Loop exists but isn't running — fall through to resume/rotate.
+  }
+
+  const provider = getProvider(agent.provider);
+
+  // One-shot providers (groove-network): kill any running instance and respawn
+  // with the message as --prompt. No handoff brief, no resume, no queue.
+  if (provider?.constructor?.isOneShot) {
+    const oldConfig = { ...agent };
+    if (daemon.processes.isRunning(agentId)) {
+      await daemon.processes.kill(agentId);
+    }
+    daemon.registry.remove(agentId, { silent: true });
+    daemon.locks.release(agentId);
+
+    const newAgent = await respawn(daemon, {
+      role: oldConfig.role,
+      scope: oldConfig.scope,
+      provider: oldConfig.provider,
+      model: oldConfig.model,
+      prompt: finalMessage,
+      permission: oldConfig.permission || 'full',
+      workingDir: oldConfig.workingDir,
+      name: oldConfig.name,
+      teamId: oldConfig.teamId,
+    });
+    daemon.audit.log('agent.instruct', { id: agentId, newId: newAgent.id, resumed: false });
+    return { agentId: newAgent.id, status: 'respawned', resumed: false, agent: newAgent };
+  }
+
+  // Non-interactive CLI providers (e.g. Gemini): one prompt per spawn, cannot
+  // resume — respawn preserving the original introContext.
+  if (provider?.constructor?.nonInteractive && !daemon.processes.isRunning(agentId)) {
+    const oldConfig = { ...agent };
+    daemon.registry.remove(agentId, { silent: true });
+    daemon.locks.release(agentId);
+
+    const newAgent = await respawn(daemon, {
+      role: oldConfig.role,
+      scope: oldConfig.scope,
+      provider: oldConfig.provider,
+      model: oldConfig.model,
+      prompt: finalMessage,
+      introContext: oldConfig.introContext,
+      permission: oldConfig.permission || 'full',
+      workingDir: oldConfig.workingDir,
+      name: oldConfig.name,
+      teamId: oldConfig.teamId,
+    });
+    daemon.audit.log('agent.instruct', { id: agentId, newId: newAgent.id, resumed: false });
+    return { agentId: newAgent.id, status: 'respawned', resumed: false, agent: newAgent };
+  }
+
+  // Running CLI agent (no loop) — queue behind the current task rather than
+  // killing and respawning mid-work.
+  if (daemon.processes.isRunning(agentId)) {
+    daemon.processes.queueMessage(agentId, wrappedMessage);
+    daemon.audit.log('agent.chat.queued', { id: agentId });
+    return { agentId, status: 'message_queued', resumed: false, agent };
+  }
+
+  // Stopped CLI agent — resume the session, or rotate past the ceiling.
+  const resumed = !!agent.sessionId && (agent.tokensUsed || 0) < SESSION_RESUME_CEILING;
+  const newAgent = resumed
+    ? await daemon.processes.resume(agentId, wrappedMessage)
+    : await daemon.rotator.rotate(agentId, { additionalPrompt: wrappedMessage });
+
+  daemon.audit.log('agent.instruct', { id: agentId, newId: newAgent.id, resumed });
+  return { agentId: newAgent.id, status: resumed ? 'resumed' : 'rotated', resumed, agent: newAgent };
+}
+
+// Spawn, flushing the registry's pending removals if it fails so a failed
+// respawn doesn't silently erase the agent it was replacing.
+async function respawn(daemon, config) {
+  try {
+    return await daemon.processes.spawn(config);
+  } catch (spawnErr) {
+    daemon.registry.flushPendingRemovals();
+    throw spawnErr;
+  }
+}

package/packages/daemon/src/index.js

@@ -10,7 +10,7 @@ import express from 'express';
 import { WebSocketServer } from 'ws';
 import { Registry } from './registry.js';
 import { createApi } from './api.js';
-import { ProcessManager } from './process.js';
+import { ProcessManager, sanitizeFilename } from './process.js';
 import { StateManager } from './state.js';
 import { Introducer } from './introducer.js';
 import { LockManager } from './lockmanager.js';
@@ -750,7 +750,11 @@ export class Daemon {
     try {
       // Build set of agent names still in the registry — never remove their logs
       const allAgents = this.registry.getAll();
-      const activeNames = new Set(allAgents.map((a) => a.name));
+      // Raw logs are keyed by sanitized name; GROOVE_AGENT_LOGS/ subdirectories
+      // are keyed by agent id (journalist.js). Comparing either against the
+      // wrong set deletes live agents' history.
+      const activeNames = new Set(allAgents.map((a) => sanitizeFilename(a.name)));
+      const activeIds = new Set(allAgents.map((a) => a.id));
 
       // Safety: if registry is empty but log files exist, state may have been
       // lost (corrupt JSON, partial write). Skip log cleanup to prevent
@@ -778,7 +782,7 @@ export class Daemon {
       if (existsSync(agentLogsDir)) {
         for (const dir of readdirSync(agentLogsDir, { withFileTypes: true })) {
           if (!dir.isDirectory()) continue;
-          if (activeNames.has(dir.name)) continue;
+          if (activeIds.has(dir.name)) continue;
           try { rmSync(resolve(agentLogsDir, dir.name), { recursive: true }); cleaned++; } catch { /* skip */ }
         }
         // Remove GROOVE_AGENT_LOGS/ itself if empty
@@ -836,6 +840,7 @@ export class Daemon {
     // Persist state before shutdown
     this.state.set('agents', this.registry.getAll());
     await this.state.save();
+    try { this.tokens.flush(); } catch { /* best-effort */ }
 
     // Stop background services
     await this.gateways.stop();

package/packages/daemon/src/innerchat.js

@@ -1,100 +1,251 @@
 // FSL-1.1-Apache-2.0 — see LICENSE
 
 import { randomUUID } from 'crypto';
-
+import { deliverInstruction } from './deliver.js';
+
+// How much prior conversation to replay into each relay turn. Enough for the
+// recipient to pick up the thread without re-reading the whole exchange.
+const CONTEXT_TURNS = 4;
+const MAX_TURN_CHARS = 1200;
+
+/**
+ * Agent-to-agent relay, user-initiated.
+ *
+ * The A→B hop is always driven by a human clicking Relay. The B→A hop is
+ * automatic: B's answer is fed straight back into A so A can process it and
+ * report to the user, who then decides whether to run another turn.
+ *
+ * Delivery goes through deliverInstruction — the same pipe as user chat — so
+ * a relay reaches its target whether it's mid-task, idle, or stopped.
+ */
 export class InnerChat {
   constructor(daemon) {
     this.daemon = daemon;
-    this.messages = new Map();
-    this.pendingResponses = new Map();
+    this.threads = new Map();
+    // agentId -> { threadId, sentAt } — which agent we're awaiting a reply from.
+    this.awaiting = new Map();
   }
 
-  async send(fromAgentId, toAgentId, message) {
+  /**
+   * Relay a message from one agent to another, opening a thread or continuing
+   * an existing one.
+   */
+  async send(fromAgentId, toAgentId, message, threadId = null) {
     const fromAgent = this.daemon.registry.get(fromAgentId);
     const toAgent = this.daemon.registry.get(toAgentId);
     if (!fromAgent) throw new Error(`Sender agent ${fromAgentId} not found`);
     if (!toAgent) throw new Error(`Target agent ${toAgentId} not found`);
-
-    const id = randomUUID().slice(0, 12);
-    const msg = {
-      id,
-      from: { id: fromAgent.id, name: fromAgent.name, role: fromAgent.role },
-      to: { id: toAgent.id, name: toAgent.name, role: toAgent.role },
-      message,
-      response: null,
-      status: 'sent',
+    if (fromAgentId === toAgentId) throw new Error('Cannot relay an agent to itself');
+    if (!message || !message.trim()) throw new Error('message is required');
+
+    const thread = threadId ? this.threads.get(threadId) : null;
+    if (threadId && !thread) throw new Error(`Thread ${threadId} not found`);
+
+    const t = thread || this._createThread(fromAgent, toAgent);
+    const turn = {
+      id: randomUUID().slice(0, 12),
+      from: peer(fromAgent),
+      to: peer(toAgent),
+      text: message.trim(),
+      kind: 'relay',
+      status: 'sending',
       timestamp: Date.now(),
-      respondedAt: null,
     };
+    t.turns.push(turn);
+
+    const wrapped = this._wrap(t, fromAgent, toAgent, message.trim());
+
+    let result;
+    try {
+      result = await deliverInstruction(this.daemon, toAgentId, wrapped, { recordFeedback: false });
+    } catch (err) {
+      turn.status = 'failed';
+      turn.error = err.message;
+      t.status = 'failed';
+      this.daemon.broadcast({ type: 'innerchat:turn', data: { thread: t, turn } });
+      throw err;
+    }
 
-    this.messages.set(id, msg);
-    this.pendingResponses.set(toAgentId, id);
+    // A stopped target gets resumed or rotated, which mints a new agent id.
+    // Re-key everything onto it or the reply will never be captured.
+    if (result.agentId !== toAgentId) {
+      this._remapParticipant(t, toAgentId, result.agentId);
+      turn.to.id = result.agentId;
+    }
 
-    const wrapped = `[InnerChat from ${fromAgent.name} (${fromAgent.role})]\n\n${message}\n\nReply normally — your response will be relayed back to ${fromAgent.name}.`;
+    turn.status = result.status;
+    t.status = 'awaiting_reply';
+    t.updatedAt = Date.now();
 
-    let deliveryStatus = 'sent';
-    if (this.daemon.processes.hasAgentLoop(toAgentId)) {
-      const sent = await this.daemon.processes.sendMessage(toAgentId, wrapped, 'agent');
-      deliveryStatus = sent ? 'delivered' : 'queued';
-    } else if (this.daemon.processes.isRunning(toAgentId)) {
-      this.daemon.processes.queueMessage(toAgentId, wrapped);
-      deliveryStatus = 'queued';
-    } else {
-      throw new Error(`Target agent ${toAgent.name} is not running`);
-    }
+    // A queued relay sits behind whatever the agent is already doing, so the
+    // next result belongs to that prior task, not to us — skip it.
+    const skipResults = result.status === 'message_queued' ? 1 : 0;
+    this.awaiting.set(turn.to.id, { threadId: t.id, sentAt: Date.now(), skipResults });
 
-    msg.status = deliveryStatus;
-    this.daemon.broadcast({ type: 'innerchat:sent', data: msg });
-    this.daemon.audit.log('innerchat.send', { id, from: fromAgentId, to: toAgentId });
+    this.daemon.broadcast({ type: 'innerchat:turn', data: { thread: t, turn } });
+    this.daemon.audit.log('innerchat.send', { thread: t.id, from: fromAgentId, to: turn.to.id });
 
-    return msg;
+    return { thread: t, turn };
   }
 
+  /**
+   * Watch agent output for the reply to an outstanding relay, then forward it
+   * back to the agent that asked.
+   */
   onAgentOutput(agentId, output) {
-    const messageId = this.pendingResponses.get(agentId);
-    if (!messageId) return;
+    const pending = this.awaiting.get(agentId);
+    if (!pending) return;
     if (output.type !== 'result') return;
 
-    const msg = this.messages.get(messageId);
-    if (!msg) return;
+    const thread = this.threads.get(pending.threadId);
+    if (!thread) { this.awaiting.delete(agentId); return; }
+
+    const responseText = extractText(output.data);
+    if (!responseText) return;
+
+    // Burn off results belonging to work that was already underway when the
+    // relay was queued behind it.
+    if (pending.skipResults > 0) {
+      pending.skipResults -= 1;
+      return;
+    }
+
+    // Claim the reply before the async forward so a second result arriving
+    // mid-flight can't be captured as a duplicate.
+    this.awaiting.delete(agentId);
 
-    let responseText = '';
-    if (typeof output.data === 'string') {
-      responseText = output.data;
-    } else if (Array.isArray(output.data)) {
-      responseText = output.data.filter(b => b.type === 'text').map(b => b.text).join('\n');
+    const responder = this.daemon.registry.get(agentId);
+    const asker = this._otherParticipant(thread, agentId);
+
+    const turn = {
+      id: randomUUID().slice(0, 12),
+      from: responder ? peer(responder) : { id: agentId, name: agentId, role: 'agent' },
+      to: asker,
+      text: responseText,
+      kind: 'reply',
+      status: 'forwarding',
+      timestamp: Date.now(),
+    };
+    thread.turns.push(turn);
+    thread.status = 'forwarding';
+    thread.updatedAt = Date.now();
+
+    this._forwardReply(thread, turn, asker.id, responseText);
+  }
+
+  async _forwardReply(thread, turn, askerId, responseText) {
+    const from = turn.from;
+    const relay = [
+      `[InnerChat reply from ${from.name} (${from.role})]`,
+      '',
+      responseText,
+      '',
+      `This is the answer to what you relayed to ${from.name}. Process it and report back — `
+        + 'the user will decide whether to send another turn.',
+    ].join('\n');
+
+    try {
+      const result = await deliverInstruction(this.daemon, askerId, relay, { recordFeedback: false });
+      if (result.agentId !== askerId) {
+        this._remapParticipant(thread, askerId, result.agentId);
+        turn.to.id = result.agentId;
+      }
+      turn.status = result.status;
+      thread.status = 'idle';
+    } catch (err) {
+      turn.status = 'failed';
+      turn.error = err.message;
+      thread.status = 'failed';
     }
-    if (!responseText.trim()) return;
-
-    msg.response = responseText.trim();
-    msg.status = 'responded';
-    msg.respondedAt = Date.now();
-    this.pendingResponses.delete(agentId);
-
-    const relay = `[InnerChat reply from ${msg.to.name} (${msg.to.role})]\n\n${msg.response}`;
-    const senderId = msg.from.id;
-    if (this.daemon.processes.hasAgentLoop(senderId)) {
-      this.daemon.processes.sendMessage(senderId, relay, 'agent').catch(() => {});
-    } else if (this.daemon.processes.isRunning(senderId)) {
-      this.daemon.processes.queueMessage(senderId, relay);
+
+    thread.updatedAt = Date.now();
+    this.daemon.broadcast({ type: 'innerchat:turn', data: { thread, turn } });
+    this.daemon.audit.log('innerchat.reply', { thread: thread.id, from: turn.from.id, to: turn.to.id });
+  }
+
+  // ── Thread helpers ──────────────────────────────────────────
+
+  _createThread(fromAgent, toAgent) {
+    const thread = {
+      id: randomUUID().slice(0, 12),
+      participants: [peer(fromAgent), peer(toAgent)],
+      turns: [],
+      status: 'idle',
+      createdAt: Date.now(),
+      updatedAt: Date.now(),
+    };
+    this.threads.set(thread.id, thread);
+    return thread;
+  }
+
+  // Rebuild the message the target sees. It reads as a direct message from the
+  // other agent, with enough prior turns that a continuing thread makes sense.
+  _wrap(thread, fromAgent, toAgent, message) {
+    const prior = thread.turns.slice(0, -1).slice(-CONTEXT_TURNS);
+    const lines = [`[InnerChat from ${fromAgent.name} (${fromAgent.role})]`, ''];
+
+    if (prior.length) {
+      lines.push('Earlier in this conversation:');
+      for (const t of prior) {
+        lines.push(`  ${t.from.name}: ${truncate(t.text, MAX_TURN_CHARS)}`);
+      }
+      lines.push('');
     }
 
-    this.daemon.broadcast({ type: 'innerchat:response', data: msg });
-    this.daemon.audit.log('innerchat.response', { id: messageId, from: msg.from.id, to: msg.to.id });
+    lines.push(message, '');
+    lines.push(
+      `Reply normally — your response is relayed straight back to ${fromAgent.name}. `
+      + 'Answer them directly; do not address the user.',
+    );
+    return lines.join('\n');
+  }
+
+  _otherParticipant(thread, agentId) {
+    return thread.participants.find((p) => p.id !== agentId) || thread.participants[0];
+  }
+
+  _remapParticipant(thread, oldId, newId) {
+    for (const p of thread.participants) {
+      if (p.id === oldId) p.id = newId;
+    }
+    // Any relay still awaiting a reply from the old id must follow it forward.
+    const pending = this.awaiting.get(oldId);
+    if (pending) {
+      this.awaiting.delete(oldId);
+      this.awaiting.set(newId, pending);
+    }
   }
 
-  getMessages(agentId = null) {
-    const all = Array.from(this.messages.values());
+  // ── Queries ─────────────────────────────────────────────────
+
+  getThreads(agentId = null) {
+    const all = Array.from(this.threads.values()).sort((a, b) => b.updatedAt - a.updatedAt);
     if (!agentId) return all;
-    return all.filter(m => m.from.id === agentId || m.to.id === agentId);
+    return all.filter((t) => t.participants.some((p) => p.id === agentId));
   }
 
-  getMessage(id) {
-    return this.messages.get(id) || null;
+  getThread(id) {
+    return this.threads.get(id) || null;
   }
 
   getPending(agentId) {
-    const messageId = this.pendingResponses.get(agentId);
-    return messageId ? this.messages.get(messageId) : null;
+    const pending = this.awaiting.get(agentId);
+    return pending ? this.threads.get(pending.threadId) : null;
+  }
+}
+
+function peer(agent) {
+  return { id: agent.id, name: agent.name, role: agent.role };
+}
+
+function truncate(text, max) {
+  return text.length <= max ? text : `${text.slice(0, max)}… [truncated]`;
+}
+
+function extractText(data) {
+  if (typeof data === 'string') return data.trim();
+  if (Array.isArray(data)) {
+    return data.filter((b) => b.type === 'text').map((b) => b.text).join('\n').trim();
   }
+  return '';
 }

package/packages/daemon/src/journalist.js

@@ -5,6 +5,7 @@ import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync } from 'fs
 import { resolve } from 'path';
 import { execFile, spawn as cpSpawn } from 'child_process';
 import { getProvider, getInstalledProviders, resolveProviderCommand } from './providers/index.js';
+import { agentLogPath } from './process.js';
 
 const DEFAULT_INTERVAL = 300_000; // 5 minutes (safety-net fallback; event-driven triggers handle the normal case)
 const MAX_LOG_CHARS = 100_000; // ~25k tokens budget for synthesis input (captures 80-90% of recent activity)
@@ -168,7 +169,7 @@ export class Journalist {
 
   hasNewActivity(agents) {
     for (const agent of agents) {
-      const logPath = resolve(this.daemon.grooveDir, 'logs', `${agent.id}.log`);
+      const logPath = agentLogPath(this.daemon.grooveDir, agent);
       if (!existsSync(logPath)) continue;
       try {
         const size = statSync(logPath).size;
@@ -182,7 +183,7 @@ export class Journalist {
     const result = {};
 
     for (const agent of agents) {
-      const logPath = resolve(this.daemon.grooveDir, 'logs', `${agent.id}.log`);
+      const logPath = agentLogPath(this.daemon.grooveDir, agent);
       if (!existsSync(logPath)) {
         result[agent.id] = { agent, entries: [], explorationEntries: [] };
         continue;
@@ -574,9 +575,15 @@ export class Journalist {
       const provider = getProvider(providerId);
       if (!provider) continue;
 
-      const selectedModel = provider.constructor.models?.find((m) => m.tier === 'medium')
-        || provider.constructor.models?.find((m) => m.tier === 'light')
-        || provider.constructor.models?.[0];
+      // Digests are light-tier work (Haiku-shaped): default internal overhead to
+      // the cheapest tier, escalate via config only on evidence of quality issues.
+      // On Claude, medium→light cuts the journalist's marginal cost ~90%.
+      const models = provider.constructor.models || [];
+      const preferredTier = this.daemon.config?.journalistModelTier || 'light';
+      const selectedModel = models.find((m) => m.tier === preferredTier)
+        || models.find((m) => m.tier === 'light')
+        || models.find((m) => m.tier === 'medium')
+        || models[0];
       const modelId = selectedModel?.id || null;
 
       // Try CLI headless command first
@@ -1055,7 +1062,7 @@ export class Journalist {
    * Budget: keeps recent turns verbatim, summarizes oldest if over maxChars.
    */
   extractConversationThread(agent, { maxChars = 60000 } = {}) {
-    const logPath = resolve(this.daemon.grooveDir, 'logs', `${agent.id}.log`);
+    const logPath = agentLogPath(this.daemon.grooveDir, agent);
     if (!existsSync(logPath)) return null;
 
     let content;
@@ -1297,7 +1304,7 @@ export class Journalist {
    * Used by the Introducer to tell new agents what their teammates built.
    */
   getAgentFiles(agent) {
-    const logPath = resolve(this.daemon.grooveDir, 'logs', `${agent.id}.log`);
+    const logPath = agentLogPath(this.daemon.grooveDir, agent);
     if (!existsSync(logPath)) return [];
 
     try {
@@ -1335,7 +1342,7 @@ export class Journalist {
    * Used to capture planner conclusions, build summaries, etc.
    */
   getAgentResult(agent) {
-    const logPath = resolve(this.daemon.grooveDir, 'logs', `${agent.id}.log`);
+    const logPath = agentLogPath(this.daemon.grooveDir, agent);
     if (!existsSync(logPath)) return '';
 
     try {