klaude-code 2.8.0__tar.gz → 2.10.1__tar.gz

{klaude_code-2.8.0 → klaude_code-2.10.1}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 2.8.0
+Version: 2.10.1
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: ddgs>=9.9.3
 Requires-Dist: diff-match-patch>=20241021
+Requires-Dist: filelock>=3.20.3
 Requires-Dist: google-genai>=1.56.0
 Requires-Dist: markdown-it-py>=4.0.0
 Requires-Dist: openai>=1.102.0
@@ -23,7 +24,7 @@ Description-Content-Type: text/markdown
 Minimal code agent CLI.
 
 ## Features
-- **Multi-provider**: Anthropic Message API, OpenAI Responses API, OpenRouter, Claude Max OAuth and ChatGPT Codex OAuth etc.
+- **Multi-provider**: Anthropic Message API, OpenAI Responses API, OpenRouter, ChatGPT Codex OAuth etc.
 - **Keep reasoning item in context**: Interleaved thinking support
 - **Model-aware tools**: Claude Code tool set for Opus, `apply_patch` for GPT-5/Codex
 - **Reminders**: Cooldown-based todo tracking, instruction reinforcement and external file change reminder
@@ -107,7 +108,6 @@ 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                                                                      |
@@ -139,7 +139,6 @@ 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
 ```
 
@@ -148,7 +147,6 @@ API keys are stored in `~/.klaude/klaude-auth.json` and used as fallback when en
 To logout from OAuth providers:
 
 ```bash
-klaude auth logout claude
 klaude auth logout codex
 ```
 
@@ -201,7 +199,6 @@ provider_list:
 ##### Supported Protocols
 
 - `anthropic` - Anthropic Messages API
-- `claude_oauth` - Claude OAuth (for Claude Pro/Max subscribers)
 - `openai` - OpenAI Chat Completion API
 - `responses` - OpenAI Responses API (for o-series, GPT-5, Codex)
 - `codex_oauth` - OpenAI Codex CLI (OAuth-based, for ChatGPT Pro subscribers)

{klaude_code-2.8.0 → klaude_code-2.10.1}/README.md

@@ -3,7 +3,7 @@
 Minimal code agent CLI.
 
 ## Features
-- **Multi-provider**: Anthropic Message API, OpenAI Responses API, OpenRouter, Claude Max OAuth and ChatGPT Codex OAuth etc.
+- **Multi-provider**: Anthropic Message API, OpenAI Responses API, OpenRouter, ChatGPT Codex OAuth etc.
 - **Keep reasoning item in context**: Interleaved thinking support
 - **Model-aware tools**: Claude Code tool set for Opus, `apply_patch` for GPT-5/Codex
 - **Reminders**: Cooldown-based todo tracking, instruction reinforcement and external file change reminder
@@ -87,7 +87,6 @@ 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                                                                      |
@@ -119,7 +118,6 @@ 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
 ```
 
@@ -128,7 +126,6 @@ API keys are stored in `~/.klaude/klaude-auth.json` and used as fallback when en
 To logout from OAuth providers:
 
 ```bash
-klaude auth logout claude
 klaude auth logout codex
 ```
 
@@ -181,7 +178,6 @@ provider_list:
 ##### Supported Protocols
 
 - `anthropic` - Anthropic Messages API
-- `claude_oauth` - Claude OAuth (for Claude Pro/Max subscribers)
 - `openai` - OpenAI Chat Completion API
 - `responses` - OpenAI Responses API (for o-series, GPT-5, Codex)
 - `codex_oauth` - OpenAI Codex CLI (OAuth-based, for ChatGPT Pro subscribers)

