mindcode 0.5.1__tar.gz → 0.5.3__tar.gz

{mindcode-0.5.1 → mindcode-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindcode
-Version: 0.5.1
+Version: 0.5.3
 Summary: codex-style interactive coding agent on top of mindagent
 Author: mindcode
 License: MIT

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/_version.py

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

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/acp_agent/agent.py

@@ -34,7 +34,6 @@ from acp.schema import (
     PermissionOption,
     PromptCapabilities,
     PromptResponse,
-    RequestPermissionResponse,
     TextContentBlock,
     ToolCallStart,
 )
@@ -43,6 +42,8 @@ from mindagent.core import (
     AgentSession,
     AgentRuntime,
     EventType,
+    ExternalFileReadDecision,
+    ExternalFileReadRequest,
     LocalConversationStore,
     RunOutcome,
     SessionEnvironment,
@@ -50,7 +51,7 @@ from mindagent.core import (
     SessionPolicy,
 )
 from ..approval import describe_action
-from ..config import ConfigError, ConfigStore, ProviderConfig
+from ..config import BUILTIN_SETTINGS, ConfigError, ConfigStore, ProviderConfig
 from ..policy import ApprovalMode
 from ..runtime import build_runtime
 
@@ -58,9 +59,6 @@ logger = logging.getLogger("mindcode.acp_agent")
 
 PROTOCOL_VERSION = 1  # stable ACP v1; see docs/acp-layering.md §5
 
-_PERMISSION_TIMEOUT_S = 120.0
-
-
 def _stop_reason(result: Any) -> str:
     """Map a native run result to an ACP v1 stop reason (layering §3)."""
     outcome = getattr(result, "outcome", None)
@@ -123,12 +121,22 @@ class _AgentHarness:
         config_store: ConfigStore | None = None,
         cwd: Path | None = None,
         subagents: bool = False,
-        permission_timeout_s: float = _PERMISSION_TIMEOUT_S,
+        permission_timeout_s: float | None = None,
     ) -> None:
         self._conn = conn
         self._config_store = config_store or ConfigStore()
         self._cwd = cwd or Path.cwd()
         self._subagents = subagents
+        self._permission_timeout_from_config = permission_timeout_s is None
+        if permission_timeout_s is None:
+            try:
+                permission_timeout_s = (
+                    self._config_store.read()
+                    .runtime_settings.permission_timeout_s
+                )
+            except AttributeError:
+                # Lightweight test/fake stores may only implement resolve().
+                permission_timeout_s = BUILTIN_SETTINGS.permission_timeout_s
         self._permission_timeout_s = permission_timeout_s
         self._sessions: dict[str, _ManagedSession] = {}
         self._new_session_lock = asyncio.Lock()
@@ -171,6 +179,10 @@ class _AgentHarness:
                 resolved = self._config_store.resolve()
             except ConfigError as exc:
                 raise RequestError.internal_error(str(exc)) from exc
+            if self._permission_timeout_from_config:
+                self._permission_timeout_s = (
+                    resolved.runtime_settings.permission_timeout_s
+                )
             store = LocalConversationStore(
                 self._config_store.root / "sessions"
             )
@@ -181,6 +193,7 @@ class _AgentHarness:
                 stream=True,
                 event_handler=None,
                 approval_callback=self._make_approval(resolved),
+                file_access_callback=self._make_file_access_approval(),
             )
             try:
                 session = runtime.create_session(
@@ -309,6 +322,52 @@ class _AgentHarness:
 
         return approve
 
+    def _make_file_access_approval(self) -> Any:
+        async def approve(
+            context: Any,
+            request: ExternalFileReadRequest,
+        ) -> ExternalFileReadDecision:
+            managed = self._managed(context.session_id)
+            started = helpers.start_tool_call(
+                tool_call_id=f"external-read-{request.request_id}",
+                title=f"Read external file {request.path}",
+                kind="read",
+                status="pending",
+            )
+            await self._notify_update(managed, started)
+            options = [
+                PermissionOption(
+                    option_id="allow", name="Allow once", kind="allow_once"
+                ),
+                PermissionOption(
+                    option_id="reject", name="Reject", kind="reject_once"
+                ),
+            ]
+            approved = False
+            try:
+                response = await asyncio.wait_for(
+                    self._conn.request_permission(
+                        session_id=managed.session_id,
+                        tool_call=started,
+                        options=options,
+                    ),
+                    timeout=self._permission_timeout_s,
+                )
+            except asyncio.TimeoutError:
+                logger.warning(
+                    "external read permission timed out after %.0fs → deny",
+                    self._permission_timeout_s,
+                )
+            else:
+                outcome = response.outcome
+                approved = (
+                    getattr(outcome, "outcome", None) != "cancelled"
+                    and getattr(outcome, "option_id", None) == "allow"
+                )
+            return ExternalFileReadDecision(request.request_id, approved)
+
+        return approve
+
     # ----- event-stream translation (native port 5 → session/update) -----
 
     async def _notify_update(self, managed: _ManagedSession, update: Any) -> None:

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/bench/schema.py

@@ -4,6 +4,8 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
 
+from ..config import BUILTIN_SETTINGS
+
 
 @dataclass(frozen=True)
 class BenchmarkFile:
@@ -59,9 +61,9 @@ class BenchmarkRunConfig:
     limit: int | None = None
     case_ids: tuple[str, ...] = ()
     concurrency: int = 1
-    max_steps: int = 50
-    step_timeout_s: float | None = 300.0
-    total_timeout_s: float | None = 1800.0
+    max_steps: int = BUILTIN_SETTINGS.benchmark.max_steps
+    step_timeout_s: float | None = BUILTIN_SETTINGS.benchmark.step_timeout_s
+    total_timeout_s: float | None = BUILTIN_SETTINGS.benchmark.total_timeout_s
     enable_subagents: bool = False
     enable_background_tasks: bool = False
     seed: int | None = None

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/cli/__init__.py

@@ -20,7 +20,13 @@
 from __future__ import annotations
 
 import typer
-from click import UsageError
+
+try:
+    # Typer 0.27 vendors Click to keep its exception types aligned with its
+    # renderer; older Typer releases use the public Click package directly.
+    from typer.core import _click
+except ImportError:  # pragma: no cover - compatibility with older Typer
+    import click as _click
 
 from .._version import __version__
 from ._shared import console
@@ -46,9 +52,10 @@ class DefaultShellGroup(typer.core.TyperGroup):
         if args:
             first = args[0]
             if first == "shell":
-                raise UsageError(
+                raise _click.exceptions.UsageError(
                     "`mindcode shell` 已移除；请改用 "
-                    "`mindcode [PROMPT] [OPTIONS]`"
+                    "`mindcode [PROMPT] [OPTIONS]`",
+                    ctx,
                 )
             if (
                 first in PUBLIC_SUBCOMMANDS

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/cli/commands/bench.py

@@ -86,15 +86,22 @@ def run(
         "--benchmark-root",
         help="benchmark case 根目录",
     ),
-    max_steps: int = typer.Option(50, "--max-steps", help="每 case 最大 step"),
+    max_steps: int | None = typer.Option(
+        None, "--max-steps", help="每 case 最大 step"
+    ),
     total_timeout: float | None = typer.Option(
-        600.0,
+        None,
         "--total-timeout",
-        help="每 case 总超时秒数",
+        help="每 case 总超时秒数，0 表示禁用",
     ),
 ) -> None:
     run_id = f"{suite}-{time.strftime('%Y%m%d-%H%M%S')}"
     try:
+        total_timeout_disabled = total_timeout == 0
+        if total_timeout is not None and total_timeout < 0:
+            raise ValueError("total timeout 必须为 0 或大于 0")
+        if total_timeout_disabled:
+            total_timeout = None
         approval_override = (
             ApprovalMode(approve_mode).value
             if approve_mode is not None
@@ -106,6 +113,11 @@ def run(
             approval_override=approval_override,
         )
         selected_approve_mode = resolved.approval_mode
+        benchmark_defaults = resolved.runtime_settings.benchmark
+        if max_steps is None:
+            max_steps = benchmark_defaults.max_steps
+        if total_timeout is None and not total_timeout_disabled:
+            total_timeout = benchmark_defaults.total_timeout_s
         output_root = Path(output).expanduser()
         run_output_dir = _run_output_dir(output_root, run_id)
         run_config = BenchmarkRunConfig(

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/cli/commands/chat.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 import typer
 
+from ...config import BUILTIN_SETTINGS
 from ...policy import ApprovalMode
 from .._shared import console
 from ..shell import run_shell
@@ -41,15 +42,25 @@ def chat(
         False, "--no-stream", help="关闭流式输出"
     ),
     max_steps: int | None = typer.Option(
-        None, "--max-steps", help="最大 step 数（默认 50）"
+        None,
+        "--max-steps",
+        help=f"最大 step 数（默认 {BUILTIN_SETTINGS.one_shot.max_steps}）",
     ),
     step_timeout: float | None = typer.Option(
         None,
         "--step-timeout",
-        help="单步超时秒数（默认 300，必须大于 0）",
+        help=(
+            "单步超时秒数（默认 "
+            f"{BUILTIN_SETTINGS.one_shot.step_timeout_s:g}，必须大于 0）"
+        ),
     ),
     total_timeout: float | None = typer.Option(
-        None, "--total-timeout", help="总超时秒数，0 表示禁用（默认 1800）"
+        None,
+        "--total-timeout",
+        help=(
+            "总超时秒数，0 表示禁用（默认 "
+            f"{BUILTIN_SETTINGS.one_shot.total_timeout_s:g}）"
+        ),
     ),
 ) -> None:
     """发送单条消息，不进入交互模式。"""
@@ -78,13 +89,32 @@ def chat(
             resume=resume,
             stream=not no_stream,
             one_shot_prompt=message,
-            max_steps=max_steps if max_steps is not None else 50,
+            max_steps=(
+                max_steps
+                if max_steps is not None
+                else BUILTIN_SETTINGS.one_shot.max_steps
+            ),
             step_timeout_s=(
-                step_timeout if step_timeout is not None else 300.0
+                step_timeout
+                if step_timeout is not None
+                else BUILTIN_SETTINGS.one_shot.step_timeout_s
             ),
             total_timeout_s=None
             if total_timeout == 0
-            else (total_timeout if total_timeout is not None else 1800.0),
+            else (
+                total_timeout
+                if total_timeout is not None
+                else BUILTIN_SETTINGS.one_shot.total_timeout_s
+            ),
+            settings_defaults=frozenset(
+                name
+                for name, value in (
+                    ("max_steps", max_steps),
+                    ("step_timeout_s", step_timeout),
+                    ("total_timeout_s", total_timeout),
+                )
+                if value is None
+            ),
         )
     except ValueError as exc:
         console.print(f"[red]配置错误:[/red] {exc}")

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/cli/commands/shell.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 import typer
 
+from ...config import BUILTIN_SETTINGS
 from ...policy import ApprovalMode
 from .._shared import console
 from ..shell import run_shell
@@ -52,17 +53,25 @@ def shell(
         help="使用 master/coder 委派模式（await_result）",
     ),
     max_steps: int | None = typer.Option(
-        None, "--max-steps", help="最大 step 数（默认 50）"
+        None,
+        "--max-steps",
+        help=f"最大 step 数（默认 {BUILTIN_SETTINGS.one_shot.max_steps}）",
     ),
     step_timeout: float | None = typer.Option(
         None,
         "--step-timeout",
-        help="单步超时秒数（交互默认不限制；one-shot 默认 300，必须大于 0）",
+        help=(
+            "单步超时秒数（交互默认不限制；one-shot 默认 "
+            f"{BUILTIN_SETTINGS.one_shot.step_timeout_s:g}，必须大于 0）"
+        ),
     ),
     total_timeout: float | None = typer.Option(
         None,
         "--total-timeout",
-        help="总超时秒数，0 表示禁用（交互默认禁用；一次性/子代理默认 1800）",
+        help=(
+            "总超时秒数，0 表示禁用（交互默认禁用；一次性/子代理默认 "
+            f"{BUILTIN_SETTINGS.one_shot.total_timeout_s:g}）"
+        ),
     ),
 ) -> None:
     """启动顶层 `mindcode` 交互或 one-shot 模式。"""
@@ -95,7 +104,9 @@ def shell(
         selected_total_timeout = None
     else:
         selected_total_timeout = (
-            total_timeout if total_timeout is not None else 1800.0
+            total_timeout
+            if total_timeout is not None
+            else BUILTIN_SETTINGS.one_shot.total_timeout_s
         )
 
     try:
@@ -109,13 +120,34 @@ def shell(
             stream=not no_stream,
             subagents=subagents,
             one_shot_prompt=prompt,
-            max_steps=max_steps if max_steps is not None else 50,
+            max_steps=(
+                max_steps
+                if max_steps is not None
+                else (
+                    BUILTIN_SETTINGS.interactive.max_steps
+                    if prompt is None
+                    else BUILTIN_SETTINGS.one_shot.max_steps
+                )
+            ),
             step_timeout_s=(
                 step_timeout
                 if step_timeout is not None
-                else (None if prompt is None else 300.0)
+                else (
+                    BUILTIN_SETTINGS.interactive.step_timeout_s
+                    if prompt is None
+                    else BUILTIN_SETTINGS.one_shot.step_timeout_s
+                )
             ),
             total_timeout_s=selected_total_timeout,
+            settings_defaults=frozenset(
+                name
+                for name, value in (
+                    ("max_steps", max_steps),
+                    ("step_timeout_s", step_timeout),
+                    ("total_timeout_s", total_timeout),
+                )
+                if value is None
+            ),
         )
     except ValueError as exc:
         console.print(f"[red]配置错误:[/red] {exc}")

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/cli/commands/task.py

@@ -22,7 +22,7 @@ from mindagent.core import (
 from mindagent.tools import MemoryReadTool
 from rich.table import Table
 
-from ...config import ConfigStore
+from ...config import BUILTIN_SETTINGS, ConfigStore
 from ...policy import ApprovalMode
 from ...runtime import build_runtime
 from ...tasking import TaskEventRecorder, TaskStatus, TaskStore
@@ -44,16 +44,16 @@ def run_task(
         case_sensitive=False,
         help="审批模式",
     ),
-    max_steps: int = typer.Option(50, "--max-steps", help="最大 step 数"),
+    max_steps: int | None = typer.Option(None, "--max-steps", help="最大 step 数"),
     step_timeout: float | None = typer.Option(
-        300.0,
+        None,
         "--step-timeout",
         help="单步超时秒数（默认 300，必须大于 0）",
     ),
     total_timeout: float | None = typer.Option(
-        1800.0,
+        None,
         "--total-timeout",
-        help="总超时秒数",
+        help="总超时秒数，0 表示禁用",
     ),
     allow_dangerous: bool = typer.Option(
         False,
@@ -70,6 +70,12 @@ def run_task(
     if step_timeout is not None and step_timeout <= 0:
         console.print("[red]无效 step timeout:[/red] 必须大于 0")
         raise typer.Exit(2)
+    total_timeout_disabled = total_timeout == 0
+    if total_timeout is not None and total_timeout < 0:
+        console.print("[red]无效 total timeout:[/red] 必须为 0 或大于 0")
+        raise typer.Exit(2)
+    if total_timeout_disabled:
+        total_timeout = None
 
     ws = Path(workspace).expanduser().resolve()
     if not ws.is_dir():
@@ -87,6 +93,13 @@ def run_task(
         raise typer.Exit(2)
     model_name = provider_config.model
     selected_approve_mode = ApprovalMode(provider_config.approval_mode)
+    task_defaults = provider_config.runtime_settings.task
+    if max_steps is None:
+        max_steps = task_defaults.max_steps
+    if step_timeout is None:
+        step_timeout = task_defaults.step_timeout_s
+    if total_timeout is None and not total_timeout_disabled:
+        total_timeout = task_defaults.total_timeout_s
     store = TaskStore()
     record = store.create(
         goal=goal,
@@ -96,6 +109,7 @@ def run_task(
         approve_mode=selected_approve_mode.value,
         background=background,
         max_steps=max_steps,
+        step_timeout_s=step_timeout,
         total_timeout_s=total_timeout,
         allow_dangerous=allow_dangerous,
     )
@@ -163,7 +177,9 @@ def task_worker(task_id: str) -> None:
             model=record.model or "",
             approve_mode=ApprovalMode(record.approve_mode),
             max_steps=record.max_steps,
-            step_timeout=getattr(record, "step_timeout_s", 300.0),
+            step_timeout=getattr(
+                record, "step_timeout_s", BUILTIN_SETTINGS.task.step_timeout_s
+            ),
             total_timeout=record.total_timeout_s,
             allow_dangerous=record.allow_dangerous,
         )
@@ -199,7 +215,9 @@ def resume_task(
                 model=record.model or "",
                 approve_mode=ApprovalMode(record.approve_mode),
                 max_steps=record.max_steps,
-                step_timeout=getattr(record, "step_timeout_s", 300.0),
+                step_timeout=getattr(
+                    record, "step_timeout_s", BUILTIN_SETTINGS.task.step_timeout_s
+                ),
                 total_timeout=record.total_timeout_s,
                 allow_dangerous=record.allow_dangerous,
                 resume=True,
@@ -225,7 +243,7 @@ async def _run_task(
     max_steps: int,
     total_timeout: float | None,
     allow_dangerous: bool,
-    step_timeout: float | None = 300.0,
+    step_timeout: float | None = BUILTIN_SETTINGS.task.step_timeout_s,
     resume: bool = False,
     user_input: str | None = None,
 ) -> bool:

{mindcode-0.5.1 → mindcode-0.5.3}/mindcode/cli/shell/input_pipeline.py

@@ -34,6 +34,7 @@ class InputPipeline:
     def __init__(self) -> None:
         self._seq = 0
         self._pending: UserInput | None = None
+        self._pending_items: list[str] = []
 
     def has_pending(self) -> bool:
         return self._pending is not None
@@ -49,6 +50,12 @@ class InputPipeline:
         """派生显示文本：合并文本单卡，不多卡不丢卡。"""
         return self.peek_text()
 
+    def display_items(self) -> list[str] | None:
+        """Independent pending texts for TUI cards, in FIFO order."""
+        if self._pending is None:
+            return None
+        return list(self._pending_items) or [self._pending.text]
+
     def display_status(self) -> str:
         """strip 状态：appending 显示发送中，其余显示等待中。"""
         if self._pending is not None and self._pending.exec == "appending":
@@ -59,9 +66,11 @@ class InputPipeline:
         """兼容旧测试的整包赋值；None 表示清空。"""
         if text is None:
             self._pending = None
+            self._pending_items = []
             return
         self._seq += 1
         self._pending = UserInput(id=self._seq, text=text, kind=kind)
+        self._pending_items = [text]
 
     def stage(self, text: str, kind: str = "normal") -> str:
         """忙时追问暂存：无 pending 则建卡，有则 ``\\n\\n`` 并入同一对象。"""
@@ -72,7 +81,9 @@ class InputPipeline:
         if self._pending is None:
             self._seq += 1
             self._pending = UserInput(id=self._seq, text=text, kind=kind)
+            self._pending_items = [text]
         elif text not in (None, ""):
+            self._pending_items.append(text)
             if self._pending.text:
                 self._pending.text = self._pending.text + "\n\n" + text
             else:
@@ -95,6 +106,7 @@ class InputPipeline:
         self._pending.exec = "accepted"
         text = self._pending.text
         self._pending = None
+        self._pending_items = []
         return text
 
     def discard(self) -> str | None:
@@ -103,6 +115,7 @@ class InputPipeline:
             return None
         text = self._pending.text
         self._pending = None
+        self._pending_items = []
         return text