langchain-agentx-python 2.4.4__py3-none-any.whl → 2.4.6__py3-none-any.whl

langchain_agentx/__init__.py

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

langchain_agentx/loop/hook/registry.py

@@ -18,6 +18,7 @@ registry.py — HookRegistry 用户侧入口。
 from __future__ import annotations
 
 import copy
+import types
 from dataclasses import replace
 from typing import Any, Callable
 from uuid import uuid4
@@ -25,6 +26,51 @@ from uuid import uuid4
 from .config import HookSpec, HooksConfigSnapshot
 from .types import HookEvent
 
+# fresh_state 克隆时，同一父实例上的多个 bound method 共用一个克隆 self
+_CallableSelfCloneMap = dict[int, Any]
+
+
+def _clone_hook_callable(
+    fn: Any,
+    *,
+    self_clones: _CallableSelfCloneMap,
+) -> Any:
+    """克隆 hook 回调；bound method 按 ``id(__self__)`` 去重，再绑到同一克隆实例。"""
+    self_obj = getattr(fn, "__self__", None)
+    func = getattr(fn, "__func__", None)
+    if self_obj is None or func is None or isinstance(self_obj, type):
+        # 普通函数 / 静态 / 类方法：保持 deepcopy 语义（通常仍是同一对象）
+        try:
+            return copy.deepcopy(fn)
+        except Exception:
+            return fn
+
+    key = id(self_obj)
+    if key not in self_clones:
+        self_clones[key] = copy.deepcopy(self_obj)
+    cloned_self = self_clones[key]
+    name = getattr(func, "__name__", None)
+    if isinstance(name, str) and name and hasattr(cloned_self, name):
+        rebound = getattr(cloned_self, name)
+        if callable(rebound) and getattr(rebound, "__self__", None) is cloned_self:
+            return rebound
+    return types.MethodType(func, cloned_self)
+
+
+def _clone_hook_config_fresh(
+    config: dict[str, Any],
+    *,
+    self_clones: _CallableSelfCloneMap,
+) -> dict[str, Any]:
+    """逐键深拷；``fn``/``callback`` 走 bound-method 去重克隆。"""
+    cloned: dict[str, Any] = {}
+    for key, value in config.items():
+        if key in ("fn", "callback") and callable(value):
+            cloned[key] = _clone_hook_callable(value, self_clones=self_clones)
+        else:
+            cloned[key] = copy.deepcopy(value)
+    return cloned
+
 
 # ── 任务完成 Hook 类型定义 ────────────────────────────────────────
 
@@ -326,13 +372,19 @@ class HookRegistry:
         *,
         fresh_state: bool = True,
     ) -> HookRegistry:
-        """过滤 clone 父 registry specs 到子 loop（LOCK-2；fresh_state 预留计数器隔离扩展）。"""
+        """过滤 clone 父 registry specs 到子 loop（LOCK-2）。
+
+        ``fresh_state=True``：可变 config 深拷，且同一父实例上的 bound method
+        （PRE/POST/…）共用**一份**克隆 ``__self__``——子会话相对父隔离，
+        子会话内跨事件状态机仍共享（见 bug hook-fork-bound-method-deepcopy-splits-state）。
+        """
         child = HookRegistry()
+        self_clones: _CallableSelfCloneMap = {}
         for spec in self._specs:
             if spec.event not in inherited_events:
                 continue
             if fresh_state:
