klaude-code 1.2.18__tar.gz → 1.2.20__tar.gz

{klaude_code-1.2.18 → klaude_code-1.2.20}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.2.18
+Version: 1.2.20
 Summary: Add your description here
 Requires-Dist: anthropic>=0.66.0
+Requires-Dist: chardet>=5.2.0
 Requires-Dist: ddgs>=9.9.3
 Requires-Dist: openai>=1.102.0
 Requires-Dist: pillow>=12.0.0
@@ -41,6 +42,21 @@ To update:
 uv tool upgrade klaude-code
 ```
 
+Or use the built-in alias command:
+
+```bash
+klaude update
+klaude upgrade
+```
+
+To show version:
+
+```bash
+klaude --version
+klaude -v
+klaude version
+```
+
 ## Usage
 
 ### Interactive Mode
@@ -50,7 +66,7 @@ klaude [--model <name>] [--select-model]
 ```
 
 **Options:**
-- `--version`/`-V`: Show version and exit.
+- `--version`/`-V`/`-v`: Show version and exit.
 - `--model`/`-m`: Preferred model name (exact match picks immediately; otherwise opens the interactive selector filtered by this value).
 - `--select-model`/`-s`: Open the interactive model selector at startup (shows all models unless `--model` is also provided).
 - `--continue`/`-c`: Resume the most recent session.

{klaude_code-1.2.18 → klaude_code-1.2.20}/README.md

@@ -23,6 +23,21 @@ To update:
 uv tool upgrade klaude-code
 ```
 
+Or use the built-in alias command:
+
+```bash
+klaude update
+klaude upgrade
+```
+
+To show version:
+
+```bash
+klaude --version
+klaude -v
+klaude version
+```
+
 ## Usage
 
 ### Interactive Mode
@@ -32,7 +47,7 @@ klaude [--model <name>] [--select-model]
 ```
 
 **Options:**
-- `--version`/`-V`: Show version and exit.
+- `--version`/`-V`/`-v`: Show version and exit.
 - `--model`/`-m`: Preferred model name (exact match picks immediately; otherwise opens the interactive selector filtered by this value).
 - `--select-model`/`-s`: Open the interactive model selector at startup (shows all models unless `--model` is also provided).
 - `--continue`/`-c`: Resume the most recent session.

{klaude_code-1.2.18 → klaude_code-1.2.20}/pyproject.toml

@@ -4,12 +4,13 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "1.2.18"
+version = "1.2.20"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "anthropic>=0.66.0",
+    "chardet>=5.2.0",
     "ddgs>=9.9.3",
     "openai>=1.102.0",
     "pillow>=12.0.0",

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/cli/main.py

@@ -1,8 +1,6 @@
 import asyncio
 import os
 import sys
-from importlib.metadata import PackageNotFoundError
-from importlib.metadata import version as pkg_version
 from pathlib import Path
 
 import typer
@@ -10,6 +8,7 @@ import typer
 from klaude_code.cli.auth_cmd import register_auth_commands
 from klaude_code.cli.config_cmd import register_config_commands
 from klaude_code.cli.debug import DEBUG_FILTER_HELP, open_log_file_in_editor, resolve_debug_settings
+from klaude_code.cli.self_update import register_self_update_commands, version_option_callback
 from klaude_code.cli.session_cmd import register_session_commands
 from klaude_code.session import Session, resume_select_session
 from klaude_code.trace import DebugType, prepare_debug_log_file
@@ -21,10 +20,13 @@ def set_terminal_title(title: str) -> None:
     sys.stdout.flush()
 
 
-def setup_terminal_title() -> None:
-    """Set terminal title to current folder name."""
+def update_terminal_title(model_name: str | None = None) -> None:
+    """Update terminal title with folder name and optional model name."""
     folder_name = os.path.basename(os.getcwd())
-    set_terminal_title(f"{folder_name}: klaude")
+    if model_name:
+        set_terminal_title(f"{folder_name}: klaude ✳ {model_name}")
+    else:
+        set_terminal_title(f"{folder_name}: klaude")
 
 
 def prepare_debug_logging(debug: bool, debug_filter: str | None) -> tuple[bool, set[DebugType] | None, Path | None]:
@@ -78,20 +80,6 @@ def read_input_content(cli_argument: str) -> str | None:
     return content
 
 
