langchain-agentx-python 0.1.9__tar.gz → 0.2.1__tar.gz

{langchain-agentx-python-0.1.9/langchain_agentx_python.egg-info → langchain-agentx-python-0.2.1}/PKG-INFO

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

{langchain-agentx-python-0.1.9 → langchain-agentx-python-0.2.1}/langchain_agentx/tool_runtime/adapter.py

@@ -94,10 +94,20 @@ class LangChainAdapter:
         conversation_session_id = getattr(loop_config, "conversation_session_id", None) or session_id
         workspace_root = getattr(loop_config, "workspace_root", None)
         agent_home = getattr(loop_config, "agent_home", ".langchain_agentx")
-        # cwd 优先级：loop_config.cwd > loop_config.workspace_root > get_cwd()
-        # CC 对照：getCwd() = AsyncLocalStorage.getStore() ?? getCwdState()
-        from langchain_agentx.utils.cwd import get_cwd
-        cwd = getattr(loop_config, "cwd", None) or workspace_root or get_cwd()
+        # cwd 优先级（v0.2.0）：loop_config.cwd > state_bridge cwd > workspace_root > get_cwd()
+        # state_bridge cwd 由 BashRuntimeTool.set_cwd() 维护，支持 bash cd 后其他工具自动感知
+        from langchain_agentx.utils.cwd import get_cwd as _utils_get_cwd
+        from langchain_agentx.tool_runtime.state_bridge import ToolStateBridge
+
+        cwd = getattr(loop_config, "cwd", None)
+        if not cwd and isinstance(state, dict):
+            # 尝试从 state_bridge 读取存储的 cwd（bash cd 设置的）
+            bridge_cwd_key = ToolStateBridge.CWD_KEY
+            bridge_cwd = state.get(bridge_cwd_key)
+            if isinstance(bridge_cwd, str) and bridge_cwd:
+                cwd = bridge_cwd
+        if not cwd:
+            cwd = workspace_root or _utils_get_cwd()
         trace_enabled = bool(getattr(loop_config, "trace_enabled", True))
 
         _depth_from_loop = getattr(loop_config, "agent_depth", None)

{langchain-agentx-python-0.1.9 → langchain-agentx-python-0.2.1}/langchain_agentx/tool_runtime/loader.py

@@ -103,6 +103,8 @@ class ToolRuntimeLoader:
         注册默认工具集（Read/Grep/Glob/Bash + 可选 Agent/Skill）。
 
         用于打通默认工具装配链路，避免每个调用方重复手写 register 序列。
