langchain-agentx-python 1.2.7__tar.gz → 1.2.9__tar.gz

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/PKG-INFO

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

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/langchain_agentx/__init__.py

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

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/langchain_agentx/loop/graph/factory.py

@@ -363,6 +363,7 @@ class LoopGraphBuilder:
         self._context_schema = context_schema
         self._prepared = False
         self._memory_prefetch_coordinator: Any | None = None
+        self._plan_mode_attachment_coordinator: Any | None = None
 
     def _prepare_compile_context(self) -> None:
         if self._prepared:
@@ -620,6 +621,9 @@ class LoopGraphBuilder:
             model=model,
             session_store=session_store,
         )
+        self._plan_mode_attachment_coordinator = self._build_plan_mode_attachment_coordinator(
+            session_id=session_id or "",
+        )
         self._hook_graph_wiring = HookGraphWiring(
             hook_engine,
             trace_lifecycle_collector=trace_lifecycle_collector,
@@ -947,20 +951,66 @@ class LoopGraphBuilder:
         iteration = int(state.get("turn_count", 0) or 0)
         return coordinator.consume_attachment_messages(state, iteration=iteration)
 
-    def _patch_messages_with_memory_prefetch(
+    def _build_plan_mode_attachment_coordinator(self, *, session_id: str) -> Any | None:
+        if self._is_subagent:
+            return None
+        from ...session.plan_mode_attachments import PlanModeAttachmentCoordinator
+
+        return PlanModeAttachmentCoordinator(
+            workspace_cfg=self._workspace_cfg,
+            session_id=session_id,
+        )
+
+    def _consume_plan_mode_attachment_messages(
+        self,
+        state: dict[str, Any],
+        *,
+        configurable: dict[str, Any] | None = None,
+    ) -> list[dict[str, Any]]:
+        coordinator = self._plan_mode_attachment_coordinator
+        if coordinator is None:
+            return []
+        iteration = int(state.get("turn_count", 0) or 0)
+        return coordinator.consume_attachment_messages(
+            state,
+            iteration=iteration,
+            configurable=configurable,
+        )
+
+    def _patch_messages_with_loop_attachments(
         self,
         state: dict[str, Any],
         patch: dict[str, Any],
+        *,
+        configurable: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         memory_attachments = self._consume_memory_prefetch_attachment_messages(state)
-        if not memory_attachments:
+        plan_mode_attachments = self._consume_plan_mode_attachment_messages(
+            state,
+            configurable=configurable,
+        )
+        extra = memory_attachments + plan_mode_attachments
+        if not extra:
             return patch
         messages = list(patch.get("messages") or state.get("messages") or [])
-        messages.extend(to_record(m) for m in memory_attachments)
+        messages.extend(to_record(m) for m in extra)
         patch = dict(patch)
         patch["messages"] = messages
         return patch
 
+    def _patch_messages_with_memory_prefetch(
+        self,
+        state: dict[str, Any],
+        patch: dict[str, Any],
+        *,
+        configurable: dict[str, Any] | None = None,
+    ) -> dict[str, Any]:
+        return self._patch_messages_with_loop_attachments(
+            state,
+            patch,
+            configurable=configurable,
+        )
+
     def _resolve_workspace_config(self) -> None:
         raw_workspace_root = self._config.workspace.workspace_root
         if raw_workspace_root is None:
@@ -1464,6 +1514,12 @@ class LoopGraphBuilder:
             agent_id = state.get("agent_id")
             scope = TaskScope(agent_id=agent_id if isinstance(agent_id, str) else None)
             task_events: list[dict[str, Any]] = []
+            try:
+                from langgraph.config import get_config
+
+                runnable_config = get_config()
+            except Exception:
+                runnable_config = None
 
             provider_index = -1
             batch = None
@@ -1541,6 +1597,7 @@ class LoopGraphBuilder:
                             "pending_task_command_ids": [],
                             "task_events": task_events,
                         },
+                        configurable=runnable_config,
                     )
                 messages = list(state.get("messages") or [])
                 # 冻结契约：task 通知附件仅经本节点注入；按 command_id 与已有 messages 去重
@@ -1615,6 +1672,7 @@ class LoopGraphBuilder:
                         "pending_task_command_ids": list(batch.command_ids),
                         "task_events": task_events,
                     },
