langchain-agentx-python 2.2.9__tar.gz → 2.3.0__tar.gz

{langchain-agentx-python-2.2.9/langchain_agentx_python.egg-info → langchain-agentx-python-2.3.0}/PKG-INFO

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

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx/__init__.py

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

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx/tool_runtime/inner_permission_chain.py

@@ -209,12 +209,13 @@ class InnerPermissionChain:
             command = data.get("command")
             if not isinstance(command, str) or not command.strip():
                 return None
-            deny_result = matcher.match_deny(tool_name, command)
-            if deny_result is not None:
-                return deny_result
-            ask_result = matcher.match_ask(tool_name, command)
-            if ask_result is not None:
-                return ask_result
+            from langchain_agentx.tools.bash.bash_registry_content import (
+                evaluate_bash_inner_content_rules,
+            )
+
+            content_decision = evaluate_bash_inner_content_rules(command, registry)
+            if content_decision is not None:
+                return content_decision
             return None
 
         path = self._engine._extract_path(data)

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx/tool_runtime/permission_rules.py

@@ -127,6 +127,15 @@ def _content_rule_matches_target(
             target=target,
             rule_content=rule_content,
         )
+    if tool_name == "Skill":
+        from langchain_agentx.tools.skill.registry_permission import (
+            skill_rule_content_matches,
+        )
+
+        return skill_rule_content_matches(
+            skill_name=target,
+            rule_content=rule_content,
+        )
     return fnmatch.fnmatch(target, rule_content)
 
 

langchain-agentx-python-2.3.0/langchain_agentx/tools/bash/bash_registry_content.py

@@ -0,0 +1,106 @@
+"""
+tools/bash/bash_registry_content.py — Bash cliArg 内容 deny/ask（compound 段级 · Phase D）
+
+职责：
+    Inner 段 1 对 Bash 按 AST permission_segments 评估内容级 deny/ask（对齐 CC compound 子命令优先 deny）。
+
+链路位置：
+    InnerPermissionChain._segment_1_2_global（Bash 分支）。
+"""
+
+from __future__ import annotations
+
+from langchain_agentx.tool_runtime.models import AuthorizationDecision
+from langchain_agentx.tool_runtime.permission_rule_matcher import (
+    RegistryPermissionMatcher,
+    _decision_from_legacy_glob,
+    _decision_from_rule,
+)
+from langchain_agentx.tool_runtime.permission_rules import (
+    PermissionRuleBehavior,
+    PermissionRuleRegistry,
+)
+from langchain_agentx.tools.bash.shell_rule_matching import match_shell_permission_rule
+
+
+def bash_permission_segments(command: str) -> list[str]:
+    from langchain_agentx.tools.bash.ast_security import BashAstAnalyzer
+
+    analysis = BashAstAnalyzer().analyze(command)
+    segments = [s.strip() for s in analysis.permission_segments if s and s.strip()]
+    return segments or [command.strip()]
+
+
+def _segment_content_decision(
+    segment: str,
+    registry: PermissionRuleRegistry,
+    behavior: PermissionRuleBehavior,
+) -> AuthorizationDecision | None:
+    matcher = RegistryPermissionMatcher(registry)
+    if behavior is PermissionRuleBehavior.DENY:
+        direct = matcher.match_deny("Bash", segment)
+    else:
+        direct = matcher.match_ask("Bash", segment)
+    if direct is not None:
+        return direct
+
+    legacy = registry.find_legacy_glob_match(segment, behavior)
+    if legacy is not None:
+        return _decision_from_legacy_glob(legacy, behavior=behavior.value)
+
+    for rule in registry.iter_rules(behavior):
+        if rule.tool_name != "Bash" or not rule.rule_content:
+            continue
+        if match_shell_permission_rule(rule.rule_content, segment, match_mode="prefix"):
+            return _decision_from_rule(rule, behavior=behavior.value)
+    return None
+
+
+def evaluate_bash_inner_content_rules(
+    command: str,
+    registry: PermissionRuleRegistry,
+) -> AuthorizationDecision | None:
+    """CC compound：段级 deny 优先 → full deny/ask → 段级 ask。"""
+    cmd = command.strip()
+    if not cmd:
+        return None
+
+    matcher = RegistryPermissionMatcher(registry)
+    full_deny = matcher.match_deny("Bash", cmd)
+    if full_deny is not None:
+        return full_deny
+
+    segments = bash_permission_segments(cmd)
+    if len(segments) > 1:
+        for segment in segments:
+            seg_deny = _segment_content_decision(
+                segment, registry, PermissionRuleBehavior.DENY
+            )
+            if seg_deny is not None:
+                return seg_deny
+
+    full_ask = matcher.match_ask("Bash", cmd)
+    if full_ask is not None:
+        return full_ask
+
+    if len(segments) > 1:
+        first_ask: AuthorizationDecision | None = None
+        for segment in segments:
+            seg_ask = _segment_content_decision(
+                segment, registry, PermissionRuleBehavior.ASK
+            )
+            if seg_ask is not None and first_ask is None:
+                first_ask = seg_ask
+        if first_ask is not None:
+            return first_ask
+
+    if len(segments) == 1:
+        return _segment_content_decision(
+            segments[0], registry, PermissionRuleBehavior.DENY
+        ) or _segment_content_decision(
+            segments[0], registry, PermissionRuleBehavior.ASK
+        )
+    return None
+
+
+__all__ = ["bash_permission_segments", "evaluate_bash_inner_content_rules"]

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx/tools/bash/command_allow_rules.py

