fix: restore Python source from fork point 3bad72e instead of main

The branch forked from 3bad72e, so src/kimi_cli/, docs/, tests/ and
other Python files should match that commit, not the latest main.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Yuandiaodiaodiao

CHANGELOG.md

@@ -11,29 +11,6 @@ Only write entries that are worth mentioning to users.
 
 ## Unreleased
 
-- ReadFile: Add total line count to every read response and support negative `line_offset` for tail mode — the tool now reports `Total lines in file: N.` in its message so the model can plan subsequent reads; negative `line_offset` (e.g. `-100`) reads the last N lines using a sliding window, useful for viewing recent log output without shell commands; the absolute value is capped at 1000 (MAX_LINES)
-- Shell: Fix black background on inline code and code blocks in Markdown rendering — `NEUTRAL_MARKDOWN_THEME` now overrides all Rich default `markdown.*` styles to `"none"`, preventing Rich's built-in `"cyan on black"` from leaking through on non-black terminals
-
-## 1.30.0 (2026-04-02)
-
-- Shell: Refine idle background completion auto-trigger — resumed shell sessions no longer auto-start a foreground turn from stale pending background notifications before the user sends a message, and fresh background completions now wait briefly while the user is actively typing to avoid stealing the prompt or breaking CJK IME composition
-- Core: Fix interrupted foreground turns leaving unbalanced wire events — `TurnEnd` is now emitted even when a turn exits via cancellation or step interruption, preventing dirty session wire logs from accumulating across resume cycles
-- Core: Improve session startup resilience — `--continue`/`--resume` now tolerate malformed `context.jsonl` records and corrupted subagent, background-task, or notification artifacts; the CLI skips invalid persisted state where possible instead of failing to restore the session
-- CLI: Improve `kimi export` session export UX — `kimi export` now previews the previous session for the current working directory and asks for confirmation, showing the session ID, title, and last user-message time; adds `--yes` to skip confirmation; also fixes explicit session-ID invocations where `--output` after the argument was incorrectly parsed as a subcommand
-- Grep: Add `include_ignored` parameter to search files excluded by `.gitignore` — when set to `true`, ripgrep's `--no-ignore` flag is enabled, allowing searches in gitignored artifacts such as build outputs or `node_modules`; sensitive files (like `.env`) remain filtered by the sensitive-file protection layer; defaults to `false` to preserve existing behavior
-- Core: Add sensitive file protection to Grep and Read tools — `.env`, SSH private keys (`id_rsa`, `id_ed25519`, `id_ecdsa`), and cloud credentials (`.aws/credentials`, `.gcp/credentials`) are now detected and blocked; Grep filters them from results with a warning, Read rejects them outright; `.env.example`/`.env.sample`/`.env.template` are exempted
-- Core: Fix parallel foreground subagent approval requests hanging the session — in interactive shell mode, `_set_active_approval_sink` no longer flushes pending approval requests to the live view sink (which cannot render approval modals); requests stay in the pending queue for the prompt modal path; also adds a 300-second timeout to `wait_for_response` so that any unresolved approval request eventually raises `ApprovalCancelledError` instead of hanging forever
-- CLI: Add `--session`/`--resume` (`-S`/`-r`) flag to resume sessions — without an argument opens an interactive session picker (shell UI only); with a session ID resumes that specific session; replaces the reverted `--pick-session`/`--list-sessions` design with a unified optional-value flag
-- CLI: Add CJK-safe `shorten()` utility — replaces all `textwrap.shorten` calls so that CJK text without spaces is truncated gracefully instead of collapsing to just the placeholder
-- Core: Fix skills in brand directories (e.g. `~/.kimi/skills/`) silently disappearing when a generic directory (`~/.config/agents/skills/`) exists but is empty — skill directory discovery now searches brand and generic directory groups independently and merges both results, instead of stopping at the first existing directory across all candidates
-- Core: Add `merge_all_available_skills` config option — when enabled, skills from all existing brand directories (`~/.kimi/skills/`, `~/.claude/skills/`, `~/.codex/skills/`) are loaded and merged instead of using only the first one found; same-name skills follow priority order kimi > claude > codex; disabled by default
-- CLI: Add `--plan` flag and `default_plan_mode` config option — start new sessions in plan mode via `kimi --plan` or by setting `default_plan_mode = true` in `~/.kimi/config.toml`; resumed sessions preserve their existing plan mode state
-- Shell: Add `/undo` and `/fork` commands for session forking — `/undo` lets you pick a previous turn and fork a new session with the selected message pre-filled for re-editing; `/fork` duplicates the entire session history into a new session; the original session is always preserved
-- CLI: Add `-r` as a short alias for `--session` and print a resume hint (`kimi -r <session-id>`) whenever a session exits — covers normal exit, Ctrl-C, `/undo`, `/fork`, and `/sessions` switch so users can always find their way back
-- Core: Fix `custom_headers` not being passed to non-Kimi providers — OpenAI, Anthropic, Google GenAI, and Vertex AI providers now correctly forward custom headers configured in `providers.*.custom_headers`
-
-## 1.29.0 (2026-04-01)
-
 - Core: Support hierarchical `AGENTS.md` loading — the CLI now discovers and merges `AGENTS.md` files from the git project root down to the working directory, including `.kimi/AGENTS.md` at each level; deeper files take priority under a 32 KiB budget cap, ensuring the most specific instructions are never truncated
 - Core: Fix empty sessions lingering on disk after exit — sessions created but never used are now cleaned up on all exit paths (failure exit, session switch, unexpected errors), not just on successful exit
 - Shell: Add `KIMI_CLI_PASTE_CHAR_THRESHOLD` and `KIMI_CLI_PASTE_LINE_THRESHOLD` environment variables to control when pasted text is folded into a placeholder — lowering these thresholds works around CJK input method breakage after multiline paste on some terminals (e.g., XShell over SSH)

