a2acalling 0.6.43 → 0.6.44

package/README.md

@@ -410,11 +410,7 @@ app.listen(3001);
 | `A2A_PORT` | Server port (default: 3001) |
 | `A2A_CONFIG_DIR` | Config directory (default: `~/.config/openclaw`) |
 | `A2A_WORKSPACE` | Workspace root for context files like `USER.md` (default: current directory) |
-| `A2A_RUNTIME` | Runtime mode: `auto` (default), `openclaw`, or `generic` |
-| `A2A_RUNTIME_FAILOVER` | Fallback to generic runtime if OpenClaw runtime errors (default: `true`) |
-| `A2A_AGENT_COMMAND` | Generic runtime command for inbound turn handling (reads JSON from stdin) |
-| `A2A_SUMMARY_COMMAND` | Generic runtime command for call summaries (reads JSON from stdin) |
-| `A2A_NOTIFY_COMMAND` | Generic runtime command for owner notifications (reads JSON from stdin) |
+| `A2A_RUNTIME` | Runtime mode: `auto` (default), `openclaw`, or `claude` |
 | `A2A_AGENT_NAME` | Override local agent display name |
 | `A2A_OWNER_NAME` | Override owner display name |
 | `A2A_COLLAB_MODE` | Conversation style: `adaptive` (default) or `deep_dive` |

package/bin/cli.js

@@ -518,8 +518,7 @@ async function handleDisclosureSubmit(args, commandLabel = 'onboard') {
     return tierData.topics.map(t => String(t && t.topic || '').trim()).filter(Boolean);
   }
 
