comate-cli 0.12.4b6__tar.gz → 0.12.4b8__tar.gz

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ### Added
 
+- 规则双目录（SDK）：条件规则（带 `paths:` 的规则文件）现在也从项目 `.claude/rules/` 与用户 `~/.claude/rules/` 读取，Claude Code 里配好的路径规则搬到 comate 下直接生效——Read 命中路径注入 reminder，Edit / Write 预检同样拦截注入；user 层受 user setting source 门控，项目层受 project 门控。同一层级内 `.agent/rules` 与 `.claude/rules` 的同名文件（按相对路径）只加载 `.agent` 那份，被遮蔽路径记 info 日志；用户层与项目层之间不去重，两份都加载。`paths` 支持逗号分隔字符串（`paths: "src/**, lib/**"` 拆成多个模式，剥掉首尾空白与引号），YAML 列表形式不变；rules 目录下指向目录的符号链接跟进（做环检测，同一真实目录只进一次）；`.agents/rules/` 不读。目录、去重、逗号、符号链接四项改动作用在统一扫描入口上，常驻规则同样受益。
+- 技能扫描根加入 `.agents`（SDK；含 CLI `/skills` 菜单来源判定修正）：`npx skills add` 装进 `.agents/skills/` 的技能直接被发现、可通过 Skill 工具调用，`.claude/skills/` 下指向它的符号链接不会让它列两次；运行中再装一个，下一轮用户输入后热发现也能看到。扫描根顺序即优先级，同名先到先得：项目 `.agent/skills` → `.agents/skills` → `.claude/skills`；用户 `~/.agent/skills` → `~/.agents/skills` → `~/.config/agents/skills` → `~/.claude/skills`，两层各受对应 setting source 门控。四类扫描根下以 `.` 开头的子目录一律跳过（不当作 skill 也不当作 namespace）。`/skills` 菜单的同名去重与来源判定改按真实路径（扫描根与 skill 目录两边 resolve 后再比），符号链接 skill 归入正确分组、不再兜底成 user，project 组副标题自动列出 `.agents/skills`。
+- MCP 工具停用（SDK 部分，菜单在后续版本）：`.mcp.json` 的 server 条目新增可选字段 `disabled_tools`（字符串数组，写 server 自报的原始工具名，精确匹配、不支持通配符），列出的工具不再发给模型、子 agent 点名也拿不到；没列出的工具与 server 新增的工具照常加载，名单里写了 server 不提供的名字不报错。代码里传的 `mcp_servers`（含 `type: "sdk"`）认同一个字段。新增存盘函数 `comate_agent_sdk.mcp.set_mcp_server_disabled_tools(alias, names, *, scope, project_root)`：只改该条目的这一个字段，空名单即删除字段，对 `{"enabled": false}` 墓碑条目报错。新增 `AgentRuntime.set_mcp_disabled_tools(alias, names)`：会话中途改名单，不重连任何 server，下一次模型请求生效（实测 3 台 × 50 个工具单次约 2.4ms）。一台 server 的工具全部停用时它保持连接，但它的 instructions 不再发给模型。旧版本 SDK 会忽略这个字段并加载全部工具。
+- `/mcp` 工具列表可按工具启用 / 停用：每行前显示 `[x]`（启用）/ `[ ]`（停用），停用的工具仍留在列表里；Space 切换当前行并立刻写回该 server 所在层的 `.mcp.json`（`disabled_tools` 字段），不重连任何 server，下一次模型请求生效，agent 忙碌时也可切换；Enter 仍进工具详情，详情页多一行启用 / 停用状态。存盘失败时勾选不变，菜单里显示一行错误。server 详情页有停用时显示 `Tools: 5 / 40 tools`，整台 Enable 后的「tools loaded」只数启用的工具；一台 server 的工具全部停用后 `View tools` 入口仍在，可以进去重新启用。新文案三语齐全。comate-cli 的 `comate-agent-sdk` 下限抬到 0.12.15（SDK 同步升版）。
+- 空闲修剪提示与开关：SDK 使用方升级后默认启用空闲修剪（会话空闲超 3 小时后，新一轮发出前把较早的 Read / Bash 等可重取工具结果换成占位符，少付缓存已凉后的全价重读），可用 `AgentConfig(idle_pruning=False)` 关闭；CLI 用户可在 settings.json 顶层写 `"idle_pruning": false` 关闭（不写 = 开，三层合并）。修剪真的发生时终端显示一行「已清理 N 条较早的工具结果，约省 X tokens（空闲 H 小时）」，模型随后重读文件不再是莫名其妙的动作；resume 后已清理条目保持占位符，不重复修剪、不重复提示。
 - `--system-prompt <文本>` / `--system-prompt-file <路径>`：用自己的文字替换 system prompt 的开头段（agent 是谁、怎么干活）；`--append-system-prompt <文本>` / `--append-system-prompt-file <路径>`：在护栏之后追加。参数名对齐 Claude Code，但与 Claude Code 不同的是护栏段（运行环境说明、工作纪律、危险操作确认、汇报规范等）始终保留。替换与追加可同时使用；同类的文本版与文件版同时给、值为空、文件读不了或为空都会当场退出并按界面语言提示。`--rpc-*` 与 `-p` 同样生效，一个进程下所有新会话共用；resume 旧会话时沿用会话创建时的 system prompt，界面会给出提示，`/clear` 后生效。白牌 `system_role` 语义不变：只换品牌身份句，编码规则保留。
 - ctrl+b 把正在前台跑的 shell 命令转到后台：对模型调用的 Bash 工具和 `!` 本地命令都生效。同一个进程原样移交给后台 job（不重启不杀），模型 Bash 的工具结果立刻回「用户已转后台 + job_id + 输出尾部」让模型继续本轮；`!` 命令静默记一条 reminder、解锁输入框。后台跑完走既有 job 完成通知叫模型；想停用 `/ps`。运行面板与 `!` 活动区在 Bash 跑时显示「ctrl+b 转后台」提示，`/help` 多一行说明。没有可转后台的命令时按键只闪一条提示；子 agent 里的 Bash 不受影响。tmux 用户需按两次 ctrl+b。
 - `!` shell 模式：空输入框敲 `!` 进入 shell 模式，回车后命令在本地直接执行（跳过权限审批、与模型共享持久 cwd），滚动区显示 `! cmd` + 紧贴其下的 `⎿` 输出块（stderr 红、stdout 不红、空输出标 `(No output)`、控制码剥净、长输出截断可 Ctrl+O 看全文）。命令结束后模型自动简短回应一轮；运行期间敲的提问并入同一轮。运行中锚点下方实时显示最后 5 行输出与耗时；超过 60 秒自动转后台并解锁输入框，后台跑完再叫模型；Esc/Ctrl+C 中断不叫模型并把命令回填到输入框。忙时 `!cmd` 排队，回合结束后按顺序执行。
