Hard fork of xai-org/grok-build (Apache-2.0) re-targeted as Kigi, an
unofficial Kimi Code CLI community build.
Rename & identity
- 72 xai-*/xai-grok-* crates -> kigi-* (explicit: xai-grok-pager-bin ->
kigi-bin [binary `kigi`], xai-grok-pager -> kigi-tui; rest mechanical);
ptyctl, ptyctl-cli, third_party/ unchanged; proto package
xai.grok.tools.v1 -> kigi.tools.v1
- Config home ~/.kigi (KIGI_SHARE_DIR override), env prefix GROK_* ->
KIGI_*, `kigi --version` carries the unofficial-community-build notice
- clap identity, help text, startup banner, prompt templates rebranded
(templates re-encrypted)
Deletions (PRD removal list #5/#6/#7/#9/#10)
- voice input (xai-grok-voice) and all TUI wiring
- telemetry: Mixpanel client, external OTel stream, Sentry, OTLP layers,
trace/GCS/S3 upload queues (kigi-file-utils halved), workspace upload
module & dc_log, heap-profile uploader, auth-diagnostics uploader,
session-analytics halves of feedback; local zero-egress observability
preserved in new kigi-log crate (unified log, --debug firehose,
subsystem file logs, opt-in instrumentation)
- announcements (crate, remote-settings fields, TUI surfaces)
- plugin marketplace (crate, sources/browse/CTA/extensions-modal tab);
direct plugin install/uninstall/update via kigi-agent git_install kept
- relay/gateway/assets endpoints and features (agent relay, headless
relay transport, gateway bridge, LeaderEnvUrls); leader IPC socket now
~/.kigi/leader.sock + KIGI_LEADER_SOCKET, no ws-url derivation
- functional types rehomed instead of deleted: PermissionMode ->
kigi-config-types, McpInitStrategy -> kigi-mcp, PrCreationSource ->
session signals, TerminalDiagnostics -> kigi-pager-render, agent_id ->
shell util
Endpoints
- kigi-env rewritten: single production KigiEndpoints {coding_api_base_url
https://api.kimi.com/coding/v1 (KIGI_CODE_BASE_URL), oauth_host
https://auth.kimi.com (KIGI_OAUTH_HOST), update_base_url (GitHub
Releases API), upgrade_page_url}; GrokBuildEnvironment enum deleted
Toolchain & workspace hygiene
- Rust 1.97.0 pinned; edition 2024; full cargo update; git2 hoisted to
workspace at 0.21 (Option->Result API migration), quick-xml 0.41
- Root Cargo.toml hand-maintained (PRD §8.1): version 0.1.0 inherited by
all members, members sorted, unused deps pruned
- cargo-deny advisories gate (deny.toml with documented transitive
exceptions); CI workflow (check/clippy/fmt/deny/test, macOS+Linux)
- cross-crate test seams re-gated behind `test-support` cargo feature;
insta snapshot baselines renamed to the kigi_tui prefix
- clippy --workspace --all-targets: zero warnings; fmt clean
Fixes surfaced by the port
- updater probe/installer divergence (bin/kigi vs bin/grok symlink set)
- idle model-metadata refresh dead under KIGI_CODE_BASE_URL override
(new is_effective_coding_endpoint_url, loopback+override aware)
- macOS symlinked-TMPDIR fixture canonicalization (foreign_sessions,
fast-worktree); RSS measurement tests serialized via serial_test
Docs & legal (Apache §4)
- NOTICE added (upstream attribution + change statement); THIRD-PARTY
notices sustained; kigi-tools ported-code notices extended; README,
CONTRIBUTING, SECURITY, AGENTS.md rewritten
Out of scope for M0 (tracked): Kimi auth/inference (M1), search/fetch,
command parity, config import (M2), Computer Hub excision & final
brand-token sweep (M2), distribution & self-update rewrite (M3).
273 lines
7.9 KiB
Rust
273 lines
7.9 KiB
Rust
//! `reqwest-middleware` layer: stamps auth headers and retries on 401.
|
|
//! Gated behind the `middleware` cargo feature.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use reqwest::{Request, Response, StatusCode, header::HeaderValue};
|
|
use reqwest_middleware::{Error, Middleware, Next};
|
|
|
|
use crate::AuthCredentialProvider;
|
|
|
|
pub struct AuthRetryMiddleware {
|
|
credentials: Arc<dyn AuthCredentialProvider>,
|
|
max_retries: u32,
|
|
}
|
|
|
|
impl AuthRetryMiddleware {
|
|
pub fn new(credentials: Arc<dyn AuthCredentialProvider>, max_retries: u32) -> Self {
|
|
Self {
|
|
credentials,
|
|
max_retries,
|
|
}
|
|
}
|
|
}
|
|
|
|
fn apply_auth_header(req: &mut Request, token: &str) {
|
|
match HeaderValue::from_str(&format!("Bearer {token}")) {
|
|
Ok(val) => {
|
|
req.headers_mut()
|
|
.insert(reqwest::header::AUTHORIZATION, val);
|
|
}
|
|
Err(e) => {
|
|
tracing::warn!(error = %e, "auth retry: failed to build Authorization header");
|
|
}
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl Middleware for AuthRetryMiddleware {
|
|
async fn handle(
|
|
&self,
|
|
mut req: Request,
|
|
extensions: &mut http::Extensions,
|
|
next: Next<'_>,
|
|
) -> Result<Response, Error> {
|
|
if let Some(ref token) = self.credentials.snapshot().token {
|
|
apply_auth_header(&mut req, token);
|
|
}
|
|
|
|
let backup = req.try_clone();
|
|
let resp = next.clone().run(req, extensions).await?;
|
|
|
|
if resp.status() != StatusCode::UNAUTHORIZED || self.max_retries == 0 {
|
|
return Ok(resp);
|
|
}
|
|
let Some(backup) = backup else {
|
|
return Ok(resp);
|
|
};
|
|
|
|
let mut last_resp = resp;
|
|
for _ in 0..self.max_retries {
|
|
if !self.credentials.refresh_after_unauthorized().await {
|
|
break;
|
|
}
|
|
let Some(ref token) = self.credentials.snapshot().token else {
|
|
break;
|
|
};
|
|
let Some(mut retry) = backup.try_clone() else {
|
|
break;
|
|
};
|
|
apply_auth_header(&mut retry, token);
|
|
last_resp = next.clone().run(retry, extensions).await?;
|
|
if last_resp.status() != StatusCode::UNAUTHORIZED {
|
|
return Ok(last_resp);
|
|
}
|
|
}
|
|
|
|
Ok(last_resp)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::{CredentialSnapshot, HttpAuth};
|
|
use reqwest_middleware::ClientBuilder;
|
|
use std::sync::Mutex;
|
|
|
|
struct MockProvider {
|
|
token: Mutex<Option<String>>,
|
|
refresh_result: bool,
|
|
refresh_count: Mutex<u32>,
|
|
}
|
|
|
|
impl MockProvider {
|
|
fn new(token: Option<&str>, refresh_result: bool) -> Self {
|
|
Self {
|
|
token: Mutex::new(token.map(|s| s.to_owned())),
|
|
refresh_result,
|
|
refresh_count: Mutex::new(0),
|
|
}
|
|
}
|
|
|
|
fn refresh_count(&self) -> u32 {
|
|
*self.refresh_count.lock().unwrap()
|
|
}
|
|
}
|
|
|
|
impl HttpAuth for MockProvider {
|
|
fn apply(&self, b: reqwest::RequestBuilder, _: &str) -> reqwest::RequestBuilder {
|
|
b
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl AuthCredentialProvider for MockProvider {
|
|
fn snapshot(&self) -> CredentialSnapshot {
|
|
CredentialSnapshot {
|
|
token: self.token.lock().unwrap().clone(),
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
async fn refresh_after_unauthorized(&self) -> bool {
|
|
*self.refresh_count.lock().unwrap() += 1;
|
|
self.refresh_result
|
|
}
|
|
}
|
|
|
|
async fn build_client(
|
|
provider: Arc<dyn AuthCredentialProvider>,
|
|
max_retries: u32,
|
|
) -> reqwest_middleware::ClientWithMiddleware {
|
|
ClientBuilder::new(reqwest::Client::new())
|
|
.with(AuthRetryMiddleware::new(provider, max_retries))
|
|
.build()
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_401_no_refresh_returns_401() {
|
|
let mut server = mockito::Server::new_async().await;
|
|
let m = server
|
|
.mock("GET", "/")
|
|
.with_status(401)
|
|
.expect(1)
|
|
.create_async()
|
|
.await;
|
|
|
|
let p = Arc::new(MockProvider::new(Some("tok"), false));
|
|
let client = build_client(p.clone(), 1).await;
|
|
|
|
let resp = client.get(server.url()).send().await.unwrap();
|
|
assert_eq!(resp.status(), 401);
|
|
assert_eq!(p.refresh_count(), 1);
|
|
m.assert_async().await;
|
|
}
|
|
|
|
/// Simulates a real auth manager: starts with stale token, refresh swaps to fresh.
|
|
struct SimulatedAuthManager {
|
|
token: Mutex<Option<String>>,
|
|
fresh_token: String,
|
|
refresh_count: Mutex<u32>,
|
|
}
|
|
|
|
impl SimulatedAuthManager {
|
|
fn simulated(stale: &str, fresh: &str) -> Self {
|
|
Self {
|
|
token: Mutex::new(Some(stale.to_owned())),
|
|
fresh_token: fresh.to_owned(),
|
|
refresh_count: Mutex::new(0),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl HttpAuth for SimulatedAuthManager {
|
|
fn apply(&self, b: reqwest::RequestBuilder, _: &str) -> reqwest::RequestBuilder {
|
|
b
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl AuthCredentialProvider for SimulatedAuthManager {
|
|
fn snapshot(&self) -> CredentialSnapshot {
|
|
CredentialSnapshot {
|
|
token: self.token.lock().unwrap().clone(),
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
async fn refresh_after_unauthorized(&self) -> bool {
|
|
*self.refresh_count.lock().unwrap() += 1;
|
|
*self.token.lock().unwrap() = Some(self.fresh_token.clone());
|
|
true
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_e2e_stale_token_refreshed_and_retried() {
|
|
let mut server = mockito::Server::new_async().await;
|
|
|
|
let m401 = server
|
|
.mock("GET", "/api")
|
|
.match_header("authorization", "Bearer stale-token")
|
|
.with_status(401)
|
|
.create_async()
|
|
.await;
|
|
let m200 = server
|
|
.mock("GET", "/api")
|
|
.match_header("authorization", "Bearer fresh-token")
|
|
.with_status(200)
|
|
.with_body(r#"{"ok":true}"#)
|
|
.create_async()
|
|
.await;
|
|
|
|
let p = Arc::new(SimulatedAuthManager::simulated(
|
|
"stale-token",
|
|
"fresh-token",
|
|
));
|
|
let client = build_client(p.clone(), 1).await;
|
|
|
|
let resp = client
|
|
.get(format!("{}/api", server.url()))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
assert_eq!(*p.refresh_count.lock().unwrap(), 1);
|
|
m401.assert_async().await;
|
|
m200.assert_async().await;
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_e2e_auth_header_stamped_automatically() {
|
|
let mut server = mockito::Server::new_async().await;
|
|
let mock = server
|
|
.mock("GET", "/api")
|
|
.match_header("authorization", "Bearer my-token")
|
|
.with_status(200)
|
|
.create_async()
|
|
.await;
|
|
|
|
let p = Arc::new(MockProvider::new(Some("my-token"), false));
|
|
let client = build_client(p.clone(), 1).await;
|
|
|
|
let resp = client
|
|
.get(format!("{}/api", server.url()))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
assert_eq!(p.refresh_count(), 0);
|
|
mock.assert_async().await;
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_max_retries_bounds_attempts() {
|
|
let mut server = mockito::Server::new_async().await;
|
|
let m = server
|
|
.mock("GET", "/")
|
|
.with_status(401)
|
|
.expect(4)
|
|
.create_async()
|
|
.await;
|
|
|
|
let p = Arc::new(MockProvider::new(Some("tok"), true));
|
|
let client = build_client(p.clone(), 3).await;
|
|
|
|
let resp = client.get(server.url()).send().await.unwrap();
|
|
assert_eq!(resp.status(), 401);
|
|
assert_eq!(p.refresh_count(), 3);
|
|
m.assert_async().await;
|
|
}
|
|
}
|