langchain-agentx-cli 0.8.3__tar.gz → 0.8.4__tar.gz

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-cli
-Version: 0.8.3
+Version: 0.8.4
 Summary: Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK.
 Author: GoodMood2008
 License: Apache-2.0
@@ -63,9 +63,21 @@ agentx-code --workspace-root /path/to/project  # Specify workspace
 agentx-code --model claude-sonnet-4-20250514  # Specify model
 agentx-code --provider claude | openai        # Choose provider
 agentx-code --dangerously-skip-permissions    # Skip permission prompts (CC-aligned)
+agentx-code --allowed-tools Read Grep Glob    # Pre-approve tools (space or comma; CC --allowed-tools)
+agentx-code --disallowed-tools Bash Edit      # Block tools (space or comma; deny wins)
+agentx-code --tools Read Grep Glob            # Only these built-ins; others auto-denied (CC --tools)
+agentx-code -p "summarize README.md"          # One-shot print mode (headless)
 agentx-code --show-config                     # Print merged config
 ```
 
+**Read-only audit** (aligned with Claude Code CLI semantics):
+
+```bash
+agentx-code --permission-mode dontAsk \
+  --allowed-tools Read,Grep,Glob \
+  --disallowed-tools Bash,Edit,WebSearch,WebFetch
+```
+
 ## Input Habits (Claude Code Compatible)
 
 | Key | Action |

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/README.md

@@ -37,9 +37,21 @@ agentx-code --workspace-root /path/to/project  # Specify workspace
 agentx-code --model claude-sonnet-4-20250514  # Specify model
 agentx-code --provider claude | openai        # Choose provider
 agentx-code --dangerously-skip-permissions    # Skip permission prompts (CC-aligned)
+agentx-code --allowed-tools Read Grep Glob    # Pre-approve tools (space or comma; CC --allowed-tools)
+agentx-code --disallowed-tools Bash Edit      # Block tools (space or comma; deny wins)
+agentx-code --tools Read Grep Glob            # Only these built-ins; others auto-denied (CC --tools)
+agentx-code -p "summarize README.md"          # One-shot print mode (headless)
 agentx-code --show-config                     # Print merged config
 ```
 
+**Read-only audit** (aligned with Claude Code CLI semantics):
+
+```bash
+agentx-code --permission-mode dontAsk \
+  --allowed-tools Read,Grep,Glob \
+  --disallowed-tools Bash,Edit,WebSearch,WebFetch
+```
+
 ## Input Habits (Claude Code Compatible)
 
 | Key | Action |

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli/__init__.py

@@ -1,3 +1,3 @@
 """langchain_agentx_cli：依托 langchain_agentx_python SDK 的终端 CLI/TUI（CC Ink 迁移）。"""
 
-__version__ = "0.8.3"
+__version__ = "0.8.4"

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli/cli.py

@@ -29,6 +29,10 @@ from langchain_agentx_cli.llm_config import (
     resolve_llm_config,
     user_config_path,
 )
+from langchain_agentx_cli.permissions.cli_tool_flags import (
+    merge_cli_tool_flag_values,
+    resolve_base_tools_keep_set,
+)
 from langchain_agentx_cli.permissions.mode import normalize_permission_mode
 from langchain_agentx_cli.print_mode.prompt import PrintPromptError, resolve_print_prompt
 from langchain_agentx_cli.session_profile import non_tty_allowed_without_print
@@ -74,6 +78,9 @@ class CliEntry:
         extra_write_roots: tuple[Path, ...] = (),
         startup_check: StartupCheckMode = "quiet",
         respect_gitignore: bool | None = None,
+        allowed_tools: tuple[str, ...] = (),
+        disallowed_tools: tuple[str, ...] = (),
+        base_tools: tuple[str, ...] | None = None,
     ) -> int:
         # Mode 到 agent_home 的映射（优先级高于 --agent-home）
         if mode:
@@ -91,6 +98,9 @@ class CliEntry:
                 extra_read_roots=extra_read_roots,
                 extra_write_roots=extra_write_roots,
                 respect_gitignore_cli=respect_gitignore,