@@ -10,9 +10,10 @@ tools/bash/command_allow_rules.py — Bash 内容级 allow 匹配（slash comman
 
 from __future__ import annotations
 
-import fnmatch
 from typing import TYPE_CHECKING
 
+from langchain_agentx.tools.bash.shell_rule_matching import match_shell_permission_rule
+
 from langchain_agentx.tool_runtime.models import AuthorizationDecision, ToolExecutionContext
 from langchain_agentx.tool_runtime.permission_context import get_command_bash_allow_rules
 from langchain_agentx.tool_runtime.permission_rule_matcher import RegistryPermissionMatcher
@@ -28,22 +29,17 @@ if TYPE_CHECKING:
 
 
 def bash_command_matches_allow_rule(command: str, rule_content: str) -> bool:
-    """CC prefix:* 与简单 fnmatch 子集。"""
+    """CC shellRuleMatching（prefix / wildcard / exact）。"""
     cmd = command.strip()
     pattern = rule_content.strip()
     if not cmd or not pattern:
         return False
-
-    if pattern.endswith(":*"):
-        prefix = pattern[:-2].rstrip()
-        if not prefix:
-            return False
-        return cmd == prefix or cmd.startswith(f"{prefix} ")
-
-    if "*" in pattern or "?" in pattern or "[" in pattern:
-        return fnmatch.fnmatch(cmd, pattern)
-
-    return cmd == pattern or cmd.startswith(f"{pattern} ")
+    return match_shell_permission_rule(
+        pattern,
+        cmd,
+        match_mode="prefix",
+        is_compound=False,
+    )
 
 
 def try_command_allow_decision(
@@ -99,6 +95,51 @@ def try_registry_bash_content_allow_decision(
     return matcher.match_allow("Bash", command.strip())
 
 
+def registry_has_cliarg_bash_allow(registry: PermissionRuleRegistry) -> bool:
+    for rule in registry.iter_rules(PermissionRuleBehavior.ALLOW):
+        if rule.source_name == "cliArg" and rule.tool_name == "Bash":
+            return True
+    return False
+
+
+def promote_unscoped_bash_passthrough_to_ask(
+    decision: AuthorizationDecision,
+    *,
+    command: str,
+    ctx: ToolExecutionContext,
+    policy_engine: DefaultPolicyEngine | None,
+) -> AuthorizationDecision:
+    """无 cliArg Bash allow 时，write_roots 静默 allow → ask（对齐 CC passthrough）。"""
+    if policy_engine is None or decision.behavior != "allow":
+        return decision
+    if _READ_ONLY_CLASSIFIER.classify(
+        command.strip(),
+        shell_ops_already_resolved=True,
+    ).is_read_only:
+        return decision
+    if decision.policy_id != "write_roots":
+        return decision
+    registry = build_permission_rule_registry(
+        policy_config=policy_engine._config,
+        session_store=ctx.session_store,
+        workspace_root=ctx.workspace_root,
+        agent_home_segment=ctx.agent_home_segment,
+    )
+    if registry_has_cliarg_bash_allow(registry):
+        return decision
+    if cliarg_bash_has_content_allow_without_bare_tool(registry):
+        return decision
+    return AuthorizationDecision(
+        behavior="ask",
+        message=decision.message,
+        policy_id="bash_passthrough",
+        ask_prompt=(
+            decision.ask_prompt
+            or f"Allow Bash command?\n{command.strip()}"
+        ),
+    )
+
+
 def promote_unmatched_cliarg_content_only_allow_to_ask(
     decision: AuthorizationDecision,
     *,

langchain-agentx-python-2.3.0/langchain_agentx/tools/bash/shell_rule_matching.py

@@ -0,0 +1,143 @@
+"""
+tools/bash/shell_rule_matching.py — CC shellRuleMatching.ts 对齐（Phase D）
+
+职责：
+    prefix :*、wildcard（含 \\* / \\\\ 转义）、``git *`` 尾 wildcard 可选参数语义。
+
+链路位置：
+    command_allow_rules.bash_command_matches_permission_rule。
+"""
+
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass
+from typing import Literal
+
+_ESCAPED_STAR = "\x00ESCAPED_STAR\x00"
+_ESCAPED_BACKSLASH = "\x00ESCAPED_BACKSLASH\x00"
+
+
+def permission_rule_extract_prefix(permission_rule: str) -> str | None:
+    m = re.match(r"^(.+):\*$", permission_rule.strip())
+    return m.group(1) if m else None
+
+
+def has_wildcards(pattern: str) -> bool:
+    text = pattern.strip()
+    if text.endswith(":*"):
+        return False
+    i = 0
+    while i < len(text):
+        if text[i] == "*":
+            backslashes = 0
+            j = i - 1
+            while j >= 0 and text[j] == "\\":
+                backslashes += 1
+                j -= 1
+            if backslashes % 2 == 0:
+                return True
+        i += 1
+    return False
+
+
+def match_wildcard_pattern(
+    pattern: str,
+    command: str,
+    *,
+    case_insensitive: bool = False,
+) -> bool:
+    """对齐 CC ``matchWildcardPattern``（含 trailing `` *`` → optional args）。"""
+    trimmed = pattern.strip()
+    processed = ""
+    i = 0
+    while i < len(trimmed):
+        ch = trimmed[i]
+        if ch == "\\" and i + 1 < len(trimmed):
+            nxt = trimmed[i + 1]
+            if nxt == "*":
+                processed += _ESCAPED_STAR
+                i += 2
+                continue
+            if nxt == "\\":
+                processed += _ESCAPED_BACKSLASH
+                i += 2
+                continue
+        processed += ch
+        i += 1
+
+    escaped = re.sub(r"[.+?^${}()|\[\]\\'\"]", r"\\\g<0>", processed)
+    with_wildcards = escaped.replace("*", ".*")
+    regex_body = with_wildcards.replace(_ESCAPED_STAR, r"\*").replace(
+        _ESCAPED_BACKSLASH, r"\\"
+    )
+
+    unescaped_stars = processed.count("*")
+    if regex_body.endswith(" .*") and unescaped_stars == 1:
+        regex_body = regex_body[:-3] + "( .*)?"
+
+    flags = re.DOTALL
+    if case_insensitive:
+        flags |= re.IGNORECASE
+    return re.fullmatch(f"^{regex_body}$", command, flags=flags) is not None
+
+
+@dataclass(frozen=True)
+class ShellPermissionRule:
+    kind: Literal["exact", "prefix", "wildcard"]
+    value: str
+
+
+def parse_permission_rule(rule_content: str) -> ShellPermissionRule:
+    text = rule_content.strip()
+    prefix = permission_rule_extract_prefix(text)
+    if prefix is not None:
+        return ShellPermissionRule(kind="prefix", value=prefix)
+    if has_wildcards(text):
+        return ShellPermissionRule(kind="wildcard", value=text)
+    return ShellPermissionRule(kind="exact", value=text)
+
+
+def match_shell_permission_rule(
+    rule_content: str,
+    command: str,
+    *,
+    match_mode: Literal["exact", "prefix"] = "prefix",
+    is_compound: bool = False,
+) -> bool:
+    """单条 Bash 内容规则对单段 command 的匹配（CC ``bashPermissionRule`` 分支）。"""
+    cmd = command.strip()
+    if not cmd:
+        return False
+    parsed = parse_permission_rule(rule_content)
+
+    if parsed.kind == "exact":
+        return parsed.value == cmd
+
+    if parsed.kind == "prefix":
+        if match_mode == "exact":
+            return parsed.value == cmd
+        if is_compound:
+            return False
+        prefix = parsed.value
+        if cmd == prefix:
+            return True
+        if cmd.startswith(prefix + " "):
+            return True
+        xargs_prefix = "xargs " + prefix
+        if cmd == xargs_prefix or cmd.startswith(xargs_prefix + " "):
+            return True
+        return False
+
+    if match_mode == "exact":
+        return False
+    if is_compound:
+        return False
+    return match_wildcard_pattern(parsed.value, cmd)
+
+
+__all__ = [
+    "match_shell_permission_rule",
+    "match_wildcard_pattern",
+    "parse_permission_rule",
+]

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx/tools/bash/tool.py

@@ -1034,7 +1034,17 @@ class BashRuntimeTool(RuntimeTool):
             return decision
 
         final = self._authorize_sed_segment(command=command, ctx=ctx, cwd=cwd) or decision
-        return promote_unmatched_cliarg_content_only_allow_to_ask(
+        final = promote_unmatched_cliarg_content_only_allow_to_ask(
+            final,
+            command=command,
+            ctx=ctx,
+            policy_engine=self._policy,
+        )
+        from langchain_agentx.tools.bash.command_allow_rules import (
+            promote_unscoped_bash_passthrough_to_ask,
+        )
+
+        return promote_unscoped_bash_passthrough_to_ask(
             final,
             command=command,
             ctx=ctx,

langchain-agentx-python-2.3.0/langchain_agentx/tools/skill/registry_permission.py

@@ -0,0 +1,99 @@
+"""
+tools/skill/registry_permission.py — Skill 内容级 deny/allow（CC SkillTool.checkPermissions · Phase D）
+
+职责：
+    Skill(name) / Skill(prefix:*) 与 registry 规则匹配。
+
+链路位置：
+    SkillRuntimeTool.run_l1_permission_check（frontmatter 约束之前）。
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from langchain_agentx.tool_runtime.models import AuthorizationDecision
+from langchain_agentx.tool_runtime.permission_decision import (
+    attach_decision_reason,
+    make_other_decision_reason,
+)
+from langchain_agentx.tool_runtime.permission_rule_matcher import RegistryPermissionMatcher
+from langchain_agentx.tool_runtime.permission_rules import build_permission_rule_registry
+from langchain_agentx.tools.bash.shell_rule_matching import match_shell_permission_rule
+
+if TYPE_CHECKING:
+    from langchain_agentx.tool_runtime.models import ToolExecutionContext
+
+
+def skill_permission_rule_content(skill_name: str) -> str:
+    text = skill_name.strip()
+    if text.startswith("/"):
+        text = text[1:]
+    return text
+
+
+def skill_rule_content_matches(*, skill_name: str, rule_content: str) -> bool:
+    """对齐 CC ``ruleMatches``：精确或 ``prefix:*``。"""
+    command_name = skill_permission_rule_content(skill_name)
+    normalized_rule = rule_content.strip()
+    if normalized_rule.startswith("/"):
+        normalized_rule = normalized_rule[1:]
+    if normalized_rule == command_name:
+        return True
+    if normalized_rule.endswith(":*"):
+        prefix = normalized_rule[:-2]
+        return command_name.startswith(prefix)
+    return match_shell_permission_rule(
+        normalized_rule, command_name, match_mode="prefix"
+    )
+
+
+def evaluate_skill_registry_permission(
+    skill_name: str,
+    ctx: ToolExecutionContext,
+    policy_engine: Any,
+) -> AuthorizationDecision | None:
+    if policy_engine is None:
+        return None
+    registry = build_permission_rule_registry(
+        policy_config=policy_engine._config,
+        session_store=ctx.session_store,
+        workspace_root=ctx.workspace_root,
+        agent_home_segment=ctx.agent_home_segment,
+    )
+    target = skill_permission_rule_content(skill_name)
+    matcher = RegistryPermissionMatcher(registry)
+    for match_fn in (matcher.match_deny, matcher.match_ask, matcher.match_allow):
+        matched = match_fn("Skill", target)
+        if matched is not None:
+            return matched
+    return None
+
+
+def skill_default_ask_decision(skill_name: str) -> AuthorizationDecision:
+    target = skill_permission_rule_content(skill_name)
+    suggestions = (
+        {
+            "type": "addRules",
+            "destination": "localSettings",
+            "behavior": "allow",
+            "rules": [{"toolName": "Skill", "ruleContent": target}],
+        },
+    )
+    decision = AuthorizationDecision(
+        behavior="ask",
+        ask_prompt=f"Allow skill {target}?",
+        policy_id="skill_default",
+        metadata={"suggestions": suggestions},
+    )
+    return attach_decision_reason(
+        decision,
+        make_other_decision_reason("Skill default permission prompt"),
+    )
+
+
+__all__ = [
+    "evaluate_skill_registry_permission",
+    "skill_default_ask_decision",
+    "skill_rule_content_matches",
+]

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx/tools/skill/tool.py

@@ -187,6 +187,24 @@ class SkillRuntimeTool(RuntimeTool):
                 ),
             )
 
+        from langchain_agentx.tools.skill.registry_permission import (
+            evaluate_skill_registry_permission,
+        )
+
+        registry_decision = evaluate_skill_registry_permission(
+            inp.skill_name,
+            ctx,
+            self._policy,
+        )
+        if registry_decision is not None:
+            if registry_decision.behavior == "allow":
+                pass
+            else:
+                return L1PermissionResult(
+                    outcome=registry_decision.behavior,
+                    decision=registry_decision,
+                )
+
         local = self._constraint_evaluator.evaluate(cmd.frontmatter)
         if local.behavior != "allow":
             return L1PermissionResult(outcome=local.behavior, decision=local)

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx/tools/webfetch/registry_permission.py

@@ -40,8 +40,32 @@ def webfetch_permission_rule_content(url: str) -> str:
 
 
 def webfetch_rule_content_matches(*, target: str, rule_content: str) -> bool:
-    """WebFetch 内容规则：target 与 rule 均为 ``domain:host`` 或 ``input:…``。"""
-    return target.strip().lower() == rule_content.strip().lower()
+    """WebFetch 内容规则：``domain:host`` 精确或 ``domain:*.example.com`` wildcard（Phase D）。"""
+    t = target.strip().lower()
+    r = rule_content.strip().lower()
+    if t == r:
+        return True
+    if not r.startswith("domain:") or not t.startswith("domain:"):
+        return False
+    host_pattern = r[len("domain:") :]
+    host_target = t[len("domain:") :]
+    if "*" not in host_pattern and "?" not in host_pattern:
+        return False
+    from langchain_agentx.tools.bash.shell_rule_matching import match_wildcard_pattern
+
+    return match_wildcard_pattern(host_pattern, host_target)
+
+
+def webfetch_allow_suggestions(rule_content: str) -> tuple[dict[str, object], ...]:
+    """对齐 CC WebFetchTool ``buildSuggestions``（L3 ``metadata.suggestions``）。"""
+    return (
+        {
+            "type": "addRules",
+            "destination": "localSettings",
+            "behavior": "allow",
+            "rules": [{"toolName": "WebFetch", "ruleContent": rule_content}],
+        },
+    )
 
 
 def evaluate_webfetch_registry_permission(
@@ -60,6 +84,16 @@ def evaluate_webfetch_registry_permission(
     for match_fn in (matcher.match_deny, matcher.match_ask, matcher.match_allow):
         matched = match_fn("WebFetch", target)
         if matched is not None:
+            if matched.behavior == "ask":
+                meta = dict(matched.metadata or {})
+                meta.setdefault("suggestions", webfetch_allow_suggestions(target))
+                return AuthorizationDecision(
+                    behavior=matched.behavior,
+                    message=matched.message,
+                    policy_id=matched.policy_id,
+                    ask_prompt=matched.ask_prompt,
+                    metadata=meta,
+                )
             return matched
     decision = AuthorizationDecision(
         behavior="ask",
@@ -67,6 +101,7 @@ def evaluate_webfetch_registry_permission(
             "Claude requested permissions to use WebFetch, but you haven't granted it yet."
         ),
         policy_id="webfetch_default",
+        metadata={"suggestions": webfetch_allow_suggestions(target)},
     )
     return attach_decision_reason(
         decision,

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/langchain_agentx_python.egg-info/SOURCES.txt

@@ -535,6 +535,7 @@ langchain_agentx/tools/bash/ast_security.py
 langchain_agentx/tools/bash/auto_mode_adapter.py
 langchain_agentx/tools/bash/backend.py
 langchain_agentx/tools/bash/bash_hardening.py
+langchain_agentx/tools/bash/bash_registry_content.py
 langchain_agentx/tools/bash/bash_runtime_contract.py
 langchain_agentx/tools/bash/boundary_check.py
 langchain_agentx/tools/bash/command_allow_rules.py
@@ -560,6 +561,7 @@ langchain_agentx/tools/bash/semantic_matrix.py
 langchain_agentx/tools/bash/semantics.py
 langchain_agentx/tools/bash/shell_locator.py
 langchain_agentx/tools/bash/shell_quoting.py
+langchain_agentx/tools/bash/shell_rule_matching.py
 langchain_agentx/tools/bash/task_runtime.py
 langchain_agentx/tools/bash/tool.py
 langchain_agentx/tools/bash/windows_shell_quoting.py
@@ -621,6 +623,7 @@ langchain_agentx/tools/skill/paths_matcher.py
 langchain_agentx/tools/skill/plugin_loader.py
 langchain_agentx/tools/skill/policy.py
 langchain_agentx/tools/skill/prompt.py
+langchain_agentx/tools/skill/registry_permission.py
 langchain_agentx/tools/skill/repository_factory.py
 langchain_agentx/tools/skill/source_paths.py
 langchain_agentx/tools/skill/tool.py

{langchain-agentx-python-2.2.9 → langchain-agentx-python-2.3.0}/pyproject.toml

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