PyPI - langchain-agentx-python - Versions diffs - 1.5.5__tar.gz → 1.5.6__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 1.5.5
+Version: 1.5.6
 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__ = "1.5.5"
+__version__ = "1.5.6"
 from .loop import (  # noqa: F401
     create_loop_agent,

@@ -50,5 +50,14 @@ class QuerySource:
             return query_source.strip()
         return cls.MAIN_THREAD
+    @classmethod
+    def for_agent(cls, agent_type: str | None, *, is_builtin: bool) -> str:
+        """前台 subagent query_source（对齐 CC getQuerySourceForAgent）。"""
+        if is_builtin:
+            if isinstance(agent_type, str) and agent_type.strip():
+                return f"{cls.AGENT_PREFIX}builtin:{agent_type.strip()}"
+            return f"{cls.AGENT_PREFIX}default"
+        return f"{cls.AGENT_PREFIX}custom"
 __all__ = ["QuerySource"]

@@ -29,7 +29,8 @@ from collections.abc import Callable
 from dataclasses import dataclass, field
 from typing import Any, Literal
-from langchain_agentx.loop.context.query_source import LoopCompilationContext, QuerySource
+from langchain_agentx.loop.context.query_source import LoopCompilationContext
+from langchain_agentx.loop.exit.query_source import QuerySource
 from langchain_agentx.loop.runtime.subagent_execution_paths import (
     PreparedSubagentPaths,
     resolve_subagent_effective_cwd,
@@ -142,6 +143,8 @@ def create_subagent_context(
     fork_worktree_path: str | None = None,
     available_tools: list[Any] | None = None,
     thinking_generation_enabled: bool = True,
+    query_source: str | None = None,
+    is_builtin_subagent: bool = False,
 ) -> SubagentContext:
     """工厂函数：从父上下文创建子 Agent 上下文
@@ -266,6 +269,12 @@ def create_subagent_context(
         is_async=is_async,
     )
+    resolved_query_source = (
+        query_source
+        if isinstance(query_source, str) and query_source.strip()
+        else QuerySource.for_agent(subagent_type, is_builtin=is_builtin_subagent)
+    )
     return SubagentContext(
         agent_id=agent_id,
         initial_messages=initial_messages,
@@ -296,6 +305,7 @@ def create_subagent_context(
         runnable_config=getattr(parent_ctx, "runnable_config", None),
         available_tools=list(available_tools or []),
         thinking_generation_enabled=thinking_generation_enabled,
+        query_source=resolved_query_source,
     )

@@ -210,6 +210,7 @@ class SubagentOrchestrator:
                 fork_worktree_path=prepared.worktree_dir,
                 available_tools=runtime_tools,
                 thinking_generation_enabled=thinking_generation_enabled,
+                is_builtin_subagent=getattr(subagent_config, "is_builtin", False),
             )
             scope = propagate_subagent_tool_scope(
                 parent_ctx=ctx,
@@ -408,6 +409,7 @@ class SubagentOrchestrator:
                 fork_worktree_path=prepared.worktree_dir,
                 available_tools=runtime_tools,
                 thinking_generation_enabled=thinking_generation_enabled,
+                is_builtin_subagent=getattr(subagent_config, "is_builtin", False),
             )
             scope = propagate_subagent_tool_scope(
                 parent_ctx=ctx,

@@ -0,0 +1,81 @@
+"""
+loop/subagent/progress_dispatcher.py — 子 Agent tool_progress 冒泡
+职责：将 runner 侧 tool_use/tool_result 同步派发到父 graph 回调链。
+链路位置：runner._emit_progress → SubagentProgressDispatcher
+当前裁剪范围：并行线程池 / _run_coroutine_sync 子线程内同步 dispatch 优先；
+              不新增 SSE 类型；仅 phase ∈ {tool_use, tool_result}。
+"""
+from __future__ import annotations
+import logging
+from typing import Any
+from langchain_agentx.loop.subagent.context import SubagentContext
+from langchain_agentx.loop.subagent.progress import SubagentProgressEvent
+logger = logging.getLogger(__name__)
+_EVENT_NAME = "tool_progress"
+class SubagentProgressDispatcher:
+    """子 Agent progress → 父 graph custom event 派发器。"""
+    @staticmethod
+    def build_payload(
+        ctx: SubagentContext,
+        event: SubagentProgressEvent,
+    ) -> dict[str, Any]:
+        event_data: dict[str, Any] = {
+            "tool_name": event.tool_name,
+            "tool_call_id": ctx.parent_tool_call_id,
+            "agent_id": event.agent_id,
+            "phase": event.type,
+            "step": event.step,
+            "summary": event.summary,
+            "data": {
+                "subagent_type": event.subagent_type,
+            },
+        }
+        if event.tool_call_detail and isinstance(event.tool_call_detail.tool_input, dict):
+            event_data["tool_input"] = dict(event.tool_call_detail.tool_input)
+        return event_data
+    @classmethod
+    def dispatch_sync(cls, parent_config: Any, payload: dict[str, Any]) -> bool:
+        """同步派发；在线程池 worker 内可达父 astream_events（须带 runnable_config）。"""
+        if parent_config is None:
+            return False
+        from langchain_core.callbacks import dispatch_custom_event
+        try:
+            dispatch_custom_event(_EVENT_NAME, payload, config=parent_config)
+            return True
+        except RuntimeError:
+            return False
+        except Exception:
+            logger.debug("dispatch_custom_event failed in subagent progress", exc_info=True)
+            return False
+    @classmethod
+    async def dispatch_async(cls, parent_config: Any, payload: dict[str, Any]) -> bool:
+        """异步派发兜底（同线程 asyncio 上下文）。"""
+        if parent_config is None:
+            return False
+        from langchain_core.callbacks import adispatch_custom_event
+        try:
+            await adispatch_custom_event(
+                name=_EVENT_NAME,
+                data=payload,
+                config=parent_config,
+            )
+            return True
+        except Exception:
+            logger.debug("adispatch_custom_event failed in subagent progress", exc_info=True)
+            return False
+__all__ = ["SubagentProgressDispatcher"]

@@ -64,6 +64,7 @@ from langchain_agentx.loop.subagent.progress import (
     SubagentExecutionTrace,
     SubagentProgressEvent,
 )
+from langchain_agentx.loop.subagent.progress_dispatcher import SubagentProgressDispatcher
 from langchain_agentx.loop.subagent.subagent_termination_classifier import (
     SubagentTerminationClassifier,
 )
@@ -211,7 +212,7 @@ async def _emit_progress(
 ) -> None:
     """发射子 Agent 工具进度到父 graph（CC 对齐：仅 tool_use / tool_result）。
-    通过 adispatch_custom_event 将子 agent 事件冒泡到父 graph 的 astream_events 流。
+    同步 dispatch 优先：并行线程池 / _run_coroutine_sync 子线程内 adispatch 无法触达父回调链。
     父 graph 的 config 通过 ctx.runnable_config 传递（在 _collect_subagent_events 中合并）。
     """
     if event.type not in ("tool_use", "tool_result"):
@@ -224,34 +225,14 @@ async def _emit_progress(
         )
         return
-    from langchain_core.callbacks import adispatch_custom_event
     parent_config = getattr(ctx, "runnable_config", None)
     if parent_config is None:
         return
-    try:
-        event_data: dict[str, Any] = {
-            "tool_name": event.tool_name,
-            "tool_call_id": ctx.parent_tool_call_id,
-            "agent_id": event.agent_id,
-            "phase": event.type,
-            "step": event.step,
-            "summary": event.summary,
-            "data": {
-                "subagent_type": event.subagent_type,
-            },
-        }
-        # G5: 携带 tool_input 以支持 CLI 端 Bash(command) 等进度行显示
-        if event.tool_call_detail and isinstance(event.tool_call_detail.tool_input, dict):
-            event_data["tool_input"] = dict(event.tool_call_detail.tool_input)
-        await adispatch_custom_event(
-            name="tool_progress",
-            data=event_data,
-            config=parent_config,
-        )
-    except Exception:
-        logger.debug("adispatch_custom_event failed in subagent progress", exc_info=True)
+    payload = SubagentProgressDispatcher.build_payload(ctx, event)
+    if SubagentProgressDispatcher.dispatch_sync(parent_config, payload):
+        return
+    await SubagentProgressDispatcher.dispatch_async(parent_config, payload)
 async def _handle_tool_start_event(

@@ -58,6 +58,7 @@ AGENTX_GUIDE_AGENT = SubagentConfig(
     tools_description="Read, Glob, Grep, WebFetch, WebSearch",
     default_max_steps=None,
     allow_async=False,
+    is_builtin=True,
     tags={"guide", "docs", "project-specific"},
 )

@@ -48,6 +48,7 @@ GENERAL_PURPOSE_AGENT = SubagentConfig(
     tools_description="All tools",
     default_max_steps=None,
     allow_async=True,
+    is_builtin=True,
     tags={"general", "multi-step"},
 )

@@ -41,3 +41,5 @@ class SubagentConfig:
     tools_allowlist_empty: bool = False
     user_denied_tools: frozenset[str] = field(default_factory=frozenset)
     pending_snapshot_update: PendingSnapshotUpdate | None = None
+    is_builtin: bool = False
+    """True = CC built-in agent（query_source 为 agent:builtin:{name}）。"""

@@ -146,6 +146,7 @@ langchain_agentx/loop/subagent/forked_runner.py
 langchain_agentx/loop/subagent/graph.py
 langchain_agentx/loop/subagent/orchestrator.py
 langchain_agentx/loop/subagent/progress.py
+langchain_agentx/loop/subagent/progress_dispatcher.py
 langchain_agentx/loop/subagent/prompt.py
 langchain_agentx/loop/subagent/reasoning_extractor.py
 langchain_agentx/loop/subagent/runner.py

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

langchain-agentx-python 1.5.5__tar.gz → 1.5.6__tar.gz

langchain-agentx-python 1.5.5tar.gz → 1.5.6tar.gz