M0: compilable skeleton — Kigi 0.1.0 fork surgery
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).
This commit is contained in:
@@ -0,0 +1,156 @@
|
||||
//! Process-wide shared `reqwest::Client`s for sampling requests.
|
||||
//!
|
||||
//! Sharing one client across all `SamplingClient` instances is safe because
|
||||
//! the builders below take no config-derived input: auth, extra headers, base
|
||||
//! URL, and User-Agent are all applied per-request in `SamplingClient::post`.
|
||||
//! Stale-connection exposure is bounded by HTTP/2 keepalive pings (15s
|
||||
//! interval, 5s timeout, while idle), the 90s idle-pool eviction, and the
|
||||
//! first-retry HTTP/1.1 rebuild escape hatch (that client never pools, so
|
||||
//! every use opens a fresh connection).
|
||||
//!
|
||||
//! Wire-level behavior (connection reuse, header isolation, pool-less http1
|
||||
//! fallback, kill switch) is pinned by the `shared_http_wire` and
|
||||
//! `shared_http_kill_switch` integration binaries, which own their process
|
||||
//! environment.
|
||||
|
||||
use std::sync::OnceLock;
|
||||
use std::time::Duration;
|
||||
|
||||
static SHARED_H2: OnceLock<reqwest::Client> = OnceLock::new();
|
||||
static SHARED_HTTP1: OnceLock<reqwest::Client> = OnceLock::new();
|
||||
|
||||
/// Kill switch: `KIGI_SAMPLER_SHARED_CLIENT=0` (or `false`, any case)
|
||||
/// restores the old behavior of building a fresh `reqwest::Client` per
|
||||
/// `SamplingClient`. Resolved once per process: the environment cannot
|
||||
/// change externally after spawn, and latching keeps the rollback state
|
||||
/// consistent with the read-once pool knobs.
|
||||
fn sharing_disabled() -> bool {
|
||||
static DISABLED: OnceLock<bool> = OnceLock::new();
|
||||
*DISABLED.get_or_init(|| {
|
||||
let disabled = match std::env::var("KIGI_SAMPLER_SHARED_CLIENT") {
|
||||
Ok(v) => v == "0" || v.eq_ignore_ascii_case("false"),
|
||||
Err(_) => false,
|
||||
};
|
||||
if disabled {
|
||||
tracing::info!("sampler HTTP client sharing disabled via KIGI_SAMPLER_SHARED_CLIENT");
|
||||
}
|
||||
disabled
|
||||
})
|
||||
}
|
||||
|
||||
/// Clone the shared client out of `cell`, building it on first use. Build
|
||||
/// failures are not cached: on `Err` the cell stays empty and the next call
|
||||
/// retries. A racing loser's freshly built client is simply dropped.
|
||||
fn shared(
|
||||
cell: &OnceLock<reqwest::Client>,
|
||||
build: fn() -> Result<reqwest::Client, reqwest::Error>,
|
||||
disabled: bool,
|
||||
) -> Result<reqwest::Client, reqwest::Error> {
|
||||
if disabled {
|
||||
return build();
|
||||
}
|
||||
if let Some(client) = cell.get() {
|
||||
return Ok(client.clone());
|
||||
}
|
||||
let built = build()?;
|
||||
Ok(cell.get_or_init(|| built).clone())
|
||||
}
|
||||
|
||||
/// Shared HTTP/2 sampling client (connection pooling + h2 keepalive).
|
||||
pub(crate) fn client() -> Result<reqwest::Client, reqwest::Error> {
|
||||
shared(&SHARED_H2, build_http_client, sharing_disabled())
|
||||
}
|
||||
|
||||
/// Shared HTTP/1.1 fallback client. Pool-less by construction, so sharing it
|
||||
/// is behaviorally identical to building a fresh one.
|
||||
pub(crate) fn client_http1() -> Result<reqwest::Client, reqwest::Error> {
|
||||
shared(&SHARED_HTTP1, build_http_client_http1, sharing_disabled())
|
||||
}
|
||||
|
||||
/// Build a `reqwest::Client` for sampling with HTTP/2 + connection pooling.
|
||||
/// Env knobs are read once, when the shared client is first built.
|
||||
fn build_http_client() -> Result<reqwest::Client, reqwest::Error> {
|
||||
let pool_max_idle: usize = std::env::var("KIGI_POOL_MAX_IDLE")
|
||||
.ok()
|
||||
.and_then(|v| v.parse().ok())
|
||||
.unwrap_or(2);
|
||||
let pool_idle_timeout_secs: u64 = std::env::var("KIGI_POOL_IDLE_TIMEOUT_SECS")
|
||||
.ok()
|
||||
.and_then(|v| v.parse().ok())
|
||||
.unwrap_or(90);
|
||||
let connect_timeout_secs: u64 = std::env::var("KIGI_CONNECT_TIMEOUT_SECS")
|
||||
.ok()
|
||||
.and_then(|v| v.parse().ok())
|
||||
.unwrap_or(10);
|
||||
|
||||
reqwest::Client::builder()
|
||||
.pool_max_idle_per_host(pool_max_idle)
|
||||
.pool_idle_timeout(Duration::from_secs(pool_idle_timeout_secs))
|
||||
.connect_timeout(Duration::from_secs(connect_timeout_secs))
|
||||
.tcp_nodelay(true)
|
||||
// HTTP/2 keep-alive: ping every 15s, timeout after 5s.
|
||||
.http2_keep_alive_interval(Duration::from_secs(15))
|
||||
.http2_keep_alive_timeout(Duration::from_secs(5))
|
||||
.http2_keep_alive_while_idle(true)
|
||||
.build()
|
||||
}
|
||||
|
||||
/// Build a `reqwest::Client` constrained to HTTP/1.1 with pooling disabled.
|
||||
/// Used as a fallback after HTTP/2 transport failures.
|
||||
fn build_http_client_http1() -> Result<reqwest::Client, reqwest::Error> {
|
||||
let connect_timeout_secs: u64 = std::env::var("KIGI_CONNECT_TIMEOUT_SECS")
|
||||
.ok()
|
||||
.and_then(|v| v.parse().ok())
|
||||
.unwrap_or(10);
|
||||
|
||||
reqwest::Client::builder()
|
||||
.pool_max_idle_per_host(0)
|
||||
.pool_idle_timeout(Duration::from_secs(0))
|
||||
.connect_timeout(Duration::from_secs(connect_timeout_secs))
|
||||
.tcp_nodelay(true)
|
||||
.http1_only()
|
||||
.build()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::sync::OnceLock;
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
|
||||
use super::shared;
|
||||
|
||||
static BUILD_CALLS: AtomicUsize = AtomicUsize::new(0);
|
||||
|
||||
/// Fails on the first call (a real `reqwest::Error`, no I/O), then builds.
|
||||
fn flaky_build() -> Result<reqwest::Client, reqwest::Error> {
|
||||
if BUILD_CALLS.fetch_add(1, Ordering::SeqCst) == 0 {
|
||||
return Err(reqwest::Proxy::all("not a proxy url").unwrap_err());
|
||||
}
|
||||
reqwest::Client::builder().build()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_does_not_cache_build_failures() {
|
||||
static CELL: OnceLock<reqwest::Client> = OnceLock::new();
|
||||
assert!(shared(&CELL, flaky_build, false).is_err());
|
||||
assert!(CELL.get().is_none(), "failure must leave the cell empty");
|
||||
assert!(shared(&CELL, flaky_build, false).is_ok());
|
||||
assert!(CELL.get().is_some(), "success must populate the cell");
|
||||
assert!(shared(&CELL, flaky_build, false).is_ok());
|
||||
assert_eq!(
|
||||
BUILD_CALLS.load(Ordering::SeqCst),
|
||||
2,
|
||||
"third call must reuse the cached client, not rebuild"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_disabled_bypasses_cell() {
|
||||
static CELL: OnceLock<reqwest::Client> = OnceLock::new();
|
||||
assert!(shared(&CELL, || reqwest::Client::builder().build(), true).is_ok());
|
||||
assert!(
|
||||
CELL.get().is_none(),
|
||||
"disabled mode must never touch the cell"
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user