code-puppy 0.0.372__py3-none-any.whl → 0.0.373__py3-none-any.whl

code_puppy/claude_cache_client.py

@@ -26,7 +26,7 @@ import httpx
 
 logger = logging.getLogger(__name__)
 
-# Refresh token if it's older than 1 hour (3600 seconds)
+# Refresh token if it's older than the configured max age (seconds)
 TOKEN_MAX_AGE_SECONDS = 3600
 
 # Tool name prefix for Claude Code OAuth compatibility
@@ -94,13 +94,13 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
                 return age
 
             # Fall back to calculating from 'exp' claim
-            # Assume tokens are typically valid for 1 hour
+            # Assume tokens are typically valid for TOKEN_MAX_AGE_SECONDS
             if "exp" in payload:
                 exp = float(payload["exp"])
                 # If exp is in the future, calculate how long until expiry
-                # and assume the token was issued 1 hour before expiry
+                # and assume the token was issued TOKEN_MAX_AGE_SECONDS before expiry
                 time_until_exp = exp - now
-                # If token has less than 1 hour left, it's "old"
+                # If token has less than TOKEN_MAX_AGE_SECONDS left, it's "old"
                 age = TOKEN_MAX_AGE_SECONDS - time_until_exp
                 return max(0, age)
 
@@ -119,13 +119,13 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
         return None
 
     def _should_refresh_token(self, request: httpx.Request) -> bool:
-        """Check if the token should be refreshed (within 1 hour of expiry).
+        """Check if the token should be refreshed (within the max-age window).
 
         Uses two strategies:
         1. Decode JWT to check token age (if possible)
         2. Fall back to stored expires_at from token file
 
