29th platform `openai-codex` (uses_oauth, Responses wire). PKCE-localhost login at auth.openai.com (client app_EMoamEEZ73f0CkXaXp7hrann, redirect localhost:1455/auth/ callback, form token exchange, fresh-random state) reusing the claude-pro-max flow; OAuthFlow::PkceLocalhost gained a redirect_path and OAuthConfig an authorize_extra (empty elsewhere, so claude/xai/copilot authorize URLs stay byte-identical). Codex-specific: the access token is a JWT carrying chatgpt_account_id, which becomes the `chatgpt-account-id` inference header. It is derived STATELESSLY from whichever bearer rides each request (so a rotated token needs no persisted field), and BOTH login and refresh fail fast when the claim is absent — gated on the explicit OAuthConfig.requires_chatgpt_account_id fact, never inferred from the token-body encoding (a plain form endpoint is the OAuth norm and must not inherit this). Inference rides the existing Responses wire at chatgpt.com/backend-api/codex → /responses, with codex headers (chatgpt-account-id, originator, OpenAI-Beta responses=experimental, codex UA) gated on SamplerConfig.openai_codex so API-key `openai` stays byte-identical; store:false was already the global Responses default. Catalog is HARDCODED (no live endpoint exists for this backend; read from the official Codex CLI's model cache): gpt-5.6-sol/terra/luna + gpt-5.5, ctx 272000, each with its real reasoning levels (low..ultra — ReasoningEffort gained Ultra). Excluded: gpt-5.3-codex-spark (supported_in_api=false), gpt-5.4/-mini and codex-auto-review (hidden) — they would list but fail at inference. The fetch short-circuits before any HTTP; Kigi never shells out to the codex CLI or reads ~/.codex. Security review fixes: redact any `account-id` header from request logs (it was reaching debug logs), strict 3-segment JWT check (fail closed), refresh no longer fails open on a missing claim. Inherits leak-safe pooled routing (scope oauth/openai-codex) — never the Kimi token. Full gate green (234 suites, 0 warnings).
149 lines
4.7 KiB
Rust
149 lines
4.7 KiB
Rust
//! Actor-internal state.
|
|
//!
|
|
//! All fields are touched only from the actor task, so no mutex /
|
|
//! atomic synchronization is needed -- the actor's command-loop
|
|
//! serialization gives us a "single-threaded with shared state"
|
|
//! discipline matching the hunk-tracker pattern.
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use tokio_util::sync::CancellationToken;
|
|
|
|
use crate::config::{RetryPolicy, SamplerConfig};
|
|
use crate::types::RequestId;
|
|
|
|
/// In-flight request bookkeeping.
|
|
///
|
|
/// `cancel_token` is owned by the actor (cloned into the spawned
|
|
/// per-request task). The completion oneshot is moved into the
|
|
/// per-request task at spawn time and is therefore not stored here.
|
|
pub(crate) struct ActiveRequest {
|
|
pub(crate) cancel_token: CancellationToken,
|
|
}
|
|
|
|
/// Actor-owned state.
|
|
pub(crate) struct ActorState {
|
|
pub(crate) active_requests: HashMap<RequestId, ActiveRequest>,
|
|
pub(crate) config: SamplerConfig,
|
|
pub(crate) retry_policy: RetryPolicy,
|
|
}
|
|
|
|
impl ActorState {
|
|
pub(crate) fn new(config: SamplerConfig, retry_policy: RetryPolicy) -> Self {
|
|
Self {
|
|
active_requests: HashMap::new(),
|
|
config,
|
|
retry_policy,
|
|
}
|
|
}
|
|
|
|
/// Register a newly-spawned request. Returns the previous entry if
|
|
/// the same `request_id` was already in flight (callers should
|
|
/// cancel the previous token before overwriting).
|
|
pub(crate) fn register(
|
|
&mut self,
|
|
request_id: RequestId,
|
|
active: ActiveRequest,
|
|
) -> Option<ActiveRequest> {
|
|
self.active_requests.insert(request_id, active)
|
|
}
|
|
|
|
/// Remove a request from the active set without cancelling its
|
|
/// token. Used by the cleanup signal sent from per-request tasks
|
|
/// when they exit normally.
|
|
pub(crate) fn remove(&mut self, request_id: &RequestId) -> Option<ActiveRequest> {
|
|
self.active_requests.remove(request_id)
|
|
}
|
|
|
|
/// Cancel and remove an in-flight request.
|
|
pub(crate) fn cancel(&mut self, request_id: &RequestId) -> bool {
|
|
if let Some(active) = self.active_requests.remove(request_id) {
|
|
active.cancel_token.cancel();
|
|
true
|
|
} else {
|
|
false
|
|
}
|
|
}
|
|
|
|
/// Replace the default config. The next request submitted without
|
|
/// an override will use this.
|
|
pub(crate) fn update_config(&mut self, config: SamplerConfig) {
|
|
self.config = config;
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::client::ApiBackend;
|
|
use indexmap::IndexMap;
|
|
|
|
/// Minimal config builder for tests in this module.
|
|
fn cfg() -> SamplerConfig {
|
|
SamplerConfig {
|
|
api_key: None,
|
|
base_url: "https://example.test".into(),
|
|
model: "test-model".into(),
|
|
max_completion_tokens: None,
|
|
temperature: None,
|
|
top_p: None,
|
|
api_backend: ApiBackend::ChatCompletions,
|
|
auth_scheme: Default::default(),
|
|
anthropic_oauth: false,
|
|
github_copilot: false,
|
|
openai_codex: false,
|
|
chat_compat: Default::default(),
|
|
extra_headers: IndexMap::new(),
|
|
context_window: 8192,
|
|
force_http1: false,
|
|
max_retries: None,
|
|
stream_tool_calls: false,
|
|
idle_timeout_secs: None,
|
|
reasoning_effort: None,
|
|
origin_client: None,
|
|
attribution_callback: None,
|
|
bearer_resolver: None,
|
|
supports_backend_search: false,
|
|
compactions_remaining: None,
|
|
compaction_at_tokens: None,
|
|
doom_loop_recovery: None,
|
|
header_injector: None,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn cancel_unknown_request_returns_false() {
|
|
let mut state = ActorState::new(cfg(), RetryPolicy::default());
|
|
assert!(!state.cancel(&RequestId::from("unknown")));
|
|
}
|
|
|
|
#[test]
|
|
fn register_then_cancel_removes() {
|
|
let mut state = ActorState::new(cfg(), RetryPolicy::default());
|
|
let id = RequestId::from("req-1");
|
|
state.register(
|
|
id.clone(),
|
|
ActiveRequest {
|
|
cancel_token: CancellationToken::new(),
|
|
},
|
|
);
|
|
assert_eq!(state.active_requests.len(), 1);
|
|
assert!(state.cancel(&id));
|
|
assert_eq!(state.active_requests.len(), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn register_returns_previous_when_same_id() {
|
|
let mut state = ActorState::new(cfg(), RetryPolicy::default());
|
|
let id = RequestId::from("req-1");
|
|
let first = ActiveRequest {
|
|
cancel_token: CancellationToken::new(),
|
|
};
|
|
let second = ActiveRequest {
|
|
cancel_token: CancellationToken::new(),
|
|
};
|
|
assert!(state.register(id.clone(), first).is_none());
|
|
assert!(state.register(id.clone(), second).is_some());
|
|
}
|
|
}
|