PyPI - langchain-agentx-python - Versions diffs - 0.4.2__tar.gz → 0.4.4__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 0.4.2
+Version: 0.4.4
 Summary: LangChain/LangGraph-based agent utilities for CodeBaseX.
 Author-email: GoodMood2008 <GoodMood2008@users.noreply.github.com>
 License:                                  Apache License

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
-__version__ = "0.3.9"
+__version__ = "0.4.4"
 from .loop import (  # noqa: F401
     create_loop_agent,

@@ -1305,11 +1305,18 @@ class LoopGraphBuilder:
             debug=self._debug,
             name=self._name,
         )
-        compiled = compiled.with_config(config)
+        # Consolidate all configurable keys to avoid with_config overwrite bug
+        # (RunnableBinding.with_config does shallow merge, so second "configurable" replaces first)
         configurable_dict: dict[str, Any] = {"loop_config": self._loop_config}
         if self._raw_capabilities is not None:
             configurable_dict["capabilities"] = self._raw_capabilities
-        compiled = compiled.with_config({"configurable": configurable_dict})
+        if "configurable" in config:
+            # Merge existing configurable keys (e.g., tool_loader, session_store)
+            configurable_dict = {**config["configurable"], **configurable_dict}
+            # Remove from original config to avoid duplication
+            config = {k: v for k, v in config.items() if k != "configurable"}
+        config["configurable"] = configurable_dict
+        compiled = compiled.with_config(config)
         if self._trace_tool_callback_handler is not None:
             compiled = compiled.with_config({"callbacks": [self._trace_tool_callback_handler]})
         self._wrap_compiled_ainvoke_with_trace_failure_fallback(compiled)

@@ -92,7 +92,9 @@ class LangchainAgentEventType(Enum):
     # 错误
     ERROR = "error"
-    # Task Runtime（Phase D）
+    # Task Runtime（对齐 CC task_started/task_progress）
+    TASK_STARTED = "task-started"
+    TASK_PROGRESS = "task-progress"
     TASK_NOTIFICATION_ENQUEUED = "task-notification-enqueued"
     TASK_NOTIFICATION_CONSUMED = "task-notification-consumed"
     TASK_TERMINATED = "task-terminated"
@@ -661,6 +663,12 @@ class LangGraphToLangchainAgentEventAdapter:
                         mapped = LangchainAgentEventType.TASK_NOTIFICATION_CONSUMED
                     elif task_event_type == "task-terminated":
                         mapped = LangchainAgentEventType.TASK_TERMINATED
+                    elif task_event_type == "started":
+                        # 对齐 CC task_started 事件
+                        mapped = LangchainAgentEventType.TASK_STARTED
+                    elif task_event_type == "progress":
+                        # 对齐 CC task_progress 事件
+                        mapped = LangchainAgentEventType.TASK_PROGRESS
                     if mapped is not None:
                         yield self._event(
                             event_type=mapped,

@@ -122,10 +122,7 @@ class ToolUseSummaryProvider:
             if not tool_name:
                 continue
             if event_type in {"tool-result", "TOOL_RESULT"}:
-                # ingest_from_opencode_events：消费外部/历史 opencode 风格 JSON，字段可能仍带
-                # output 而无 summary；SDK 内部 TOOL_RESULT 已平铺 summary/payload/display。
-                # 仅在此入口保留 output 降级；SDK 直连应传 summary。
-                summary = data.get("summary") or data.get("output") or ""
+                summary = data.get("summary") or ""
                 self.record_tool_result(
                     scope=scope,
                     tool_name=tool_name,

@@ -4,6 +4,9 @@ tools/bash/task_runtime.py — P1 任务编排统一状态机协议
 职责：
     提供前后台统一任务生命周期状态机与快照模型：
     created -> running -> (completed|failed|interrupted|cancelled)
+当前裁剪范围：
+    Phase E：添加 TaskUsage 对齐 CC task_progress 事件的 usage 字段。
 """
 from __future__ import annotations
@@ -23,6 +26,20 @@ TaskStatus = Literal[
 ]
+@dataclass
+class TaskUsage:
+    """任务使用统计（对齐 CC task_progress.usage）。
+    字段说明：
+    - total_tokens: 总 token 消耗量
+    - tool_uses: 工具调用次数
+    - duration_ms: 执行时长（毫秒）
+    """
+    total_tokens: int = 0
+    tool_uses: int = 0
+    duration_ms: int = 0
 @dataclass(frozen=True)
 class BashTaskSnapshot:
     task_id: str
@@ -36,6 +53,7 @@ class BashTaskSnapshot:
     output_path: str | None = None
     pid: int | None = None
     output_size: int | None = None
+    usage: TaskUsage = field(default_factory=TaskUsage)
 @dataclass
@@ -52,6 +70,7 @@ class BashTaskStateMachine:
     output_path: str | None = None
     pid: int | None = None
     output_size: int | None = None
+    usage: TaskUsage = field(default_factory=TaskUsage)
     _history: list[TaskStatus] = field(default_factory=lambda: ["created"])
     _TRANSITIONS: dict[TaskStatus, set[TaskStatus]] = field(
@@ -88,4 +107,14 @@ class BashTaskStateMachine:
             output_path=self.output_path,
             pid=self.pid,
             output_size=self.output_size,
+            usage=self.usage,
         )
+    def record_tool_use(self, tokens: int = 0) -> None:
+        """记录一次工具调用（用于 usage 统计）。"""
+        self.usage.tool_uses += 1
+        self.usage.total_tokens += tokens
+    def update_duration_ms(self, duration_ms: int) -> None:
+        """更新执行时长（毫秒）。"""
+        self.usage.duration_ms = duration_ms

@@ -4,7 +4,7 @@
  [project]
  name = "langchain-agentx-python"
- version = "0.4.2"
+ version = "0.4.4"
  description = "LangChain/LangGraph-based agent utilities for CodeBaseX."
  readme = "README.md"
  requires-python = ">=3.11"

langchain-agentx-python 0.4.2__tar.gz → 0.4.4__tar.gz

langchain-agentx-python 0.4.2tar.gz → 0.4.4tar.gz