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,31 @@
|
||||
//! Tracing-based utility macros.
|
||||
//!
|
||||
//! This crate provides macros for:
|
||||
//! - Timestamped logging (`tprintln!`, `teprintln!`)
|
||||
//! - Execution timing with automatic logging (`timed!`)
|
||||
//!
|
||||
//! # Examples
|
||||
//!
|
||||
//! ```ignore
|
||||
//! use kigi_tracing_macros::{tprintln, teprintln, timed};
|
||||
//!
|
||||
//! // Timestamped logging
|
||||
//! tprintln!("Hello, world!");
|
||||
//! teprintln!("Warning: something happened");
|
||||
//!
|
||||
//! // Execution timing
|
||||
//! let result = timed!(log: "expensive_operation", {
|
||||
//! // ... expensive work ...
|
||||
//! 42
|
||||
//! });
|
||||
//!
|
||||
//! // Timing with Result handling
|
||||
//! let result: Result<i32, String> = timed!(try: "fallible_operation", {
|
||||
//! Ok(42)
|
||||
//! });
|
||||
//! ```
|
||||
|
||||
mod timed;
|
||||
mod timestamp;
|
||||
|
||||
// Macros are automatically exported at crate root via #[macro_export]
|
||||
@@ -0,0 +1,117 @@
|
||||
//! Macros for measuring and logging execution time.
|
||||
|
||||
/// Measure and optionally log execution time of a block.
|
||||
///
|
||||
/// # Variants
|
||||
///
|
||||
/// - `timed!({ ... })` - Returns `(value, elapsed_ms)` tuple
|
||||
/// - `timed!(log: "name", { ... })` - Logs at debug level, returns value
|
||||
/// - `timed!(log: info, "name", { ... })` - Logs at specified level, returns value
|
||||
/// - `timed!(try: "name", { ... })` - For sync Result blocks, logs and returns Result
|
||||
/// - `timed!(try: info, "name", { ... })` - For sync Result blocks with level
|
||||
/// - `timed!(try: "name", async { ... })` - For async Result blocks
|
||||
/// - `timed!(try: info, "name", async { ... })` - For async Result blocks with level
|
||||
#[macro_export]
|
||||
macro_rules! timed {
|
||||
(@log_ok $lvl:ident, $name:expr, $elapsed_ms:expr) => {{
|
||||
::tracing::$lvl!(elapsed_ms = $elapsed_ms as u64, "{}", $name);
|
||||
}};
|
||||
(@log_err $lvl:ident, $name:expr, $elapsed_ms:expr, $err:expr) => {{
|
||||
::tracing::$lvl!(elapsed_ms = $elapsed_ms as u64, error = ?$err, "{}", $name);
|
||||
}};
|
||||
|
||||
($block:block) => {{
|
||||
let start = ::std::time::Instant::now();
|
||||
let value = $block;
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
(value, elapsed_ms)
|
||||
}};
|
||||
|
||||
(log: $name:expr, $block:block) => {{
|
||||
let start = ::std::time::Instant::now();
|
||||
let value = $block;
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
$crate::timed!(@log_ok debug, $name, elapsed_ms);
|
||||
value
|
||||
}};
|
||||
|
||||
// Logging-only variant with explicit log level:
|
||||
// `timed!(log: info, "something", { ... })`
|
||||
(log: $lvl:ident, $name:expr, $block:block) => {{
|
||||
let start = ::std::time::Instant::now();
|
||||
let value = $block;
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
$crate::timed!(@log_ok $lvl, $name, elapsed_ms);
|
||||
value
|
||||
}};
|
||||
|
||||
// Sync Result variant (no `.await` inside the block)
|
||||
(try: $name:expr, $block:block) => {{
|
||||
let start = ::std::time::Instant::now();
|
||||
let result = (|| $block)();
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
match result {
|
||||
Ok(value) => {
|
||||
$crate::timed!(@log_ok debug, $name, elapsed_ms);
|
||||
Ok(value)
|
||||
}
|
||||
Err(err) => {
|
||||
$crate::timed!(@log_err debug, $name, elapsed_ms, err);
|
||||
Err(err)
|
||||
}
|
||||
}
|
||||
}};
|
||||
|
||||
// Sync Result variant with explicit log level:
|
||||
// `timed!(try: info, "something", { ... })?`
|
||||
(try: $lvl:ident, $name:expr, $block:block) => {{
|
||||
let start = ::std::time::Instant::now();
|
||||
let result = (|| $block)();
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
match result {
|
||||
Ok(value) => {
|
||||
$crate::timed!(@log_ok $lvl, $name, elapsed_ms);
|
||||
Ok(value)
|
||||
}
|
||||
Err(err) => {
|
||||
$crate::timed!(@log_err $lvl, $name, elapsed_ms, err);
|
||||
Err(err)
|
||||
}
|
||||
}
|
||||
}};
|
||||
|
||||
// Async Result variant, for blocks that use `.await` / `?`.
|
||||
(try: $name:expr, async $block:block) => {{
|
||||
let start = ::std::time::Instant::now();
|
||||
let result = (async $block).await;
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
match result {
|
||||
Ok(value) => {
|
||||
$crate::timed!(@log_ok debug, $name, elapsed_ms);
|
||||
Ok(value)
|
||||
}
|
||||
Err(err) => {
|
||||
$crate::timed!(@log_err debug, $name, elapsed_ms, err);
|
||||
Err(err)
|
||||
}
|
||||
}
|
||||
}};
|
||||
|
||||
// Async Result variant with explicit log level:
|
||||
// `timed!(try: info, "something", async { ... })?`
|
||||
(try: $lvl:ident, $name:expr, async $block:block) => {{
|
||||
let start = ::std::time::Instant::now();
|
||||
let result = (async $block).await;
|
||||
let elapsed_ms = start.elapsed().as_millis();
|
||||
match result {
|
||||
Ok(value) => {
|
||||
$crate::timed!(@log_ok $lvl, $name, elapsed_ms);
|
||||
Ok(value)
|
||||
}
|
||||
Err(err) => {
|
||||
$crate::timed!(@log_err $lvl, $name, elapsed_ms, err);
|
||||
Err(err)
|
||||
}
|
||||
}
|
||||
}};
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
//! Macros for printing messages with Unix timestamps.
|
||||
//!
|
||||
//! These macros use tracing for output, which is safe to use in headless mode
|
||||
//! (no terminal attached). The timestamp is included in the message.
|
||||
|
||||
/// Prints a message via tracing::info with a Unix timestamp prefix.
|
||||
///
|
||||
/// The format is: `{unix_timestamp}::{message}`
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```ignore
|
||||
/// tprintln!("Hello, world!");
|
||||
/// // Logs: 1234567890::Hello, world!
|
||||
///
|
||||
/// tprintln!("Value: {}", 42);
|
||||
/// // Logs: 1234567890::Value: 42
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! tprintln {
|
||||
() => {{
|
||||
let ts = ::std::time::SystemTime::now()
|
||||
.duration_since(::std::time::UNIX_EPOCH)
|
||||
.map(|d| d.as_secs())
|
||||
.unwrap_or(0);
|
||||
::tracing::info!("{}::", ts)
|
||||
}};
|
||||
($($arg:tt)*) => {{
|
||||
let ts = ::std::time::SystemTime::now()
|
||||
.duration_since(::std::time::UNIX_EPOCH)
|
||||
.map(|d| d.as_secs())
|
||||
.unwrap_or(0);
|
||||
::tracing::info!("{}::{}", ts, ::std::format_args!($($arg)*))
|
||||
}};
|
||||
}
|
||||
|
||||
/// Prints a message via tracing::warn with a Unix timestamp prefix.
|
||||
///
|
||||
/// The format is: `{unix_timestamp}::{message}`
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```ignore
|
||||
/// teprintln!("Error occurred!");
|
||||
/// // Logs: 1234567890::Error occurred!
|
||||
///
|
||||
/// teprintln!("Error code: {}", 500);
|
||||
/// // Logs: 1234567890::Error code: 500
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! teprintln {
|
||||
() => {{
|
||||
let ts = ::std::time::SystemTime::now()
|
||||
.duration_since(::std::time::UNIX_EPOCH)
|
||||
.map(|d| d.as_secs())
|
||||
.unwrap_or(0);
|
||||
::tracing::warn!("{}::", ts)
|
||||
}};
|
||||
($($arg:tt)*) => {{
|
||||
let ts = ::std::time::SystemTime::now()
|
||||
.duration_since(::std::time::UNIX_EPOCH)
|
||||
.map(|d| d.as_secs())
|
||||
.unwrap_or(0);
|
||||
::tracing::warn!("{}::{}", ts, ::std::format_args!($($arg)*))
|
||||
}};
|
||||
}
|
||||
Reference in New Issue
Block a user