@@ -59,6 +64,7 @@
 
 ### Changed
 
+- 常驻规则进置顶区（SDK）：规则目录（`~/.agent/rules`、`~/.claude/rules`、项目 `.agent/rules`、`.claude/rules`）里没有有效 `paths:` 的文件——没有 frontmatter、frontmatter YAML 写坏、`paths` 只写了 `**` 之类全匹配——不再被丢弃，而是像 Claude Code 一样启动就加载，和 AGENTS.md 一起常驻。顺序：用户 AGENTS.md → 用户层常驻规则 → 项目 AGENTS.md 链 → 项目层常驻规则（同层 `.agent` 先、`.claude` 后）。进模型的是剥掉 frontmatter 和 HTML 注释后的正文；置顶区文件清单带上每条规则的路径与 token 数；compact、`/clear`、resume 后仍在。user 层受 user setting source 门控，项目层受 project 门控；计入置顶区既有的 token 告警阈值，不截断。**行为变更**：`.agent/rules` 下以前被静默丢弃的无 `paths` 文件从本版起生效。
 - 首启向导（Provider setup）整体重做，照 `/effort` 刻度尺模式改为自绘组件 `preflight_wizard_ui.WizardScreenUI`，不再借用共用的 `SelectionMenuUI`：六屏统一「标题 / 空行 / 内容 / 空行 / 键位提示」顶部对齐骨架；选项行改为 `❯ label` 无圆点、项间不留空行；provider 屏只在选中项下方显示一行 preset 说明；API key / endpoint / 模型名输入屏去掉边框；确认屏的 JSON 预览改为对齐缩进的静态块；键位提示只写真正绑定的键（去掉并不存在的 k/j）。其它菜单不受影响。
 - `/effort` 的 `ultracode` 改绑 `max` 档（原 `xhigh`）：选 ultracode = 最高思考档 + workflows
   多 agent 编排；`/effort max` 或 `auto` 关开关，`xhigh` 变回普通档。刻度尺描述改为

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.12.4b6
+Version: 0.12.4b8
 Summary: Comate terminal CLI built on comate-agent-sdk
 Project-URL: Homepage, https://github.com/AndyLee1024/agent-sdk
 Project-URL: Repository, https://github.com/AndyLee1024/agent-sdk
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <3.14,>=3.11
 Requires-Dist: charset-normalizer==3.4.7
-Requires-Dist: comate-agent-sdk<0.13,>=0.12.13
+Requires-Dist: comate-agent-sdk<0.13,>=0.12.15
 Requires-Dist: comate-rpc<0.2,>=0.1.4
 Requires-Dist: concurrent-log-handler>=0.9.25
 Requires-Dist: curl-cffi==0.13.0

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/event_renderer.py