-                config = copy.deepcopy(spec.config)
+                config = _clone_hook_config_fresh(spec.config, self_clones=self_clones)
             else:
                 config = dict(spec.config)
             cloned = replace(

langchain_agentx/loop/subagent/context.py

@@ -19,7 +19,8 @@ Fork 路径区分（对齐 CC）：
       ``path_prep`` 与遗留 ``cwd``/worktree 自建二选一（编排层须传 ``path_prep``）；
       fork + worktree 时可选注入 CC 等价 ``buildWorktreeNotice`` user 消息（见 ``fork_worktree_notice``）；
       create_subagent_context 在 fork_from_parent=True 时注入 fork-boilerplate 行为规范；
-      P0-1: 子代理默认隔离 session_store（父为 AgentSessionStore 时使用 clone(file_state_only=True, inherit_grants=True)）。
+      P0-1: 子代理隔离 session_store（clone + inherit_grants）；读缓存仅在
+      fork_from_parent=True 时继承（对齐 CC forkContextMessages ⟺ cloneFileStateCache）。
 """
 
 import os
@@ -287,11 +288,15 @@ def create_subagent_context(
 
     parent_store = getattr(parent_ctx, "session_store", None)
     session_store: Any = parent_store
-    # P0-1 修复：子代理默认隔离 session_store
-    # 无论 plain 还是 fork 模式，子代理都应使用 clone(file_state_only=True, inherit_grants=True)
-    # 来继承文件读状态 + spawn 时刻 grant 快照，但隔离 cwd_override、权限缓存等运行态
+    # P0-1：子代理隔离 session_store（cwd / 权限缓存不共享）；grant 快照可继承。
+    # 读缓存绑定消息历史（对齐 CC runAgent.ts）：仅 fork_from_parent=True 时
+    # clone _file_read_state；plain / Skill fork 空缓存，避免 file_unchanged 误判。
     if isinstance(parent_store, AgentSessionStore):
-        session_store = parent_store.clone(file_state_only=True, inherit_grants=True)
+        session_store = parent_store.clone(
+            file_state_only=True,
+            inherit_grants=True,
+            inherit_file_reads=fork_from_parent,
+        )
 
     # 写入 cwd 到子会话 session_store.cwd_override（runtime state SSOT）
     # 这确保后续 LangChainAdapter.build_tool_execution_context() 和

langchain_agentx/tool_runtime/session_store.py

@@ -390,11 +390,19 @@ class AgentSessionStore:
         *,
         file_state_only: bool = True,
         inherit_grants: bool = False,
+        inherit_file_reads: bool = True,
     ) -> AgentSessionStore:
+        """克隆会话存储。
+
+        ``inherit_file_reads`` 对齐 CC ``forkContextMessages !== undefined``
+        → ``cloneFileStateCache``；plain / Skill fork 须传 ``False``（空读缓存），
+        避免 Read dedup 返回 ``file_unchanged`` 而子会话无父消息历史。
+        """
         new = AgentSessionStore(session_id=str(uuid.uuid4()))
-        new._file_read_state = {
-            k: copy.deepcopy(v) for k, v in self._file_read_state.items()
-        }
+        if inherit_file_reads:
+            new._file_read_state = {
+                k: copy.deepcopy(v) for k, v in self._file_read_state.items()
+            }
         if inherit_grants:
             new._granted_roots = copy.deepcopy(self._granted_roots)
             new.enable_dynamic_root_grant = self.enable_dynamic_root_grant

{langchain_agentx_python-2.4.4.dist-info → langchain_agentx_python-2.4.6.dist-info}/METADATA

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

{langchain_agentx_python-2.4.4.dist-info → langchain_agentx_python-2.4.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-langchain_agentx/__init__.py,sha256=gX9uh5HhQBKt0DLInVlFKZmLGU6UFTHBPQmjVNSMRKo,2014
+langchain_agentx/__init__.py,sha256=fth2HJEGBE2s3P92UlQiNbql2glzWE_f5uddTh6FkP4,2014
 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
@@ -83,7 +83,7 @@ langchain_agentx/loop/hook/engine.py,sha256=s18KUN1QY0eC5T01mG8yO2lNxLg-GDa8ZhIX
 langchain_agentx/loop/hook/graph_wiring.py,sha256=EvntU0VsqX-VIp9yQnKI3Qnz2-Scd-5-GviHh7xoZ1s,8769
 langchain_agentx/loop/hook/hook_projection.py,sha256=B2PgU2YPx6Mnpdpcac6g_8SlkmR1bllNNPIn8jp2hyU,5966
 langchain_agentx/loop/hook/progress_payload.py,sha256=bbNUEguw_cYbI3l0RJZ4VAtfgaRhD0jqwk3eE5AzgCE,4532
-langchain_agentx/loop/hook/registry.py,sha256=aL7v0--v_YPYBVlRbGUr76rSSswMAyHgr8AVHk0ho74,13350
+langchain_agentx/loop/hook/registry.py,sha256=tRuVbwUsO7ELwmigJNkgcxczF1toOy27tavUhzczyoI,15348
 langchain_agentx/loop/hook/trust.py,sha256=4RlzQkleRO3xU1N4dZ5mPHgejDn_Xar2jOhwkLWKn4A,1236
 langchain_agentx/loop/hook/types.py,sha256=tkI5R5KwsUNBczJ9we3dRa7gbqNmOar6k4BQyXGqiGs,5510
 langchain_agentx/loop/hook/executors/__init__.py,sha256=rzRQ0_8-G1IUqNFMEVxAq7YTvvq2zTlZGENRabeU4_c,258
@@ -146,7 +146,7 @@ langchain_agentx/loop/subagent/active_run_registry.py,sha256=KurhAMDTBnRkdxNidaM
 langchain_agentx/loop/subagent/async_runner.py,sha256=ZJu6DztRmg0SNEapEuPyQbsk8SprXiMKWDWDHb9L7yQ,14124
 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=cSyXYu9l5MnHQMEJkCQFTZKhn3pnIR6nGgGKzd_vhr8,25099
+langchain_agentx/loop/subagent/context.py,sha256=YAAR_g7BA_PXL5LGxxO1xWMn5pvVU3VOYSmxdxNPbbg,25243
 langchain_agentx/loop/subagent/definition_permission.py,sha256=_Y30FA0EDTgqpqjw5luIiwbpABLo17myC3aY4NWbGIw,2188
 langchain_agentx/loop/subagent/display_projector.py,sha256=AKsGWS1c9reH0kuD5u4oQ24KsBgyt7X10iZM3ere6Fs,3504
 langchain_agentx/loop/subagent/fork_boilerplate.py,sha256=2Uh3cwegL7V-DvtLIxjX7ik5uW5mXfY2NBzP-biREso,5005
@@ -489,7 +489,7 @@ langchain_agentx/tool_runtime/read_ignore_patterns.py,sha256=l4kNulVDaOdQxcs4FeC
 langchain_agentx/tool_runtime/read_permission.py,sha256=rwH7NEtL57aUKXVjSf6hMOOvEWOayNFyvI_SNoNCHPA,9284
 langchain_agentx/tool_runtime/registry.py,sha256=cvdMRz5cyAqLjM0MWWp6wu1DgqtZeMoiR2vgyAVHlb8,3358
 langchain_agentx/tool_runtime/session_hints.py,sha256=TyoNdSw5GsE5AvYDPHJKsrto9YXZtbAdihI8YKHdRxA,3004
-langchain_agentx/tool_runtime/session_store.py,sha256=KEapYa7scu-KBl5R1WwlOOU9J3lynYWgzggtnkiIsRE,17235
+langchain_agentx/tool_runtime/session_store.py,sha256=47asao4mHf75BijGg2OrJhexCUk2k8w3GpMUGYirNxM,17625
 langchain_agentx/tool_runtime/shell_error.py,sha256=gi2i0sc4qHcUiLD5B2yk-wIvyVaOpLFKyf4ZnnKmAuE,2198
 langchain_agentx/tool_runtime/smoke_test_runtime.py,sha256=vOdoYdFwsWjq8k7rHD7hkgtgM5noGr9a6Wn1hHZ7354,11846
 langchain_agentx/tool_runtime/state_bridge.py,sha256=8F7jG8Uk4EVJaAB8rwKpNmbWrNZtIHYJO5RFBiwSRhs,6011
@@ -839,8 +839,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.4.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-langchain_agentx_python-2.4.4.dist-info/METADATA,sha256=yKso1obM03vdYTdmgAAiSaPpXk2sVBOUFq8_CzLm9MQ,23971
-langchain_agentx_python-2.4.4.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-langchain_agentx_python-2.4.4.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
-langchain_agentx_python-2.4.4.dist-info/RECORD,,
+langchain_agentx_python-2.4.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+langchain_agentx_python-2.4.6.dist-info/METADATA,sha256=hlPQGo7vha4ZBFMEIgNs77O8oCYLtYQ-kymif47LSTs,23971
+langchain_agentx_python-2.4.6.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+langchain_agentx_python-2.4.6.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
+langchain_agentx_python-2.4.6.dist-info/RECORD,,