-def _version_callback(value: bool) -> None:
-    """Show version and exit."""
-    if value:
-        try:
-            ver = pkg_version("klaude-code")
-        except PackageNotFoundError:
-            # Package is not installed or has no metadata; show a generic version string.
-            ver = "unknown"
-        except Exception:
-            ver = "unknown"
-        print(f"klaude-code {ver}")
-        raise typer.Exit(0)
-
-
 app = typer.Typer(
     add_completion=False,
     pretty_exceptions_enable=False,
@@ -103,6 +91,8 @@ register_session_commands(app)
 register_auth_commands(app)
 register_config_commands(app)
 
+register_self_update_commands(app)
+
 
 @app.command("exec")
 def exec_command(
@@ -146,7 +136,7 @@ def exec_command(
     ),
 ) -> None:
     """Execute non-interactively with provided input."""
-    setup_terminal_title()
+    update_terminal_title()
 
     merged_input = read_input_content(input_content)
     if merged_input is None:
@@ -190,8 +180,9 @@ def main_callback(
         False,
         "--version",
         "-V",
+        "-v",
         help="Show version and exit",
-        callback=_version_callback,
+        callback=version_option_callback,
         is_eager=True,
     ),
     model: str | None = typer.Option(
@@ -234,7 +225,7 @@ def main_callback(
         from klaude_code.cli.runtime import AppInitConfig, run_interactive
         from klaude_code.config.select_model import select_model_from_config
 
-        setup_terminal_title()
+        update_terminal_title()
 
         chosen_model = model
         if model or select_model:
@@ -254,6 +245,35 @@ def main_callback(
             session_id = Session.most_recent_session_id()
         # If still no session_id, leave as None to create a new session
 
+        if session_id is not None and chosen_model is None:
+            from klaude_code.config import load_config
+            from klaude_code.trace import log
+
+            session_meta = Session.load_meta(session_id)
+            cfg = load_config()
+
+            if cfg is not None and session_meta.model_config_name:
+                if any(m.model_name == session_meta.model_config_name for m in cfg.model_list):
+                    chosen_model = session_meta.model_config_name
+                else:
+                    log(
+                        (
+                            f"Warning: session model '{session_meta.model_config_name}' is not defined in config; falling back to default",
+                            "yellow",
+                        )
+                    )
+
+            if cfg is not None and chosen_model is None and session_meta.model_name:
+                raw_model = session_meta.model_name.strip()
+                if raw_model:
+                    matches = [
+                        m.model_name
+                        for m in cfg.model_list
+                        if (m.model_params.model or "").strip().lower() == raw_model.lower()
+                    ]
+                    if len(matches) == 1:
+                        chosen_model = matches[0]
+
         debug_enabled, debug_filters, log_path = prepare_debug_logging(debug, debug_filter)
 
         init_config = AppInitConfig(

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/cli/runtime.py

@@ -8,20 +8,22 @@ import typer
 from rich.text import Text
 
 from klaude_code import ui
+from klaude_code.cli.main import update_terminal_title
+from klaude_code.cli.self_update import get_update_message
 from klaude_code.command import has_interactive_command
 from klaude_code.config import Config, load_config
-from klaude_code.core.agent import DefaultModelProfileProvider, VanillaModelProfileProvider
+from klaude_code.core.agent import Agent, DefaultModelProfileProvider, VanillaModelProfileProvider
 from klaude_code.core.executor import Executor
 from klaude_code.core.manager import build_llm_clients
 from klaude_code.protocol import events, op
 from klaude_code.protocol.model import UserInputPayload
+from klaude_code.session.session import close_default_store
 from klaude_code.trace import DebugType, log, set_debug_logging
 from klaude_code.ui.modes.repl import build_repl_status_snapshot
 from klaude_code.ui.modes.repl.input_prompt_toolkit import REPLStatusSnapshot
 from klaude_code.ui.terminal.color import is_light_terminal_background
 from klaude_code.ui.terminal.control import install_sigint_double_press_exit, start_esc_interrupt_monitor
 from klaude_code.ui.terminal.progress_bar import OSC94States, emit_osc94
-from klaude_code.version import get_update_message
 
 
 class PrintCapable(Protocol):
@@ -92,8 +94,12 @@ async def initialize_app_components(init_config: AppInitConfig) -> AppComponents
         event_queue,
         llm_clients,
         model_profile_provider=model_profile_provider,
+        on_model_change=update_terminal_title,
     )
 
+    # Update terminal title with initial model name
+    update_terminal_title(llm_clients.main.model_name)
+
     # Start executor in background
     executor_task = asyncio.create_task(executor.start())
 
@@ -151,12 +157,38 @@ async def initialize_session(
     return active_session_id or session_id
 
 
+def _backfill_session_model_config(
+    agent: Agent | None,
+    model_override: str | None,
+    default_model: str,
+    is_new_session: bool,
+) -> None:
+    """Backfill model_config_name and model_thinking on newly created sessions."""
+    if agent is None or agent.session.model_config_name is not None:
+        return
+
+    if model_override is not None:
+        agent.session.model_config_name = model_override
+    elif is_new_session:
+        agent.session.model_config_name = default_model
+    else:
+        return
+
+    if agent.session.model_thinking is None and agent.profile:
+        agent.session.model_thinking = agent.profile.llm_client.get_llm_config().thinking
+    # Don't save here - session will be saved when first message is sent via append_history()
+
+
 async def cleanup_app_components(components: AppComponents) -> None:
     """Clean up all application components."""
     try:
         # Clean shutdown
         await components.executor.stop()
         components.executor_task.cancel()
+        with contextlib.suppress(asyncio.CancelledError):
+            await components.executor_task
+        with contextlib.suppress(Exception):
+            await close_default_store()
 
         # Signal UI to stop
         await components.event_queue.put(events.EndEvent())
@@ -192,6 +224,12 @@ async def run_exec(init_config: AppInitConfig, input_content: str) -> None:
 
     try:
         session_id = await initialize_session(components.executor, components.event_queue)
+        _backfill_session_model_config(
+            components.executor.context.current_agent,
+            init_config.model,
+            components.config.main_model,
+            is_new_session=True,
+        )
 
         # Submit the input content directly
         await components.executor.submit_and_wait(
@@ -260,6 +298,12 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
 
     try:
         await initialize_session(components.executor, components.event_queue, session_id=session_id)
+        _backfill_session_model_config(
+            components.executor.context.current_agent,
+            init_config.model,
+            components.config.main_model,
+            is_new_session=session_id is None,
+        )
 
         def _get_active_session_id() -> str | None:
             """Get the current active session ID dynamically.

klaude_code-1.2.18/src/klaude_code/version.py → klaude_code-1.2.20/src/klaude_code/cli/self_update.py

@@ -1,4 +1,4 @@
-"""Version checking utilities for klaude-code."""
+"""Self-update and version utilities for klaude-code."""
 
 from __future__ import annotations
 
@@ -8,8 +8,14 @@ import subprocess
 import threading
 import time
 import urllib.request
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version as pkg_version
 from typing import NamedTuple
 
+import typer
+
+from klaude_code.trace import log
+
 PACKAGE_NAME = "klaude-code"
 PYPI_URL = f"https://pypi.org/pypi/{PACKAGE_NAME}/json"
 CHECK_INTERVAL_SECONDS = 3600  # Check at most once per hour
@@ -160,4 +166,106 @@ def get_update_message() -> str | None:
     info = check_for_updates()
     if info is None or not info.update_available:
         return None
-    return f"New version available: {info.latest}. Please run `uv tool upgrade {PACKAGE_NAME}` to upgrade."
+    return f"New version available: {info.latest}. Please run `klaude upgrade` to upgrade."
+
+
+def _print_version() -> None:
+    try:
+        ver = pkg_version(PACKAGE_NAME)
+    except PackageNotFoundError:
+        ver = "unknown"
+    except Exception:
+        ver = "unknown"
+    print(f"{PACKAGE_NAME} {ver}")
+
+
+def version_option_callback(value: bool) -> None:
+    """Show version and exit."""
+    if value:
+        _print_version()
+        raise typer.Exit(0)
+
+
+def version_command() -> None:
+    """Show version and exit."""
+
+    _print_version()
+
+
+def update_command(
+    check: bool = typer.Option(
+        False,
+        "--check",
+        help="Check for updates and exit without upgrading",
+    ),
+) -> None:
+    """Upgrade klaude-code when installed via `uv tool`."""
+
+    info = check_for_updates_blocking()
+
+    if check:
+        if info is None:
+            log(("Error: `uv` is not available; cannot check for updates.", "red"))
+            log(f"Install uv, then run `uv tool upgrade {PACKAGE_NAME}`.")
+            raise typer.Exit(1)
+
+        installed_display = info.installed or "unknown"
+        latest_display = info.latest or "unknown"
+        status = "update available" if info.update_available else "up to date"
+
+        log(f"{PACKAGE_NAME} installed: {installed_display}")
+        log(f"{PACKAGE_NAME} latest:    {latest_display}")
+        log(f"Status: {status}")
+
+        if info.update_available:
+            log("Run `klaude upgrade` to upgrade.")
+
+        return
+
+    if shutil.which("uv") is None:
+        log(("Error: `uv` not found in PATH.", "red"))
+        log(f"To update, install uv and run `uv tool upgrade {PACKAGE_NAME}`.")
+        raise typer.Exit(1)
+
+    log(f"Running `uv tool upgrade {PACKAGE_NAME}`...")
+    result = subprocess.run(["uv", "tool", "upgrade", PACKAGE_NAME], check=False)
+    if result.returncode != 0:
+        log((f"Error: update failed (exit code {result.returncode}).", "red"))
+        raise typer.Exit(result.returncode or 1)
+
+    log("Update complete. Please re-run `klaude` to use the new version.")
+
+
+def register_self_update_commands(app: typer.Typer) -> None:
+    """Register self-update and version subcommands to the given Typer app."""
+
+    app.command("update")(update_command)
+    app.command("upgrade", help="Alias for `klaude update`.")(update_command)
+    app.command("version", help="Alias for `klaude --version`.")(version_command)
+
+
+def check_for_updates_blocking() -> VersionInfo | None:
+    """Check for updates to klaude-code synchronously.
+
+    This is intended for CLI commands (e.g. `klaude update --check`) that need
+    a deterministic result instead of the async cached behavior.
+
+    Returns:
+        VersionInfo if uv is available, otherwise None.
+    """
+
+    if not _has_uv():
+        return None
+
+    installed = _get_installed_version()
+    latest = _get_latest_version()
+
+    update_available = False
+    if installed and latest:
+        update_available = _compare_versions(installed, latest)
+
+    return VersionInfo(
+        installed=installed,
+        latest=latest,
+        update_available=update_available,
+    )

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/command/__init__.py

@@ -1,4 +1,4 @@
-from .command_abc import CommandABC, CommandResult, InputAction, InputActionType
+from .command_abc import CommandABC, CommandResult
 from .registry import (
     dispatch_command,
     get_commands,
@@ -89,8 +89,6 @@ __all__ = [
     # "StatusCommand", "TerminalSetupCommand",
     "CommandABC",
     "CommandResult",
-    "InputAction",
-    "InputActionType",
     "dispatch_command",
     "ensure_commands_loaded",
     "get_commands",

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/command/clear_cmd.py

@@ -1,5 +1,5 @@
-from klaude_code.command.command_abc import Agent, CommandABC, CommandResult, InputAction
-from klaude_code.protocol import commands
+from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
+from klaude_code.protocol import commands, model, op
 
 
 class ClearCommand(CommandABC):
@@ -13,5 +13,6 @@ class ClearCommand(CommandABC):
     def summary(self) -> str:
         return "Clear conversation history and free up context"
 
-    async def run(self, raw: str, agent: Agent) -> CommandResult:
-        return CommandResult(actions=[InputAction.clear()])
+    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+        del user_input  # unused
+        return CommandResult(operations=[op.ClearSessionOperation(session_id=agent.session.id)])

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/command/command_abc.py

@@ -1,11 +1,10 @@
 from abc import ABC, abstractmethod
-from enum import Enum
 from typing import Protocol
 
 from pydantic import BaseModel
 
 from klaude_code.llm import LLMClientABC
-from klaude_code.protocol import commands, llm_param
+from klaude_code.protocol import commands, llm_param, model, op
 from klaude_code.protocol import events as protocol_events
 from klaude_code.session.session import Session
 
@@ -34,40 +33,6 @@ class Agent(Protocol):
     def get_llm_client(self) -> LLMClientABC: ...
 
 
-class InputActionType(str, Enum):
-    """Supported input action kinds."""
-
-    RUN_AGENT = "run_agent"
-    CHANGE_MODEL = "change_model"
-    CLEAR = "clear"
-
-
-class InputAction(BaseModel):
-    """Structured executor action derived from a user input."""
-
-    type: InputActionType
-    text: str = ""
-    model_name: str | None = None
-
-    @classmethod
-    def run_agent(cls, text: str) -> "InputAction":
-        """Create a RunAgent action preserving the provided text."""
-
-        return cls(type=InputActionType.RUN_AGENT, text=text)
-
-    @classmethod
-    def change_model(cls, model_name: str) -> "InputAction":
-        """Create a ChangeModel action for the provided model name."""
-
-        return cls(type=InputActionType.CHANGE_MODEL, model_name=model_name)
-
-    @classmethod
-    def clear(cls) -> "InputAction":
-        """Create a Clear action to reset the session."""
-
-        return cls(type=InputActionType.CLEAR)
-
-
 class CommandResult(BaseModel):
     """Result of a command execution."""
 
@@ -75,7 +40,7 @@ class CommandResult(BaseModel):
         list[protocol_events.DeveloperMessageEvent | protocol_events.WelcomeEvent | protocol_events.ReplayHistoryEvent]
         | None
     ) = None  # List of UI events to display immediately
-    actions: list[InputAction] | None = None
+    operations: list[op.Operation] | None = None
 
 
 class CommandABC(ABC):
@@ -109,13 +74,13 @@ class CommandABC(ABC):
         return "additional instructions"
 
     @abstractmethod
-    async def run(self, raw: str, agent: Agent) -> CommandResult:
+    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
         """
         Execute the command.
 
         Args:
-            raw: The full command string as typed by user (e.g., "/help" or "/model gpt-4")
-            session_id: Current session ID, may be None if no session initialized yet
+            agent: The agent instance
+            user_input: User input with text containing command arguments (without command name)
 
         Returns:
             CommandResult: Result of the command execution

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/command/debug_cmd.py

@@ -45,8 +45,8 @@ class DebugCommand(CommandABC):
     def placeholder(self) -> str:
         return "filter types"
 
-    async def run(self, raw: str, agent: Agent) -> CommandResult:
-        raw = raw.strip()
+    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+        raw = user_input.text.strip()
 
         # /debug (no args) - enable debug
         if not raw:

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/command/diff_cmd.py

@@ -16,7 +16,8 @@ class DiffCommand(CommandABC):
     def summary(self) -> str:
         return "Show git diff"
 
-    async def run(self, raw: str, agent: Agent) -> CommandResult:
+    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+        del user_input  # unused
         try:
             # Check if current directory is in a git repository
             git_check = subprocess.run(

klaude_code-1.2.20/src/klaude_code/command/export_cmd.py

@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
+from klaude_code.protocol import commands, model, op
+
+
+class ExportCommand(CommandABC):
+    """Export the current session into a standalone HTML transcript."""
+
+    @property
+    def name(self) -> commands.CommandName:
+        return commands.CommandName.EXPORT
+
+    @property
+    def summary(self) -> str:
+        return "Export current session to HTML"
+
+    @property
+    def support_addition_params(self) -> bool:
+        return True
+
+    @property
+    def placeholder(self) -> str:
+        return "output path"
+
+    @property
+    def is_interactive(self) -> bool:
+        return False
+
+    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+        output_path = self._normalize_output_path(user_input.text, agent)
+        return CommandResult(
+            operations=[
+                op.ExportSessionOperation(
+                    session_id=agent.session.id,
+                    output_path=str(output_path) if output_path is not None else None,
+                )
+            ]
+        )
+
+    def _normalize_output_path(self, raw: str, agent: Agent) -> Path | None:
+        trimmed = raw.strip()
+        if trimmed:
+            candidate = Path(trimmed).expanduser()
+            if not candidate.is_absolute():
+                candidate = Path(agent.session.work_dir) / candidate
+            if candidate.suffix.lower() != ".html":
+                candidate = candidate.with_suffix(".html")
+            return candidate
+        return None

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/command/export_online_cmd.py

@@ -6,6 +6,9 @@ import subprocess
 import tempfile
 from pathlib import Path
 
+from rich.console import Console
+from rich.text import Text
+
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, model
 from klaude_code.session.export import build_export_html
@@ -30,7 +33,8 @@ class ExportOnlineCommand(CommandABC):
     def is_interactive(self) -> bool:
         return False
 
-    async def run(self, raw: str, agent: Agent) -> CommandResult:
+    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+        del user_input  # unused
         # Check if npx or surge is available
         surge_cmd = self._get_surge_command()
         if not surge_cmd:
@@ -56,9 +60,11 @@ class ExportOnlineCommand(CommandABC):
             return CommandResult(events=[event])
 
         try:
-            html_doc = self._build_html(agent)
-            domain = self._generate_domain()
-            url = self._deploy_to_surge(surge_cmd, html_doc, domain)
+            console = Console()
+            with console.status(Text("Deploying to surge.sh...", style="dim"), spinner_style="dim"):
+                html_doc = self._build_html(agent)
+                domain = self._generate_domain()
+                url = self._deploy_to_surge(surge_cmd, html_doc, domain)
 
             event = events.DeveloperMessageEvent(
                 session_id=agent.session.id,

{klaude_code-1.2.18 → klaude_code-1.2.20}/src/klaude_code/command/help_cmd.py

@@ -13,7 +13,8 @@ class HelpCommand(CommandABC):
     def summary(self) -> str:
         return "Show help and available commands"
 
-    async def run(self, raw: str, agent: Agent) -> CommandResult:
+    async def run(self, agent: Agent, user_input: model.UserInputPayload) -> CommandResult:
+        del user_input  # unused
         lines: list[str] = [
             """
 Usage: