mindcode 0.2.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

mindcode/_version.py

@@ -1,6 +1,6 @@
 """mindcode 版本与品牌信息。"""
 
-__version__ = "0.2.0"
+__version__ = "0.3.1"
 
 __logo__ = r"""
 [bold cyan]                           _           _[/bold cyan]

mindcode/approval.py

@@ -9,12 +9,13 @@ one-shot / TUI 未启动时回退到 ``menu.prompt_yes_no``。
 from __future__ import annotations
 
 import json
+import time
 from collections.abc import Awaitable, Callable
 from typing import Any
 
 from mindagent.core import ActionRequest, AgentContext
 
-from .policy import ApprovalCallback
+from .policy import ApprovalCallback, FileAccessCallback
 
 
 def risk_label(risk: Any) -> str:
@@ -47,10 +48,7 @@ def describe_action(action: ActionRequest) -> str:
         return f"{verb} {path} [{risk_label(action.risk)}]"
     if name == "exec_command":
         command = arguments.get("command", "")
-        if isinstance(command, list):
-            preview = " ".join(_one_line(item) for item in command)
-        else:
-            preview = _one_line(command)
+        preview = _one_line(command) if isinstance(command, str) else ""
         if len(preview) > 120:
             preview = preview[:117] + "..."
         return f"Command {preview} [{risk_label(action.risk)}]"
@@ -103,3 +101,30 @@ def make_shell_approval(
         )
 
     return _approve
+
+
+def make_shell_file_access_approval(
+    get_chooser: Callable[[], Chooser | None],
+) -> FileAccessCallback:
+    """Ask for a precise, single-call external read using a bound decision."""
+    from mindagent.core import ExternalFileReadDecision
+
+    async def approve(context, request):
+        title = (
+            "允许读取 workspace 外部文件？\n"
+            f"精确文件：{request.path}\n"
+            "权限：只读；范围：仅此次工具调用（一次），不扩大 workspace。\n"
+            f"有效期：剩余 {max(0, int(request.expires_at - time.time()))} 秒，过期需重新请求。"
+        )
+        chooser = get_chooser()
+        if chooser is not None:
+            result = await chooser(
+                title, [("allow", "允许此次只读访问"), ("deny", "拒绝")], "deny",
+            )
+            approved = result == "allow"
+        else:
+            from .cli.shell.menu import prompt_yes_no
+            approved = await prompt_yes_no(title, default_yes=False)
+        return ExternalFileReadDecision(request_id=request.request_id, approved=approved)
+
+    return approve

mindcode/bench/adapters/terminal_bench.py

@@ -4,8 +4,6 @@ import json
 from pathlib import Path
 from typing import Any
 
-import yaml
-
 from ..paths import DEFAULT_TERMINAL_BENCH_ROOT
 from ..schema import BenchmarkCase, BenchmarkFile
 from ..scorers.base import Scorer
@@ -52,6 +50,12 @@ def _case_from_json(raw: dict[str, Any]) -> BenchmarkCase:
 
 
 def _case_from_task_dir(task_dir: Path) -> BenchmarkCase:
+    try:
+        import yaml
+    except ImportError as exc:
+        raise RuntimeError(
+            "terminal_bench 需要 pyyaml，请先 pip install pyyaml"
+        ) from exc
     task = yaml.safe_load((task_dir / "task.yaml").read_text(encoding="utf-8"))
     files = tuple(_iter_visible_files(task_dir))
     instruction = str(task["instruction"])

mindcode/cli/__init__.py

@@ -4,7 +4,7 @@
     cli/__init__.py           typer app + 命令注册
     cli/_shared.py            共享 console + find_config_file
     cli/commands/
-        shell.py              `mindcode shell`（默认子命令）
+        shell.py              顶层 `mindcode` 默认入口 handler
         chat.py               `mindcode chat -m "..."`
         task.py               `mindcode task run/list/status/tail`
         status.py             `mindcode status`
@@ -20,12 +20,12 @@
 from __future__ import annotations
 
 import typer
+from click import UsageError
 
 from .._version import __version__
 from ._shared import console
 
-KNOWN_SUBCOMMANDS = {
-    "shell",
+PUBLIC_SUBCOMMANDS = {
     "chat",
     "status",
     "config",
@@ -37,21 +37,25 @@ KNOWN_SUBCOMMANDS = {
 
 
 class DefaultShellGroup(typer.core.TyperGroup):
-    """让 `mindcode`（不带子命令）默认进 shell。
+    """让顶层 `mindcode` 直接复用内部 Shell 参数解析。
 
-    当第一个非 flag 参数不是已知子命令时，把 "shell" 注入到 args 前面，
-    让 click 走完整的参数解析路径。
+    公开子命令保持原分派；其他参数注入隐藏的 ``shell`` handler。
     """
 
     def parse_args(self, ctx, args):
         if args:
             first = args[0]
