langchain-agentx-python 2.4.0__py3-none-any.whl → 2.4.1__py3-none-any.whl

langchain_agentx/__init__.py

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
 
-__version__ = "2.4.0"
+__version__ = "2.4.1"
 
 from .mcp.call import McpToolCaller
 from .mcp.client_manager import McpClientManager, McpConnectedClient

langchain_agentx/loop/config/loop_config.py

@@ -136,6 +136,8 @@ class SubagentLinkage:
     subagent_type: str | None = None
     agent_depth: int = 0
     parent_agent_id: str | None = None
+    fork_from_parent: bool = False
+    """True = 当前子 loop 为 ForkA worker（会话继承 fork）；供 ToolExecutionContext / L1。"""
 
 
 @dataclass(frozen=True, init=False)

langchain_agentx/loop/graph/factory.py

@@ -312,7 +312,12 @@ def _flatten_config_for_runtime(config: AgentLoopConfig) -> _FlatLoopConfig:
         conversation_session_id=config.conversation_session_id,
         agent_id=config.agent_id,
         parent_agent_id=config.subagent.parent_agent_id,
-        agent_depth=config.agent_depth,
+        agent_depth=(
+            config.subagent.agent_depth
+            if config.subagent.is_subagent
+            else config.agent_depth
+        ),
+        fork_from_parent=bool(config.subagent.fork_from_parent),
         subagent_type=config.subagent.subagent_type,
         trace_enabled=config.trace.enabled,
         trace_persist=config.trace.persist,

langchain_agentx/loop/run_context.py

