langchain-agentx-python 2.0.0__tar.gz → 2.0.1__tar.gz

{langchain-agentx-python-2.0.0/langchain_agentx_python.egg-info → langchain-agentx-python-2.0.1}/PKG-INFO

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

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1}/langchain_agentx/__init__.py

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

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1}/langchain_agentx/tools/bash/path_security.py

@@ -30,6 +30,26 @@ from .ast_security import BashAstAnalysis, BashWrapperStripper
 
 OperationType = Literal["read", "write", "create"]
 
+# CC pathValidation.ts GLOB_PATTERN_REGEX — read glob base-dir 校验 SSOT（非 glob.ts extractGlobBaseDirectory）
+_GLOB_PATTERN_RE = re.compile(r"[*?\[\]{}]")
+
+
+def get_glob_base_directory(path: str) -> str:
+    """从 glob pattern 提取 base 目录（对齐 CC pathValidation.ts getGlobBaseDirectory）。"""
+    match = _GLOB_PATTERN_RE.search(path)
+    if not match:
+        return path
+
+    before_glob = path[: match.start()]
+    if os.name == "nt":
+        last_sep = max(before_glob.rfind("/"), before_glob.rfind("\\"))
+    else:
+        last_sep = before_glob.rfind("/")
+    if last_sep == -1:
+        return "."
+    base = before_glob[:last_sep]
+    return base if base else "/"
+
 
 @dataclass(frozen=True)
 class BashPathTarget:
@@ -2164,6 +2184,23 @@ class BashPathSyntaxGuard:
             return True
         return False
 
+    def has_non_glob_shell_expansion(self, raw_path: str) -> bool:
+        """除 read 允许的未引号 glob 外，是否仍含需人工确认的 shell 展开语法。"""
+        stripped = raw_path.strip()
+        if not stripped:
+            return False
+
+        scanner = BashPathLexicalScanner(stripped)
+        if self._contains_parameter_like_expansion(scanner):
+            return True
+        if self._contains_unquoted_dynamic_tilde(scanner):
+            return True
+        if self._contains_unquoted_extglob(scanner):
+            return True
+        if self._contains_unquoted_brace_expansion(scanner):
+            return True
+        return False
+
     def _contains_parameter_like_expansion(self, scanner: "BashPathLexicalScanner") -> bool:
         for index, char in enumerate(scanner.text):
             if scanner.is_single(index) or scanner.is_escaped(index):
@@ -2408,34 +2445,65 @@ class BashPathSecurityAnalyzer:
                 ask_prompt=reason,
             )
 
-        syntax_reason = self._path_syntax_guard.get_manual_approval_reason(path_info)
-        if syntax_reason is not None:
-            semantic_kind = self._path_syntax_guard.get_syntax_semantic_kind(path_info)
-            metadata: dict[str, object] | None = None
-            if semantic_kind is not None:
-                metadata = {"path_syntax": {"semantic_kind": semantic_kind}}
-            return AuthorizationDecision(
-                behavior="ask",
-                message=syntax_reason,
-                policy_id="bash_path_validator",
-                ask_prompt=syntax_reason,
-                metadata=metadata,
-            )
-
         dangerous_decision = self._dangerous_path_checker.check(path_info, cwd)
         if dangerous_decision is not None:
             return dangerous_decision
 
         authorize_path = getattr(policy, "authorize_path", None)
-        if authorize_path is None:
-            return AuthorizationDecision(behavior="allow")
 
         for target in path_info.path_targets:
