groove-dev 0.27.183 → 0.27.185

package/packages/daemon/src/api.js

@@ -28,6 +28,7 @@ import { registerFileRoutes, resetEditorRoot } from './routes/files.js';
 import { registerNetworkRoutes } from './routes/network.js';
 import { registerScheduleRoutes } from './routes/schedules.js';
 import { registerInnerChatRoutes } from './routes/innerchat.js';
+import { registerWatchRoutes } from './routes/watch.js';
 import { registerAutoAgentRoutes } from './routes/auto-agents.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -178,6 +179,7 @@ export function createApi(app, daemon) {
   registerNetworkRoutes(app, daemon);
   registerScheduleRoutes(app, daemon);
   registerInnerChatRoutes(app, daemon);
+  registerWatchRoutes(app, daemon);
   registerAutoAgentRoutes(app, daemon);
 
 

package/packages/daemon/src/index.js

@@ -47,6 +47,7 @@ import { RepoImporter } from './repo-import.js';
 import { ConversationManager } from './conversations.js';
 import { Toys } from './toys.js';
 import { InnerChat } from './innerchat.js';
+import { Watcher } from './watcher.js';
 import { AutoState } from './autostate.js';
 import { Orchestrator } from './orchestrator.js';
 import { TrajectoryCapture, ConsentManager } from '../../../moe-training/client/index.js';
