feat(auth): enable OAuth login for Kimi account (#719)

stdrc · web-flow · commit 98ce964f8c84 · 2026-01-27T10:49:40.000+08:00
Signed-off-by: Richard Chien &lt;stdrc@outlook.com&gt;
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml
@@ -26,14 +26,14 @@ body:
     id: plan
     attributes:
       label: Which open platform/subscription were you using?
-      description: The one you selected when running `/setup`
+      description: The one you selected when running `/login` or `/setup`
     validations:
       required: true
   - type: input
     id: model
     attributes:
       label: Which model were you using?
-      description: The one you selected when running `/setup`, like `kimi-k2-turbo-preview`, `kimi-for-coding`, etc.
+      description: The one you can see on the bottom status line, like `kimi-k2-turbo-preview`, `kimi-for-coding`, etc.
   - type: input
     id: platform
     attributes:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ Only write entries that are worth mentioning to users.
 
 ## Unreleased
 
+- Shell: Add `/login` and `/logout` slash commands for login and logout
+- CLI: Add `kimi login` and `kimi logout` subcommands
 - Core: Fix subagent approval request handling
 
 ## 0.88 (2026-01-26)
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Kimi Code CLI supports [Agent Client Protocol] out of the box. You can use it to
 
 [Agent Client Protocol]: https://github.com/agentclientprotocol/agent-client-protocol
 
-To use Kimi Code CLI with ACP clients, make sure to run Kimi Code CLI in the terminal and send `/setup` to complete the setup first. Then, you can configure your ACP client to start Kimi Code CLI as an ACP agent server with command `kimi acp`.
+To use Kimi Code CLI with ACP clients, make sure to run Kimi Code CLI in the terminal and send `/login` to complete the login first. Then, you can configure your ACP client to start Kimi Code CLI as an ACP agent server with command `kimi acp`.
 
 For example, to use Kimi Code CLI with [Zed](https://zed.dev/) or [JetBrains](https://blog.jetbrains.com/ai/2025/12/bring-your-own-ai-agent-to-jetbrains-ides/), add the following configuration to your `~/.config/zed/settings.json` or `~/.jetbrains/acp.json` file:
 
diff --git a/docs/en/guides/getting-started.md b/docs/en/guides/getting-started.md
@@ -75,7 +75,15 @@ cd your-project
 kimi
 ```
 
-On first launch, you need to configure the API platform and model. Enter the `/setup` command to start the configuration wizard:
+On first launch, you need to configure your API source. The recommended approach is to use the `/login` command to log in to your Kimi account, which automatically configures available models:
+
+```
+/login
+```
+
+This will automatically open a browser. Complete the Kimi account authorization and you're ready to go. After successful login, Kimi Code CLI will automatically reload the configuration.
+
+If you prefer using an API key instead, enter the `/setup` command to start the configuration wizard:
 
 1. Select an API platform (e.g., Kimi Code, Moonshot AI Open Platform)
 2. Enter your API key
diff --git a/docs/en/reference/kimi-command.md b/docs/en/reference/kimi-command.md
@@ -144,7 +144,25 @@ When not specified, Kimi Code CLI automatically discovers user-level and project
 
 | Subcommand | Description |
 |------------|-------------|
+| [`kimi login`](#kimi-login) | Log in to your Kimi account |
+| [`kimi logout`](#kimi-logout) | Log out from your Kimi account |
 | [`kimi info`](./kimi-info.md) | Display version and protocol information |
 | [`kimi acp`](./kimi-acp.md) | Start multi-session ACP server |
 | [`kimi mcp`](./kimi-mcp.md) | Manage MCP server configuration |
 | [`kimi term`](./kimi-term.md) | Launch the Toad terminal UI |
+
+### `kimi login`
+
+Log in to your Kimi account. This automatically opens a browser; complete account authorization and available models will be automatically configured.
+
+```sh
+kimi login
+```
+
+### `kimi logout`
+
+Log out from your Kimi account. This clears stored OAuth credentials and removes related configuration from the config file.
+
+```sh
+kimi logout
+```
diff --git a/docs/en/reference/slash-commands.md b/docs/en/reference/slash-commands.md
@@ -28,11 +28,23 @@ Alias: `/release-notes`
 
 Open the GitHub Issues page to submit feedback.
 
-## Configuration and debugging
+## Account and configuration
+
+### `/login`
+
+Log in to your Kimi account. This automatically opens a browser; complete account authorization and available models will be automatically configured. After successful login, Kimi Code CLI will automatically reload the configuration.
+
+::: tip
+This command is only available when using the default configuration file. If a configuration was specified via `--config` or `--config-file`, this command cannot be used.
+:::
+
+### `/logout`
+
+Log out from your Kimi account. This clears stored OAuth credentials and removes related configuration from the config file. After logout, Kimi Code CLI will automatically reload the configuration.
 
 ### `/setup`
 
-Start the configuration wizard to set up API platform and model.
+Start the configuration wizard to set up API platform and model using an API key.
 
 Configuration flow:
 1. Select an API platform (Kimi Code, Moonshot AI Open Platform, etc.)
diff --git a/docs/en/release-notes/changelog.md b/docs/en/release-notes/changelog.md
@@ -4,6 +4,8 @@ This page documents the changes in each Kimi Code CLI release.
 
 ## Unreleased
 
+- Shell: Add `/login` and `/logout` slash commands for login and logout
+- CLI: Add `kimi login` and `kimi logout` subcommands
 - Core: Fix subagent approval request handling
 
 ## 0.88 (2026-01-26)
diff --git a/docs/zh/guides/getting-started.md b/docs/zh/guides/getting-started.md
@@ -75,7 +75,15 @@ cd your-project
 kimi
 ```
 
-首次启动时，你需要配置 API 平台和模型。输入 `/setup` 命令进入配置向导：
+首次启动时，你需要配置 API 来源。推荐使用 `/login` 命令登录 Kimi 账号，登录后会自动配置可用的模型：
+
+```
+/login
+```
+
+执行后会自动打开浏览器，完成 Kimi 账号授权即可。登录成功后 Kimi Code CLI 会自动重新加载配置。
+
+如果你更倾向于使用 API 密钥，可以输入 `/setup` 命令进入配置向导：
 
 1. 选择 API 平台（如 Kimi Code、Moonshot AI 开放平台）
 2. 输入你的 API 密钥
diff --git a/docs/zh/reference/kimi-command.md b/docs/zh/reference/kimi-command.md
@@ -144,7 +144,25 @@ Thinking 模式需要模型支持。如果不指定，使用上次会话的设
 
 | 子命令 | 说明 |
 |--------|------|
+| [`kimi login`](#kimi-login) | 登录 Kimi 账号 |
+| [`kimi logout`](#kimi-logout) | 登出 Kimi 账号 |
 | [`kimi info`](./kimi-info.md) | 显示版本和协议信息 |
 | [`kimi acp`](./kimi-acp.md) | 启动多会话 ACP 服务器 |
 | [`kimi mcp`](./kimi-mcp.md) | 管理 MCP 服务器配置 |
 | [`kimi term`](./kimi-term.md) | 启动 Toad 终端 UI |
+
+### `kimi login`
+
+登录 Kimi 账号。执行后会自动打开浏览器，完成账号授权后自动配置可用的模型。
+
+```sh
+kimi login
+```
+
+### `kimi logout`
+
+登出 Kimi 账号。会清理存储的 OAuth 凭据并移除配置文件中的相关配置。
+
+```sh
+kimi logout
+```
diff --git a/docs/zh/reference/slash-commands.md b/docs/zh/reference/slash-commands.md
@@ -28,11 +28,23 @@
 
 打开 GitHub Issues 页面提交反馈。
 
-## 配置与调试
+## 账号与配置
+
+### `/login`
+
+登录 Kimi 账号。执行后会自动打开浏览器，完成账号授权后自动配置可用的模型。登录成功后 Kimi Code CLI 会自动重新加载配置。
+
+::: tip 提示
+此命令仅在使用默认配置文件时可用。如果通过 `--config` 或 `--config-file` 指定了配置，则无法使用此命令。
+:::
+
+### `/logout`
+
+登出 Kimi 账号。会清理存储的 OAuth 凭据并移除配置文件中的相关配置。登出后 Kimi Code CLI 会自动重新加载配置。
 
 ### `/setup`
 
-启动配置向导，设置 API 平台和模型。
+启动配置向导，通过 API 密钥配置平台和模型。
 
 配置流程：
 1. 选择 API 平台（Kimi Code、Moonshot AI 开放平台等）
diff --git a/docs/zh/release-notes/changelog.md b/docs/zh/release-notes/changelog.md
@@ -4,6 +4,8 @@
 
 ## 未发布
 
+- Shell：添加 `/login` 和 `/logout` 斜杠命令，用于登录和登出
+- CLI：添加 `kimi login` 和 `kimi logout` 子命令
 - Core：修复子 Agent 审批请求处理问题
 
 ## 0.88 (2026-01-26)
diff --git a/src/kimi_cli/acp/server.py b/src/kimi_cli/acp/server.py
@@ -72,32 +72,32 @@ async def initialize(
             ),
             auth_methods=[
                 acp.schema.AuthMethod(
-                    id="setup",
-                    name="Setup LLM with /setup slash command",
+                    id="login",
+                    name="Login with Kimi account",
                     description=(
-                        "Run `kimi` command in the terminal, "
-                        "then send `/setup` command to complete the setup."
+                        "Run `kimi login` command in the terminal, "
+                        "then follow the instructions to finish login."
                     ),
                     field_meta={
                         "terminal-auth": {
                             "command": command,
-                            "args": args,
-                            "label": "Kimi Code CLI Setup",
+                            "args": args + ["login"],
+                            "label": "Kimi Code Login",
                         }
                     },
                 ),
                 # acp.schema.AuthMethod(
-                #     id="login",
-                #     name="Login",
+                #     id="setup",
+                #     name="Setup LLM with /setup slash command",
                 #     description=(
-                #         "Run `kimi login` command in the terminal, "
-                #         "then follow the instructions to finish login."
+                #         "Run `kimi` command in the terminal, "
+                #         "then send `/setup` command to complete the setup."
                 #     ),
                 #     field_meta={
                 #         "terminal-auth": {
                 #             "command": command,
-                #             "args": args + ["login"],
-                #             "label": "Kimi Code Login",
+                #             "args": args,
+                #             "label": "Kimi Code CLI Setup",
                 #         }
                 #     },
                 # ),
diff --git a/src/kimi_cli/auth/oauth.py b/src/kimi_cli/auth/oauth.py
@@ -362,7 +362,6 @@ async def refresh_token(refresh_token: str) -> OAuthToken:
         ) as response,
     ):
         data = await response.json(content_type=None)
-        print("/api/oauth/token response:", data)  # TODO(login)
         status = response.status
     if status in (401, 403):
         raise OAuthUnauthorized(data.get("error_description") or "Token refresh unauthorized.")
@@ -630,7 +629,6 @@ async def ensure_fresh(self, runtime: Runtime) -> None:
         if ref is None:
             return
         token = self._tokens.get(ref.key) or load_tokens(ref)
-        print("current saved token:", token)  # TODO(login)
         if token is None:
             return
         self._tokens[ref.key] = token
diff --git a/src/kimi_cli/auth/platforms.py b/src/kimi_cli/auth/platforms.py
@@ -17,8 +17,10 @@ class ModelInfo(BaseModel):
     """Model information returned from the API."""
 
     id: str
-    context_length: int = 0
-    supports_reasoning: bool = False
+    context_length: int
+    supports_reasoning: bool
+    supports_image_in: bool
+    supports_video_in: bool
 
     @property
     def capabilities(self) -> set[ModelCapability]:
@@ -29,6 +31,12 @@ def capabilities(self) -> set[ModelCapability]:
         # Models with "thinking" in name are always-thinking
         if "thinking" in self.id.lower():
             caps.update(("thinking", "always_thinking"))
+        if self.supports_image_in:
+            caps.add("image_in")
+        if self.supports_video_in:
+            caps.add("video_in")
+        if "kimi-k2.5" in self.id.lower():
+            caps.update(("thinking", "image_in", "video_in"))
         return caps
 
 
@@ -213,6 +221,8 @@ async def _list_models(
                 id=str(model_id),
                 context_length=int(item.get("context_length") or 0),
                 supports_reasoning=bool(item.get("supports_reasoning")),
+                supports_image_in=bool(item.get("supports_image_in")),
+                supports_video_in=bool(item.get("supports_video_in")),
             )
         )
     return result
diff --git a/src/kimi_cli/cli/__init__.py b/src/kimi_cli/cli/__init__.py
@@ -540,6 +540,7 @@ async def _reload_loop(session_id: str | None):
 cli.add_typer(info_cli, name="info")
 
 
+@cli.command()
 def login(
     json: bool = typer.Option(
         False,
@@ -596,6 +597,7 @@ async def _run() -> bool:
         raise typer.Exit(code=1)
 
 
+@cli.command()
 def logout(
     json: bool = typer.Option(
         False,
@@ -637,17 +639,6 @@ async def _run() -> bool:
         raise typer.Exit(code=1)
 
 
-def _oauth_enabled() -> bool:
-    from kimi_cli.utils.envvar import get_env_bool
-
-    return get_env_bool("KIMI_ENABLE_OAUTH")
-
-
-if _oauth_enabled():
-    cli.command()(login)
-    cli.command()(logout)
-
-
 @cli.command(context_settings={"allow_extra_args": True, "ignore_unknown_options": True})
 def term(
     ctx: typer.Context,
diff --git a/src/kimi_cli/ui/shell/slash.py b/src/kimi_cli/ui/shell/slash.py
@@ -14,7 +14,6 @@
 from kimi_cli.ui.shell.console import console
 from kimi_cli.utils.changelog import CHANGELOG
 from kimi_cli.utils.datetime import format_relative_time
-from kimi_cli.utils.envvar import get_env_bool
 from kimi_cli.utils.slashcmd import SlashCommand, SlashCommandRegistry
 
 if TYPE_CHECKING:
@@ -416,10 +415,8 @@ async def mcp(app: Shell, args: str):
 
 from . import (  # noqa: E402
     debug,  # noqa: F401 # type: ignore[reportUnusedImport]
+    oauth,  # noqa: F401 # type: ignore[reportUnusedImport]
     setup,  # noqa: F401 # type: ignore[reportUnusedImport]
     update,  # noqa: F401 # type: ignore[reportUnusedImport]
     usage,  # noqa: F401 # type: ignore[reportUnusedImport]
 )
-
-if get_env_bool("KIMI_ENABLE_OAUTH"):
-    from . import oauth  # noqa: F401 # type: ignore[reportUnusedImport]
