langchain-agentx-python 2.1.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

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/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/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/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/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/observability/events/subagent_window_text_guard.py

@@ -1,14 +1,17 @@
 """
-subagent_window_text_guard.py — D28 SDK-1 子 Agent 窗口 main-tier 流抑制
+subagent_window_text_guard.py — 子 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 事件类型
+职责：跟踪 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
 
@@ -18,9 +21,11 @@ if TYPE_CHECKING:
 
 @dataclass
 class SubagentWindowTextGuard:
-    """D28：子 Agent 运行窗口内抑制父 main-tier 流式正文。"""
+    """子 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
@@ -28,11 +33,45 @@ class SubagentWindowTextGuard:
     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

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.dist-info → langchain_agentx_python-2.1.1.dist-info}/METADATA

@@ -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.dist-info → langchain_agentx_python-2.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-langchain_agentx/__init__.py,sha256=CgHyU18uWVbXjHg_5d0L50y28LboDeAoFspC7YP5mk0,1678
+langchain_agentx/__init__.py,sha256=HR2GxgZ6DS54PYkZLAbryBGZGrh2SOYkxP73uKeSEsI,1678
 langchain_agentx/command/__init__.py,sha256=Ej260S5uFQcmEtGZQG_NH7BYjHoStrpBLtGUsBTxyZk,631
 langchain_agentx/command/allowed_tools.py,sha256=TVA0VM8rm98H-QbLK_GRiX5RhEAZFxKawliMi4kk96A,3359
 langchain_agentx/command/context.py,sha256=DIGOGPBw5UGDBm0WNNJlKx1h_9rCRmcdROv4DT61Qug,731
@@ -141,19 +141,19 @@ langchain_agentx/loop/subagent/active_run_registry.py,sha256=KurhAMDTBnRkdxNidaM
 langchain_agentx/loop/subagent/async_runner.py,sha256=y8Ke8nMi2XwdsrTKHCdOtIdr9hc-B1iGTAgMoVceapk,8692
 langchain_agentx/loop/subagent/boundary_snapshot.py,sha256=9cQuqN29nJDRnHnx9c8b09KRmODE2zv15Z06QyjVJps,10008
 langchain_agentx/loop/subagent/cache_safe_params.py,sha256=-qcgdazEYRy6s4ILQuttpxraE3gsxq17Ro7LYBnuv3E,4460
-langchain_agentx/loop/subagent/context.py,sha256=3ho_iZwHu3Ydz-4ZXJWCUeEuLe53VXAk8goBfdv0uiY,22290
+langchain_agentx/loop/subagent/context.py,sha256=skkSPvnshEN4Lh5kWoD7zjUtCOKcjdb4Ho1eM1apXFo,22297
 langchain_agentx/loop/subagent/display_projector.py,sha256=AKsGWS1c9reH0kuD5u4oQ24KsBgyt7X10iZM3ere6Fs,3504
 langchain_agentx/loop/subagent/fork_boilerplate.py,sha256=2Uh3cwegL7V-DvtLIxjX7ik5uW5mXfY2NBzP-biREso,5005
 langchain_agentx/loop/subagent/fork_ports.py,sha256=hZATCvlYOxNVZtR3PoOVbI1GkA0KhHEyux6lUIjG5_4,1323
 langchain_agentx/loop/subagent/fork_worktree_notice.py,sha256=WKAJVxvRMJfbzRe_07Mgrm_zQIQCYx4RwsUnWSSOnkg,1389
 langchain_agentx/loop/subagent/forked_runner.py,sha256=ZEwkNlbwp1-PlJB5COHMKUu_w8EnSMLRc8s0umZ4NuM,6667
 langchain_agentx/loop/subagent/graph.py,sha256=EbwEE9A1-pDdLADsGdWuNQwl-cw7j1_Xia5lW7Wb-kQ,5215
