langchain-agentx-python 2.4.5__py3-none-any.whl → 2.4.7__py3-none-any.whl

langchain_agentx/__init__.py

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

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/tools/bash/backend.py

@@ -42,6 +42,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Protocol
 
+from .bash_exec_assembly import AssembledShellCommand, BashExecAssembler
 from .cwd_reporter import (
     BashCwdReporter,
     bash_single_quoted,
@@ -52,8 +53,6 @@ from .cwd_reporter import (
 from .sandbox_decision import BashSandboxDecision
 from .shell_locator import resolve_posix_shell
 from .task_runtime import BashTaskSnapshot, BashTaskStateMachine
-from .shell_quoting import append_stdin_redirect
-from .windows_shell_quoting import rewrite_windows_null_redirect
 
 # cwd 提取用的特殊 sentinel（不太可能出现在正常输出中）
 _CWD_SENTINEL = "__BASH_CWD_SENTINEL_63f8a2__"
@@ -159,14 +158,16 @@ def _cwd_invalid_execute_result(cwd: str | None, exc: BaseException) -> ExecuteR
     )
 
 
-def _merge_reset_into_result(
-    result: ExecuteResult, reset_stderr_prefix: str
+def _copy_execute_result(
+    result: ExecuteResult,
+    *,
+    stderr: str | None = None,
+    cwd_warning: str | None = None,
 ) -> ExecuteResult:
-    if not reset_stderr_prefix:
-        return result
+    """复制 ExecuteResult，保留 D2/D4 装配观测字段。"""
     return ExecuteResult(
         stdout=result.stdout,
-        stderr=reset_stderr_prefix + (result.stderr or ""),
+        stderr=result.stderr if stderr is None else stderr,
         exit_code=result.exit_code,
         interrupted=result.interrupted,
         cwd_after=result.cwd_after,
@@ -174,7 +175,22 @@ def _merge_reset_into_result(
         sandbox_bypass_reason=result.sandbox_bypass_reason,
         sandbox_temp_dir=result.sandbox_temp_dir,
         sandbox_violation_message=result.sandbox_violation_message,
-        cwd_warning=result.cwd_warning,
+        cwd_warning=result.cwd_warning if cwd_warning is None else cwd_warning,
+        command_before=result.command_before,
+        command_after=result.command_after,
+        shell_snapshot_path=result.shell_snapshot_path,
+        shell_login_flag=result.shell_login_flag,
+    )
+
+
+def _merge_reset_into_result(
+    result: ExecuteResult, reset_stderr_prefix: str
+) -> ExecuteResult:
+    if not reset_stderr_prefix:
+        return result
+    return _copy_execute_result(
+        result,
+        stderr=reset_stderr_prefix + (result.stderr or ""),
     )
 
 
@@ -187,16 +203,9 @@ def _post_process_execute_result(result: ExecuteResult) -> ExecuteResult:
     cleaned_stderr, cwd_warning = extract_cwd_warning(result.stderr)
     # 替换 stderr 为清理后的版本（UI 层看到干净的 stderr）
     # 同时设置 cwd_warning 字段（UI 层可直接使用）
-    return ExecuteResult(
-        stdout=result.stdout,
+    return _copy_execute_result(
+        result,
         stderr=cleaned_stderr,
-        exit_code=result.exit_code,
-        interrupted=result.interrupted,
-        cwd_after=result.cwd_after,
-        sandboxed=result.sandboxed,
-        sandbox_bypass_reason=result.sandbox_bypass_reason,
-        sandbox_temp_dir=result.sandbox_temp_dir,
-        sandbox_violation_message=result.sandbox_violation_message,
         cwd_warning=cwd_warning,
     )
 
@@ -235,6 +244,18 @@ class ExecuteResult:
     cwd_warning: str | None = None
     """从 stderr 中提取的 cwd 重置警告信息（结构化）。"""
 
+    command_before: str | None = None
+    """进入 preprocess 前的原始命令（D4 可观测）。"""
+
+    command_after: str | None = None
+    """preprocess + snapshot/extglob 装配后的命令串（cwd wrap 前）。"""
+
+    shell_snapshot_path: str | None = None
+    """本次使用的 shell 快照路径；None 表示回退 ``-l``。"""
+
+    shell_login_flag: bool = False
+    """spawn 是否带 ``-l``（无可用快照时为 True，对齐 CC getSpawnArgs）。"""
+
 
 @dataclass
 class BackgroundTask:
@@ -581,6 +602,10 @@ class BashBackend:
         sandbox_backend: BashSandboxBackendProtocol | None = None,
         sandbox_runtime_config: BashSandboxRuntimeConfig | None = None,
         posix_shell_executable: str | None = None,
+        *,
+        enable_shell_snapshot: bool = True,
+        shell_snapshot_path: str | None = None,
+        exec_assembler: BashExecAssembler | None = None,
         **_: Any,
     ) -> None:
         if sandbox_backend is not None:
@@ -592,6 +617,10 @@ class BashBackend:
                 config=sandbox_runtime_config,
             )
         self._posix_shell_override = posix_shell_executable
+        self._exec_assembler = exec_assembler or BashExecAssembler(
+            enable_snapshot=enable_shell_snapshot,
+            injected_snapshot_path=shell_snapshot_path,
+        )
 
     def _posix_shell_executable(self, env: dict[str, str]) -> str:
         """解析 argv[0]；测试可注入 `posix_shell_executable` 跳过 PATH 探测。"""
@@ -603,10 +632,27 @@ class BashBackend:
         merged.update(env)
         return resolve_posix_shell(environ=merged)
 
+    def _assemble_shell_command(
+        self, command: str, *, shell_exe: str
+    ) -> AssembledShellCommand:
+        """D2/D4：preprocess + snapshot/extglob 装配（对齐 CC bashProvider）。"""
+        return self._exec_assembler.assemble(command, shell_exe=shell_exe)
+
     def _preprocess_shell_command(self, command: str) -> str:
-        """进入 `-c` 包装前：win32 nul 纠偏 + stdin EOF（防交互阻塞，对齐 CC）。"""
-        command = rewrite_windows_null_redirect(command)
-        return append_stdin_redirect(command)
+        """兼容旧调用：仅返回 preprocess 后文本（不含 snapshot 链）。"""
+        from .bash_exec_assembly import preprocess_shell_command
+
+        return preprocess_shell_command(command).after
+
+    @staticmethod
+    def _attach_assembly_meta(
+        result: ExecuteResult, assembled: AssembledShellCommand
+    ) -> ExecuteResult:
+        result.command_before = assembled.preprocess.before
+        result.command_after = assembled.command_string
+        result.shell_snapshot_path = assembled.snapshot_path
+        result.shell_login_flag = assembled.use_login_shell
+        return result
 
     @staticmethod
     def _spawn_env_with_shell(env: dict[str, str], shell_exe: str) -> dict[str, str]:
@@ -727,7 +773,8 @@ class BashBackend:
         import subprocess as _sp
 
         shell_exe = self._posix_shell_executable(env)
-        command = self._preprocess_shell_command(command)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        command = assembled.command_string
         effective_cwd, reset_prefix = _prepare_spawn_cwd(cwd, fallback=fallback_cwd)
         if effective_cwd is None:
             msg = reset_prefix.strip() or "Shell cwd invalid and no valid fallback"
@@ -737,6 +784,10 @@ class BashBackend:
                 interrupted=False,
                 stderr=msg + "\n",
                 cwd_warning=msg,
+                command_before=assembled.preprocess.before,
+                command_after=assembled.command_string,
+                shell_snapshot_path=assembled.snapshot_path,
+                shell_login_flag=assembled.use_login_shell,
             )
         read_fd = -1
         write_fd = -1
@@ -748,14 +799,16 @@ class BashBackend:
                     timeout_sec=timeout_sec,
                     env=env,
                     shell_exe=shell_exe,
+                    assembled=assembled,
                 )
                 return _merge_reset_into_result(result, reset_prefix)
 
             read_fd, write_fd = os.pipe()
             wrapped = BashCwdReporter.wrap_with_fd3(command, write_fd)
+            argv = assembled.spawn_argv(shell_exe, wrapped)
 
             proc = _sp.Popen(
-                [shell_exe, "-c", wrapped],
+                argv,
                 stdin=_sp.DEVNULL,
                 stdout=_sp.PIPE,
                 stderr=_sp.PIPE,
@@ -775,15 +828,18 @@ class BashBackend:
                 os.close(read_fd)
                 partial = stdout_bytes.decode("utf-8", errors="replace")
                 partial_stderr = stderr_bytes.decode("utf-8", errors="replace")
-                return _merge_reset_into_result(
-                    ExecuteResult(
-                        stdout=partial,
-                        stderr=partial_stderr,
-                        exit_code=-1,
-                        interrupted=True,
-                        cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    _merge_reset_into_result(
+                        ExecuteResult(
+                            stdout=partial,
+                            stderr=partial_stderr,
+                            exit_code=-1,
+                            interrupted=True,
+                            cwd_after=cwd_after,
+                        ),
+                        reset_prefix,
                     ),
-                    reset_prefix,
+                    assembled,
                 )
 
             cwd_after = _read_fd_safe(read_fd)
@@ -792,21 +848,27 @@ class BashBackend:
 
             stdout_str = stdout_bytes.decode("utf-8", errors="replace")
             stderr_str = stderr_bytes.decode("utf-8", errors="replace")
-            return _merge_reset_into_result(
-                ExecuteResult(
-                    stdout=stdout_str,
-                    stderr=stderr_str,
-                    exit_code=proc.returncode,
-                    interrupted=False,
-                    cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                _merge_reset_into_result(
+                    ExecuteResult(
+                        stdout=stdout_str,
+                        stderr=stderr_str,
+                        exit_code=proc.returncode,
+                        interrupted=False,
+                        cwd_after=cwd_after,
+                    ),
+                    reset_prefix,
                 ),
-                reset_prefix,
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
@@ -832,6 +894,7 @@ class BashBackend:
         timeout_sec: int,
         env: dict[str, str],
         shell_exe: str,
+        assembled: AssembledShellCommand | None = None,
     ) -> ExecuteResult:
         fd, cwd_file = tempfile.mkstemp(prefix="agentx_bash_cwd_", suffix=".txt")
         os.close(fd)
@@ -840,11 +903,14 @@ class BashBackend:
             command, bash_single_quoted(posix_tgt)
         )
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        if assembled is None:
+            assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        argv = assembled.spawn_argv(shell_exe, wrapped)
         _cf = self._win32_creationflags()
         try:
             if _cf:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
@@ -854,7 +920,7 @@ class BashBackend:
                 )
             else:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
@@ -869,34 +935,46 @@ class BashBackend:
                 cwd_after = read_cwd_file(cwd_file)
                 partial = stdout_bytes.decode("utf-8", errors="replace")
                 partial_stderr = stderr_bytes.decode("utf-8", errors="replace")
-                return ExecuteResult(
-                    stdout=partial,
-                    stderr=partial_stderr,
-                    exit_code=-1,
-                    interrupted=True,
-                    cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    ExecuteResult(
+                        stdout=partial,
+                        stderr=partial_stderr,
+                        exit_code=-1,
+                        interrupted=True,
+                        cwd_after=cwd_after,
+                    ),
+                    assembled,
                 )
 
             cwd_after = read_cwd_file(cwd_file)
             stdout_str = stdout_bytes.decode("utf-8", errors="replace")
             stderr_str = stderr_bytes.decode("utf-8", errors="replace")
-            return ExecuteResult(
-                stdout=stdout_str,
-                stderr=stderr_str,
-                exit_code=proc.returncode,
-                interrupted=False,
-                cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout=stdout_str,
+                    stderr=stderr_str,
+                    exit_code=proc.returncode,
+                    interrupted=False,
+                    cwd_after=cwd_after,
+                ),
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                stderr="",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    stderr="",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
-                return _cwd_invalid_execute_result(cwd, exc)
+                return self._attach_assembly_meta(
+                    _cwd_invalid_execute_result(cwd, exc),
+                    assembled,
+                )
             raise
         finally:
             try:
@@ -973,7 +1051,8 @@ class BashBackend:
         fallback_cwd: str | None = None,
     ) -> ExecuteResult:
         shell_exe = self._posix_shell_executable(env)
