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,141 @@
|
||||
//! Unified log forwarding for the pager.
|
||||
//!
|
||||
//! Buffers log entries in memory and flushes them to the shell via
|
||||
//! `x.ai/log` ACP notifications. Call [`init`] once at startup with
|
||||
//! the ACP sender, then use [`info`], [`warn`], [`error`], [`debug`]
|
||||
//! from anywhere.
|
||||
|
||||
use std::sync::{Mutex, OnceLock};
|
||||
|
||||
use agent_client_protocol as acp;
|
||||
use kigi_acp_lib::AcpAgentTx;
|
||||
use kigi_log::unified_log::{
|
||||
ClientLogEntry, LOG_METHOD, LogLevel, LogNotificationParams, LogSource,
|
||||
};
|
||||
use tokio::runtime::Handle;
|
||||
|
||||
static ACP_TX: OnceLock<AcpAgentTx> = OnceLock::new();
|
||||
static BUFFER: Mutex<Vec<ClientLogEntry>> = Mutex::new(Vec::new());
|
||||
|
||||
/// Initialize the unified log forwarder with the ACP sender.
|
||||
///
|
||||
/// Must be called once after the ACP connection is established.
|
||||
/// Spawns a background task that flushes buffered entries every few
|
||||
/// seconds so events are delivered promptly without manual flush calls.
|
||||
/// Entries buffered before this call will be picked up on the first tick.
|
||||
pub fn init(tx: AcpAgentTx) {
|
||||
let _ = ACP_TX.set(tx);
|
||||
tokio::spawn(async {
|
||||
let mut interval = tokio::time::interval(std::time::Duration::from_secs(1));
|
||||
interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
|
||||
loop {
|
||||
interval.tick().await;
|
||||
flush();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn now_ts() -> String {
|
||||
chrono::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Millis, true)
|
||||
}
|
||||
|
||||
fn push_entry(lvl: LogLevel, msg: &str, sid: Option<&str>, ctx: Option<serde_json::Value>) {
|
||||
let entry = ClientLogEntry {
|
||||
ts: now_ts(),
|
||||
pid: Some(std::process::id()),
|
||||
ver: Some(kigi_version::VERSION.to_owned()),
|
||||
lvl,
|
||||
sid: sid.map(Into::into),
|
||||
msg: msg.into(),
|
||||
ctx,
|
||||
};
|
||||
if let Ok(mut buf) = BUFFER.lock() {
|
||||
buf.push(entry);
|
||||
// Auto-flush when we have a reasonable batch, but only if the ACP
|
||||
// sender is ready -- otherwise keep buffering until an explicit flush().
|
||||
if buf.len() >= 16 && ACP_TX.get().is_some() {
|
||||
let entries: Vec<ClientLogEntry> = buf.drain(..).collect();
|
||||
drop(buf);
|
||||
send_entries(entries);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn build_notification(entries: Vec<ClientLogEntry>) -> Option<acp::ExtNotification> {
|
||||
if entries.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let params = LogNotificationParams {
|
||||
src: LogSource::GrokPager,
|
||||
entries,
|
||||
};
|
||||
let raw = serde_json::value::to_raw_value(¶ms).ok()?;
|
||||
Some(acp::ExtNotification::new(LOG_METHOD, raw.into()))
|
||||
}
|
||||
|
||||
fn send_entries(entries: Vec<ClientLogEntry>) {
|
||||
let Some(tx) = ACP_TX.get() else { return };
|
||||
let Some(notification) = build_notification(entries) else {
|
||||
return;
|
||||
};
|
||||
// Guard against panic if called from a non-tokio thread (e.g., a
|
||||
// tracing::Layer callback on a blocking thread).
|
||||
let Ok(handle) = Handle::try_current() else {
|
||||
return;
|
||||
};
|
||||
let tx = tx.clone();
|
||||
handle.spawn(async move {
|
||||
let _ = kigi_acp_lib::acp_send(notification, &tx).await;
|
||||
});
|
||||
}
|
||||
|
||||
/// Flush any buffered entries to the shell (fire-and-forget).
|
||||
pub fn flush() {
|
||||
let entries = {
|
||||
let Ok(mut buf) = BUFFER.lock() else { return };
|
||||
if buf.is_empty() {
|
||||
return;
|
||||
}
|
||||
buf.drain(..).collect::<Vec<_>>()
|
||||
};
|
||||
send_entries(entries);
|
||||
}
|
||||
|
||||
/// Flush buffered entries and await delivery.
|
||||
///
|
||||
/// Use this before process exit to ensure entries are delivered
|
||||
/// before the agent shuts down.
|
||||
pub async fn flush_blocking() {
|
||||
let entries = {
|
||||
let Ok(mut buf) = BUFFER.lock() else { return };
|
||||
if buf.is_empty() {
|
||||
return;
|
||||
}
|
||||
buf.drain(..).collect::<Vec<_>>()
|
||||
};
|
||||
let Some(tx) = ACP_TX.get() else { return };
|
||||
let Some(notification) = build_notification(entries) else {
|
||||
return;
|
||||
};
|
||||
let _ = kigi_acp_lib::acp_send(notification, tx).await;
|
||||
}
|
||||
|
||||
/// Log an info-level entry.
|
||||
pub fn info(msg: &str, sid: Option<&str>, ctx: Option<serde_json::Value>) {
|
||||
push_entry(LogLevel::Info, msg, sid, ctx);
|
||||
}
|
||||
|
||||
/// Log a warn-level entry.
|
||||
pub fn warn(msg: &str, sid: Option<&str>, ctx: Option<serde_json::Value>) {
|
||||
push_entry(LogLevel::Warn, msg, sid, ctx);
|
||||
}
|
||||
|
||||
/// Log an error-level entry.
|
||||
pub fn error(msg: &str, sid: Option<&str>, ctx: Option<serde_json::Value>) {
|
||||
push_entry(LogLevel::Error, msg, sid, ctx);
|
||||
}
|
||||
|
||||
/// Log a debug-level entry.
|
||||
pub fn debug(msg: &str, sid: Option<&str>, ctx: Option<serde_json::Value>) {
|
||||
push_entry(LogLevel::Debug, msg, sid, ctx);
|
||||
}
|
||||
Reference in New Issue
Block a user