Merge branch 'main' of https://github.com/lee101/codex-infinity

Author: lee101

codex-rs/cli/src/main.rs

@@ -21,6 +21,7 @@ use codex_exec::Cli as ExecCli;
 use codex_exec::Command as ExecCommand;
 use codex_exec::ReviewArgs;
 use codex_execpolicy::ExecPolicyCheckCommand;
+use codex_login::bootstrap_anthropic_api_key_from_claude_credentials;
 use codex_responses_api_proxy::Args as ResponsesApiProxyArgs;
 use codex_state::StateRuntime;
 use codex_state::state_db_path;
@@ -588,6 +589,10 @@ fn main() -> anyhow::Result<()> {
 }
 
 async fn cli_main(arg0_paths: Arg0DispatchPaths) -> anyhow::Result<()> {
+    // If ANTHROPIC_API_KEY is not set, auto-load from Claude Code credentials
+    // (~/.claude/.credentials.json) so Anthropic-configured providers work.
+    bootstrap_anthropic_api_key_from_claude_credentials();
+
     let MultitoolCli {
         config_overrides: mut root_config_overrides,
         feature_toggles,

codex-rs/login/src/auth/manager.rs

@@ -363,6 +363,46 @@ pub fn read_codex_api_key_from_env() -> Option<String> {
         .filter(|value| !value.is_empty())
 }
 
+pub const ANTHROPIC_API_KEY_ENV_VAR: &str = "ANTHROPIC_API_KEY";
+
+/// Read the Anthropic API key from the environment variable `ANTHROPIC_API_KEY`.
+pub fn read_anthropic_api_key_from_env() -> Option<String> {
+    env::var(ANTHROPIC_API_KEY_ENV_VAR)
+        .ok()
+        .map(|value| value.trim().to_string())
+        .filter(|value| !value.is_empty())
+}
+
+/// Read the Claude Code OAuth access token from `~/.claude/.credentials.json`.
+///
+/// Claude Code stores OAuth credentials (from `claude.ai` login) in this file.
+/// The access token can be used as an `ANTHROPIC_API_KEY` bearer token for
+/// Anthropic API calls when a proper Anthropic provider is configured.
+pub fn read_claude_code_credentials() -> Option<String> {
+    let home = env::var("HOME").ok().map(PathBuf::from)?;
+    let creds_path = home.join(".claude").join(".credentials.json");
+    let content = std::fs::read_to_string(creds_path).ok()?;
+    let json: serde_json::Value = serde_json::from_str(&content).ok()?;
+    json["claudeAiOauth"]["accessToken"]
+        .as_str()
+        .map(String::from)
+        .filter(|s| !s.is_empty())
+}
+
+/// If `ANTHROPIC_API_KEY` is not set in the environment, attempt to load the
+/// Claude Code OAuth token from `~/.claude/.credentials.json` and set it.
+///
+/// Call this early in the process lifecycle so downstream provider lookups see it.
+pub fn bootstrap_anthropic_api_key_from_claude_credentials() {
+    if read_anthropic_api_key_from_env().is_some() {
+        return;
+    }
+    if let Some(token) = read_claude_code_credentials() {
+        // SAFETY: single-threaded startup context.
+        unsafe { env::set_var(ANTHROPIC_API_KEY_ENV_VAR, token) };
+    }
+}
+
 /// Delete the auth.json file inside `codex_home` if it exists. Returns `Ok(true)`
 /// if a file was removed, `Ok(false)` if no auth file was present.
 pub fn logout(

codex-rs/login/src/lib.rs

@@ -32,6 +32,10 @@ pub use auth::load_auth_dot_json;
 pub use auth::login_with_api_key;
 pub use auth::logout;
 pub use auth::read_openai_api_key_from_env;
+pub use auth::read_anthropic_api_key_from_env;
+pub use auth::read_claude_code_credentials;
+pub use auth::bootstrap_anthropic_api_key_from_claude_credentials;
+pub use auth::ANTHROPIC_API_KEY_ENV_VAR;
 pub use auth::save_auth;
 pub use codex_app_server_protocol::AuthMode;
 pub use token_data::TokenData;