From b69e8d03d6f2a7d40b7fc12d59b0d253f4a907ec Mon Sep 17 00:00:00 2001 From: "haozhe.yang" Date: Mon, 31 Aug 2026 22:50:36 +0800 Subject: [PATCH] docs: rename permission modes to Always Ask, Ask When Needed, and Never Ask MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up to #3403 for the user docs: living pages (en + zh mirrors) now use the new mode names and descriptions — slash-commands and interaction references for /ask-when-needed (aliases /yolo, /yes) and /never-ask (alias /auto), CLI flag and config glosses, guides, customization pages, and the docs AGENTS.md terminology table. Wire and config ids (manual/yolo/auto) are unchanged; release notes are historical and untouched. --- docs/AGENTS.md | 6 ++++-- docs/en/configuration/config-files.md | 2 +- docs/en/configuration/overrides.md | 6 +++--- docs/en/customization/agents.md | 2 +- docs/en/customization/mcp.md | 2 +- docs/en/customization/themes.md | 2 +- docs/en/guides/getting-started.md | 2 +- docs/en/guides/interaction.md | 12 ++++++------ docs/en/guides/use-cases.md | 2 +- docs/en/reference/kimi-command.md | 6 +++--- docs/en/reference/slash-commands.md | 8 ++++---- docs/en/reference/tools.md | 2 +- docs/zh/configuration/config-files.md | 2 +- docs/zh/configuration/overrides.md | 6 +++--- docs/zh/customization/agents.md | 2 +- docs/zh/customization/mcp.md | 2 +- docs/zh/customization/themes.md | 2 +- docs/zh/guides/getting-started.md | 2 +- docs/zh/guides/interaction.md | 12 ++++++------ docs/zh/guides/use-cases.md | 2 +- docs/zh/reference/kimi-command.md | 6 +++--- docs/zh/reference/slash-commands.md | 8 ++++---- docs/zh/reference/tools.md | 2 +- 23 files changed, 50 insertions(+), 48 deletions(-) diff --git a/docs/AGENTS.md b/docs/AGENTS.md index c03f4439110..5ce3276964b 100644 --- a/docs/AGENTS.md +++ b/docs/AGENTS.md @@ -54,7 +54,7 @@ Both groups share the same behavior: they arrive with a specific goal, scan head ## Wording conventions - Do not change H1 titles or nav/sidebar labels. -- English H2+ headings use sentence case (only the first word capitalized unless it is a proper noun). Treat "Wire", "Plan mode", "YOLO mode", and "Thinking mode" as proper nouns; do not treat "agent" as a proper noun. +- English H2+ headings use sentence case (only the first word capitalized unless it is a proper noun). Treat "Wire", "Plan mode", "Thinking mode", and the permission mode names "Always Ask", "Ask When Needed", and "Never Ask" as proper nouns; do not treat "agent" as a proper noun. - Chinese H2+ headings keep English words in sentence case; preserve proper nouns listed in the term table below. - Use `API key` in English and `API 密钥` in Chinese; keep `JSON`, `JSONL`, `OAuth`, `macOS`, `Node.js`, `npm`, `pnpm`, and `TypeScript` as-is. - Use straight double quotes with spaces for quoted content: `"被引内容"` (not curly quotes). Add a space before and after the quoted text when adjacent to CJK characters. Use corner brackets `「」` for special terms (e.g., `「工具」`, `「会话」`). @@ -71,7 +71,9 @@ Term mapping (Chinese <-> English, and proper noun handling): | subagent | subagent | no | no | | Shell | shell | yes | no | | Plan 模式 | Plan mode | yes | yes (Plan mode) | -| YOLO 模式 | YOLO mode | yes | yes (YOLO mode) | +| 始终询问 | Always Ask | yes | yes | +| 必要时询问 | Ask When Needed | yes | yes | +| 完全自动 | Never Ask | yes | yes | | Thinking 模式 | Thinking mode | yes | yes (Thinking mode) | | MCP | MCP | yes | yes | | Kimi Code CLI | Kimi Code CLI | yes | yes | diff --git a/docs/en/configuration/config-files.md b/docs/en/configuration/config-files.md index c48edf1b9a4..28957a03b1b 100644 --- a/docs/en/configuration/config-files.md +++ b/docs/en/configuration/config-files.md @@ -98,7 +98,7 @@ Fields in the config file fall into two categories: **top-level scalars** that d | Field | Type | Default | Description | | --- | --- | --- | --- | | `default_model` | `string` | — | Default model alias; must be defined in `models` | -| `default_permission_mode` | `string` | `manual` | Default permission mode for new sessions; one of `manual` (prompt each time), `yolo` (auto-approve tool actions, but the agent may still ask questions), or `auto` (fully autonomous, but dangerous commands are always blocked) | +| `default_permission_mode` | `string` | `manual` | Default permission mode for new sessions; one of `manual` (Always Ask: auto-read only; everything else needs your approval first), `yolo` (Ask When Needed: routine edits and commands run automatically; risky actions, questions, and plans still ask), or `auto` (Never Ask: never interrupts you; everything runs and is decided automatically, but dangerous commands are always blocked) | | `default_plan_mode` | `boolean` | `false` | Whether new sessions start in Plan mode (produce a plan before executing) by default | | `merge_all_available_skills` | `boolean` | `true` | Whether to merge Agent Skills from all available directories | | `extra_skill_dirs` | `array` | — | Extra skill search directories, layered on top of the default directories | diff --git a/docs/en/configuration/overrides.md b/docs/en/configuration/overrides.md index c59a1b28d27..94e126c77fc 100644 --- a/docs/en/configuration/overrides.md +++ b/docs/en/configuration/overrides.md @@ -18,7 +18,7 @@ Environment variables fall into three categories by function and cannot be colla ## Priority for ordinary runtime parameters -For ordinary runtime parameters such as model alias, Plan mode, yolo mode, and Skills directories, priority from highest to lowest is: +For ordinary runtime parameters such as model alias, Plan mode, permission mode, and Skills directories, priority from highest to lowest is: 1. **Command-line options** (`-m`, `--plan`, `--yolo`, etc.): apply only to the current startup 2. **User config file** (`~/.kimi-code/config.toml`): stores long-term preferences @@ -55,8 +55,8 @@ Options passed at startup have the highest priority and apply only to the curren | --- | --- | | `-S, --session [id]` | Resume a specific session; enters interactive selection when no id is given | | `-c, --continue` | Resume the last session for the current working directory | -| `-y, --yolo` | Auto-approve regular tool calls; the agent may still ask questions | -| `--auto` | Start in auto permission mode: fully autonomous, the agent will not ask questions | +| `-y, --yolo` | Ask When Needed mode: routine edits and commands run automatically; the agent may still ask questions | +| `--auto` | Never Ask mode: never interrupts you; the agent will not ask questions | | `--plan` | Start in Plan mode | | `-m, --model ` | Use a specific model alias for this session | | `-p, --prompt ` | Run in non-interactive mode: execute a single prompt and exit | diff --git a/docs/en/customization/agents.md b/docs/en/customization/agents.md index 0056048cec8..f3e0d3d1a6f 100644 --- a/docs/en/customization/agents.md +++ b/docs/en/customization/agents.md @@ -18,7 +18,7 @@ A `coder` sub-agent shares most of the main Agent's tool set: it can run shell c Sub-agents are scheduled automatically by the main Agent — based on task complexity, context consumption, and sub-task independence, they are dispatched at the right moment without the user having to specify one. -Each dispatch is presented in the terminal as an approval request (unless it matches an allow rule or YOLO mode is active), giving you a chance to review the task description. You can also instruct the main Agent directly in conversation to use a specific sub-agent, for example: "Use explore to map out the relevant files before making any changes." +Each dispatch is presented in the terminal as an approval request (unless it matches an allow rule or Ask When Needed mode is active), giving you a chance to review the task description. You can also instruct the main Agent directly in conversation to use a specific sub-agent, for example: "Use explore to map out the relevant files before making any changes." Sub-agents support running in the background: results are automatically returned to the main Agent upon completion, with no manual polling needed. You can also call back an existing sub-agent instance to continue the same task. diff --git a/docs/en/customization/mcp.md b/docs/en/customization/mcp.md index cf7dd9c4c1c..be65fd48b49 100644 --- a/docs/en/customization/mcp.md +++ b/docs/en/customization/mcp.md @@ -100,7 +100,7 @@ When connecting to external MCP servers, be aware of: - Keep manual approval for high-risk tools (file writes, command execution, etc.); avoid using `mcp__*` wildcards to allow all tools at once ::: warning Note -In YOLO mode, MCP tool calls are automatically approved. Only use this mode when you fully trust the MCP servers you have connected. +In Ask When Needed mode, MCP tool calls are automatically approved. Only use this mode when you fully trust the MCP servers you have connected. ::: ## Next steps diff --git a/docs/en/customization/themes.md b/docs/en/customization/themes.md index 82e0e55dfd7..ffa5399d359 100644 --- a/docs/en/customization/themes.md +++ b/docs/en/customization/themes.md @@ -17,7 +17,7 @@ Custom themes can override the tokens below. The `dark` and `light` columns show | `border` | `#5A5A5A` | `#737373` | Pane and editor borders, Markdown horizontal rule | | `borderFocus` | `#E8A838` | `#92660A` | Focus / attention border, currently only the approval panel | | `success` | `#4EC87E` | `#0E7A38` | Success state. `✓`, "enabled", completed | -| `warning` | `#E8A838` | `#92660A` | Warning state. auto/yolo badges, stale markers, Plan mode hint | +| `warning` | `#E8A838` | `#92660A` | Warning state. Ask When Needed/Never Ask badges, stale markers, Plan mode hint | | `error` | `#E85454` | `#B91C1C` | Error state. Error messages, failed tool output | | `diffAdded` | `#4EC87E` | `#0E7A38` | Diff added lines | | `diffRemoved` | `#E85454` | `#B91C1C` | Diff removed lines | diff --git a/docs/en/guides/getting-started.md b/docs/en/guides/getting-started.md index 609236c25a9..d0ff35c44dd 100644 --- a/docs/en/guides/getting-started.md +++ b/docs/en/guides/getting-started.md @@ -170,6 +170,6 @@ npm uninstall -g @moonshot-ai/kimi-code ## Next steps -- [Interaction and input](./interaction.md) — input box operations, approval flow, Plan mode, and YOLO mode explained +- [Interaction and input](./interaction.md) — input box operations, approval flow, Plan mode, and Ask When Needed mode explained - [Sessions and context](./sessions.md) — resuming sessions, compressing context, exporting sessions - [Common use cases](./use-cases.md) — prompt examples for typical tasks diff --git a/docs/en/guides/interaction.md b/docs/en/guides/interaction.md index 4c058434347..e1577acb905 100644 --- a/docs/en/guides/interaction.md +++ b/docs/en/guides/interaction.md @@ -33,7 +33,7 @@ Type `/` to open the completion menu — it filters as you type, `Esc` closes it | `/undo` | Undo recent prompts | | `/model` | Switch the model used in the current session | | `/plan` | Toggle Plan mode (plan first, then execute) | -| `/yolo` | Toggle YOLO mode (auto-approve regular tool calls) | +| `/ask-when-needed` | Toggle Ask When Needed mode (routine edits and commands run automatically) | | `/goal` | Start or manage goal mode | | `/help` | Show all commands | @@ -58,13 +58,13 @@ When the agent calls a tool that has side effects — modifying files, running c - **Approve for this session**: auto-approves the same kind of call for the rest of the session - **Permanent rules**: add allow / deny entries in [Configuration files](../configuration/config-files.md#permission) -Approvals are not triggered for regular tool calls in YOLO mode, nor for writes to plan files in Plan mode. +Approvals are not triggered for regular tool calls in Ask When Needed mode, nor for writes to plan files in Plan mode. -### YOLO / Auto mode +### Ask When Needed / Never Ask mode -**YOLO mode** (`/yolo`) auto-approves regular tool calls, making it suitable for batch tasks you know are safe. It still asks before sensitive actions — accessing sensitive files such as `.env` or SSH keys, running dangerous commands such as `shutdown` or `rm -rf`, or exiting Plan mode — and the agent can still ask you questions. +**Ask When Needed mode** (`/ask-when-needed`) auto-approves regular tool calls, making it suitable for batch tasks you know are safe. It still asks before sensitive actions — accessing sensitive files such as `.env` or SSH keys, running dangerous commands such as `shutdown` or `rm -rf`, or exiting Plan mode — and the agent can still ask you questions. -**Auto mode** (`/auto`) is the fully unattended mode: every tool approval is handled automatically, including sensitive files and plan exits, and the agent never asks you questions — it decides everything on its own. The only exception is the built-in dangerous-command guard: commands such as `shutdown`, `reboot`, or `rm -rf` are always blocked in Auto mode, and always require your confirmation in Manual and YOLO mode. +**Never Ask mode** (`/never-ask`) is the fully unattended mode: every tool approval is handled automatically, including sensitive files and plan exits, and the agent never asks you questions — it decides everything on its own. The only exception is the built-in dangerous-command guard: commands such as `shutdown`, `reboot`, or `rm -rf` are always blocked in Never Ask mode, and always require your confirmation in Always Ask and Ask When Needed mode. ## Mode switching @@ -76,7 +76,7 @@ In Plan mode the agent first outputs an action plan and waits for your approval - Toggle: `Shift-Tab` or `/plan` - Clear the current plan: `/plan clear` (only while idle) -After producing a plan the agent pauses for your review — you can approve it, reject it, or ask for revisions. Exiting Plan mode requires your confirmation even if YOLO mode is also active. Auto mode is the exception: plan exits are approved automatically and marked as "Auto-approved" in the transcript. +After producing a plan the agent pauses for your review — you can approve it, reject it, or ask for revisions. Exiting Plan mode requires your confirmation even if Ask When Needed mode is also active. Never Ask mode is the exception: plan exits are approved automatically and marked as "Auto-approved" in the transcript. ### Shell mode diff --git a/docs/en/guides/use-cases.md b/docs/en/guides/use-cases.md index adf5154a7f0..13ed05d6398 100644 --- a/docs/en/guides/use-cases.md +++ b/docs/en/guides/use-cases.md @@ -99,7 +99,7 @@ Analyze the access logs in logs/ from the past 7 days. For each API path, comput Research the main dependency injection options for TypeScript (tsyringe, inversify, awilix). Compare them across three dimensions: API style, decorator requirements, and runtime overhead. Give me a recommendation that fits on one page. ``` -For batch tasks you know are safe, use `--yolo` or `/yolo` to skip approval prompts, or add pre-approved allowlist rules for specific tools in [Configuration files](../configuration/config-files.md#permission). +For batch tasks you know are safe, use `--yolo` or `/ask-when-needed` to skip approval prompts, or add pre-approved allowlist rules for specific tools in [Configuration files](../configuration/config-files.md#permission). ## Scheduled tasks and reminders diff --git a/docs/en/reference/kimi-command.md b/docs/en/reference/kimi-command.md index 6d7c19e20cf..915155bf7e3 100644 --- a/docs/en/reference/kimi-command.md +++ b/docs/en/reference/kimi-command.md @@ -20,8 +20,8 @@ All flags are optional — run `kimi` directly to enter an interactive session: | `--model ` | `-m` | Specify a model alias for this launch. When omitted, new sessions use `default_model` from the config file | | `--prompt ` | `-p` | Run a single prompt non-interactively and stream the Assistant output to stdout. This mode does not open the TUI | | `--output-format ` | | Set the non-interactive output format; supports `text` and `stream-json`. Can only be used with `--prompt`; defaults to `text` | -| `--yolo` | `-y` | Auto-approve regular tool calls, skipping approval requests | -| `--auto` | | Start with auto permission mode; tool approvals are handled automatically and the Agent will not ask the user questions | +| `--yolo` | `-y` | Start in Ask When Needed mode: routine edits and commands run automatically; risky actions, questions, and plans still ask | +| `--auto` | | Start in Never Ask mode: never interrupts you; everything runs and is decided automatically | | `--plan` | | Start a new session in Plan mode — the AI will prioritize read-only tools for exploration and planning | | `--skills-dir ` | | Load Skills from the specified directory, replacing the automatically discovered user and project directories. Can be repeated | | `--agent ` | | Start a new session with the specified agent as the main Agent. Cannot be combined with `--session`/`--continue` | @@ -43,7 +43,7 @@ The following combinations are rejected at startup: - `--prompt` cannot be used with `--yolo`, `--auto`, or `--plan` — non-interactive mode uses `auto` permission by default - `--output-format` can only be used together with `--prompt` -When resuming a session, you can override its saved permission or plan mode by adding `--auto`, `--yolo`, or `--plan`. For example, `kimi --continue --auto` resumes the latest session and switches it to auto permission mode. +When resuming a session, you can override its saved permission or plan mode by adding `--auto`, `--yolo`, or `--plan`. For example, `kimi --continue --auto` resumes the latest session and switches it to Never Ask mode. ## Common Usage diff --git a/docs/en/reference/slash-commands.md b/docs/en/reference/slash-commands.md index b137b1a0396..726578b4aa5 100644 --- a/docs/en/reference/slash-commands.md +++ b/docs/en/reference/slash-commands.md @@ -47,16 +47,16 @@ Some commands are only available in the idle state. Executing these commands whi | Command | Alias | Description | Always available | | --- | --- | --- | --- | -| `/yolo [on\|off]` | `/yes` | Toggle YOLO mode. Without arguments, flips the current state; explicitly passing `on`/`off` forces the setting. When enabled, skips approval for regular tool calls; Plan mode exit approval is not affected | Yes | -| `/auto [on\|off]` | — | Toggle auto permission mode. When enabled, tool approvals are handled automatically and the Agent will not ask the user questions | Yes | +| `/ask-when-needed [on\|off]` | `/yolo`, `/yes` | Toggle Ask When Needed mode. Without arguments, flips the current state; explicitly passing `on`/`off` forces the setting. When enabled, routine edits and commands run automatically; risky actions, questions, and plans still ask | Yes | +| `/never-ask [on\|off]` | `/auto` | Toggle Never Ask mode. When enabled, it never interrupts you; everything runs and is decided automatically | Yes | | `/plan [on\|off]` | — | Toggle Plan mode. Without arguments, flips the current state; explicitly passing `on`/`off` forces the setting. Simply toggling does not create an empty plan file | Yes | | `/plan clear` | — | Clear the current plan | No | | `/swarm on\|off` | — | Turn swarm mode on or off without sending a prompt. | Yes | -| `/swarm ` | — | Turn swarm mode on, then send `` as a normal prompt. If the turn completes normally, swarm mode turns off automatically. In `manual` permission mode, Kimi Code asks whether to switch to `auto` or `yolo` before starting. | No | +| `/swarm ` | — | Turn swarm mode on, then send `` as a normal prompt. If the turn completes normally, swarm mode turns off automatically. In `manual` permission mode, Kimi Code asks whether to switch to Ask When Needed or Never Ask mode before starting. | No | | `/goal [...]` | — | Start or manage an autonomous goal | See below | ::: warning -`/yolo` skips approval for regular tool calls. Please make sure you understand the potential risks before enabling it. Plan mode exit approval is not bypassed by `/yolo`; `Bash` inside Plan mode is still subject to the regular `/yolo` allow rules. +`/ask-when-needed` skips approval for regular tool calls. Please make sure you understand the potential risks before enabling it. Plan mode exit approval is not bypassed by `/ask-when-needed`; `Bash` inside Plan mode is still subject to the regular `/ask-when-needed` allow rules. ::: ## Autonomous Goal diff --git a/docs/en/reference/tools.md b/docs/en/reference/tools.md index 179e2f864a7..8a176e2bf42 100644 --- a/docs/en/reference/tools.md +++ b/docs/en/reference/tools.md @@ -2,7 +2,7 @@ Built-in tools are the tool set provided by Kimi Code CLI alongside its core engine — no MCP server installation required. The Agent automatically selects and calls these tools based on the task at hand during each conversation; users can inspect the details of each tool call through the approval interface. -Compared to MCP tools, built-in tools are managed directly by the runtime, their lifecycle is bound to the session, and no external process is required. Both follow the same unified approval mechanism: **read-only tools** (such as `Read`, `Grep`, `Glob`) are automatically allowed by default, while **write and execution tools** (such as `Write`, `Edit`, `Bash`) require user approval by default. In YOLO mode, approval for regular tool calls is skipped; Plan mode exit approval is not affected. +Compared to MCP tools, built-in tools are managed directly by the runtime, their lifecycle is bound to the session, and no external process is required. Both follow the same unified approval mechanism: **read-only tools** (such as `Read`, `Grep`, `Glob`) are automatically allowed by default, while **write and execution tools** (such as `Write`, `Edit`, `Bash`) require user approval by default. In Ask When Needed mode, approval for regular tool calls is skipped; Plan mode exit approval is not affected. ## File Tools diff --git a/docs/zh/configuration/config-files.md b/docs/zh/configuration/config-files.md index 3f4aa37d8ae..76f4b135395 100644 --- a/docs/zh/configuration/config-files.md +++ b/docs/zh/configuration/config-files.md @@ -98,7 +98,7 @@ timeout = 5 | 字段 | 类型 | 默认值 | 说明 | | --- | --- | --- | --- | | `default_model` | `string` | — | 默认模型别名，必须在 `models` 中定义 | -| `default_permission_mode` | `string` | `manual` | 新会话的默认权限模式，可选 `manual`（逐次询问）、`yolo`（自动批准工具操作，Agent 仍可能提问）、`auto`（完全自主，但危险命令始终被拒绝） | +| `default_permission_mode` | `string` | `manual` | 新会话的默认权限模式，可选 `manual`（始终询问：仅自动读取，其余操作逐一向你确认）、`yolo`（必要时询问：自动完成常规修改和命令；高危操作、提问和计划仍会问你）、`auto`（完全自动：完全不打断，所有操作和判断自动完成，但危险命令仍会被拒绝） | | `default_plan_mode` | `boolean` | `false` | 新会话是否默认以 Plan 模式（先出计划再执行）启动 | | `merge_all_available_skills` | `boolean` | `true` | 是否合并所有目录中的 Agent Skills | | `extra_skill_dirs` | `array` | — | 额外 Skill 搜索目录，叠加到默认目录之上 | diff --git a/docs/zh/configuration/overrides.md b/docs/zh/configuration/overrides.md index e3fed310e40..a780a7e5398 100644 --- a/docs/zh/configuration/overrides.md +++ b/docs/zh/configuration/overrides.md @@ -18,7 +18,7 @@ Kimi Code CLI 有三个地方可以影响运行参数：配置文件、命令行 ## 普通运行参数的优先级 -对模型别名、Plan 模式、yolo 模式、Skills 目录等普通运行参数，优先级从高到低： +对模型别名、Plan 模式、权限模式、Skills 目录等普通运行参数，优先级从高到低： 1. **命令行选项**（`-m`、`--plan`、`--yolo` 等）：仅对本次启动生效 2. **用户配置文件**（`~/.kimi-code/config.toml`）：保存长期偏好 @@ -55,8 +55,8 @@ Kimi Code CLI 有三个地方可以影响运行参数：配置文件、命令行 | --- | --- | | `-S, --session [id]` | 恢复指定会话；不带 id 时进入交互式选择 | | `-c, --continue` | 续上当前目录的上一次会话 | -| `-y, --yolo` | 自动批准普通工具调用，Agent 仍可能提问 | -| `--auto` | 以 auto 权限模式启动：完全自主，Agent 不会向用户提问 | +| `-y, --yolo` | 「必要时询问」模式：常规修改和命令自动完成，Agent 仍可能提问 | +| `--auto` | 「完全自动」模式：完全不打断，Agent 不会向用户提问 | | `--plan` | 以 Plan 模式启动 | | `-m, --model ` | 指定本次使用的模型别名 | | `-p, --prompt ` | 非交互模式：执行单条提示词后退出 | diff --git a/docs/zh/customization/agents.md b/docs/zh/customization/agents.md index fb6ac265a68..694b3198024 100644 --- a/docs/zh/customization/agents.md +++ b/docs/zh/customization/agents.md @@ -18,7 +18,7 @@ Kimi Code CLI 内置三种 subagent，开箱即用，分别面向不同任务形 subagent 由 main agent 自动调度——根据任务复杂度、上下文消耗和子任务的独立性，在适当时机派发，无需用户手动指定。 -每次派发都会在终端以审批请求的形式呈现（除非命中 allow 规则或处于 YOLO 模式），方便你审视任务描述。你也可以在对话中直接指示 main agent 使用特定 subagent，例如"先用 explore 把相关文件梳理一遍再动手"。 +每次派发都会在终端以审批请求的形式呈现（除非命中 allow 规则或处于「必要时询问」模式），方便你审视任务描述。你也可以在对话中直接指示 main agent 使用特定 subagent，例如"先用 explore 把相关文件梳理一遍再动手"。 subagent 支持在后台运行：完成后结果自动回到 main agent，无需手动轮询。也可以唤回已有的 subagent 实例继续推进同一任务。 diff --git a/docs/zh/customization/mcp.md b/docs/zh/customization/mcp.md index 7ff61b2dcd9..f09da69c36f 100644 --- a/docs/zh/customization/mcp.md +++ b/docs/zh/customization/mcp.md @@ -100,7 +100,7 @@ pattern = "mcp__filesystem__write_file" - 对高风险工具（写文件、执行命令等）维持手动审批，避免用 `mcp__*` 通配放行全部工具 ::: warning 注意 -在 YOLO 模式下，MCP 工具调用会被自动批准。仅在完全信任所接入的 MCP server 时使用此模式。 +在「必要时询问」模式下，MCP 工具调用会被自动批准。仅在完全信任所接入的 MCP server 时使用此模式。 ::: ## 下一步 diff --git a/docs/zh/customization/themes.md b/docs/zh/customization/themes.md index 778863bbfad..adb876d25de 100644 --- a/docs/zh/customization/themes.md +++ b/docs/zh/customization/themes.md @@ -17,7 +17,7 @@ Kimi Code CLI 可以使用内置配色，也可以使用自定义 JSON 主题文 | `border` | `#5A5A5A` | `#737373` | 面板与编辑器的普通边框、Markdown 分隔线 | | `borderFocus` | `#E8A838` | `#92660A` | 聚焦/注意边框，目前仅审批面板使用 | | `success` | `#4EC87E` | `#0E7A38` | 成功态。`✓`、已启用、完成 | -| `warning` | `#E8A838` | `#92660A` | 警告态。auto/yolo 徽章、过期标记、Plan 模式提示 | +| `warning` | `#E8A838` | `#92660A` | 警告态。「必要时询问」/「完全自动」徽章、过期标记、Plan 模式提示 | | `error` | `#E85454` | `#B91C1C` | 错误态。错误信息、失败的工具输出 | | `diffAdded` | `#4EC87E` | `#0E7A38` | diff 新增行 | | `diffRemoved` | `#E85454` | `#B91C1C` | diff 删除行 | diff --git a/docs/zh/guides/getting-started.md b/docs/zh/guides/getting-started.md index 25988f9ea63..57b0e3d6589 100644 --- a/docs/zh/guides/getting-started.md +++ b/docs/zh/guides/getting-started.md @@ -170,6 +170,6 @@ npm uninstall -g @moonshot-ai/kimi-code ## 下一步 -- [交互与输入](./interaction.md) — 输入框操作、审批流程、Plan 模式和 YOLO 模式详解 +- [交互与输入](./interaction.md) — 输入框操作、审批流程、Plan 模式和必要时询问模式详解 - [会话与上下文](./sessions.md) — 恢复会话、上下文压缩、导出会话 - [常见使用案例](./use-cases.md) — 典型任务的 prompt 示例 diff --git a/docs/zh/guides/interaction.md b/docs/zh/guides/interaction.md index 1200832065a..164e8662a9b 100644 --- a/docs/zh/guides/interaction.md +++ b/docs/zh/guides/interaction.md @@ -33,7 +33,7 @@ Kimi Code CLI 支持在输入框中直接粘贴图片和视频，让 AI 结合 | `/undo` | 撤销最近的提示词 | | `/model` | 切换当前会话使用的模型 | | `/plan` | 切换 Plan 模式（先出计划再动手） | -| `/yolo` | 切换 YOLO 模式（自动批准普通工具调用） | +| `/ask-when-needed` | 切换「必要时询问」模式（常规修改和命令自动完成） | | `/goal` | 开始或管理目标模式 | | `/help` | 查看全部命令 | @@ -58,13 +58,13 @@ Agent 调用会产生副作用的工具（修改文件、执行命令等）时 - **会话内放行**：选「Approve for this session」，本次会话内同类调用不再询问 - **永久规则**：在[配置文件](../configuration/config-files.md#permission)预置 allow / deny 规则 -YOLO 模式下的普通工具调用、Plan 模式下对计划文件的写入，不触发审批。 +「必要时询问」模式下的普通工具调用、Plan 模式下对计划文件的写入，不触发审批。 -### YOLO / Auto 模式 +### 必要时询问 / 完全自动 模式 -**YOLO 模式**（`/yolo`）自动批准普通工具调用，适合已知安全的批处理任务。敏感操作仍会询问——例如访问 `.env`、SSH 私钥等敏感文件、执行 `shutdown`、`rm -rf` 这类危险命令，或退出 Plan 模式——Agent 也仍可能向你提问。 +**必要时询问**（`/ask-when-needed`）自动批准普通工具调用，适合已知安全的批处理任务。敏感操作仍会询问——例如访问 `.env`、SSH 私钥等敏感文件、执行 `shutdown`、`rm -rf` 这类危险命令，或退出 Plan 模式——Agent 也仍可能向你提问。 -**Auto 模式**（`/auto`）是完全无人值守模式：所有工具审批自动处理，包括敏感文件和计划退出，且 Agent 不会向你提问，完全由它自己做决定。唯一的例外是内置的危险命令拦截：`shutdown`、`reboot`、`rm -rf` 这类命令在 Auto 模式下会被直接拒绝，在 Manual 和 YOLO 模式下必须经你确认。 +**完全自动**（`/never-ask`）是完全无人值守模式：所有工具审批自动处理，包括敏感文件和计划退出，且 Agent 不会向你提问，完全由它自己做决定。唯一的例外是内置的危险命令拦截：`shutdown`、`reboot`、`rm -rf` 这类命令在完全自动模式下会被直接拒绝，在始终询问和必要时询问模式下必须经你确认。 ## 模式切换 @@ -76,7 +76,7 @@ Plan 模式下，Agent 先输出行动计划，等待你确认后才动手修改 - 切换：`Shift-Tab` 或 `/plan` - 清除当前计划：`/plan clear`（仅空闲时） -Agent 输出方案后会等待你审批——可批准执行、拒绝、或要求修改。退出 Plan 模式需要你确认，即使开启了 YOLO 模式也不例外。Auto 模式例外：计划退出会自动批准，并在记录中标记为 "Auto-approved"。 +Agent 输出方案后会等待你审批——可批准执行、拒绝、或要求修改。退出 Plan 模式需要你确认，即使开启了必要时询问模式也不例外。完全自动模式例外：计划退出会自动批准，并在记录中标记为 "Auto-approved"。 ### Shell 模式 diff --git a/docs/zh/guides/use-cases.md b/docs/zh/guides/use-cases.md index 9318b94fdee..cb8a3f7b3ad 100644 --- a/docs/zh/guides/use-cases.md +++ b/docs/zh/guides/use-cases.md @@ -99,7 +99,7 @@ src/parser/markdown.ts 目前几乎没有测试。请补一组单元测试，覆 帮我调研一下 TypeScript 里几种主流的依赖注入方案（tsyringe、inversify、awilix），从 API 风格、装饰器依赖、运行时开销三个维度对比，给一份不超过一页的建议。 ``` -对于确定安全的批处理任务，可以用 `--yolo` 或 `/yolo` 跳过审批，也可以在[配置文件](../configuration/config-files.md#permission)里给特定工具预置白名单规则。 +对于确定安全的批处理任务，可以用 `--yolo` 或 `/ask-when-needed` 跳过审批，也可以在[配置文件](../configuration/config-files.md#permission)里给特定工具预置白名单规则。 ## 定时任务与提醒 diff --git a/docs/zh/reference/kimi-command.md b/docs/zh/reference/kimi-command.md index 9a1dfb3b3ae..7239346ef7e 100644 --- a/docs/zh/reference/kimi-command.md +++ b/docs/zh/reference/kimi-command.md @@ -20,8 +20,8 @@ kimi [options] | `--model ` | `-m` | 为本次启动指定模型别名。省略时新会话使用配置文件中的 `default_model` | | `--prompt ` | `-p` | 非交互执行单次 prompt，并把 Assistant 输出流式写到 stdout。该模式不会打开 TUI | | `--output-format ` | | 设置非交互输出格式，支持 `text` 与 `stream-json`。仅可与 `--prompt` 一起使用，默认 `text` | -| `--yolo` | `-y` | 自动批准普通工具调用，跳过审批请求 | -| `--auto` | | 以 auto 权限模式启动；工具审批自动处理，Agent 不会向用户提问 | +| `--yolo` | `-y` | 以「必要时询问」模式启动：常规修改和命令自动完成；高危操作、提问和计划仍会问你 | +| `--auto` | | 以「完全自动」模式启动：完全不打断，所有操作和判断自动完成 | | `--plan` | | 以 Plan 模式启动新会话，AI 会优先使用只读工具进行探索和规划 | | `--skills-dir ` | | 从指定目录加载 Skills，替换自动发现的用户和项目目录。可重复传入 | | `--agent ` | | 以指定 Agent 作为 main agent 启动新会话。不能与 `--session`/`--continue` 同时使用 | @@ -43,7 +43,7 @@ kimi [options] - `--prompt` 不能与 `--yolo`、`--auto` 或 `--plan` 同时使用——非交互模式固定使用 `auto` 权限 - `--output-format` 只能与 `--prompt` 一起使用 -恢复会话时，可以通过 `--auto`、`--yolo` 或 `--plan` 覆盖原会话保存的权限或计划模式。例如，`kimi --continue --auto` 会恢复最近会话并切换到 auto 权限模式。 +恢复会话时，可以通过 `--auto`、`--yolo` 或 `--plan` 覆盖原会话保存的权限或计划模式。例如，`kimi --continue --auto` 会恢复最近会话并切换到「完全自动」模式。 ## 典型用法 diff --git a/docs/zh/reference/slash-commands.md b/docs/zh/reference/slash-commands.md index a3a99ae25d1..986e8d755fc 100644 --- a/docs/zh/reference/slash-commands.md +++ b/docs/zh/reference/slash-commands.md @@ -45,16 +45,16 @@ | 命令 | 别名 | 说明 | 随时可用 | | --- | --- | --- | --- | -| `/yolo [on\|off]` | `/yes` | 切换 YOLO 模式。不带参数时翻转；显式传 `on`/`off` 时强制设置。开启后跳过普通工具调用审批；Plan 模式的退出审批不受影响 | 是 | -| `/auto [on\|off]` | — | 切换 auto 权限模式。开启后工具审批自动处理，Agent 不会向用户提问 | 是 | +| `/ask-when-needed [on\|off]` | `/yolo`、`/yes` | 切换「必要时询问」模式。不带参数时翻转；显式传 `on`/`off` 时强制设置。开启后常规修改和命令自动完成；高危操作、提问和计划仍会问你 | 是 | +| `/never-ask [on\|off]` | `/auto` | 切换「完全自动」模式。开启后完全不打断，所有操作和判断自动完成 | 是 | | `/plan [on\|off]` | — | 切换 Plan 模式。不带参数时翻转；显式传 `on`/`off` 时强制设置。单纯切换不会创建空计划文件 | 是 | | `/plan clear` | — | 清除当前 plan 方案 | 否 | | `/swarm on\|off` | — | 开启或关闭 swarm mode，但不发送提示词。 | 是 | -| `/swarm ` | — | 先开启 swarm mode，再把 `` 作为普通提示词发送。如果该轮次正常完成，swarm mode 会自动关闭。若当前是 `manual` 权限模式，启动前会提示是否切换到 `auto` 或 `yolo`。 | 否 | +| `/swarm ` | — | 先开启 swarm mode，再把 `` 作为普通提示词发送。如果该轮次正常完成，swarm mode 会自动关闭。若当前是 `manual` 权限模式，启动前会提示是否切换到「必要时询问」或「完全自动」模式。 | 否 | | `/goal [...]` | — | 开始或管理目标模式 | 见下文 | ::: warning 注意 -`/yolo` 会跳过普通工具调用的审批确认，使用前请确保了解可能的风险。Plan 模式的退出审批不会被 `/yolo` 跳过；Plan 模式下的 `Bash` 也按 `/yolo` 的普通放行规则处理。 +`/ask-when-needed` 会跳过普通工具调用的审批确认，使用前请确保了解可能的风险。Plan 模式的退出审批不会被 `/ask-when-needed` 跳过；Plan 模式下的 `Bash` 也按 `/ask-when-needed` 的普通放行规则处理。 ::: ## 目标模式 diff --git a/docs/zh/reference/tools.md b/docs/zh/reference/tools.md index bbf2699ebc0..fd5bbc6569b 100644 --- a/docs/zh/reference/tools.md +++ b/docs/zh/reference/tools.md @@ -2,7 +2,7 @@ 内置工具是 Kimi Code CLI 随核心引擎提供的工具集，无需安装 MCP server 即可使用。Agent 在每次对话中会根据任务需要自动选择并调用这些工具；用户可以通过权限审批界面查看每次工具调用的细节。 -与 MCP 工具相比，内置工具由运行时直接管理，生命周期与会话绑定，无需外部进程。两者都遵循统一的审批机制：**只读类工具**（如 `Read`、`Grep`、`Glob`）默认自动放行，**写入与执行类工具**（如 `Write`、`Edit`、`Bash`）默认需要用户审批。YOLO 模式下普通工具调用的审批会被跳过，但 Plan 模式下的退出审批不受影响。 +与 MCP 工具相比，内置工具由运行时直接管理，生命周期与会话绑定，无需外部进程。两者都遵循统一的审批机制：**只读类工具**（如 `Read`、`Grep`、`Glob`）默认自动放行，**写入与执行类工具**（如 `Write`、`Edit`、`Bash`）默认需要用户审批。「必要时询问」模式下普通工具调用的审批会被跳过，但 Plan 模式下的退出审批不受影响。 ## 文件类