-langchain_agentx/loop/subagent/orchestrator.py,sha256=Eyy9SA1AuX_uafWYMEVK-n6qPpSkuOJqvMwfzQGpOj4,30969
+langchain_agentx/loop/subagent/orchestrator.py,sha256=LZcwnR5YnXGq_qC-ueOkV3Tv061RUomUcCcqip882GQ,31062
 langchain_agentx/loop/subagent/progress.py,sha256=_4YCDnVDH8sBiwXhCQVB8OHaUQwsCOGdUTP_Z_yOdsU,6522
 langchain_agentx/loop/subagent/progress_dispatcher.py,sha256=e1Kd16WRUOAJSeAjupukrlxHoyCR_JO84SHqntMCzdQ,3831
 langchain_agentx/loop/subagent/prompt.py,sha256=p7RgzibNfEJdfX8nBnZGEwQLa3_EgOn4E56T9MBRIEc,1722
 langchain_agentx/loop/subagent/reasoning_extractor.py,sha256=KrCQtBdKzsjAEfA7H5COuXzBhuGGonT2Su8IEKYlUpA,1334
-langchain_agentx/loop/subagent/runner.py,sha256=rjWtFKf2NgtLQax8nhlKQhlFVQuJeP8JvtuuhkJLbyM,29323
+langchain_agentx/loop/subagent/runner.py,sha256=40jIJsTJcJTOFbMELB283YSPQIBCs_zXyABznpBOE0U,29325
 langchain_agentx/loop/subagent/subagent_termination_classifier.py,sha256=ULArQeAibgy6ETSf4vRR0L6X1rsDM7-ZuLzRWQ_pmeY,3158
 langchain_agentx/loop/subagent/transcript.py,sha256=-S0VjZcvqlJQGkVGu8VDMTYwTwOePdjDHfjYi3uu7BY,7187
 langchain_agentx/loop/subagent/transcript_message_builder.py,sha256=gcDdbVOospJ9f0b-eM_0Y1uc4yTstaraWZdejokDyDQ,2081
@@ -217,7 +217,7 @@ langchain_agentx/observability/evaluation/checkers/tool_behavior.py,sha256=o1nH8
 langchain_agentx/observability/events/__init__.py,sha256=9IfY3IcALgQjxdsircWrwTCFuSwr8MTKBDstC8CXPHY,1051
 langchain_agentx/observability/events/accumulated_text_scope.py,sha256=M4OvuQTgReF8SFrOmr-M5vyOJpzfvxj_DKD5bVpGb70,3169
 langchain_agentx/observability/events/agent_defaults.py,sha256=gmX0P__lux5xbCb8dtAlVCb3wZ7avaqFleoW4Q5anw4,1187
-langchain_agentx/observability/events/agent_event_projector.py,sha256=RN1bS9-A-XI_AZYguraVtfcQ4OvEvDxnAWhn0NKySIU,60600
+langchain_agentx/observability/events/agent_event_projector.py,sha256=0xm_lWv5wtlhI05aL08yPSwTuA_Gj4cDXB00ni5bihI,62075
 langchain_agentx/observability/events/api_retry_projection.py,sha256=XGb09sNOi6k1ZGW4YqMLBE8GDxNwNMprk62jV9TS9dQ,2433
 langchain_agentx/observability/events/factory.py,sha256=gqMATIK9tBQzaPWSPhCCSPuCq-WF562ZDTnFUaMm9Qc,1570
 langchain_agentx/observability/events/finish_event_payload_composer.py,sha256=W4jLFy6868GX122qljjeLJowsG7g26o4eKVbHEa7DJc,11481
@@ -225,7 +225,7 @@ langchain_agentx/observability/events/finish_outcome.py,sha256=I1-1RKQYMRXA5Kw0w
 langchain_agentx/observability/events/langchain_agentx_event_adapter.py,sha256=plPZpoqYwDFR_XgdjH5NMQnl_oO6-rixBNl4sGJ0XRw,7519
 langchain_agentx/observability/events/model_end_text_backfill.py,sha256=7RBnxWLi1Oe-Bw9WTYqN-B6IdytFlY-Jso1STtQr6rE,5157
 langchain_agentx/observability/events/subagent_event_mapper.py,sha256=9M9cKzMz7_OXOod0JKtLb-FtUhAKiAVikKGRF6h6Ttk,6860
