M1/F1: Kimi Code OAuth device-code flow
Replace the xAI OAuth stack with the Kimi device authorization grant:
- kimi_oauth.rs wire layer (device_authorization + token poll + refresh
against kigi_env::oauth_host(); client_id per PRD; retryable statuses
429/5xx with backoff; expired_token restarts authorization)
- X-Msh-Device-{Name,Model,Id} headers; device_id minted uuid4-hex at
~/.kigi/device_id (0600)
- Storage: system keyring service `kigi`, entry `oauth/kimi-code`
(macOS/Windows native backends), atomic-file fallback under ~/.kigi;
official client's keyring/~/.kimi never touched
- Refresh manager: 60s tick, threshold max(300, expires_in*0.5),
401-tombstone keyed by rejected refresh token with 300s cooldown and
rotation auto-clear, cross-process lock with sibling-adoption
triple-check, sleep/wake forced refresh
- Deleted xAI machinery: enterprise OIDC (PKCE/JWKS/teams), devbox login,
external auth provider, JWT tier gating + subscription paywall stack,
X-XAI-Token-Auth marker headers, ZDR gates, /user enrichment
- kigi login / TUI /login both drive the device flow; login-host display
now derives from kigi_env::oauth_host()
- 264 auth unit/wiremock tests; live contract probe of
auth.kimi.com/api/oauth/device_authorization matches the wire shapes
Gates: check/clippy --all-targets clean, fmt, deny ok, kigi-shell lib
5131 tests green.
This commit is contained in:
@@ -492,7 +492,7 @@ async fn workspace_start(
|
||||
);
|
||||
}
|
||||
ensure_authenticated(
|
||||
&agent_config.grok_com_config,
|
||||
&agent_config.kimi_code_config,
|
||||
false,
|
||||
Some("No cached credentials found. Run `grok login` first."),
|
||||
)
|
||||
@@ -1682,18 +1682,13 @@ async fn async_main() -> Result<()> {
|
||||
)
|
||||
.await;
|
||||
}
|
||||
Command::Login {
|
||||
legacy: _,
|
||||
oauth,
|
||||
device_auth,
|
||||
devbox,
|
||||
} => {
|
||||
Command::Login => {
|
||||
init_tracing_simple("cli");
|
||||
let config = kigi_shell::config::load_effective_config_disk_only()
|
||||
.map_err(|e| anyhow::anyhow!("Failed to load config: {e}"))?;
|
||||
let config = AgentConfig::new_from_toml_cfg(&config)
|
||||
.map_err(|e| anyhow::anyhow!("Failed to create agent config: {e}"))?;
|
||||
kigi_shell::auth::run_cli_login(&config, oauth, device_auth, devbox).await?;
|
||||
kigi_shell::auth::run_cli_login(&config).await?;
|
||||
println!();
|
||||
kigi_shell::instrumentation::finalize_and_exit(0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user