@@ -112,6 +112,36 @@ async def run_under_owner_run_context(
         _current_run_context.reset(token)
 
 
+@dataclass
+class SubagentConcurrencyGate:
+    """会话级并发子 Agent 计数（挂在 RunContext.cancel_authority 根上）。
+
+    Doc-37 C9 / Phase 2：独立于深度；无「总 spawn」帽。
+    """
+
+    _running: int = field(default=0, repr=False)
+    _lock: threading.Lock = field(default_factory=threading.Lock, repr=False)
+
+    def try_acquire(self, *, limit: int) -> bool:
+        if limit < 1:
+            return False
+        with self._lock:
+            if self._running >= limit:
+                return False
+            self._running += 1
+            return True
+
+    def release(self) -> None:
+        with self._lock:
+            if self._running > 0:
+                self._running -= 1
+
+    @property
+    def running(self) -> int:
+        with self._lock:
+            return self._running
+
+
 @dataclass
 class RunContext:
     """运行上下文（Graph/Workflow/Agent 共享）。"""
@@ -127,6 +157,10 @@ class RunContext:
     # D-EVT-6：宿主在 cancel_tree / killAll 时写入；finish 投影读取；缺省 unknown。
     # 取值：escape | workflow_stop | kill_agents | unknown；禁止从「是否有后台」猜测。
     cancel_source: str | None = None
+    # Phase 2：并发子 Agent 槽位；acquire/release 始终走 cancel_authority 根上的 gate。
+    subagent_concurrency: SubagentConcurrencyGate = field(
+        default_factory=SubagentConcurrencyGate, repr=False
+    )
     # install 时若成功 register_agent_loop，记下以便 reset 精确 unregister（勿误弹外层）。
     _registered_agent_loop: asyncio.AbstractEventLoop | None = field(
         default=None, repr=False, compare=False
@@ -134,6 +168,18 @@ class RunContext:
     # install 时是否 push 进进程级 RunContext 栈（供 worker 解析 owner）。
     _registered_on_ctx_stack: bool = field(default=False, repr=False, compare=False)
 
+    def try_acquire_subagent_slot(self, *, limit: int) -> bool:
+        """在 outermost RunContext 上占用一个并发槽；满则 False。"""
+        return self.cancel_authority().subagent_concurrency.try_acquire(limit=limit)
+
+    def release_subagent_slot(self) -> None:
+        """释放 outermost 上的一个并发槽（幂等下限 0）。"""
+        self.cancel_authority().subagent_concurrency.release()
+
+    @property
+    def running_subagent_count(self) -> int:
+        return self.cancel_authority().subagent_concurrency.running
+
     def register_child(self, task: asyncio.Task) -> None:
         self.child_tasks.add(task)
 
@@ -412,6 +458,7 @@ def register_spawned_thread(
 
 __all__ = [
     "RunContext",
+    "SubagentConcurrencyGate",
     "create_task_with_copied_context",
     "drive_async_iterator_in_current_task",
     "get_run_context",
@@ -420,5 +467,6 @@ __all__ = [
     "register_spawned_thread",
     "reset_run_context",
     "resolve_cancel_authority",
+    "resolve_owner_run_context",
     "run_context_scope",
 ]

langchain_agentx/loop/runtime/context_factory.py

@@ -146,12 +146,15 @@ class RuntimeContextFactory:
         subagent_query_source = (
             f"agent:{subagent_type}" if subagent_type else "agent:default"
         )
+        # 子 depth 与顶层 agent_depth 必须一致：factory flatten 在 is_subagent 时
+        # 优先读 subagent.agent_depth（嵌套 L1→L2 若只写顶层会误成 0）。
+        child_depth = int(getattr(parent_ctx, "agent_depth", 0) or 0) + 1
 
         return AgentLoopConfig(
             model=resolved_model,
             session_id=getattr(parent_ctx, "session_id", "") or "",
             agent_id=agent_id,
-            agent_depth=(parent_ctx.agent_depth or 0) + 1,
+            agent_depth=child_depth,
             max_steps=resolved_max_steps,
             permission_mode=resolved_permission,
             model_retry=ModelRetrySettings(query_source=subagent_query_source),
@@ -171,6 +174,9 @@ class RuntimeContextFactory:
             ),
             subagent=SubagentLinkage(
                 is_subagent=True,
+                subagent_type=str(subagent_type) if subagent_type else None,
                 parent_agent_id=parent_agent_id,
+                agent_depth=child_depth,
+                # fork_from_parent 由 orchestrator mode 决定，derive 不知 mode → False
             ),
         )

langchain_agentx/loop/subagent/async_runner.py

@@ -175,8 +175,12 @@ async def _execute_background_lifecycle(
     task_id: str,
     task_runtime: Any | None,
     allowed_tool_names: set[str] | None = None,
+    slot_owner: RunContext | None = None,
 ) -> None:
-    """共享后台生命周期：run_subagent → 写 output → task_runtime 终态。"""
+    """共享后台生命周期：run_subagent → 写 output → task_runtime 终态。
+
+    ``slot_owner``：Phase 2 并发槽从 orchestrator 移交至此；终态时 release。
+    """
     execution_ctx = ctx
     execution_ctx.is_async = False
     agent_id = getattr(ctx, "agent_id", None)
@@ -252,6 +256,9 @@ async def _execute_background_lifecycle(
             agent_id=agent_id,
             terminal_reason=TERMINAL_REASON_GRAPH_RUNTIME_ERROR,
         )
+    finally:
+        if slot_owner is not None:
+            slot_owner.release_subagent_slot()
 
 
 def register_background_agent(
@@ -264,6 +271,7 @@ def register_background_agent(
     parent_ctx: Any | None = None,
     owner_run_ctx: RunContext | None = None,
     allowed_tool_names: set[str] | None = None,
+    slot_owner: RunContext | None = None,
 ) -> BackgroundAgentHandle:
     """注册并启动后台子 Agent（仅同 loop C3；无/异 loop 拒绝，D-BG-1）。"""
     task_runtime = _resolve_task_runtime(parent_ctx)
@@ -307,6 +315,7 @@ def register_background_agent(
         task_runtime=task_runtime,
         owner_run_ctx=owner_run_ctx,
         allowed_tool_names=allowed_tool_names,
+        slot_owner=slot_owner,
     )
 
 
@@ -321,6 +330,7 @@ def _register_background_agent_task(
     task_runtime: Any | None,
     owner_run_ctx: RunContext | None,
     allowed_tool_names: set[str] | None = None,
+    slot_owner: RunContext | None = None,
 ) -> BackgroundAgentHandle:
     async def _task_body() -> None:
         await _execute_background_lifecycle(
@@ -331,6 +341,7 @@ def _register_background_agent_task(
             task_id=task_id,
             task_runtime=task_runtime,
             allowed_tool_names=allowed_tool_names,
+            slot_owner=slot_owner,
         )
 
     task = loop.create_task(_task_body(), name=f"agentx-subagent-{task_id}")

langchain_agentx/loop/subagent/graph.py

@@ -119,11 +119,13 @@ def create_subagent_graph(
             parent_tool_call_id=ctx.parent_tool_call_id,
             parent_conversation_session_id=ctx.parent_conversation_session_id,
         ),
+        agent_depth=ctx.agent_depth,
         subagent=SubagentLinkage(
             is_subagent=True,
             subagent_type=ctx.subagent_type,
             parent_agent_id=ctx.parent_agent_id,
             agent_depth=ctx.agent_depth,
+            fork_from_parent=bool(ctx.fork_from_parent),
         ),
         max_steps=ctx.max_steps,
         headless=bool(ctx.headless),