langchain-agentx-python 2.1.0__tar.gz → 2.1.1__tar.gz

{langchain-agentx-python-2.1.0/langchain_agentx_python.egg-info → langchain-agentx-python-2.1.1}/PKG-INFO

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

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1}/langchain_agentx/__init__.py

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

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1}/langchain_agentx/loop/subagent/context.py

@@ -91,7 +91,7 @@ class SubagentContext:
     parent_tool_call_id: str | None = None  # 触发本子 Agent 的 tool_call_id
     parent_conversation_session_id: str | None = None
     enable_trace: bool = True
-    runnable_config: Any = None  # 父 graph 的 runnable_config，用于子 graph 事件自动冒泡到父 graph
+    runnable_config: Any = None  # 父 runnable_config：仅供 tool_progress custom event 回调链；非子 raw 合并
     isolation: str = "none"
     worktree_dir: str | None = None
     workspace_root: str = ""

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1}/langchain_agentx/loop/subagent/orchestrator.py

@@ -307,7 +307,8 @@ class SubagentOrchestrator:
     ) -> "AgentToolOutput":
         """异步执行子代理。
 
-        子 graph 事件通过 config 自动冒泡到父 graph，无需手动回调。
+        子 graph 在独立 LoopStreamDriver 消费（Phase-4）；progress 经 custom event 冒泡，
+        裸子 on_tool_* 不并进父 astream。
         """
         from langchain_agentx.tools.agent.models import AgentToolOutput
 
@@ -595,7 +596,7 @@ class SubagentOrchestrator:
     ) -> Any:
         """异步启动子 agent。
 
-        子 graph 事件通过 config 自动冒泡到父 graph。
+        子 graph Phase-4 独立 Driver 消费；progress 经 custom event 冒泡到父流。
         """
         owner_run_ctx = get_run_context()
         handle = self._register_background_agent(

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1}/langchain_agentx/loop/subagent/runner.py

@@ -226,7 +226,7 @@ async def _emit_progress(
     """发射子 Agent teaser lane 到父 graph（CC 对齐：仅 tool_use / tool_result）。
 
     同步 dispatch 优先：并行线程池 / _run_coroutine_sync 子线程内 adispatch 无法触达父回调链。
-    父 graph 的 config 通过 ctx.runnable_config 传递（在 _collect_subagent_events 中合并）。
+    父 config 经 ctx.runnable_config 仅服务 custom event 派发（Phase-4 不合并父 callbacks）。
     """
     if event.type not in ("tool_use", "tool_result"):
         return

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1}/langchain_agentx/observability/events/agent_event_projector.py

@@ -219,6 +219,10 @@ class AgentEventProjector:
         self.enable_subagent_events: bool = config.get("enable_subagent_events", True)
         self.synthesize_tool_call: bool = config.get("synthesize_tool_call", True)
         self.enable_tool_input_start: bool = config.get("enable_tool_input_start", False)
+        # Doc-34 F5：活跃子窗内抑制非 Agent 主台 tool-*（默认 on；关则恢复旧投影）
+        self.suppress_subagent_child_main_tier_tools: bool = bool(
+            config.get("suppress_subagent_child_main_tier_tools", True)
+        )
         self.filter_unparented_subgraph_events: bool = config.get(
             "filter_unparented_subgraph_events", False
         )
@@ -528,9 +532,17 @@ class AgentEventProjector:
             self._sync_accumulated_answer_mirror()
 
     def _should_suppress_main_tier_text_stream(self) -> bool:
-        """D28 SDK-1：子 Agent 窗口内不 emit 父 main-tier TEXT_* / REASONING_*。"""
+        """Doc-33：子 Agent 窗口内不 emit 父 main-tier TEXT_* / REASONING_*。"""
         return self.state.subagent_window_text_guard.should_suppress_main_tier_stream
 