-        Returns True if token expires within TOKEN_MAX_AGE_SECONDS (1 hour).
+        Returns True if token expires within TOKEN_MAX_AGE_SECONDS.
         """
         token = self._extract_bearer_token(request)
         if not token:
@@ -169,7 +169,7 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
             if not tokens:
                 return False
 
-            # is_token_expired already uses TOKEN_REFRESH_BUFFER_SECONDS (1 hour)
+            # is_token_expired already uses the configured refresh buffer window
             return is_token_expired(tokens)
         except Exception as exc:
             logger.debug("Error checking stored token expiry: %s", exc)
@@ -366,10 +366,10 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
 
         # Handle auth errors with token refresh
         try:
-            if response.status_code in (400, 401) and not request.extensions.get(
+            if response.status_code in (400, 401, 403) and not request.extensions.get(
                 "claude_oauth_refresh_attempted"
             ):
-                is_auth_error = response.status_code == 401
+                is_auth_error = response.status_code in (401, 403)
 
                 if response.status_code == 400:
                     is_auth_error = self._is_cloudflare_html_error(response)

code_puppy/plugins/claude_code_oauth/README.md

@@ -52,7 +52,7 @@ The plugin ships with sensible defaults in `config.py`:
 ```python
 CLAUDE_CODE_OAUTH_CONFIG = {
     "auth_url": "https://claude.ai/oauth/authorize",
-    "token_url": "https://claude.ai/api/oauth/token",
+    "token_url": "https://console.anthropic.com/v1/oauth/token",
     "api_base_url": "https://api.anthropic.com",
     "client_id": "9d1c250a-e61b-44d9-88ed-5944d1962f5e",
     "scope": "org:create_api_key user:profile user:inference",

code_puppy/plugins/claude_code_oauth/SETUP.md

@@ -37,7 +37,7 @@ Anthropic exposes a shared **public client** (`claude-cli`) for command-line too
 ```python
 CLAUDE_CODE_OAUTH_CONFIG = {
     "auth_url": "https://claude.ai/oauth/authorize",
-    "token_url": "https://claude.ai/api/oauth/token",
+    "token_url": "https://console.anthropic.com/v1/oauth/token",
     "api_base_url": "https://api.anthropic.com",
     "client_id": "9d1c250a-e61b-44d9-88ed-5944d1962f5e",
     "scope": "org:create_api_key user:profile user:inference",

code_puppy/plugins/claude_code_oauth/utils.py

@@ -21,10 +21,10 @@ from .config import (
     get_token_storage_path,
 )
 
-# Proactive refresh buffer: refresh tokens 1 hour before expiration
-# This ensures smooth operation by refreshing during model requests,
-# well before the token actually expires
-TOKEN_REFRESH_BUFFER_SECONDS = 3600  # 1 hour
+# Proactive refresh buffer default (seconds). Actual buffer is dynamic
+# based on expires_in to avoid overly aggressive refreshes.
+TOKEN_REFRESH_BUFFER_SECONDS = 300
+MIN_REFRESH_BUFFER_SECONDS = 30
 
 logger = logging.getLogger(__name__)
 
@@ -146,15 +146,40 @@ def _calculate_expires_at(expires_in: Optional[float]) -> Optional[float]:
         return None
 
 
-def is_token_expired(tokens: Dict[str, Any]) -> bool:
+def _calculate_refresh_buffer(expires_in: Optional[float]) -> float:
+    default_buffer = float(TOKEN_REFRESH_BUFFER_SECONDS)
+    if expires_in is None:
+        return default_buffer
+    try:
+        expires_value = float(expires_in)
+    except (TypeError, ValueError):
+        return default_buffer
+    return min(default_buffer, max(MIN_REFRESH_BUFFER_SECONDS, expires_value * 0.1))
+
+
+def _get_expires_at_value(tokens: Dict[str, Any]) -> Optional[float]:
     expires_at = tokens.get("expires_at")
     if expires_at is None:
-        return False
+        return None
     try:
-        expires_at_value = float(expires_at)
+        return float(expires_at)
     except (TypeError, ValueError):
+        return None
+
+
+def _is_token_actually_expired(tokens: Dict[str, Any]) -> bool:
+    expires_at_value = _get_expires_at_value(tokens)
+    if expires_at_value is None:
+        return False
+    return time.time() >= expires_at_value
+
+
+def is_token_expired(tokens: Dict[str, Any]) -> bool:
+    expires_at_value = _get_expires_at_value(tokens)
+    if expires_at_value is None:
         return False
-    return time.time() >= expires_at_value - TOKEN_REFRESH_BUFFER_SECONDS
+    buffer_seconds = _calculate_refresh_buffer(tokens.get("expires_in"))
+    return time.time() >= expires_at_value - buffer_seconds
 
 
 def update_claude_code_model_tokens(access_token: str) -> bool:
@@ -216,11 +241,12 @@ def refresh_access_token(force: bool = False) -> Optional[str]:
             new_tokens = response.json()
             tokens["access_token"] = new_tokens.get("access_token")
             tokens["refresh_token"] = new_tokens.get("refresh_token", refresh_token)
-            if "expires_in" in new_tokens:
-                tokens["expires_in"] = new_tokens["expires_in"]
-                tokens["expires_at"] = _calculate_expires_at(
-                    new_tokens.get("expires_in")
-                )
+            expires_in_value = new_tokens.get("expires_in")
+            if expires_in_value is None:
+                expires_in_value = tokens.get("expires_in")
+            if expires_in_value is not None:
+                tokens["expires_in"] = expires_in_value
+                tokens["expires_at"] = _calculate_expires_at(expires_in_value)
             if save_tokens(tokens):
                 update_claude_code_model_tokens(tokens["access_token"])
                 return tokens["access_token"]
@@ -249,6 +275,11 @@ def get_valid_access_token() -> Optional[str]:
         refreshed = refresh_access_token()
         if refreshed:
             return refreshed
+        if not _is_token_actually_expired(tokens):
+            logger.warning(
+                "Claude Code token refresh failed; using existing access token until expiry"
+            )
+            return access_token
         logger.warning("Claude Code token refresh failed")
         return None
 

{code_puppy-0.0.372.dist-info → code_puppy-0.0.373.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.372
+Version: 0.0.373
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.372.dist-info → code_puppy-0.0.373.dist-info}/RECORD

@@ -2,7 +2,7 @@ code_puppy/__init__.py,sha256=xMPewo9RNHb3yfFNIk5WCbv2cvSPtJOCgK2-GqLbNnU,373
 code_puppy/__main__.py,sha256=pDVssJOWP8A83iFkxMLY9YteHYat0EyWDQqMkKHpWp4,203
 code_puppy/callbacks.py,sha256=Pp0VyeXJBEtk-N_RSWr5pbveelovsdLUiJ4f11dzwGw,10775
 code_puppy/chatgpt_codex_client.py,sha256=upMuAfOhMB7SEpVw4CU4GjgaeZ8X65ri3yNM-dnlmYA,12308
-code_puppy/claude_cache_client.py,sha256=1-rIDtZBJ_aiAZSprdsq0ty2urftu6F0uzJDn_OE41Q,23966
+code_puppy/claude_cache_client.py,sha256=GtwYrxcTe0pE-JGtl1ysR2qskfeE73_x4w7q_u-kR1k,24026
 code_puppy/cli_runner.py,sha256=w5CLKgQYYaT7My3Cga2StXYol-u6DBxNzzUuhhsfhsA,34952
 code_puppy/config.py,sha256=aKWADF6PdHnr9_0ZVZHwBh5NH9uSAx1lmIiycfaYEF8,54737
 code_puppy/error_logging.py,sha256=a80OILCUtJhexI6a9GM-r5LqIdjvSRzggfgPp2jv1X0,3297
@@ -165,13 +165,13 @@ code_puppy/plugins/chatgpt_oauth/oauth_flow.py,sha256=i-CP2gpzEBT3ogUt-oTMexiP2o
 code_puppy/plugins/chatgpt_oauth/register_callbacks.py,sha256=KNi5-R0EXtkBm3p55ttAxuA_ApaOs_tsGDnPt-5vgGA,2998
 code_puppy/plugins/chatgpt_oauth/test_plugin.py,sha256=oHX7Eb_Hb4rgRpOWdhtFp8Jj6_FDuvXQITRPiNy4tRo,9622
 code_puppy/plugins/chatgpt_oauth/utils.py,sha256=fzpsCQOv0kqPWmG5vNEV_GLSUrMQh8cF7tdIjSOt1Dc,16504
-code_puppy/plugins/claude_code_oauth/README.md,sha256=76nHhMlhk61DZa5g0Q2fc0AtpplLmpbwuWFZt7PHH5g,5458
-code_puppy/plugins/claude_code_oauth/SETUP.md,sha256=lnGzofPLogBy3oPPFLv5_cZ7vjg_GYrIyYnF-EoTJKg,3278
+code_puppy/plugins/claude_code_oauth/README.md,sha256=fOSDDzCdm2JCKjU5J82IRHIAhxYxl8_UmHo7uH4AbFo,5469
+code_puppy/plugins/claude_code_oauth/SETUP.md,sha256=DCNLkSU9nf86S1rsrIg8HBe87NZrF8YND8P4ettWeEM,3289
 code_puppy/plugins/claude_code_oauth/__init__.py,sha256=mCcOU-wM7LNCDjr-w-WLPzom8nTF1UNt4nqxGE6Rt0k,187
 code_puppy/plugins/claude_code_oauth/config.py,sha256=DjGySCkvjSGZds6DYErLMAi3TItt8iSLGvyJN98nSEM,2013
 code_puppy/plugins/claude_code_oauth/register_callbacks.py,sha256=ZnLQfwssbQXdCpnMGHjzEIzXTLc_OZ1UGS4npU5k5m8,9168
 code_puppy/plugins/claude_code_oauth/test_plugin.py,sha256=yQy4EeZl4bjrcog1d8BjknoDTRK75mRXXvkSQJYSSEM,9286
-code_puppy/plugins/claude_code_oauth/utils.py,sha256=Ltk_m2efGNQSSvmb1lxgcPp_vcEig8VMydTZffQP-2c,17433
+code_puppy/plugins/claude_code_oauth/utils.py,sha256=2ioGG-4FCh4WdHrN2MJvWKbPWA-YVg_WTEeddc1xv4U,18557
 code_puppy/plugins/customizable_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_puppy/plugins/customizable_commands/register_callbacks.py,sha256=zVMfIzr--hVn0IOXxIicbmgj2s-HZUgtrOc0NCDOnDw,5183
 code_puppy/plugins/example_custom_command/README.md,sha256=5c5Zkm7CW6BDSfe3WoLU7GW6t5mjjYAbu9-_pu-b3p4,8244
@@ -208,10 +208,10 @@ code_puppy/tools/browser/chromium_terminal_manager.py,sha256=w1thQ_ACb6oV45L93TS
 code_puppy/tools/browser/terminal_command_tools.py,sha256=9byOZku-dwvTtCl532xt7Lumed_jTn0sLvUe_X75XCQ,19068
 code_puppy/tools/browser/terminal_screenshot_tools.py,sha256=J_21YO_495NvYgNFu9KQP6VYg2K_f8CtSdZuF94Yhnw,18448
 code_puppy/tools/browser/terminal_tools.py,sha256=F5LjVH3udSCFHmqC3O1UJLoLozZFZsEdX42jOmkqkW0,17853
-code_puppy-0.0.372.data/data/code_puppy/models.json,sha256=jAHRsCl3trysP4vU_k_ltA8GcFU2APd4lxFl8-4Jnvc,3243
-code_puppy-0.0.372.data/data/code_puppy/models_dev_api.json,sha256=wHjkj-IM_fx1oHki6-GqtOoCrRMR0ScK0f-Iz0UEcy8,548187
-code_puppy-0.0.372.dist-info/METADATA,sha256=fqWkbQK2MIKm-wet6ooDhPvSdw8mFpzEbvnV2-2vIxg,27604
-code_puppy-0.0.372.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-code_puppy-0.0.372.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
-code_puppy-0.0.372.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.372.dist-info/RECORD,,
+code_puppy-0.0.373.data/data/code_puppy/models.json,sha256=jAHRsCl3trysP4vU_k_ltA8GcFU2APd4lxFl8-4Jnvc,3243
+code_puppy-0.0.373.data/data/code_puppy/models_dev_api.json,sha256=wHjkj-IM_fx1oHki6-GqtOoCrRMR0ScK0f-Iz0UEcy8,548187
+code_puppy-0.0.373.dist-info/METADATA,sha256=bdAEhxmZ0q5kT15tSnZ2yuLdwhZ-a2-UiiQY0NZXN9M,27604
+code_puppy-0.0.373.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+code_puppy-0.0.373.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
+code_puppy-0.0.373.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.373.dist-info/RECORD,,