kimi-cli 0.43__tar.gz → 0.45__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of kimi-cli might be problematic. Click here for more details.
- {kimi_cli-0.43 → kimi_cli-0.45}/PKG-INFO +2 -2
- {kimi_cli-0.43 → kimi_cli-0.45}/pyproject.toml +2 -2
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/CHANGELOG.md +22 -0
- kimi_cli-0.43/src/kimi_cli/__init__.py → kimi_cli-0.45/src/kimi_cli/app.py +55 -52
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/cli.py +14 -6
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/config.py +1 -1
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/llm.py +27 -7
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/agent.py +4 -2
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/runtime.py +6 -4
- kimi_cli-0.45/src/kimi_cli/ui/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/print/__init__.py +1 -4
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/__init__.py +11 -2
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/liveview.py +36 -5
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/prompt.py +1 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/setup.py +1 -1
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/visualize.py +7 -3
- {kimi_cli-0.43 → kimi_cli-0.45}/README.md +0 -0
- {kimi_cli-0.43/src/kimi_cli/ui → kimi_cli-0.45/src/kimi_cli}/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/agents/default/agent.yaml +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/agents/default/sub.yaml +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/agents/default/system.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/agentspec.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/constant.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/exception.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/metadata.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/prompts/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/prompts/compact.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/prompts/init.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/py.typed +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/session.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/share.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/approval.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/compaction.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/context.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/denwarenji.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/kimisoul.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/message.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/soul/toolset.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/bash/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/bash/bash.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/dmail/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/dmail/dmail.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/glob.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/glob.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/grep.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/grep.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/patch.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/patch.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/read.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/read.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/replace.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/replace.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/write.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/file/write.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/mcp.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/task/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/task/task.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/test.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/think/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/think/think.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/todo/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/todo/set_todo_list.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/utils.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/web/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/web/fetch.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/web/fetch.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/web/search.md +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/tools/web/search.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/acp/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/console.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/debug.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/keyboard.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/metacmd.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/replay.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/ui/shell/update.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/aiohttp.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/changelog.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/logging.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/message.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/path.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/pyinstaller.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/signals.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/utils/string.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/wire/__init__.py +0 -0
- {kimi_cli-0.43 → kimi_cli-0.45}/src/kimi_cli/wire/message.py +0 -0
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
Metadata-Version: 2.3
|
|
2
2
|
Name: kimi-cli
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.45
|
|
4
4
|
Summary: Kimi CLI is your next CLI agent.
|
|
5
5
|
Requires-Dist: agent-client-protocol==0.6.2
|
|
6
6
|
Requires-Dist: aiofiles==25.1.0
|
|
7
7
|
Requires-Dist: aiohttp==3.13.2
|
|
8
8
|
Requires-Dist: click==8.3.0
|
|
9
|
-
Requires-Dist: kosong==0.16.
|
|
9
|
+
Requires-Dist: kosong==0.16.2
|
|
10
10
|
Requires-Dist: loguru==0.7.3
|
|
11
11
|
Requires-Dist: patch-ng==1.19.0
|
|
12
12
|
Requires-Dist: prompt-toolkit==3.0.52
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "kimi-cli"
|
|
3
|
-
version = "0.
|
|
3
|
+
version = "0.45"
|
|
4
4
|
description = "Kimi CLI is your next CLI agent."
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
requires-python = ">=3.13"
|
|
@@ -9,7 +9,7 @@ dependencies = [
|
|
|
9
9
|
"aiofiles==25.1.0",
|
|
10
10
|
"aiohttp==3.13.2",
|
|
11
11
|
"click==8.3.0",
|
|
12
|
-
"kosong==0.16.
|
|
12
|
+
"kosong==0.16.2",
|
|
13
13
|
"loguru==0.7.3",
|
|
14
14
|
"patch-ng==1.19.0",
|
|
15
15
|
"prompt-toolkit==3.0.52",
|
|
@@ -9,6 +9,28 @@ Internal builds may append content to the Unreleased section.
|
|
|
9
9
|
Only write entries that are worth mentioning to users.
|
|
10
10
|
-->
|
|
11
11
|
|
|
12
|
+
## [0.45] - 2025-10-31
|
|
13
|
+
|
|
14
|
+
### Added
|
|
15
|
+
|
|
16
|
+
- Allow `KIMI_MODEL_CAPABILITIES` environment variable to override model capabilities
|
|
17
|
+
- Add `--no-markdown` option to disable markdown rendering
|
|
18
|
+
- Support `openai_responses` LLM provider type
|
|
19
|
+
|
|
20
|
+
### Fixed
|
|
21
|
+
|
|
22
|
+
- Fix crash when continuing a session
|
|
23
|
+
|
|
24
|
+
## [0.44] - 2025-10-30
|
|
25
|
+
|
|
26
|
+
### Changed
|
|
27
|
+
|
|
28
|
+
- Improve startup time
|
|
29
|
+
|
|
30
|
+
### Fixed
|
|
31
|
+
|
|
32
|
+
- Fix potential invalid bytes in user input
|
|
33
|
+
|
|
12
34
|
## [0.43] - 2025-10-30
|
|
13
35
|
|
|
14
36
|
### Added
|
|
@@ -8,6 +8,7 @@ from typing import Any
|
|
|
8
8
|
from pydantic import SecretStr
|
|
9
9
|
|
|
10
10
|
from kimi_cli.agentspec import DEFAULT_AGENT_FILE
|
|
11
|
+
from kimi_cli.cli import InputFormat, OutputFormat
|
|
11
12
|
from kimi_cli.config import LLMModel, LLMProvider, load_config
|
|
12
13
|
from kimi_cli.llm import augment_provider_with_env_vars, create_llm
|
|
13
14
|
from kimi_cli.session import Session
|
|
@@ -15,9 +16,6 @@ from kimi_cli.soul.agent import load_agent
|
|
|
15
16
|
from kimi_cli.soul.context import Context
|
|
16
17
|
from kimi_cli.soul.kimisoul import KimiSoul
|
|
17
18
|
from kimi_cli.soul.runtime import Runtime
|
|
18
|
-
from kimi_cli.ui.acp import ACPServer
|
|
19
|
-
from kimi_cli.ui.print import InputFormat, OutputFormat, PrintApp
|
|
20
|
-
from kimi_cli.ui.shell import ShellApp, WelcomeInfoItem
|
|
21
19
|
from kimi_cli.utils.logging import StreamToLogger, logger
|
|
22
20
|
|
|
23
21
|
|
|
@@ -81,43 +79,6 @@ class KimiCLI:
|
|
|
81
79
|
logger.info("Using LLM model: {model}", model=model)
|
|
82
80
|
llm = create_llm(provider, model, stream=stream, session_id=session.id)
|
|
83
81
|
|
|
84
|
-
welcome_info = [
|
|
85
|
-
WelcomeInfoItem(name="Directory", value=str(session.work_dir)),
|
|
86
|
-
WelcomeInfoItem(name="Session", value=session.id),
|
|
87
|
-
]
|
|
88
|
-
if base_url := env_overrides.get("KIMI_BASE_URL"):
|
|
89
|
-
welcome_info.append(
|
|
90
|
-
WelcomeInfoItem(
|
|
91
|
-
name="API URL",
|
|
92
|
-
value=f"{base_url} (from KIMI_BASE_URL)",
|
|
93
|
-
level=WelcomeInfoItem.Level.WARN,
|
|
94
|
-
)
|
|
95
|
-
)
|
|
96
|
-
if not llm:
|
|
97
|
-
welcome_info.append(
|
|
98
|
-
WelcomeInfoItem(
|
|
99
|
-
name="Model",
|
|
100
|
-
value="not set, send /setup to configure",
|
|
101
|
-
level=WelcomeInfoItem.Level.WARN,
|
|
102
|
-
)
|
|
103
|
-
)
|
|
104
|
-
elif "KIMI_MODEL_NAME" in env_overrides:
|
|
105
|
-
welcome_info.append(
|
|
106
|
-
WelcomeInfoItem(
|
|
107
|
-
name="Model",
|
|
108
|
-
value=f"{model.model} (from KIMI_MODEL_NAME)",
|
|
109
|
-
level=WelcomeInfoItem.Level.WARN,
|
|
110
|
-
)
|
|
111
|
-
)
|
|
112
|
-
else:
|
|
113
|
-
welcome_info.append(
|
|
114
|
-
WelcomeInfoItem(
|
|
115
|
-
name="Model",
|
|
116
|
-
value=model.model,
|
|
117
|
-
level=WelcomeInfoItem.Level.INFO,
|
|
118
|
-
)
|
|
119
|
-
)
|
|
120
|
-
|
|
121
82
|
runtime = await Runtime.create(config, llm, session, yolo)
|
|
122
83
|
|
|
123
84
|
if agent_file is None:
|
|
@@ -132,17 +93,17 @@ class KimiCLI:
|
|
|
132
93
|
runtime,
|
|
133
94
|
context=context,
|
|
134
95
|
)
|
|
135
|
-
return KimiCLI(soul,
|
|
96
|
+
return KimiCLI(soul, runtime, env_overrides)
|
|
136
97
|
|
|
137
98
|
def __init__(
|
|
138
99
|
self,
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
100
|
+
_soul: KimiSoul,
|
|
101
|
+
_runtime: Runtime,
|
|
102
|
+
_env_overrides: dict[str, str],
|
|
142
103
|
) -> None:
|
|
143
|
-
self._soul =
|
|
144
|
-
self.
|
|
145
|
-
self.
|
|
104
|
+
self._soul = _soul
|
|
105
|
+
self._runtime = _runtime
|
|
106
|
+
self._env_overrides = _env_overrides
|
|
146
107
|
|
|
147
108
|
@property
|
|
148
109
|
def soul(self) -> KimiSoul:
|
|
@@ -152,12 +113,12 @@ class KimiCLI:
|
|
|
152
113
|
@property
|
|
153
114
|
def session(self) -> Session:
|
|
154
115
|
"""Get the Session instance."""
|
|
155
|
-
return self.
|
|
116
|
+
return self._runtime.session
|
|
156
117
|
|
|
157
118
|
@contextlib.contextmanager
|
|
158
119
|
def _app_env(self) -> Generator[None]:
|
|
159
120
|
original_cwd = Path.cwd()
|
|
160
|
-
os.chdir(self.
|
|
121
|
+
os.chdir(self._runtime.session.work_dir)
|
|
161
122
|
try:
|
|
162
123
|
# to ignore possible warnings from dateparser
|
|
163
124
|
warnings.filterwarnings("ignore", category=DeprecationWarning)
|
|
@@ -166,9 +127,47 @@ class KimiCLI:
|
|
|
166
127
|
finally:
|
|
167
128
|
os.chdir(original_cwd)
|
|
168
129
|
|
|
169
|
-
async def run_shell_mode(self, command: str | None = None) -> bool:
|
|
130
|
+
async def run_shell_mode(self, command: str | None = None, markdown: bool = True) -> bool:
|
|
131
|
+
from kimi_cli.ui.shell import ShellApp, WelcomeInfoItem
|
|
132
|
+
|
|
133
|
+
welcome_info = [
|
|
134
|
+
WelcomeInfoItem(name="Directory", value=str(self._runtime.session.work_dir)),
|
|
135
|
+
WelcomeInfoItem(name="Session", value=self._runtime.session.id),
|
|
136
|
+
]
|
|
137
|
+
if base_url := self._env_overrides.get("KIMI_BASE_URL"):
|
|
138
|
+
welcome_info.append(
|
|
139
|
+
WelcomeInfoItem(
|
|
140
|
+
name="API URL",
|
|
141
|
+
value=f"{base_url} (from KIMI_BASE_URL)",
|
|
142
|
+
level=WelcomeInfoItem.Level.WARN,
|
|
143
|
+
)
|
|
144
|
+
)
|
|
145
|
+
if not self._runtime.llm:
|
|
146
|
+
welcome_info.append(
|
|
147
|
+
WelcomeInfoItem(
|
|
148
|
+
name="Model",
|
|
149
|
+
value="not set, send /setup to configure",
|
|
150
|
+
level=WelcomeInfoItem.Level.WARN,
|
|
151
|
+
)
|
|
152
|
+
)
|
|
153
|
+
elif "KIMI_MODEL_NAME" in self._env_overrides:
|
|
154
|
+
welcome_info.append(
|
|
155
|
+
WelcomeInfoItem(
|
|
156
|
+
name="Model",
|
|
157
|
+
value=f"{self._soul.model} (from KIMI_MODEL_NAME)",
|
|
158
|
+
level=WelcomeInfoItem.Level.WARN,
|
|
159
|
+
)
|
|
160
|
+
)
|
|
161
|
+
else:
|
|
162
|
+
welcome_info.append(
|
|
163
|
+
WelcomeInfoItem(
|
|
164
|
+
name="Model",
|
|
165
|
+
value=self._soul.model,
|
|
166
|
+
level=WelcomeInfoItem.Level.INFO,
|
|
167
|
+
)
|
|
168
|
+
)
|
|
170
169
|
with self._app_env():
|
|
171
|
-
app = ShellApp(self._soul, welcome_info=
|
|
170
|
+
app = ShellApp(self._soul, welcome_info=welcome_info, markdown=markdown)
|
|
172
171
|
return await app.run(command)
|
|
173
172
|
|
|
174
173
|
async def run_print_mode(
|
|
@@ -177,16 +176,20 @@ class KimiCLI:
|
|
|
177
176
|
output_format: OutputFormat,
|
|
178
177
|
command: str | None = None,
|
|
179
178
|
) -> bool:
|
|
179
|
+
from kimi_cli.ui.print import PrintApp
|
|
180
|
+
|
|
180
181
|
with self._app_env():
|
|
181
182
|
app = PrintApp(
|
|
182
183
|
self._soul,
|
|
183
184
|
input_format,
|
|
184
185
|
output_format,
|
|
185
|
-
self.
|
|
186
|
+
self._runtime.session.history_file,
|
|
186
187
|
)
|
|
187
188
|
return await app.run(command)
|
|
188
189
|
|
|
189
190
|
async def run_acp_server(self) -> bool:
|
|
191
|
+
from kimi_cli.ui.acp import ACPServer
|
|
192
|
+
|
|
190
193
|
with self._app_env():
|
|
191
194
|
app = ACPServer(self._soul)
|
|
192
195
|
return await app.run()
|
|
@@ -7,12 +7,7 @@ from typing import Any, Literal, get_args
|
|
|
7
7
|
|
|
8
8
|
import click
|
|
9
9
|
|
|
10
|
-
from kimi_cli import KimiCLI
|
|
11
10
|
from kimi_cli.constant import VERSION
|
|
12
|
-
from kimi_cli.session import Session
|
|
13
|
-
from kimi_cli.share import get_share_dir
|
|
14
|
-
from kimi_cli.ui.print import InputFormat, OutputFormat
|
|
15
|
-
from kimi_cli.utils.logging import logger
|
|
16
11
|
|
|
17
12
|
|
|
18
13
|
class Reload(Exception):
|
|
@@ -22,6 +17,8 @@ class Reload(Exception):
|
|
|
22
17
|
|
|
23
18
|
|
|
24
19
|
UIMode = Literal["shell", "print", "acp"]
|
|
20
|
+
InputFormat = Literal["text", "stream-json"]
|
|
21
|
+
OutputFormat = Literal["text", "stream-json"]
|
|
25
22
|
|
|
26
23
|
|
|
27
24
|
@click.command(context_settings=dict(help_option_names=["-h", "--help"]))
|
|
@@ -140,6 +137,12 @@ UIMode = Literal["shell", "print", "acp"]
|
|
|
140
137
|
default=False,
|
|
141
138
|
help="Automatically approve all actions. Default: no.",
|
|
142
139
|
)
|
|
140
|
+
@click.option(
|
|
141
|
+
"--markdown/--no-markdown",
|
|
142
|
+
is_flag=True,
|
|
143
|
+
default=True,
|
|
144
|
+
help="Enable/disable markdown rendering in shell UI. Default: yes.",
|
|
145
|
+
)
|
|
143
146
|
def kimi(
|
|
144
147
|
verbose: bool,
|
|
145
148
|
debug: bool,
|
|
@@ -154,8 +157,13 @@ def kimi(
|
|
|
154
157
|
mcp_config_file: list[Path],
|
|
155
158
|
mcp_config: list[str],
|
|
156
159
|
yolo: bool,
|
|
160
|
+
markdown: bool,
|
|
157
161
|
):
|
|
158
162
|
"""Kimi, your next CLI agent."""
|
|
163
|
+
from kimi_cli.app import KimiCLI
|
|
164
|
+
from kimi_cli.session import Session
|
|
165
|
+
from kimi_cli.share import get_share_dir
|
|
166
|
+
from kimi_cli.utils.logging import logger
|
|
159
167
|
|
|
160
168
|
def _noop_echo(*args: Any, **kwargs: Any):
|
|
161
169
|
pass
|
|
@@ -219,7 +227,7 @@ def kimi(
|
|
|
219
227
|
)
|
|
220
228
|
match ui:
|
|
221
229
|
case "shell":
|
|
222
|
-
return await instance.run_shell_mode(command)
|
|
230
|
+
return await instance.run_shell_mode(command, markdown=markdown)
|
|
223
231
|
case "print":
|
|
224
232
|
return await instance.run_print_mode(
|
|
225
233
|
input_format or "text",
|
|
@@ -12,7 +12,7 @@ from kimi_cli.utils.logging import logger
|
|
|
12
12
|
class LLMProvider(BaseModel):
|
|
13
13
|
"""LLM provider configuration."""
|
|
14
14
|
|
|
15
|
-
type: Literal["kimi", "openai_legacy", "_chaos"]
|
|
15
|
+
type: Literal["kimi", "openai_legacy", "openai_responses", "_chaos"]
|
|
16
16
|
"""Provider type"""
|
|
17
17
|
base_url: str
|
|
18
18
|
"""API base URL"""
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import os
|
|
2
|
-
from typing import NamedTuple
|
|
2
|
+
from typing import NamedTuple, cast, get_args
|
|
3
3
|
|
|
4
4
|
from kosong.base.chat_provider import ChatProvider
|
|
5
|
-
from kosong.chat_provider.chaos import ChaosChatProvider, ChaosConfig
|
|
6
|
-
from kosong.chat_provider.kimi import Kimi
|
|
7
|
-
from kosong.chat_provider.openai_legacy import OpenAILegacy
|
|
8
5
|
from pydantic import SecretStr
|
|
9
6
|
|
|
10
7
|
from kimi_cli.config import LLMModel, LLMModelCapability, LLMProvider
|
|
@@ -44,11 +41,19 @@ def augment_provider_with_env_vars(provider: LLMProvider, model: LLMModel) -> di
|
|
|
44
41
|
applied["KIMI_API_KEY"] = "******"
|
|
45
42
|
if model_name := os.getenv("KIMI_MODEL_NAME"):
|
|
46
43
|
model.model = model_name
|
|
47
|
-
applied["KIMI_MODEL_NAME"] =
|
|
44
|
+
applied["KIMI_MODEL_NAME"] = model_name
|
|
48
45
|
if max_context_size := os.getenv("KIMI_MODEL_MAX_CONTEXT_SIZE"):
|
|
49
46
|
model.max_context_size = int(max_context_size)
|
|
50
|
-
applied["KIMI_MODEL_MAX_CONTEXT_SIZE"] =
|
|
51
|
-
|
|
47
|
+
applied["KIMI_MODEL_MAX_CONTEXT_SIZE"] = max_context_size
|
|
48
|
+
if capabilities := os.getenv("KIMI_MODEL_CAPABILITIES"):
|
|
49
|
+
caps_lower = (cap.strip().lower() for cap in capabilities.split(",") if cap.strip())
|
|
50
|
+
model.capabilities = set(
|
|
51
|
+
cast(LLMModelCapability, cap)
|
|
52
|
+
for cap in caps_lower
|
|
53
|
+
if cap in get_args(LLMModelCapability)
|
|
54
|
+
)
|
|
55
|
+
applied["KIMI_MODEL_CAPABILITIES"] = capabilities
|
|
56
|
+
case "openai_legacy" | "openai_responses":
|
|
52
57
|
if base_url := os.getenv("OPENAI_BASE_URL"):
|
|
53
58
|
provider.base_url = base_url
|
|
54
59
|
if api_key := os.getenv("OPENAI_API_KEY"):
|
|
@@ -68,6 +73,8 @@ def create_llm(
|
|
|
68
73
|
) -> LLM:
|
|
69
74
|
match provider.type:
|
|
70
75
|
case "kimi":
|
|
76
|
+
from kosong.chat_provider.kimi import Kimi
|
|
77
|
+
|
|
71
78
|
chat_provider = Kimi(
|
|
72
79
|
model=model.model,
|
|
73
80
|
base_url=provider.base_url,
|
|
@@ -81,13 +88,26 @@ def create_llm(
|
|
|
81
88
|
if session_id:
|
|
82
89
|
chat_provider = chat_provider.with_generation_kwargs(prompt_cache_key=session_id)
|
|
83
90
|
case "openai_legacy":
|
|
91
|
+
from kosong.chat_provider.openai_legacy import OpenAILegacy
|
|
92
|
+
|
|
84
93
|
chat_provider = OpenAILegacy(
|
|
85
94
|
model=model.model,
|
|
86
95
|
base_url=provider.base_url,
|
|
87
96
|
api_key=provider.api_key.get_secret_value(),
|
|
88
97
|
stream=stream,
|
|
89
98
|
)
|
|
99
|
+
case "openai_responses":
|
|
100
|
+
from kosong.chat_provider.openai_responses import OpenAIResponses
|
|
101
|
+
|
|
102
|
+
chat_provider = OpenAIResponses(
|
|
103
|
+
model=model.model,
|
|
104
|
+
base_url=provider.base_url,
|
|
105
|
+
api_key=provider.api_key.get_secret_value(),
|
|
106
|
+
stream=stream,
|
|
107
|
+
)
|
|
90
108
|
case "_chaos":
|
|
109
|
+
from kosong.chat_provider.chaos import ChaosChatProvider, ChaosConfig
|
|
110
|
+
|
|
91
111
|
chat_provider = ChaosChatProvider(
|
|
92
112
|
model=model.model,
|
|
93
113
|
base_url=provider.base_url,
|
|
@@ -4,7 +4,6 @@ import string
|
|
|
4
4
|
from pathlib import Path
|
|
5
5
|
from typing import Any, NamedTuple
|
|
6
6
|
|
|
7
|
-
import fastmcp
|
|
8
7
|
from kosong.tooling import CallableTool, CallableTool2, Toolset
|
|
9
8
|
|
|
10
9
|
from kimi_cli.agentspec import ResolvedAgentSpec, load_agent_spec
|
|
@@ -14,7 +13,6 @@ from kimi_cli.soul.approval import Approval
|
|
|
14
13
|
from kimi_cli.soul.denwarenji import DenwaRenji
|
|
15
14
|
from kimi_cli.soul.runtime import BuiltinSystemPromptArgs, Runtime
|
|
16
15
|
from kimi_cli.soul.toolset import CustomToolset
|
|
17
|
-
from kimi_cli.tools.mcp import MCPTool
|
|
18
16
|
from kimi_cli.utils.logging import logger
|
|
19
17
|
|
|
20
18
|
|
|
@@ -143,6 +141,10 @@ async def _load_mcp_tools(
|
|
|
143
141
|
ValueError: If the MCP config is not valid.
|
|
144
142
|
RuntimeError: If the MCP server cannot be connected.
|
|
145
143
|
"""
|
|
144
|
+
import fastmcp
|
|
145
|
+
|
|
146
|
+
from kimi_cli.tools.mcp import MCPTool
|
|
147
|
+
|
|
146
148
|
for mcp_config in mcp_configs:
|
|
147
149
|
logger.info("Loading MCP tools from: {mcp_config}", mcp_config=mcp_config)
|
|
148
150
|
client = fastmcp.Client(mcp_config)
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import asyncio
|
|
1
2
|
import subprocess
|
|
2
3
|
import sys
|
|
3
4
|
from datetime import datetime
|
|
@@ -75,9 +76,10 @@ class Runtime(NamedTuple):
|
|
|
75
76
|
session: Session,
|
|
76
77
|
yolo: bool,
|
|
77
78
|
) -> "Runtime":
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
ls_output, agents_md = await asyncio.gather(
|
|
80
|
+
asyncio.to_thread(_list_work_dir, session.work_dir),
|
|
81
|
+
asyncio.to_thread(load_agents_md, session.work_dir),
|
|
82
|
+
)
|
|
81
83
|
|
|
82
84
|
return Runtime(
|
|
83
85
|
config=config,
|
|
@@ -87,7 +89,7 @@ class Runtime(NamedTuple):
|
|
|
87
89
|
KIMI_NOW=datetime.now().astimezone().isoformat(),
|
|
88
90
|
KIMI_WORK_DIR=session.work_dir,
|
|
89
91
|
KIMI_WORK_DIR_LS=ls_output,
|
|
90
|
-
KIMI_AGENTS_MD=agents_md,
|
|
92
|
+
KIMI_AGENTS_MD=agents_md or "",
|
|
91
93
|
),
|
|
92
94
|
denwa_renji=DenwaRenji(),
|
|
93
95
|
approval=Approval(yolo=yolo),
|
|
File without changes
|
|
@@ -3,13 +3,13 @@ import json
|
|
|
3
3
|
import sys
|
|
4
4
|
from functools import partial
|
|
5
5
|
from pathlib import Path
|
|
6
|
-
from typing import Literal
|
|
7
6
|
|
|
8
7
|
import aiofiles
|
|
9
8
|
from kosong.base.message import Message
|
|
10
9
|
from kosong.chat_provider import ChatProviderError
|
|
11
10
|
from rich import print
|
|
12
11
|
|
|
12
|
+
from kimi_cli.cli import InputFormat, OutputFormat
|
|
13
13
|
from kimi_cli.soul import LLMNotSet, MaxStepsReached, RunCancelled, Soul, run_soul
|
|
14
14
|
from kimi_cli.utils.logging import logger
|
|
15
15
|
from kimi_cli.utils.message import message_extract_text
|
|
@@ -17,9 +17,6 @@ from kimi_cli.utils.signals import install_sigint_handler
|
|
|
17
17
|
from kimi_cli.wire import WireUISide
|
|
18
18
|
from kimi_cli.wire.message import StepInterrupted
|
|
19
19
|
|
|
20
|
-
InputFormat = Literal["text", "stream-json"]
|
|
21
|
-
OutputFormat = Literal["text", "stream-json"]
|
|
22
|
-
|
|
23
20
|
|
|
24
21
|
class PrintApp:
|
|
25
22
|
"""
|
|
@@ -24,10 +24,16 @@ from kimi_cli.utils.signals import install_sigint_handler
|
|
|
24
24
|
|
|
25
25
|
|
|
26
26
|
class ShellApp:
|
|
27
|
-
def __init__(
|
|
27
|
+
def __init__(
|
|
28
|
+
self,
|
|
29
|
+
soul: Soul,
|
|
30
|
+
welcome_info: list["WelcomeInfoItem"] | None = None,
|
|
31
|
+
markdown: bool = True,
|
|
32
|
+
):
|
|
28
33
|
self.soul = soul
|
|
29
34
|
self._welcome_info = list(welcome_info or [])
|
|
30
35
|
self._background_tasks: set[asyncio.Task[Any]] = set()
|
|
36
|
+
self._markdown = markdown
|
|
31
37
|
|
|
32
38
|
async def run(self, command: str | None = None) -> bool:
|
|
33
39
|
if command is not None:
|
|
@@ -168,7 +174,10 @@ class ShellApp:
|
|
|
168
174
|
self.soul,
|
|
169
175
|
user_input,
|
|
170
176
|
lambda wire: visualize(
|
|
171
|
-
wire,
|
|
177
|
+
wire,
|
|
178
|
+
initial_status=self.soul.status,
|
|
179
|
+
cancel_event=cancel_event,
|
|
180
|
+
markdown=self._markdown,
|
|
172
181
|
),
|
|
173
182
|
cancel_event,
|
|
174
183
|
)
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import asyncio
|
|
2
2
|
from collections import deque
|
|
3
|
+
from typing import Literal
|
|
3
4
|
|
|
4
5
|
import streamingjson
|
|
5
6
|
from kosong.base.message import ToolCall, ToolCallPart
|
|
@@ -129,6 +130,7 @@ class StepLiveView:
|
|
|
129
130
|
def __init__(self, status: StatusSnapshot, cancel_event: asyncio.Event | None = None):
|
|
130
131
|
# message content
|
|
131
132
|
self._line_buffer = Text("")
|
|
133
|
+
self._last_text_mode: Literal["text", "think", ""] = ""
|
|
132
134
|
|
|
133
135
|
# tool call
|
|
134
136
|
self._tool_calls: dict[str, _ToolCallDisplay] = {}
|
|
@@ -187,7 +189,21 @@ class StepLiveView:
|
|
|
187
189
|
"""
|
|
188
190
|
console.print(renderable)
|
|
189
191
|
|
|
190
|
-
def append_text(self, text: str):
|
|
192
|
+
def append_text(self, text: str, mode: Literal["text", "think"] = "text"):
|
|
193
|
+
if not text:
|
|
194
|
+
# Ignore empty message
|
|
195
|
+
return
|
|
196
|
+
if self._last_text_mode != mode:
|
|
197
|
+
if self._line_buffer:
|
|
198
|
+
self._push_out(self._line_buffer)
|
|
199
|
+
self._push_out("") # Add extra line between different modes
|
|
200
|
+
self._line_buffer.plain = ""
|
|
201
|
+
self._last_text_mode = mode
|
|
202
|
+
match mode:
|
|
203
|
+
case "text":
|
|
204
|
+
self._line_buffer.style = ""
|
|
205
|
+
case "think":
|
|
206
|
+
self._line_buffer.style = "grey50 italic"
|
|
191
207
|
lines = text.split("\n")
|
|
192
208
|
prev_is_empty = not self._line_buffer
|
|
193
209
|
for line in lines[:-1]:
|
|
@@ -313,7 +329,14 @@ class StepLiveViewWithMarkdown(StepLiveView):
|
|
|
313
329
|
self._buffer_status_active = False
|
|
314
330
|
self._buffer_status_obj: Status | None = None
|
|
315
331
|
|
|
316
|
-
def append_text(self, text: str):
|
|
332
|
+
def append_text(self, text: str, mode: Literal["text", "think"] = "text"):
|
|
333
|
+
if not text:
|
|
334
|
+
# Ignore empty message
|
|
335
|
+
return
|
|
336
|
+
if self._last_text_mode != mode:
|
|
337
|
+
if self._flush_markdown():
|
|
338
|
+
self._push_out("") # Add extra line between different modes
|
|
339
|
+
self._last_text_mode = mode
|
|
317
340
|
if not self._pending_markdown_parts:
|
|
318
341
|
self._show_thinking_status()
|
|
319
342
|
self._pending_markdown_parts.append(text)
|
|
@@ -334,14 +357,22 @@ class StepLiveViewWithMarkdown(StepLiveView):
|
|
|
334
357
|
self._flush_markdown()
|
|
335
358
|
return super().__exit__(exc_type, exc_value, traceback)
|
|
336
359
|
|
|
337
|
-
def _flush_markdown(self):
|
|
360
|
+
def _flush_markdown(self) -> bool:
|
|
338
361
|
self._hide_thinking_status()
|
|
339
362
|
if not self._pending_markdown_parts:
|
|
340
|
-
return
|
|
363
|
+
return False
|
|
341
364
|
markdown_text = "".join(self._pending_markdown_parts)
|
|
342
365
|
self._pending_markdown_parts.clear()
|
|
343
366
|
if markdown_text.strip():
|
|
344
|
-
self._push_out(
|
|
367
|
+
self._push_out(
|
|
368
|
+
_LeftAlignedMarkdown(
|
|
369
|
+
markdown_text,
|
|
370
|
+
justify="left",
|
|
371
|
+
style="grey50 italic" if self._last_text_mode == "think" else "none",
|
|
372
|
+
)
|
|
373
|
+
)
|
|
374
|
+
return True
|
|
375
|
+
return False
|
|
345
376
|
|
|
346
377
|
def _show_thinking_status(self):
|
|
347
378
|
if self._buffer_status_active:
|
|
@@ -572,6 +572,7 @@ class CustomPromptSession:
|
|
|
572
572
|
async def prompt(self) -> UserInput:
|
|
573
573
|
with patch_stdout():
|
|
574
574
|
command = str(await self._session.prompt_async()).strip()
|
|
575
|
+
command = command.replace("\x00", "") # just in case null bytes are somehow inserted
|
|
575
576
|
self._append_history_entry(command)
|
|
576
577
|
|
|
577
578
|
# Parse rich content parts
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import asyncio
|
|
2
2
|
from contextlib import asynccontextmanager, suppress
|
|
3
3
|
|
|
4
|
-
from kosong.base.message import ContentPart, TextPart, ToolCall, ToolCallPart
|
|
4
|
+
from kosong.base.message import ContentPart, TextPart, ThinkPart, ToolCall, ToolCallPart
|
|
5
5
|
from kosong.tooling import ToolResult
|
|
6
6
|
|
|
7
7
|
from kimi_cli.soul import StatusSnapshot
|
|
@@ -42,6 +42,7 @@ async def visualize(
|
|
|
42
42
|
*,
|
|
43
43
|
initial_status: StatusSnapshot,
|
|
44
44
|
cancel_event: asyncio.Event | None = None,
|
|
45
|
+
markdown: bool = True,
|
|
45
46
|
):
|
|
46
47
|
"""
|
|
47
48
|
A loop to consume agent events and visualize the agent behavior.
|
|
@@ -60,7 +61,8 @@ async def visualize(
|
|
|
60
61
|
while True:
|
|
61
62
|
# TODO: Maybe we can always have a StepLiveView here.
|
|
62
63
|
# No need to recreate for each step.
|
|
63
|
-
|
|
64
|
+
LiveView = StepLiveViewWithMarkdown if markdown else StepLiveView
|
|
65
|
+
with LiveView(latest_status, cancel_event) as step:
|
|
64
66
|
async with _keyboard_listener(step):
|
|
65
67
|
# spin the moon at the beginning of each step
|
|
66
68
|
with console.status("", spinner="moon"):
|
|
@@ -78,7 +80,9 @@ async def visualize(
|
|
|
78
80
|
while True:
|
|
79
81
|
match msg:
|
|
80
82
|
case TextPart(text=text):
|
|
81
|
-
step.append_text(text)
|
|
83
|
+
step.append_text(text, mode="text")
|
|
84
|
+
case ThinkPart(think=think):
|
|
85
|
+
step.append_text(think, mode="think")
|
|
82
86
|
case ContentPart():
|
|
83
87
|
# TODO: support more content parts
|
|
84
88
|
step.append_text(f"[{msg.__class__.__name__}]")
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|