-langchain_agentx/observability/events/subagent_window_text_guard.py,sha256=yOlhWFKOij98Rdn6knBIk2FUQpSGaBbob7d4U49tEmM,1372
+langchain_agentx/observability/events/subagent_window_text_guard.py,sha256=myo4SSV2TKZjpyrCoe-g5beNGmZnYZefa8nqW76q0Xc,3101
 langchain_agentx/observability/events/tool_call_id_resolver.py,sha256=Mun8jNb91tbV7hvIUkFG9g6NJGHVMW0kHS7Zt6N2gUA,4530
 langchain_agentx/observability/events/tool_outcome_resolver.py,sha256=YqF9Io9-0xdIdz7iYQuJkY-PiUXLC0zR26Eb9n35L9g,4357
 langchain_agentx/observability/events/workflow_aware_event_adapter.py,sha256=GlKN4vQcnXUSC9vcBWbrg4B6Td3aglzcOr4zDUfsXXw,7490
@@ -501,7 +501,7 @@ langchain_agentx/tools/agent/models.py,sha256=jPxah6JgPt0UlZVyrAQxQeZmVUDOBV7xyl
 langchain_agentx/tools/agent/prompt.py,sha256=QQA40AfA5sEIl_LG7kn7UlUKFBOzsHSs_M8c5n-p7YU,8093
 langchain_agentx/tools/agent/prompt_scope.py,sha256=xQup3hosuN0B6TFq7jYV5SE6gzZNwR6BOQ552dfef5I,2677
 langchain_agentx/tools/agent/scope.py,sha256=6F2ZJgSvt-gFeciyKIQxaIiW5PBW9zUeTj3P0uxqrrg,6324
-langchain_agentx/tools/agent/tool.py,sha256=FfL8sfxgFryDLvs-q83tOQJugBFhRu-TQQSZTnvOXiI,16705
+langchain_agentx/tools/agent/tool.py,sha256=kRKnS-xCUtLyAWhkizlDsQo5cXjH5f4QNF7O8EDXXws,16778
 langchain_agentx/tools/agent/built_in/__init__.py,sha256=4YUHj8nUcUOvJW9p158W_t_RBoQt8Uh7eTt0idnCTE4,657
 langchain_agentx/tools/agent/built_in/agentx_guide.py,sha256=Wz4791lK_URpAGtKWceEMvJlD_cu79KfmNQka5yXeUs,2719
 langchain_agentx/tools/agent/built_in/explore.py,sha256=H5757yjmudceFVaMN0O4YDH267DKfFPMSxGR83waNkk,3504
@@ -752,8 +752,8 @@ langchain_agentx/workspace/root_grant_manager.py,sha256=W3gy8HTevbERbXqIgRcjzOXO
 langchain_agentx/workspace/tool_boundary.py,sha256=UDwX6swpSLsx9HNkYuuRRiV5o7ZZG_Bru2Yn0c5kNX8,5724
 langchain_agentx/workspace/validators.py,sha256=tQt-6TOcL8Fw7Ig5ebA9S7vGWh1rby920eFW6x8Tk9E,1439
 langchain_agentx/workspace/view.py,sha256=PGasqTaqhlD03SXXazHuw4RHfV681AIdlsYqL70pEjc,4774
-langchain_agentx_python-2.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-langchain_agentx_python-2.1.0.dist-info/METADATA,sha256=TdLyMypNyg3psJwPdU3votemXhPzWi1HQkEH7qm03Ww,24844
-langchain_agentx_python-2.1.0.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-langchain_agentx_python-2.1.0.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
-langchain_agentx_python-2.1.0.dist-info/RECORD,,
+langchain_agentx_python-2.1.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+langchain_agentx_python-2.1.1.dist-info/METADATA,sha256=2NbkPmSmd1eLI1GDFHMWqUIDLyh9t0c7DKJvxlHDwcA,24844
+langchain_agentx_python-2.1.1.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+langchain_agentx_python-2.1.1.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
+langchain_agentx_python-2.1.1.dist-info/RECORD,,