mindcode 0.5.3__tar.gz → 0.5.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindcode
-Version: 0.5.3
+Version: 0.5.5
 Summary: codex-style interactive coding agent on top of mindagent
 Author: mindcode
 License: MIT
@@ -35,7 +35,7 @@ Requires-Dist: prompt-toolkit>=3.0.30
 - **可选 Subagent 模式**：`mindcode --subagents` 启用受限的 master/coder 协作；master 仅能委派，coder 才能访问 workspace
 - 全屏 TUI：顶部 logo/会话信息、可滚动 Markdown 消息区、固定带边框多行输入框与状态栏
 - 顶部信息栏显示本会话累计 token 消耗；provider 未返回 usage 时显示 `tokens —`
-- Rich 富渲染：Markdown、彩色工具面板、file_edit diff 高亮和流式 LLM 输出
+- Rich 富渲染：Markdown、彩色工具面板、edit diff 高亮和流式 LLM 输出
 - TUI 内选择菜单：`/models`、`/permissions` 用方向键选择
 - REPL 权限模式：`ask_user`（默认，写入和危险操作逐项询问）/ `full_accept`（接受权限上限内的操作风险）
 - 会话持久化与恢复：基于 `LocalConversationStore`，存到 `~/.cache/mindcode/sessions/`
@@ -168,7 +168,7 @@ mindcode --subagents "审查当前改动并运行相关测试"
 ```bash
 mindcode                                     # 默认进 shell
 › 在 workspace 创建 hello.txt 写入 hi
-   › file_edit (create) hello.txt [WRITE]
+   › edit (create) hello.txt [WRITE]
    ask_user 将在执行前询问；也可切换到 /permissions full_accept
    ┌─ diff: hello.txt ──────────────────────┐
    │ +hi                                     │
@@ -333,15 +333,15 @@ mindcode/
   持久化；运行结束会清理未消费的授权，不自动新增磁盘审计文件。
 - 普通问答使用 `USER_INPUT_REQUIRED` 与 `submit_user_input()`；旧 `approve_run()`
   因未绑定授权请求而被拒绝。
-- `exec_command` 只限制 `cwd`，不会隔离子进程访问的文件。`sed`、`find`、`git diff`
+- `command` 只限制 `cwd`，不会隔离子进程访问的文件。`sed`、`find`、`git diff`
   等命令保守按写风险审批，具体范围见
   [策略与权限](../../docs/guides/policies-and-approval.md)。
 
 ## 局限
 
-- 不支持 `/undo`：`exec_command` 的副作用可能不可逆，回滚复杂。
+- 不支持 `/undo`：`command` 的副作用可能不可逆，回滚复杂。
 - 会话恢复只续聊 user/assistant 历史，不恢复 TaskState / Evidence / pending continuation。
 - `task resume` 是重新观察 workspace 后创建新 Run，不会重放未确认的旧 Action。
 - 后台任务目前依赖本机 PID；不提供跨主机监督或精确进程身份恢复。
-- `bench run` 第一版仅支持串行（concurrency=1）；`exec_command` 无沙箱，
+- `bench run` 第一版仅支持串行（concurrency=1）；`command` 无沙箱，
   SWE-bench / Terminal-Bench 评测依赖本机对应的评测环境。

{mindcode-0.5.3 → mindcode-0.5.5}/README.md

@@ -19,7 +19,7 @@
 - **可选 Subagent 模式**：`mindcode --subagents` 启用受限的 master/coder 协作；master 仅能委派，coder 才能访问 workspace
 - 全屏 TUI：顶部 logo/会话信息、可滚动 Markdown 消息区、固定带边框多行输入框与状态栏
 - 顶部信息栏显示本会话累计 token 消耗；provider 未返回 usage 时显示 `tokens —`
-- Rich 富渲染：Markdown、彩色工具面板、file_edit diff 高亮和流式 LLM 输出
+- Rich 富渲染：Markdown、彩色工具面板、edit diff 高亮和流式 LLM 输出
 - TUI 内选择菜单：`/models`、`/permissions` 用方向键选择
 - REPL 权限模式：`ask_user`（默认，写入和危险操作逐项询问）/ `full_accept`（接受权限上限内的操作风险）
 - 会话持久化与恢复：基于 `LocalConversationStore`，存到 `~/.cache/mindcode/sessions/`
@@ -152,7 +152,7 @@ mindcode --subagents "审查当前改动并运行相关测试"
 ```bash
 mindcode                                     # 默认进 shell
 › 在 workspace 创建 hello.txt 写入 hi
