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,155 @@
|
||||
use async_trait::async_trait;
|
||||
use opentelemetry::global;
|
||||
use opentelemetry_http::HeaderInjector;
|
||||
use reqwest::header::HeaderMap;
|
||||
use reqwest_middleware::{ClientBuilder, ClientWithMiddleware, Middleware};
|
||||
use tracing::{Instrument, Span, field};
|
||||
use tracing_opentelemetry::OpenTelemetrySpanExt;
|
||||
|
||||
pub fn attach_trace_to_http_request(headers: &mut HeaderMap) {
|
||||
global::get_text_map_propagator(|propagator| {
|
||||
let context = Span::current().context();
|
||||
propagator.inject_context(&context, &mut HeaderInjector(headers));
|
||||
});
|
||||
}
|
||||
|
||||
pub type TracedHttpClient = ClientWithMiddleware;
|
||||
|
||||
pub fn traced_client(client: reqwest::Client) -> TracedHttpClient {
|
||||
ClientBuilder::new(client).with(TracingMiddleware).build()
|
||||
}
|
||||
|
||||
pub fn traced_client_new() -> TracedHttpClient {
|
||||
traced_client(reqwest::Client::new())
|
||||
}
|
||||
|
||||
pub fn traced_client_from_builder(
|
||||
builder: reqwest::ClientBuilder,
|
||||
) -> Result<TracedHttpClient, reqwest::Error> {
|
||||
Ok(traced_client(builder.build()?))
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Default)]
|
||||
struct TracingMiddleware;
|
||||
|
||||
#[async_trait]
|
||||
impl Middleware for TracingMiddleware {
|
||||
async fn handle(
|
||||
&self,
|
||||
mut req: reqwest::Request,
|
||||
extensions: &mut http::Extensions,
|
||||
next: reqwest_middleware::Next<'_>,
|
||||
) -> reqwest_middleware::Result<reqwest::Response> {
|
||||
let method = req.method().as_str().to_owned();
|
||||
let url = req.url().clone();
|
||||
// No active dispatcher → the span has no consumer and would only be
|
||||
// downgraded to `log` spam. See `crate::dispatcher_active`.
|
||||
let span = if crate::dispatcher_active() {
|
||||
tracing::info_span!(
|
||||
"http_request",
|
||||
otel.kind = "client",
|
||||
"http.request.method" = %method,
|
||||
"url.full" = %url,
|
||||
"http.response.status_code" = field::Empty,
|
||||
)
|
||||
} else {
|
||||
Span::none()
|
||||
};
|
||||
|
||||
let result = async move {
|
||||
attach_trace_to_http_request(req.headers_mut());
|
||||
next.run(req, extensions).await
|
||||
}
|
||||
.instrument(span.clone())
|
||||
.await;
|
||||
|
||||
if let Ok(ref response) = result {
|
||||
span.record("http.response.status_code", response.status().as_u16());
|
||||
}
|
||||
result
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::testing::{OtelTestEnv, otel_span_id_hex, otel_trace_id_hex, parse_traceparent};
|
||||
use tracing::Instrument;
|
||||
use wiremock::matchers::method;
|
||||
use wiremock::{Mock, MockServer, ResponseTemplate};
|
||||
|
||||
#[tokio::test]
|
||||
async fn attach_trace_to_http_request_writes_traceparent() {
|
||||
let _env = OtelTestEnv::install();
|
||||
let span = tracing::info_span!("http_request", otel.kind = "client");
|
||||
let span_id = otel_span_id_hex(&span);
|
||||
let mut headers = HeaderMap::new();
|
||||
let _enter = span.enter();
|
||||
attach_trace_to_http_request(&mut headers);
|
||||
let tp = headers.get("traceparent").unwrap().to_str().unwrap();
|
||||
let (_ver, _tid, injected_span_id) = parse_traceparent(tp);
|
||||
assert_eq!(injected_span_id, span_id);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn traced_client_injects_client_span_not_parent_on_wire() {
|
||||
let _env = OtelTestEnv::install();
|
||||
let server = MockServer::start().await;
|
||||
Mock::given(method("GET"))
|
||||
.respond_with(ResponseTemplate::new(200))
|
||||
.mount(&server)
|
||||
.await;
|
||||
|
||||
let client = traced_client(reqwest::Client::new());
|
||||
let parent = tracing::info_span!("parent_handler");
|
||||
let parent_span_id = otel_span_id_hex(&parent);
|
||||
let parent_trace_id = otel_trace_id_hex(&parent);
|
||||
|
||||
async {
|
||||
client
|
||||
.get(format!("{}/health", server.uri()))
|
||||
.send()
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
.instrument(parent)
|
||||
.await;
|
||||
|
||||
let received = server.received_requests().await.unwrap();
|
||||
assert_eq!(received.len(), 1);
|
||||
let tp = received[0]
|
||||
.headers
|
||||
.get("traceparent")
|
||||
.expect("traceparent on wire")
|
||||
.to_str()
|
||||
.unwrap();
|
||||
let (_ver, injected_trace_id, injected_span_id) = parse_traceparent(tp);
|
||||
|
||||
assert_eq!(injected_trace_id, parent_trace_id);
|
||||
assert_ne!(injected_span_id, parent_span_id);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn traced_client_returns_response_status() {
|
||||
let _env = OtelTestEnv::install();
|
||||
let server = MockServer::start().await;
|
||||
Mock::given(method("GET"))
|
||||
.respond_with(ResponseTemplate::new(404))
|
||||
.mount(&server)
|
||||
.await;
|
||||
|
||||
let client = traced_client_new();
|
||||
let resp = client
|
||||
.get(format!("{}/missing", server.uri()))
|
||||
.send()
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(resp.status().as_u16(), 404);
|
||||
assert!(
|
||||
server.received_requests().await.unwrap()[0]
|
||||
.headers
|
||||
.get("traceparent")
|
||||
.is_some()
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user