-            resolved_path = self._resolve_path(target.raw_path, cwd)
-            decision = authorize_path(
-                resolved_path,
-                is_write=target.operation_type in {"write", "create"},
-            )
+            raw_path = target.raw_path.strip()
+            operation_type = target.operation_type
+
+            if self._path_syntax_guard.has_non_glob_shell_expansion(raw_path):
+                if target.target_source == "redirection":
+                    reason = (
+                        "Shell expansion syntax in redirection targets requires explicit approval "
+                        "because the write path cannot be determined safely."
+                    )
+                else:
+                    reason = (
+                        "Shell expansion syntax in filesystem path arguments requires explicit approval "
+                        "because the target path cannot be determined safely."
+                    )
+                semantic_kind = self._path_syntax_guard._classify_target_semantic_kind(target)
+                metadata: dict[str, object] | None = None
+                if semantic_kind is not None:
+                    metadata = {"path_syntax": {"semantic_kind": semantic_kind}}
+                return AuthorizationDecision(
+                    behavior="ask",
+                    message=reason,
+                    policy_id="bash_path_validator",
+                    ask_prompt=reason,
+                    metadata=metadata,
+                )
+
+            if _GLOB_PATTERN_RE.search(raw_path) and operation_type in {"write", "create"}:
+                reason = (
+                    "Glob patterns are not allowed in write operations. "
+                    "Please specify an exact file path."
+                )
+                return AuthorizationDecision(
+                    behavior="ask",
+                    message=reason,
+                    policy_id="bash_path_validator",
+                    ask_prompt=reason,
+                    metadata={"path_syntax": {"semantic_kind": "wildcard"}},
+                )
+
+            if authorize_path is None:
+                continue
+
+            if _GLOB_PATTERN_RE.search(raw_path) and operation_type == "read":
+                base_path = get_glob_base_directory(raw_path)
+                resolved_path = self._resolve_path(base_path, cwd)
+                decision = authorize_path(resolved_path, is_write=False)
+            else:
+                resolved_path = self._resolve_path(raw_path, cwd)
+                decision = authorize_path(
+                    resolved_path,
+                    is_write=operation_type in {"write", "create"},
+                )
             if decision.behavior != "allow":
                 return decision
 

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1}/langchain_agentx/tools/bash/semantic_matrix.py

@@ -25,13 +25,15 @@ class BashSemanticMatrixRow:
     semantic_kind: str | None
 
 
-# CC pathValidation / bashSecurity / bashPermissions 对齐子集（L1 ask + decision_reason）
+# CC pathValidation / bashSecurity / bashPermissions 对齐子集（L1 behavior + decision_reason）
 BASH_WILDCARD_PREFIX_SEMANTIC_MATRIX: tuple[BashSemanticMatrixRow, ...] = (
-    # --- wildcard / brace / glob（path_security → bash_path_validator）---
-    BashSemanticMatrixRow("W01", "cat file*.txt", "ask", "bash_path_validator", "classifier", "wildcard"),
-    BashSemanticMatrixRow("W02", "cat file?.txt", "ask", "bash_path_validator", "classifier", "wildcard"),
-    BashSemanticMatrixRow("W03", "cat [ab].txt", "ask", "bash_path_validator", "classifier", "wildcard"),
+    # --- read glob（Phase 1：roots 内 validateGlobPattern → allow）---
+    BashSemanticMatrixRow("W01", "cat file*.txt", "allow", None, None, None),
+    BashSemanticMatrixRow("W02", "cat file?.txt", "allow", None, None, None),
+    BashSemanticMatrixRow("W03", "cat [ab].txt", "allow", None, None, None),
+    # --- brace / write glob（仍 ask；非 read glob base-dir 放行）---
     BashSemanticMatrixRow("W04", "cat src/{a,b}.txt", "ask", "bash_path_validator", "classifier", "wildcard"),
+    BashSemanticMatrixRow("W05", "touch foo*.txt", "ask", "bash_path_validator", "classifier", "wildcard"),
     # --- path expansion（$ / ~+ / ${}）---
     BashSemanticMatrixRow("E01", "cat $HOME/x", "ask", "bash_path_validator", "classifier", "path_expansion"),
     BashSemanticMatrixRow("E02", "cat ~+/file.txt", "ask", "bash_path_validator", "classifier", "path_expansion"),

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1}/langchain_agentx/tools/glob/tool.py

@@ -64,6 +64,17 @@ def _is_descendant(child: str, parent: str) -> bool:
         return False
 
 
+def _directory_listing_glob_hint(pattern: str) -> str | None:
+    """层 B：Glob 底层 rg --files 列文件不列目录名；pattern 含 ``*/`` 时提示 Agent。"""
+    if "*/" not in pattern:
+        return None
+    return (
+        "Glob lists files via ripgrep --files, not directory names. "
+        "Use pattern '**/*' with an explicit path to find files, "
+        "or Bash 'ls -d */' to list immediate subdirectory names."
+    )
+
+
 class GlobRuntimeTool(RuntimeTool):
     name: str = TOOL_NAME
     description: str = DESCRIPTION