{klaude_code-2.8.0 → klaude_code-2.10.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "2.8.0"
+version = "2.10.1"
 description = "Minimal code agent CLI"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -13,6 +13,7 @@ dependencies = [
     "chardet>=5.2.0",
     "ddgs>=9.9.3",
     "diff-match-patch>=20241021",
+    "filelock>=3.20.3",
     "google-genai>=1.56.0",
     "markdown-it-py>=4.0.0",
     "openai>=1.102.0",

{klaude_code-2.8.0 → klaude_code-2.10.1}/src/klaude_code/app/runtime.py

@@ -12,6 +12,7 @@ from klaude_code.core.agent import Agent
 from klaude_code.core.agent_profile import (
     DefaultModelProfileProvider,
     VanillaModelProfileProvider,
+    WebModelProfileProvider,
 )
 from klaude_code.core.executor import Executor
 from klaude_code.core.manager import build_llm_clients
@@ -27,6 +28,7 @@ class AppInitConfig:
     model: str | None
     debug: bool
     vanilla: bool
+    web: bool = False
     debug_filters: set[DebugType] | None = None
 
 
@@ -74,6 +76,8 @@ async def initialize_app_components(
 
     if init_config.vanilla:
         model_profile_provider = VanillaModelProfileProvider()
+    elif init_config.web:
+        model_profile_provider = WebModelProfileProvider(config=config)
     else:
         model_profile_provider = DefaultModelProfileProvider(config=config)
 
@@ -87,7 +91,7 @@ async def initialize_app_components(
     )
 
     if on_model_change is not None:
-        on_model_change(llm_clients.main.model_name)
+        on_model_change(llm_clients.main_model_alias)
 
     executor_task = asyncio.create_task(executor.start())
 
@@ -178,6 +182,7 @@ 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 {session_id}", "green"))
+        short_id = Session.shortest_unique_prefix(session_id)
+        log(("Resume with:", "dim"), (f"klaude -r {short_id}", "green"))
     with contextlib.suppress(Exception):
         await executor.submit(op.InterruptOperation(target_session_id=None))

{klaude_code-2.8.0 → klaude_code-2.10.1}/src/klaude_code/auth/antigravity/oauth.py

@@ -258,42 +258,46 @@ class AntigravityOAuth:
         )
 
     def refresh(self) -> AntigravityAuthState:
-        """Refresh the access token using refresh token."""
-        state = self.token_manager.get_state()
-        if state is None:
-            raise AntigravityNotLoggedInError("Not logged in to Antigravity. Run 'klaude login antigravity' first.")
+        """Refresh the access token using refresh token with file locking.
 
-        data = {
-            "client_id": CLIENT_ID,
-            "client_secret": CLIENT_SECRET,
-            "refresh_token": state.refresh_token,
-            "grant_type": "refresh_token",
-        }
+        Uses file locking to prevent multiple instances from refreshing simultaneously.
+        If another instance has already refreshed, returns the updated state.
+        """
 
-        with httpx.Client() as client:
-            response = client.post(TOKEN_URL, data=data, timeout=30)
+        def do_refresh(current_state: AntigravityAuthState) -> AntigravityAuthState:
+            data = {
+                "client_id": CLIENT_ID,
+                "client_secret": CLIENT_SECRET,
+                "refresh_token": current_state.refresh_token,
+                "grant_type": "refresh_token",
+            }
 
-        if response.status_code != 200:
-            raise AntigravityTokenExpiredError(f"Token refresh failed: {response.text}")
+            with httpx.Client() as client:
+                response = client.post(TOKEN_URL, data=data, timeout=30)
 
-        tokens = response.json()
-        access_token = tokens["access_token"]
-        refresh_token = tokens.get("refresh_token", state.refresh_token)
-        expires_in = tokens.get("expires_in", 3600)
+            if response.status_code != 200:
+                raise AntigravityTokenExpiredError(f"Token refresh failed: {response.text}")
 
-        # Calculate expiry time with 5 minute buffer
-        expires_at = int(time.time()) + expires_in - 300
+            tokens = response.json()
+            access_token = tokens["access_token"]
+            refresh_token = tokens.get("refresh_token", current_state.refresh_token)
+            expires_in = tokens.get("expires_in", 3600)
 
-        new_state = AntigravityAuthState(
-            access_token=access_token,
-            refresh_token=refresh_token,
-            expires_at=expires_at,
-            project_id=state.project_id,
-            email=state.email,
-        )
+            # Calculate expiry time with 5 minute buffer
+            expires_at = int(time.time()) + expires_in - 300
 
-        self.token_manager.save(new_state)
-        return new_state
+            return AntigravityAuthState(
+                access_token=access_token,
+                refresh_token=refresh_token,
+                expires_at=expires_at,
+                project_id=current_state.project_id,
+                email=current_state.email,
+            )
+
+        try:
+            return self.token_manager.refresh_with_lock(do_refresh)
+        except ValueError as e:
+            raise AntigravityNotLoggedInError(str(e)) from e
 
     def ensure_valid_token(self) -> tuple[str, str]:
         """Ensure we have a valid access token, refreshing if needed.
@@ -309,12 +313,3 @@ class AntigravityOAuth:
             state = self.refresh()
 
         return state.access_token, state.project_id
-
-    def get_api_key_json(self) -> str:
-        """Get API key as JSON string for LLM client.
-
-        Returns:
-            JSON string with token and projectId.
-        """
-        access_token, project_id = self.ensure_valid_token()
-        return json.dumps({"token": access_token, "projectId": project_id})

klaude_code-2.10.1/src/klaude_code/auth/antigravity/token_manager.py

@@ -0,0 +1,27 @@
+"""Token storage and management for Antigravity authentication."""
+
+from pathlib import Path
+from typing import Any
+
+from klaude_code.auth.base import BaseAuthState, BaseTokenManager
+
+
+class AntigravityAuthState(BaseAuthState):
+    """Stored authentication state for Antigravity."""
+
+    project_id: str
+    email: str | None = None
+
+
+class AntigravityTokenManager(BaseTokenManager[AntigravityAuthState]):
+    """Manage Antigravity OAuth tokens."""
+
+    def __init__(self, auth_file: Path | None = None):
+        super().__init__(auth_file)
+
+    @property
+    def storage_key(self) -> str:
+        return "antigravity"
+
+    def _create_state(self, data: dict[str, Any]) -> AntigravityAuthState:
+        return AntigravityAuthState.model_validate(data)

{klaude_code-2.8.0 → klaude_code-2.10.1}/src/klaude_code/auth/base.py

@@ -3,12 +3,15 @@
 import json
 import time
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from pathlib import Path
 from typing import Any, cast
 
+from filelock import FileLock, Timeout
 from pydantic import BaseModel
 
 KLAUDE_AUTH_FILE = Path.home() / ".klaude" / "klaude-auth.json"
+LOCK_TIMEOUT_SECONDS = 30  # Maximum time to wait for lock acquisition
 
 
 class BaseAuthState(BaseModel):
@@ -99,3 +102,53 @@ class BaseTokenManager[T: BaseAuthState](ABC):
     def clear_cached_state(self) -> None:
         """Clear in-memory cached state to force reload from file on next access."""
         self._state = None
+
+    def _get_lock_file(self) -> Path:
+        """Get the lock file path for this auth file."""
+        return self.auth_file.with_suffix(".lock")
+
+    def refresh_with_lock(self, refresh_fn: Callable[[T], T]) -> T:
+        """Refresh token with file locking to prevent concurrent refresh.
+
+        This prevents multiple instances from simultaneously refreshing the same token.
+        If another instance has already refreshed, returns the updated state.
+
+        Args:
+            refresh_fn: Function that takes current state and returns new state.
+
+        Returns:
+            The new or already-refreshed authentication state.
+
+        Raises:
+            Timeout: If unable to acquire the lock within timeout.
+            ValueError: If not logged in.
+        """
+        lock_file = self._get_lock_file()
+        lock = FileLock(lock_file, timeout=LOCK_TIMEOUT_SECONDS)
+
+        try:
+            with lock:
+                # Re-read file after acquiring lock - another instance may have refreshed
+                self.clear_cached_state()
+                state = self.load()
+
+                if state is None:
+                    raise ValueError(f"Not logged in to {self.storage_key}")
+
+                # Check if token is still expired after re-reading
+                if not state.is_expired():
+                    # Another instance already refreshed, use their result
+                    return state
+
+                # Token still expired, we need to refresh
+                new_state = refresh_fn(state)
+                self.save(new_state)
+                return new_state
+
+        except Timeout:
+            # Lock timeout - try to re-read file in case another instance succeeded
+            self.clear_cached_state()
+            state = self.load()
+            if state and not state.is_expired():
+                return state
+            raise

{klaude_code-2.8.0 → klaude_code-2.10.1}/src/klaude_code/auth/claude/oauth.py

@@ -125,60 +125,45 @@ class ClaudeOAuth:
             expires_at=int(time.time()) + int(expires_in),
         )
 
-    def _do_refresh_request(self, refresh_token: str) -> httpx.Response:
-        """Send token refresh request to OAuth server."""
-        payload = {
-            "grant_type": "refresh_token",
-            "client_id": CLIENT_ID,
-            "refresh_token": refresh_token,
-        }
-        with httpx.Client() as client:
-            return client.post(
-                TOKEN_URL,
-                json=payload,
-                headers={"Content-Type": "application/json"},
-            )
-
     def refresh(self) -> ClaudeAuthState:
-        """Refresh the access token using refresh token.
+        """Refresh the access token using refresh token with file locking.
 
-        Handles concurrent refresh race conditions by retrying with freshly loaded token
-        if the first attempt fails with invalid_grant error.
+        Uses file locking to prevent multiple instances from refreshing simultaneously.
+        If another instance has already refreshed, returns the updated state.
         """
-        state = self.token_manager.get_state()
-        if state is None:
-            raise ClaudeNotLoggedInError("Not logged in to Claude. Run 'klaude login claude' first.")
 
-        response = self._do_refresh_request(state.refresh_token)
-
-        # Handle race condition: another process may have refreshed the token already
-        if response.status_code != 200 and "invalid_grant" in response.text:
-            # Reload token from file (another process may have updated it)
-            self.token_manager.clear_cached_state()
-            fresh_state = self.token_manager.load()
-            if fresh_state and fresh_state.refresh_token != state.refresh_token:
-                # Token was updated by another process
-                if not fresh_state.is_expired():
-                    # New token is still valid, use it directly
-                    return fresh_state
-                # New token expired, try refreshing with the new refresh_token
-                response = self._do_refresh_request(fresh_state.refresh_token)
-
-        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)
+        def do_refresh(current_state: ClaudeAuthState) -> ClaudeAuthState:
+            payload = {
+                "grant_type": "refresh_token",
+                "client_id": CLIENT_ID,
+                "refresh_token": current_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", current_state.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),
+            )
 
-        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
+        try:
+            return self.token_manager.refresh_with_lock(do_refresh)
+        except ValueError as e:
+            raise ClaudeNotLoggedInError(str(e)) from e
 
     def ensure_valid_token(self) -> str:
         """Ensure we have a valid access token, refreshing if needed."""

{klaude_code-2.8.0 → klaude_code-2.10.1}/src/klaude_code/auth/codex/exceptions.py

@@ -15,7 +15,3 @@ class CodexTokenExpiredError(CodexAuthError):
 
 class CodexOAuthError(CodexAuthError):
     """OAuth flow failed."""
-
-
-class CodexUnsupportedModelError(CodexAuthError):
-    """Model is not supported by codex_oauth protocol."""

{klaude_code-2.8.0 → klaude_code-2.10.1}/src/klaude_code/auth/codex/oauth.py

@@ -177,43 +177,47 @@ class CodexOAuth:
         )
 
     def refresh(self) -> CodexAuthState:
-        """Refresh the access token using refresh token."""
-        state = self.token_manager.get_state()
-        if state is None:
-            from klaude_code.auth.codex.exceptions import CodexNotLoggedInError
+        """Refresh the access token using refresh token with file locking.
 
-            raise CodexNotLoggedInError("Not logged in to Codex. Run 'klaude login codex' first.")
+        Uses file locking to prevent multiple instances from refreshing simultaneously.
+        If another instance has already refreshed, returns the updated state.
+        """
 
-        data = {
-            "grant_type": "refresh_token",
-            "client_id": CLIENT_ID,
-            "refresh_token": state.refresh_token,
-        }
+        def do_refresh(current_state: CodexAuthState) -> CodexAuthState:
+            data = {
+                "grant_type": "refresh_token",
+                "client_id": CLIENT_ID,
+                "refresh_token": current_state.refresh_token,
+            }
 
-        with httpx.Client() as client:
-            response = client.post(TOKEN_URL, data=data)
+            with httpx.Client() as client:
+                response = client.post(TOKEN_URL, data=data)
 
-        if response.status_code != 200:
-            from klaude_code.auth.codex.exceptions import CodexTokenExpiredError
+            if response.status_code != 200:
+                from klaude_code.auth.codex.exceptions import CodexTokenExpiredError
 
