klaude-code 2.5.3__tar.gz → 2.7.0__tar.gz

{klaude_code-2.5.3 → klaude_code-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 2.5.3
+Version: 2.7.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
@@ -9,15 +9,13 @@ Requires-Dist: diff-match-patch>=20241021
 Requires-Dist: google-genai>=1.56.0
 Requires-Dist: markdown-it-py>=4.0.0
 Requires-Dist: openai>=1.102.0
-Requires-Dist: pillow>=9.1,<11.0
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14.1.0
-Requires-Dist: term-image>=0.7.2
 Requires-Dist: trafilatura>=2.0.0
 Requires-Dist: typer>=0.17.3
-Requires-Python: >=3.13, <3.14
+Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 
 # Klaude Code
@@ -52,32 +50,31 @@ To update:
 uv tool upgrade klaude-code
 ```
 
-Or use the built-in alias command:
+Or use the built-in command:
 
 ```bash
-klaude update
 klaude upgrade
-klaude --version
-
 ```
 
 ## Usage
 
 ```bash
-klaude [--model <name>] [--select-model]
+klaude [--model [<name>]] [--continue] [--resume [<id>]]
 ```
 
 **Options:**
-- `--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).
+- `--model`/`-m`: Choose a model.
+  - `--model` (no value): opens the interactive selector.
+  - `--model <value>`: resolves `<value>` to a single model; if it can't, it opens the interactive selector filtered by `<value>`.
 - `--continue`/`-c`: Resume the most recent session.
-- `--resume`/`-r`: Select a session to resume for this project.
-- `--resume-by-id <id>`: Resume a session by its ID directly.
+- `--resume`/`-r`: Resume a session.
+  - `--resume` (no value): select a session to resume for this project.
+  - `--resume <id>`: resume a session by its ID directly.
 - `--vanilla`: Minimal mode with only basic tools (Bash, Read, Edit, Write) and no system prompts.
 
 **Model selection behavior:**
 - Default: uses `main_model` from config.
-- `--select-model`: always prompts you to pick.
+- `--model` (no value): always prompts you to pick.
 - `--model <value>`: tries to resolve `<value>` to a single model; if it can't, it prompts with a filtered list (and falls back to showing all models if there are no matches).
 
 **Debug Options:**
@@ -125,24 +122,34 @@ klaude list
 
 Models from providers without a valid API key are shown as dimmed/unavailable.
 
-#### OAuth Login
+#### Authentication
 
-For subscription-based providers (Claude Pro/Max, ChatGPT Pro), use the login command:
+Use the auth command to configure API keys or login to subscription-based providers:
 
 ```bash
 # Interactive provider selection
-klaude login
-
-# Or specify provider directly
-klaude login claude   # Claude Pro/Max subscription
-klaude login codex    # ChatGPT Pro subscription
+klaude auth login
+
+# Configure API keys
+klaude auth login anthropic   # Set ANTHROPIC_API_KEY
+klaude auth login openai      # Set OPENAI_API_KEY
+klaude auth login google      # Set GOOGLE_API_KEY
+klaude auth login openrouter  # Set OPENROUTER_API_KEY
+klaude auth login deepseek    # Set DEEPSEEK_API_KEY
+klaude auth login moonshot    # Set MOONSHOT_API_KEY
+
+# OAuth login for subscription-based providers
+klaude auth login claude      # Claude Pro/Max subscription
+klaude auth login codex       # ChatGPT Pro subscription
 ```
 
-To logout:
+API keys are stored in `~/.klaude/klaude-auth.json` and used as fallback when environment variables are not set.
+
+To logout from OAuth providers:
 
 ```bash
-klaude logout claude
-klaude logout codex
+klaude auth logout claude
+klaude auth logout codex
 ```
 
 #### Custom Configuration
@@ -152,7 +159,7 @@ User config file: `~/.klaude/klaude-config.yaml`
 Open in editor:
 
 ```bash
-klaude config
+klaude conf
 ```
 
 ##### Model Configuration