+            if first == "shell":
+                raise UsageError(
+                    "`mindcode shell` 已移除；请改用 "
+                    "`mindcode [PROMPT] [OPTIONS]`"
+                )
             if (
-                first in KNOWN_SUBCOMMANDS
+                first in PUBLIC_SUBCOMMANDS
                 or first in {"--help", "-h", "--version", "-v"}
             ):
                 return super().parse_args(ctx, args)
-        # 无子命令或第一参数是 shell 的 flag/位置参数 → 注入 shell
+        # 无公开子命令：交给隐藏的顶层 Shell handler 做完整参数解析。
         new_args = ["shell", *args]
         return super().parse_args(ctx, new_args)
 
@@ -98,7 +102,8 @@ from .commands.status import status  # noqa: E402
 from .commands.task import app as task_app  # noqa: E402
 from .commands.terminal import app as terminal_app  # noqa: E402
 
-app.command("shell")(shell)
+# 仅供 DefaultShellGroup 内部分派；不作为公开子命令展示。
+app.command("shell", hidden=True)(shell)
 app.command()(chat)
 app.command()(status)
 app.add_typer(config_app, name="config")

mindcode/cli/commands/chat.py

@@ -44,10 +44,10 @@ def chat(
         None, "--max-steps", help="最大 step 数（默认 50）"
     ),
     step_timeout: float | None = typer.Option(
-        None, "--step-timeout", help="单步超时秒数，0 表示禁用（默认 120）"
+        None, "--step-timeout", help="单步超时秒数，0 表示禁用（默认 300）"
     ),
     total_timeout: float | None = typer.Option(
-        None, "--total-timeout", help="总超时秒数，0 表示禁用（默认 600）"
+        None, "--total-timeout", help="总超时秒数，0 表示禁用（默认 1800）"
     ),
 ) -> None:
     """发送单条消息，不进入交互模式。"""

mindcode/cli/commands/shell.py

@@ -1,4 +1,4 @@
-"""`mindcode shell` 子命令 —— 交互式 REPL 入口。"""
+"""顶层 `mindcode` 默认入口的交互式 REPL handler。"""
 
 from __future__ import annotations
 
@@ -59,13 +59,15 @@ def shell(
         None, "--max-steps", help="最大 step 数（默认 50）"
     ),
     step_timeout: float | None = typer.Option(
-        None, "--step-timeout", help="单步超时秒数，0 表示禁用（默认 120）"
+        None, "--step-timeout", help="单步超时秒数，0 表示禁用（默认 300）"
     ),
     total_timeout: float | None = typer.Option(
-        None, "--total-timeout", help="总超时秒数，0 表示禁用（默认 600）"
+        None,
+        "--total-timeout",
+        help="总超时秒数，0 表示禁用（交互默认禁用；一次性/子代理默认 1800）",
     ),
 ) -> None:
-    """启动交互式 shell（默认子命令）。"""
+    """启动顶层 `mindcode` 交互或 one-shot 模式。"""
     ws = Path(workspace).expanduser().resolve()
     if not ws.is_dir():
         console.print(
@@ -83,6 +85,15 @@ def shell(
         )
         raise typer.Exit(2)
 
+    if total_timeout == 0 or (
+        total_timeout is None and prompt is None and not subagents
+    ):
+        selected_total_timeout = None
+    else:
+        selected_total_timeout = (
+            total_timeout if total_timeout is not None else 1800.0
+        )
+
     try:
         rc = run_shell(
             ws,
@@ -98,9 +109,7 @@ def shell(
             step_timeout_s=None
             if step_timeout == 0
             else (step_timeout if step_timeout is not None else 300.0),
-            total_timeout_s=None
-            if total_timeout == 0
-            else (total_timeout if total_timeout is not None else 1800.0),
+            total_timeout_s=selected_total_timeout,
         )
     except ValueError as exc:
         console.print(f"[red]配置错误:[/red] {exc}")

mindcode/cli/shell/completion.py

@@ -10,11 +10,8 @@ SLASH_COMMANDS = {
     "models": "切换当前模型",
     "compact": "压缩整理当前会话上下文",
     "permissions": "切换权限模式",
-    "status": "显示当前会话状态",
-    "config": "显示配置",
-    "sessions": "列出本地会话",
-    "history": "打印当前会话消息",
-    "diff": "显示最后一次 diff",
+    "status": "查看当前历史 session 状态与上下文使用",
+    "resume": "恢复本地保存的历史 session",
     "clear": "清空当前会话历史",
     "help": "显示帮助",
     "exit": "退出",