kimi-cli 0.40__tar.gz → 0.41__tar.gz

{kimi_cli-0.40 → kimi_cli-0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kimi-cli
-Version: 0.40
+Version: 0.41
 Summary: Kimi CLI is your next CLI agent.
 Requires-Dist: agent-client-protocol>=0.4.9
 Requires-Dist: aiofiles>=25.1.0
@@ -24,6 +24,11 @@ Description-Content-Type: text/markdown
 
 # Kimi CLI
 
+[![Commit Activity](https://img.shields.io/github/commit-activity/w/MoonshotAI/kimi-cli)](https://github.com/MoonshotAI/kimi-cli/graphs/commit-activity)
+[![Checks](https://img.shields.io/github/check-runs/MoonshotAI/kimi-cli/main)](https://github.com/MoonshotAI/kimi-cli/actions)
+[![Version](https://img.shields.io/pypi/v/kimi-cli)](https://pypi.org/project/kimi-cli/)
+[![Downloads](https://img.shields.io/pypi/dw/kimi-cli)](https://pypistats.org/packages/kimi-cli)
+
 [中文](https://www.kimi.com/coding/docs/kimi-cli.html)
 
 Kimi CLI is a new CLI agent that can help you with your software development tasks and terminal operations.
@@ -152,3 +157,31 @@ Run `kimi` with `--mcp-config-file` option to connect to the specified MCP serve
 ```sh
 kimi --mcp-config-file /path/to/mcp.json
 ```
+
+## Development
+
+To develop Kimi CLI, run:
+
+```sh
+git clone https://github.com/MoonshotAI/kimi-cli.git
+cd kimi-cli
+
+make prepare  # prepare the development environment
+```
+
+Then you can start working on Kimi CLI.
+
+Refer to the following commands after you make changes:
+
+```sh
+uv run kimi  # run Kimi CLI
+
+make format  # format code
+make check  # run linting and type checking
+make test  # run tests
+make help  # show all make targets
+```
+
+## Contributing
+
+We welcome contributions to Kimi CLI! Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for more information.

{kimi_cli-0.40 → kimi_cli-0.41}/README.md

@@ -1,5 +1,10 @@
 # Kimi CLI
 
+[![Commit Activity](https://img.shields.io/github/commit-activity/w/MoonshotAI/kimi-cli)](https://github.com/MoonshotAI/kimi-cli/graphs/commit-activity)
+[![Checks](https://img.shields.io/github/check-runs/MoonshotAI/kimi-cli/main)](https://github.com/MoonshotAI/kimi-cli/actions)
+[![Version](https://img.shields.io/pypi/v/kimi-cli)](https://pypi.org/project/kimi-cli/)
+[![Downloads](https://img.shields.io/pypi/dw/kimi-cli)](https://pypistats.org/packages/kimi-cli)
+
 [中文](https://www.kimi.com/coding/docs/kimi-cli.html)
 
 Kimi CLI is a new CLI agent that can help you with your software development tasks and terminal operations.
@@ -128,3 +133,31 @@ Run `kimi` with `--mcp-config-file` option to connect to the specified MCP serve
 ```sh
 kimi --mcp-config-file /path/to/mcp.json
 ```
+
+## Development
+
+To develop Kimi CLI, run:
+
+```sh
+git clone https://github.com/MoonshotAI/kimi-cli.git
+cd kimi-cli
+
+make prepare  # prepare the development environment
+```
+
+Then you can start working on Kimi CLI.
+
+Refer to the following commands after you make changes:
+
+```sh
+uv run kimi  # run Kimi CLI
+
+make format  # format code
+make check  # run linting and type checking
+make test  # run tests
+make help  # show all make targets
+```
+
+## Contributing
+
+We welcome contributions to Kimi CLI! Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for more information.

{kimi_cli-0.40 → kimi_cli-0.41}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kimi-cli"
-version = "0.40"
+version = "0.41"
 description = "Kimi CLI is your next CLI agent."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -43,7 +43,7 @@ module-name = ["kimi_cli"]
 source-exclude = ["tests/**/*", "src/kimi_cli/deps/**/*"]
 
 [project.scripts]
-kimi = "kimi_cli:main"
+kimi = "kimi_cli.cli:main"
 
 [tool.ruff]
 line-length = 100
@@ -57,3 +57,9 @@ select = [
     "SIM", # flake8-simplify
     "I",   # isort
 ]
+
+[tool.typos.files]
+extend-exclude = ["kimi.spec", "pyinstaller.py"]
+
+[tool.typos.default.extend-words]
+datas = "datas"

{kimi_cli-0.40 → kimi_cli-0.41}/src/kimi_cli/CHANGELOG.md

@@ -9,6 +9,18 @@ Internal builds may append content to the Unreleased section.
 Only write entries that are worth mentioning to users.
 -->
 
+## [0.41] - 2025-10-26
+
+### Fixed
+
+- Fix a bug for Glob tool when no matching files are found
+- Ensure reading files with UTF-8 encoding
+
+### Changed
+
+- Disable reading command/query from stdin in shell mode
+- Clarify the API platform selection in `/setup` meta command
+
 ## [0.40] - 2025-10-24
 
 ### Added

kimi_cli-0.41/src/kimi_cli/__init__.py

@@ -0,0 +1,125 @@
+import contextlib
+import os
+import warnings
+from pathlib import Path
+from typing import Any, Literal
+
+import click
+from pydantic import SecretStr
+
+from kimi_cli.agentspec import DEFAULT_AGENT_FILE
+from kimi_cli.config import Config, LLMModel, LLMProvider
+from kimi_cli.llm import augment_provider_with_env_vars, create_llm
+from kimi_cli.metadata import Session
+from kimi_cli.soul.agent import load_agent_with_mcp
+from kimi_cli.soul.context import Context
+from kimi_cli.soul.globals import AgentGlobals
+from kimi_cli.soul.kimisoul import KimiSoul
+from kimi_cli.ui.acp import ACPServer
+from kimi_cli.ui.print import InputFormat, OutputFormat, PrintApp
+from kimi_cli.ui.shell import ShellApp
+from kimi_cli.utils.logging import StreamToLogger, logger
+
+UIMode = Literal["shell", "print", "acp"]
+
+
+async def kimi_run(
+    *,
+    config: Config,
+    model_name: str | None,
+    work_dir: Path,
+    session: Session,
+    command: str | None = None,
+    agent_file: Path = DEFAULT_AGENT_FILE,
+    ui: UIMode = "shell",
+    input_format: InputFormat | None = None,
+    output_format: OutputFormat | None = None,
+    mcp_configs: list[dict[str, Any]] | None = None,
+    yolo: bool = False,
+) -> bool:
+    """Run Kimi CLI."""
+    model: LLMModel | None = None
+    provider: LLMProvider | None = None
+
+    # try to use config file
+    if not model_name and config.default_model:
+        # no --model specified && default model is set in config
+        model = config.models[config.default_model]
+        provider = config.providers[model.provider]
+    if model_name and model_name in config.models:
+        # --model specified && model is set in config
+        model = config.models[model_name]
+        provider = config.providers[model.provider]
+
+    if not model:
+        model = LLMModel(provider="", model="", max_context_size=100_000)
+        provider = LLMProvider(type="kimi", base_url="", api_key=SecretStr(""))
+
+    # try overwrite with environment variables
+    assert provider is not None
+    assert model is not None
+    augment_provider_with_env_vars(provider, model)
+
+    if not provider.base_url or not model.model:
+        llm = None
+    else:
+        logger.info("Using LLM provider: {provider}", provider=provider)
+        logger.info("Using LLM model: {model}", model=model)
+        stream = ui != "print"  # use non-streaming mode only for print UI
+        llm = create_llm(provider, model, stream=stream, session_id=session.id)
+
+    agent_globals = await AgentGlobals.create(config, llm, session, yolo)
+    try:
+        agent = await load_agent_with_mcp(agent_file, agent_globals, mcp_configs or [])
+    except ValueError as e:
+        raise click.BadParameter(f"Failed to load agent: {e}") from e
+
+    if command is not None:
+        command = command.strip()
+        if not command:
+            raise click.BadParameter("Command cannot be empty")
+
+    context = Context(session.history_file)
+    await context.restore()
+
+    soul = KimiSoul(
+        agent,
+        agent_globals,
+        context=context,
+        loop_control=config.loop_control,
+    )
+
+    original_cwd = Path.cwd()
+    os.chdir(work_dir)
+
+    try:
+        if ui == "shell":
+            app = ShellApp(
+                soul,
+                welcome_info={
+                    "Directory": str(work_dir),
+                    "Session": session.id,
+                },
+            )
+            # to ignore possible warnings from dateparser
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
+            with contextlib.redirect_stderr(StreamToLogger()):
+                return await app.run(command)
+        elif ui == "print":
+            soul._approval.set_yolo(True)  # print mode implies yolo mode
+            app = PrintApp(
+                soul,
+                input_format or "text",
+                output_format or "text",
+                context.file_backend,
+            )
+            return await app.run(command)
+        elif ui == "acp":
+            if command is not None:
+                logger.warning("ACP server ignores command argument")
+            app = ACPServer(soul)
+            return await app.run()
+        else:
+            raise click.BadParameter(f"Invalid UI mode: {ui}")
+    finally:
+        os.chdir(original_cwd)

{kimi_cli-0.40 → kimi_cli-0.41}/src/kimi_cli/agents/koder/system.md

@@ -47,7 +47,7 @@ The operating environment is not in a sandbox. Any action especially mutation yo
 
 The current working directory is `${KIMI_WORK_DIR}`. This should be considered as the project root if you are instructed to perform tasks on the project. Every file system operation will be relative to the working directory if you do not explicitly specify the absolute path. Tools may require absolute paths for some parameters, if so, you should strictly follow the requirements.
 
-The `ls -la` output of current working directory is:
+The directory listing of current working directory is:
 
 ```
 ${KIMI_WORK_DIR_LS}

kimi_cli-0.41/src/kimi_cli/agentspec.py

@@ -0,0 +1,104 @@
+from pathlib import Path
+from typing import Any, NamedTuple
+
+import yaml
+from pydantic import BaseModel, Field
+
+
+def get_agents_dir() -> Path:
+    return Path(__file__).parent / "agents"
+
+
+DEFAULT_AGENT_FILE = get_agents_dir() / "koder" / "agent.yaml"
+
+
+class AgentSpec(BaseModel):
+    """Agent specification."""
+
+    extend: str | None = Field(default=None, description="Agent file to extend")
+    name: str | None = Field(default=None, description="Agent name")  # required
+    system_prompt_path: Path | None = Field(
+        default=None, description="System prompt path"
+    )  # required
+    system_prompt_args: dict[str, str] = Field(
+        default_factory=dict, description="System prompt arguments"
+    )
+    tools: list[str] | None = Field(default=None, description="Tools")  # required
+    exclude_tools: list[str] | None = Field(default=None, description="Tools to exclude")
+    subagents: dict[str, "SubagentSpec"] | None = Field(default=None, description="Subagents")
+
+
+class SubagentSpec(BaseModel):
+    """Subagent specification."""
+
+    path: Path = Field(description="Subagent file path")
+    description: str = Field(description="Subagent description")
+
+
+class ResolvedAgentSpec(NamedTuple):
+    """Resolved agent specification."""
+
+    name: str
+    system_prompt_path: Path
+    system_prompt_args: dict[str, str]
+    tools: list[str]
+    exclude_tools: list[str]
+    subagents: dict[str, "SubagentSpec"]
+
+
+def load_agent_spec(agent_file: Path) -> ResolvedAgentSpec:
+    """Load agent specification from file."""
+    agent_spec = _load_agent_spec(agent_file)
+    assert agent_spec.extend is None, "agent extension should be recursively resolved"
+    if agent_spec.name is None:
+        raise ValueError("Agent name is required")
+    if agent_spec.system_prompt_path is None:
+        raise ValueError("System prompt path is required")
+    if agent_spec.tools is None:
+        raise ValueError("Tools are required")
+    return ResolvedAgentSpec(
+        name=agent_spec.name,
+        system_prompt_path=agent_spec.system_prompt_path,
+        system_prompt_args=agent_spec.system_prompt_args,
+        tools=agent_spec.tools,
+        exclude_tools=agent_spec.exclude_tools or [],
+        subagents=agent_spec.subagents or {},
+    )
+
+
+def _load_agent_spec(agent_file: Path) -> AgentSpec:
+    assert agent_file.is_file(), "expect agent file to exist"
+    with open(agent_file, encoding="utf-8") as f:
+        data: dict[str, Any] = yaml.safe_load(f)
+
+    version = data.get("version", 1)
+    if version != 1:
+        raise ValueError(f"Unsupported agent spec version: {version}")
+
+    agent_spec = AgentSpec(**data.get("agent", {}))
+    if agent_spec.system_prompt_path is not None:
+        agent_spec.system_prompt_path = agent_file.parent / agent_spec.system_prompt_path
+    if agent_spec.subagents is not None:
+        for v in agent_spec.subagents.values():
+            v.path = agent_file.parent / v.path
+    if agent_spec.extend:
+        if agent_spec.extend == "default":
+            base_agent_file = DEFAULT_AGENT_FILE
+        else:
+            base_agent_file = agent_file.parent / agent_spec.extend
+        base_agent_spec = _load_agent_spec(base_agent_file)
+        if agent_spec.name is not None:
+            base_agent_spec.name = agent_spec.name
+        if agent_spec.system_prompt_path is not None:
+            base_agent_spec.system_prompt_path = agent_spec.system_prompt_path
+        for k, v in agent_spec.system_prompt_args.items():
+            # system prompt args should be merged instead of overwritten
+            base_agent_spec.system_prompt_args[k] = v
+        if agent_spec.tools is not None:
+            base_agent_spec.tools = agent_spec.tools
+        if agent_spec.exclude_tools is not None:
+            base_agent_spec.exclude_tools = agent_spec.exclude_tools
+        if agent_spec.subagents is not None:
+            base_agent_spec.subagents = agent_spec.subagents
+        agent_spec = base_agent_spec
+    return agent_spec

kimi_cli-0.40/src/kimi_cli/__init__.py → kimi_cli-0.41/src/kimi_cli/cli.py

@@ -1,53 +1,28 @@
 import asyncio
-import contextlib
-import importlib.metadata
 import json
-import os
-import subprocess
 import sys
-import textwrap
-import warnings
-from datetime import datetime
 from pathlib import Path
-from typing import Any, Literal
 
 import click
-from pydantic import SecretStr
 
-from kimi_cli.agent import (
-    DEFAULT_AGENT_FILE,
-    AgentGlobals,
-    BuiltinSystemPromptArgs,
-    load_agent_with_mcp,
-    load_agents_md,
-)
-from kimi_cli.config import (
-    Config,
-    ConfigError,
-    LLMModel,
-    LLMProvider,
-    load_config,
-)
-from kimi_cli.metadata import Session, continue_session, new_session
+from kimi_cli import UIMode, kimi_run
+from kimi_cli.agentspec import DEFAULT_AGENT_FILE
+from kimi_cli.config import ConfigError, load_config
+from kimi_cli.constant import VERSION
+from kimi_cli.metadata import continue_session, new_session
 from kimi_cli.share import get_share_dir
-from kimi_cli.soul.approval import Approval
-from kimi_cli.soul.context import Context
-from kimi_cli.soul.denwarenji import DenwaRenji
-from kimi_cli.soul.kimisoul import KimiSoul
-from kimi_cli.ui.acp import ACPServer
-from kimi_cli.ui.print import InputFormat, OutputFormat, PrintApp
-from kimi_cli.ui.shell import Reload, ShellApp
-from kimi_cli.utils.logging import StreamToLogger, logger
-from kimi_cli.utils.provider import augment_provider_with_env_vars, create_llm
+from kimi_cli.ui.print import InputFormat, OutputFormat
+from kimi_cli.utils.logging import logger
 
-__version__ = importlib.metadata.version("kimi-cli")
-USER_AGENT = f"KimiCLI/{__version__}"
 
-UIMode = Literal["shell", "print", "acp"]
+class Reload(Exception):
+    """Reload configuration."""
+
+    pass
 
 
 @click.command(context_settings=dict(help_option_names=["-h", "--help"]))
-@click.version_option(__version__)
+@click.version_option(VERSION)
 @click.option(
     "--verbose",
     is_flag=True,
@@ -238,7 +213,6 @@ def kimi(
                     session=session,
                     command=command,
                     agent_file=agent_file,
-                    verbose=verbose,
                     ui=ui,
                     input_format=input_format,
                     output_format=output_format,
@@ -253,132 +227,6 @@ def kimi(
             continue
 
 
-async def kimi_run(
-    *,
-    config: Config,
-    model_name: str | None,
-    work_dir: Path,
-    session: Session,
-    command: str | None = None,
-    agent_file: Path = DEFAULT_AGENT_FILE,
-    verbose: bool = True,
-    ui: UIMode = "shell",
-    input_format: InputFormat | None = None,
-    output_format: OutputFormat | None = None,
-    mcp_configs: list[dict[str, Any]] | None = None,
-    yolo: bool = False,
-) -> bool:
-    """Run Kimi CLI."""
-    echo = click.echo if verbose else lambda *args, **kwargs: None
-
-    model: LLMModel | None = None
-    provider: LLMProvider | None = None
-
-    # try to use config file
-    if not model_name and config.default_model:
-        # no --model specified && default model is set in config
-        model = config.models[config.default_model]
-        provider = config.providers[model.provider]
-    if model_name and model_name in config.models:
-        # --model specified && model is set in config
-        model = config.models[model_name]
-        provider = config.providers[model.provider]
-
-    if not model:
-        model = LLMModel(provider="", model="", max_context_size=100_000)
-        provider = LLMProvider(type="kimi", base_url="", api_key=SecretStr(""))
-
-    # try overwrite with environment variables
-    assert provider is not None
-    assert model is not None
-    augment_provider_with_env_vars(provider, model)
-
-    if not provider.base_url or not model.model:
-        llm = None
-    else:
-        echo(f"✓ Using LLM provider: {provider}")
-        echo(f"✓ Using LLM model: {model}")
-        stream = ui != "print"  # use non-streaming mode only for print UI
-        llm = create_llm(provider, model, stream=stream, session_id=session.id)
-
-    # TODO: support Windows
-    ls = subprocess.run(["ls", "-la"], capture_output=True, text=True)
-    agents_md = load_agents_md(work_dir) or ""
-    if agents_md:
-        echo(f"✓ Loaded agents.md: {textwrap.shorten(agents_md, width=100)}")
-
-    agent_globals = AgentGlobals(
-        config=config,
-        llm=llm,
-        builtin_args=BuiltinSystemPromptArgs(
-            KIMI_NOW=datetime.now().astimezone().isoformat(),
-            KIMI_WORK_DIR=work_dir,
-            KIMI_WORK_DIR_LS=ls.stdout,
-            KIMI_AGENTS_MD=agents_md,
-        ),
-        denwa_renji=DenwaRenji(),
-        session=session,
-        approval=Approval(yolo=yolo),
-    )
-    try:
-        agent = await load_agent_with_mcp(agent_file, agent_globals, mcp_configs or [])
-    except ValueError as e:
-        raise click.BadParameter(f"Failed to load agent: {e}") from e
-    echo(f"✓ Loaded agent: {agent.name}")
-    echo(f"✓ Loaded system prompt: {textwrap.shorten(agent.system_prompt, width=100)}")
-    echo(f"✓ Loaded tools: {[tool.name for tool in agent.toolset.tools]}")
-
-    if command is not None:
-        command = command.strip()
-        if not command:
-            raise click.BadParameter("Command cannot be empty")
-
-    context = Context(session.history_file)
-    restored = await context.restore()
-    if restored:
-        echo(f"✓ Restored history from {session.history_file}")
-
-    soul = KimiSoul(
-        agent,
-        agent_globals,
-        context=context,
-        loop_control=config.loop_control,
-    )
-
-    original_cwd = Path.cwd()
-    os.chdir(work_dir)
-
-    try:
-        if ui == "shell":
-            if command is None and not sys.stdin.isatty():
-                command = sys.stdin.read().strip()
-                echo(f"✓ Read command from stdin: {command}")
-
-            app = ShellApp(
-                soul,
-                welcome_info={
-                    "Directory": str(work_dir),
-                    "Session": session.id,
-                },
-            )
-            # to ignore possible warnings from dateparser
-            warnings.filterwarnings("ignore", category=DeprecationWarning)
-            with contextlib.redirect_stderr(StreamToLogger()):
-                return await app.run(command)
-        elif ui == "print":
-            app = PrintApp(soul, input_format or "text", output_format or "text")
-            return await app.run(command)
-        elif ui == "acp":
-            if command is not None:
-                logger.warning("ACP server ignores command argument")
-            app = ACPServer(soul)
-            return await app.run()
-        else:
-            raise click.BadParameter(f"Invalid UI mode: {ui}")
-    finally:
-        os.chdir(original_cwd)
-
-
 def main():
     kimi()
 

kimi_cli-0.41/src/kimi_cli/constant.py

@@ -0,0 +1,4 @@
+import importlib.metadata
+
+VERSION = importlib.metadata.version("kimi-cli")
+USER_AGENT = f"KimiCLI/{VERSION}"

kimi_cli-0.40/src/kimi_cli/utils/provider.py → kimi_cli-0.41/src/kimi_cli/llm.py

@@ -1,12 +1,19 @@
 import os
+from typing import NamedTuple
 
-from kosong.chat_provider import ChaosChatProvider, Kimi, OpenAILegacy
-from kosong.chat_provider.chaos import ChaosConfig
+from kosong.base.chat_provider import ChatProvider
+from kosong.chat_provider.chaos import ChaosChatProvider, ChaosConfig
+from kosong.chat_provider.kimi import Kimi
+from kosong.chat_provider.openai_legacy import OpenAILegacy
 from pydantic import SecretStr
 
-import kimi_cli
 from kimi_cli.config import LLMModel, LLMProvider
-from kimi_cli.llm import LLM
+from kimi_cli.constant import USER_AGENT
+
+
+class LLM(NamedTuple):
+    chat_provider: ChatProvider
+    max_context_size: int
 
 
 def augment_provider_with_env_vars(provider: LLMProvider, model: LLMModel):
@@ -44,7 +51,7 @@ def create_llm(
                 api_key=provider.api_key.get_secret_value(),
                 stream=stream,
                 default_headers={
-                    "User-Agent": kimi_cli.USER_AGENT,
+                    "User-Agent": USER_AGENT,
                 },
             )
             if session_id:

kimi_cli-0.41/src/kimi_cli/prompts/__init__.py

@@ -0,0 +1,4 @@
+from pathlib import Path
+
+INIT = (Path(__file__).parent / "init.md").read_text(encoding="utf-8")
+COMPACT = (Path(__file__).parent / "compact.md").read_text(encoding="utf-8")