@@ -308,11 +319,17 @@ class GlobRuntimeTool(RuntimeTool):
                     f"No files in this page (offset {result.offset}, "
                     f"{result.total_matches} total match(es))"
                 )
+            hints: list[ToolHint] | None = None
+            dir_hint = _directory_listing_glob_hint(result.pattern)
+            if dir_hint is not None and result.total_matches == 0:
+                hints = [ToolHint(message=dir_hint)]
+                meta["semantic_note"] = "glob_lists_files_not_directories"
             return ToolResultEnvelope(
                 status="ok",
                 tool_name=self.name,
                 summary=summary,
                 payload=summary,
+                hints=hints,
                 meta=meta,
             )
 

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1}/langchain_agentx/tools/grep/backend.py

@@ -60,10 +60,14 @@ def run_ripgrep_lines(
     对齐 CC ripgrep.ts：returncode 1 -> []；EAGAIN 时以 -j 1 重试一次。
     供 RipgrepBackend 与 Glob 的 rg --files 列文件共用。
 
+    SDK 补充：``subprocess cwd=search_path``。CC 隐式依赖进程 cwd≈searchDir；
+    编排布局 ``state_root≠repo`` 时须显式设 cwd，否则 Windows 上目录前缀 glob（如 ``alpha/*``）误空。
+
     若 ``cancel_event`` 非空，使用可中断子进程路径（``RgSubprocessController``），
     不再走 ``text_runner.run``（便于测试 mock 时仅覆盖无取消路径）。
     """
-    cmd = [rg_path, *args, search_path]
+    search_cwd = os.path.realpath(search_path)
+    cmd = [rg_path, *args, search_cwd]
     if cancel_event is not None:
         if cancel_event.is_set():
             raise GrepCancelledError("ripgrep cancelled before start")
@@ -72,7 +76,10 @@ def run_ripgrep_lines(
         ctrl = RgSubprocessController()
         try:
             result = ctrl.run_argv_wait_completed(
-                cmd, timeout=float(timeout), cancel_event=cancel_event
+                cmd,
+                timeout=float(timeout),
+                cancel_event=cancel_event,
+                cwd=search_cwd,
             )
         except GrepTimeoutError:
             raise
@@ -84,6 +91,7 @@ def run_ripgrep_lines(
                 cmd,
                 capture_output=True,
                 timeout=timeout,
+                cwd=search_cwd,
             )
         except subprocess.TimeoutExpired:
             raise GrepTimeoutError(f"ripgrep search timed out after {timeout}s")
@@ -312,7 +320,8 @@ class RipgrepBackend:
             multiline=multiline,
             plugin_glob_exclusions=plugin_glob_exclusions,
         )
-        cmd = [self._rg_path, *args, search_path]
+        cmd = [self._rg_path, *args, os.path.realpath(search_path)]
+        search_cwd = os.path.realpath(search_path)
         if cancel_event is not None and cancel_event.is_set():
             raise GrepCancelledError("ripgrep cancelled before start")
         try:
@@ -321,6 +330,7 @@ class RipgrepBackend:
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 text=True,
+                cwd=search_cwd,
             )
         except FileNotFoundError as e:
             raise GrepExecutionError(

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1}/langchain_agentx/tools/grep/rg_subprocess_controller.py

@@ -37,6 +37,7 @@ class RgSubprocessController:
         *,
         timeout: float,
         cancel_event: threading.Event | None,
+        cwd: str | None = None,
     ) -> subprocess.CompletedProcess[str]:
         """
         启动 ``argv``，在 ``timeout`` 秒内等待结束；若 ``cancel_event`` 被 set 则 terminate/kill。
@@ -55,6 +56,7 @@ class RgSubprocessController:
                 text=True,
                 encoding="utf-8",
                 errors="replace",
+                cwd=cwd,
             )
         except FileNotFoundError as e:
             raise GrepExecutionError(

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.0.0 → langchain-agentx-python-2.0.1}/pyproject.toml

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