-   › file_edit (create) hello.txt [WRITE]
+   › edit (create) hello.txt [WRITE]
    ask_user 将在执行前询问；也可切换到 /permissions full_accept
    ┌─ diff: hello.txt ──────────────────────┐
    │ +hi                                     │
@@ -317,15 +317,15 @@ mindcode/
   持久化；运行结束会清理未消费的授权，不自动新增磁盘审计文件。
 - 普通问答使用 `USER_INPUT_REQUIRED` 与 `submit_user_input()`；旧 `approve_run()`
   因未绑定授权请求而被拒绝。
-- `exec_command` 只限制 `cwd`，不会隔离子进程访问的文件。`sed`、`find`、`git diff`
+- `command` 只限制 `cwd`，不会隔离子进程访问的文件。`sed`、`find`、`git diff`
   等命令保守按写风险审批，具体范围见
   [策略与权限](../../docs/guides/policies-and-approval.md)。
 
 ## 局限
 
-- 不支持 `/undo`：`exec_command` 的副作用可能不可逆，回滚复杂。
+- 不支持 `/undo`：`command` 的副作用可能不可逆，回滚复杂。
 - 会话恢复只续聊 user/assistant 历史，不恢复 TaskState / Evidence / pending continuation。
 - `task resume` 是重新观察 workspace 后创建新 Run，不会重放未确认的旧 Action。
 - 后台任务目前依赖本机 PID；不提供跨主机监督或精确进程身份恢复。
-- `bench run` 第一版仅支持串行（concurrency=1）；`exec_command` 无沙箱，
+- `bench run` 第一版仅支持串行（concurrency=1）；`command` 无沙箱，
   SWE-bench / Terminal-Bench 评测依赖本机对应的评测环境。

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

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

{mindcode-0.5.3 → mindcode-0.5.5}/mindcode/acp_agent/__main__.py

@@ -14,6 +14,7 @@ from pathlib import Path
 
 from acp import run_agent
 
+from ..policy import ApprovalMode
 from .agent import _AgentHarness
 
 
@@ -37,6 +38,23 @@ def main(argv: list[str] | None = None) -> int:
         default=None,
         help="Default workspace used when a client connects without a cwd",
     )
+    parser.add_argument(
+        "--approval-mode",
+        choices=[mode.value for mode in ApprovalMode],
+        default=None,
+        help=(
+            "Override the approval mode read from config.toml. This is a "
+            "host-side launch decision; ACP requests can never change it."
+        ),
+    )
+    parser.add_argument(
+        "--allow-dangerous",
+        action="store_true",
+        help=(
+            "Allow ActionRisk.DANGEROUS tools in created sessions. Only for "
+            "trusted, attended hosts: it lifts the SessionPolicy ceiling."
+        ),
+    )
     parser.add_argument("--verbose", action="store_true", help="stderr debug logs")
     args = parser.parse_args(argv)
 
@@ -49,6 +67,8 @@ def main(argv: list[str] | None = None) -> int:
             harness = _AgentHarness(
                 conn,  # type: ignore[arg-type]
                 cwd=Path(args.cwd).expanduser() if args.cwd else None,
+                approval_mode=args.approval_mode,
+                allow_dangerous=args.allow_dangerous,
             )
             harness_holder.append(harness)
             return harness

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

@@ -11,8 +11,10 @@ approval callback / event stream.  Hard rules honoured here:
 
 - stdout carries protocol frames only; every log line goes to stderr.
 - one run per session at a time; a second ``session/prompt`` is rejected.