@@ -162,6 +163,7 @@ export class Daemon {
     this.modelLab = new ModelLab(this);
     this.toys = new Toys(this);
     this.innerchat = new InnerChat(this);
+    this.watcher = new Watcher(this);
     this.autoState = new AutoState(this.grooveDir);
     this.orchestrator = new Orchestrator(this);
     this.trajectoryCapture = null;
@@ -623,6 +625,19 @@ export class Daemon {
         this.federation.initialize();
         this._startGarbageCollector();
 
+        // Regenerate the on-disk registry files once on boot. They otherwise
+        // only refresh on a registry change, so a daemon upgraded with new
+        // agent-facing docs (InnerChat, Watch) would serve stale AGENTS_REGISTRY.md
+        // to already-running agents until something happened to change state.
+        if (this.registry.getAll().length > 0) {
+          try {
+            this.introducer.writeRegistryFile(this.projectDir);
+            this.introducer.injectGrooveSection(this.projectDir);
+          } catch (err) {
+            console.error('[startup] Failed to refresh registry files:', err.message);
+          }
+        }
+
         // Restore auth token from stored config so subscription polling works after restart
         const storedToken = this.skills.getToken();
         if (storedToken) {
@@ -847,6 +862,8 @@ export class Daemon {
     this.journalist.stop();
     this.rotator.stop();
     this.scheduler.stop();
+    this.watcher.stop();
+    this.innerchat.stop();
     this.orchestrator.stop();
     this.timeline.stop();
     if (this._gcInterval) clearInterval(this._gcInterval);

package/packages/daemon/src/innerchat-docs.js

@@ -0,0 +1,96 @@
+// FSL-1.1-Apache-2.0 — see LICENSE
+
+// The agent-facing InnerChat instructions, in one place.
+//
+// These are injected into a new agent's spawn prompt AND written into every
+// AGENTS_REGISTRY.md. Both are needed: the prompt reaches the agent on turn
+// one, and the file survives context compaction — an agent that has forgotten
+// the prompt can re-read the registry it already knows to consult.
+//
+// No imports on purpose — process.js and introducer.js both pull from here.
+
+export function innerChatInstructions(port = 31415, agentName = 'YOUR_NAME') {
+  return [
+    '## Consulting Other Agents (InnerChat)',
+    '',
+    'Other GROOVE agents may be working alongside you, including on other teams.',
+    'When the user asks you to reach out to, coordinate with, or get input from',
+    'another agent, use this — it sends them a message and waits for their reply:',
+    '',
+    '> **Do NOT use your built-in `SendMessage` / Agent tools to reach a GROOVE agent.**',
+    '> Those only address sub-agents you spawned yourself in this session, so they will',
+    '> fail with "not reachable" or ask you for an `a…-…` agent ID that does not exist',
+    '> here. GROOVE agents are separate processes. The curl below is the only way to',
+    '> reach them. Do not invent a fallback (writing a message into a file, etc.) —',
+    '> if the curl fails, read the error and report it to the user.',
+    '',
+    '```bash',
+    `curl -s http://localhost:${port}/api/innerchat/ask -X POST -H 'Content-Type: application/json' \\`,
+    `  -d '{"from":"${agentName}","to":"AGENT_NAME","message":"YOUR_QUESTION"}'`,
+    '```',
+    '',
+    'This BLOCKS until they answer, then returns:',
+    '`{"from":"...","reply":"...","exchangesUsed":N,"exchangesRemaining":N}`',
+    '',
+    '> **Run the curl in the FOREGROUND and let it block.** Do not background it with',
+    "> `&`, and never put `&` inside the command — that detaches the curl and throws away",
+    "> the reply, so you get no answer and can't confirm delivery. Blocking for a minute or",
+    '> two is expected and correct; just wait for it. If you truly cannot wait, use `tell`',
+    '> (below) instead — that is the right tool for fire-and-forget, not a backgrounded ask.',
+    '',
+    'Call it again to continue — prior turns are included automatically, so just say',
+    'the next thing. Keep going until you reach a conclusion together, then report',
+    'that conclusion to the user. `ask` is best for tight back-and-forth (negotiating',
+    'an interface, resolving a blocker) where you need the answer before you proceed.',
+    '',
+    'If the other agent is heads-down and you do NOT need the answer right now, send it',
+    'without blocking instead — this returns immediately, and their reply (if any) is',
+    'delivered back to you later, waking you if your turn has ended:',
+    '',
+    '```bash',
+    `curl -s http://localhost:${port}/api/innerchat/tell -X POST -H 'Content-Type: application/json' \\`,
+    `  -d '{"from":"${agentName}","to":"AGENT_NAME","message":"YOUR_MESSAGE"}'`,
+    '```',
+    '',
+    '**Rules:**',
+    '- Only start a conversation when the user asks you to. Never consult other agents on your own initiative.',
+    `- \`from\` must be your own agent name${agentName === 'YOUR_NAME' ? ' (it is in your $GROOVE_AGENT_NAME environment variable)' : ''}.`,
+    '- Agent names are listed in `AGENTS_REGISTRY.md`, including agents on other teams.',
+    '- Use `ask` when you need the reply now; use `tell` to hand off or notify without waiting.',
+    '- One message per call. With `ask`, wait for the answer before deciding what to ask next.',
+    '- Ground truth lives in files (specs, code, run output), not in chat — use InnerChat to',
+    '  negotiate and hand off, and verify claims against the actual artifacts.',
+    '- Read any error you get back — it tells you what to do (unknown name, cap reached, or they are waiting on you).',
+    '- `exchangesRemaining` counts down (shared by ask and tell). At 0 the conversation is over: stop and report.',
+    '- If another agent asks YOU something (a blocking ask), answer it directly in your next message — they are blocked until you do.',
+  ];
+}
+
+// Wake-on-completion. Same delivery/injection story as InnerChat above.
+export function watchInstructions(port = 31415, agentName = 'YOUR_NAME') {
+  const nameHint = agentName === 'YOUR_NAME' ? ' ($GROOVE_AGENT_NAME)' : '';
+  return [
+    '## Getting Notified When Something Finishes (Watch)',
+    '',
+    'Your process ends when your turn ends, so a test suite or long job you kicked',
+    'off has nothing to notify you — telling the user "I\'ll report back when it lands"',
+    'does not work on its own; the session is gone. Instead, set a Watch. The daemon',
+    'outlives your turn and RESUMES you with the result when it finishes:',
+    '',
+    '```bash',
+    `curl -s http://localhost:${port}/api/watch -X POST -H 'Content-Type: application/json' \\`,
+    `  -d '{"agent":"${agentName}","label":"test suite","command":"npm test"}'`,
+    '```',
+    '',
+    'This returns immediately with a `watchId`. **End your turn** — you will be woken',
+    'with the exit code and output tail when the command finishes.',
+    '',
+    '- Prefer `command` (let the daemon run it) over launching it yourself — that way',
+    '  it captures the real exit code and output.',
+    '- For something ALREADY running, poll instead with `until` (fires when the check',
+    `  exits 0): \`-d '{"agent":"${agentName}","label":"server up","until":"curl -sf localhost:3000/health"}'\`.`,
+    `- \`agent\` must be your own name${nameHint}.`,
+    '- Watches time out (default 30 min). One clear task per watch; do not watch trivial commands you could just run.',
+    '- Do not poll or sleep-loop waiting yourself — set the watch and end the turn. That is the whole point.',
+  ];
+}

package/packages/daemon/src/innerchat.js

@@ -3,94 +3,212 @@
 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.
+// An unanswered ask holds an HTTP request open and blocks the calling agent,
+// so it has to be bounded.
+const DEFAULT_TIMEOUT_MS = 5 * 60 * 1000;
+const MAX_TIMEOUT_MS = 15 * 60 * 1000;
+
+// Ceiling on autonomous back-and-forth. Two agents that can call each other
+// freely will happily talk until the budget is gone; past this they're told to
+// wrap up and report to the user.
+const MAX_EXCHANGES = 12;
+
 const CONTEXT_TURNS = 4;
 const MAX_TURN_CHARS = 1200;
 
 /**
- * Agent-to-agent relay, user-initiated.
+ * Agent-to-agent consultation.
  *
- * 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.
+ * An agent asks another agent a question and BLOCKS until it answers — the
+ * daemon holds the caller's HTTP request open, delivers the question, waits
+ * for the target's next result, and returns it as the response body. That
+ * makes a normal request/response loop available to the calling agent, so two
+ * agents can iterate to consensus without a human relaying between them.
  *
  * Delivery goes through deliverInstruction — the same pipe as user chat — so
- * a relay reaches its target whether it's mid-task, idle, or stopped.
+ * a question reaches its target whether it's mid-task, idle, or stopped.
  */
 export class InnerChat {
   constructor(daemon) {
     this.daemon = daemon;
     this.threads = new Map();
-    // agentId -> { threadId, sentAt } — which agent we're awaiting a reply from.
+    // agentId being asked -> pending record (resolve/reject/timer/threadId)
     this.awaiting = new Map();
+    // asker id -> id of the agent it is currently blocked on
+    this.blockedOn = new Map();
   }
 
   /**
-   * Relay a message from one agent to another, opening a thread or continuing
-   * an existing one.
+   * Ask another agent a question and wait for its answer.
+   *
+   * Resolves with { reply, threadId, exchanges, remaining }. Rejects when the
+   * target can't be reached, the exchange cap is hit, the call would deadlock,
+   * or the target doesn't answer inside the timeout.
    */
-  async send(fromAgentId, toAgentId, message, threadId = null) {
+  async ask(fromAgentId, toAgentId, message, opts = {}) {
     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 (!fromAgent) throw new Error(`Calling agent ${fromAgentId} not found`);
     if (!toAgent) throw new Error(`Target agent ${toAgentId} not found`);
-    if (fromAgentId === toAgentId) throw new Error('Cannot relay an agent to itself');
+    if (fromAgentId === toAgentId) throw new Error('An agent cannot ask 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`);
+    // Deadlock guard: the target is already blocked waiting on us, so it can
+    // never get far enough to read this. Tell the caller to just answer.
+    if (this.blockedOn.get(toAgentId) === fromAgentId) {
+      throw new Error(
+        `${toAgent.name} is currently waiting for YOUR answer — it cannot reply to a new `
+        + 'question until you respond. Answer its question first; your reply is what unblocks it.',
+      );
+    }
+    if (this.awaiting.has(toAgentId)) {
+      throw new Error(`${toAgent.name} is already answering another agent — try again shortly`);
+    }
+
+    const t = this._openThread(fromAgent, toAgent, opts.threadId);
+    this._checkExchangeCap(t, toAgent);
 
-    const t = thread || this._createThread(fromAgent, toAgent);
+    const timeoutMs = Math.min(Number(opts.timeoutMs) || DEFAULT_TIMEOUT_MS, MAX_TIMEOUT_MS);
+
+    const { turn, targetId, skipResults } = await this._deliver(t, fromAgent, toAgent, message.trim(), 'ask');
+    this.daemon.audit.log('innerchat.ask', { thread: t.id, from: fromAgentId, to: targetId });
+
+    const reply = await this._awaitReply(t, fromAgentId, targetId, { skipResults, timeoutMs });
+    const exchanges = t.turns.filter((x) => x.kind === 'ask' || x.kind === 'tell').length;
+
+    return { reply, threadId: t.id, exchanges, remaining: MAX_EXCHANGES - exchanges };
+  }
+
+  /**
+   * Send a message to another agent WITHOUT blocking. Returns as soon as it's
+   * delivered. If the target later replies, the reply is routed back to the
+   * sender asynchronously — resuming the sender if its turn has ended.
+   *
+   * This is the fire-and-forget counterpart to ask(): use it to hand off to an
+   * agent that's heads-down, where waiting out a timeout would waste the turn.
+   */
+  async tell(fromAgentId, toAgentId, message, opts = {}) {
+    const fromAgent = this.daemon.registry.get(fromAgentId);
+    const toAgent = this.daemon.registry.get(toAgentId);
+    if (!fromAgent) throw new Error(`Calling agent ${fromAgentId} not found`);
+    if (!toAgent) throw new Error(`Target agent ${toAgentId} not found`);
+    if (fromAgentId === toAgentId) throw new Error('An agent cannot message itself');
+    if (!message || !message.trim()) throw new Error('message is required');
+    if (this.awaiting.has(toAgentId)) {
+      throw new Error(`${toAgent.name} already has an unanswered message — wait for its reply before sending another`);
+    }
+
+    const t = this._openThread(fromAgent, toAgent, opts.threadId);
+    this._checkExchangeCap(t, toAgent);
+
+    const { turn, targetId, skipResults } = await this._deliver(t, fromAgent, toAgent, message.trim(), 'tell');
+    this.daemon.audit.log('innerchat.tell', { thread: t.id, from: fromAgentId, to: targetId });
+
+    // Register async capture: the reply (if any) is forwarded, not awaited.
+    this.awaiting.set(targetId, {
+      mode: 'async',
+      threadId: t.id,
+      senderId: fromAgentId,
+      skipResults,
+      timer: setTimeout(() => this._clearAwait(targetId), MAX_TIMEOUT_MS),
+    });
+
+    const exchanges = t.turns.filter((x) => x.kind === 'ask' || x.kind === 'tell').length;
+    return { delivered: true, threadId: t.id, exchanges, remaining: MAX_EXCHANGES - exchanges };
+  }
+
+  // Shared send: push a turn, deliver it, and remap the target id if delivery
+  // resumed/rotated the agent. Returns the queued-skip count for reply capture.
+  async _deliver(thread, fromAgent, toAgent, message, kind) {
     const turn = {
       id: randomUUID().slice(0, 12),
       from: peer(fromAgent),
       to: peer(toAgent),
-      text: message.trim(),
-      kind: 'relay',
+      text: message,
+      kind,
       status: 'sending',
       timestamp: Date.now(),
     };
-    t.turns.push(turn);
+    thread.turns.push(turn);
 
-    const wrapped = this._wrap(t, fromAgent, toAgent, message.trim());
+    const wrapped = this._wrap(thread, fromAgent, toAgent, message, kind);
 
     let result;
     try {
-      result = await deliverInstruction(this.daemon, toAgentId, wrapped, { recordFeedback: false });
+      result = await deliverInstruction(this.daemon, toAgent.id, 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;
+      thread.status = 'failed';
+      this._broadcast(thread, turn);
+      throw new Error(`Could not reach ${toAgent.name}: ${err.message}`);
     }
 
-    // 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;
+    // A stopped target gets resumed or rotated, minting a new agent id.
+    const targetId = result.agentId;
+    if (targetId !== toAgent.id) {
+      this._remapParticipant(thread, toAgent.id, targetId);
+      turn.to.id = targetId;
     }
 
     turn.status = result.status;
-    t.status = 'awaiting_reply';
-    t.updatedAt = Date.now();
+    thread.status = 'awaiting_reply';
+    thread.updatedAt = Date.now();
+    this._broadcast(thread, turn);
+
+    // A queued message sits behind the target's current work, so the next
+    // result belongs to that prior task, not to us — skip it.
+    return { turn, targetId, skipResults: result.status === 'message_queued' ? 1 : 0 };
+  }
 
-    // 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 });
+  _openThread(fromAgent, toAgent, threadId) {
+    const thread = threadId ? this.threads.get(threadId) : this._findThread(fromAgent.id, toAgent.id);
+    return thread || this._createThread(fromAgent, toAgent);
+  }
 
-    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 });
+  _checkExchangeCap(thread, toAgent) {
+    const used = thread.turns.filter((x) => x.kind === 'ask' || x.kind === 'tell').length;
+    if (used >= MAX_EXCHANGES) {
+      throw new Error(
+        `This conversation has reached its ${MAX_EXCHANGES}-exchange limit. Stop consulting `
+        + `${toAgent.name} and report your conclusion to the user.`,
+      );
+    }
+  }
 
-    return { thread: t, turn };
+  _awaitReply(thread, askerId, targetId, { skipResults, timeoutMs }) {
+    return new Promise((resolve, reject) => {
+      const settle = (fn, value) => {
+        this._clearAwait(targetId);
+        this.blockedOn.delete(askerId);
+        fn(value);
+      };
+
+      const record = {
+        mode: 'block',
+        threadId: thread.id,
+        askerId,
+        skipResults,
+        resolve: (text) => settle(resolve, text),
+        reject: (err) => settle(reject, err),
+        timer: setTimeout(() => {
+          thread.status = 'timeout';
+          thread.updatedAt = Date.now();
+          record.reject(new Error(
+            `No answer within ${Math.round(timeoutMs / 1000)}s. The agent may still be working — `
+            + 'proceed on your own judgement, or use a non-blocking send (tell) next time.',
+          ));
+        }, timeoutMs),
+      };
+
+      this.awaiting.set(targetId, record);
+      this.blockedOn.set(askerId, targetId);
+    });
   }
 
   /**
-   * Watch agent output for the reply to an outstanding relay, then forward it
-   * back to the agent that asked.
+   * Watch agent output for the reply to an outstanding message.
+   * Called from the process manager's output handler.
    */
   onAgentOutput(agentId, output) {
     const pending = this.awaiting.get(agentId);
@@ -98,72 +216,88 @@ export class InnerChat {
     if (output.type !== 'result') return;
 
     const thread = this.threads.get(pending.threadId);
-    if (!thread) { this.awaiting.delete(agentId); return; }
+    if (!thread) { this._settlePending(agentId, pending, null, new Error('Conversation was lost')); return; }
 
-    const responseText = extractText(output.data);
-    if (!responseText) return;
+    const text = extractText(output.data);
+    if (!text) return;
 
-    // Burn off results belonging to work that was already underway when the
-    // relay was queued behind it.
+    // Burn off results belonging to work already underway when we queued.
     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);
-
     const responder = this.daemon.registry.get(agentId);
-    const asker = this._otherParticipant(thread, agentId);
-
-    const turn = {
+    const answerTurn = {
       id: randomUUID().slice(0, 12),
       from: responder ? peer(responder) : { id: agentId, name: agentId, role: 'agent' },
-      to: asker,
-      text: responseText,
-      kind: 'reply',
-      status: 'forwarding',
+      to: this._otherParticipant(thread, agentId),
+      text,
+      kind: 'answer',
+      status: 'delivered',
       timestamp: Date.now(),
     };
-    thread.turns.push(turn);
-    thread.status = 'forwarding';
+    thread.turns.push(answerTurn);
+    thread.status = 'idle';
     thread.updatedAt = Date.now();
-
-    this._forwardReply(thread, turn, asker.id, responseText);
+    this._broadcast(thread, answerTurn);
+    this.daemon.audit.log('innerchat.answer', { thread: thread.id, from: agentId });
+
+    if (pending.mode === 'async') {
+      this._clearAwait(agentId);
+      this._forwardAsyncReply(pending, answerTurn, text);
+    } else {
+      pending.resolve(text);
+    }
   }
 
-  async _forwardReply(thread, turn, askerId, responseText) {
-    const from = turn.from;
-    const relay = [
-      `[InnerChat reply from ${from.name} (${from.role})]`,
+  // Deliver an async (tell) reply back to the original sender, resuming it if
+  // its turn has ended. The sender is not blocked, so this just wakes them.
+  async _forwardAsyncReply(pending, answerTurn, text) {
+    const sender = this.daemon.registry.get(pending.senderId)
+      || this.daemon.registry.getAll().find((a) => a.name === answerTurn.to.name);
+    if (!sender) return; // sender is gone — nothing to route back to
+
+    const msg = [
+      `[InnerChat reply from ${answerTurn.from.name} (${answerTurn.from.role})]`,
       '',
-      responseText,
+      text,
       '',
-      `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.',
+      'This is a reply to a message you sent earlier (you were not blocking on it). '
+      + 'Fold it into your work, or reply again to continue.',
     ].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';
+      await deliverInstruction(this.daemon, sender.id, msg, { recordFeedback: false });
     } catch (err) {
-      turn.status = 'failed';
-      turn.error = err.message;
-      thread.status = 'failed';
+      this.daemon.audit.log('innerchat.forward_failed', { to: sender.id, error: err.message });
     }
+  }
 
-    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 });
+  /**
+   * An agent that dies mid-question would otherwise leave a blocking asker
+   * stuck until timeout. Async senders aren't waiting, so just clear those.
+   */
+  onAgentGone(agentId, reason = 'stopped') {
+    const pending = this.awaiting.get(agentId);
+    if (!pending) return;
+    if (pending.mode === 'async') { this._clearAwait(agentId); return; }
+    const agent = this.daemon.registry.get(agentId);
+    pending.reject(new Error(`${agent?.name || agentId} ${reason} before answering`));
   }
 
-  // ── Thread helpers ──────────────────────────────────────────
+  _clearAwait(targetId) {
+    const pending = this.awaiting.get(targetId);
+    if (pending?.timer) clearTimeout(pending.timer);
+    this.awaiting.delete(targetId);
+  }
+
+  _settlePending(agentId, pending, value, err) {
+    if (pending.mode === 'async') { this._clearAwait(agentId); return; }
+    if (err) pending.reject(err); else pending.resolve(value);
+  }
+
+  // ── Threads ─────────────────────────────────────────────────
 
   _createThread(fromAgent, toAgent) {
     const thread = {
@@ -178,25 +312,43 @@ export class InnerChat {
     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) {
+  // Consecutive asks between the same pair continue one conversation, so the
+  // exchange cap actually bounds a back-and-forth rather than resetting.
+  _findThread(a, b) {
+    return this.getThreads(a).find((t) => t.participants.some((p) => p.id === b)) || null;
+  }
+
+  // The target sees a direct message from the other agent, with enough prior
+  // turns to follow a continuing conversation. The closing instruction differs
+  // by kind: an ask blocks the sender (answer now), a tell does not (answer
+  // when you reach a good stopping point).
+  _wrap(thread, fromAgent, toAgent, message, kind = 'ask') {
+    const header = kind === 'tell'
+      ? `[InnerChat — ${fromAgent.name} (${fromAgent.role}) sent you a message]`
+      : `[InnerChat — ${fromAgent.name} (${fromAgent.role}) is asking you a question]`;
     const prior = thread.turns.slice(0, -1).slice(-CONTEXT_TURNS);
-    const lines = [`[InnerChat from ${fromAgent.name} (${fromAgent.role})]`, ''];
+    const lines = [header, ''];
 
     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)}`);
-      }
+      for (const t of prior) lines.push(`  ${t.from.name}: ${truncate(t.text, MAX_TURN_CHARS)}`);
       lines.push('');
     }
 
     lines.push(message, '');
-    lines.push(
-      `Reply normally — your response is relayed straight back to ${fromAgent.name}. `
-      + 'Answer them directly; do not address the user.',
-    );
+    if (kind === 'tell') {
+      lines.push(
+        `${fromAgent.name} is NOT blocked on this — finish what you're doing first if you're `
+        + 'mid-task. When you reach a good stopping point, answer directly in a message; your '
+        + `reply is relayed back to ${fromAgent.name}. If no reply is needed, just carry on.`,
+      );
+    } else {
+      lines.push(
+        `${fromAgent.name} is BLOCKED waiting on your answer — it cannot continue until you `
+        + 'respond. Answer directly and concisely in your next message; that message is sent '
+        + 'back to it verbatim. Do not address the user, and do not start unrelated work first.',
+      );
+    }
     return lines.join('\n');
   }
 
@@ -205,10 +357,7 @@ export class InnerChat {
   }
 
   _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.
+    for (const p of thread.participants) if (p.id === oldId) p.id = newId;
     const pending = this.awaiting.get(oldId);
     if (pending) {
       this.awaiting.delete(oldId);
@@ -216,6 +365,10 @@ export class InnerChat {
     }
   }
 
+  _broadcast(thread, turn) {
+    this.daemon.broadcast({ type: 'innerchat:turn', data: { thread, turn } });
+  }
+
   // ── Queries ─────────────────────────────────────────────────
 
   getThreads(agentId = null) {
@@ -232,6 +385,20 @@ export class InnerChat {
     const pending = this.awaiting.get(agentId);
     return pending ? this.threads.get(pending.threadId) : null;
   }
+
+  // Clear all outstanding timers so a shutdown (or a test) doesn't hang on
+  // pending ask/tell timeouts. Blocking asks are rejected so their HTTP
+  // requests don't hang either.
+  stop() {
+    for (const [targetId, pending] of this.awaiting) {
+      if (pending.timer) clearTimeout(pending.timer);
+      if (pending.mode === 'block') {
+        try { pending.reject(new Error('Daemon shutting down')); } catch { /* already settled */ }
+      }
+      this.awaiting.delete(targetId);
+    }
+    this.blockedOn.clear();
+  }
 }
 
 function peer(agent) {
@@ -249,3 +416,5 @@ function extractText(data) {
   }
   return '';
 }
+
+export { MAX_EXCHANGES, DEFAULT_TIMEOUT_MS };