+                    configurable=runnable_config,
                 )
             except Exception:
                 if batch is not None and batch.batch_id:

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/langchain_agentx/loop/graph/graph_edges.py

@@ -32,7 +32,7 @@ from langchain_core.messages import AIMessage, AnyMessage, HumanMessage, ToolMes
 from langgraph._internal._runnable import RunnableCallable
 from langgraph.graph.state import StateGraph
 from langgraph.prebuilt.tool_node import ToolNode
-from ..hook.async_hook_runner import AsyncHookRunner
+from ..hook.async_hook_runner import AsyncHookRunner, get_process_async_hook_runner
 from ..hook.hook_projection import hook_result_to_event_dict
 from ..hook.types import HookContext, HookEvent
 
@@ -96,7 +96,7 @@ def _execute_hook_common(
         return None
     hook_runner = state.get("_hook_runner")
     if not isinstance(hook_runner, AsyncHookRunner):
-        hook_runner = AsyncHookRunner()
+        hook_runner = get_process_async_hook_runner()
     ctx_kwargs: dict[str, Any] = {
         "event": event,
         "state": state,

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/langchain_agentx/loop/hook/__init__.py

@@ -12,7 +12,11 @@ loop.hook — Hook 子系统（P1/P2）。
     Phase 1：新增 HookProgressPayloadBuilder 用于 progress 展示元数据构建。
 """
 
-from .async_hook_runner import AsyncHookRunner
+from .async_hook_runner import (
+    AsyncHookRunner,
+    get_process_async_hook_runner,
+    shutdown_process_async_hook_runner,
+)
 from .config import HookCandidate, HookCandidateDecision, HookSpec, HooksConfigSnapshot
 from .engine import HookEngine
 from .executors import AgentExecutor, CommandExecutor, HttpExecutor, PromptExecutor
@@ -40,6 +44,8 @@ from .types import (
 __all__ = [
     "AggregatedHookResult",
     "AsyncHookRunner",
+    "get_process_async_hook_runner",
+    "shutdown_process_async_hook_runner",
     "ATTACHMENT_HOOK_BLOCKING_ERROR",
     "ATTACHMENT_HOOK_CANCELLED",
     "ATTACHMENT_HOOK_NON_BLOCKING_ERROR",

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/langchain_agentx/loop/hook/async_hook_runner.py

@@ -8,12 +8,14 @@ async_hook_runner.py — Hook 同步入口的异步执行协作者。
     HookGraphWiring 与 graph_edges 通过本协作者调用 HookEngine.execute()。
 
 当前裁剪范围：
-    P1 仅实现线程桥接执行；不引入 nest_asyncio，不修改外部事件循环。
+    P1 仅实现线程桥接执行；不引入 nest_asyncio，不修改外部 event loop。
+    进程级单例 ThreadPoolExecutor，atexit 显式 shutdown，禁止 fallback 裸 new。
 """
 
 from __future__ import annotations
 
 import asyncio
+import atexit
 from concurrent.futures import ThreadPoolExecutor
 from threading import Lock
 
@@ -45,7 +47,10 @@ class AsyncHookRunner:
     def _get_or_create_executor(self) -> ThreadPoolExecutor:
         with self._executor_lock:
             if self._executor is None:
-                self._executor = ThreadPoolExecutor(max_workers=1)
+                self._executor = ThreadPoolExecutor(
+                    max_workers=1,
+                    thread_name_prefix="async-hook-runner",
+                )
             return self._executor
 
     def close(self) -> None:
@@ -59,4 +64,33 @@ class AsyncHookRunner:
         return asyncio.run(hook_engine.execute(ctx))
 
 
-__all__ = ["AsyncHookRunner"]
+_process_runner: AsyncHookRunner | None = None
+_process_runner_lock = Lock()
+
+
+def get_process_async_hook_runner() -> AsyncHookRunner:
+    """进程级 Hook 桥接 runner（单例，避免 graph_edges fallback 泄漏线程池）。"""
+    global _process_runner
+    with _process_runner_lock:
+        if _process_runner is None:
+            _process_runner = AsyncHookRunner()
+        return _process_runner
+
+
+def shutdown_process_async_hook_runner() -> None:
+    """关闭进程级 runner 线程池（测试 / 进程退出）。"""
+    global _process_runner
+    with _process_runner_lock:
+        if _process_runner is not None:
+            _process_runner.close()
+            _process_runner = None
+
+
+atexit.register(shutdown_process_async_hook_runner)
+
+
+__all__ = [
+    "AsyncHookRunner",
+    "get_process_async_hook_runner",
+    "shutdown_process_async_hook_runner",
+]

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/langchain_agentx/loop/hook/graph_wiring.py

@@ -17,7 +17,7 @@ from dataclasses import dataclass, field
 from typing import Any
 from uuid import uuid4
 
-from .async_hook_runner import AsyncHookRunner
+from .async_hook_runner import AsyncHookRunner, get_process_async_hook_runner
 from .engine import HookEngine
 from .hook_projection import derive_hook_outcome, hook_result_to_event_dict
 from .types import AggregatedHookResult, HookContext, HookEvent
@@ -44,7 +44,7 @@ class HookGraphWiring:
     workspace_cfg: Any | None = None
     session_id: str | None = None
     container_type: str = "interactive"
-    hook_runner: AsyncHookRunner = field(default_factory=AsyncHookRunner)
+    hook_runner: AsyncHookRunner = field(default_factory=get_process_async_hook_runner)
 
     def loop_start_node(self, state: dict[str, Any], runtime: Any) -> dict[str, Any]:
         run_id = state.get("_run_id")

{langchain-agentx-python-1.2.7 → langchain-agentx-python-1.2.9}/langchain_agentx/session/plan_mode.py

@@ -18,6 +18,8 @@ logger = logging.getLogger(__name__)
 
 PRE_PLAN_MODE_KEY = "prePlanMode"
 PERMISSION_MODE_KEY = "permission_mode"
+NEEDS_PLAN_MODE_EXIT_ATTACHMENT_KEY = "needsPlanModeExitAttachment"
+HAS_EXITED_PLAN_MODE_KEY = "hasExitedPlanModeInSession"
 PLAN_MODE = "plan"
 DEFAULT_MODE = "default"
 
@@ -37,6 +39,18 @@ def _mutable_configurable(target: MutableMapping[str, Any]) -> MutableMapping[st
 class PlanModeTransition:
     """IF-G9：configurable 上 plan 模式 enter/exit（OOP 单职责）。"""
 
+    @staticmethod
+    def handle_transition(
+        configurable: MutableMapping[str, Any],
+        from_mode: str,
+        to_mode: str,
+    ) -> None:
+        """对齐 CC ``handlePlanModeTransition``：exit attachment 与快速切换互斥。"""
+        if to_mode == PLAN_MODE and from_mode != PLAN_MODE:
+            configurable[NEEDS_PLAN_MODE_EXIT_ATTACHMENT_KEY] = False
+        if from_mode == PLAN_MODE and to_mode != PLAN_MODE:
+            configurable[NEEDS_PLAN_MODE_EXIT_ATTACHMENT_KEY] = True
+
     @staticmethod
     def enter(config_or_configurable: MutableMapping[str, Any]) -> str:
         """进入 plan；返回进入前的 permission_mode（并写入 prePlanMode）。"""
@@ -44,6 +58,7 @@ class PlanModeTransition:
         previous = str(configurable.get(PERMISSION_MODE_KEY, DEFAULT_MODE))
         configurable[PRE_PLAN_MODE_KEY] = previous
         configurable[PERMISSION_MODE_KEY] = PLAN_MODE
+        PlanModeTransition.handle_transition(configurable, previous, PLAN_MODE)
         return previous
 
     @staticmethod
@@ -56,6 +71,8 @@ class PlanModeTransition:
                 DEFAULT_MODE,
             )
         restore = str(configurable.get(PRE_PLAN_MODE_KEY, DEFAULT_MODE))
+        PlanModeTransition.handle_transition(configurable, PLAN_MODE, restore)
+        configurable[HAS_EXITED_PLAN_MODE_KEY] = True
         configurable[PERMISSION_MODE_KEY] = restore
         configurable.pop(PRE_PLAN_MODE_KEY, None)
         return restore
@@ -102,6 +119,8 @@ __all__ = [
     "PLAN_MODE",
     "PRE_PLAN_MODE_KEY",
     "PERMISSION_MODE_KEY",
+    "NEEDS_PLAN_MODE_EXIT_ATTACHMENT_KEY",
+    "HAS_EXITED_PLAN_MODE_KEY",
     "PlanModeAction",
     "PlanModeTransition",
     "build_plan_mode_transition_event",