feat(cli): remove --query, add --prompt cli option (#612)

Signed-off-by: Richard Chien <stdrc@outlook.com>

Author: stdrc

.kimi/prompts/pr.md

@@ -0,0 +1,2 @@
+如果当前分支有 dirty change，什么都不要做，直接停止。
+如果是干净的，确保当前分支是一个不同于 main 的独立分支。然后，根据当前分支相对于 main 分支的修改，push 并提交一个 PR（利用 gh 命令），用英文编写 PR 标题和 description，描述所做的更改。PR title 要符合先前的 commit message 规范（PR title 就是 squash merge 之后的 commit message）。

CHANGELOG.md

@@ -14,6 +14,7 @@ Only write entries that are worth mentioning to users.
 - Shell: Use `/model` to toggle thinking mode instead of Tab key
 - Config: Add `default_thinking` config option (auto-migrated from metadata)
 - LLM: Add `always_thinking` capability for models that always use thinking mode
+- CLI: Rename `--command`/`-c` to `--prompt`/`-p`, keep `--command`/`-c` as alias, remove `--query`/`-q`
 
 ## 0.76 (2026-01-12)
 

docs/en/customization/print-mode.md

@@ -7,8 +7,8 @@ Print mode lets Kimi CLI run non-interactively, suitable for scripting and autom
 Use the `--print` flag to enable print mode:
 
 ```sh
-# Pass instructions via -c
-kimi --print -c "List all Python files in the current directory"
+# Pass instructions via -p (or -c)
+kimi --print -p "List all Python files in the current directory"
 
 # Pass instructions via stdin
 echo "Explain what this code does" | kimi --print
@@ -20,15 +20,15 @@ Print mode characteristics:
 - **Auto-approval**: Implicitly enables `--yolo` mode, all operations are auto-approved
 - **Text output**: AI responses are output to stdout
 
-<!-- TODO: Enable this example after supporting reading content from stdin and instructions from -c simultaneously
+<!-- TODO: Enable this example after supporting reading content from stdin and instructions from -p simultaneously
 **Pipeline examples**
 
 ```sh
 # Analyze git diff and generate commit message
-git diff --staged | kimi --print -c "Generate a Conventional Commits compliant commit message based on this diff"
+git diff --staged | kimi --print -p "Generate a Conventional Commits compliant commit message based on this diff"
 
 # Read file and generate documentation
-cat src/api.py | kimi --print -c "Generate API documentation for this Python module"
+cat src/api.py | kimi --print -p "Generate API documentation for this Python module"
 ```
 -->
 
@@ -37,13 +37,13 @@ cat src/api.py | kimi --print -c "Generate API documentation for this Python mod
 Use the `--final-message-only` option to only output the final assistant message, skipping intermediate tool call processes:
 
 ```sh
-kimi --print -c "Give me a Git commit message based on the current changes" --final-message-only
+kimi --print -p "Give me a Git commit message based on the current changes" --final-message-only
 ```
 
 `--quiet` is a shortcut for `--print --output-format text --final-message-only`, suitable for scenarios where only the final result is needed:
 
 ```sh
-kimi --quiet -c "Give me a Git commit message based on the current changes"
+kimi --quiet -p "Give me a Git commit message based on the current changes"
 ```
 
 ## JSON format
@@ -55,7 +55,7 @@ Print mode supports JSON format for input and output, convenient for programmati
 Use `--output-format=stream-json` to output in JSONL (one JSON per line) format:
 
 ```sh
-kimi --print -c "Hello" --output-format=stream-json
+kimi --print -p "Hello" --output-format=stream-json
 ```
 
 Example output:
@@ -136,7 +136,7 @@ Assistant message with tool calls:
 Auto-generate code or perform checks in CI workflows:
 
 ```sh
-kimi --print -c "Check if there are any obvious security issues in the src/ directory, output a JSON format report"
+kimi --print -p "Check if there are any obvious security issues in the src/ directory, output a JSON format report"
 ```
 
 **Batch processing**
@@ -145,7 +145,7 @@ Combine with shell loops for batch file processing:
 
 ```sh
 for file in src/*.py; do
-  kimi --print -c "Add type annotations to $file"
+  kimi --print -p "Add type annotations to $file"
 done
 ```
 

docs/en/faq.md

@@ -112,7 +112,7 @@ Correct input format example:
 
 If there's no output in `--print` mode, it may be:
 
-- **No input provided**: You need to provide input via `--command` or stdin. For example: `kimi --print --command "Hello"`.
+- **No input provided**: You need to provide input via `--prompt` (or `--command`) or stdin. For example: `kimi --print --prompt "Hello"`.
 - **Output is buffered**: Try using `--output-format stream-json` for streaming output.
 - **Configuration incomplete**: Ensure API key and model are configured via `/setup`.
 

docs/en/reference/kimi-command.md

@@ -60,10 +60,10 @@ The working directory determines the root directory for file operations. The age
 
 | Option | Short | Description |
 |--------|-------|-------------|
-| `--command TEXT` | `-c` | Pass user query, doesn't enter interactive mode |
-| `--query TEXT` | `-q` | Alias for `--command` |
+| `--prompt TEXT` | `-p` | Pass user prompt, doesn't enter interactive mode |
+| `--command TEXT` | `-c` | Alias for `--prompt` |
 
-When using `--command`, Kimi CLI exits after processing the query (unless `--print` is specified, results are still displayed in interactive mode).
+When using `--prompt` (or `--command`), Kimi CLI exits after processing the query (unless `--print` is specified, results are still displayed in interactive mode).
 
 ## Loop control
 

docs/en/release-notes/breaking-changes.md

@@ -2,6 +2,17 @@
 
 This page documents breaking changes in Kimi CLI releases and provides migration guidance.
 
+## Unreleased
+
+### `--query` option removed
+
+The `--query` (`-q`) option has been removed. Use `--prompt` as the primary option, with `--command` as an alias.
+
+- **Affected**: Scripts and automation using `--query` or `-q`
+- **Migration**:
+  - `--query` / `-q` → `--prompt` / `-p`
+  - Or continue using `--command` / `-c`
+
 ## 0.74 - ACP command change
 
 ### `--acp` option deprecated

docs/en/release-notes/changelog.md

@@ -7,6 +7,7 @@ This page documents the changes in each Kimi CLI release.
 - Shell: Use `/model` to toggle thinking mode instead of Tab key
 - Config: Add `default_thinking` config option (auto-migrated from metadata)
 - LLM: Add `always_thinking` capability for models that always use thinking mode
+- CLI: Rename `--command`/`-c` to `--prompt`/`-p`, keep `--command`/`-c` as alias, remove `--query`/`-q`
 
 ## 0.76 (2026-01-12)
 

docs/zh/customization/print-mode.md

@@ -7,8 +7,8 @@ Print 模式让 Kimi CLI 以非交互方式运行，适合脚本调用和自动
 使用 `--print` 参数启用 Print 模式：
 
 ```sh
-# 通过 -c 传入指令
-kimi --print -c "列出当前目录的所有 Python 文件"
+# 通过 -p 传入指令（或 -c）
+kimi --print -p "列出当前目录的所有 Python 文件"
 
 # 通过 stdin 传入指令
 echo "解释这段代码的作用" | kimi --print
@@ -20,15 +20,15 @@ Print 模式的特点：
 - **自动审批**：隐式启用 `--yolo` 模式，所有操作自动批准
 - **文本输出**：AI 的回复输出到 stdout
 
-<!-- TODO: 支持同时从 stdin 读取内容和 -c 读取指令后启用此示例
+<!-- TODO: 支持同时从 stdin 读取内容和 -p 读取指令后启用此示例
 **管道组合示例**
 
 ```sh
 # 分析 git diff 并生成提交信息
-git diff --staged | kimi --print -c "根据这个 diff 生成一个符合 Conventional Commits 规范的提交信息"
+git diff --staged | kimi --print -p "根据这个 diff 生成一个符合 Conventional Commits 规范的提交信息"
 
 # 读取文件并生成文档
-cat src/api.py | kimi --print -c "为这个 Python 模块生成 API 文档"
+cat src/api.py | kimi --print -p "为这个 Python 模块生成 API 文档"
 ```
 -->
 
@@ -37,13 +37,13 @@ cat src/api.py | kimi --print -c "为这个 Python 模块生成 API 文档"
 使用 `--final-message-only` 选项可以只输出最终的 assistant 消息，跳过中间的工具调用过程：
 
 ```sh
-kimi --print -c "根据当前变更给我一个 Git commit message" --final-message-only
+kimi --print -p "根据当前变更给我一个 Git commit message" --final-message-only
 ```
 
 `--quiet` 是 `--print --output-format text --final-message-only` 的快捷方式，适合只需要最终结果的场景：
 
 ```sh
-kimi --quiet -c "根据当前变更给我一个 Git commit message"
+kimi --quiet -p "根据当前变更给我一个 Git commit message"
 ```
 
 ## JSON 格式
@@ -55,7 +55,7 @@ Print 模式支持 JSON 格式的输入和输出，方便程序化处理。输
 使用 `--output-format=stream-json` 以 JSONL（每行一个 JSON）格式输出：
 
 ```sh
-kimi --print -c "你好" --output-format=stream-json
+kimi --print -p "你好" --output-format=stream-json
 ```
 
 输出示例：
@@ -136,7 +136,7 @@ echo '{"role":"user","content":"你好"}' | kimi --print --input-format=stream-j
 在 CI 流程中自动生成代码或执行检查：
 
 ```sh
-kimi --print -c "检查 src/ 目录下是否有明显的安全问题，输出 JSON 格式的报告"
+kimi --print -p "检查 src/ 目录下是否有明显的安全问题，输出 JSON 格式的报告"
 ```
 
 **批量处理**
@@ -145,7 +145,7 @@ kimi --print -c "检查 src/ 目录下是否有明显的安全问题，输出 JS
 
 ```sh
 for file in src/*.py; do
-  kimi --print -c "为 $file 添加类型注解"
+  kimi --print -p "为 $file 添加类型注解"
 done
 ```
 

docs/zh/faq.md

@@ -112,7 +112,7 @@ kimi mcp add --transport http context7 https://mcp.context7.com/mcp --header "CO
 
 如果 `--print` 模式下没有输出，可能是：
 
-- **未提供输入**：需要通过 `--command` 或 stdin 提供输入。例如：`kimi --print --command "你好"`。
+- **未提供输入**：需要通过 `--prompt`（或 `--command`）或 stdin 提供输入。例如：`kimi --print --prompt "你好"`。
 - **输出被缓冲**：尝试使用 `--output-format stream-json` 获取流式输出。
 - **配置未完成**：确保已通过 `/setup` 配置 API 密钥和模型。
 

docs/zh/reference/kimi-command.md

@@ -60,10 +60,10 @@ kimi [OPTIONS] COMMAND [ARGS]
 
 | 选项 | 简写 | 说明 |
 |------|------|------|
-| `--command TEXT` | `-c` | 传入用户查询，不进入交互模式 |
-| `--query TEXT` | `-q` | `--command` 的别名 |
+| `--prompt TEXT` | `-p` | 传入用户提示，不进入交互模式 |
+| `--command TEXT` | `-c` | `--prompt` 的别名 |
 
-使用 `--command` 时，Kimi CLI 会处理完查询后退出（除非指定 `--print`，否则仍以交互模式显示结果）。
+使用 `--prompt`（或 `--command`）时，Kimi CLI 会处理完查询后退出（除非指定 `--print`，否则仍以交互模式显示结果）。
 
 ## 循环控制