PyPI - klaude-code - Versions diffs - 1.2.12__tar.gz → 1.2.14__tar.gz - Mend

klaude-code 1.2.12tar.gz → 1.2.14tar.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.

Files changed (189) hide show

{klaude_code-1.2.12 → klaude_code-1.2.14}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.2.12
+Version: 1.2.14
 Summary: Add your description here
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: openai>=1.102.0

{klaude_code-1.2.12 → klaude_code-1.2.14}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 [project]
 name = "klaude-code"
-version = "1.2.12"
+version = "1.2.14"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -30,7 +30,6 @@ module-name = "klaude_code"
 [dependency-groups]
 dev = [
     "import-linter>=2.6",
-    "isort>=6.0.1",
     "pyright>=1.1.407",
     "pytest>=8.4.1",
     "pytest-cov>=7.0.0",
@@ -45,6 +44,14 @@ markers = [
 [tool.ruff]
 line-length = 120
+src = ["src"]
+[tool.ruff.lint]
+select = ["E", "F", "B", "I", "UP", "SIM", "RUF"]
+ignore = ["RUF001", "RUF002", "RUF003", "E501"]
+[tool.ruff.lint.isort]
+known-first-party = ["klaude_code"]
 [tool.pyright]
 typeCheckingMode = "strict"

{klaude_code-1.2.12 → klaude_code-1.2.14}/src/klaude_code/auth/codex/oauth.py RENAMED Viewed

@@ -78,13 +78,13 @@ class OAuthCallbackHandler(BaseHTTPRequestHandler):
         self.end_headers()
         if OAuthCallbackHandler.error:
-            html = """
+            html = f"""
             <html><body style="font-family: sans-serif; text-align: center; padding: 50px;">
             <h1>Authentication Failed</h1>
-            <p>Error: {}</p>
+            <p>Error: {OAuthCallbackHandler.error}</p>
             <p>Please close this window and try again.</p>
             </body></html>
-            """.format(OAuthCallbackHandler.error)
+            """
         else:
             html = """
             <html><body style="font-family: sans-serif; text-align: center; padding: 50px;">

klaude_code-1.2.14/src/klaude_code/cli/auth_cmd.py ADDED Viewed

@@ -0,0 +1,73 @@
+"""Authentication commands for CLI."""
+import datetime
+import typer
+from klaude_code.trace import log
+def login_command(
+    provider: str = typer.Argument("codex", help="Provider to login (codex)"),
+) -> None:
+    """Login to a provider using OAuth."""
+    if provider.lower() != "codex":
+        log((f"Error: Unknown provider '{provider}'. Currently only 'codex' is supported.", "red"))
+        raise typer.Exit(1)
+    from klaude_code.auth.codex.oauth import CodexOAuth
+    from klaude_code.auth.codex.token_manager import CodexTokenManager
+    token_manager = CodexTokenManager()
+    # Check if already logged in
+    if token_manager.is_logged_in():
+        state = token_manager.get_state()
+        if state and not state.is_expired():
+            log(("You are already logged in to Codex.", "green"))
+            log(f"  Account ID: {state.account_id[:8]}...")
+            expires_dt = datetime.datetime.fromtimestamp(state.expires_at, tz=datetime.UTC)
+            log(f"  Expires: {expires_dt.strftime('%Y-%m-%d %H:%M:%S UTC')}")
+            if not typer.confirm("Do you want to re-login?"):
+                return
+    log("Starting Codex OAuth login flow...")
+    log("A browser window will open for authentication.")
+    try:
+        oauth = CodexOAuth(token_manager)
+        state = oauth.login()
+        log(("Login successful!", "green"))
+        log(f"  Account ID: {state.account_id[:8]}...")
+        expires_dt = datetime.datetime.fromtimestamp(state.expires_at, tz=datetime.UTC)
+        log(f"  Expires: {expires_dt.strftime('%Y-%m-%d %H:%M:%S UTC')}")
+    except Exception as e:
+        log((f"Login failed: {e}", "red"))
+        raise typer.Exit(1) from None
+def logout_command(
+    provider: str = typer.Argument("codex", help="Provider to logout (codex)"),
+) -> None:
+    """Logout from a provider."""
+    if provider.lower() != "codex":
+        log((f"Error: Unknown provider '{provider}'. Currently only 'codex' is supported.", "red"))
+        raise typer.Exit(1)
+    from klaude_code.auth.codex.token_manager import CodexTokenManager
+    token_manager = CodexTokenManager()
+    if not token_manager.is_logged_in():
+        log("You are not logged in to Codex.")
+        return
+    if typer.confirm("Are you sure you want to logout from Codex?"):
+        token_manager.delete()
+        log(("Logged out from Codex.", "green"))
+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)

klaude_code-1.2.14/src/klaude_code/cli/config_cmd.py ADDED Viewed

@@ -0,0 +1,88 @@
+"""Configuration commands for CLI."""
+import os
+import subprocess
+import sys
+import typer
+from klaude_code.config import config_path, load_config
+from klaude_code.trace import log
+def list_models() -> None:
+    """List all models and providers configuration"""
+    from klaude_code.config.list_model import display_models_and_providers
+    from klaude_code.ui.terminal.color import is_light_terminal_background
+    config = load_config()
+    if config is None:
+        raise typer.Exit(1)
+    # Auto-detect theme when not explicitly set in config, to match other CLI entrypoints.
+    if config.theme is None:
+        detected = is_light_terminal_background()
+        if detected is True:
+            config.theme = "light"
+        elif detected is False:
+            config.theme = "dark"
+    display_models_and_providers(config)
+def edit_config() -> None:
+    """Open the configuration file in $EDITOR or default system editor"""
+    editor = os.environ.get("EDITOR")
+    # If no EDITOR is set, prioritize TextEdit on macOS
+    if not editor:
+        # Try common editors in order of preference on other platforms
+        for cmd in [
+            "code",
+            "nvim",
+            "vim",
+            "nano",
+        ]:
+            try:
+                subprocess.run(["which", cmd], check=True, capture_output=True)
+                editor = cmd
+                break
+            except (subprocess.CalledProcessError, FileNotFoundError):
+                continue
+    # If no editor found, try platform-specific defaults
+    if not editor:
+        if sys.platform == "darwin":  # macOS
+            editor = "open"
+        elif sys.platform == "win32":  # Windows
+            editor = "notepad"
+        else:  # Linux and other Unix systems
+            editor = "xdg-open"
+    # Ensure config file exists
+    config = load_config()
+    if config is None:
+        raise typer.Exit(1)
+    try:
+        if editor == "open -a TextEdit":
+            subprocess.run(["open", "-a", "TextEdit", str(config_path)], check=True)
+        elif editor in ["open", "xdg-open"]:
+            # For open/xdg-open, we need to pass the file directly
+            subprocess.run([editor, str(config_path)], check=True)
+        else:
+            subprocess.run([editor, str(config_path)], check=True)
+    except subprocess.CalledProcessError as e:
+        log((f"Error: Failed to open editor: {e}", "red"))
+        raise typer.Exit(1) from None
+    except FileNotFoundError:
+        log((f"Error: Editor '{editor}' not found", "red"))
+        log("Please install a text editor or set your $EDITOR environment variable")
+        raise typer.Exit(1) from 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)

klaude_code-1.2.14/src/klaude_code/cli/debug.py ADDED Viewed

@@ -0,0 +1,72 @@
+"""Debug utilities for CLI."""
+import os
+import subprocess
+import sys
+from pathlib import Path
+import typer
+from klaude_code.trace import DebugType, log
+DEBUG_FILTER_HELP = "Comma-separated debug types: " + ", ".join(dt.value for dt in DebugType)
+def parse_debug_filters(raw: str | None) -> set[DebugType] | None:
+    """Parse comma-separated debug filter string into a set of DebugType."""
+    if raw is None:
+        return None
+    filters: set[DebugType] = set()
+    for chunk in raw.split(","):
+        normalized = chunk.strip().lower().replace("-", "_")
+        if not normalized:
+            continue
+        try:
+            filters.add(DebugType(normalized))
+        except ValueError:  # pragma: no cover - user input validation
+            valid_options = ", ".join(dt.value for dt in DebugType)
+            log(
+                (
+                    f"Invalid debug filter '{normalized}'. Valid options: {valid_options}",
+                    "red",
+                )
+            )
+            raise typer.Exit(2) from None
+    return filters or None
+def resolve_debug_settings(flag: bool, raw_filters: str | None) -> tuple[bool, set[DebugType] | None]:
+    """Resolve debug flag and filters into effective settings."""
+    filters = parse_debug_filters(raw_filters)
+    effective_flag = flag or (filters is not None)
+    return effective_flag, filters
+def open_log_file_in_editor(path: Path) -> None:
+    """Open the given log file in a text editor without blocking the CLI."""
+    editor = os.environ.get("EDITOR")
+    if not editor:
+        for cmd in ["open", "xdg-open", "code", "nvim", "vim", "nano"]:
+            try:
+                subprocess.run(["which", cmd], check=True, capture_output=True)
+                editor = cmd
+                break
+            except (subprocess.CalledProcessError, FileNotFoundError):
+                continue
+    if not editor:
+        if sys.platform == "darwin":
+            editor = "open"
+        elif sys.platform == "win32":
+            editor = "notepad"
+        else:
+            editor = "xdg-open"
+    try:
+        subprocess.Popen([editor, str(path)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    except FileNotFoundError:
+        log((f"Error: Editor '{editor}' not found", "red"))
+    except Exception as exc:  # pragma: no cover - best effort
+        log((f"Warning: failed to open log file in editor: {exc}", "yellow"))

{klaude_code-1.2.12 → klaude_code-1.2.14}/src/klaude_code/cli/main.py RENAMED Viewed

@@ -1,19 +1,19 @@
 import asyncio
-import datetime
 import os
-import subprocess
 import sys
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as pkg_version
+from pathlib import Path
 import typer
-from klaude_code.cli.runtime import DEBUG_FILTER_HELP, AppInitConfig, resolve_debug_settings, run_exec, run_interactive
+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.session_cmd import register_session_commands
-from klaude_code.config import config_path, display_models_and_providers, load_config, select_model_from_config
+from klaude_code.config import load_config
 from klaude_code.session import Session, resume_select_session
-from klaude_code.trace import log
-from klaude_code.ui.terminal.color import is_light_terminal_background
+from klaude_code.trace import prepare_debug_log_file
 def set_terminal_title(title: str) -> None:
@@ -42,142 +42,10 @@ app = typer.Typer(
     no_args_is_help=False,
 )
-session_app = typer.Typer(help="Manage sessions for the current project")
-register_session_commands(session_app)
-app.add_typer(session_app, name="session")
-@app.command("login")
-def login_command(
-    provider: str = typer.Argument("codex", help="Provider to login (codex)"),
-) -> None:
-    """Login to a provider using OAuth."""
-    if provider.lower() != "codex":
-        log((f"Error: Unknown provider '{provider}'. Currently only 'codex' is supported.", "red"))
-        raise typer.Exit(1)
-    from klaude_code.auth.codex.oauth import CodexOAuth
-    from klaude_code.auth.codex.token_manager import CodexTokenManager
-    token_manager = CodexTokenManager()
-    # Check if already logged in
-    if token_manager.is_logged_in():
-        state = token_manager.get_state()
-        if state and not state.is_expired():
-            log(("You are already logged in to Codex.", "green"))
-            log(f"  Account ID: {state.account_id[:8]}...")
-            expires_dt = datetime.datetime.fromtimestamp(state.expires_at, tz=datetime.timezone.utc)
-            log(f"  Expires: {expires_dt.strftime('%Y-%m-%d %H:%M:%S UTC')}")
-            if not typer.confirm("Do you want to re-login?"):
-                return
-    log("Starting Codex OAuth login flow...")
-    log("A browser window will open for authentication.")
-    try:
-        oauth = CodexOAuth(token_manager)
-        state = oauth.login()
-        log(("Login successful!", "green"))
-        log(f"  Account ID: {state.account_id[:8]}...")
-        expires_dt = datetime.datetime.fromtimestamp(state.expires_at, tz=datetime.timezone.utc)
-        log(f"  Expires: {expires_dt.strftime('%Y-%m-%d %H:%M:%S UTC')}")
-    except Exception as e:
-        log((f"Login failed: {e}", "red"))
-        raise typer.Exit(1)
-@app.command("logout")
-def logout_command(
-    provider: str = typer.Argument("codex", help="Provider to logout (codex)"),
-) -> None:
-    """Logout from a provider."""
-    if provider.lower() != "codex":
-        log((f"Error: Unknown provider '{provider}'. Currently only 'codex' is supported.", "red"))
-        raise typer.Exit(1)
-    from klaude_code.auth.codex.token_manager import CodexTokenManager
-    token_manager = CodexTokenManager()
-    if not token_manager.is_logged_in():
-        log("You are not logged in to Codex.")
-        return
-    if typer.confirm("Are you sure you want to logout from Codex?"):
-        token_manager.delete()
-        log(("Logged out from Codex.", "green"))
-@app.command("list")
-def list_models() -> None:
-    """List all models and providers configuration"""
-    config = load_config()
-    if config is None:
-        raise typer.Exit(1)
-    # Auto-detect theme when not explicitly set in config, to match other CLI entrypoints.
-    if config.theme is None:
-        detected = is_light_terminal_background()
-        if detected is True:
-            config.theme = "light"
-        elif detected is False:
-            config.theme = "dark"
-    display_models_and_providers(config)
-@app.command("config")
-@app.command("conf", hidden=True)
-def edit_config() -> None:
-    """Open the configuration file in $EDITOR or default system editor"""
-    editor = os.environ.get("EDITOR")
-    # If no EDITOR is set, prioritize TextEdit on macOS
-    if not editor:
-        # Try common editors in order of preference on other platforms
-        for cmd in [
-            "code",
-            "nvim",
-            "vim",
-            "nano",
-        ]:
-            try:
-                subprocess.run(["which", cmd], check=True, capture_output=True)
-                editor = cmd
-                break
-            except (subprocess.CalledProcessError, FileNotFoundError):
-                continue
-    # If no editor found, try platform-specific defaults
-    if not editor:
-        if sys.platform == "darwin":  # macOS
-            editor = "open"
-        elif sys.platform == "win32":  # Windows
-            editor = "notepad"
-        else:  # Linux and other Unix systems
-            editor = "xdg-open"
-    # Ensure config file exists
-    config = load_config()
-    if config is None:
-        raise typer.Exit(1)
-    try:
-        if editor == "open -a TextEdit":
-            subprocess.run(["open", "-a", "TextEdit", str(config_path)], check=True)
-        elif editor in ["open", "xdg-open"]:
-            # For open/xdg-open, we need to pass the file directly
-            subprocess.run([editor, str(config_path)], check=True)
-        else:
-            subprocess.run([editor, str(config_path)], check=True)
-    except subprocess.CalledProcessError as e:
-        log((f"Error: Failed to open editor: {e}", "red"))
-        raise typer.Exit(1)
-    except FileNotFoundError:
-        log((f"Error: Editor '{editor}' not found", "red"))
-        log("Please install a text editor or set your $EDITOR environment variable")
-        raise typer.Exit(1)
+# Register subcommands from modules
+register_session_commands(app)
+register_auth_commands(app)
+register_config_commands(app)
 @app.command("exec")
@@ -222,6 +90,7 @@ def exec_command(
     ),
 ) -> None:
     """Execute non-interactively with provided input."""
+    from klaude_code.trace import log
     # Set terminal title with current folder name
     folder_name = os.path.basename(os.getcwd())
@@ -250,6 +119,9 @@ def exec_command(
         log(("Error: No input content provided", "red"))
         raise typer.Exit(1)
+    from klaude_code.cli.runtime import AppInitConfig, run_exec
+    from klaude_code.config.select_model import select_model_from_config
     chosen_model = model
     if select_model:
         # Prefer the explicitly provided model as default; otherwise main model
@@ -263,6 +135,10 @@ def exec_command(
     debug_enabled, debug_filters = resolve_debug_settings(debug, debug_filter)
+    log_path: Path | None = None
+    if debug_enabled:
+        log_path = prepare_debug_log_file()
     init_config = AppInitConfig(
         model=chosen_model,
         debug=debug_enabled,
@@ -272,6 +148,9 @@ def exec_command(
         stream_json=stream_json,
     )
+    if log_path:
+        open_log_file_in_editor(log_path)
     asyncio.run(
         run_exec(
             init_config=init_config,
@@ -328,6 +207,9 @@ def main_callback(
 ) -> None:
     # Only run interactive mode when no subcommand is invoked
     if ctx.invoked_subcommand is None:
+        from klaude_code.cli.runtime import AppInitConfig, run_interactive
+        from klaude_code.config.select_model import select_model_from_config
         # Set terminal title with current folder name
         folder_name = os.path.basename(os.getcwd())
         set_terminal_title(f"{folder_name}: klaude")
@@ -352,6 +234,10 @@ def main_callback(
         debug_enabled, debug_filters = resolve_debug_settings(debug, debug_filter)
+        log_path: Path | None = None
+        if debug_enabled:
+            log_path = prepare_debug_log_file()
         init_config = AppInitConfig(
             model=chosen_model,
             debug=debug_enabled,
@@ -359,6 +245,9 @@ def main_callback(
             debug_filters=debug_filters,
         )
+        if log_path:
+            open_log_file_in_editor(log_path)
         asyncio.run(
             run_interactive(
                 init_config=init_config,

{klaude_code-1.2.12 → klaude_code-1.2.14}/src/klaude_code/cli/runtime.py RENAMED Viewed

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 import sys
 from dataclasses import dataclass
 from typing import Any, Protocol
@@ -29,37 +30,6 @@ class PrintCapable(Protocol):
     def print(self, *objects: Any, style: Any | None = None, end: str = "\n") -> None: ...
-DEBUG_FILTER_HELP = "Comma-separated debug types: " + ", ".join(dt.value for dt in DebugType)
-def _parse_debug_filters(raw: str | None) -> set[DebugType] | None:
-    if raw is None:
-        return None
-    filters: set[DebugType] = set()
-    for chunk in raw.split(","):
-        normalized = chunk.strip().lower().replace("-", "_")
-        if not normalized:
-            continue
-        try:
-            filters.add(DebugType(normalized))
-        except ValueError:  # pragma: no cover - user input validation
-            valid_options = ", ".join(dt.value for dt in DebugType)
-            log(
-                (
-                    f"Invalid debug filter '{normalized}'. Valid options: {valid_options}",
-                    "red",
-                )
-            )
-            raise typer.Exit(2) from None
-    return filters or None
-def resolve_debug_settings(flag: bool, raw_filters: str | None) -> tuple[bool, set[DebugType] | None]:
-    filters = _parse_debug_filters(raw_filters)
-    effective_flag = flag or (filters is not None)
-    return effective_flag, filters
 @dataclass
 class AppInitConfig:
     """Configuration for initializing the application components."""
@@ -169,32 +139,26 @@ async def cleanup_app_components(components: AppComponents) -> None:
         await components.display_task
     finally:
         # Always attempt to clear Ghostty progress bar and restore cursor visibility
-        try:
+        # Best-effort only; never fail cleanup due to OSC errors
+        with contextlib.suppress(Exception):
             emit_osc94(OSC94States.HIDDEN)
-        except Exception:
-            # Best-effort only; never fail cleanup due to OSC errors
-            pass
-        try:
-            # Ensure the terminal cursor is visible even if Rich's Status spinner
-            # did not get a chance to stop cleanly (e.g. on KeyboardInterrupt).
+        # Ensure the terminal cursor is visible even if Rich's Status spinner
+        # did not get a chance to stop cleanly (e.g. on KeyboardInterrupt).
+        # If this fails the shell can still recover via `reset`/`stty sane`.
+        with contextlib.suppress(Exception):
             stream = getattr(sys, "__stdout__", None) or sys.stdout
             stream.write("\033[?25h")
             stream.flush()
-        except Exception:
-            # If this fails the shell can still recover via `reset`/`stty sane`.
-            pass
 async def _handle_keyboard_interrupt(executor: Executor) -> None:
     """Handle Ctrl+C by logging and sending a global interrupt."""
     log("Bye!")
-    try:
+    # Executor might already be stopping
+    with contextlib.suppress(Exception):
         await executor.submit(op.InterruptOperation(target_session_id=None))
-    except Exception:
-        # Executor might already be stopping
-        pass
 async def run_exec(init_config: AppInitConfig, input_content: str) -> None:
@@ -259,9 +223,12 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
             if isinstance(components.display, ui.REPLDisplay):
                 printer = components.display.renderer
             # Check if it's a DebugEventDisplay wrapping a REPLDisplay
-            elif isinstance(components.display, ui.DebugEventDisplay) and components.display.wrapped_display:
-                if isinstance(components.display.wrapped_display, ui.REPLDisplay):
-                    printer = components.display.wrapped_display.renderer
+            elif (
+                isinstance(components.display, ui.DebugEventDisplay)
+                and components.display.wrapped_display
+                and isinstance(components.display.wrapped_display, ui.REPLDisplay)
+            ):
+                printer = components.display.wrapped_display.renderer
             if printer is not None:
                 printer.print(Text(f" {MSG} ", style="bold yellow reverse"))
@@ -272,10 +239,8 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
             print(MSG, file=sys.stderr)
     def _hide_progress() -> None:
-        try:
+        with contextlib.suppress(Exception):
             emit_osc94(OSC94States.HIDDEN)
-        except Exception:
-            pass
     restore_sigint = install_sigint_double_press_exit(_show_toast_once, _hide_progress)
@@ -315,17 +280,13 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
                 finally:
                     # Stop ESC monitor and wait for it to finish cleaning up TTY
                     stop_event.set()
-                    try:
+                    with contextlib.suppress(Exception):
                         await esc_task
-                    except Exception:
-                        pass
     except KeyboardInterrupt:
         await _handle_keyboard_interrupt(components.executor)
     finally:
-        try:
-            # Restore original SIGINT handler
+        # Restore original SIGINT handler
+        with contextlib.suppress(Exception):
             restore_sigint()
-        except Exception:
-            pass
         await cleanup_app_components(components)

klaude-code 1.2.12__tar.gz → 1.2.14__tar.gz

klaude-code 1.2.12tar.gz → 1.2.14tar.gz