@@ -15,6 +15,7 @@ from comate_agent_sdk.agent.events import (
     CompactionResultEvent,
     CompactionStartedEvent,
     FixedOverheadDetail,
+    IdlePruneEvent,
     JobCompletedEvent,
     JobProgressEvent,
     JobStartedEvent,
@@ -2374,6 +2375,21 @@ class EventRenderer:
                     self._append_history_entry(
                         HistoryEntry(entry_type="thinking", text=thinking)
                     )
+            case IdlePruneEvent(
+                item_count=item_count,
+                tokens_saved=tokens_saved,
+                idle_seconds=idle_seconds,
+            ):
+                # 空闲修剪：模型接下来会重读文件，先给用户一行解释（票 03）
+                self.append_system_message(
+                    i18n(
+                        i18n_message.idle_prune_notice,
+                        item_count=item_count,
+                        tokens_saved=f"{tokens_saved:,}",
+                        idle_hours=f"{idle_seconds / 3600:.1f}",
+                    ),
+                    severity="info",
+                )
             case CompactionStartedEvent(
                 current_tokens=_,
                 threshold=_,

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/i18n/_en.py

@@ -122,6 +122,10 @@ EN: dict[str, str] = {
     "goal_paused_hint": (
         "Goal paused. Use /goal resume to continue, or /goal clear to drop it."
     ),
+    "idle_prune_notice": (
+        "Pruned {item_count} older tool results, saving ~{tokens_saved} tokens "
+        "(idle for {idle_hours} h)"
+    ),
     "image_clipboard_empty": "No image in the clipboard.",
     "image_clipboard_reader_missing": (
         "No clipboard reader command found (xclip or wl-paste). "
@@ -159,6 +163,14 @@ EN: dict[str, str] = {
         "Interrupt signal sent. Press Esc again to force interrupt, "
         "or Ctrl+C again to exit."
     ),
+    "mcp_server_tools_enabled_of_total": "Tools: {enabled_count} / {total_count} tools",
+    "mcp_tool_status_disabled": "Status: disabled",
+    "mcp_tool_status_enabled": "Status: enabled",
+    "mcp_tool_toggle_apply_failed": "The setting is saved, but this session did not apply it: {error}",
+    "mcp_tool_toggle_save_failed": "Could not save the tool setting: {error}",
+    "mcp_tools_count_enabled_of_total": "{enabled_count} / {total_count} tools",
+    "mcp_tools_key_hints": "or k/j: Move  Space: Turn on/off  Enter: Details  Esc: Back",
+    "mcp_tools_read_only": "The config of this server is not in a .mcp.json file. You cannot change its tools here.",
     "mode_switch_failed": "Failed to switch permission mode: {error}",
     "output_style_cancelled": "Output style change cancelled.",
     "output_style_global_requires_name": "--global needs a style name, e.g. /output-style learning --global",

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/i18n/_ja.py

@@ -128,6 +128,10 @@ JA: dict[str, str] = {
     "goal_paused_hint": (
         "ゴールは一時停止されました。/goal resume で再開、/goal clear で破棄できます。"
     ),
+    "idle_prune_notice": (
+        "古いツール結果を {item_count} 件整理し、約 {tokens_saved} トークン節約しました"
+        "（{idle_hours} 時間アイドル後）"
+    ),
     "image_clipboard_empty": "クリップボードに画像がありません。",
     "image_clipboard_reader_missing": (
         "クリップボード読み取りコマンド（xclip または wl-paste）が見つかりません。"
@@ -166,6 +170,14 @@ JA: dict[str, str] = {
         "中断シグナルを送信しました。もう一度 Esc を押すと強制中断し、"
         "もう一度 Ctrl+C を押すと終了します。"
     ),
+    "mcp_server_tools_enabled_of_total": "ツール：{enabled_count} / {total_count} 個",
+    "mcp_tool_status_disabled": "状態：無効",
+    "mcp_tool_status_enabled": "状態：有効",
+    "mcp_tool_toggle_apply_failed": "保存しましたが、現在のセッションに反映できませんでした：{error}",
+    "mcp_tool_toggle_save_failed": "ツールの設定を保存できませんでした：{error}",
+    "mcp_tools_count_enabled_of_total": "{enabled_count} / {total_count} 個のツール",
+    "mcp_tools_key_hints": "または k/j：移動  Space：有効/無効  Enter：詳細  Esc：戻る",
+    "mcp_tools_read_only": "このサーバーの設定は .mcp.json ファイルにないため、ここではツールを変更できません。",
     "mode_switch_failed": "権限モードの切り替えに失敗しました：{error}",
     "output_style_cancelled": "出力スタイルの変更をキャンセルしました。",
     "output_style_global_requires_name": "--global にはスタイル名が必要です。例：/output-style learning --global",

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/i18n/_zh.py

@@ -92,6 +92,9 @@ ZH: dict[str, str] = {
     "feedback_value_unknown": "未知",
     "file_log_write_failed": "日志文件写入异常，本次会话的文件日志可能不完整（不影响正常使用）。",
     "goal_paused_hint": "Goal 已暂停。使用 /goal resume 继续，或 /goal clear 清除。",
+    "idle_prune_notice": (
+        "已清理 {item_count} 条较早的工具结果，约省 {tokens_saved} tokens（空闲 {idle_hours} 小时）"
+    ),
     "image_clipboard_empty": "剪贴板中没有图片。",
     "image_clipboard_reader_missing": (
         "未找到剪贴板读取命令（xclip 或 wl-paste），"
@@ -112,6 +115,14 @@ ZH: dict[str, str] = {
     "interrupt_force_or_exit_hint": (
         "已发送中断信号。再次按 Esc 可强制中断，再次按 Ctrl+C 可退出。"
     ),
+    "mcp_server_tools_enabled_of_total": "工具：{enabled_count} / {total_count} 个",
+    "mcp_tool_status_disabled": "状态：已停用",
+    "mcp_tool_status_enabled": "状态：已启用",
+    "mcp_tool_toggle_apply_failed": "已存盘，但没能在当前会话生效：{error}",
+    "mcp_tool_toggle_save_failed": "工具开关没能存盘：{error}",
+    "mcp_tools_count_enabled_of_total": "{enabled_count} / {total_count} 个工具",
+    "mcp_tools_key_hints": "或 k/j：移动  Space：启用/停用  Enter：详情  Esc：返回",
+    "mcp_tools_read_only": "此 server 的配置不在 .mcp.json 文件里，不能在这里修改工具开关。",
     "mode_switch_failed": "切换权限模式失败：{error}",
     "output_style_cancelled": "已取消切换输出风格。",
     "output_style_global_requires_name": "--global 需要带上风格名，例如：/output-style learning --global",

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/i18n/message.py

@@ -87,6 +87,7 @@ class message(StrEnum):  # noqa: N801 - 调用形态是 i18n(message.key)，小
     feedback_value_unknown = "feedback_value_unknown"
     file_log_write_failed = "file_log_write_failed"
     goal_paused_hint = "goal_paused_hint"
+    idle_prune_notice = "idle_prune_notice"
     image_clipboard_empty = "image_clipboard_empty"
     image_clipboard_reader_missing = "image_clipboard_reader_missing"
     image_dropped_feedback_draft = "image_dropped_feedback_draft"
@@ -101,6 +102,14 @@ class message(StrEnum):  # noqa: N801 - 调用形态是 i18n(message.key)，小
     input_cleared_recall_hint = "input_cleared_recall_hint"
     input_cleared_recall_interrupt_hint = "input_cleared_recall_interrupt_hint"
     interrupt_force_or_exit_hint = "interrupt_force_or_exit_hint"
+    mcp_server_tools_enabled_of_total = "mcp_server_tools_enabled_of_total"
+    mcp_tool_status_disabled = "mcp_tool_status_disabled"
+    mcp_tool_status_enabled = "mcp_tool_status_enabled"
+    mcp_tool_toggle_apply_failed = "mcp_tool_toggle_apply_failed"
+    mcp_tool_toggle_save_failed = "mcp_tool_toggle_save_failed"
+    mcp_tools_count_enabled_of_total = "mcp_tools_count_enabled_of_total"
+    mcp_tools_key_hints = "mcp_tools_key_hints"
+    mcp_tools_read_only = "mcp_tools_read_only"
     mode_switch_failed = "mode_switch_failed"
     output_style_cancelled = "output_style_cancelled"
     output_style_global_requires_name = "output_style_global_requires_name"

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/skills_menu.py

@@ -76,6 +76,18 @@ def _is_within(path: Path, root: Path) -> bool:
     return path == root or root in path.parents
 
 
+def _resolved_roots(roots: Sequence[Path]) -> list[Path]:
+    return [resolved for resolved in (_normalized(root) for root in roots) if resolved is not None]
+
+
+def _layer_of(path: Path, project_roots: Sequence[Path], user_roots: Sequence[Path]) -> str | None:
+    if any(_is_within(path, root) for root in project_roots):
+        return "project"
+    if any(_is_within(path, root) for root in user_roots):
+        return "user"
+    return None
+
+
 def _resolve_source(
     skill: Any,
     *,
@@ -100,22 +112,26 @@ def _resolve_source(
             bundled_root = _normalized(bundled_skills_dir())
             if bundled_root is not None and _is_within(resolved, bundled_root):
                 return "builtin"
-            if any(_is_within(resolved, root) for root in project_roots):
-                return "project"
-            if any(_is_within(resolved, root) for root in user_roots):
-                return "user"
+            # 先按真实路径比（扫描根也 resolve，扫描根本身是符号链接时才对得上）；
+            # skill 链到所有扫描根之外时真实路径落空，再按扫描时的原路径比，不兜底成 user。
+            layer = _layer_of(
+                resolved, _resolved_roots(project_roots), _resolved_roots(user_roots)
+            ) or _layer_of(base_dir.expanduser(), project_roots, user_roots)
+            if layer is not None:
+                return layer
     return "user"
 
 
 def _split_scan_roots(
     project_root: Path | str | None,
 ) -> tuple[list[Path], list[Path]]:
-    """扫描根拆成项目层与用户层；按「是否挂在 home 下」判断，不依赖 SDK 的返回顺序。"""
-    scan_roots = skill_scan_roots(project_root if project_root is not None else Path.cwd())
-    home = _normalized(Path.home())
-    user_roots = [root for root in scan_roots if home is not None and root.parent.parent == home]
-    project_roots = [root for root in scan_roots if root not in user_roots]
-    return project_roots, user_roots
+    """扫描根拆成项目层与用户层；按 SDK 的配置层过滤取，不按目录形状猜
+    （`~/.config/agents/skills` 不直接挂在 home 下）。"""
+    root = project_root if project_root is not None else Path.cwd()
+    return (
+        skill_scan_roots(root, sources=("project",)),
+        skill_scan_roots(root, sources=("user",)),
+    )
 
 
 def build_skill_menu_rows(

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/tips.py

@@ -227,9 +227,14 @@ LOADING_TIP_PAIRS: tuple[LoadingTip, ...] = (
         ja="自作コマンドは shell 出力やファイル内容を埋め込めます",
     ),
     LoadingTip(
-        en="Rules in .agent/rules/ load only when matching files appear.",
-        zh=".agent/rules/ 的规则只在碰到指定路径的文件时才注入",
-        ja=".agent/rules/ の規則は該当ファイル出現時のみ注入",
+        en=".agent and .claude rules load at startup, or on paths: match.",
+        zh=".agent 与 .claude 规则都读；带 paths: 命中才注入，不带启动加载",
+        ja=".agent と .claude の両方を読む。paths: は一致時、なしは起動時",
+    ),
+    LoadingTip(
+        en="Use npx skills add; skills in .agents/skills/ work as-is.",
+        zh="npx skills add 装进 .agents/skills/ 的技能直接用，不用挪目录",
+        ja="npx skills add で .agents/skills/ に追加、そのまま使えます",
     ),
     LoadingTip(
         en="Define your own subagents as .md files under .agent/agents.",

{comate_cli-0.12.4b6 → comate_cli-0.12.4b8}/comate_cli/terminal_agent/tui_parts/commands.py

@@ -67,6 +67,10 @@ if TYPE_CHECKING:
 _GLOBAL_FLAG_RE = re.compile(r"(?:(?<=\s)|^)(?:--global|-g)(?=\s|$)")
 
 
+# `/mcp` 菜单能改写的配置层：只有这三层落在磁盘 .mcp.json 上。
+_MCP_WRITABLE_SCOPES = frozenset({"user", "project", "local"})
+
+
 def _strip_global_flag(args: str) -> tuple[str, bool]:
     """从参数串里摘出 `--global` / `-g`，返回 (剩余参数, 是否出现)。剩余部分只去首尾空白。"""
     stripped, count = _GLOBAL_FLAG_RE.subn("", args)
@@ -78,6 +82,8 @@ class CommandsMixin:
     _skills_menu_rows: dict[str, SkillMenuRow] = {}
     # `/skills` 菜单会话内发生过启停：关闭菜单时一次性补发 listing delta。
     _skills_listing_flush_pending: bool = False
+    # `/mcp` 工具列表当前打开的 server；离开工具列表时清空，异步刷新据此判断还能不能改菜单。
+    _mcp_tools_menu_alias: str | None = None
 
     def _sync_local_interactive_ui_barrier(self) -> None:
         return
@@ -950,9 +956,12 @@ class CommandsMixin:
         info_rows = list(getattr(manager, "tool_infos", []) or []) if manager is not None else []
         failed_rows = list(getattr(manager, "failed_servers", []) or []) if manager is not None else []
         state_rows = dict(getattr(manager, "server_states", {}) or {}) if manager is not None else {}
+        disabled_names_fn = getattr(manager, "disabled_tool_names", None)
 
-        tools_by_alias: dict[str, list[dict[str, str]]] = {}
+        # 账本 tool_infos 是全集（含停用的）；停用与否以 manager 为准，不回头读配置比对。
+        tools_by_alias: dict[str, list[dict[str, Any]]] = {}
         tool_count_by_alias: dict[str, int] = {}
+        enabled_count_by_alias: dict[str, int] = {}
         for info in info_rows:
             alias = str(getattr(info, "server_alias", "")).strip()
             if not alias:
@@ -960,14 +969,18 @@ class CommandsMixin:
             remote_name = str(getattr(info, "remote_name", "")).strip()
             mapped_name = str(getattr(info, "mapped_name", "")).strip()
             description = str(getattr(info, "description", "")).strip()
+            disabled = callable(disabled_names_fn) and remote_name in disabled_names_fn(alias)
             tools_by_alias.setdefault(alias, []).append(
                 {
                     "remote_name": remote_name or mapped_name or "(unknown tool)",
                     "mapped_name": mapped_name or remote_name or "(unknown tool)",
                     "description": description or "(No description)",
+                    "disabled": disabled,
                 }
             )
             tool_count_by_alias[alias] = tool_count_by_alias.get(alias, 0) + 1
+            if not disabled:
+                enabled_count_by_alias[alias] = enabled_count_by_alias.get(alias, 0) + 1
 
         failed_reason_by_alias: dict[str, str] = {
             str(alias): str(reason) for alias, reason in failed_rows
@@ -979,15 +992,15 @@ class CommandsMixin:
             server_type = str(cfg.get("type", "stdio")).strip().upper()  # type: ignore[attr-defined]
             endpoint = self._format_mcp_endpoint(cfg)
             enabled = bool(cfg.get("enabled", True))  # type: ignore[attr-defined]
+            # 总数与启用数都只从账本算（票 01：state.tool_count 是连接那一刻的自报数，
+            # TTL 刷新后会和账本对不上）。
             tool_count = 0 if not enabled else int(tool_count_by_alias.get(alias, 0))
+            enabled_tool_count = 0 if not enabled else int(enabled_count_by_alias.get(alias, 0))
             tools = [] if not enabled else list(tools_by_alias.get(alias, []))
             tools.sort(key=lambda item: item["remote_name"].lower())
             state = state_rows.get(alias)
             raw_status = str(getattr(state, "status", "") or "").strip().lower()
             state_reason = str(getattr(state, "reason", "") or "").strip() or None
-            state_tool_count = int(getattr(state, "tool_count", tool_count) or 0)
-            if enabled and raw_status == "connected":
-                tool_count = state_tool_count
 
             if not enabled:
                 status = f"{EFFORT_LOW} Disabled"
@@ -1003,6 +1016,7 @@ class CommandsMixin:
             elif raw_status == "failed":
                 status = f"{CROSS_MARK} {state_reason}" if state_reason else f"{CROSS_MARK} Not connected"
                 tool_count = 0
+                enabled_tool_count = 0
             elif raw_status == "connected":
                 status = f"{CHECK_MARK} Connected"
             elif tool_count > 0:
@@ -1033,6 +1047,7 @@ class CommandsMixin:
                     "status": status,
                     "raw_status": raw_status,
                     "tool_count": tool_count,
+                    "enabled_tool_count": enabled_tool_count,
                     "tools": tools,
                     "config_location": config_location,
                     "config_scope": config_scope,
@@ -1202,15 +1217,18 @@ class CommandsMixin:
             return
 
         tool_count = int(row["tool_count"])
+        enabled_tool_count = int(row.get("enabled_tool_count", tool_count))
+        has_disabled_tools = enabled_tool_count < tool_count
         options: list[dict[str, str]] = []
         raw_status = str(row.get("raw_status", "")).strip().lower()
         is_disabled = raw_status == "disabled" or not bool(row.get("enabled", True))
+        # tool_count 是账本全集：工具全部停用后入口仍在，用户才能回来重新启用。
         if raw_status == "connected" and tool_count > 0:
             options.append(
                 {
                     "value": "view_tools",
                     "label": "View tools",
-                    "description": f"{tool_count} tools",
+                    "description": self._mcp_tools_count_text(enabled_tool_count, tool_count),
                 }
             )
         if not is_disabled and raw_status != "connecting":
@@ -1244,7 +1262,15 @@ class CommandsMixin:
             f"Status: {row['status']}",
             f"Config location: {row['config_location']}",
             "Capabilities: tools",
-            f"Tools: {tool_count} tools",
+            (
+                i18n(
+                    message.mcp_server_tools_enabled_of_total,
+                    enabled_count=enabled_tool_count,
+                    total_count=tool_count,
+                )
+                if has_disabled_tools
+                else f"Tools: {tool_count} tools"
+            ),
         ]
 
         def on_confirm(value: str) -> None:
@@ -1348,9 +1374,15 @@ class CommandsMixin:
                     mgr = getattr(agent_runtime, "_mcp_manager", None)
                     tool_count = 0
                     if mgr:
+                        # 只数启用的工具：停用的不发给模型，不算「loaded」。
+                        disabled_names_fn = getattr(mgr, "disabled_tool_names", None)
+                        disabled_names = (
+                            disabled_names_fn(alias) if callable(disabled_names_fn) else frozenset()
+                        )
                         tool_count = sum(
                             1 for info in (getattr(mgr, "tool_infos", None) or [])
                             if getattr(info, "server_alias", "") == alias
+                            and getattr(info, "remote_name", "") not in disabled_names
                         )
                     message = f"{past_action} {alias}. ({tool_count} tools loaded)"
                 else:
@@ -1481,25 +1513,17 @@ class CommandsMixin:
             )
             self._refresh_layers()
             return
-        tools = list(row["tools"])
-        options: list[dict[str, str]] = []
-        for index, tool in enumerate(tools, start=1):
-            options.append(
-                {
-                    "value": str(tool["mapped_name"]),
-                    "label": f"{index}. {tool['remote_name']}",
-                    "description": str(tool["mapped_name"]),
-                }
+        read_only = str(row.get("config_scope", "")).strip().lower() not in _MCP_WRITABLE_SCOPES
+
+        def on_toggle(value: str) -> None:
+            self._toggle_mcp_tool_disabled(
+                rows_by_alias=rows_by_alias,
+                alias=alias,
+                mapped_name=str(value).strip(),
             )
-        options.append(
-            {
-                "value": "back",
-                "label": "Back",
-                "description": f"Return to {alias}",
-            }
-        )
 
         def on_confirm(value: str) -> None:
+            self._mcp_tools_menu_alias = None
             selected = str(value).strip()
             if selected == "back":
                 self._mark_local_ui_transition_pending()
@@ -1520,6 +1544,7 @@ class CommandsMixin:
             )
 
         def on_cancel() -> None:
+            self._mcp_tools_menu_alias = None
             self._mark_local_ui_transition_pending()
             self._schedule_background(
                 self._open_mcp_server_detail_menu_async(
@@ -1528,12 +1553,15 @@ class CommandsMixin:
                 )
             )
 
+        # 只读 server 不注册 on_toggle：Space 绑定的 filter 为假，按键直接失效。
         ok = self._selection_ui.set_options(
             title=f"Tools for {alias}",
-            options=options,
+            options=self._mcp_tools_menu_options(row),
             on_confirm=on_confirm,
             on_cancel=on_cancel,
-            context_lines=[f"{len(tools)} tools"],
+            on_toggle=None if read_only else on_toggle,
+            key_hints=None if read_only else i18n(message.mcp_tools_key_hints),
+            context_lines=self._mcp_tools_context_lines(row),
         )
         if not ok:
             self._append_slash_command_result(
@@ -1542,11 +1570,157 @@ class CommandsMixin:
             )
             self._refresh_layers()
             return
+        self._mcp_tools_menu_alias = alias
         self._selection_ui.refresh()
         self._set_ui_mode(UIMode.SELECTION)
         self._sync_focus_for_mode()
         self._invalidate()
 
+    @staticmethod
+    def _mcp_tools_menu_options(row: dict[str, Any]) -> list[dict[str, str]]:
+        alias = str(row["alias"])
+        options: list[dict[str, str]] = []
+        for index, tool in enumerate(row["tools"], start=1):
+            mark = "[ ]" if tool.get("disabled") else "[x]"
+            options.append(
+                {
+                    "value": str(tool["mapped_name"]),
+                    "label": f"{mark} {index}. {tool['remote_name']}",
+                    "description": str(tool["mapped_name"]),
+                }
+            )
+        options.append(
+            {
+                "value": "back",
+                "label": "Back",
+                "description": f"Return to {alias}",
+            }
+        )
+        return options
+
+    @staticmethod
+    def _mcp_tools_count_text(enabled_tool_count: int, tool_count: int) -> str:
+        if enabled_tool_count < tool_count:
+            return i18n(
+                message.mcp_tools_count_enabled_of_total,
+                enabled_count=enabled_tool_count,
+                total_count=tool_count,
+            )
+        return f"{tool_count} tools"
+
+    @staticmethod
+    def _mcp_tools_context_lines(row: dict[str, Any], *, error: str | None = None) -> list[str]:
+        enabled_tool_count = sum(1 for tool in row["tools"] if not tool.get("disabled"))
+        lines = [CommandsMixin._mcp_tools_count_text(enabled_tool_count, len(row["tools"]))]
+        if str(row.get("config_scope", "")).strip().lower() not in _MCP_WRITABLE_SCOPES:
+            lines.append(i18n(message.mcp_tools_read_only))
+        if error:
+            lines.append(error)
+        return lines
+
+    def _toggle_mcp_tool_disabled(
+        self,
+        *,
+        rows_by_alias: dict[str, dict[str, Any]],
+        alias: str,
+        mapped_name: str,
+    ) -> None:
+        """`/mcp` 工具列表里按 Space 停用 / 启用一个工具（ADR-0032）。
+
+        顺序即契约：先写该 server 所在层的 .mcp.json，成功后才改运行时名单，
+        最后原地刷新勾选。写盘失败则运行时与勾选都不变，菜单里显示一行错误。
+        不走整台开关那条 invalidate + 强制重载的路：那会重连全部 server。
+        """
+        row = rows_by_alias.get(alias)
+        if row is None:
+            return
+        tool = next(
+            (item for item in row["tools"] if str(item["mapped_name"]) == mapped_name),
+            None,
+        )
+        if tool is None:
+            # Back 行。
+            return
+        config_scope = str(row.get("config_scope", "")).strip().lower()
+        if config_scope not in _MCP_WRITABLE_SCOPES:
+            return
+
+        remote_name = str(tool["remote_name"])
+        project_root = getattr(self._session, "_cwd", None)
+        try:
+            from comate_agent_sdk.mcp import load_scope_servers, set_mcp_server_disabled_tools
+
+            servers = load_scope_servers(
+                scope=config_scope,  # type: ignore[arg-type]
+                project_root=project_root,
+                include_disabled=True,
+            )
+            # 以磁盘条目现有名单为底，只增删这一个名字：server 不提供的名字原样保留（Q11）。
+            current = [str(name) for name in (servers.get(alias, {}).get("disabled_tools") or [])]
+            if tool.get("disabled"):
+                names = [name for name in current if name != remote_name]
+            elif remote_name in current:
+                names = current
+            else:
+                names = [*current, remote_name]
+            set_mcp_server_disabled_tools(
+                alias,
+                names,
+                scope=config_scope,  # type: ignore[arg-type]
+                project_root=project_root,
+            )
+        except Exception as exc:
+            logger.warning("Failed to save disabled MCP tools for '%s': %s", alias, exc)
+            self._selection_ui.update_context_lines(
+                self._mcp_tools_context_lines(
+                    row,
+                    error=i18n(message.mcp_tool_toggle_save_failed, error=exc),
+                )
+            )
+            self._invalidate()
+            return
+
+        # 运行时生效与刷新在后台 task 里；先记下已存盘的状态，
+        # 刷新落地前再按一次 Space 才会按新状态反向切换，而不是重复同一个方向。
+        tool["disabled"] = remote_name in names
+        self._schedule_background(
+            self._apply_mcp_disabled_tools(
+                rows_by_alias=rows_by_alias,
+                alias=alias,
+                names=names,
+            )
+        )
+
+    async def _apply_mcp_disabled_tools(
+        self,
+        *,
+        rows_by_alias: dict[str, dict[str, Any]],
+        alias: str,
+        names: list[str],
+    ) -> None:
+        """名单已存盘：通知运行时（不重连），再按 manager 的新状态刷新工具列表。"""
+        error: str | None = None
+        try:
+            await self._session._agent.set_mcp_disabled_tools(alias, names)
+        except Exception as exc:
+            logger.warning("Failed to apply disabled MCP tools for '%s': %s", alias, exc)
+            error = i18n(message.mcp_tool_toggle_apply_failed, error=exc)
+
+        refreshed_rows = self._collect_mcp_cached_rows()
+        if refreshed_rows:
+            # 原地更新：工具详情页与 server 详情页共用这份 rows，返回时看到的是新状态。
+            rows_by_alias.update({str(r["alias"]): r for r in refreshed_rows})
+
+        # 用户已离开这个工具列表：不能把工具行刷进别的菜单。
+        if self._mcp_tools_menu_alias != alias or self._ui_mode != UIMode.SELECTION:
+            return
+        row = rows_by_alias.get(alias)
+        if row is None:
+            return
+        self._selection_ui.update_context_lines(self._mcp_tools_context_lines(row, error=error))
+        self._selection_ui.update_options_preserve_selection(self._mcp_tools_menu_options(row))
+        self._invalidate()
+
     async def _open_mcp_tool_detail_menu_async(
         self,
         *,
@@ -1598,6 +1772,11 @@ class CommandsMixin:
         context_lines = [
             f"Tool name: {tool['remote_name']}",
             f"Full name: {tool['mapped_name']}",
+            i18n(
+                message.mcp_tool_status_disabled
+                if tool.get("disabled")
+                else message.mcp_tool_status_enabled
+            ),
             "Description:",
         ]
         context_lines.extend(description.splitlines())