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,154 @@
|
||||
//! Generic retry utilities with exponential backoff.
|
||||
|
||||
use std::future::Future;
|
||||
use std::time::Duration;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tokio::time::sleep;
|
||||
|
||||
/// Configuration for retry behavior with exponential backoff.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct BackoffConfig {
|
||||
pub max_retries: u32,
|
||||
pub base_delay_ms: u64,
|
||||
pub max_delay_ms: u64,
|
||||
}
|
||||
|
||||
impl Default for BackoffConfig {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
max_retries: 10,
|
||||
base_delay_ms: 1000,
|
||||
max_delay_ms: 30_000,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl BackoffConfig {
|
||||
pub fn new(max_retries: u32, base_delay_ms: u64, max_delay_ms: u64) -> Self {
|
||||
Self {
|
||||
max_retries,
|
||||
base_delay_ms,
|
||||
max_delay_ms,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn calculate_delay(&self, attempt: u32) -> Duration {
|
||||
let delay_ms = std::cmp::min(
|
||||
self.base_delay_ms * 2u64.pow(attempt.saturating_sub(1)),
|
||||
self.max_delay_ms,
|
||||
);
|
||||
Duration::from_millis(delay_ms)
|
||||
}
|
||||
}
|
||||
|
||||
/// Execute with retry logic and exponential backoff.
|
||||
/// Calls `on_retry(attempt, max_retries, delay)` before each retry.
|
||||
pub async fn execute_with_backoff<T, E, EFut, R, RFut>(
|
||||
config: &BackoffConfig,
|
||||
mut execute: E,
|
||||
mut on_retry: R,
|
||||
) -> Result<T, E::Error>
|
||||
where
|
||||
E: ExecuteFn<T, Fut = EFut>,
|
||||
EFut: Future<Output = Result<T, E::Error>>,
|
||||
E::Error: std::fmt::Display,
|
||||
R: FnMut(u32, u32, Duration) -> RFut,
|
||||
RFut: Future<Output = ()>,
|
||||
{
|
||||
let mut attempt = 0u32;
|
||||
#[allow(unused_assignments)]
|
||||
let mut last_error: Option<E::Error> = None;
|
||||
|
||||
loop {
|
||||
attempt += 1;
|
||||
|
||||
match execute.call().await {
|
||||
Ok(output) => {
|
||||
if attempt > 1 {
|
||||
tracing::info!("Execution succeeded after {} attempts", attempt);
|
||||
}
|
||||
return Ok(output);
|
||||
}
|
||||
Err(err) => {
|
||||
let delay = config.calculate_delay(attempt);
|
||||
tracing::info!(
|
||||
"Attempt {} failed ({}), retrying in {}ms",
|
||||
attempt,
|
||||
err,
|
||||
delay.as_millis()
|
||||
);
|
||||
last_error = Some(err);
|
||||
|
||||
if attempt >= config.max_retries {
|
||||
tracing::warn!("Execution failed after {} attempts", attempt);
|
||||
break;
|
||||
}
|
||||
|
||||
on_retry(attempt, config.max_retries, delay).await;
|
||||
sleep(delay).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Err(last_error.unwrap())
|
||||
}
|
||||
|
||||
/// Helper trait to work around FnMut closure limitations with async.
|
||||
pub trait ExecuteFn<T> {
|
||||
type Error;
|
||||
type Fut: Future<Output = Result<T, Self::Error>>;
|
||||
fn call(&mut self) -> Self::Fut;
|
||||
}
|
||||
|
||||
impl<T, E, Fut, F> ExecuteFn<T> for F
|
||||
where
|
||||
F: FnMut() -> Fut,
|
||||
Fut: Future<Output = Result<T, E>>,
|
||||
{
|
||||
type Error = E;
|
||||
type Fut = Fut;
|
||||
fn call(&mut self) -> Self::Fut {
|
||||
(self)()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_backoff_config_default() {
|
||||
let config = BackoffConfig::default();
|
||||
assert_eq!(config.max_retries, 10);
|
||||
assert_eq!(config.base_delay_ms, 1000);
|
||||
assert_eq!(config.max_delay_ms, 30_000);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_calculate_delay() {
|
||||
let config = BackoffConfig::default();
|
||||
assert_eq!(config.calculate_delay(1), Duration::from_millis(1000));
|
||||
assert_eq!(config.calculate_delay(2), Duration::from_millis(2000));
|
||||
assert_eq!(config.calculate_delay(3), Duration::from_millis(4000));
|
||||
assert_eq!(config.calculate_delay(6), Duration::from_millis(30000)); // capped
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_calculate_delay_custom_config() {
|
||||
let config = BackoffConfig::new(5, 500, 5000);
|
||||
assert_eq!(config.calculate_delay(1), Duration::from_millis(500));
|
||||
assert_eq!(config.calculate_delay(4), Duration::from_millis(4000));
|
||||
assert_eq!(config.calculate_delay(5), Duration::from_millis(5000)); // capped
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_backoff_config_serde_roundtrip() {
|
||||
let config = BackoffConfig::new(3, 500, 5000);
|
||||
let json = serde_json::to_string(&config).unwrap();
|
||||
let restored: BackoffConfig = serde_json::from_str(&json).unwrap();
|
||||
assert_eq!(restored.max_retries, 3);
|
||||
assert_eq!(restored.base_delay_ms, 500);
|
||||
assert_eq!(restored.max_delay_ms, 5000);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user