langchain-agentx-cli 0.2.2__tar.gz → 0.3.0__tar.gz

{langchain_agentx_cli-0.2.2 → langchain_agentx_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-agentx-cli
-Version: 0.2.2
+Version: 0.3.0
 Summary: Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK.
 Author: GoodMood2008
 License: Apache-2.0
@@ -22,7 +22,7 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: langchain-agentx-python<0.4.0,>=0.3.7
+Requires-Dist: langchain-agentx-python<0.6.0,>=0.4.3
 Requires-Dist: click>=8.1
 Requires-Dist: textual>=0.79.0
 Provides-Extra: dev

{langchain_agentx_cli-0.2.2 → langchain_agentx_cli-0.3.0}/langchain_agentx_cli/bridge/session_bridge.py

@@ -46,6 +46,10 @@ from langchain_agentx_cli.widgets.messages import (
     ContextCompactedMessage,
     ContextCompactingMessage,
     ErrorMessageOccurred,
+    HookFinished,
+    HookStarted,
+    TaskProgress,
+    TaskStarted,
     ThinkingContentDelta,
     ThinkingEnded,
     ThinkingStarted,
@@ -63,9 +67,9 @@ if TYPE_CHECKING:
 MVP_ADAPTER_CONFIG: dict[str, bool] = {
     "enable_reasoning_events": True,
     "enable_step_events": False,
-    "enable_hook_events": False,
+    "enable_hook_events": True,  # 启用 Hook 事件
     "enable_compact_events": True,
-    "enable_subagent_events": False,
+    "enable_subagent_events": True,  # Phase 3: 启用子 agent 事件
     "synthesize_tool_call": True,
 }
 
@@ -112,6 +116,27 @@ class SessionBridge:
     def _post_ui(self, message: object) -> None:
         self._screen_messenger.post(message)
 
+    @staticmethod
+    def _build_fallback_text(data: dict[str, Any]) -> str:
+        """为未升级的 widget 提供兜底渲染文本：summary + payload。
+
+        与 SDK envelope_to_tool_output 的语义一致（summary\\npayload），
+        让仍按 event.output 字符串渲染的 widget 不需要改动即可工作。
+        """
+        summary = str(data.get("summary", ""))
+        payload = data.get("payload")
+        if payload is None or payload == "":
+            return summary
+        if isinstance(payload, str):
+            payload_str = payload
+        else:
+            import json
+            try:
+                payload_str = json.dumps(payload, ensure_ascii=False)
+            except (TypeError, ValueError):
+                payload_str = str(payload)
+        return f"{summary}\n{payload_str}" if summary else payload_str
+
     def submit_input(self, text: str) -> None:
         self._post_ui(UserMessage(content=text))
         self._post_ui(TurnInProgress(in_progress=True))
@@ -168,30 +193,56 @@ class SessionBridge:
                 )
             case LangchainAgentEventType.TOOL_INPUT:
                 tool_input = data.get("input")
+                tool_name = str(data.get("tool_name", ""))
                 if not isinstance(tool_input, dict):
                     tool_input = data.get("params") if isinstance(data.get("params"), dict) else {}
+                info("[BRIDGE] TOOL_INPUT tool_name=%s", tool_name)
                 self._post_ui(
                     ToolUseStarted(
-                        tool_name=str(data.get("tool_name", "")),
+                        tool_name=tool_name,
                         tool_input=tool_input,
                     )
                 )
             case LangchainAgentEventType.TOOL_CALL:
+                tool_name = str(data.get("tool_name", ""))
+                info("[BRIDGE] TOOL_CALL tool_name=%s", tool_name)
                 pass
             case LangchainAgentEventType.TOOL_RESULT:
+                tool_name = str(data.get("tool_name", ""))
+                fallback_output = self._build_fallback_text(data)
+                info(
+                    "[BRIDGE] TOOL_RESULT tool_name=%s summary_len=%d payload_type=%s has_display=%s",
+                    tool_name,
+                    len(str(data.get("summary", ""))),
+                    type(data.get("payload")).__name__,
+                    bool(data.get("display")),
+                )
                 self._post_ui(
                     ToolUseCompleted(
-                        tool_name=str(data.get("tool_name", "")),
-                        output=str(data.get("output", "")),
+                        tool_name=tool_name,
+                        output=fallback_output,
+                        summary=str(data.get("summary", "")),
+                        payload=data.get("payload"),
+                        status=str(data.get("status", "ok")),
+                        meta=data.get("meta") if isinstance(data.get("meta"), dict) else None,
+                        display=data.get("display") if isinstance(data.get("display"), dict) else None,
+                        truncated=bool(data.get("truncated", False)),
+                        overflow_file=data.get("overflow_file"),
                     )
                 )
             case LangchainAgentEventType.TOOL_ERROR:
+                tool_name = str(data.get("tool_name", ""))
                 error_text = str(data.get("error", ""))
                 self._post_ui(
                     ToolUseCompleted(
-                        tool_name=str(data.get("tool_name", "")),
+                        tool_name=tool_name,
                         output=f"Error: {error_text}",
                         error=error_text or None,
+                        summary=str(data.get("summary", "")),
+                        payload=data.get("payload"),
+                        status=str(data.get("status", "error")),
+                        meta=data.get("meta") if isinstance(data.get("meta"), dict) else None,
+                        display=data.get("display") if isinstance(data.get("display"), dict) else None,
                     )
                 )
             case LangchainAgentEventType.ERROR:
@@ -224,6 +275,114 @@ class SessionBridge:
             case LangchainAgentEventType.COMPACT_START:
                 info("[BRIDGE] COMPACT_START — compacting...")
                 pass
+            # Phase 3: 子 agent 工具事件（通过 adispatch_custom_event 冒泡）
+            case LangchainAgentEventType.SUBAGENT_TOOL_CALL:
+                tool_name = str(data.get("tool_name", ""))
+                tool_input = data.get("tool_input")
+                parent_tool_use_id = data.get("parent_tool_use_id")
+                info(
+                    "[BRIDGE] SUBAGENT_TOOL_CALL tool=%s parent=%s",
+                    tool_name,
+                    parent_tool_use_id,
+                )
+                self._post_ui(
+                    ToolUseStarted(
+                        tool_name=tool_name,
+                        tool_input=tool_input if isinstance(tool_input, dict) else {},
+                        parent_tool_use_id=parent_tool_use_id,
+                    )
+                )
+            case LangchainAgentEventType.SUBAGENT_TOOL_RESULT:
+                tool_name = str(data.get("tool_name", ""))
+                parent_tool_use_id = data.get("parent_tool_use_id")
+                fallback_output = self._build_fallback_text(data)
+                info(
+                    "[BRIDGE] SUBAGENT_TOOL_RESULT tool=%s parent=%s summary_len=%d",
+                    tool_name,
+                    parent_tool_use_id,
+                    len(str(data.get("summary", ""))),
+                )
+                self._post_ui(
+                    ToolUseCompleted(
+                        tool_name=tool_name,
+                        output=fallback_output,
+                        summary=str(data.get("summary", "")),
+                        payload=data.get("payload"),
+                        status=str(data.get("status", "ok")),
+                        meta=data.get("meta") if isinstance(data.get("meta"), dict) else None,
+                        display=data.get("display") if isinstance(data.get("display"), dict) else None,
+                        truncated=bool(data.get("truncated", False)),
+                        overflow_file=data.get("overflow_file"),
+                        parent_tool_use_id=parent_tool_use_id,
+                    )
+                )
+            case LangchainAgentEventType.HOOK_STARTED:
+                hook_event = str(data.get("hook_event", ""))
+                hook_name = str(data.get("hook_name", ""))
+                info("[BRIDGE] HOOK_STARTED event=%s name=%s", hook_event, hook_name)
+                self._post_ui(
+                    HookStarted(
+                        hook_event=hook_event,
+                        hook_name=hook_name,
+                    )
+                )
+            case LangchainAgentEventType.HOOK_FINISHED:
+                hook_event = str(data.get("hook_event", ""))
+                hook_name = str(data.get("hook_name", ""))
+                outcome = str(data.get("outcome", ""))
+                info(
+                    "[BRIDGE] HOOK_FINISHED event=%s name=%s outcome=%s stdout_len=%d stderr_len=%d",
+                    hook_event,
+                    hook_name,
+                    outcome,
+                    len(str(data.get("combined_stdout", ""))),
+                    len(str(data.get("combined_stderr", ""))),
+                )
+                self._post_ui(
+                    HookFinished(
+                        hook_event=hook_event,
+                        hook_name=hook_name,
+                        outcome=outcome,
+                        stdout=data.get("combined_stdout"),
+                        stderr=data.get("combined_stderr"),
+                        exit_codes=data.get("exit_codes"),
+                        combined_stdout=data.get("combined_stdout"),
+                        combined_stderr=data.get("combined_stderr"),
+                    )
+                )
+            case LangchainAgentEventType.TASK_STARTED:
+                task_id = str(data.get("task_id", ""))
+                task_type = str(data.get("task_type", ""))
+                description = str(data.get("description", ""))
+                tool_use_id = data.get("tool_use_id")
+                info("[BRIDGE] TASK_STARTED id=%s type=%s", task_id, task_type)
+                self._post_ui(
+                    TaskStarted(
+                        task_id=task_id,
+                        task_type=task_type,
+                        description=description,
+                        tool_use_id=tool_use_id,
+                        prompt=data.get("prompt"),
+                        workflow_name=data.get("workflow_name"),
+                    )
+                )
+            case LangchainAgentEventType.TASK_PROGRESS:
+                task_id = str(data.get("task_id", ""))
+                description = str(data.get("description", ""))
+                usage = data.get("usage")
+                last_tool_name = data.get("last_tool_name")
+                summary = data.get("summary")
+                info("[BRIDGE] TASK_PROGRESS id=%s summary=%s", task_id, summary)
+                self._post_ui(
+                    TaskProgress(
+                        task_id=task_id,
+                        description=description,
+                        usage=usage if isinstance(usage, dict) else None,
+                        last_tool_name=last_tool_name,
+                        summary=summary,
+                        tool_use_id=data.get("tool_use_id"),
+                    )
+                )
             case _:
                 pass
 

{langchain_agentx_cli-0.2.2 → langchain_agentx_cli-0.3.0}/langchain_agentx_cli/state/task_store.py

@@ -19,7 +19,7 @@ from __future__ import annotations
 import time
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Callable
+from typing import Any, Callable
 
 
 class TaskStatus(Enum):
@@ -165,6 +165,68 @@ class TaskStore:
                 del self._tasks[task_id]
                 self._notify()
 
+    def update_from_tool_result(
+        self,
+        tool_name: str,
+        tool_input: dict,
+        *,
+        display: dict[str, Any] | None = None,
+        output: str = "",
+    ) -> None:
+        """从 TOOL_RESULT 的 display 字段同步 Task 状态（D09 + SDK 双流）。"""
+        d = display or {}
+        now = time.time()
+
+        if tool_name == "TaskCreate":
+            if not d.get("success"):
+                return
+            task_id = str(d.get("task_id") or "").strip()
+            if not task_id:
+                return
+            subject = str(d.get("subject") or tool_input.get("subject", ""))
+            description = str(tool_input.get("description", ""))
+            if task_id in self._tasks:
+                self._tasks[task_id].subject = subject or self._tasks[task_id].subject
+            else:
+                self._tasks[task_id] = TaskEntry(
+                    id=task_id,
+                    subject=subject,
+                    description=description,
+                    status=TaskStatus.PENDING.value,
+                    active_form=tool_input.get("activeForm"),
+                    metadata=tool_input.get("metadata"),
+                )
+            self._notify()
+            return
+
+        if tool_name == "TaskUpdate":
+            task_id = str(d.get("task_id") or tool_input.get("taskId", "")).strip()
+            if not task_id or task_id not in self._tasks:
+                return
+            entry = self._tasks[task_id]
+            new_status = d.get("new_status")
+            if new_status:
+                if (
+                    new_status == TaskStatus.COMPLETED.value
+                    and entry.status != new_status
+                ):
+                    entry.completed_at = now
+                entry.status = str(new_status)
+            self._notify()
+            return
+
+        if tool_name == "TaskGet" and d.get("found") and d.get("task_id"):
+            task_id = str(d["task_id"])
+            if task_id in self._tasks and d.get("status"):
+                self._tasks[task_id].status = str(d["status"])
+                self._notify()
+            return
+
+        if tool_name == "TaskList":
+            # 列表工具不改变单条 Task；TaskPanel 仍由 started 事件驱动
+            _ = output
+            return
+
     def get_sorted_tasks(self) -> list[TaskEntry]:
         """获取排序后的 Task 列表（对齐 CC 优先级）。
 

{langchain_agentx_cli-0.2.2 → langchain_agentx_cli-0.3.0}/langchain_agentx_cli/widgets/message_events.py

@@ -13,6 +13,8 @@ widgets/message_events.py — Textual UI 消息事件类型。
 
 from __future__ import annotations
 
+from typing import Any
+
 from textual.message import Message
 
 
@@ -42,27 +44,63 @@ class AssistantMessageChunk(Message):
 
 
 class ToolUseStarted(Message):
-    """工具调用开始。"""
+    """工具调用开始。
+
+    属性:
+        parent_tool_use_id: 父级工具调用 ID（子 agent 内部工具时设置）
+    """
 
-    def __init__(self, tool_name: str, tool_input: dict | None = None) -> None:
+    def __init__(
+        self,
+        tool_name: str,
+        tool_input: dict | None = None,
+        *,
+        parent_tool_use_id: str | None = None,
+    ) -> None:
         self.tool_name = tool_name
         self.tool_input = tool_input if tool_input is not None else {}
+        self.parent_tool_use_id = parent_tool_use_id
         super().__init__()
 
 
 class ToolUseCompleted(Message):
-    """工具调用完成（含 TOOL_ERROR）。"""
+    """工具调用完成（含 TOOL_ERROR）。
+
+    对齐 SDK 0.3.9 双流契约（envelope_to_event_artifact v1）：
+      - summary/payload/status/meta/truncated/overflow_file：模型可见的结构化字段
+      - display：out-of-band UI 数据（如 user_message 的 message + attachments）
+      - output：兜底文本（summary + payload 拼接），未升级的 widget 仍用此渲染
+
+    属性:
+        parent_tool_use_id: 父级工具调用 ID（子 agent 内部工具时设置）
+    """
 
     def __init__(
         self,
         tool_name: str,
-        output: str,
+        output: str = "",
         *,
         error: str | None = None,
+        summary: str = "",
+        payload: Any = None,
+        status: str = "ok",
+        meta: dict[str, Any] | None = None,
+        display: dict[str, Any] | None = None,
+        truncated: bool = False,
+        overflow_file: str | None = None,
+        parent_tool_use_id: str | None = None,
     ) -> None:
         self.tool_name = tool_name
         self.output = output
         self.error = error
+        self.summary = summary
+        self.payload = payload
+        self.status = status
+        self.meta = meta or {}
+        self.display = display or {}
+        self.truncated = truncated
+        self.overflow_file = overflow_file
+        self.parent_tool_use_id = parent_tool_use_id
         super().__init__()
 
 
@@ -174,3 +212,83 @@ class CompactFinished(Message):
         self.before = before
         self.after = after
         super().__init__()
+
+
+class HookStarted(Message):
+    """Hook 执行开始。"""
+
+    def __init__(self, hook_event: str, hook_name: str) -> None:
+        self.hook_event = hook_event
+        self.hook_name = hook_name
+        super().__init__()
+
+
+class HookFinished(Message):
+    """Hook 执行完成（携带 stdout/stderr/exit_code）。"""
+
+    def __init__(
+        self,
+        hook_event: str,
+        hook_name: str,
+        outcome: str,
+        *,
+        stdout: str | None = None,
+        stderr: str | None = None,
+        exit_codes: list[int] | None = None,
+        combined_stdout: str | None = None,
+        combined_stderr: str | None = None,
+    ) -> None:
+        self.hook_event = hook_event
+        self.hook_name = hook_name
+        self.outcome = outcome
+        self.stdout = stdout
+        self.stderr = stderr
+        self.exit_codes = exit_codes
+        self.combined_stdout = combined_stdout
+        self.combined_stderr = combined_stderr
+        super().__init__()
+
+
+class TaskStarted(Message):
+    """任务启动（对齐 CC task_started）。"""
+
+    def __init__(
+        self,
+        task_id: str,
+        task_type: str,
+        description: str,
+        *,
+        tool_use_id: str | None = None,
+        prompt: str | None = None,
+        workflow_name: str | None = None,
+    ) -> None:
+        self.task_id = task_id
+        self.task_type = task_type
+        self.description = description
+        self.tool_use_id = tool_use_id
+        self.prompt = prompt
+        self.workflow_name = workflow_name
+        super().__init__()
+
+
+class TaskProgress(Message):
+    """任务进度（对齐 CC task_progress）。"""
+
+    def __init__(
+        self,
+        task_id: str,
+        description: str,
+        *,
+        usage: dict[str, int] | None = None,
+        last_tool_name: str | None = None,
+        summary: str | None = None,
+        tool_use_id: str | None = None,
+    ) -> None:
+        self.task_id = task_id
+        self.description = description
+        self.usage = usage or {}
+        self.last_tool_name = last_tool_name
+        self.summary = summary
+        self.tool_use_id = tool_use_id
+        super().__init__()
+