docs/en/configuration/config-files.md

@@ -27,10 +27,8 @@ The configuration file contains the following top-level configuration items:
 | `default_model` | `string` | Default model name, must be a model defined in `models` |
 | `default_thinking` | `boolean` | Whether to enable thinking mode by default (defaults to `false`) |
 | `default_yolo` | `boolean` | Whether to enable YOLO (auto-approve) mode by default (defaults to `false`) |
-| `default_plan_mode` | `boolean` | Whether to start new sessions in plan mode by default (defaults to `false`); resumed sessions preserve their existing state |
 | `default_editor` | `string` | Default external editor command (e.g. `"vim"`, `"code --wait"`), auto-detects when empty |
 | `theme` | `string` | Terminal color theme, either `"dark"` or `"light"` (defaults to `"dark"`) |
-| `merge_all_available_skills` | `boolean` | Whether to merge skills from all brand directories (defaults to `false`); see [Skills configuration](../customization/skills.md) |
 | `providers` | `table` | API provider configuration |
 | `models` | `table` | Model configuration |
 | `loop_control` | `table` | Agent loop control parameters |
@@ -44,10 +42,8 @@ The configuration file contains the following top-level configuration items:
 default_model = "kimi-for-coding"
 default_thinking = false
 default_yolo = false
-default_plan_mode = false
 default_editor = ""
 theme = "dark"
-merge_all_available_skills = false
 
 [providers.kimi-for-coding]
 type = "kimi"

docs/en/configuration/data-locations.md