@@ -208,21 +215,6 @@ List configured providers and models:
 klaude list
 ```
 
-### Session Management
-
-Clean up sessions with few messages:
-
-```bash
-# Remove sessions with fewer than 5 messages (default)
-klaude session clean
-
-# Remove sessions with fewer than 10 messages
-klaude session clean --min 10
-
-# Remove all sessions for the current project
-klaude session clean-all
-```
-
 ### Cost Tracking
 
 View aggregated usage statistics across all sessions:

{klaude_code-2.5.3 → klaude_code-2.7.0}/README.md

@@ -30,32 +30,31 @@ To update:
 uv tool upgrade klaude-code
 ```
 
-Or use the built-in alias command:
+Or use the built-in command:
 
 ```bash
-klaude update
 klaude upgrade
-klaude --version
-
 ```
 
 ## Usage
 
 ```bash
-klaude [--model <name>] [--select-model]
+klaude [--model [<name>]] [--continue] [--resume [<id>]]
 ```
 
 **Options:**
-- `--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).
+- `--model`/`-m`: Choose a model.
+  - `--model` (no value): opens the interactive selector.
+  - `--model <value>`: resolves `<value>` to a single model; if it can't, it opens the interactive selector filtered by `<value>`.
 - `--continue`/`-c`: Resume the most recent session.
-- `--resume`/`-r`: Select a session to resume for this project.
-- `--resume-by-id <id>`: Resume a session by its ID directly.
+- `--resume`/`-r`: Resume a session.
+  - `--resume` (no value): select a session to resume for this project.
+  - `--resume <id>`: resume a session by its ID directly.
 - `--vanilla`: Minimal mode with only basic tools (Bash, Read, Edit, Write) and no system prompts.
 
 **Model selection behavior:**
 - Default: uses `main_model` from config.
-- `--select-model`: always prompts you to pick.
+- `--model` (no value): always prompts you to pick.
 - `--model <value>`: tries to resolve `<value>` to a single model; if it can't, it prompts with a filtered list (and falls back to showing all models if there are no matches).
 
 **Debug Options:**
@@ -103,24 +102,34 @@ klaude list
 
 Models from providers without a valid API key are shown as dimmed/unavailable.
 
-#### OAuth Login
+#### Authentication
 
-For subscription-based providers (Claude Pro/Max, ChatGPT Pro), use the login command:
+Use the auth command to configure API keys or login to subscription-based providers:
 
 ```bash
 # Interactive provider selection
-klaude login
-
-# Or specify provider directly
-klaude login claude   # Claude Pro/Max subscription
-klaude login codex    # ChatGPT Pro subscription
+klaude auth login
+
+# Configure API keys
+klaude auth login anthropic   # Set ANTHROPIC_API_KEY
+klaude auth login openai      # Set OPENAI_API_KEY
+klaude auth login google      # Set GOOGLE_API_KEY
+klaude auth login openrouter  # Set OPENROUTER_API_KEY
+klaude auth login deepseek    # Set DEEPSEEK_API_KEY
+klaude auth login moonshot    # Set MOONSHOT_API_KEY
+
+# OAuth login for subscription-based providers
+klaude auth login claude      # Claude Pro/Max subscription
+klaude auth login codex       # ChatGPT Pro subscription
 ```
 
-To logout:
+API keys are stored in `~/.klaude/klaude-auth.json` and used as fallback when environment variables are not set.
+
+To logout from OAuth providers:
 
 ```bash
-klaude logout claude
-klaude logout codex
+klaude auth logout claude
+klaude auth logout codex
 ```
 
 #### Custom Configuration
@@ -130,7 +139,7 @@ User config file: `~/.klaude/klaude-config.yaml`
 Open in editor:
 
 ```bash
-klaude config
+klaude conf
 ```
 
 ##### Model Configuration
@@ -186,21 +195,6 @@ List configured providers and models:
 klaude list
 ```
 