+    def _should_suppress_main_tier_child_tool_events(self, tool_name: str) -> bool:
+        """Doc-34 F2/F3/F5：flag on 且非 Agent 且 open_runs>0 → 抑制主台 tool-*。"""
+        if not self.suppress_subagent_child_main_tier_tools:
+            return False
+        if self._is_agent_tool(tool_name):
+            return False
+        return self.state.subagent_window_text_guard.should_suppress_main_tier_tool_events
+
     def _on_subagent_start_boundary(self) -> None:
         self.state.subagent_window_text_guard.on_subagent_start()
 
@@ -888,6 +900,7 @@ class AgentEventProjector:
                 messages=messages if isinstance(messages, list) else None,
             )
             self._closeout_saw_finish_emitted = True
+            self.state.subagent_window_text_guard.warn_if_unbalanced_at_finish(logger)
             yield self._event(
                 event_type=LangchainAgentEventType.FINISH,
                 data=finish_data,
@@ -1113,6 +1126,16 @@ class AgentEventProjector:
 
         self.state.current_tool = name
 
+        # Doc-34 F2：非 Agent 且窗开 → 在任何 TOOL_INPUT_* / TOOL_CALL 之前 return
+        if self._should_suppress_main_tier_child_tool_events(name):
+            self.state.subagent_window_text_guard.note_suppressed_child_tool_start()
+            logger.debug(
+                "Doc-34: suppress main-tier tool_start name=%s open_runs=%s",
+                name,
+                self.state.subagent_window_text_guard.open_runs,
+            )
+            return
+
         if self.enable_tool_input_start:
             yield self._event(
                 event_type=LangchainAgentEventType.TOOL_INPUT_START,
@@ -1192,6 +1215,11 @@ class AgentEventProjector:
         data = event.get("data", {}) or {}
         tool_call_id = ToolCallIdResolver.resolve_from_langgraph_tool_event(event)
 
+        # Doc-34 F2：窗内非 Agent 对称抑制 RESULT/ERROR（不碰 Agent end → on_subagent_end）
+        if self._should_suppress_main_tier_child_tool_events(name):
+            self.state.current_tool = None
+            return
+
         output = data.get("output")
 
         event_type, event_data = self._classify_tool_end_event(

langchain-agentx-python-2.1.1/langchain_agentx/observability/events/subagent_window_text_guard.py

@@ -0,0 +1,81 @@
+"""
+subagent_window_text_guard.py — 子 Agent 窗口 main-tier 抑制闸门
+
+职责：跟踪 open subagent 计数（open_runs SSOT）；
+      Doc-33：窗内抑制 TEXT_* / REASONING_*；
+      Doc-34：窗内抑制非 Agent 主台 tool-*（分属性 API，共用 open_runs）；
+      Phase 2：非平衡 END / finish 扫尾轻诊断 + 抑制计数。
+链路位置：AgentEventProjector model_stream / tool_start/_end / FINISH
+当前裁剪范围：不引入 Registry 独窗；不做 D3 漏网 B 改写
+"""
+
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from langchain_agentx.observability.events.agent_event_projector import EventAdapterState
+
+
+@dataclass
+class SubagentWindowTextGuard:
+    """子 Agent 运行窗口：text / tool 分属性抑制，共用 open_runs。"""
+
+    open_runs: int = 0
+    suppressed_child_tool_starts: int = 0
+    unbalanced_end_count: int = 0
+
+    def on_subagent_start(self) -> None:
+        self.open_runs += 1
+
+    def on_subagent_end(self) -> None:
+        if self.open_runs > 0:
+            self.open_runs -= 1
+            return
+        self.unbalanced_end_count += 1
+
+    def note_suppressed_child_tool_start(self) -> None:
+        """Doc-34：窗内抑制了一次主台子工具 on_tool_start（B 抵达但被闸）。"""
+        self.suppressed_child_tool_starts += 1
+
+    @property
+    def should_suppress_main_tier_stream(self) -> bool:
+        """Doc-33：窗内抑制 main-tier TEXT_* / REASONING_*。"""
+        return self.open_runs > 0
+
+    @property
+    def should_suppress_main_tier_tool_events(self) -> bool:
+        """Doc-34（F3）：窗内抑制非 Agent 主台 tool-*；与 stream 分属性、共用 open_runs。"""
+        return self.open_runs > 0
+
+    def warn_if_unbalanced_at_finish(self, log: logging.Logger | None = None) -> None:
+        """FINISH 扫尾：缺 END 导致 open_runs 僵死，或多余 END。"""
+        active = log or logging.getLogger(__name__)
+        if self.open_runs > 0:
+            active.warning(
+                "SubagentWindowTextGuard: open_runs=%s at FINISH "
+                "(missing SUBAGENT_END; parent tools may stay suppressed)",
+                self.open_runs,
+            )
+        if self.unbalanced_end_count > 0:
+            active.warning(
+                "SubagentWindowTextGuard: unbalanced SUBAGENT_END count=%s "
+                "(END without matching START)",
+                self.unbalanced_end_count,
+            )
+        if self.suppressed_child_tool_starts > 0:
+            active.debug(
+                "SubagentWindowTextGuard: suppressed_child_tool_starts=%s "
+                "(Doc-34 B path reached projector but was gated)",
+                self.suppressed_child_tool_starts,
+            )
+
+    def reset_active_stream_flags(self, state: EventAdapterState) -> None:
+        """抑制 emit 时清理由半开 stream 留下的 active 标志（不补发 END）。"""
+        state.is_reasoning_active = False
+        state.is_text_active = False
+
+
+__all__ = ["SubagentWindowTextGuard"]

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1}/langchain_agentx/tools/agent/tool.py

@@ -285,8 +285,8 @@ class AgentRuntimeTool(RuntimeTool):
     async def ainvoke(self, data: dict[str, Any], ctx: ToolExecutionContext) -> AgentToolOutput:
         """异步执行子 Agent。
 
-        子 graph 事件通过 config 自动冒泡到父 graph（runner.py 合并父 runnable_config），
-        无需手动 bubble。
+        子 graph 在独立 LoopStreamDriver 内消费 astream_events（Phase-4 源头隔离）；
+        仅 tool_progress / transcript 经 custom event 冒泡到父流，裸 on_tool_* 不并进父 astream。
 
         CC 对照：AgentTool.tsx call() 中 onProgress → createProgressMessage → stream.enqueue
         """

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.1.0 → langchain-agentx-python-2.1.1}/pyproject.toml

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

langchain-agentx-python-2.1.0/langchain_agentx/observability/events/subagent_window_text_guard.py

@@ -1,42 +0,0 @@
-"""
-subagent_window_text_guard.py — D28 SDK-1 子 Agent 窗口 main-tier 流抑制
-
-职责：跟踪 open subagent 计数；窗口内禁止父 adapter emit TEXT_* / REASONING_*，
-      子 Agent 正文仅经 SUBAGENT_TRANSCRIPT / subagent-tool-* progress 冒泡。
-链路位置：AgentEventProjector._handle_model_stream / _handle_model_end
-当前裁剪范围：SUBAGENT_START/END 计数；不新增 subagent-text-delta 事件类型
-"""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from langchain_agentx.observability.events.agent_event_projector import EventAdapterState
-
-
-@dataclass
-class SubagentWindowTextGuard:
-    """D28：子 Agent 运行窗口内抑制父 main-tier 流式正文。"""
-
-    open_runs: int = 0
-
-    def on_subagent_start(self) -> None:
-        self.open_runs += 1
-
-    def on_subagent_end(self) -> None:
-        if self.open_runs > 0:
-            self.open_runs -= 1
-
-    @property
-    def should_suppress_main_tier_stream(self) -> bool:
-        return self.open_runs > 0
-
-    def reset_active_stream_flags(self, state: EventAdapterState) -> None:
-        """抑制 emit 时清理由半开 stream 留下的 active 标志（不补发 END）。"""
-        state.is_reasoning_active = False
-        state.is_text_active = False
-
-
-__all__ = ["SubagentWindowTextGuard"]