@@ -99,7 +99,6 @@ Wire message log file, stores Wire events during the session in JSON Lines (JSON
 
 Session state file, stores the session's runtime state, including:
 
-- `title`: User-set session title
 - `approval`: Approval decision state (YOLO mode on/off, auto-approved operation types)
 - `plan_mode`: Plan mode on/off status
 - `plan_session_id`: Unique identifier for the current plan session, used to associate the plan file

docs/en/configuration/overrides.md

@@ -36,12 +36,9 @@ The model specified by `--model` must be defined in the configuration file's `mo
 | `--thinking` | Enable thinking mode |
 | `--no-thinking` | Disable thinking mode |
 | `--yolo, --yes, -y` | Auto-approve all operations |
-| `--plan` | Start in plan mode |
 
 `--thinking` / `--no-thinking` overrides the thinking state saved from the last session. If not specified, uses the last session's state.
 
-`--plan` enables plan mode for new sessions; when resuming an existing session, it forces plan mode on. You can also set `default_plan_mode = true` in the config file to start new sessions in plan mode by default.
-
 ## Environment variable overrides
 
 Environment variables can override provider and model settings without modifying the configuration file. This is particularly useful in the following scenarios:

docs/en/customization/agents.md

@@ -215,12 +215,12 @@ When `run_in_background=true`, the command is launched as a background task and
 ### `ReadFile`
 
 - **Path**: `kimi_cli.tools.file:ReadFile`
-- **Description**: Read text file content. Max 1000 lines per read, max 2000 characters per line. Files outside working directory require absolute paths. Every read returns the total number of lines in the file.
+- **Description**: Read text file content. Max 1000 lines per read, max 2000 characters per line. Files outside working directory require absolute paths.
 
 | Parameter | Type | Description |
 |-----------|------|-------------|
 | `path` | string | File path |
-| `line_offset` | int | Starting line number, default 1. Supports negative values to read from the end of the file (e.g. `-100` reads the last 100 lines); absolute value cannot exceed 1000 |
+| `line_offset` | int | Starting line number, default 1 |
 | `n_lines` | int | Number of lines to read, default/max 1000 |
 
 ### `ReadMediaFile`

docs/en/customization/skills.md

@@ -19,54 +19,39 @@ For details about plugins, see the [Plugins](./plugins.md) documentation.
 
 ## Skill discovery
 
-Kimi Code CLI uses a layered loading mechanism to discover skills, loading in the following priority order (earlier ones take priority for skills with the same name):
+Kimi Code CLI uses a layered loading mechanism to discover skills, loading in the following priority order (later ones override skills with the same name):
 
 **Built-in skills**
 
 Skills shipped with the package, providing basic capabilities.
 
 **User-level skills**
 
-Stored in the user's home directory, effective across all projects. Candidate directories are split into two groups; within each group, the first existing directory is selected, and results from both groups are merged independently (brand group has higher specificity and priority):
+Stored in the user's home directory, effective across all projects. Kimi Code CLI checks the following directories in priority order and uses the first one that exists:
 
-- **Brand group** (mutually exclusive):
-  1. `~/.kimi/skills/`
-  2. `~/.claude/skills/`
-  3. `~/.codex/skills/`
-- **Generic group** (mutually exclusive):
-  1. `~/.config/agents/skills/` (recommended)
-  2. `~/.agents/skills/`
-
-Both groups are searched independently and results are merged. When a skill with the same name exists in both groups, the brand group version takes priority.
-
-To load skills from all existing brand directories instead of only the first one, enable `merge_all_available_skills` in your config file:
-
-```toml
-merge_all_available_skills = true
-```
-
-When enabled, all existing brand directories are loaded and merged, with same-name skills resolved by priority: kimi > claude > codex. The generic group is not affected.
+1. `~/.config/agents/skills/` (recommended)
+2. `~/.agents/skills/`
+3. `~/.kimi/skills/`
+4. `~/.claude/skills/`
+5. `~/.codex/skills/`
 
 **Project-level skills**
 
-Stored in the project directory, only effective within that project's working directory. Similarly split into two groups:
-
-- **Brand group** (mutually exclusive):
-  1. `.kimi/skills/`
-  2. `.claude/skills/`
-  3. `.codex/skills/`
-- **Generic group**: `.agents/skills/`
+Stored in the project directory, only effective within that project's working directory. Kimi Code CLI checks the following directories in priority order and uses the first one that exists:
 
-The `merge_all_available_skills` config applies to project-level skills as well.
+1. `.agents/skills/` (recommended)
+2. `.kimi/skills/`
+3. `.claude/skills/`
+4. `.codex/skills/`
 
-You can also specify additional skills directories with the `--skills-dir` flag. This flag can be specified multiple times, and the directories override the auto-discovered user/project directories:
+You can also append additional skills directories with the `--skills-dir` flag. This flag can be specified multiple times, and the directories are merged with the auto-discovered ones:
 
 ```sh
 kimi --skills-dir /path/to/my-skills --skills-dir /path/to/more-skills
 ```
 
 ::: tip
-Skills paths are independent of [`KIMI_SHARE_DIR`](../configuration/env-vars.md#kimi-share-dir). `KIMI_SHARE_DIR` customizes the storage location for configuration, sessions, logs, and other runtime data, but does not affect Skills search paths. Skills are cross-tool shared capability extensions (compatible with Kimi CLI, Claude, Codex, and others), which is a different type of data from application runtime data. To specify custom skills paths, use the `--skills-dir` flag.
+Skills paths are independent of [`KIMI_SHARE_DIR`](../configuration/env-vars.md#kimi-share-dir). `KIMI_SHARE_DIR` customizes the storage location for configuration, sessions, logs, and other runtime data, but does not affect Skills search paths. Skills are cross-tool shared capability extensions (compatible with Kimi CLI, Claude, Codex, and others), which is a different type of data from application runtime data. To append additional skills paths, use the `--skills-dir` flag.
 :::
 
 ## Built-in skills

docs/en/guides/interaction.md

@@ -33,15 +33,12 @@ In plan mode, the AI can only use read-only tools (`Glob`, `Grep`, `ReadFile`) t
 
 ### Entering plan mode
 
-There are four ways to enter plan mode:
+There are three ways to enter plan mode:
 
-- **CLI flag**: Use `kimi --plan` to start a new session directly in plan mode
 - **Keyboard shortcut**: Press `Shift-Tab` to toggle plan mode
 - **Slash command**: Enter `/plan` or `/plan on`
 - **AI-initiated**: When facing complex tasks, the AI may request to enter plan mode via the `EnterPlanMode` tool — you can accept or decline
 
-You can also set `default_plan_mode = true` in the config file to start every new session in plan mode by default. See [Configuration files](../configuration/config-files.md).
-
 When plan mode is active, the prompt changes to `📋` and a blue `plan` badge appears in the status bar.
 
 ### Reviewing plans
@@ -85,6 +82,8 @@ While the AI is executing a task, you can type and send follow-up messages in th
 
 Steer messages are appended to the context after the current step completes, and the AI will see and respond to your message before the next step begins. Approval requests and question panels are also handled inline with keyboard navigation during agent execution.
 
+Any text you type in the input box during a turn but haven't yet submitted is preserved when the turn ends — it won't be lost. You can press `Enter` to send it as the next message, or continue editing.
+
 ::: tip
 Steer messages do not interrupt the AI's currently executing step — they are processed between steps. To interrupt immediately, use `Ctrl-C`.
 :::

docs/en/guides/sessions.md

@@ -16,26 +16,14 @@ Use the `--continue` flag to continue the most recent session in the current wor
 kimi --continue
 ```
 
-**Interactively pick a session**
+**Switch to a specific session**
 
-Use `--session` (or `--resume`, `-S`, `-r`) without an argument to open an interactive session picker, where you can use arrow keys to select the session to resume:
+Use the `--session` flag to switch to a session with a specific ID:
 
 ```sh
-kimi --session
+kimi --session abc123
 ```
 
-> The interactive picker is only available in shell mode.
-
-**Resume a specific session**
-
-Use `--session` (or `--resume`) with a session ID to resume that specific session:
-
-```sh
-kimi -r abc123
-```
-
-If the specified session ID does not exist, a new session is created automatically.
-
 **Switch sessions during runtime**
 
 Enter `/sessions` (or `/resume`) to view all sessions in the current working directory, and use arrow keys to select the session you want to switch to:

docs/en/reference/kimi-command.md

@@ -55,9 +55,9 @@ The working directory determines the root directory for file operations. Relativ
 | Option | Short | Description |
 |--------|-------|-------------|
 | `--continue` | `-C` | Continue the previous session in the current working directory |
-| `--session [ID]` / `--resume [ID]` | `-S` / `-r` | Resume a session. With ID: resume that session (creates new if not found). Without ID: open interactive session picker (shell mode only) |
+| `--session ID` | `-S` | Resume session with specified ID, creates new session if not exists |
 
-`--continue` and `--session`/`--resume` are mutually exclusive.
+`--continue` and `--session` are mutually exclusive.
 
 ## Input and commands
 
@@ -126,16 +126,6 @@ Default loads `~/.kimi/mcp.json` (if exists). See [Model Context Protocol](../cu
 In YOLO mode, all file modifications and shell commands are automatically executed. Use with caution.
 :::
 
-## Plan mode
-
-| Option | Description |
-|--------|-------------|
-| `--plan` | Start a new session in plan mode |
-
-When started with `--plan`, the AI can only use read-only tools to explore the codebase and write an implementation plan. When resuming an existing session, `--plan` forces plan mode on; resuming without `--plan` preserves the session's existing state.
-
-You can also set `default_plan_mode = true` in the config file to start new sessions in plan mode by default. See [Configuration files](../configuration/config-files.md).
-
 ## Thinking mode
 
 | Option | Description |
@@ -185,17 +175,16 @@ kimi logout
 
 ### `kimi export`
 
-Export session data as a ZIP file. The ZIP contains all files in the session directory (`context.jsonl`, `wire.jsonl`, `state.json`, etc.).
+Export the data of a specified session as a ZIP file. The ZIP contains all files in the session directory (`context.jsonl`, `wire.jsonl`, `state.json`, etc.).
 
 ```sh
-kimi export [<session_id>] [-o <output_path>] [--yes]
+kimi export <session_id> [-o <output_path>]
 ```
 
 | Argument / Option | Description |
 |--------|-------------|
-| `<session_id>` | Session ID to export. If omitted, the CLI previews the previous session for the current working directory and asks for confirmation before exporting |
+| `<session_id>` | Session ID to export |
 | `--output, -o` | Output ZIP file path (defaults to `session-<id>.zip` in the current directory) |
-| `--yes, -y` | Skip the confirmation prompt when exporting the default previous session |
 
 ::: info Added
 Added in version 1.20.

docs/en/reference/kimi-vis.md

@@ -66,7 +66,7 @@ At the top of the session detail page, you can use `Open Dir` to open the curren
 You can export session data as a ZIP file for offline analysis or sharing.
 
 - **ZIP download**: Click the download button in the session explorer or session detail page to download the session directory as a ZIP file
-- **CLI export**: Use `kimi export [<session_id>]` to export a session as a ZIP file; when `<session_id>` is omitted, the CLI previews the previous session for the current working directory and asks for confirmation
+- **CLI export**: Use the `kimi export <session_id>` command to export a specified session as a ZIP file
 
 ### Session import