fix: subagent summerize (#83)

* fix: subagent summerize

* fix: group subagent text by agent name for parallel fallback

The flat subagent_text_buffer list would interleave text from parallel
sub-agents into incoherent output. Replace with a dict grouped by
agent name so each sub-agent's text stays coherent, with [name]:
attribution when multiple agents contribute.

Add comprehensive tests for the new behavior (24 tests).

* fix: group subagent text by agent name for parallel fallback

The flat subagent_text_buffer list would interleave text from parallel
sub-agents into incoherent output. Replace with a dict grouped by
agent name so each sub-agent's text stays coherent, with [name]:
attribution when multiple agents contribute.

Add comprehensive tests for the new behavior (24 tests).

* fix: group subagent text by agent name for parallel fallback

The flat subagent_text_buffer list would interleave text from parallel
sub-agents into incoherent output. Replace with a dict grouped by
agent name so each sub-agent's text stays coherent, with [name]:
attribution when multiple agents contribute.

Add comprehensive tests for the new behavior (24 tests).

* chore: fix multiple agent

* test: add test

* fix linter

* remove redundant

EvoScientist/channels/consumer.py

@@ -78,6 +78,36 @@ def _format_todo_list(todos: list[dict]) -> str:
     return "\n".join(lines)
 
 
+def _join_subagent_text(buffers: dict[str, tuple[str, list[str]]]) -> str:
+    """Join sub-agent text buffers into a single fallback string.
+
+    *buffers* maps ``instance_id`` → ``(display_name, chunks)``.
+
+    When only one instance produced text, return its content directly.
+    When multiple instances share the same display name, number them
+    (e.g. ``[research-agent #1]``, ``[research-agent #2]``).
+    """
+    if not buffers:
+        return ""
+    if len(buffers) == 1:
+        _display_name, chunks = next(iter(buffers.values()))
+        return "".join(chunks)
+
+    # Group by display_name to detect same-name instances
+    name_groups: dict[str, list[list[str]]] = {}
+    for _instance_id, (display_name, chunks) in buffers.items():
+        name_groups.setdefault(display_name, []).append(chunks)
+
+    sections: list[str] = []
+    for display_name, chunk_lists in name_groups.items():
+        if len(chunk_lists) == 1:
+            sections.append(f"[{display_name}]: {''.join(chunk_lists[0])}")
+        else:
+            for i, chs in enumerate(chunk_lists, 1):
+                sections.append(f"[{display_name} #{i}]: {''.join(chs)}")
+    return "\n\n".join(sections)
+
+
 def _should_auto_approve(action_requests: list[dict]) -> bool:
     """Check if all action requests can be auto-approved via config.
 
@@ -430,6 +460,7 @@ class InboundConsumer:
                 final_content = ""
                 thinking_buffer: list[str] = []
                 todo_sent = False
+                subagent_text_buffers: dict[str, tuple[str, list[str]]] = {}
                 thinking_sent = False
                 interrupt_data: dict | None = None
 
@@ -481,6 +512,15 @@ class InboundConsumer:
                     elif event_type == "text":
                         final_content += event.get("content", "")
 
+                    elif event_type == "subagent_text":
+                        sa_name = event.get("subagent", "unknown")
+                        instance_id = event.get("instance_id") or sa_name
+                        if instance_id not in subagent_text_buffers:
+                            subagent_text_buffers[instance_id] = (sa_name, [])
+                        subagent_text_buffers[instance_id][1].append(
+                            event.get("content", "")
+                        )
+
                     elif event_type == "done":
                         final_content = event.get("content", "") or final_content
 
@@ -507,7 +547,9 @@ class InboundConsumer:
                     outbound = OutboundMessage(
                         channel=msg.channel,
                         chat_id=msg.chat_id,
-                        content=final_content or "No response",
+                        content=final_content
+                        or _join_subagent_text(subagent_text_buffers)
+                        or "No response",
                         reply_to=msg.message_id or None,
                         metadata=msg.metadata,
                     )

EvoScientist/stream/emitter.py

@@ -96,6 +96,21 @@ class StreamEventEmitter:
             },
         )
 
+    @staticmethod
+    def subagent_text(
+        subagent: str, content: str, instance_id: str = ""
+    ) -> StreamEvent:
+        """Text content from a sub-agent (for fallback extraction)."""
+        return StreamEvent(
+            "subagent_text",
+            {
+                "type": "subagent_text",
+                "subagent": subagent,
+                "content": content,
+                "instance_id": instance_id,
+            },
+        )
+
     @staticmethod
     def subagent_end(name: str) -> StreamEvent:
         """Sub-agent delegation completed."""

EvoScientist/stream/events.py

@@ -502,7 +502,14 @@ async def stream_agent_events(
                                 ev.data["args"],
                                 ev.data.get("id", ""),
                             ).data
-                        # Skip text/thinking from sub-agents (too noisy)
+                        # Emit sub-agent text for fallback extraction
+                        # (not displayed in TUI, but available to consumers)
+                        elif ev.type == "text":
+                            yield emitter.subagent_text(
+                                subagent,
+                                ev.data.get("content", ""),
+                                instance_id=tracker_key,
+                            ).data
 
                     if hasattr(msg, "tool_calls") and msg.tool_calls:
                         for tc in msg.tool_calls:

tests/test_stream_emitter.py

@@ -99,6 +99,7 @@ class TestStreamEventEmitter:
             StreamEventEmitter.subagent_start("s", "d"),
             StreamEventEmitter.subagent_tool_call("s", "t", {}),
             StreamEventEmitter.subagent_tool_result("s", "t", "x"),
+            StreamEventEmitter.subagent_text("s", "c"),
             StreamEventEmitter.subagent_end("s"),
             StreamEventEmitter.interrupt("i", []),
             StreamEventEmitter.done(),

tests/test_subagent_summarize.py

@@ -0,0 +1,734 @@
+"""Tests for sub-agent text fallback (fix/subagent-summarize).
+
+Covers:
+    1. StreamEventEmitter.subagent_text — event construction
+    2. stream_agent_events — subagent_text emission for sub-agent text chunks
+    3. InboundConsumer — subagent_text buffer & fallback priority chain
+    4. Prompt — DELEGATION_STRATEGY contains summarize guidance
+"""
+
+from __future__ import annotations
+
+import asyncio
+from dataclasses import dataclass
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from langchain_core.messages import AIMessageChunk
+
+from EvoScientist.channels.base import Channel
+from EvoScientist.channels.bus.events import InboundMessage as BusInbound
+from EvoScientist.channels.bus.message_bus import MessageBus
+from EvoScientist.channels.channel_manager import ChannelManager
+from EvoScientist.channels.consumer import InboundConsumer, _join_subagent_text
+from EvoScientist.stream.emitter import StreamEvent, StreamEventEmitter
+from EvoScientist.stream.events import stream_agent_events
+from tests.conftest import run_async as _run
+
+# ═══════════════════════════════════════════════════════════════════
+# Helpers
+# ═══════════════════════════════════════════════════════════════════
+
+
+@dataclass
+class _FakeConfig:
+    text_chunk_limit: int = 4096
+    allowed_senders: list | None = None
+    allowed_channels: list | None = None
+    proxy: str | None = None
+    require_mention: str = "group"
+    dm_policy: str = "allowlist"
+
+
+def _make_ai_chunk(content: str = "", **kwargs):
+    return AIMessageChunk(content=content, **kwargs)
+
+
+async def _async_iter(items):
+    for item in items:
+        yield item
+
+
+def _collect_events(agent, message="hi", thread_id="t1"):
+    async def _run_inner():
+        events = []
+        async for ev in stream_agent_events(agent, message, thread_id):
+            events.append(ev)
+        return events
+
+    loop = asyncio.new_event_loop()
+    try:
+        return loop.run_until_complete(_run_inner())
+    finally:
+        loop.close()
+
+
+# ═══════════════════════════════════════════════════════════════════
+# 1. StreamEventEmitter.subagent_text
+# ═══════════════════════════════════════════════════════════════════
+
+
+class TestSubagentTextEmitter:
+    def test_creates_correct_event_type(self):
+        ev = StreamEventEmitter.subagent_text("research-agent", "Found 3 papers.")
+        assert isinstance(ev, StreamEvent)
+        assert ev.type == "subagent_text"
+
+    def test_data_contains_subagent_and_content(self):
+        ev = StreamEventEmitter.subagent_text("analyst", "Result summary")
+        assert ev.data["subagent"] == "analyst"
+        assert ev.data["content"] == "Result summary"
+
+    def test_data_contains_type_key(self):
+        """Event data dict should include 'type' matching event type (project convention)."""
+        ev = StreamEventEmitter.subagent_text("a", "b")
+        assert ev.data["type"] == "subagent_text"
+
+    def test_empty_content(self):
+        ev = StreamEventEmitter.subagent_text("agent", "")
+        assert ev.data["content"] == ""
+
+    def test_instance_id_defaults_to_empty(self):
+        ev = StreamEventEmitter.subagent_text("agent", "content")
+        assert ev.data["instance_id"] == ""
+
+    def test_instance_id_included_when_provided(self):
+        ev = StreamEventEmitter.subagent_text(
+            "agent", "content", instance_id="tracker:abc"
+        )
+        assert ev.data["instance_id"] == "tracker:abc"
+
+    def test_included_in_all_events_type_check(self):
+        """subagent_text must pass the same invariant as other emitters."""
+        ev = StreamEventEmitter.subagent_text("s", "c")
+        assert "type" in ev.data
+        assert ev.data["type"] == ev.type
+
+
+# ═══════════════════════════════════════════════════════════════════
+# 2. stream_agent_events — subagent_text emission
+# ═══════════════════════════════════════════════════════════════════
+
+
+class TestStreamAgentEventsSubagentText:
+    """Verify sub-agent text chunks yield subagent_text events."""
+
+    def test_subagent_text_emitted_for_subagent_chunks(self):
+        """When a sub-agent produces text, subagent_text events should appear."""
+        subagent_chunk = _make_ai_chunk("Sub-agent finding: X is significant.")
+        mock_agent = AsyncMock()
+        mock_agent.astream = MagicMock(
+            return_value=_async_iter(
+                [
+                    (("sub:research",), "messages", (subagent_chunk, {})),
+                ]
+            )
+        )
+        events = _collect_events(mock_agent)
+        sa_text = [e for e in events if e.get("type") == "subagent_text"]
+        assert len(sa_text) == 1
+        assert "Sub-agent finding" in sa_text[0]["content"]
+        # instance_id must be present and non-empty
+        assert sa_text[0].get("instance_id"), "instance_id must be a non-empty string"
+
+    def test_subagent_text_not_emitted_for_main_agent(self):
+        """Main agent text should produce 'text' events, not 'subagent_text'."""
+        chunk = _make_ai_chunk("Main agent reply.")
+        mock_agent = AsyncMock()
+        mock_agent.astream = MagicMock(
+            return_value=_async_iter(
+                [
+                    ((), "messages", (chunk, {})),
+                ]
+            )
+        )
+        events = _collect_events(mock_agent)
+        sa_text = [e for e in events if e.get("type") == "subagent_text"]
+        text_events = [e for e in events if e.get("type") == "text"]
+        assert len(sa_text) == 0
+        assert len(text_events) == 1
+
+    def test_multiple_subagent_text_chunks_all_emitted(self):
+        """Multiple text chunks from a sub-agent all yield subagent_text events."""
+        chunks = [
+            (("sub:a",), "messages", (_make_ai_chunk("Part 1."), {})),
+            (("sub:a",), "messages", (_make_ai_chunk("Part 2."), {})),
+            (("sub:a",), "messages", (_make_ai_chunk("Part 3."), {})),
+        ]
+        mock_agent = AsyncMock()
+        mock_agent.astream = MagicMock(return_value=_async_iter(chunks))
+        events = _collect_events(mock_agent)
+        sa_text = [e for e in events if e.get("type") == "subagent_text"]
+        assert len(sa_text) == 3
+        combined = "".join(e["content"] for e in sa_text)
+        assert "Part 1." in combined
+        assert "Part 2." in combined
+        assert "Part 3." in combined
+        # All chunks from the same namespace must share the same instance_id
+        ids = {e["instance_id"] for e in sa_text}
+        assert len(ids) == 1, f"Expected 1 unique instance_id, got {ids}"
+        assert all(e.get("instance_id") for e in sa_text)
+
+    def test_parallel_same_name_agents_get_distinct_instance_ids(self):
+        """Two sub-agents with the same display name but different namespaces
+        produce subagent_text events with different instance_id values.
+
+        This is the core of the interleaving fix: the consumer can tell
+        the two instances apart even though their 'subagent' field is
+        identical.
+        """
+        # Two different namespaces with task: IDs, same lc_agent_name
+        chunks = [
+            (
+                ("ns:task:id1:agent",),
+                "messages",
+                (
+                    _make_ai_chunk("Instance-1 text."),
+                    {"lc_agent_name": "research-agent"},
+                ),
+            ),
+            (
+                ("ns:task:id2:agent",),
+                "messages",
+                (
+                    _make_ai_chunk("Instance-2 text."),
+                    {"lc_agent_name": "research-agent"},
+                ),
+            ),
+            (
+                ("ns:task:id1:agent",),
+                "messages",
+                (_make_ai_chunk(" More from 1."), {"lc_agent_name": "research-agent"}),
+            ),
+        ]
+        mock_agent = AsyncMock()
+        mock_agent.astream = MagicMock(return_value=_async_iter(chunks))
+        events = _collect_events(mock_agent)
+        sa_text = [e for e in events if e.get("type") == "subagent_text"]
+        assert len(sa_text) == 3
+
+        # All events have the same subagent display name
+        assert all(e["subagent"] == "research-agent" for e in sa_text)
+
+        # But instance_ids differ between the two namespaces
+        id1_events = [
+            e
+            for e in sa_text
+            if "Instance-1" in e["content"] or "More from 1" in e["content"]
+        ]
+        id2_events = [e for e in sa_text if "Instance-2" in e["content"]]
+        assert len(id1_events) == 2
+        assert len(id2_events) == 1
+
+        # Same namespace → same instance_id
+        assert id1_events[0]["instance_id"] == id1_events[1]["instance_id"]
+        # Different namespace → different instance_id
+        assert id1_events[0]["instance_id"] != id2_events[0]["instance_id"]
+
+
+# ═══════════════════════════════════════════════════════════════════
+# 3. InboundConsumer — subagent_text buffer & fallback priority
+# ═══════════════════════════════════════════════════════════════════
+
+
+class _StubChannel(Channel):
+    """Minimal concrete channel for consumer tests."""
+
+    name = "stub"
+
+    def __init__(self, config=None):
+        super().__init__(config or _FakeConfig())
+
+    async def start(self):
+        self._running = True
+
+    async def _send_chunk(self, chat_id, formatted, raw, reply_to, metadata):
+        pass
+
+    async def _send_typing_action(self, chat_id):
+        pass
+
+
+def _make_consumer(stream_events: list[dict], **kw):
+    """Create an InboundConsumer whose agent streams the given event dicts.
+
+    ``stream_events`` is a flat list of event data dicts (as produced by
+    ``StreamEventEmitter.xxx().data``).
+    """
+    bus = MessageBus()
+    mgr = ChannelManager(bus)
+    mgr.register(_StubChannel())
+
+    # Patch stream_agent_events to yield pre-built events
+    async def _fake_stream(agent, message, thread_id, **kwargs):
+        for ev in stream_events:
+            yield ev
+
+    agent = MagicMock()
+    consumer = InboundConsumer(
+        bus=bus,
+        manager=mgr,
+        agent=agent,
+        thread_id="",
+        max_concurrent=2,
+        max_pending=10,
+        inference_timeout=5.0,
+        drain_timeout=1.0,
+        **kw,
+    )
+    return consumer, bus, _fake_stream
+
+
+class TestConsumerSubagentTextFallback:
+    """InboundConsumer should use sub-agent text as fallback when main agent is silent."""
+
+    def test_subagent_text_used_when_no_final_content(self):
+        """When the main agent produces no text, sub-agent text becomes the response."""
+        events = [
+            {
+                "type": "subagent_text",
+                "subagent": "research",
+                "content": "Found 3 relevant papers.",
+            },
+            {
+                "type": "subagent_text",
+                "subagent": "research",
+                "content": " Key insight: X is Y.",
+            },
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="analyze papers",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                assert (
+                    outbound.content == "Found 3 relevant papers. Key insight: X is Y."
+                )
+                assert outbound.channel == "stub"
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+    def test_final_content_takes_priority_over_subagent_text(self):
+        """When the main agent produces text, sub-agent text is ignored."""
+        events = [
+            {
+                "type": "subagent_text",
+                "subagent": "research",
+                "content": "Sub-agent detail.",
+            },
+            {"type": "text", "content": "Here is my summary."},
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                assert outbound.content == "Here is my summary."
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+    def test_no_response_fallback_when_both_empty(self):
+        """When both final_content and subagent_text are empty, 'No response' is used."""
+        events = [
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                assert outbound.content == "No response"
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+    def test_done_content_overrides_subagent_text(self):
+        """Done event with content takes priority over sub-agent text buffer."""
+        events = [
+            {
+                "type": "subagent_text",
+                "subagent": "research",
+                "content": "Sub-agent work.",
+            },
+            {"type": "done", "content": "Final summary from done event."},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                assert outbound.content == "Final summary from done event."
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+
+# ═══════════════════════════════════════════════════════════════════
+# 3b. _join_subagent_text helper
+# ═══════════════════════════════════════════════════════════════════
+
+
+class TestJoinSubagentText:
+    """Unit tests for the _join_subagent_text helper."""
+
+    def test_empty_dict_returns_empty_string(self):
+        assert _join_subagent_text({}) == ""
+
+    def test_single_agent_no_prefix(self):
+        """One sub-agent: return raw text without [name]: prefix."""
+        buffers = {"research": ("research", ["Found papers.", " Key insight."])}
+        result = _join_subagent_text(buffers)
+        assert result == "Found papers. Key insight."
+        assert "[research]" not in result
+
+    def test_multiple_agents_with_prefix(self):
+        """Multiple sub-agents: each section gets [name]: prefix."""
+        buffers = {
+            "research": ("research", ["Paper A is relevant."]),
+            "analysis": ("analysis", ["Metric X is high."]),
+        }
+        result = _join_subagent_text(buffers)
+        assert "[research]: Paper A is relevant." in result
+        assert "[analysis]: Metric X is high." in result
+        assert "\n\n" in result
+
+    def test_multiple_agents_chunk_concatenation(self):
+        """Chunks within the same agent are joined without separator."""
+        buffers = {
+            "agent-a": ("agent-a", ["chunk1", "chunk2"]),
+            "agent-b": ("agent-b", ["chunk3"]),
+        }
+        result = _join_subagent_text(buffers)
+        assert "[agent-a]: chunk1chunk2" in result
+        assert "[agent-b]: chunk3" in result
+
+    def test_single_agent_empty_chunks(self):
+        """Single agent with empty chunks returns empty string."""
+        buffers = {"agent": ("agent", [""])}
+        assert _join_subagent_text(buffers) == ""
+
+    def test_multiple_agents_preserves_order(self):
+        """Agent sections appear in insertion order."""
+        buffers = {
+            "beta-key": ("beta", ["B"]),
+            "alpha-key": ("alpha", ["A"]),
+            "gamma-key": ("gamma", ["G"]),
+        }
+        result = _join_subagent_text(buffers)
+        beta_pos = result.index("[beta]")
+        alpha_pos = result.index("[alpha]")
+        gamma_pos = result.index("[gamma]")
+        assert beta_pos < alpha_pos < gamma_pos
+
+    def test_same_name_instances_numbered(self):
+        """Multiple instances of the same agent type get numbered labels."""
+        buffers = {
+            "inst-1": ("research-agent", ["Instance 1 text."]),
+            "inst-2": ("research-agent", ["Instance 2 text."]),
+        }
+        result = _join_subagent_text(buffers)
+        assert "[research-agent #1]: Instance 1 text." in result
+        assert "[research-agent #2]: Instance 2 text." in result
+        assert "\n\n" in result
+
+
+# ═══════════════════════════════════════════════════════════════════
+# 3c. InboundConsumer — parallel sub-agent grouping
+# ═══════════════════════════════════════════════════════════════════
+
+
+class TestConsumerParallelSubagentFallback:
+    """Consumer should group parallel sub-agent text by agent name."""
+
+    def test_parallel_agents_grouped_with_attribution(self):
+        """Multiple sub-agents produce grouped, attributed output."""
+        events = [
+            {
+                "type": "subagent_text",
+                "subagent": "research",
+                "content": "Found papers.",
+            },
+            {
+                "type": "subagent_text",
+                "subagent": "analysis",
+                "content": "Metric is high.",
+            },
+            {
+                "type": "subagent_text",
+                "subagent": "research",
+                "content": " Key insight.",
+            },
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                assert "[research]: Found papers. Key insight." in outbound.content
+                assert "[analysis]: Metric is high." in outbound.content
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+    def test_single_agent_no_attribution_prefix(self):
+        """Single sub-agent fallback has no [name]: prefix."""
+        events = [
+            {"type": "subagent_text", "subagent": "research", "content": "Only agent."},
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                assert outbound.content == "Only agent."
+                assert "[research]" not in outbound.content
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+    def test_missing_subagent_field_uses_unknown(self):
+        """Events without 'subagent' field are grouped under 'unknown'."""
+        events = [
+            {"type": "subagent_text", "content": "No agent name."},
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                # Single agent (unknown), no prefix
+                assert outbound.content == "No agent name."
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+
+class TestConsumerSameNameInterleaved:
+    """Two instances of the same agent type with interleaved chunks."""
+
+    def test_same_name_interleaved_chunks_separated_by_instance_id(self):
+        """Two research-agent instances with different instance_ids are properly separated.
+
+        With the instance_id fix, chunks are keyed by instance_id so
+        each instance's text is buffered independently and labelled
+        with numbered suffixes.
+        """
+        events = [
+            {
+                "type": "subagent_text",
+                "subagent": "research-agent",
+                "instance_id": "inst-1",
+                "content": "Instance-1 sentence A.",
+            },
+            {
+                "type": "subagent_text",
+                "subagent": "research-agent",
+                "instance_id": "inst-2",
+                "content": "Instance-2 sentence X.",
+            },
+            {
+                "type": "subagent_text",
+                "subagent": "research-agent",
+                "instance_id": "inst-1",
+                "content": " Instance-1 sentence B.",
+            },
+            {
+                "type": "subagent_text",
+                "subagent": "research-agent",
+                "instance_id": "inst-2",
+                "content": " Instance-2 sentence Y.",
+            },
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                # Fixed: instances are now properly separated with numbered labels
+                assert (
+                    "[research-agent #1]: Instance-1 sentence A. Instance-1 sentence B."
+                    in outbound.content
+                )
+                assert (
+                    "[research-agent #2]: Instance-2 sentence X. Instance-2 sentence Y."
+                    in outbound.content
+                )
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+    def test_same_name_no_instance_id_still_concatenated(self):
+        """Without instance_id (legacy events), same-name chunks still merge into one buffer."""
+        events = [
+            {"type": "subagent_text", "subagent": "research-agent", "content": "A."},
+            {"type": "subagent_text", "subagent": "research-agent", "content": " B."},
+            {"type": "done", "content": ""},
+        ]
+        consumer, bus, fake_stream = _make_consumer(events)
+
+        async def _test():
+            with patch(
+                "EvoScientist.stream.events.stream_agent_events",
+                new=fake_stream,
+            ):
+                msg = BusInbound(
+                    channel="stub",
+                    sender_id="u1",
+                    chat_id="c1",
+                    content="test",
+                )
+                await bus.publish_inbound(msg)
+
+                task = asyncio.create_task(consumer.run())
+                outbound = await asyncio.wait_for(bus.consume_outbound(), timeout=5.0)
+
+                # Single instance (no instance_id), no prefix
+                assert outbound.content == "A. B."
+
+                await consumer.stop()
+                await task
+
+        _run(_test())
+
+
+class TestDelegationPromptSummarize:
+    def test_framework_task_tool_contains_summarize_guidance(self):
+        """The upstream TASK_TOOL_DESCRIPTION already instructs the LLM to summarize."""
+        from deepagents.middleware.subagents import TASK_TOOL_DESCRIPTION
+
+        assert "not visible to the user" in TASK_TOOL_DESCRIPTION
+        assert "summary of the result" in TASK_TOOL_DESCRIPTION
+
+    def test_framework_task_system_prompt_contains_reconcile_step(self):
+        """The upstream TASK_SYSTEM_PROMPT includes a reconcile/synthesize step."""
+        from deepagents.middleware.subagents import TASK_SYSTEM_PROMPT
+
+        assert "Reconcile" in TASK_SYSTEM_PROMPT
+        assert "synthesize" in TASK_SYSTEM_PROMPT.lower()