klaude-code 1.7.1__tar.gz → 1.9.0__tar.gz

{klaude_code-1.7.1 → klaude_code-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.7.1
+Version: 1.9.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
@@ -120,11 +120,12 @@ On first run, you'll be prompted to select a model. Your choice is saved as `mai
 | Provider    | Env Variable          | Models                                                                        |
 |-------------|-----------------------|-------------------------------------------------------------------------------|
 | anthropic   | `ANTHROPIC_API_KEY`   | sonnet, opus                                                                  |
+| claude      | N/A (OAuth)           | sonnet@claude, opus@claude (requires Claude Pro/Max subscription)             |
 | openai      | `OPENAI_API_KEY`      | gpt-5.2                                                                       |
 | openrouter  | `OPENROUTER_API_KEY`  | gpt-5.2, gpt-5.2-fast, gpt-5.1-codex-max, sonnet, opus, haiku, kimi, gemini-* |
 | deepseek    | `DEEPSEEK_API_KEY`    | deepseek                                                                      |
 | moonshot    | `MOONSHOT_API_KEY`    | kimi@moonshot                                                                 |
-| codex       | N/A (OAuth)           | gpt-5.2-codex                                                                 |
+| codex       | N/A (OAuth)           | gpt-5.2-codex (requires ChatGPT Pro subscription)                             |
 
 List all configured providers and models:
 
@@ -134,6 +135,26 @@ klaude list
 
 Models from providers without a valid API key are shown as dimmed/unavailable.
 
+#### OAuth Login
+
+For subscription-based providers (Claude Pro/Max, ChatGPT Pro), use the login command:
+
+```bash
+# Interactive provider selection
+klaude login
+
+# Or specify provider directly
+klaude login claude   # Claude Pro/Max subscription
+klaude login codex    # ChatGPT Pro subscription
+```
+
+To logout:
+
+```bash
+klaude logout claude
+klaude logout codex
+```
+
 #### Custom Configuration
 
 User config file: `~/.klaude/klaude-config.yaml`
@@ -240,7 +261,6 @@ provider_list:
 main_model: opus
 
 sub_agent_models:
-  oracle: gpt-4.1
   explore: sonnet
   task: opus
   webagent: sonnet
@@ -269,12 +289,13 @@ provider_list:
 ##### Supported Protocols
 
 - `anthropic` - Anthropic Claude API
+- `claude_oauth` - Claude OAuth (for Claude Pro/Max subscribers)
 - `openai` - OpenAI-compatible API
 - `responses` - OpenAI Responses API (for o-series, GPT-5, Codex)
 - `openrouter` - OpenRouter API
 - `google` - Google Gemini API
 - `bedrock` - AWS Bedrock (uses AWS credentials instead of api_key)
-- `codex` - OpenAI Codex CLI (OAuth-based)
+- `codex_oauth` - OpenAI Codex CLI (OAuth-based, for ChatGPT Pro subscribers)
 
 List configured providers and models:
 
@@ -297,6 +318,18 @@ klaude session clean --min 10
 klaude session clean-all
 ```
 
+### Cost Tracking
+
+View aggregated usage statistics across all sessions:
+
+```bash
+# Show all historical usage data
+klaude cost
+
+# Show usage for the last 7 days only
+klaude cost --days 7
+```
+
 ### Slash Commands
 
 Inside the interactive session (`klaude`), use these commands to streamline your workflow:
@@ -362,4 +395,3 @@ The main agent can spawn specialized sub-agents for specific tasks:
 | **Explore** | Fast codebase exploration - find files, search code, answer questions about the codebase |
 | **Task** | Handle complex multi-step tasks autonomously |
 | **WebAgent** | Search the web, fetch pages, and analyze content |
-| **Oracle** | Advanced reasoning advisor for code reviews, architecture planning, and bug analysis |

{klaude_code-1.7.1 → klaude_code-1.9.0}/README.md

@@ -99,11 +99,12 @@ On first run, you'll be prompted to select a model. Your choice is saved as `mai
 | Provider    | Env Variable          | Models                                                                        |
 |-------------|-----------------------|-------------------------------------------------------------------------------|
 | anthropic   | `ANTHROPIC_API_KEY`   | sonnet, opus                                                                  |
+| claude      | N/A (OAuth)           | sonnet@claude, opus@claude (requires Claude Pro/Max subscription)             |
 | openai      | `OPENAI_API_KEY`      | gpt-5.2                                                                       |
 | openrouter  | `OPENROUTER_API_KEY`  | gpt-5.2, gpt-5.2-fast, gpt-5.1-codex-max, sonnet, opus, haiku, kimi, gemini-* |
 | deepseek    | `DEEPSEEK_API_KEY`    | deepseek                                                                      |
 | moonshot    | `MOONSHOT_API_KEY`    | kimi@moonshot                                                                 |
-| codex       | N/A (OAuth)           | gpt-5.2-codex                                                                 |
+| codex       | N/A (OAuth)           | gpt-5.2-codex (requires ChatGPT Pro subscription)                             |
 
 List all configured providers and models:
 
@@ -113,6 +114,26 @@ klaude list
 
 Models from providers without a valid API key are shown as dimmed/unavailable.
 
+#### OAuth Login
+
+For subscription-based providers (Claude Pro/Max, ChatGPT Pro), use the login command:
+
+```bash
+# Interactive provider selection
+klaude login
+
+# Or specify provider directly
+klaude login claude   # Claude Pro/Max subscription
+klaude login codex    # ChatGPT Pro subscription
+```
+
+To logout:
+
+```bash
+klaude logout claude
+klaude logout codex
+```
+
 #### Custom Configuration
 
 User config file: `~/.klaude/klaude-config.yaml`
@@ -219,7 +240,6 @@ provider_list:
 main_model: opus
 
 sub_agent_models:
-  oracle: gpt-4.1
   explore: sonnet
   task: opus
   webagent: sonnet
@@ -248,12 +268,13 @@ provider_list:
 ##### Supported Protocols
 
 - `anthropic` - Anthropic Claude API
+- `claude_oauth` - Claude OAuth (for Claude Pro/Max subscribers)
 - `openai` - OpenAI-compatible API
 - `responses` - OpenAI Responses API (for o-series, GPT-5, Codex)
 - `openrouter` - OpenRouter API
 - `google` - Google Gemini API
 - `bedrock` - AWS Bedrock (uses AWS credentials instead of api_key)
-- `codex` - OpenAI Codex CLI (OAuth-based)
+- `codex_oauth` - OpenAI Codex CLI (OAuth-based, for ChatGPT Pro subscribers)
 
 List configured providers and models:
 
@@ -276,6 +297,18 @@ klaude session clean --min 10
 klaude session clean-all
 ```
 
+### Cost Tracking
+
+View aggregated usage statistics across all sessions:
+
+```bash
+# Show all historical usage data
+klaude cost
+
+# Show usage for the last 7 days only
+klaude cost --days 7
+```
+
 ### Slash Commands
 
 Inside the interactive session (`klaude`), use these commands to streamline your workflow:
@@ -341,4 +374,3 @@ The main agent can spawn specialized sub-agents for specific tasks:
 | **Explore** | Fast codebase exploration - find files, search code, answer questions about the codebase |
 | **Task** | Handle complex multi-step tasks autonomously |
 | **WebAgent** | Search the web, fetch pages, and analyze content |
-| **Oracle** | Advanced reasoning advisor for code reviews, architecture planning, and bug analysis |

{klaude_code-1.7.1 → klaude_code-1.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "1.7.1"
+version = "1.9.0"
 description = "Minimal code agent CLI"
 readme = "README.md"
 requires-python = ">=3.13"

klaude_code-1.9.0/src/klaude_code/auth/base.py

@@ -0,0 +1,101 @@
+"""Base classes for authentication token management."""
+
+import json
+import time
+from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Any, Generic, TypeVar, cast
+
+from pydantic import BaseModel
+
+
+KLAUDE_AUTH_FILE = Path.home() / ".klaude" / "klaude-auth.json"
+
+
+class BaseAuthState(BaseModel):
+    """Base authentication state with common OAuth fields."""
+
+    access_token: str
+    refresh_token: str
+    expires_at: int  # Unix timestamp
+
+    def is_expired(self, buffer_seconds: int = 300) -> bool:
+        """Check if token is expired or will expire soon."""
+        return time.time() + buffer_seconds >= self.expires_at
+
+
+T = TypeVar("T", bound=BaseAuthState)
+
+
+class BaseTokenManager(ABC, Generic[T]):
+    """Base class for OAuth token management."""
+
+    def __init__(self, auth_file: Path | None = None):
+        self.auth_file = auth_file or KLAUDE_AUTH_FILE
+        self._state: T | None = None
+
+    @property
+    @abstractmethod
+    def storage_key(self) -> str:
+        """Key used to store this auth state in the JSON file."""
+        ...
+
+    @abstractmethod
+    def _create_state(self, data: dict[str, Any]) -> T:
+        """Create state instance from dict data."""
+        ...
+
+    def _load_store(self) -> dict[str, Any]:
+        if not self.auth_file.exists():
+            return {}
+        try:
+            data: Any = json.loads(self.auth_file.read_text())
+            if isinstance(data, dict):
+                return cast(dict[str, Any], data)
+            return {}
+        except (json.JSONDecodeError, ValueError):
+            return {}
+
+    def _save_store(self, data: dict[str, Any]) -> None:
+        self.auth_file.parent.mkdir(parents=True, exist_ok=True)
+        self.auth_file.write_text(json.dumps(data, indent=2))
+
+    def load(self) -> T | None:
+        """Load authentication state from file."""
+        data: Any = self._load_store().get(self.storage_key)
+        if not isinstance(data, dict):
+            return None
+        try:
+            self._state = self._create_state(cast(dict[str, Any], data))
+            return self._state
+        except ValueError:
+            return None
+
+    def save(self, state: T) -> None:
+        """Save authentication state to file."""
+        store = self._load_store()
+        store[self.storage_key] = state.model_dump(mode="json")
+        self._save_store(store)
+        self._state = state
+
+    def delete(self) -> None:
+        """Delete stored tokens."""
+        store = self._load_store()
+        store.pop(self.storage_key, None)
+        if len(store) == 0:
+            if self.auth_file.exists():
+                self.auth_file.unlink()
+        else:
+            self._save_store(store)
+        self._state = None
+
+    def is_logged_in(self) -> bool:
+        """Check if user is logged in."""
+        state = self._state or self.load()
+        return state is not None
+
+    def get_state(self) -> T | None:
+        """Get current authentication state."""
+        if self._state is None:
+            self._state = self.load()
+        return self._state

klaude_code-1.9.0/src/klaude_code/auth/claude/__init__.py

@@ -0,0 +1,6 @@
+"""Claude (Anthropic OAuth) authentication helpers."""
+
+from .oauth import ClaudeOAuth
+from .token_manager import ClaudeAuthState, ClaudeTokenManager
+
+__all__ = ["ClaudeAuthState", "ClaudeOAuth", "ClaudeTokenManager"]

klaude_code-1.9.0/src/klaude_code/auth/claude/exceptions.py

@@ -0,0 +1,9 @@
+"""Exceptions for Claude OAuth authentication."""
+
+
+class ClaudeAuthError(Exception):
+    """Base class for Claude auth errors."""
+
+
+class ClaudeNotLoggedInError(ClaudeAuthError):
+    """Raised when no valid Claude OAuth session is available."""

klaude_code-1.9.0/src/klaude_code/auth/claude/oauth.py

@@ -0,0 +1,172 @@
+"""OAuth PKCE flow for Claude (Anthropic OAuth) authentication."""
+
+import base64
+import hashlib
+import secrets
+import time
+from collections.abc import Callable
+
+import httpx
+
+from klaude_code.auth.claude.exceptions import ClaudeAuthError, ClaudeNotLoggedInError
+from klaude_code.auth.claude.token_manager import ClaudeAuthState, ClaudeTokenManager
+
+
+def _decode_base64(value: str) -> str:
+    return base64.b64decode(value).decode()
+
+
+# OAuth configuration (Claude Pro/Max)
+CLIENT_ID = _decode_base64("OWQxYzI1MGEtZTYxYi00NGQ5LTg4ZWQtNTk0NGQxOTYyZjVl")
+AUTHORIZE_URL = "https://claude.ai/oauth/authorize"
+TOKEN_URL = "https://console.anthropic.com/v1/oauth/token"
+REDIRECT_URI = "https://console.anthropic.com/oauth/code/callback"
+SCOPE = "org:create_api_key user:profile user:inference"
+
+
+def generate_code_verifier() -> str:
+    """Generate a random code verifier for PKCE."""
+    return secrets.token_urlsafe(64)[:128]
+
+
+def generate_code_challenge(verifier: str) -> str:
+    """Generate code challenge from verifier using S256 method."""
+    digest = hashlib.sha256(verifier.encode()).digest()
+    return base64.urlsafe_b64encode(digest).rstrip(b"=").decode()
+
+
+def build_authorize_url(code_challenge: str, state: str) -> str:
+    """Build the authorization URL with all required parameters."""
+    # Note: the `code=true` parameter is required for the console callback flow.
+    params = {
+        "code": "true",
+        "client_id": CLIENT_ID,
+        "response_type": "code",
+        "redirect_uri": REDIRECT_URI,
+        "scope": SCOPE,
+        "code_challenge": code_challenge,
+        "code_challenge_method": "S256",
+        "state": state,
+    }
+
+    encoded = httpx.QueryParams(params)
+    return f"{AUTHORIZE_URL}?{encoded}"
+
+
+def _parse_user_code(value: str) -> tuple[str, str | None]:
+    raw = value.strip()
+    if "#" in raw:
+        code, state = raw.split("#", 1)
+        return code.strip(), state.strip()
+    return raw, None
+
+
+class ClaudeOAuth:
+    """Handle OAuth PKCE flow for Claude (Anthropic OAuth) authentication."""
+
+    def __init__(self, token_manager: ClaudeTokenManager | None = None):
+        self.token_manager = token_manager or ClaudeTokenManager()
+
+    def login(
+        self,
+        *,
+        on_auth_url: Callable[[str], None],
+        on_prompt_code: Callable[[], str],
+    ) -> ClaudeAuthState:
+        """Run the complete OAuth login flow."""
+        verifier = generate_code_verifier()
+        challenge = generate_code_challenge(verifier)
+
+        # Some flows require `state` to be echoed back for token exchange.
+        state = verifier
+
+        auth_url = build_authorize_url(challenge, state)
+        on_auth_url(auth_url)
+
+        raw_user_code = on_prompt_code()
+        code, returned_state = _parse_user_code(raw_user_code)
+        if not code:
+            raise ClaudeAuthError("No authorization code provided")
+
+        exchange_state = returned_state or state
+        auth_state = self._exchange_code(code=code, state=exchange_state, verifier=verifier)
+        self.token_manager.save(auth_state)
+        return auth_state
+
+    def _exchange_code(self, *, code: str, state: str, verifier: str) -> ClaudeAuthState:
+        """Exchange authorization code for tokens."""
+        payload = {
+            "grant_type": "authorization_code",
+            "client_id": CLIENT_ID,
+            "code": code,
+            "state": state,
+            "redirect_uri": REDIRECT_URI,
+            "code_verifier": verifier,
+        }
+
+        with httpx.Client() as client:
+            response = client.post(
+                TOKEN_URL,
+                json=payload,
+                headers={"Content-Type": "application/json"},
+            )
+
+        if response.status_code != 200:
+            raise ClaudeAuthError(f"Token exchange failed: {response.text}")
+
+        tokens = response.json()
+        access_token = tokens["access_token"]
+        refresh_token = tokens["refresh_token"]
+        expires_in = tokens.get("expires_in", 3600)
+
+        return ClaudeAuthState(
+            access_token=access_token,
+            refresh_token=refresh_token,
+            expires_at=int(time.time()) + int(expires_in),
+        )
+
+    def refresh(self) -> ClaudeAuthState:
+        """Refresh the access token using refresh token."""
+        state = self.token_manager.get_state()
+        if state is None:
+            raise ClaudeNotLoggedInError("Not logged in to Claude. Run 'klaude login claude' first.")
+
+        payload = {
+            "grant_type": "refresh_token",
+            "client_id": CLIENT_ID,
+            "refresh_token": state.refresh_token,
+        }
+
+        with httpx.Client() as client:
+            response = client.post(
+                TOKEN_URL,
+                json=payload,
+                headers={"Content-Type": "application/json"},
+            )
+
+        if response.status_code != 200:
+            raise ClaudeAuthError(f"Token refresh failed: {response.text}")
+
+        tokens = response.json()
+        access_token = tokens["access_token"]
+        refresh_token = tokens.get("refresh_token", state.refresh_token)
+        expires_in = tokens.get("expires_in", 3600)
+
+        new_state = ClaudeAuthState(
+            access_token=access_token,
+            refresh_token=refresh_token,
+            expires_at=int(time.time()) + int(expires_in),
+        )
+        self.token_manager.save(new_state)
+        return new_state
+
+    def ensure_valid_token(self) -> str:
+        """Ensure we have a valid access token, refreshing if needed."""
+        state = self.token_manager.get_state()
+        if state is None:
+            raise ClaudeNotLoggedInError("Not logged in to Claude. Run 'klaude login claude' first.")
+
+        if state.is_expired():
+            state = self.refresh()
+
+        return state.access_token

klaude_code-1.9.0/src/klaude_code/auth/claude/token_manager.py

@@ -0,0 +1,26 @@
+"""Token storage and management for Claude (Anthropic OAuth) authentication."""
+
+from pathlib import Path
+from typing import Any
+
+from klaude_code.auth.base import BaseAuthState, BaseTokenManager
+
+
+class ClaudeAuthState(BaseAuthState):
+    """Stored authentication state for Claude OAuth."""
+
+    pass
+
+
+class ClaudeTokenManager(BaseTokenManager[ClaudeAuthState]):
+    """Manage Claude OAuth tokens."""
+
+    def __init__(self, auth_file: Path | None = None):
+        super().__init__(auth_file)
+
+    @property
+    def storage_key(self) -> str:
+        return "claude"
+
+    def _create_state(self, data: dict[str, Any]) -> ClaudeAuthState:
+        return ClaudeAuthState.model_validate(data)

klaude_code-1.9.0/src/klaude_code/auth/codex/token_manager.py

@@ -0,0 +1,44 @@
+"""Token storage and management for Codex authentication."""
+
+from pathlib import Path
+from typing import Any
+
+from klaude_code.auth.base import BaseAuthState, BaseTokenManager
+
+
+class CodexAuthState(BaseAuthState):
+    """Stored authentication state for Codex."""
+
+    account_id: str
+
+
+class CodexTokenManager(BaseTokenManager[CodexAuthState]):
+    """Manage Codex OAuth tokens."""
+
+    def __init__(self, auth_file: Path | None = None):
+        super().__init__(auth_file)
+
+    @property
+    def storage_key(self) -> str:
+        return "codex"
+
+    def _create_state(self, data: dict[str, Any]) -> CodexAuthState:
+        return CodexAuthState.model_validate(data)
+
+    def get_access_token(self) -> str:
+        """Get access token, raising if not logged in."""
+        state = self.get_state()
+        if state is None:
+            from klaude_code.auth.codex.exceptions import CodexNotLoggedInError
+
+            raise CodexNotLoggedInError("Not logged in to Codex. Run 'klaude login codex' first.")
+        return state.access_token
+
+    def get_account_id(self) -> str:
+        """Get account ID, raising if not logged in."""
+        state = self.get_state()
+        if state is None:
+            from klaude_code.auth.codex.exceptions import CodexNotLoggedInError
+
+            raise CodexNotLoggedInError("Not logged in to Codex. Run 'klaude login codex' first.")
+        return state.account_id