-        command = self._preprocess_shell_command(command)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        command = assembled.command_string
         effective_cwd, reset_prefix = _prepare_spawn_cwd(cwd, fallback=fallback_cwd)
         if effective_cwd is None:
             msg = reset_prefix.strip() or "Shell cwd invalid and no valid fallback"
@@ -983,6 +1062,10 @@ class BashBackend:
                 interrupted=False,
                 stderr=msg + "\n",
                 cwd_warning=msg,
+                command_before=assembled.preprocess.before,
+                command_after=assembled.command_string,
+                shell_snapshot_path=assembled.snapshot_path,
+                shell_login_flag=assembled.use_login_shell,
             )
         read_fd = -1
         write_fd = -1
@@ -994,16 +1077,16 @@ class BashBackend:
                     timeout_sec=timeout_sec,
                     env=env,
                     shell_exe=shell_exe,
+                    assembled=assembled,
                 )
                 return _merge_reset_into_result(result, reset_prefix)
 
             read_fd, write_fd = os.pipe()
             wrapped = BashCwdReporter.wrap_with_fd3(command, write_fd)
+            argv = assembled.spawn_argv(shell_exe, wrapped)
 
             proc = await asyncio.create_subprocess_exec(
-                shell_exe,
-                "-c",
-                wrapped,
+                *argv,
                 stdin=asyncio.subprocess.DEVNULL,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
@@ -1025,15 +1108,18 @@ class BashBackend:
                 cwd_after = _read_fd_safe(read_fd)
                 os.close(read_fd)
                 read_fd = -1
-                return _merge_reset_into_result(
-                    ExecuteResult(
-                        stdout="",
-                        stderr="",
-                        exit_code=-1,
-                        interrupted=True,
-                        cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    _merge_reset_into_result(
+                        ExecuteResult(
+                            stdout="",
+                            stderr="",
+                            exit_code=-1,
+                            interrupted=True,
+                            cwd_after=cwd_after,
+                        ),
+                        reset_prefix,
                     ),
-                    reset_prefix,
+                    assembled,
                 )
 
             cwd_after = _read_fd_safe(read_fd)
@@ -1042,26 +1128,35 @@ class BashBackend:
 
             stdout_str = (stdout_bytes or b"").decode("utf-8", errors="replace")
             stderr_str = (stderr_bytes or b"").decode("utf-8", errors="replace")
-            return _merge_reset_into_result(
-                ExecuteResult(
-                    stdout=stdout_str,
-                    stderr=stderr_str,
-                    exit_code=proc.returncode or 0,
-                    interrupted=False,
-                    cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                _merge_reset_into_result(
+                    ExecuteResult(
+                        stdout=stdout_str,
+                        stderr=stderr_str,
+                        exit_code=proc.returncode or 0,
+                        interrupted=False,
+                        cwd_after=cwd_after,
+                    ),
+                    reset_prefix,
                 ),
-                reset_prefix,
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                stderr="",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    stderr="",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
-                return _cwd_invalid_execute_result(effective_cwd or cwd, exc)
+                return self._attach_assembly_meta(
+                    _cwd_invalid_execute_result(effective_cwd or cwd, exc),
+                    assembled,
+                )
             raise
         finally:
             if write_fd != -1:
@@ -1083,6 +1178,7 @@ class BashBackend:
         timeout_sec: int,
         env: dict[str, str],
         shell_exe: str,
+        assembled: AssembledShellCommand | None = None,
     ) -> ExecuteResult:
         fd, cwd_file = tempfile.mkstemp(prefix="agentx_bash_cwd_", suffix=".txt")
         os.close(fd)
@@ -1091,13 +1187,14 @@ class BashBackend:
             command, bash_single_quoted(posix_tgt)
         )
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        if assembled is None:
+            assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        argv = assembled.spawn_argv(shell_exe, wrapped)
         _cf = self._win32_creationflags()
         try:
             if _cf:
                 proc = await asyncio.create_subprocess_exec(
-                    shell_exe,
-                    "-c",
-                    wrapped,
+                    *argv,
                     stdin=asyncio.subprocess.DEVNULL,
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.PIPE,
@@ -1107,9 +1204,7 @@ class BashBackend:
                 )
             else:
                 proc = await asyncio.create_subprocess_exec(
-                    shell_exe,
-                    "-c",
-                    wrapped,
+                    *argv,
                     stdin=asyncio.subprocess.DEVNULL,
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.PIPE,
@@ -1125,30 +1220,39 @@ class BashBackend:
                 proc.kill()
                 await proc.wait()
                 cwd_after = read_cwd_file(cwd_file)
-                return ExecuteResult(
-                    stdout="",
-                    stderr="",
-                    exit_code=-1,
-                    interrupted=True,
-                    cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    ExecuteResult(
+                        stdout="",
+                        stderr="",
+                        exit_code=-1,
+                        interrupted=True,
+                        cwd_after=cwd_after,
+                    ),
+                    assembled,
                 )
 
             cwd_after = read_cwd_file(cwd_file)
             stdout_str = (stdout_bytes or b"").decode("utf-8", errors="replace")
             stderr_str = (stderr_bytes or b"").decode("utf-8", errors="replace")
-            return ExecuteResult(
-                stdout=stdout_str,
-                stderr=stderr_str,
-                exit_code=proc.returncode or 0,
-                interrupted=False,
-                cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout=stdout_str,
+                    stderr=stderr_str,
+                    exit_code=proc.returncode or 0,
+                    interrupted=False,
+                    cwd_after=cwd_after,
+                ),
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                stderr="",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    stderr="",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
@@ -1281,7 +1385,9 @@ class BashBackend:
                 )
                 return
             stream_env = self._sandbox_stream_env(request)
-            wrapped = self._build_stream_wrapper(self._preprocess_shell_command(command))
+            shell_exe = self._posix_shell_executable(stream_env)
+            assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+            wrapped = self._build_stream_wrapper(assembled.command_string)
             yield from self._stream_execute_raw_iter(
                 wrapped_command=wrapped,
                 cwd=effective_cwd,
@@ -1289,10 +1395,13 @@ class BashBackend:
                 env=stream_env,
                 cancel_event=cancel_event,
                 fallback_cwd=fallback_cwd,
+                assembled=assembled,
             )
             return
 
-        wrapped = self._build_stream_wrapper(self._preprocess_shell_command(command))
+        shell_exe = self._posix_shell_executable(effective_env)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        wrapped = self._build_stream_wrapper(assembled.command_string)
         yield from self._stream_execute_raw_iter(
             wrapped_command=wrapped,
             cwd=cwd,
@@ -1300,6 +1409,7 @@ class BashBackend:
             env=effective_env,
             cancel_event=cancel_event,
             fallback_cwd=fallback_cwd,
+            assembled=assembled,
         )
 
     @staticmethod
@@ -1325,10 +1435,16 @@ class BashBackend:
         env: dict[str, str],
         cancel_event: threading.Event | None,
         fallback_cwd: str | None = None,
+        assembled: AssembledShellCommand | None = None,
     ) -> Iterator[BashStreamEvent]:
         marker = "__AGENTX_STREAM_CWD__"
         shell_exe = self._posix_shell_executable(env)
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        if assembled is None:
+            assembled = self._assemble_shell_command(
+                wrapped_command, shell_exe=shell_exe
+            )
+        argv = assembled.spawn_argv(shell_exe, wrapped_command)
         effective_cwd, reset_prefix = _prepare_spawn_cwd(cwd, fallback=fallback_cwd)
         # effective_cwd is None 有两种情况：
         # 1. reset_prefix 为空：用户未指定 cwd，使用当前进程工作目录（有效）
@@ -1348,7 +1464,7 @@ class BashBackend:
         try:
             if _cf:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped_command],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.STDOUT,
