comate-cli 0.9.1__tar.gz → 0.10.0__tar.gz

comate_cli-0.10.0/.agent/artifacts/bash/08b40bf6a68c85059572f3478db27d848acd36a6e8c6b89fa5173927210e7b53.json

@@ -0,0 +1,12 @@
+{
+  "args": [
+    "git",
+    "diff"
+  ],
+  "cwd": "/home/hyc/projects/agent-sdk/packages/comate_cli",
+  "stdout": "diff --git a/comate_agent_sdk/agent/chat_session.py b/comate_agent_sdk/agent/chat_session.py\nindex c253580..144a0d6 100644\n--- a/comate_agent_sdk/agent/chat_session.py\n+++ b/comate_agent_sdk/agent/chat_session.py\n@@ -150,6 +150,7 @@ class ChatSession:\n             self._storage_root,\n             session_id=self.session_id,\n             task_namespace=self._agent._task_namespace,\n+            team_name=self._agent._team_name,\n         )\n \n     def _bind_task_namespace(self, task_namespace: str, *, persist: bool) -> None:\n@@ -265,6 +266,7 @@ class ChatSession:\n                 header_snapshot=header_snapshot,\n                 session_id=session_id,\n                 task_namespace=metadata[\"task_namespace\"] if metadata is not None else None,\n+                team_name=metadata.get(\"team_name\", \"\") if metadata is not None else \"\",\n             )\n         except Exception as e:\n             raise ChatSessionError(\n@@ -360,6 +362,7 @@ class ChatSession:\n                 dst,\n                 session_id=new_session_id,\n                 task_namespace=new_session_id,\n+                team_name=\"\",\n             )\n         except Exception as e:\n             logger.warning(f\"Failed to rewrite session metadata for forked session: {e}\")\ndiff --git a/comate_agent_sdk/agent/core/template.py b/comate_agent_sdk/agent/core/template.py\nindex 88aadab..dddfac4 100644\n--- a/comate_agent_sdk/agent/core/template.py\n+++ b/comate_agent_sdk/agent/core/template.py\n@@ -136,6 +136,7 @@ class AgentTemplate:\n         header_snapshot: dict[str, Any],\n         session_id: str | None = None,\n         task_namespace: str | None = None,\n+        team_name: str = \"\",\n         parent_token_cost: TokenCost | None = None,\n         is_subagent: bool = False,\n         name: str | None = None,\n@@ -154,6 +155,7 @@ class AgentTemplate:\n             cwd=resolved_cwd,\n             session_id=session_id or self.config.session_id,\n             task_namespace=task_namespace or self.config.task_namespace,\n+            team_name=team_name,\n             resolved_settings=self._resolved_settings,\n         )\n         return AgentRuntime(\ndiff --git a/comate_agent_sdk/agent/runner_engine/query_stream.py b/comate_agent_sdk/agent/runner_engine/query_stream.py\nindex 4fd9215..e5073f5 100644\n--- a/comate_agent_sdk/agent/runner_engine/query_stream.py\n+++ b/comate_agent_sdk/agent/runner_engine/query_stream.py\n@@ -157,17 +157,17 @@ def _normalize_tool_call_event_args(\n     return raw_args\n \n \n-def _check_team_inbox(agent: \"AgentRuntime\") -> bool:\n+def _check_team_inbox(agent: \"AgentRuntime\") -> list[str]:\n     \"\"\"C4/D2: Team 模式下，在 LLM 调用前检查 inbox，将未读消息注入为系统提示。\n \n-    返回 True 表示收到 shutdown_request，调用方应终止主循环。\n+    返回 shutdown_request 的发送方列表；非空表示调用方应回复并终止主循环。\n     \"\"\"\n     if not getattr(agent, \"is_team_member\", False):\n-        return False\n+        return []\n     team_name = getattr(agent, \"_team_name\", \"\").strip()\n-    agent_name = str(getattr(agent, \"_name\", \"\") or \"\").strip()\n+    agent_name = str(getattr(agent, \"name\", \"\") or \"\").strip()\n     if not team_name or not agent_name:\n-        return False\n+        return []\n \n     try:\n         from comate_agent_sdk.system_tools.team.inbox import Inbox, MessageType\n@@ -175,16 +175,15 @@ def _check_team_inbox(agent: \"AgentRuntime\") -> bool:\n         inbox = Inbox(team_name=team_name, agent_name=agent_name)\n         messages = inbox.read_unread(mark_as_read=True)\n         if not messages:\n-            return False\n+            return []\n \n-        shutdown_requested = False\n+        shutdown_requesters: list[str] = []\n         reminder_lines: list[str] = [\"# Team Inbox — New Messages\"]\n         for envelope in messages:\n             from_agent = envelope.get(\"from\", \"unknown\")\n             timestamp = envelope.get(\"timestamp\", \"\")\n             raw_text = envelope.get(\"text\", \"\")\n             try:\n-                import json\n                 payload = json.loads(raw_text) if raw_text else {}\n             except Exception:\n                 payload = {\"raw\": raw_text}\n@@ -195,8 +194,8 @@ def _check_team_inbox(agent: \"AgentRuntime\") -> bool:\n             reminder_lines.append(\n                 f\"- [{timestamp}] From: {from_agent} | Type: {msg_type}\\n  {content}\"\n             )\n-            if msg_type == MessageType.SHUTDOWN_REQUEST.value:\n-                shutdown_requested = True\n+            if msg_type == MessageType.SHUTDOWN_REQUEST.value and from_agent not in shutdown_requesters:\n+                shutdown_requesters.append(str(from_agent))\n \n         reminder = \"\\n\".join(reminder_lines)\n         agent.add_hidden_system_reminder(\n@@ -207,10 +206,10 @@ def _check_team_inbox(agent: \"AgentRuntime\") -> bool:\n             f\"[Team inbox] {len(messages)} 条消息注入: \"\n             f\"team={team_name!r} agent={agent_name!r}\"\n         )\n-        return shutdown_requested\n+        return shutdown_requesters\n     except Exception as exc:\n         logger.debug(f\"[Team inbox] 轮询失败（忽略）: {exc}\")\n-        return False\n+        return []\n \n \n def _send_team_idle_notification(agent: \"AgentRuntime\") -> None:\n@@ -218,12 +217,12 @@ def _send_team_idle_notification(agent: \"AgentRuntime\") -> None:\n     if not getattr(agent, \"is_team_member\", False):\n         return\n     team_name = getattr(agent, \"_team_name\", \"\").strip()\n-    agent_name = str(getattr(agent, \"_name\", \"\") or \"\").strip()\n+    agent_name = str(getattr(agent, \"name\", \"\") or \"\").strip()\n     if not team_name or not agent_name:\n         return\n     try:\n         from comate_agent_sdk.system_tools.team.config import TeamConfig\n-        from comate_agent_sdk.system_tools.team.inbox import Inbox, MessageType\n+        from comate_agent_sdk.system_tools.team.inbox import Inbox, MessageType, get_all_inboxes\n \n         # 发给 leader（第一个 agent_type=\"leader\" 的成员，或全体广播）\n         team_cfg = TeamConfig(team_name=team_name)\n@@ -233,10 +232,8 @@ def _send_team_idle_notification(agent: \"AgentRuntime\") -> None:\n             if m.get(\"agent_type\") == \"leader\" and m[\"name\"] != agent_name\n         ]\n         recipients = leaders or [\n-            name for name in __import__(\n-                \"comate_agent_sdk.system_tools.team.inbox\",\n-                fromlist=[\"get_all_inboxes\"],\n-            ).get_all_inboxes(team_name)\n+            name\n+            for name in get_all_inboxes(team_name)\n             if name != agent_name\n         ]\n         for recipient in recipients:\n@@ -254,6 +251,41 @@ def _send_team_idle_notification(agent: \"AgentRuntime\") -> None:\n         logger.debug(f\"[Team] 发送 idle_notification 失败（忽略）: {exc}\")\n \n \n+def _send_team_shutdown_response(\n+    agent: \"AgentRuntime\",\n+    *,\n+    recipients: list[str],\n+) -> None:\n+    \"\"\"收到 shutdown_request 后，向请求方回复 shutdown_response。\"\"\"\n+    if not getattr(agent, \"is_team_member\", False):\n+        return\n+    team_name = getattr(agent, \"_team_name\", \"\").strip()\n+    agent_name = str(getattr(agent, \"name\", \"\") or \"\").strip()\n+    normalized_recipients = [\n+        str(recipient).strip()\n+        for recipient in recipients\n+        if str(recipient).strip() and str(recipient).strip() != agent_name\n+    ]\n+    if not team_name or not agent_name or not normalized_recipients:\n+        return\n+    try:\n+        from comate_agent_sdk.system_tools.team.inbox import Inbox, MessageType\n+\n+        for recipient in normalized_recipients:\n+            inbox = Inbox(team_name=team_name, agent_name=recipient)\n+            inbox.append_message(\n+                from_agent=agent_name,\n+                message_type=MessageType.SHUTDOWN_RESPONSE,\n+                content=f\"Agent '{agent_name}' acknowledged shutdown and is stopping.\",\n+            )\n+        logger.debug(\n+            f\"[Team] shutdown_response 已发送: agent={agent_name!r} \"\n+            f\"recipients={normalized_recipients!r}\"\n+        )\n+    except Exception as exc:\n+        logger.debug(f\"[Team] 发送 shutdown_response 失败（忽略）: {exc}\")\n+\n+\n async def _run_stop_hook(agent: \"AgentRuntime\", stop_reason: str) -> bool:\n     return await should_continue_after_stop_block(\n         agent,\n@@ -676,9 +708,9 @@ async def run_query_stream(\n             destroy_ephemeral_messages(agent)\n \n             # C4/D2: Team 模式 inbox 轮询（每轮 LLM 调用前检查未读消息）\n-            if _check_team_inbox(agent):\n-                # 收到 shutdown_request — 发送 shutdown_response 后退出\n-                _send_team_idle_notification(agent)\n+            shutdown_requesters = _check_team_inbox(agent)\n+            if shutdown_requesters:\n+                _send_team_shutdown_response(agent, recipients=shutdown_requesters)\n                 async for hidden_event in drain_hub.drain_hidden_events():\n                     yield hidden_event\n                 yield StopEvent(reason=\"shutdown_request\")\ndiff --git a/comate_agent_sdk/agent/session_store.py b/comate_agent_sdk/agent/session_store.py\nindex 94dd040..d66b4a5 100644\n--- a/comate_agent_sdk/agent/session_store.py\n+++ b/comate_agent_sdk/agent/session_store.py\n@@ -79,11 +79,16 @@ def build_session_metadata(\n     *,\n     session_id: str,\n     task_namespace: str,\n+    team_name: str = \"\",\n ) -> dict[str, str]:\n-    return {\n+    payload = {\n         \"session_id\": str(session_id).strip(),\n         \"task_namespace\": str(task_namespace).strip(),\n     }\n+    normalized_team_name = str(team_name).strip()\n+    if normalized_team_name:\n+        payload[\"team_name\"] = normalized_team_name\n+    return payload\n \n \n def load_session_metadata(session_root: Path) -> dict[str, str] | None:\n@@ -100,10 +105,14 @@ def load_session_metadata(session_root: Path) -> dict[str, str] | None:\n     task_namespace = str(data.get(\"task_namespace\", \"\")).strip()\n     if not session_id or not task_namespace:\n         return None\n-    return {\n+    payload = {\n         \"session_id\": session_id,\n         \"task_namespace\": task_namespace,\n     }\n+    team_name = str(data.get(\"team_name\", \"\")).strip()\n+    if team_name:\n+        payload[\"team_name\"] = team_name\n+    return payload\n \n \n def write_session_metadata(\n@@ -111,12 +120,14 @@ def write_session_metadata(\n     *,\n     session_id: str,\n     task_namespace: str,\n+    team_name: str = \"\",\n ) -> None:\n     session_root.mkdir(parents=True, exist_ok=True)\n     path = session_metadata_path(session_root)\n     payload = build_session_metadata(\n         session_id=session_id,\n         task_namespace=task_namespace,\n+        team_name=team_name,\n     )\n     path.write_text(json.dumps(payload, indent=2, ensure_ascii=False), encoding=\"utf-8\")\n \ndiff --git a/comate_agent_sdk/agent/tests/test_chat_session_persistence.py b/comate_agent_sdk/agent/tests/test_chat_session_persistence.py\nindex ac99814..2540a86 100644\n--- a/comate_agent_sdk/agent/tests/test_chat_session_persistence.py\n+++ b/comate_agent_sdk/agent/tests/test_chat_session_persistence.py\n@@ -158,6 +158,79 @@ class TestChatSessionPersistence(unittest.TestCase):\n                 },\n             )\n \n+    def test_resume_restores_team_name_from_session_metadata(self) -> None:\n+        with tempfile.TemporaryDirectory() as td:\n+            root = Path(td)\n+            agent = Agent(\n+                llm=_FakeChatModel(),  # type: ignore[arg-type]\n+                config=AgentConfig(\n+                    tools=(),\n+                    agents=(),\n+                    offload_enabled=False,\n+                    setting_sources=None,\n+                ),\n+            )\n+\n+            session = ChatSession(\n+                agent,\n+                session_id=\"s1\",\n+                cwd=root,\n+            )\n+            session._agent._team_name = \"review-team\"\n+            session._bind_task_namespace(\"review-team\", persist=True)\n+            session._ensure_header_persisted()\n+\n+            self.assertEqual(\n+                load_session_metadata(session._storage_root),\n+                {\n+                    \"session_id\": \"s1\",\n+                    \"task_namespace\": \"review-team\",\n+                    \"team_name\": \"review-team\",\n+                },\n+            )\n+\n+            resumed = ChatSession.resume(\n+                agent,\n+                session_id=\"s1\",\n+                cwd=root,\n+            )\n+\n+            self.assertEqual(resumed._agent._task_namespace, \"review-team\")\n+            self.assertEqual(resumed._agent._team_name, \"review-team\")\n+            self.assertTrue(resumed._agent.is_team_member)\n+\n+    def test_fork_session_resets_team_name_metadata(self) -> None:\n+        with tempfile.TemporaryDirectory() as td:\n+            root = Path(td)\n+            agent = Agent(\n+                llm=_FakeChatModel(),  # type: ignore[arg-type]\n+                config=AgentConfig(\n+                    tools=(),\n+                    agents=(),\n+                    offload_enabled=False,\n+                    setting_sources=None,\n+                ),\n+            )\n+\n+            session = ChatSession(\n+                agent,\n+                session_id=\"s1\",\n+                cwd=root,\n+            )\n+            session._agent._team_name = \"review-team\"\n+            session._bind_task_namespace(\"review-team\", persist=True)\n+            forked = session.fork_session()\n+\n+            self.assertEqual(\n+                load_session_metadata(forked._storage_root),\n+                {\n+                    \"session_id\": forked.session_id,\n+                    \"task_namespace\": forked.session_id,\n+                },\n+            )\n+            self.assertEqual(forked._agent._team_name, \"\")\n+            self.assertFalse(forked._agent.is_team_member)\n+\n     def test_delta_append_and_replay_basic(self) -> None:\n         with tempfile.TemporaryDirectory() as td:\n             root = Path(td)\ndiff --git a/comate_agent_sdk/agent/tests/test_subagent_disable_semantics.py b/comate_agent_sdk/agent/tests/test_subagent_disable_semantics.py\nindex 3affbb4..254860c 100644\n--- a/comate_agent_sdk/agent/tests/test_subagent_disable_semantics.py\n+++ b/comate_agent_sdk/agent/tests/test_subagent_disable_semantics.py\n@@ -1,5 +1,6 @@\n import tempfile\n import unittest\n+import json\n from pathlib import Path\n from types import SimpleNamespace\n from unittest.mock import MagicMock, patch\n@@ -7,7 +8,10 @@ from unittest.mock import MagicMock, patch\n from comate_agent_sdk.agent import Agent, AgentConfig\n from comate_agent_sdk.llm.views import ChatInvokeCompletion\n from comate_agent_sdk.subagent.models import AgentDefinition\n-from comate_agent_sdk.subagent.agent_tool import create_agent_tool\n+from comate_agent_sdk.subagent.agent_tool import _register_team_members, create_agent_tool\n+from comate_agent_sdk.agent.runner_engine.query_stream import _check_team_inbox, _send_team_shutdown_response\n+from comate_agent_sdk.system_tools.team.config import TeamConfig\n+from comate_agent_sdk.system_tools.team.inbox import Inbox\n from comate_agent_sdk.tools.registry import ToolRegistry\n \n \n@@ -134,6 +138,62 @@ class TestTaskToolNoNestedSubagentError(unittest.IsolatedAsyncioTestCase):\n             (\"~/.agent/plans\",),\n         )\n \n+\n+class TestTeamSemantics(unittest.IsolatedAsyncioTestCase):\n+    def test_register_team_members_uses_parent_runtime_name(self) -> None:\n+        with tempfile.TemporaryDirectory() as td:\n+            with patch.dict(\"os.environ\", {\"COMATE_TEAMS_DIR\": td}):\n+                parent_runtime = SimpleNamespace(name=\"captain\")\n+\n+                _register_team_members(\n+                    team_name=\"review-team\",\n+                    parent_runtime=parent_runtime,\n+                    subagent_name=\"worker-1\",\n+                    subagent_type=\"researcher\",\n+                )\n+\n+                members = TeamConfig(team_name=\"review-team\").list_members()\n+\n+        self.assertEqual(\n+            [(member[\"name\"], member[\"agent_type\"]) for member in members],\n+            [(\"captain\", \"leader\"), (\"worker-1\", \"researcher\")],\n+        )\n+\n+    def test_team_inbox_shutdown_request_uses_runtime_name_and_replies_with_shutdown_response(self) -> None:\n+        with tempfile.TemporaryDirectory() as td:\n+            with patch.dict(\"os.environ\", {\"COMATE_TEAMS_DIR\": td}):\n+                runtime = Agent(\n+                    llm=_FakeChatModel(),  # type: ignore[arg-type]\n+                    config=AgentConfig(\n+                        tools=(),\n+                        agents=(),\n+                        offload_enabled=False,\n+                        setting_sources=None,\n+                        cwd=Path(td),\n+                    ),\n+                ).create_runtime(\n+                    name=\"worker-1\",\n+                    team_name=\"review-team\",\n+                )\n+\n+                inbox = Inbox(team_name=\"review-team\", agent_name=\"worker-1\")\n+                inbox.append_message(\n+                    from_agent=\"captain\",\n+                    content=\"please stop\",\n+                    message_type=\"shutdown_request\",\n+                )\n+\n+                shutdown_requesters = _check_team_inbox(runtime)\n+                _send_team_shutdown_response(runtime, recipients=shutdown_requesters)\n+\n+                leader_messages = Inbox(team_name=\"review-team\", agent_name=\"captain\").read_all()\n+\n+        self.assertEqual(shutdown_requesters, [\"captain\"])\n+        self.assertEqual(len(leader_messages), 1)\n+        payload = json.loads(leader_messages[0][\"text\"])\n+        self.assertEqual(payload[\"type\"], \"shutdown_response\")\n+        self.assertEqual(leader_messages[0][\"from\"], \"worker-1\")\n+\n     async def test_task_inherits_parent_task_namespace(self) -> None:\n         fake_runtime = _FakeSubagentRuntime(content=\"ok-non-stream\")\n \ndiff --git a/comate_agent_sdk/subagent/agent_tool.py b/comate_agent_sdk/subagent/agent_tool.py\nindex a75e232..0efd03c 100644\n--- a/comate_agent_sdk/subagent/agent_tool.py\n+++ b/comate_agent_sdk/subagent/agent_tool.py\n@@ -173,8 +173,12 @@ def _switch_parent_to_team_namespace(runtime: \"AgentRuntime\", team_name: str) ->\n             session_root,\n             session_id=runtime._session_id,\n             task_namespace=team_name,\n+            team_name=team_name,\n+        )\n+        logger.debug(\n+            f\"[Team 模式] session metadata 已更新 \"\n+            f\"task_namespace={team_name!r} team_name={team_name!r}\"\n         )\n-        logger.debug(f\"[Team 模式] session metadata 已更新 task_namespace={team_name!r}\")\n     except Exception as exc:\n         logger.warning(f\"[Team 模式] 持久化 session metadata 失败（忽略）: {exc}\")\n \n@@ -197,7 +201,7 @@ def _register_team_members(\n         team_cfg = TeamConfig(team_name=team_name)\n         # 注册主 agent（仅首次；幂等，重复注册无副作用）\n         if parent_runtime is not None:\n-            parent_name = str(getattr(parent_runtime, \"_name\", \"\") or \"\").strip() or \"leader\"\n+            parent_name = str(getattr(parent_runtime, \"name\", \"\") or \"\").strip() or \"leader\"\n             team_cfg.register_member(name=parent_name, agent_type=\"leader\")\n         # 注册 subagent\n         team_cfg.register_member(name=subagent_name, agent_type=subagent_type)\ndiff --git a/comate_agent_sdk/system_tools/team/inbox.py b/comate_agent_sdk/system_tools/team/inbox.py\nindex 200c8d2..1ef505e 100644\n--- a/comate_agent_sdk/system_tools/team/inbox.py\n+++ b/comate_agent_sdk/system_tools/team/inbox.py\n@@ -28,7 +28,6 @@ _LOCK_POLL_INTERVAL_SECONDS = 0.05\n class MessageType(str, Enum):\n     TASK_ASSIGNMENT = \"task_assignment\"\n     MESSAGE = \"message\"\n-    BROADCAST = \"broadcast\"\n     SHUTDOWN_REQUEST = \"shutdown_request\"\n     SHUTDOWN_RESPONSE = \"shutdown_response\"\n     PLAN_APPROVAL_REQUEST = \"plan_approval_request\"\n",
+  "stderr": "",
+  "exit_code": 0,
+  "timed_out": false,
+  "interrupted": false
+}