-- provider/model/approval configuration always comes from ``ConfigStore``
-  (fresh ``read()`` per session); clients cannot widen the SessionPolicy.
+- provider/model/approval configuration comes from ``ConfigStore`` (fresh
+  ``read()`` per session); an ACP *request* can never widen it. Only the host
+  that launched this process may override approval/session limits, through
+  explicit CLI flags (``--approval-mode``, ``--allow-dangerous``).
 - unimplemented stable methods (``session/load``, ``session/set_mode``)
   answer with a JSON-RPC error instead of pretending support.
 """
@@ -70,9 +72,9 @@ def _stop_reason(result: Any) -> str:
 
 
 def _tool_kind(action_name: str) -> str:
-    if action_name.startswith("file_read"):
+    if action_name.startswith("read"):
         return "read"
-    if action_name in ("file_write", "file_edit"):
+    if action_name in ("write", "edit"):
         return "edit"
     if action_name.startswith("exec_") or "command" in action_name:
         return "execute"
@@ -121,12 +123,19 @@ class _AgentHarness:
         config_store: ConfigStore | None = None,
         cwd: Path | None = None,
         subagents: bool = False,
+        approval_mode: str | None = None,
+        allow_dangerous: bool = False,
         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
+        # Explicit launch-time policy, always from the *host* that started
+        # this process (CLI flags, i.e. the user's own settings) — never from
+        # an ACP request. ``None`` keeps the ConfigStore value.
+        self._approval_mode = approval_mode
+        self._allow_dangerous = allow_dangerous
         self._permission_timeout_from_config = permission_timeout_s is None
         if permission_timeout_s is None:
             try:
@@ -186,10 +195,12 @@ class _AgentHarness:
             store = LocalConversationStore(
                 self._config_store.root / "sessions"
             )
+            effective_mode = self._approval_mode or resolved.approval_mode
+            effective_approval = ApprovalMode(effective_mode)
             runtime = build_runtime(
                 workspace,
                 provider_config=resolved,
-                approve_mode=ApprovalMode(resolved.approval_mode),
+                approve_mode=effective_approval,
                 stream=True,
                 event_handler=None,
                 approval_callback=self._make_approval(resolved),
@@ -203,7 +214,7 @@ class _AgentHarness:
                     ),
                     policy=SessionPolicy(
                         allow_write=True,
-                        allow_dangerous=False,
+                        allow_dangerous=self._allow_dangerous,
                         max_parallel_actions=1,
                     ),
                     conversation_store=store,
@@ -216,12 +227,13 @@ class _AgentHarness:
                 session_id, session, runtime
             )
             logger.info(
-                "session %s created (workspace=%s provider=%s model=%s approval=%s)",
+                "session %s created (workspace=%s provider=%s model=%s approval=%s allow_dangerous=%s)",
                 session_id,
                 workspace,
                 resolved.name,
                 resolved.model,
-                resolved.approval_mode,
+                effective_mode,
+                self._allow_dangerous,
             )
             return NewSessionResponse(session_id=session_id)
 
@@ -518,6 +530,8 @@ def build_harness(
     config_store: ConfigStore | None = None,
     cwd: Path | None = None,
     subagents: bool = False,
+    approval_mode: str | None = None,
+    allow_dangerous: bool = False,
 ) -> _AgentHarness:
     """Factory used by ``__main__`` and tests."""
     return _AgentHarness(
@@ -525,4 +539,6 @@ def build_harness(
         config_store=config_store,
         cwd=cwd,
         subagents=subagents,
+        approval_mode=approval_mode,
+        allow_dangerous=allow_dangerous,
     )

{mindcode-0.5.3 → mindcode-0.5.5}/mindcode/approval.py

@@ -42,17 +42,17 @@ def describe_action(action: ActionRequest) -> str:
     arguments = (
         action.arguments if isinstance(action.arguments, dict) else {}
     )
-    if name in ("file_edit", "file_write"):
-        verb = "Edit" if name == "file_edit" else "Write"
+    if name in ("edit", "write"):
+        verb = "Edit" if name == "edit" else "Write"
         path = _one_line(arguments.get("path", "?"))
         return f"{verb} {path} [{risk_label(action.risk)}]"
-    if name == "exec_command":
+    if name == "command":
         command = arguments.get("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)}]"
-    if name in ("file_read", "memory_read"):
+    if name in ("read", "memory_read"):
         path = _one_line(arguments.get("path", "?"))
         return f"Read {path} [{risk_label(action.risk)}]"
     payload = json.dumps(arguments, ensure_ascii=False, sort_keys=True)

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

@@ -47,6 +47,9 @@ def shell(
     no_stream: bool = typer.Option(
         False, "--no-stream", help="关闭流式输出"
     ),
+    no_markdown: bool = typer.Option(
+        False, "--no-markdown", help="关闭交互消息的 Markdown 渲染"
+    ),
     subagents: bool = typer.Option(
         False,
         "--subagents",
@@ -118,6 +121,7 @@ def shell(
             session_id=session,
             resume=resume,
             stream=not no_stream,
+            markdown_enabled=False if no_markdown else None,
             subagents=subagents,
             one_shot_prompt=prompt,
             max_steps=(

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

@@ -284,10 +284,10 @@ async def _run_task(
         policy = SessionPolicy(
             allowed_tools=frozenset(
                 {
-                    "file_read",
-                    "file_write",
-                    "file_edit",
-                    "exec_command",
+                    "read",
+                    "write",
+                    "edit",
+                    "command",
                     "memory_read",
                 }
             ),

{mindcode-0.5.3 → mindcode-0.5.5}/mindcode/cli/shell/repl.py

@@ -204,10 +204,12 @@ class Shell:
         max_steps: int = BUILTIN_SETTINGS.run.max_steps,
         step_timeout_s: float | None = BUILTIN_SETTINGS.run.step_timeout_s,
         total_timeout_s: float | None = BUILTIN_SETTINGS.run.total_timeout_s,
+        markdown_enabled: bool | None = None,
     ):
         self.workspace = workspace
         self.approve_mode = approve_mode
         self.stream = stream
+        self.markdown_enabled = markdown_enabled
         self.resume_id = resume
         self.explicit_session_id = session_id
 
@@ -359,7 +361,9 @@ class Shell:
             on_submit=self._submit_from_tui,
             on_exit=self._request_exit,
             on_interrupt=self._interrupt_current,
+            on_push_pending=self._push_pending_now,
             status_provider=self._status_text,
+            markdown_enabled=self.markdown_enabled,
         )
         self.renderer.attach_transcript(self._tui.transcript)
         self.state.choose_option = self._tui.choose
@@ -716,6 +720,42 @@ class Shell:
         except Exception as exc:
             self._note(f"未能停止：{exc}")
 
+    async def _push_pending_now(self) -> None:
+        """Ctrl-Enter: interrupt the active run and dispatch the oldest pending input."""
+        session = getattr(self.state, "session", None)
+        if not self._busy or session is None:
+            return
+        pipe = self._pipeline()
+        first = pipe.peek_text()
+        if first is None:
+            return
+        # Move the staged item ahead of the queue; the normal process loop will
+        # dispatch it after the current run is cancelled.
+        queued: list[str] = []
+        while True:
+            try:
+                item = self._queue.get_nowait()
+            except asyncio.QueueEmpty:
+                break
+            if isinstance(item, str):
+                queued.append(item)
+            else:
+                self._queue.put_nowait(item)
+                break
+        pipe.discard()
+        self._queue.put_nowait(first)
+        for item in queued:
+            self._queue.put_nowait(item)
+        self._sync_pending_display()
+        active_id = getattr(session, "active_run_id", None) or getattr(
+            self.state, "last_run_id", None
+        )
+        if active_id:
+            try:
+                await session.cancel_run(active_id)
+            except Exception as exc:
+                self._note(f"未能立即推送：{exc}")
+
     async def _process_loop(self) -> None:
         """轮间调度：先排空 slash 优先队，再跑一条普通消息。
 
@@ -845,10 +885,6 @@ class Shell:
     def _print_banner(self) -> None:
         auth = self.config.auth.get(self.state.active_provider)
         if self._tui is not None:
-            self._tui.transcript.add_system(
-                "已就绪。输入消息开始对话；/help 查看命令；/exit 退出；"
-                "运行中 Ctrl-C 取回消息继续编辑，Ctrl-D 退出。"
-            )
             if self.state.history:
                 self._tui.transcript.add_system(
                     f"已恢复 {len(self.state.history)} 条历史消息。"
@@ -1199,10 +1235,14 @@ def run_shell(
     max_steps: int = BUILTIN_SETTINGS.run.max_steps,
     step_timeout_s: float | None = BUILTIN_SETTINGS.run.step_timeout_s,
     total_timeout_s: float | None = BUILTIN_SETTINGS.run.total_timeout_s,
+    markdown_enabled: bool | None = None,
     settings_defaults: frozenset[str] = frozenset(),
 ) -> int:
     """Synchronous entry: build Shell and run it (or one-shot)."""
-    configured = ConfigStore().read().runtime_settings
+    config_snapshot = ConfigStore().read()
+    configured = config_snapshot.runtime_settings
+    if markdown_enabled is None:
+        markdown_enabled = config_snapshot.settings.markdown_enabled
     profile = (
         configured.one_shot
         if one_shot_prompt is not None or subagents
@@ -1226,6 +1266,7 @@ def run_shell(
         max_steps=max_steps,
         step_timeout_s=step_timeout_s,
         total_timeout_s=total_timeout_s,
+        markdown_enabled=markdown_enabled,
     )
 
     if one_shot_prompt:

{mindcode-0.5.3 → mindcode-0.5.5}/mindcode/cli/shell/startup.py

@@ -41,14 +41,6 @@ def build_welcome_banner(
                 "配置后重新启动"
             )
         )
-    lines.append(Text(""))
-    lines.append(
-        Text.from_markup(
-            "[dim]输入消息开始对话；[cyan]/help[/cyan] 查看命令；"
-            "[cyan]/exit[/cyan] 退出；运行中 Ctrl-C 取回消息继续编辑，"
-            "Ctrl-D 退出[/dim]"
-        )
-    )
     return Panel(
         Group(*lines),
         border_style="cyan",