@@ -1360,7 +1476,7 @@ class BashBackend:
                 )
             else:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped_command],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.STDOUT,
@@ -1553,7 +1669,9 @@ class BashBackend:
         output_file = open(output_path, "wb")  # noqa: WPS515
         exit_code_path = os.path.join(task_dir, "exit_code")
 
-        command = self._preprocess_shell_command(command)
+        shell_exe = self._posix_shell_executable(env)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        command = assembled.command_string
         quoted_exit_code_path = shlex.quote(exit_code_path)
         wrapped = (
             "{ "
@@ -1563,12 +1681,12 @@ class BashBackend:
             "exit $__AGENTX_EC; "
             "}"
         )
-        shell_exe = self._posix_shell_executable(env)
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        argv = assembled.spawn_argv(shell_exe, wrapped)
         _cf = self._win32_creationflags()
         if _cf:
             proc = subprocess.Popen(
-                [shell_exe, "-c", wrapped],
+                argv,
                 stdin=subprocess.DEVNULL,
                 stdout=output_file,
                 stderr=subprocess.STDOUT,
@@ -1579,7 +1697,7 @@ class BashBackend:
             )
         else:
             proc = subprocess.Popen(
-                [shell_exe, "-c", wrapped],
+                argv,
                 stdin=subprocess.DEVNULL,
                 stdout=output_file,
                 stderr=subprocess.STDOUT,

langchain_agentx/tools/bash/bash_exec_assembly.py

@@ -0,0 +1,146 @@
+"""
+bash_exec_assembly.py — Bash 命令装配与 spawn argv（对齐 CC bashProvider）
+
+职责：
+    1) preprocess（nul rewrite + stdin/管道）并记录 before/after（D4）
+    2) 有快照时 ``source snap || true`` + disable extglob + 用户命令（D2 L1/L4）
+    3) ``get_spawn_args``：有可用快照 → ``[-c, cmd]``；否则 ``[-c, -l, cmd]``（对齐 CC）
+
+链路位置：
+    ``BashBackend`` 各 Popen / asyncio 路径在 cwd wrap 之前调用。
+
+CC 对照：
+    ``utils/shell/bashProvider.ts::buildExecCommand`` / ``getSpawnArgs``
+"""
+
+from __future__ import annotations
+
+import os
+from dataclasses import dataclass
+
+from .cwd_reporter import bash_single_quoted
+from .shell_quoting import append_stdin_redirect
+from .shell_snapshot import ShellSnapshotService
+from .windows_shell_quoting import rewrite_windows_null_redirect
+
+
+@dataclass(frozen=True)
+class PreprocessObservation:
+    """D4：preprocess 前后快照。"""
+
+    before: str
+    after: str
+
+    @property
+    def changed(self) -> bool:
+        return self.before != self.after
+
+
+@dataclass(frozen=True)
+class AssembledShellCommand:
+    """装配结果：进入 cwd wrap / Popen 前的命令与 spawn 策略。"""
+
+    original_command: str
+    preprocessed_command: str
+    command_string: str
+    snapshot_path: str | None
+    use_login_shell: bool
+    preprocess: PreprocessObservation
+
+    def spawn_argv(self, shell_exe: str, wrapped_command: str) -> list[str]:
+        """对齐 CC ``getSpawnArgs``：``['-c', ...]`` 或 ``['-c', '-l', ...]``。"""
+        if self.use_login_shell:
+            return [shell_exe, "-c", "-l", wrapped_command]
+        return [shell_exe, "-c", wrapped_command]
+
+    def observability_dict(self) -> dict[str, object]:
+        return {
+            "command_before": self.preprocess.before,
+            "command_after": self.preprocess.after,
+            "command_rewritten": self.preprocess.changed,
+            "assembled_command": self.command_string,
+            "shell_snapshot_path": self.snapshot_path,
+            "shell_login_flag": self.use_login_shell,
+        }
+
+
+def disable_extglob_command(shell_path: str) -> str | None:
+    """对齐 CC ``getDisableExtglobCommand``（无 SHELL_PREFIX 双写分支）。"""
+    base = os.path.basename(shell_path).lower()
+    if "bash" in base:
+        return "shopt -u extglob 2>/dev/null || true"
+    if "zsh" in base:
+        return "setopt NO_EXTENDED_GLOB 2>/dev/null || true"
+    return None
+
+
+def preprocess_shell_command(command: str) -> PreprocessObservation:
+    after = append_stdin_redirect(rewrite_windows_null_redirect(command))
+    return PreprocessObservation(before=command, after=after)
+
+
+class BashExecAssembler:
+    """将用户命令装配为 CC 风格 source/extglob 链，并决定是否 ``-l``。"""
+
+    def __init__(
+        self,
+        *,
+        snapshot_service: ShellSnapshotService | None = None,
+        enable_snapshot: bool = True,
+        injected_snapshot_path: str | None = None,
+    ) -> None:
+        self._snapshot_service = snapshot_service or ShellSnapshotService()
+        self._enable_snapshot = enable_snapshot
+        self._injected_snapshot_path = injected_snapshot_path
+        self._cached_snapshot: str | None | object = _UNSET
+
+    def resolve_snapshot_path(self, shell_exe: str) -> str | None:
+        if self._injected_snapshot_path is not None:
+            path = self._injected_snapshot_path
+            return path if ShellSnapshotService.is_usable(path) else None
+        if not self._enable_snapshot:
+            return None
+        if self._cached_snapshot is _UNSET:
+            self._cached_snapshot = self._snapshot_service.create_and_save(shell_exe)
+        path = self._cached_snapshot if isinstance(self._cached_snapshot, str) else None
+        if not ShellSnapshotService.is_usable(path):
+            self._cached_snapshot = None
+            return None
+        return path
+
+    def assemble(self, command: str, *, shell_exe: str) -> AssembledShellCommand:
+        obs = preprocess_shell_command(command)
+        snapshot_path = self.resolve_snapshot_path(shell_exe)
+        use_login = snapshot_path is None
+        parts: list[str] = []
+        if snapshot_path is not None:
+            quoted = bash_single_quoted(snapshot_path)
+            parts.append(f"source {quoted} 2>/dev/null || true")
+        extglob = disable_extglob_command(shell_exe)
+        if extglob:
+            parts.append(extglob)
+        parts.append(obs.after)
+        command_string = " && ".join(parts)
+        return AssembledShellCommand(
+            original_command=command,
+            preprocessed_command=obs.after,
+            command_string=command_string,
+            snapshot_path=snapshot_path,
+            use_login_shell=use_login,
+            preprocess=obs,
+        )
+
+
+class _UnsetType:
+    __slots__ = ()
+
+
+_UNSET = _UnsetType()
+
+__all__ = [
+    "AssembledShellCommand",
+    "BashExecAssembler",
+    "PreprocessObservation",
+    "disable_extglob_command",
+    "preprocess_shell_command",
+]

langchain_agentx/tools/bash/shell_quoting.py

@@ -68,35 +68,51 @@ def _should_use_pipe_eval_fallback(command: str) -> bool:
 
 
 def _split_top_level_pipes(command: str) -> list[str] | None:
-    """按顶层 ``|`` 分段（不在引号内）。"""
+    """按顶层单 ``|`` 分段（不在引号内）；**不**拆 ``||`` / ``|&``（BUG-20261101-20）。"""
     parts: list[str] = []
     buf: list[str] = []
     in_single = False
     in_double = False
     escape = False
+    i = 0
+    n = len(command)
 
-    for ch in command:
+    while i < n:
+        ch = command[i]
         if escape:
             buf.append(ch)
             escape = False
+            i += 1
             continue
         if ch == "\\" and in_double:
             escape = True
             buf.append(ch)
+            i += 1
             continue
         if ch == "'" and not in_double:
             in_single = not in_single
             buf.append(ch)
+            i += 1
             continue
         if ch == '"' and not in_single:
             in_double = not in_double
             buf.append(ch)
+            i += 1
             continue
         if ch == "|" and not in_single and not in_double:
+            nxt = command[i + 1] if i + 1 < n else ""
+            # ``||`` 逻辑或、``|&`` pipe+stderr：保留为普通字符，不做管道重排分段
+            if nxt in ("|", "&"):
+                buf.append(ch)
+                buf.append(nxt)
+                i += 2
+                continue
             parts.append("".join(buf))
             buf = []
+            i += 1
             continue
         buf.append(ch)
+        i += 1
 
     if in_single or in_double:
         return None
@@ -107,6 +123,11 @@ def _split_top_level_pipes(command: str) -> list[str] | None:
     return parts
 
 
+def _has_rearrangeable_pipe(command: str) -> bool:
+    """是否存在可重排的顶层管道（排除仅含 ``||`` 的命令）。"""
+    return _split_top_level_pipes(command) is not None
+
+
 def _rearrange_pipe_command(command: str) -> str:
     """
     管道场景：``eval 'cmd1 < /dev/null | cmd2'``（redirect 在头段，不在 eval 尾）。
@@ -140,6 +161,6 @@ def append_stdin_redirect(command: str) -> str:
         or has_process_substitution(stripped)
     ):
         return command
-    if "|" in stripped:
+    if _has_rearrangeable_pipe(stripped):
         return _rearrange_pipe_command(stripped)
     return _eval_with_stdin_redirect(stripped)

langchain_agentx/tools/bash/shell_snapshot.py

@@ -0,0 +1,205 @@
+"""
+shell_snapshot.py — Bash/Zsh 环境快照（对齐 CC ShellSnapshot.ts）
+
+职责：
+    会话级导出用户 shell 配置中的 alias / shopt / PATH，写入可 source 的快照文件；
+    供后续每条 Bash 命令 ``source snapshot || true``，避免反复 ``-l`` 的 login 漂移。
+
+链路位置：
+    ``BashExecAssembler`` / ``BashBackend`` 在 spawn 前解析快照路径；
+    创建失败时返回 None → spawn 带 ``-l``（对齐 CC getSpawnArgs 回退）。
+
+CC 对照：
+    ``utils/bash/ShellSnapshot.ts::createAndSaveSnapshot``
+    ``utils/shell/bashProvider.ts``（有快照跳过 ``-l``）
+
+当前裁剪范围：
+    不移植 CC 嵌入式 rg/find/grep 影子函数；不读 sessionEnv hooks；
+    快照目录默认 ``~/.langchain_agentx/shell-snapshots``（可用环境变量覆盖）。
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+import subprocess
+import time
+import uuid
+from pathlib import Path
+
+_logger = logging.getLogger(__name__)
+
+_SNAPSHOT_TIMEOUT_SEC = 10.0
+_DEFAULT_REL = Path(".langchain_agentx") / "shell-snapshots"
+
+
+def default_snapshots_dir() -> Path:
+    override = os.environ.get("LANGCHAIN_AGENTX_SHELL_SNAPSHOT_DIR", "").strip()
+    if override:
+        return Path(os.path.expanduser(override))
+    return Path.home() / _DEFAULT_REL
+
+
+def resolve_user_config_file(shell_path: str) -> Path:
+    home = Path.home()
+    lower = os.path.basename(shell_path).lower()
+    if "zsh" in lower:
+        return home / ".zshrc"
+    if "bash" in lower:
+        return home / ".bashrc"
+    return home / ".profile"
+
+
+class ShellSnapshotService:
+    """创建并校验 shell 快照文件（进程内可复用同一路径）。"""
+
+    def __init__(
+        self,
+        *,
+        snapshots_dir: Path | None = None,
+        timeout_sec: float = _SNAPSHOT_TIMEOUT_SEC,
+    ) -> None:
+        self._snapshots_dir = snapshots_dir or default_snapshots_dir()
+        self._timeout_sec = timeout_sec
+
+    def create_and_save(self, shell_path: str) -> str | None:
+        """对齐 CC ``createAndSaveSnapshot``；失败返回 None。"""
+        if os.environ.get("LANGCHAIN_AGENTX_BASH_SKIP_SNAPSHOT", "").strip() == "1":
+            return None
+        shell_path = os.path.normpath(os.path.realpath(os.path.expanduser(shell_path)))
+        if not shell_path or not os.path.isfile(shell_path):
+            return None
+
+        try:
+            self._snapshots_dir.mkdir(parents=True, exist_ok=True)
+        except OSError as exc:
+            _logger.debug("shell snapshot dir create failed: %s", exc)
+            return None
+
+        shell_type = (
+            "zsh"
+            if "zsh" in os.path.basename(shell_path).lower()
+            else "bash"
+            if "bash" in os.path.basename(shell_path).lower()
+            else "sh"
+        )
+        stamp = int(time.time() * 1000)
+        random_id = uuid.uuid4().hex[:6]
+        snapshot_path = self._snapshots_dir / f"snapshot-{shell_type}-{stamp}-{random_id}.sh"
+        config_file = resolve_user_config_file(shell_path)
+        config_exists = config_file.is_file()
+        script = self._build_snapshot_script(
+            snapshot_path=snapshot_path,
+            config_file=config_file if config_exists else None,
+            is_zsh=shell_type == "zsh",
+        )
+        env = os.environ.copy()
+        env["SHELL"] = shell_path
+        env.setdefault("GIT_EDITOR", "true")
+        try:
+            completed = subprocess.run(
+                [shell_path, "-c", "-l", script],
+                env=env,
+                timeout=self._timeout_sec,
+                capture_output=True,
+                text=True,
+                check=False,
+            )
+        except (OSError, subprocess.TimeoutExpired) as exc:
+            _logger.debug("shell snapshot spawn failed: %s", exc)
+            self._unlink_quiet(snapshot_path)
+            return None
+
+        if completed.returncode != 0 or not snapshot_path.is_file():
+            _logger.debug(
+                "shell snapshot creation failed rc=%s stderr=%s",
+                completed.returncode,
+                (completed.stderr or "")[:300],
+            )
+            self._unlink_quiet(snapshot_path)
+            return None
+        return str(snapshot_path)
+
+    @staticmethod
+    def is_usable(path: str | None) -> bool:
+        return bool(path) and os.path.isfile(path)
+
+    @staticmethod
+    def _unlink_quiet(path: Path) -> None:
+        try:
+            path.unlink(missing_ok=True)
+        except OSError:
+            pass
+
+    @staticmethod
+    def _build_snapshot_script(
+        *,
+        snapshot_path: Path,
+        config_file: Path | None,
+        is_zsh: bool,
+    ) -> str:
+        snap = str(snapshot_path).replace("'", "'\"'\"'")
+        lines = [
+            f"SNAPSHOT_FILE='{snap}'",
+        ]
+        if config_file is not None:
+            cfg = str(config_file).replace("'", "'\"'\"'")
+            lines.append(f"source '{cfg}' < /dev/null")
+        else:
+            lines.append("# No user config file to source")
+
+        lines.extend(
+            [
+                'echo "# Snapshot file" >| "$SNAPSHOT_FILE"',
+                'echo "# Unset all aliases to avoid conflicts with functions" >> "$SNAPSHOT_FILE"',
+                'echo "unalias -a 2>/dev/null || true" >> "$SNAPSHOT_FILE"',
+            ]
+        )
+
+        if is_zsh:
+            lines.extend(
+                [
+                    'echo "# Shell Options" >> "$SNAPSHOT_FILE"',
+                    'setopt 2>/dev/null | sed "s/^/setopt /" | head -n 1000 >> "$SNAPSHOT_FILE" || true',
+                    'echo "# Aliases" >> "$SNAPSHOT_FILE"',
+                    "alias 2>/dev/null | sed 's/^alias //g' | sed 's/^/alias -- /' "
+                    '| head -n 1000 >> "$SNAPSHOT_FILE" || true',
+                ]
+            )
+        else:
+            if config_file is None:
+                lines.append(
+                    'echo "shopt -s expand_aliases" >> "$SNAPSHOT_FILE"'
+                )
+            lines.extend(
+                [
+                    'echo "# Shell Options" >> "$SNAPSHOT_FILE"',
+                    'shopt -p 2>/dev/null | head -n 1000 >> "$SNAPSHOT_FILE" || true',
+                    'set -o 2>/dev/null | grep "on" | awk \'{print "set -o " $1}\' '
+                    '| head -n 1000 >> "$SNAPSHOT_FILE" || true',
+                    'echo "shopt -s expand_aliases" >> "$SNAPSHOT_FILE"',
+                    'echo "# Aliases" >> "$SNAPSHOT_FILE"',
+                    "alias 2>/dev/null | sed 's/^alias //g' | sed 's/^/alias -- /' "
+                    '| head -n 1000 >> "$SNAPSHOT_FILE" || true',
+                ]
+            )
+
+        path_value = os.environ.get("PATH", "")
+        path_q = path_value.replace("'", "'\"'\"'")
+        lines.append(f'echo "export PATH=\'{path_q}\'" >> "$SNAPSHOT_FILE"')
+        lines.extend(
+            [
+                'if [ ! -f "$SNAPSHOT_FILE" ]; then',
+                '  echo "Error: Snapshot file was not created" >&2',
+                "  exit 1",
+                "fi",
+            ]
+        )
+        return "\n".join(lines)
+
+
+__all__ = [
+    "ShellSnapshotService",
+    "default_snapshots_dir",
+    "resolve_user_config_file",
+]

langchain_agentx/tools/bash/tool.py

@@ -818,6 +818,26 @@ class BashRuntimeTool(RuntimeTool):
             auto_backgrounded=False,
         )
         ev.add("task_state_changed", from_state="running", to_state=snapshot.task_status)