-### Session Management
-
-Clean up sessions with few messages:
-
-```bash
-# Remove sessions with fewer than 5 messages (default)
-klaude session clean
-
-# Remove sessions with fewer than 10 messages
-klaude session clean --min 10
-
-# Remove all sessions for the current project
-klaude session clean-all
-```
-
 ### Cost Tracking
 
 View aggregated usage statistics across all sessions:

{klaude_code-2.5.3 → klaude_code-2.7.0}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "2.5.3"
+version = "2.7.0"
 description = "Minimal code agent CLI"
 readme = "README.md"
-requires-python = ">=3.13,<3.14"
+requires-python = ">=3.13"
 dependencies = [
     "anthropic>=0.66.0",
     "chardet>=5.2.0",
@@ -16,12 +16,10 @@ dependencies = [
     "google-genai>=1.56.0",
     "markdown-it-py>=4.0.0",
     "openai>=1.102.0",
-    "pillow>=9.1,<11.0",
     "prompt-toolkit>=3.0.52",
     "pydantic>=2.11.7",
     "pyyaml>=6.0.2",
     "rich>=14.1.0",
-    "term-image>=0.7.2",
     "trafilatura>=2.0.0",
     "typer>=0.17.3",
 ]

{klaude_code-2.5.3 → klaude_code-2.7.0}/src/klaude_code/app/runtime.py

@@ -178,6 +178,6 @@ async def handle_keyboard_interrupt(executor: Executor) -> None:
     log("Bye!")
     session_id = executor.context.current_session_id()
     if session_id and Session.exists(session_id):
-        log(("Resume with:", "dim"), (f"klaude --resume-by-id {session_id}", "green"))
+        log(("Resume with:", "dim"), (f"klaude --resume {session_id}", "green"))
     with contextlib.suppress(Exception):
         await executor.submit(op.InterruptOperation(target_session_id=None))

{klaude_code-2.5.3 → klaude_code-2.7.0}/src/klaude_code/auth/__init__.py

@@ -12,6 +12,12 @@ from klaude_code.auth.codex import (
     CodexTokenExpiredError,
     CodexTokenManager,
 )
+from klaude_code.auth.env import (
+    delete_auth_env,
+    get_auth_env,
+    list_auth_env,
+    set_auth_env,
+)
 
 __all__ = [
     "CodexAuthError",
@@ -21,4 +27,8 @@ __all__ = [
     "CodexOAuthError",
     "CodexTokenExpiredError",
     "CodexTokenManager",
+    "delete_auth_env",
+    "get_auth_env",
+    "list_auth_env",
+    "set_auth_env",
 ]

klaude_code-2.7.0/src/klaude_code/auth/env.py

@@ -0,0 +1,81 @@
+"""Environment variable configuration stored in klaude-auth.json."""
+
+import json
+from typing import Any, cast
+
+from klaude_code.auth.base import KLAUDE_AUTH_FILE
+
+
+def _load_store() -> dict[str, Any]:
+    """Load the auth store from file."""
+    if not KLAUDE_AUTH_FILE.exists():
+        return {}
+    try:
+        data = json.loads(KLAUDE_AUTH_FILE.read_text())
+        if isinstance(data, dict):
+            return cast(dict[str, Any], data)
+        return {}
+    except (json.JSONDecodeError, ValueError):
+        return {}
+
+
+def _save_store(data: dict[str, Any]) -> None:
+    """Save the auth store to file."""
+    KLAUDE_AUTH_FILE.parent.mkdir(parents=True, exist_ok=True)
+    KLAUDE_AUTH_FILE.write_text(json.dumps(data, indent=2))
+
+
+def _get_env_section(store: dict[str, Any]) -> dict[str, Any] | None:
+    """Extract and validate the 'env' section from store."""
+    env_section = store.get("env")
+    if isinstance(env_section, dict):
+        return cast(dict[str, Any], env_section)
+    return None
+
+
+def get_auth_env(env_var: str) -> str | None:
+    """Get environment variable value from klaude-auth.json 'env' section.
+
+    This provides a fallback for API keys when real environment variables are not set.
+    Priority: os.environ > klaude-auth.json env
+    """
+    env_section = _get_env_section(_load_store())
+    if env_section is None:
+        return None
+    value = env_section.get(env_var)
+    return str(value) if value is not None else None
+
+
+def set_auth_env(env_var: str, value: str) -> None:
+    """Set environment variable value in klaude-auth.json 'env' section."""
+    store = _load_store()
+    env_section = _get_env_section(store) or {}
+    env_section[env_var] = value
+    store["env"] = env_section
+    _save_store(store)
+
+
+def delete_auth_env(env_var: str) -> None:
+    """Delete environment variable from klaude-auth.json 'env' section."""
+    store = _load_store()
+    env_section = _get_env_section(store)
+    if env_section is None:
+        return
+    env_section.pop(env_var, None)
+    if len(env_section) == 0:
+        store.pop("env", None)
+    else:
+        store["env"] = env_section
+    if len(store) == 0:
+        if KLAUDE_AUTH_FILE.exists():
+            KLAUDE_AUTH_FILE.unlink()
+    else:
+        _save_store(store)
+
+
+def list_auth_env() -> dict[str, str]:
+    """List all environment variables in klaude-auth.json 'env' section."""
+    env_section = _get_env_section(_load_store())
+    if env_section is None:
+        return {}
+    return {k: str(v) for k, v in env_section.items() if v is not None}

{klaude_code-2.5.3 → klaude_code-2.7.0}/src/klaude_code/cli/auth_cmd.py

@@ -11,10 +11,30 @@ from klaude_code.tui.terminal.selector import DEFAULT_PICKER_STYLE, SelectItem,
 
 def _select_provider() -> str | None:
     """Display provider selection menu and return selected provider."""
+    from klaude_code.config.builtin_config import SUPPORTED_API_KEYS
+
     items: list[SelectItem[str]] = [
-        SelectItem(title=[("class:text", "Claude Max/Pro Subscription\n")], value="claude", search_text="claude"),
-        SelectItem(title=[("class:text", "ChatGPT Codex Subscription\n")], value="codex", search_text="codex"),
+        SelectItem(
+            title=[("", "Claude Max/Pro Subscription "), ("ansibrightblack", "[OAuth]\n")],
+            value="claude",
+            search_text="claude",
+        ),
+        SelectItem(
+            title=[("", "ChatGPT Codex Subscription "), ("ansibrightblack", "[OAuth]\n")],
+            value="codex",
+            search_text="codex",
+        ),
     ]
+    # Add API key options
+    for key_info in SUPPORTED_API_KEYS:
+        items.append(
+            SelectItem(
+                title=[("", f"{key_info.name} "), ("ansibrightblack", "[API key]\n")],
+                value=key_info.env_var,
+                search_text=key_info.env_var,
+            )
+        )
+
     return select_one(
         message="Select provider to login:",
         items=items,
@@ -24,10 +44,41 @@ def _select_provider() -> str | None:
     )
 
 
+def _configure_api_key(env_var: str) -> None:
+    """Configure a specific API key."""
+    import os
+
+    from klaude_code.auth.env import get_auth_env, set_auth_env
+
+    # Check if already configured
+    current_value = os.environ.get(env_var) or get_auth_env(env_var)
+    if current_value:
+        masked = current_value[:8] + "..." if len(current_value) > 8 else "***"
+        log(f"Current {env_var}: {masked}")
+        if not typer.confirm("Do you want to update it?"):
+            return
+
+    api_key = typer.prompt(f"Enter {env_var}", hide_input=True)
+    if not api_key.strip():
+        log(("Error: API key cannot be empty", "red"))
+        raise typer.Exit(1)
+
+    set_auth_env(env_var, api_key.strip())
+    log((f"{env_var} saved successfully!", "green"))
+
+
+def _build_provider_help() -> str:
+    from klaude_code.config.builtin_config import SUPPORTED_API_KEYS
+
+    # Use first word of name for brevity (e.g., "google" instead of "google gemini")
+    names = ["codex", "claude"] + [k.name.split()[0].lower() for k in SUPPORTED_API_KEYS]
+    return f"Provider name ({', '.join(names)})"
+
+
 def login_command(
-    provider: str | None = typer.Argument(None, help="Provider to login (codex|claude)"),
+    provider: str | None = typer.Argument(None, help=_build_provider_help()),
 ) -> None:
-    """Login to a provider using OAuth."""
+    """Login to a provider or configure API keys."""
     if provider is None:
         provider = _select_provider()
         if provider is None:
@@ -99,8 +150,27 @@ def login_command(
                 log((f"Login failed: {e}", "red"))
                 raise typer.Exit(1) from None
         case _:
-            log((f"Error: Unknown provider '{provider}'. Supported: codex, claude", "red"))
-            raise typer.Exit(1)
+            from klaude_code.config.builtin_config import SUPPORTED_API_KEYS
+
+            # Match by env var (e.g., OPENAI_API_KEY) or name (e.g., openai, google)
+            env_var: str | None = None
+            provider_lower = provider.lower()
+            provider_upper = provider.upper()
+            for key_info in SUPPORTED_API_KEYS:
+                name_lower = key_info.name.lower()
+                # Exact match or starts with (for "google" -> "google gemini")
+                if key_info.env_var == provider_upper or name_lower == provider_lower:
+                    env_var = key_info.env_var
+                    break
+                if name_lower.startswith(provider_lower) or provider_lower in name_lower.split():
+                    env_var = key_info.env_var
+                    break
+
+            if env_var:
+                _configure_api_key(env_var)
+            else:
+                log((f"Error: Unknown provider '{provider}'", "red"))
+                raise typer.Exit(1)
 
 
 def logout_command(
@@ -139,5 +209,14 @@ def logout_command(
 
 def register_auth_commands(app: typer.Typer) -> None:
     """Register auth commands to the given Typer app."""
-    app.command("login")(login_command)
-    app.command("logout")(logout_command)
+    auth_app = typer.Typer(help="Login/logout", invoke_without_command=True)
+
+    @auth_app.callback()
+    def auth_callback(ctx: typer.Context) -> None:  # pyright: ignore[reportUnusedFunction]
+        """Authentication commands for managing provider logins."""
+        if ctx.invoked_subcommand is None:
+            typer.echo(ctx.get_help())
+
+    auth_app.command("login")(login_command)
+    auth_app.command("logout")(logout_command)
+    app.add_typer(auth_app, name="auth")

{klaude_code-2.5.3 → klaude_code-2.7.0}/src/klaude_code/cli/config_cmd.py

@@ -11,9 +11,9 @@ from klaude_code.log import log
 
 
 def list_models(
-    show_all: bool = typer.Option(False, "--all", "-a", help="Show all providers including unavailable ones"),
+    show_all: bool = typer.Option(False, "--all", "-a", help="Include unavailable providers"),
 ) -> None:
-    """List all models and providers configuration"""
+    """List available models"""
     from klaude_code.cli.list_model import display_models_and_providers
     from klaude_code.tui.terminal.color import is_light_terminal_background
 
@@ -31,7 +31,7 @@ def list_models(
 
 
 def edit_config() -> None:
-    """Open the configuration file in $EDITOR or default system editor"""
+    """Edit config file"""
     editor = os.environ.get("EDITOR")
 
     # If no EDITOR is set, prioritize TextEdit on macOS
@@ -89,5 +89,5 @@ def edit_config() -> None:
 def register_config_commands(app: typer.Typer) -> None:
     """Register config commands to the given Typer app."""
     app.command("list")(list_models)
-    app.command("config")(edit_config)
-    app.command("conf", hidden=True)(edit_config)
+    app.command("conf")(edit_config)
+    app.command("config", hidden=True)(edit_config)