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,147 @@
|
||||
//! Agent bootstrap and lifecycle hooks.
|
||||
//!
|
||||
//! [`bootstrap`] runs the full init sequence (config resolution, process
|
||||
//! singletons, model catalog) and returns a resolved config + `ModelsManager`.
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use indexmap::IndexMap;
|
||||
|
||||
use crate::agent::config::{self, Config as AgentConfig, ModelEntry};
|
||||
use crate::agent::models::ModelsManager;
|
||||
use crate::auth::AuthManager;
|
||||
use crate::config::StorageMode;
|
||||
|
||||
/// Resolve config, init process singletons, build the model catalog.
|
||||
///
|
||||
/// The `ModelsManager` is `Clone + Send`, so callers that need a handle
|
||||
/// for the config watcher can clone it before passing it to
|
||||
/// `MvpAgent::with_models`.
|
||||
pub fn bootstrap(
|
||||
cfg: &AgentConfig,
|
||||
auth_manager: &Arc<AuthManager>,
|
||||
prefetched: Option<IndexMap<String, ModelEntry>>,
|
||||
) -> Result<(AgentConfig, ModelsManager), String> {
|
||||
// Fail closed before any policy is read: a tampered managed policy must not run unmanaged.
|
||||
crate::managed_config::managed_policy_gate()?;
|
||||
let cfg = resolve_config(cfg, auth_manager);
|
||||
cfg.validate_model_filters()?;
|
||||
init_process(&cfg, auth_manager);
|
||||
let models_manager = ModelsManager::from_config(&cfg, prefetched, auth_manager.clone())?;
|
||||
|
||||
// Refresh on every auth refresh — the FSEvents watcher can silently die after
|
||||
// macOS sleep, stranding the catalog on bundled defaults.
|
||||
models_manager.start_auth_refresh_watcher(auth_manager.refresh_notifier());
|
||||
|
||||
Ok((cfg, models_manager))
|
||||
}
|
||||
|
||||
/// Print a `bootstrap`/`MvpAgent::new` config error and exit (process boundary).
|
||||
///
|
||||
/// Restores native stderr first: a managed-policy refusal on the ACP/server path reaches here
|
||||
/// while fd 2 may still point at the `/dev/null` the TUI's `redirect_native_stderr()` set, which
|
||||
/// would swallow the message. No-op when stderr was never redirected (headless).
|
||||
pub(crate) fn exit_on_config_error<T>(e: String) -> T {
|
||||
kigi_tty_utils::restore_native_stderr();
|
||||
eprintln!("\nConfiguration error:\n\n {e}\n");
|
||||
std::process::exit(1);
|
||||
}
|
||||
|
||||
/// Config transform: apply managed settings, fetch remote settings,
|
||||
/// resolve storage mode.
|
||||
fn resolve_config(cfg: &AgentConfig, auth_manager: &AuthManager) -> AgentConfig {
|
||||
let mut cfg = cfg.clone();
|
||||
|
||||
if let Ok(layers) = crate::config::ConfigLayers::load()
|
||||
&& layers.has_managed()
|
||||
{
|
||||
let origins = crate::config::config_origins(&layers);
|
||||
let managed_keys: Vec<&str> = origins
|
||||
.iter()
|
||||
.filter(|(_, s)| matches!(s, config::ConfigSource::ManagedConfig))
|
||||
.map(|(k, _)| k.as_str())
|
||||
.collect();
|
||||
if !managed_keys.is_empty() {
|
||||
tracing::info!(keys = ?managed_keys, "managed_config.toml fields");
|
||||
}
|
||||
}
|
||||
|
||||
let managed_enforced = crate::config::apply_managed_settings_features(&mut cfg);
|
||||
let requirements_enforced = crate::config::apply_requirements(&mut cfg);
|
||||
|
||||
for e in managed_enforced.iter().chain(&requirements_enforced) {
|
||||
tracing::info!(field = %e.path, value = %e.value, source = %e.source, "policy override");
|
||||
}
|
||||
|
||||
// Fallback: if the client didn't pre-supply remote settings, fetch them
|
||||
// now so remote-settings-gated features work regardless of which client
|
||||
// spawned us. Clients that already call `start_early_prefetch()` and
|
||||
// thread the result into `cfg.remote_settings` skip this entirely.
|
||||
if cfg.remote_settings.is_none()
|
||||
&& let Some(handle) =
|
||||
crate::agent::models::start_early_prefetch(Some(cfg.grok_com_config.clone()))
|
||||
{
|
||||
match handle.join() {
|
||||
Ok(result) => {
|
||||
cfg.remote_settings = result.settings;
|
||||
crate::util::config::set_remote_campaigns_from_settings(
|
||||
cfg.remote_settings.as_ref(),
|
||||
);
|
||||
tracing::info!("remote_settings fetched as shell-level fallback");
|
||||
}
|
||||
Err(_) => {
|
||||
tracing::warn!("remote_settings fallback prefetch thread panicked");
|
||||
}
|
||||
}
|
||||
}
|
||||
crate::util::config::sync_campaign_fields(&mut cfg);
|
||||
crate::agent::config::apply_remote_settings_side_effects(cfg.remote_settings.as_ref());
|
||||
|
||||
// env var > remote settings > Local. Skip remote settings for Generic (grok -p, subagents).
|
||||
if cfg.storage_mode == StorageMode::Local
|
||||
&& cfg.mode != crate::agent::config::AgentMode::Generic
|
||||
{
|
||||
cfg.storage_mode = StorageMode::resolve(None, cfg.remote_settings.as_ref());
|
||||
}
|
||||
// Writeback talks to the code backend; requires grok.com auth.
|
||||
if cfg.storage_mode == StorageMode::Writeback
|
||||
&& !auth_manager.current().is_some_and(|a| a.is_xai_auth())
|
||||
{
|
||||
tracing::info!("Writeback is disabled: requires auth with grok.com");
|
||||
cfg.storage_mode = StorageMode::Local;
|
||||
}
|
||||
|
||||
if let Some(rs) = cfg.remote_settings.as_ref()
|
||||
&& let Some(v) = rs.path_not_found_hints
|
||||
{
|
||||
cfg.path_not_found_hints = v;
|
||||
}
|
||||
|
||||
cfg
|
||||
}
|
||||
|
||||
/// Initialize process-level singletons (deployment sync, bundled files).
|
||||
/// `Once`-guarded: only the first call takes effect.
|
||||
fn init_process(cfg: &AgentConfig, auth_manager: &AuthManager) {
|
||||
use std::sync::Once;
|
||||
static INIT: Once = Once::new();
|
||||
INIT.call_once(|| {
|
||||
if !cfg!(test) {
|
||||
// Clear a logged-out team's files before the background sync runs.
|
||||
crate::managed_config::clear_orphan();
|
||||
crate::managed_config::spawn_sync(tokio_util::sync::CancellationToken::new());
|
||||
}
|
||||
|
||||
let kigi_home = crate::util::kigi_home::kigi_home();
|
||||
crate::builtin::extract_bundled_files(&kigi_home);
|
||||
|
||||
let feedback = cfg.resolve_feedback();
|
||||
let feedback_url = cfg.endpoints.resolve_feedback_base_url();
|
||||
tracing::info!(
|
||||
feedback = %feedback,
|
||||
feedback_url = %feedback_url,
|
||||
feedback_url_custom = cfg.endpoints.feedback_base_url.is_some(),
|
||||
"data capture config resolved",
|
||||
);
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user