-  // Get tiers data (support both new 'tiers' key and legacy 'topics' key)
-  const tiersData = manifest.tiers || manifest.topics || {};
+  const tiersData = manifest.tiers || {};
 
   try {
     config.setTier('public', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "a2acalling",
-  "version": "0.6.43",
+  "version": "0.6.44",
   "description": "Agent-to-agent calling for OpenClaw - A2A agent communication",
   "main": "src/index.js",
   "bin": {

package/src/lib/claude-subagent.js

@@ -0,0 +1,485 @@
+/**
+ * Claude Subagent — Lifecycle management for Claude CLI subagent sessions.
+ *
+ * Spawns `claude` CLI processes for real LLM-powered A2A conversations
+ * as an alternative to OpenClaw for A2A conversations.
+ *
+ * Uses `claude -p` (print mode) with `--resume` for multi-turn context continuity.
+ */
+
+const { execSync, spawn } = require('child_process');
+const { createLogger } = require('./logger');
+
+const logger = createLogger({ component: 'a2a.claude-subagent' });
+
+const A2A_RESPONSE_REGEX = /<a2a_response>\s*([\s\S]*?)\s*<\/a2a_response>/i;
+
+/**
+ * Check if `claude` CLI is available in PATH.
+ */
+function isClaudeAvailable() {
+  try {
+    execSync('command -v claude', { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Build the system prompt for the Claude subagent.
+ *
+ * @param {Object} config
+ * @param {string} config.agentName
+ * @param {string} config.ownerName
+ * @param {string} config.otherAgentName
+ * @param {string} config.otherOwnerName
+ * @param {string} config.accessTier
+ * @param {string} config.tierTopics - formatted topics string
+ * @param {string} config.tierObjectives - formatted objectives string
+ * @param {string} config.doNotDiscuss - formatted do_not_discuss string
+ * @param {string} config.neverDisclose - formatted never_disclose string
+ * @param {string} config.personalityNotes
+ * @param {string} config.roleContext
+ * @returns {string}
+ */
+function buildSubagentSystemPrompt(config) {
+  const {
+    agentName = 'Agent',
+    ownerName = 'the owner',
+    otherAgentName = 'Remote Agent',
+    otherOwnerName = 'their owner',
+    accessTier = 'public',
+    tierTopics = '  (none specified)',
+    tierObjectives = '  (none specified)',
+    doNotDiscuss = '  (none specified)',
+    neverDisclose = '  (none specified)',
+    personalityNotes = '',
+    roleContext = ''
+  } = config;
+
+  return `You are ${agentName}, the personal AI agent for ${ownerName}.
+You are on a live A2A (agent-to-agent) call with ${otherAgentName}, who represents ${otherOwnerName}. ${roleContext}
+
+== OUTPUT FORMAT ==
+
+After your conversational reply, you MUST append exactly one structured response block:
+
+<a2a_response>
+{"message":"Your conversational reply here","statePatch":{"phase":"explore","overlapScore":0.3,"activeThreads":["thread1"],"candidateCollaborations":["idea1"],"closeSignal":false,"confidence":0.4},"flags":[]}
+</a2a_response>
+
+Rules for the response block:
+- "message" (required): Your full conversational reply text. This is what the other agent sees.
+- "statePatch" (optional): Collaboration state update with any of: phase, overlapScore (0-1), activeThreads (max 4), candidateCollaborations (max 4), closeSignal (boolean), confidence (0-1).
+- "flags" (optional): Array of flag objects like {"type":"question_for_owner","content":"..."} or {"type":"opportunity_flagged","content":"..."}.
+- Must be valid JSON (double quotes only).
+- The message in the JSON block should match your visible conversational text.
+
+Flag types:
+- "question_for_owner": Something you want to ask ${ownerName} about before committing
+- "opportunity_flagged": A concrete collaboration opportunity worth the owner's attention
+- "boundary_touched": The other agent probed near a do_not_discuss or never_disclose topic
+- "unverifiable_claim": The other agent made a claim you cannot verify
+
+== DISCLOSURE CONTEXT ==
+
+Access level: ${accessTier}
+
+${ownerName}'s topics of interest:
+${tierTopics}
+
+Objectives:
+${tierObjectives}
+
+DO NOT DISCUSS (redirect naturally):
+${doNotDiscuss}
+
+NEVER disclose:
+${neverDisclose}
+
+== BEHAVIORAL MANDATE ==
+
+You operate in three concurrent modes:
+
+1. EXPLORING: Map the other agent's owner — capabilities, resources, blind spots, ambitions.
+   Ask probing questions. Don't accept surface-level answers. Dig into specifics.
+
+2. ADVERSARIALLY QUALIFYING: Pressure-test claims. Push back respectfully.
+   "You say X, but that sounds like Y. What's actually different?"
+   "That's a crowded space. What makes their angle defensible?"
+   The best collaborations come from people who can handle scrutiny.
+
+3. COLLABORATING: Look for concrete overlap and actionable next steps.
+   Complementary capabilities, shared challenges, non-obvious intersections.
+   Propose specific ideas, not vague "let's stay in touch."
+
+== PHASE AWARENESS ==
+
+Each turn you receive state including turn number, maxTurns, and current phase.
+Adapt your behavior to the phase:
+
+- handshake (turns 1-2): Establish context, introduce key topics, set one meaningful direction.
+- exploring (turns 2-6): Map goals, capabilities, constraints. Stay here while new info surfaces.
+- deepening (turns 5-10): Work through specific collaboration threads in detail.
+- converging (turns 8+): Convert insights into concrete next steps. Set closeSignal when done.
+
+These are guidelines, not hard locks. Stay in any phase as long as it's productive.
+
+== PERSONALITY ==
+
+${personalityNotes || "Direct, curious, slightly irreverent. You have opinions and share them. You're not a concierge — you're a sparring partner who represents someone."}
+
+When unsure about your owner's position, say so: "I don't have ${ownerName}'s take on that — but here's what I think based on their work..."`;
+}
+
+/**
+ * Build the turn prompt containing state and the inbound message.
+ */
+function buildTurnPrompt(options) {
+  const {
+    turnMessage,
+    turn,
+    maxTurns,
+    phase = 'handshake',
+    overlapScore = 0.15,
+    activeThreads = [],
+    candidateCollaborations = [],
+    closeSignal = false
+  } = options;
+
+  return `== TURN STATE ==
+Turn: ${turn}/${maxTurns}
+Phase: ${phase}
+Overlap score: ${overlapScore}
+Active threads: ${activeThreads.length > 0 ? activeThreads.join(', ') : '(none)'}
+Candidate collaborations: ${candidateCollaborations.length > 0 ? candidateCollaborations.join(', ') : '(none)'}
+Close signal: ${closeSignal}
+
+== INBOUND MESSAGE ==
+
+${turnMessage}
+
+Respond naturally, then append your <a2a_response> block.`;
+}
+
+/**
+ * Parse the structured response from Claude's output.
+ *
+ * @param {string} resultText - Raw text output from claude CLI
+ * @returns {{ message: string, statePatch: object|null, flags: array }}
+ */
+function parseSubagentResponse(resultText) {
+  if (!resultText || typeof resultText !== 'string') {
+    return { message: '', statePatch: null, flags: [] };
+  }
+
+  const match = resultText.match(A2A_RESPONSE_REGEX);
+  if (!match) {
+    // Graceful degradation: treat entire result as the message
+    return { message: resultText.trim(), statePatch: null, flags: [] };
+  }
+
+  const jsonStr = (match[1] || '').trim();
+  if (!jsonStr) {
+    const cleanText = resultText.replace(A2A_RESPONSE_REGEX, '').trim();
+    return { message: cleanText || '', statePatch: null, flags: [] };
+  }
+
+  try {
+    const parsed = JSON.parse(jsonStr);
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+      throw new Error('a2a_response must be a JSON object');
+    }
+
+    return {
+      message: typeof parsed.message === 'string' ? parsed.message : resultText.replace(A2A_RESPONSE_REGEX, '').trim(),
+      statePatch: parsed.statePatch && typeof parsed.statePatch === 'object' ? parsed.statePatch : null,
+      flags: Array.isArray(parsed.flags) ? parsed.flags : []
+    };
+  } catch (err) {
+    logger.warn('Failed to parse <a2a_response> JSON', {
+      event: 'subagent_response_parse_failed',
+      error: err,
+      data: { json_length: jsonStr.length }
+    });
+    // Fall back to using text outside the tags
+    const cleanText = resultText.replace(A2A_RESPONSE_REGEX, '').trim();
+    return { message: cleanText || resultText.trim(), statePatch: null, flags: [] };
+  }
+}
+
+/**
+ * Spawn `claude` CLI and collect output as a promise.
+ *
+ * @param {string[]} args - CLI arguments
+ * @param {number} timeoutMs - Timeout in milliseconds
+ * @returns {Promise<{ stdout: string, stderr: string }>}
+ */
+function spawnClaude(args, timeoutMs = 180000) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn('claude', args, {
+      stdio: ['pipe', 'pipe', 'pipe'],
+      env: {
+        ...process.env,
+        FORCE_COLOR: '0',
+        CLAUDECODE: ''  // Unset to allow nested invocation
+      }
+    });
+
+    let stdout = '';
+    let stderr = '';
+    let killed = false;
+
+    const timer = setTimeout(() => {
+      killed = true;
+      proc.kill('SIGTERM');
+      // Give it 5s to clean up, then force kill
+      setTimeout(() => {
+        try { proc.kill('SIGKILL'); } catch (e) { /* already dead */ }
+      }, 5000);
+    }, timeoutMs);
+
+    proc.stdout.on('data', (data) => { stdout += data.toString(); });
+    proc.stderr.on('data', (data) => { stderr += data.toString(); });
+
+    proc.on('close', (code) => {
+      clearTimeout(timer);
+      if (killed) {
+        reject(new Error(`Claude CLI timed out after ${timeoutMs}ms`));
+        return;
+      }
+      if (code !== 0 && !stdout.trim()) {
+        reject(new Error(`Claude CLI exited with code ${code}: ${stderr.slice(0, 500)}`));
+        return;
+      }
+      resolve({ stdout, stderr });
+    });
+
+    proc.on('error', (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+  });
+}
+
+/**
+ * Extract the result text from Claude's JSON output.
+ * Claude with --output-format json returns { type, subtype, cost_usd, duration_ms, duration_api_ms,
+ * is_error, num_turns, result, session_id, ... }
+ */
+function extractResultFromJson(stdout) {
+  const trimmed = stdout.trim();
+  if (!trimmed) return { result: '', sessionId: null };
+
+  try {
+    const parsed = JSON.parse(trimmed);
+    return {
+      result: typeof parsed.result === 'string' ? parsed.result : '',
+      sessionId: parsed.session_id || null
+    };
+  } catch (err) {
+    // If JSON parsing fails, treat entire output as result text
+    logger.debug('Claude output not valid JSON, using raw text', {
+      event: 'subagent_json_parse_fallback',
+      data: { output_length: trimmed.length }
+    });
+    return { result: trimmed, sessionId: null };
+  }
+}
+
+/**
+ * Run a single turn of the Claude subagent.
+ *
+ * @param {Object} options
+ * @param {string} options.sessionId - Conversation session ID (used for --resume on turn 2+)
+ * @param {string} options.systemPrompt - System prompt (used on turn 1 only)
+ * @param {string} options.turnMessage - The inbound message from the remote agent
+ * @param {number} options.turn - Current turn number (1-based)
+ * @param {number} options.maxTurns - Maximum turns allowed
+ * @param {string} options.phase - Current conversation phase
+ * @param {number} options.overlapScore - Current overlap score
+ * @param {Array} options.activeThreads - Active conversation threads
+ * @param {Array} options.candidateCollaborations - Candidate collaboration ideas
+ * @param {boolean} options.closeSignal - Whether close has been signaled
+ * @param {number} [options.timeoutMs=180000] - Timeout in milliseconds
+ * @returns {Promise<{ message: string, statePatch: object|null, flags: array, sessionId: string }>}
+ */
+async function runClaudeTurn(options) {
+  const {
+    sessionId,
+    systemPrompt,
+    turnMessage,
+    turn = 1,
+    maxTurns = 30,
+    phase = 'handshake',
+    overlapScore = 0.15,
+    activeThreads = [],
+    candidateCollaborations = [],
+    closeSignal = false,
+    timeoutMs = 180000
+  } = options;
+
+  const turnPrompt = buildTurnPrompt({
+    turnMessage,
+    turn,
+    maxTurns,
+    phase,
+    overlapScore,
+    activeThreads,
+    candidateCollaborations,
+    closeSignal
+  });
+
+  const startAt = Date.now();
+  const allowedTools = 'Bash(readonly) Read Grep Glob WebSearch WebFetch';
+
+  let args;
+  if (turn === 1 || !sessionId) {
+    // First turn: create new session
+    args = [
+      '-p',
+      '--output-format', 'json',
+      '--system-prompt', systemPrompt,
+      '--allowedTools', allowedTools,
+      '--model', 'claude-sonnet-4-5-20250929',
+      turnPrompt
+    ];
+  } else {
+    // Subsequent turns: resume existing session
+    args = [
+      '-p',
+      '--output-format', 'json',
+      '--resume', sessionId,
+      '--allowedTools', allowedTools,
+      turnPrompt
+    ];
+  }
+
+  logger.debug('Spawning Claude subagent turn', {
+    event: 'subagent_turn_start',
+    data: {
+      turn,
+      max_turns: maxTurns,
+      phase,
+      is_resume: turn > 1 && Boolean(sessionId),
+      timeout_ms: timeoutMs
+    }
+  });
+
+  const { stdout } = await spawnClaude(args, timeoutMs);
+  const { result, sessionId: newSessionId } = extractResultFromJson(stdout);
+  const parsed = parseSubagentResponse(result);
+
+  logger.debug('Claude subagent turn completed', {
+    event: 'subagent_turn_complete',
+    data: {
+      turn,
+      duration_ms: Date.now() - startAt,
+      message_length: parsed.message.length,
+      has_state_patch: Boolean(parsed.statePatch),
+      flag_count: parsed.flags.length,
+      session_id: newSessionId || sessionId
+    }
+  });
+
+  return {
+    message: parsed.message,
+    statePatch: parsed.statePatch,
+    flags: parsed.flags,
+    sessionId: newSessionId || sessionId
+  };
+}
+
+/**
+ * Run a summary turn using the Claude subagent session.
+ *
+ * @param {string} sessionId - Session ID to resume
+ * @param {string} reason - Why the conversation is ending
+ * @param {number} [timeoutMs=120000] - Timeout in milliseconds
+ * @returns {Promise<{ summary: string, ownerSummary: string, actionItems: array, flags: array }>}
+ */
+async function runClaudeSummary(sessionId, reason, timeoutMs = 120000) {
+  if (!sessionId) {
+    throw new Error('Cannot summarize without a session ID');
+  }
+
+  const summaryPrompt = `The conversation is ending. Reason: ${reason || 'max turns reached'}.
+
+Provide a structured summary. Respond with ONLY a JSON block:
+
+<a2a_response>
+{
+  "message": "Brief 1-2 sentence summary of the conversation.",
+  "statePatch": {"phase": "close", "closeSignal": true},
+  "flags": [],
+  "summary": "Detailed summary for the conversation record.",
+  "ownerSummary": "Summary written for the owner highlighting key findings and opportunities.",
+  "actionItems": ["Specific follow-up item 1", "Specific follow-up item 2"]
+}
+</a2a_response>`;
+
+  const args = [
+    '-p',
+    '--output-format', 'json',
+    '--resume', sessionId,
+    summaryPrompt
+  ];
+
+  const startAt = Date.now();
+
+  logger.debug('Spawning Claude summary', {
+    event: 'subagent_summary_start',
+    data: { session_id: sessionId, reason }
+  });
+
+  const { stdout } = await spawnClaude(args, timeoutMs);
+  const { result } = extractResultFromJson(stdout);
+
+  // Try to extract structured summary from <a2a_response>
+  const match = result.match(A2A_RESPONSE_REGEX);
+  if (match) {
+    try {
+      const parsed = JSON.parse(match[1].trim());
+      logger.debug('Claude summary completed', {
+        event: 'subagent_summary_complete',
+        data: {
+          session_id: sessionId,
+          duration_ms: Date.now() - startAt,
+          has_summary: Boolean(parsed.summary),
+          action_item_count: Array.isArray(parsed.actionItems) ? parsed.actionItems.length : 0
+        }
+      });
+
+      return {
+        summary: parsed.summary || parsed.message || result.replace(A2A_RESPONSE_REGEX, '').trim(),
+        ownerSummary: parsed.ownerSummary || parsed.summary || parsed.message || '',
+        actionItems: Array.isArray(parsed.actionItems) ? parsed.actionItems : [],
+        flags: Array.isArray(parsed.flags) ? parsed.flags : []
+      };
+    } catch (err) {
+      logger.warn('Failed to parse summary JSON', {
+        event: 'subagent_summary_parse_failed',
+        error: err
+      });
+    }
+  }
+
+  // Fallback: use raw text as summary
+  const summaryText = result.replace(A2A_RESPONSE_REGEX, '').trim() || result.trim();
+  return {
+    summary: summaryText,
+    ownerSummary: summaryText,
+    actionItems: [],
+    flags: []
+  };
+}
+
+module.exports = {
+  isClaudeAvailable,
+  buildSubagentSystemPrompt,
+  buildTurnPrompt,
+  runClaudeTurn,
+  runClaudeSummary,
+  parseSubagentResponse
+};

package/src/lib/conversation-driver.js

@@ -56,7 +56,7 @@ function detectRemoteTermination(text) {
 
 /**
  * Infer collaboration state progression when the runtime doesn't emit
- * <collab_state> tags (generic/fallback mode). Advances phase based on
+ * <collab_state> tags (e.g. OpenClaw without adaptive mode). Advances phase based on
  * turn count and estimates overlap from remote text analysis.
  */
 function inferStateProgression(collabState, remoteText, turn) {
@@ -128,8 +128,11 @@ class ConversationDriver {
     this.tier = options.tier || 'public';
     this.summarizer = options.summarizer || null;
     this.ownerContext = options.ownerContext || {};
+    this.claudeMode = options.runtime?.mode === 'claude';
+    this.claudeTimeoutMs = options.claudeTimeoutMs || 180000;
 
-    this.client = new A2AClient({ caller: this.caller, timeout: 65000 });
+    const clientTimeout = this.claudeMode ? 200000 : 65000;
+    this.client = new A2AClient({ caller: this.caller, timeout: clientTimeout });
   }
 
   /**
@@ -351,18 +354,30 @@ Be concise but specific. No filler.`;
       // 5. Call runtime.runTurn() to generate next message
       const sessionId = `a2a-${conversationId}`;
       let rawResponse;
+      const contextPayload = {
+        conversationId,
+        tier: this.tier,
+        ownerName: this.agentContext.owner,
+        agentName: this.agentContext.name,
+        roleContext: 'You initiated this call.'
+      };
+      if (this.claudeMode) {
+        contextPayload.turnCount = turn + 1;
+        contextPayload.maxTurns = this.maxTurns;
+        contextPayload.phase = collabState.phase;
+        contextPayload.overlapScore = collabState.overlapScore;
+        contextPayload.activeThreads = collabState.activeThreads;
+        contextPayload.candidateCollaborations = collabState.candidateCollaborations;
+        contextPayload.closeSignal = collabState.closeSignal;
+      }
       try {
         rawResponse = await this.runtime.runTurn({
           sessionId,
           prompt,
           message: remoteText,
           caller: this.caller,
-          timeoutMs: 65000,
-          context: {
-            conversationId,
-            tier: this.tier,
-            ownerName: this.agentContext.owner
-          }
+          timeoutMs: this.claudeMode ? this.claudeTimeoutMs : 65000,
+          context: contextPayload
         });
       } catch (err) {
         logger.error('Runtime turn failed', {
@@ -374,33 +389,59 @@ Be concise but specific. No filler.`;
       }
 
       // 6. Extract collab state from response
-      const parsed = extractCollaborationState(rawResponse);
-      nextMessage = parsed.cleanText || rawResponse;
-
-      if (parsed.hasState && parsed.statePatch) {
-        if (parsed.statePatch.phase) collabState.phase = parsed.statePatch.phase;
-        if (parsed.statePatch.overlapScore != null) {
-          collabState.overlapScore = Math.max(0, Math.min(1, parsed.statePatch.overlapScore));
+      // In claude mode, use the side channel (getLastTurnMeta) for state/flags
+      const turnMeta = this.claudeMode ? this.runtime.getLastTurnMeta?.(sessionId) : null;
+
+      if (turnMeta?.statePatch) {
+        // Claude subagent returned structured state — apply it directly
+        nextMessage = rawResponse;
+        const sp = turnMeta.statePatch;
+        if (sp.phase) collabState.phase = sp.phase;
+        if (sp.overlapScore != null) {
+          collabState.overlapScore = Math.max(0, Math.min(1, sp.overlapScore));
         }
-        if (Array.isArray(parsed.statePatch.activeThreads)) {
-          collabState.activeThreads = parsed.statePatch.activeThreads.slice(0, 4);
+        if (Array.isArray(sp.activeThreads)) {
+          collabState.activeThreads = sp.activeThreads.slice(0, 4);
         }
-        if (Array.isArray(parsed.statePatch.candidateCollaborations)) {
-          collabState.candidateCollaborations = parsed.statePatch.candidateCollaborations.slice(0, 4);
+        if (Array.isArray(sp.candidateCollaborations)) {
+          collabState.candidateCollaborations = sp.candidateCollaborations.slice(0, 4);
         }
-        if (parsed.statePatch.closeSignal != null) {
-          collabState.closeSignal = Boolean(parsed.statePatch.closeSignal);
+        if (sp.closeSignal != null) {
+          collabState.closeSignal = Boolean(sp.closeSignal);
         }
-        if (parsed.statePatch.confidence != null) {
-          collabState.confidence = Math.max(0, Math.min(1, parsed.statePatch.confidence));
+        if (sp.confidence != null) {
+          collabState.confidence = Math.max(0, Math.min(1, sp.confidence));
         }
       } else {
-        // No <collab_state> in response (generic/fallback runtime) — infer progression
-        const inferred = inferStateProgression(collabState, remoteText, turn + 1);
-        if (inferred.phase) collabState.phase = inferred.phase;
-        if (inferred.overlapScore != null) collabState.overlapScore = inferred.overlapScore;
-        if (inferred.confidence != null) collabState.confidence = inferred.confidence;
-        if (inferred.closeSignal != null) collabState.closeSignal = inferred.closeSignal;
+        // Non-claude path: extract from <collab_state> tags in response text
+        const parsed = extractCollaborationState(rawResponse);
+        nextMessage = parsed.cleanText || rawResponse;
+
+        if (parsed.hasState && parsed.statePatch) {
+          if (parsed.statePatch.phase) collabState.phase = parsed.statePatch.phase;
+          if (parsed.statePatch.overlapScore != null) {
+            collabState.overlapScore = Math.max(0, Math.min(1, parsed.statePatch.overlapScore));
+          }
+          if (Array.isArray(parsed.statePatch.activeThreads)) {
+            collabState.activeThreads = parsed.statePatch.activeThreads.slice(0, 4);
+          }
+          if (Array.isArray(parsed.statePatch.candidateCollaborations)) {
+            collabState.candidateCollaborations = parsed.statePatch.candidateCollaborations.slice(0, 4);
+          }
+          if (parsed.statePatch.closeSignal != null) {
+            collabState.closeSignal = Boolean(parsed.statePatch.closeSignal);
+          }
+          if (parsed.statePatch.confidence != null) {
+            collabState.confidence = Math.max(0, Math.min(1, parsed.statePatch.confidence));
+          }
+        } else {
+          // No <collab_state> in response (generic/fallback runtime) — infer progression
+          const inferred = inferStateProgression(collabState, remoteText, turn + 1);
+          if (inferred.phase) collabState.phase = inferred.phase;
+          if (inferred.overlapScore != null) collabState.overlapScore = inferred.overlapScore;
+          if (inferred.confidence != null) collabState.confidence = inferred.confidence;
+          if (inferred.closeSignal != null) collabState.closeSignal = inferred.closeSignal;
+        }
       }
 
       // 6b. Overlap flatline detection — if overlap hasn't changed significantly
@@ -426,6 +467,16 @@ Be concise but specific. No filler.`;
         }
       }
 
+      // 7b. Store flags from claude subagent responses
+      if (turnMeta?.flags?.length > 0 && this.convStore && dbConversationStarted) {
+        this.convStore.addMessage(conversationId, {
+          direction: 'outbound',
+          role: 'system',
+          content: `[flags] ${turnMeta.flags.map(f => f.content || f.type).join('; ')}`,
+          metadata: JSON.stringify({ flags: turnMeta.flags, turn: turn + 1 })
+        });
+      }
+
       // onTurn callback for progress output
       if (this.onTurn) {
         try {