+
+        v0.2.0 更新：自动创建共享 ToolStateBridge 并注入给需要 cwd 的工具。
         """
         from pathlib import Path
 
@@ -118,16 +120,20 @@ class ToolRuntimeLoader:
         from langchain_agentx.tool_runtime.state_bridge import ToolStateBridge
         from langchain_agentx.workspace.config import AgentWorkspaceConfig
 
-        self.register(ReadRuntimeTool())
-        self.register(WriteRuntimeTool())
-        self.register(EditRuntimeTool())
-        self.register(BatchEditRuntimeTool())
-        default_tool_state_bridge = ToolStateBridge()
         wr = Path(workspace_root).resolve()
         cfg = AgentWorkspaceConfig(workspace_root=wr, agent_home=agent_home)
         plugin_ex = PluginCacheGlobExclusions(
             cache_root=str(cfg.plugin_cache_dir.resolve()),
         )
+
+        # v0.2.0：创建共享 bridge，初始 cwd 为 workspace_root
+        # Bash cd 后，Read/Write/Edit 自动感知新路径；Glob 存储摘要到同一 state
+        shared_bridge = ToolStateBridge(initial_cwd=str(wr))
+
+        self.register(ReadRuntimeTool(state_bridge=shared_bridge))
+        self.register(WriteRuntimeTool(state_bridge=shared_bridge))
+        self.register(EditRuntimeTool(state_bridge=shared_bridge))
+        self.register(BatchEditRuntimeTool(state_bridge=shared_bridge))
         self.register(
             GrepRuntimeTool(
                 workspace_root=str(wr),
@@ -138,10 +144,10 @@ class ToolRuntimeLoader:
             GlobRuntimeTool(
                 workspace_root=str(wr),
                 plugin_cache_glob_exclusions=plugin_ex,
-                state_bridge=default_tool_state_bridge,
+                state_bridge=shared_bridge,
             )
         )
-        self.register(BashRuntimeTool())
+        self.register(BashRuntimeTool(state_bridge=shared_bridge))
         self.register(UserMessageTool())
         self.register(AskUserQuestionTool())
 

{langchain-agentx-python-0.1.9 → langchain-agentx-python-0.2.1}/langchain_agentx/tool_runtime/policy.py

@@ -45,11 +45,14 @@ import fnmatch
 import os
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from .models import AuthorizationDecision, ToolExecutionContext
 from .permission_context import get_active_auto_approved_tools
 
+if TYPE_CHECKING:
+    from langchain_agentx.workspace.capabilities import RuntimeCapabilities
+
 
 # ---------------------------------------------------------------------------
 # ToolPolicyConfig
@@ -83,6 +86,39 @@ class ToolPolicyConfig:
     read_only_mode: bool = False
     enable_builtin_deny: bool = True
 
+    def with_infrastructure_paths(
+        self,
+        capabilities: "RuntimeCapabilities",
+    ) -> "ToolPolicyConfig":
+        """追加基础设施写路径（memory_dir、sessions_dir）到 read/write_roots。
+
+        用于 workflow 场景：节点 workspace_root 与全局 agent_home_dir 不同时，
+        agent 需要写 memory/session 文件，这些路径必须在 write_roots 内。
+        """
+        home_dir = (capabilities.primary_workspace_root / capabilities.primary_agent_home).resolve()
+        defaults = capabilities.defaults
+        infra_paths = [
+            str(defaults.default_memory_dir or (home_dir / "memory")),
+            str(defaults.default_sessions_dir or (home_dir / "sessions")),
+        ]
+
+        new_read = list(self.read_roots)
+        new_write = list(self.write_roots)
+        for p in infra_paths:
+            if p not in new_read:
+                new_read.append(p)
+            if p not in new_write:
+                new_write.append(p)
+
+        return ToolPolicyConfig(
+            read_roots=new_read,
+            write_roots=new_write,
+            deny_globs=self.deny_globs,
+            ask_globs=self.ask_globs,
+            read_only_mode=self.read_only_mode,
+            enable_builtin_deny=self.enable_builtin_deny,
+        )
+
 
 # ---------------------------------------------------------------------------
 # PolicyEngine 抽象基类

{langchain-agentx-python-0.1.9 → langchain-agentx-python-0.2.1}/langchain_agentx/tool_runtime/state_bridge.py

@@ -39,6 +39,7 @@ class ToolStateBridge:
         last_read_map      — 文件最近读取记录（为 read-before-write 规则服务）
         tool_audit         — 工具调用审计日志
         last_glob_summary  — 最近一次 Glob 摘要（仅路径样本，防 state 膨胀）
+        cwd                — 当前工作目录（跨工具共享，bash cd 后 read/grep 自动感知）
 
     不承担：
         业务 workflow state
@@ -49,8 +50,17 @@ class ToolStateBridge:
     LAST_READ_MAP_KEY = "_tool_last_read_map"
     AUDIT_LOG_KEY = "_tool_audit_log"
     LAST_GLOB_SUMMARY_KEY = "_tool_last_glob_summary"
+    CWD_KEY = "_tool_cwd"
     MAX_GLOB_SAMPLE_PATHS = 32
 
+    def __init__(self, *, initial_cwd: str | None = None) -> None:
+        """初始化状态 bridge。
+
+        Args:
+            initial_cwd: 初始工作目录。None 表示使用进程当前目录（os.getcwd()）。
+        """
+        self._initial_cwd = initial_cwd
+
     # ---- last_read_map ----
 
     def get_last_read_map(self, ctx: ToolExecutionContext) -> dict[str, Any]:
@@ -205,3 +215,26 @@ class ToolStateBridge:
     def clear_last_glob_summary(self, ctx: ToolExecutionContext) -> None:
         """清除摘要（测试或显式重置会话工具态时使用）。"""
         ctx.state.pop(self.LAST_GLOB_SUMMARY_KEY, None)
+
+    # ---- cwd（跨工具共享工作目录，v0.2.0 新增）----
+
+    def get_cwd(self, ctx: ToolExecutionContext) -> str:
+        """获取当前工作目录。
+
+        优先级：
+            1. state 中已存储的 cwd（之前 cd 命令设置的）
+            2. initial_cwd（构造时传入）
+            3. os.getcwd()（进程当前目录）
+        """
+        stored = ctx.state.get(self.CWD_KEY)
+        if isinstance(stored, str) and stored:
+            return stored
+        if self._initial_cwd:
+            return self._initial_cwd
+        import os
+
+        return os.getcwd()
+
+    def set_cwd(self, ctx: ToolExecutionContext, cwd: str) -> None:
+        """设置当前工作目录（bash cd 命令后调用）。"""
+        ctx.state[self.CWD_KEY] = cwd

{langchain-agentx-python-0.1.9 → langchain-agentx-python-0.2.1}/langchain_agentx/tools/bash/tool.py

@@ -116,6 +116,10 @@ class BashRuntimeTool(RuntimeTool):
         self._security_hardener = security_hardener or BashSecurityHardener()
         self._sandbox_decider = sandbox_decider or BashSandboxDecisionEngine()
         self._result_presenter = result_presenter or BashResultPresenter()
+        # 提取 initial_cwd 用于 check_permissions 阶段（此时 ctx 不可用）
+        self._initial_cwd: str | None = None
+        if state_bridge is not None and hasattr(state_bridge, "_initial_cwd"):
+            self._initial_cwd = state_bridge._initial_cwd
 
     # ------------------------------------------------------------------
     # Hook 1: normalize_input
@@ -455,7 +459,9 @@ class BashRuntimeTool(RuntimeTool):
         # 从 state_bridge 取上次 cwd（跨调用持久化）
         cwd: str | None = None
         if self._state_bridge is not None:
-            cwd = self._state_bridge.get_cwd() if hasattr(self._state_bridge, "get_cwd") else None
+            cwd = self._state_bridge.get_cwd(ctx)
+        if not cwd:
+            cwd = os.getcwd()
 
         sandbox_decision = self._sandbox_decider.decide(
             command=command,
@@ -585,9 +591,8 @@ class BashRuntimeTool(RuntimeTool):
             self._state_bridge is not None
             and result.cwd_after is not None
             and result.cwd_after != cwd
-            and hasattr(self._state_bridge, "set_cwd")
         ):
-            self._state_bridge.set_cwd(result.cwd_after)
+            self._state_bridge.set_cwd(ctx, result.cwd_after)
 
         # 危险命令警告（非阻断）
         destructive_warning = detect_destructive_patterns(command)
@@ -851,10 +856,13 @@ class BashRuntimeTool(RuntimeTool):
         )
 
     def _get_current_cwd(self) -> str:
-        if self._state_bridge is not None and hasattr(self._state_bridge, "get_cwd"):
-            cwd = self._state_bridge.get_cwd()
-            if isinstance(cwd, str) and cwd:
-                return cwd
+        """获取当前工作目录（用于 check_permissions 阶段）。
+
+        注意：此时 ctx 不可用，因此使用初始 cwd 或 os.getcwd()。
+        实际执行时 invoke() 会用 ctx 获取最新的 cwd。
+        """
+        if self._initial_cwd:
+            return self._initial_cwd
         return os.getcwd()
 
     @staticmethod

{langchain-agentx-python-0.1.9 → langchain-agentx-python-0.2.1/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-0.1.9 → langchain-agentx-python-0.2.1}/pyproject.toml

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