-            raise CodexTokenExpiredError(f"Token refresh failed: {response.text}")
+                raise CodexTokenExpiredError(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)
+            tokens = response.json()
+            access_token = tokens["access_token"]
+            refresh_token = tokens.get("refresh_token", current_state.refresh_token)
+            expires_in = tokens.get("expires_in", 3600)
 
-        account_id = extract_account_id(access_token)
+            account_id = extract_account_id(access_token)
 
-        new_state = CodexAuthState(
-            access_token=access_token,
-            refresh_token=refresh_token,
-            expires_at=int(time.time()) + expires_in,
-            account_id=account_id,
-        )
+            return CodexAuthState(
+                access_token=access_token,
+                refresh_token=refresh_token,
+                expires_at=int(time.time()) + expires_in,
+                account_id=account_id,
+            )
+
+        try:
+            return self.token_manager.refresh_with_lock(do_refresh)
+        except ValueError as e:
+            from klaude_code.auth.codex.exceptions import CodexNotLoggedInError
 
-        self.token_manager.save(new_state)
-        return new_state
+            raise CodexNotLoggedInError(str(e)) from e
 
     def ensure_valid_token(self) -> str:
         """Ensure we have a valid access token, refreshing if needed."""

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

@@ -0,0 +1,26 @@
+"""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)