mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-16 17:46:20 +00:00
* fix(models): reuse the Claude Code OAuth token read from a file descriptor ClaudeChatModel accepts a Claude Code OAuth token through CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR, but that handoff can be drained only once: a pipe returns EOF after the first read and a file descriptor keeps its advanced offset. _read_secret_from_file_descriptor read it again on every call and kept nothing. Every ClaudeChatModel instance loads credentials in model_post_init, and create_chat_model builds fresh instances per run, so with a descriptor-only handoff the first model authenticated and every model after it -- including the title model of the very first run -- had no credential. The Anthropic SDK then raised "Could not resolve authentication method" before sending a request. A secret read from a descriptor is now kept for the life of the process, keyed by (env_var, fd), so a different descriptor is still read fresh. The read happens under a lock so two threads building their first model concurrently cannot race one of them to EOF. Empty reads and OSError are not cached and behave as before; lookup order, config keys, and log messages are unchanged. * docs(changelog): reference #5411 in the Claude Code OAuth descriptor fix entry * test(models): pin that a closed descriptor handoff keeps its token Review follow-up on #5411: the descriptor secret cache is keyed on the fd number, which the OS recycles. Folding os.fstat identity into the key would break the property the cache exists for -- once the handoff fd is closed after the first read, fstat raises EBADF and every later model would lose the token again -- and it would still miss a regular file rewritten in place, which keeps its st_dev/st_ino. The handoff is fixed at process start, so keep the number as the key and state the invariant instead: a closed handoff keeps serving its token, a secret placed on a recycled number is not re-read, and anything handing over a new secret in-process must clear the cache. A new test pins the closed-handoff behavior; an fstat-fingerprinted key fails exactly that test.
242 lines
8.0 KiB
Python
242 lines
8.0 KiB
Python
"""Auto-load credentials from Claude Code CLI and Codex CLI.
|
|
|
|
Implements two credential strategies:
|
|
1. Claude Code OAuth token from explicit env vars or an exported credentials file
|
|
- Uses Authorization: Bearer header (NOT x-api-key)
|
|
- Requires anthropic-beta: oauth-2025-04-20,claude-code-20250219
|
|
- Supports $CLAUDE_CODE_OAUTH_TOKEN, $CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR, and $ANTHROPIC_AUTH_TOKEN
|
|
- Override path with $CLAUDE_CODE_CREDENTIALS_PATH
|
|
2. Codex CLI token from ~/.codex/auth.json
|
|
- Uses chatgpt.com/backend-api/codex/responses endpoint
|
|
- Supports both legacy top-level tokens and current nested tokens shape
|
|
- Override path with $CODEX_AUTH_PATH
|
|
"""
|
|
|
|
import json
|
|
import logging
|
|
import os
|
|
import threading
|
|
import time
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Required beta headers for Claude Code OAuth tokens
|
|
OAUTH_ANTHROPIC_BETAS = "oauth-2025-04-20,claude-code-20250219,interleaved-thinking-2025-05-14"
|
|
|
|
# A descriptor handoff can be drained only once: a pipe returns EOF and a file
|
|
# keeps its advanced offset. Every ClaudeChatModel instance loads credentials, so
|
|
# secrets read from a descriptor are kept for the life of the process.
|
|
#
|
|
# The key is the descriptor number, not its identity: the handoff is fixed when
|
|
# the process starts, so a number means one secret for the process lifetime. That
|
|
# keeps the token available after the descriptor is closed, but a secret later
|
|
# placed on a recycled number is not read. Anything that hands over a new secret
|
|
# in-process must clear this cache.
|
|
_fd_secret_cache: dict[tuple[str, int], str] = {}
|
|
_fd_secret_lock = threading.Lock()
|
|
|
|
|
|
def is_oauth_token(token: str) -> bool:
|
|
"""Check if a token is a Claude Code OAuth token (not a standard API key)."""
|
|
return isinstance(token, str) and "sk-ant-oat" in token
|
|
|
|
|
|
@dataclass
|
|
class ClaudeCodeCredential:
|
|
"""Claude Code CLI OAuth credential."""
|
|
|
|
access_token: str
|
|
refresh_token: str = ""
|
|
expires_at: int = 0
|
|
source: str = ""
|
|
|
|
@property
|
|
def is_expired(self) -> bool:
|
|
if self.expires_at <= 0:
|
|
return False
|
|
return time.time() * 1000 > self.expires_at - 60_000 # 1 min buffer
|
|
|
|
|
|
@dataclass
|
|
class CodexCliCredential:
|
|
"""Codex CLI credential."""
|
|
|
|
access_token: str
|
|
account_id: str = ""
|
|
source: str = ""
|
|
|
|
|
|
def _resolve_credential_path(env_var: str, default_relative_path: str) -> Path:
|
|
configured_path = os.getenv(env_var)
|
|
if configured_path:
|
|
return Path(configured_path).expanduser()
|
|
return _home_dir() / default_relative_path
|
|
|
|
|
|
def _home_dir() -> Path:
|
|
home = os.getenv("HOME")
|
|
if home:
|
|
return Path(home).expanduser()
|
|
return Path.home()
|
|
|
|
|
|
def _load_json_file(path: Path, label: str) -> dict[str, Any] | None:
|
|
if not path.exists():
|
|
logger.debug(f"{label} not found: {path}")
|
|
return None
|
|
if path.is_dir():
|
|
logger.warning(f"{label} path is a directory, expected a file: {path}")
|
|
return None
|
|
|
|
try:
|
|
return json.loads(path.read_text())
|
|
except (json.JSONDecodeError, OSError) as e:
|
|
logger.warning(f"Failed to read {label}: {e}")
|
|
return None
|
|
|
|
|
|
def _read_secret_from_file_descriptor(env_var: str) -> str | None:
|
|
fd_value = os.getenv(env_var)
|
|
if not fd_value:
|
|
return None
|
|
|
|
try:
|
|
fd = int(fd_value)
|
|
except ValueError:
|
|
logger.warning(f"{env_var} must be an integer file descriptor, got: {fd_value}")
|
|
return None
|
|
|
|
# Hold the lock across the read so concurrent first loads cannot race to EOF.
|
|
with _fd_secret_lock:
|
|
cached = _fd_secret_cache.get((env_var, fd))
|
|
if cached is not None:
|
|
return cached
|
|
|
|
try:
|
|
secret = os.read(fd, 1024 * 1024).decode().strip()
|
|
except OSError as e:
|
|
logger.warning(f"Failed to read {env_var}: {e}")
|
|
return None
|
|
|
|
if not secret:
|
|
return None
|
|
_fd_secret_cache[(env_var, fd)] = secret
|
|
return secret
|
|
|
|
|
|
def _credential_from_direct_token(access_token: str, source: str) -> ClaudeCodeCredential | None:
|
|
token = access_token.strip()
|
|
if not token:
|
|
return None
|
|
return ClaudeCodeCredential(access_token=token, source=source)
|
|
|
|
|
|
def _iter_claude_code_credential_paths() -> list[Path]:
|
|
paths: list[Path] = []
|
|
override_path = os.getenv("CLAUDE_CODE_CREDENTIALS_PATH")
|
|
if override_path:
|
|
paths.append(Path(override_path).expanduser())
|
|
|
|
default_path = _home_dir() / ".claude/.credentials.json"
|
|
if not paths or paths[-1] != default_path:
|
|
paths.append(default_path)
|
|
|
|
return paths
|
|
|
|
|
|
def _extract_claude_code_credential(data: dict[str, Any], source: str) -> ClaudeCodeCredential | None:
|
|
oauth = data.get("claudeAiOauth", {})
|
|
access_token = oauth.get("accessToken", "")
|
|
if not access_token:
|
|
logger.debug("Claude Code credentials container exists but no accessToken found")
|
|
return None
|
|
|
|
cred = ClaudeCodeCredential(
|
|
access_token=access_token,
|
|
refresh_token=oauth.get("refreshToken", ""),
|
|
expires_at=oauth.get("expiresAt", 0),
|
|
source=source,
|
|
)
|
|
|
|
if cred.is_expired:
|
|
logger.warning("Claude Code OAuth token is expired. Run 'claude' to refresh.")
|
|
return None
|
|
|
|
return cred
|
|
|
|
|
|
def load_claude_code_credential() -> ClaudeCodeCredential | None:
|
|
"""Load OAuth credential from explicit Claude Code handoff sources.
|
|
|
|
Lookup order:
|
|
1. $CLAUDE_CODE_OAUTH_TOKEN or $ANTHROPIC_AUTH_TOKEN
|
|
2. $CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR
|
|
3. $CLAUDE_CODE_CREDENTIALS_PATH
|
|
4. ~/.claude/.credentials.json
|
|
|
|
Exported credentials files contain:
|
|
{
|
|
"claudeAiOauth": {
|
|
"accessToken": "sk-ant-oat01-...",
|
|
"refreshToken": "sk-ant-ort01-...",
|
|
"expiresAt": 1773430695128,
|
|
"scopes": ["user:inference", ...],
|
|
...
|
|
}
|
|
}
|
|
"""
|
|
direct_token = os.getenv("CLAUDE_CODE_OAUTH_TOKEN") or os.getenv("ANTHROPIC_AUTH_TOKEN")
|
|
if direct_token:
|
|
cred = _credential_from_direct_token(direct_token, "claude-cli-env")
|
|
if cred:
|
|
logger.info("Loaded Claude Code OAuth credential from environment")
|
|
return cred
|
|
|
|
fd_token = _read_secret_from_file_descriptor("CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR")
|
|
if fd_token:
|
|
cred = _credential_from_direct_token(fd_token, "claude-cli-fd")
|
|
if cred:
|
|
logger.info("Loaded Claude Code OAuth credential from file descriptor")
|
|
return cred
|
|
|
|
override_path = os.getenv("CLAUDE_CODE_CREDENTIALS_PATH")
|
|
override_path_obj = Path(override_path).expanduser() if override_path else None
|
|
for cred_path in _iter_claude_code_credential_paths():
|
|
data = _load_json_file(cred_path, "Claude Code credentials")
|
|
if data is None:
|
|
continue
|
|
cred = _extract_claude_code_credential(data, "claude-cli-file")
|
|
if cred:
|
|
source_label = "override path" if override_path_obj is not None and cred_path == override_path_obj else "plaintext file"
|
|
logger.info(f"Loaded Claude Code OAuth credential from {source_label} (expires_at={cred.expires_at})")
|
|
return cred
|
|
|
|
return None
|
|
|
|
|
|
def load_codex_cli_credential() -> CodexCliCredential | None:
|
|
"""Load credential from Codex CLI (~/.codex/auth.json)."""
|
|
cred_path = _resolve_credential_path("CODEX_AUTH_PATH", ".codex/auth.json")
|
|
data = _load_json_file(cred_path, "Codex CLI credentials")
|
|
if data is None:
|
|
return None
|
|
tokens = data.get("tokens", {})
|
|
if not isinstance(tokens, dict):
|
|
tokens = {}
|
|
|
|
access_token = data.get("access_token") or data.get("token") or tokens.get("access_token", "")
|
|
account_id = data.get("account_id") or tokens.get("account_id", "")
|
|
if not access_token:
|
|
logger.debug("Codex CLI credentials file exists but no token found")
|
|
return None
|
|
|
|
logger.info("Loaded Codex CLI credential")
|
|
return CodexCliCredential(
|
|
access_token=access_token,
|
|
account_id=account_id,
|
|
source="codex-cli",
|
|
)
|