+        obs_payload = finalize_observability_payload(ev.to_observability())
+        shell_obs = {
+            k: v
+            for k, v in {
+                "command_before": result.command_before,
+                "command_after": result.command_after,
+                "shell_snapshot_path": result.shell_snapshot_path,
+                "shell_login_flag": result.shell_login_flag,
+                "command_rewritten": (
+                    result.command_before is not None
+                    and result.command_after is not None
+                    and result.command_before != result.command_after
+                ),
+            }.items()
+            if v is not None
+        }
+        if shell_obs:
+            merged_obs = dict(obs_payload or {})
+            merged_obs["shell_assembly"] = shell_obs
+            obs_payload = merged_obs
         return BashToolOutput(
             stdout=stdout_text,
             stderr=result.stderr,
@@ -838,7 +858,7 @@ class BashRuntimeTool(RuntimeTool):
             cwd_commit_allowed=cwd_commit_allowed,
             overflow_file=overflow_file,
             output_truncated=output_truncated,
-            observability=finalize_observability_payload(ev.to_observability()),
+            observability=obs_payload,
         )
 
     def collect_side_effects(

{langchain_agentx_python-2.4.5.dist-info → langchain_agentx_python-2.4.7.dist-info}/METADATA

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

{langchain_agentx_python-2.4.5.dist-info → langchain_agentx_python-2.4.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-langchain_agentx/__init__.py,sha256=pZsAuwiCt4PE3SIZy-8M2i69KqjY9ZHafj9Y8CUjpmA,2014
+langchain_agentx/__init__.py,sha256=N_Fs7Pkm2H6v6bByXzym_2aQuA4Ef7x0K2Sd2IN-5Ho,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
@@ -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
@@ -588,7 +588,8 @@ langchain_agentx/tools/ask_user_question/validators.py,sha256=Uc88cBzqUp0PNG_Jf2
 langchain_agentx/tools/bash/__init__.py,sha256=molPHFDylE2wWG_aQx7fb0ciAx3wWpdXzIixTZV5ne4,214
 langchain_agentx/tools/bash/ast_security.py,sha256=vMP1lAi2bHrsHojun64eu1-Ym8hGW00dSVe3PexbVxc,22999
 langchain_agentx/tools/bash/auto_mode_adapter.py,sha256=7-yb_kGmpytBYkD2Hn5YWPIceo_YN4PatEKj8O7HKsM,4243
-langchain_agentx/tools/bash/backend.py,sha256=E0DMBAENZLUSLvuEh6RubNJ6iCVnx1d2VGsQzVuLA5k,65361
+langchain_agentx/tools/bash/backend.py,sha256=aqLNdaBkD66c7jMPgguBLr9JYkCb5fsxsOBLGFbdjlk,70285
+langchain_agentx/tools/bash/bash_exec_assembly.py,sha256=Rb1spjxVZ_-H4D5zOdTiPY8d7cwTRYAs2nTi-zW8zuA,5023
 langchain_agentx/tools/bash/bash_hardening.py,sha256=KEYKRC7kS_to4mzXuChvCmOIIb4dSUkOb9K1MBDtWDc,29296
 langchain_agentx/tools/bash/bash_registry_content.py,sha256=YHE3PwuLBeFrEux4xNaDZjJpYtUSMFPLYr6A7g-fFxk,3569
 langchain_agentx/tools/bash/bash_runtime_contract.py,sha256=s8vrvMl7405KLGw2hPFbzlzWohm5JX3c9cImMBgqh8I,1511
@@ -615,10 +616,11 @@ langchain_agentx/tools/bash/sed_validation.py,sha256=HA-zWe8Wo4LbgC9x8ZMQLzkd73i
 langchain_agentx/tools/bash/semantic_matrix.py,sha256=stvsudu8mGjS1JJCawMAUKabt-7co90Q8qZgi063QSw,3285
 langchain_agentx/tools/bash/semantics.py,sha256=pkf4URTulAOVL7m04Rq9JJF7z0J2mTEsGWrjyoY9r6o,5769
 langchain_agentx/tools/bash/shell_locator.py,sha256=AUnCZS8gmZurCs8rL4y0MMOS9UZimfg5rQ5At38mZKU,6296
-langchain_agentx/tools/bash/shell_quoting.py,sha256=K4JLVGwU8VpdQzfQB1o3xsq4HoCKHew1pry8hHChcoA,4498
+langchain_agentx/tools/bash/shell_quoting.py,sha256=qh5hl9rgjdhOijkM_MHdodqkj5VuCy68DzIA8zS2Qxw,5223
 langchain_agentx/tools/bash/shell_rule_matching.py,sha256=uYEKg2C5M1r0eh3L4b5NCML1Gj2UBdIXeL_u2A6_RyM,3981
+langchain_agentx/tools/bash/shell_snapshot.py,sha256=Fxj8natFh0vuOapl3Gy3XIL2UdDKK-8G3CCvn0RKGFg,7181
 langchain_agentx/tools/bash/task_runtime.py,sha256=hikVC9YugtvpLf4nDaPlX_GFem1YQvDRwN0ShRflUYU,3568
-langchain_agentx/tools/bash/tool.py,sha256=O8wDLMsPM9ryx_BfKo_SaGtlyRb7UyUxDAmOEgUgIek,46699
+langchain_agentx/tools/bash/tool.py,sha256=XNxdyG0ayxrIdvUZdV_dv46UC_48uOnlB1QN2-wdb4w,47499
 langchain_agentx/tools/bash/windows_shell_quoting.py,sha256=0RzLnTKyFrJ536QzqPZvSyUcQWN794XRlAq2RdHeKHo,1615
 langchain_agentx/tools/edit/__init__.py,sha256=PiiOHUODUzTRQxxPdE7ZMTjd3vfdzm9LEcn1lpVtg8o,203
 langchain_agentx/tools/edit/backend.py,sha256=JrikYafZDGMQ2JjXRxbnv1VSHVGRUdLmZN__nnqkM9o,3159
@@ -839,8 +841,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.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-langchain_agentx_python-2.4.5.dist-info/METADATA,sha256=aK5l6-y3n1a8k25zAxJ8vlWQYMaMDiCH8ReZj9Faka8,23971
-langchain_agentx_python-2.4.5.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-langchain_agentx_python-2.4.5.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
-langchain_agentx_python-2.4.5.dist-info/RECORD,,
+langchain_agentx_python-2.4.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+langchain_agentx_python-2.4.7.dist-info/METADATA,sha256=rvN_Qn80V-J-HbrRDQBQHw3GdjhEvDO6szODBFZXHhY,23971
+langchain_agentx_python-2.4.7.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+langchain_agentx_python-2.4.7.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
+langchain_agentx_python-2.4.7.dist-info/RECORD,,