+                allowed_tools=allowed_tools,
+                disallowed_tools=disallowed_tools,
+                base_tools=base_tools,
             )
         except CliEnvironmentError as exc:
             EnvironmentChecker.emit_error(str(exc))
@@ -205,6 +215,9 @@ class CliEntry:
         extra_read_roots: tuple[Path, ...] = (),
         extra_write_roots: tuple[Path, ...] = (),
         respect_gitignore_cli: bool | None = None,
+        allowed_tools: tuple[str, ...] = (),
+        disallowed_tools: tuple[str, ...] = (),
+        base_tools: tuple[str, ...] | None = None,
     ) -> ReplLaunchConfig:
         self._checker.check_sdk_importable()
 
@@ -264,6 +277,9 @@ class CliEntry:
             write_roots=write_roots,
             enable_session_memory=resolve_enable_session_memory(None),
             respect_gitignore=resolved_respect_gitignore,
+            cli_allowed_tools=allowed_tools,
+            cli_disallowed_tools=disallowed_tools,
+            cli_base_tools=base_tools,
         )
 
     def _resolve_initial_permission_mode(
@@ -316,6 +332,33 @@ class CliEntry:
 _CONFIG_PATH = user_config_path()
 
 
+class SpaceSeparatedOption(click.Option):
+    """对齐 CC ``<tools...>``：一个 flag 吃到下一个 ``-`` 选项（未加引号的空格分隔）。"""
+
+    def add_to_parser(self, parser, ctx):  # noqa: ANN001
+        result = super().add_to_parser(parser, ctx)
+        seen: set[int] = set()
+        for name in self.opts:
+            opt_parser = parser._long_opt.get(name) or parser._short_opt.get(name)
+            if opt_parser is None or id(opt_parser) in seen:
+                continue
+            seen.add(id(opt_parser))
+            original = opt_parser.process
+
+            def process(value, state, _original=original):  # noqa: ANN001
+                values = [value]
+                while state.rargs:
+                    nxt = state.rargs[0]
+                    if nxt.startswith("-") and nxt != "-":
+                        break
+                    values.append(state.rargs.pop(0))
+                for item in values:
+                    _original(item, state)
+
+            opt_parser.process = process
+        return result
+
+
 @click.command(context_settings={"help_option_names": ["-h", "--help"]})
 @click.option(
     "--workspace-root",
@@ -405,6 +448,38 @@ _CONFIG_PATH = user_config_path()
     default=None,
     help="启动时权限模式（对齐 CC --permission-mode；auto 启用 Auto Mode）",
 )
+@click.option(
+    "--allowed-tools",
+    "--allowedTools",
+    "allowed_tools_raw",
+    cls=SpaceSeparatedOption,
+    multiple=True,
+    help=(
+        "工具白名单（对齐 CC --allowed-tools；空格或逗号分隔，可重复；"
+        "如 Bash Edit、Bash(git:*)）"
+    ),
+)
+@click.option(
+    "--disallowed-tools",
+    "--disallowedTools",
+    "disallowed_tools_raw",
+    cls=SpaceSeparatedOption,
+    multiple=True,
+    help=(
+        "工具黑名单（对齐 CC --disallowed-tools；空格或逗号分隔；"
+        "优先级高于 allowed）"
+    ),
+)
+@click.option(
+    "--tools",
+    "base_tools_raw",
+    cls=SpaceSeparatedOption,
+    multiple=True,
+    help=(
+        "可用内置工具集（对齐 CC --tools）。"
+        '"" 禁用全部；default 使用全部；否则只保留列出的工具，其余自动 deny'
+    ),
+)
 @click.option(
     "--debug",
     "-d",
@@ -473,6 +548,9 @@ def main(
     extra_read_roots: tuple[Path, ...],
     extra_write_roots: tuple[Path, ...],
     respect_gitignore: bool | None,
+    allowed_tools_raw: tuple[str, ...],
+    disallowed_tools_raw: tuple[str, ...],
+    base_tools_raw: tuple[str, ...],
     check_env: bool,
     no_check_env: bool,
     prompt_positional: str | None,
@@ -507,5 +585,8 @@ def main(
         extra_write_roots=extra_write_roots,
         startup_check=startup_check,
         respect_gitignore=respect_gitignore,
+        allowed_tools=merge_cli_tool_flag_values(allowed_tools_raw),
+        disallowed_tools=merge_cli_tool_flag_values(disallowed_tools_raw),
+        base_tools=resolve_base_tools_keep_set(base_tools_raw),
     )
     raise SystemExit(code)

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli/config.py

@@ -175,3 +175,8 @@ class ReplLaunchConfig:
     runtime_cwd: Path | None = None
     # @ 路径补全 respect .gitignore（CLI-D3；默认 true，可由 config.json / CLI flag 覆盖）
     respect_gitignore: bool = True
+    # CC --allowed-tools / --disallowed-tools（经 SDK apply_cli_permission_rules → cliArg）
+    cli_allowed_tools: tuple[str, ...] = field(default_factory=tuple)
+    cli_disallowed_tools: tuple[str, ...] = field(default_factory=tuple)
+    # CC --tools：None=未限制；()=禁用全部内置；非空=只保留这些工具
+    cli_base_tools: tuple[str, ...] | None = None

langchain-agentx-cli-0.8.4/langchain_agentx_cli/permissions/cli_tool_flags.py

@@ -0,0 +1,109 @@
+"""
+permissions/cli_tool_flags.py — argv 工具名单解析（CC parseToolListFromCLI / --tools）
+
+职责：
+    click 收集的 flag 值交给 SDK parse_tool_list_from_cli；
+    --tools 对照 CC parseBaseToolsFromCLI：未列出的内置工具并入 deny。
+
+链路位置：
+    cli.py → ReplLaunchConfig → CliPolicyConfigBuilder / CliLoaderFactory。
+"""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+from langchain_agentx.tools.registry_names import (
+    Agent,
+    AskUserQuestion,
+    Bash,
+    Edit,
+    Glob,
+    Grep,
+    Read,
+    Skill,
+    TaskCreate,
+    TaskGet,
+    TaskList,
+    TaskUpdate,
+    WebFetch,
+    WebSearch,
+    Write,
+)
+from langchain_agentx.tool_runtime.permission_cli_rules import parse_tool_list_from_cli
+
+# CliToolRegistry.register_all 会注册的工具（WebSearch 无后端时不挂载，deny 仍无害）。
+CLI_BASE_TOOL_NAMES: tuple[str, ...] = (
+    Read,
+    Write,
+    Edit,
+    Bash,
+    Grep,
+    Glob,
+    AskUserQuestion,
+    TaskList,
+    TaskCreate,
+    TaskGet,
+    TaskUpdate,
+    WebSearch,
+    WebFetch,
+    Skill,
+    Agent,
+)
+
+_LEGACY_TASK = "Task"
+
+
+def merge_cli_tool_flag_values(values: Sequence[str] | None) -> tuple[str, ...]:
+    """空输入 → 空 tuple；否则 SDK 解析（逗号/空格，括号内不切）后去重保序。"""
+    if not values:
+        return ()
+    parsed = parse_tool_list_from_cli(list(values))
+    seen: set[str] = set()
+    out: list[str] = []
+    for item in parsed:
+        if item in seen:
+            continue
+        seen.add(item)
+        out.append(item)
+    return tuple(out)
+
+
+def resolve_base_tools_keep_set(raw: Sequence[str] | None) -> tuple[str, ...] | None:
+    """对齐 CC parseBaseToolsFromCLI。
+
+    None：未传 ``--tools``，或值为 ``default``（不额外 deny）。
+    ()：传了空名单（``--tools ""``）→ 禁用全部内置工具。
+    非空：保留这些工具名（``Task`` 规范为 ``Agent``）。
+    """
+    if not raw:
+        return None
+    joined = " ".join(raw).strip()
+    if joined.lower() == "default":
+        return None
+    parsed = merge_cli_tool_flag_values(raw)
+    seen: set[str] = set()
+    out: list[str] = []
+    for item in parsed:
+        name = Agent if item == _LEGACY_TASK else item
+        if name in seen:
+            continue
+        seen.add(name)
+        out.append(name)
+    return tuple(out)
+
+
+def extra_disallowed_for_base_tools(keep: tuple[str, ...] | None) -> tuple[str, ...]:
+    """``--tools`` 未列出的内置工具名（工具级 deny，不含规则内容）。"""
+    if keep is None:
+        return ()
+    kept = {item.split("(", 1)[0] for item in keep}
+    return tuple(name for name in CLI_BASE_TOOL_NAMES if name not in kept)
+
+
+__all__ = [
+    "CLI_BASE_TOOL_NAMES",
+    "extra_disallowed_for_base_tools",
+    "merge_cli_tool_flag_values",
+    "resolve_base_tools_keep_set",
+]

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli/permissions/factory.py

@@ -63,6 +63,9 @@ class CliLoaderFactory:
         auto_mode_sink: AutoModeEventSink | None = None,
         permission_mode: str = "default",
         auto_mode_config: AutoModeConfig | None = None,
+        allowed_tools: tuple[str, ...] = (),
+        disallowed_tools: tuple[str, ...] = (),
+        base_tools: tuple[str, ...] | None = None,
     ) -> ToolRuntimeLoader:
         wr = Path(workspace_root).resolve()
         loader = self._build_loader(
@@ -76,6 +79,9 @@ class CliLoaderFactory:
             auto_mode_sink=auto_mode_sink,
             auto_mode_config=auto_mode_config,
             permission_mode=permission_mode,
+            allowed_tools=allowed_tools,
+            disallowed_tools=disallowed_tools,
+            base_tools=base_tools,
         )
         self._tool_registry_cls(
             loader,
@@ -97,6 +103,9 @@ class CliLoaderFactory:
         auto_mode_sink: AutoModeEventSink | None,
         auto_mode_config: AutoModeConfig | None = None,
         permission_mode: str = "default",
+        allowed_tools: tuple[str, ...] = (),
+        disallowed_tools: tuple[str, ...] = (),
+        base_tools: tuple[str, ...] | None = None,
     ) -> ToolRuntimeLoader:
         if skip_permissions:
             # bypass 专用：极简 headless loader（对齐 CC --dangerously-skip-permissions）。
@@ -107,6 +116,9 @@ class CliLoaderFactory:
             session_cwd=session_cwd,
             auto_mode=auto_mode_config,
             permission_mode=permission_mode,
+            allowed_tools=allowed_tools,
+            disallowed_tools=disallowed_tools,
+            base_tools=base_tools,
         )
         hook = build_auto_mode_hook(
             policy_config=cfg,

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli/permissions/policy.py

@@ -31,6 +31,7 @@ from langchain_agentx.tool_runtime.permission_decision import (
     attach_decision_reason,
     make_decision_reason,
 )
+from langchain_agentx.tool_runtime.permission_cli_rules import apply_cli_permission_rules
 from langchain_agentx.tool_runtime.policy import (
     DefaultPolicyEngine,
     PolicyEngine,
@@ -42,6 +43,7 @@ from langchain_agentx_cli.permissions.mode import (
     normalize_permission_mode,
     permission_mode_implies_read_only,
 )
+from langchain_agentx_cli.permissions.cli_tool_flags import extra_disallowed_for_base_tools
 
 # 对齐 D05 / CC：敏感路径硬拒绝（不弹窗）
 CLI_DENY_GLOBS: tuple[str, ...] = (
@@ -82,6 +84,9 @@ class CliPolicyConfigBuilder:
         session_cwd: Path | str | None = None,
         auto_mode: AutoModeConfig | None = None,
         permission_mode: str = "default",
+        allowed_tools: tuple[str, ...] = (),
+        disallowed_tools: tuple[str, ...] = (),
+        base_tools: tuple[str, ...] | None = None,
     ) -> ToolPolicyConfig:
         root = Path(workspace_root).resolve()
         effective_cwd = Path(session_cwd).resolve() if session_cwd is not None else root
@@ -112,7 +117,30 @@ class CliPolicyConfigBuilder:
             auto_mode=auto_mode if auto_mode is not None else AutoModeConfig(),
             project_memory_layout=layout,
         )
-        return base.with_project_memory_layout(layout)
+        layout_base = base.with_project_memory_layout(layout)
+        merged_disallowed = _merge_tool_names(
+            disallowed_tools,
+            extra_disallowed_for_base_tools(base_tools),
+        )
+        if not allowed_tools and not merged_disallowed:
+            return layout_base
+        return apply_cli_permission_rules(
+            layout_base,
+            allowed=allowed_tools if allowed_tools else None,
+            disallowed=merged_disallowed if merged_disallowed else None,
+        )
+
+
+def _merge_tool_names(*groups: tuple[str, ...]) -> tuple[str, ...]:
+    seen: set[str] = set()
+    out: list[str] = []
+    for group in groups:
+        for item in group:
+            if item in seen:
+                continue
+            seen.add(item)
+            out.append(item)
+    return tuple(out)
 
 
 def memory_layout_loop_roots(

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli/session_factory.py

@@ -132,6 +132,9 @@ async def open_agent_session(
         auto_mode_sink=auto_mode_sink,
         auto_mode_config=auto_mode_config,
         permission_mode=initial_mode,
+        allowed_tools=launch_config.cli_allowed_tools,
+        disallowed_tools=launch_config.cli_disallowed_tools,
+        base_tools=launch_config.cli_base_tools,
     )
 
     read_roots_tuple = tuple(str(p) for p in launch_config.read_roots) if launch_config.read_roots else ()

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-cli
-Version: 0.8.3
+Version: 0.8.4
 Summary: Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK.
 Author: GoodMood2008
 License: Apache-2.0
@@ -63,9 +63,21 @@ agentx-code --workspace-root /path/to/project  # Specify workspace
 agentx-code --model claude-sonnet-4-20250514  # Specify model
 agentx-code --provider claude | openai        # Choose provider
 agentx-code --dangerously-skip-permissions    # Skip permission prompts (CC-aligned)
+agentx-code --allowed-tools Read Grep Glob    # Pre-approve tools (space or comma; CC --allowed-tools)
+agentx-code --disallowed-tools Bash Edit      # Block tools (space or comma; deny wins)
+agentx-code --tools Read Grep Glob            # Only these built-ins; others auto-denied (CC --tools)
+agentx-code -p "summarize README.md"          # One-shot print mode (headless)
 agentx-code --show-config                     # Print merged config
 ```
 
+**Read-only audit** (aligned with Claude Code CLI semantics):
+
+```bash
+agentx-code --permission-mode dontAsk \
+  --allowed-tools Read,Grep,Glob \
+  --disallowed-tools Bash,Edit,WebSearch,WebFetch
+```
+
 ## Input Habits (Claude Code Compatible)
 
 | Key | Action |

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli.egg-info/SOURCES.txt

@@ -109,6 +109,7 @@ langchain_agentx_cli/observation/log_rotator.py
 langchain_agentx_cli/observation/observer.py
 langchain_agentx_cli/observation/session_context.py
 langchain_agentx_cli/permissions/__init__.py
+langchain_agentx_cli/permissions/cli_tool_flags.py
 langchain_agentx_cli/permissions/factory.py
 langchain_agentx_cli/permissions/grant_scope.py
 langchain_agentx_cli/permissions/mode.py

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/langchain_agentx_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-langchain-agentx-python>=2.2.7
+langchain-agentx-python>=2.3.0
 click>=8.1
 markdown-it-py>=2.0
 textual>=0.79.0

{langchain-agentx-cli-0.8.3 → langchain-agentx-cli-0.8.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "langchain-agentx-cli"
-version = "0.8.3"
+version = "0.8.4"
 description = "Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -26,7 +26,7 @@ classifiers = [
   "Topic :: Software Development",
 ]
 dependencies = [
-  "langchain-agentx-python>=2.2.7",
+  "langchain-agentx-python>=2.3.0",
   "click>=8.1",
   "markdown-it-py>=2.0",
   "textual>=0.79.0",