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,202 @@
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::{Result, bail};
|
||||
|
||||
use crate::agent::session_registry_client::{SessionRecord, SessionRegistryClient};
|
||||
|
||||
const UNAVAILABLE: &str = "Remote session restore is not available in this build";
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct RestoreResult {
|
||||
pub session_id: String,
|
||||
pub local_session_id: String,
|
||||
pub codebase: CodebaseRestoreResult,
|
||||
pub memory: MemoryRestoreResult,
|
||||
pub session_state: SessionStateRestoreResult,
|
||||
}
|
||||
|
||||
pub type ProgressCallback = Box<dyn Fn(&RestoreProgressEvent) + Send + Sync>;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum PhaseStep {
|
||||
Start,
|
||||
End,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct RestoreProgressEvent {
|
||||
pub phase: RestorePhase,
|
||||
pub step: PhaseStep,
|
||||
pub incomplete: bool,
|
||||
pub message: String,
|
||||
pub detail: Option<String>,
|
||||
pub elapsed: Duration,
|
||||
}
|
||||
|
||||
impl RestoreProgressEvent {
|
||||
pub fn display_line(&self) -> String {
|
||||
match self.detail.as_deref() {
|
||||
Some(detail) if !detail.is_empty() => {
|
||||
format!("{} — {}", self.message, detail)
|
||||
}
|
||||
_ => self.message.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum RestorePhase {
|
||||
SessionRecord,
|
||||
Download,
|
||||
Codebase,
|
||||
Memory,
|
||||
SessionState,
|
||||
Finalize,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct CodebaseRestoreResult {
|
||||
pub strategy: RestoreStrategy,
|
||||
pub commits_applied: usize,
|
||||
pub staged_applied: bool,
|
||||
pub unstaged_applied: bool,
|
||||
pub untracked_copied: usize,
|
||||
pub binary_copied: usize,
|
||||
pub warnings: Vec<String>,
|
||||
pub stash_created: bool,
|
||||
}
|
||||
|
||||
impl CodebaseRestoreResult {
|
||||
pub fn skipped(reason: &str) -> Self {
|
||||
Self {
|
||||
strategy: RestoreStrategy::Skipped(reason.to_string()),
|
||||
commits_applied: 0,
|
||||
staged_applied: false,
|
||||
unstaged_applied: false,
|
||||
untracked_copied: 0,
|
||||
binary_copied: 0,
|
||||
warnings: Vec::new(),
|
||||
stash_created: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum RestoreStrategy {
|
||||
DirectCheckout,
|
||||
PatchReplay,
|
||||
Skipped(String),
|
||||
}
|
||||
|
||||
impl RestoreStrategy {
|
||||
pub fn label(&self) -> &'static str {
|
||||
match self {
|
||||
Self::DirectCheckout => "direct_checkout",
|
||||
Self::PatchReplay => "patch_replay",
|
||||
Self::Skipped(_) => "skipped",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct MemoryRestoreResult {
|
||||
pub sessions_copied: usize,
|
||||
}
|
||||
|
||||
impl MemoryRestoreResult {
|
||||
pub fn skipped(_reason: &str) -> Self {
|
||||
Self { sessions_copied: 0 }
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct SessionStateRestoreResult {
|
||||
pub files_copied: u32,
|
||||
pub summary_restored: bool,
|
||||
pub updates_restored: bool,
|
||||
}
|
||||
|
||||
impl SessionStateRestoreResult {
|
||||
pub fn skipped() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn is_skipped(&self) -> bool {
|
||||
self.files_copied == 0
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn restore_session(
|
||||
_client: &SessionRegistryClient,
|
||||
_session_id: &str,
|
||||
_target_cwd: &str,
|
||||
_turn_override: Option<i32>,
|
||||
) -> Result<RestoreResult> {
|
||||
bail!(UNAVAILABLE)
|
||||
}
|
||||
|
||||
pub async fn restore_session_with_progress(
|
||||
_client: &SessionRegistryClient,
|
||||
_session_id: &str,
|
||||
_target_cwd: &str,
|
||||
_turn_override: Option<i32>,
|
||||
_progress: Option<ProgressCallback>,
|
||||
) -> Result<RestoreResult> {
|
||||
bail!(UNAVAILABLE)
|
||||
}
|
||||
|
||||
pub fn resolve_restore_turn(record: &SessionRecord, turn_override: Option<i32>) -> i32 {
|
||||
turn_override.unwrap_or_else(|| {
|
||||
record
|
||||
.restorable_turn_number
|
||||
.unwrap_or(record.last_turn_number)
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn download_to_tempfile(
|
||||
_client: &SessionRegistryClient,
|
||||
_session_id: &str,
|
||||
_filename: &str,
|
||||
_turn: i32,
|
||||
) -> anyhow::Result<tempfile::NamedTempFile> {
|
||||
bail!(UNAVAILABLE)
|
||||
}
|
||||
|
||||
pub async fn apply_memory_download(
|
||||
_download: anyhow::Result<tempfile::NamedTempFile>,
|
||||
_target_cwd: &str,
|
||||
) -> MemoryRestoreResult {
|
||||
MemoryRestoreResult::skipped(UNAVAILABLE)
|
||||
}
|
||||
|
||||
pub async fn apply_session_state_download(
|
||||
_download: anyhow::Result<tempfile::NamedTempFile>,
|
||||
_session_id: &str,
|
||||
_target_cwd: &str,
|
||||
) -> (SessionStateRestoreResult, String) {
|
||||
(SessionStateRestoreResult::skipped(), String::new())
|
||||
}
|
||||
|
||||
pub fn format_session_line(r: &SessionRecord) -> String {
|
||||
r.session_id.clone()
|
||||
}
|
||||
|
||||
pub fn format_search_results(sessions: &[SessionRecord]) -> String {
|
||||
if sessions.is_empty() {
|
||||
"No sessions found.".to_string()
|
||||
} else {
|
||||
sessions
|
||||
.iter()
|
||||
.map(format_session_line)
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n")
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn apply_session_state_in_place(
|
||||
_download: anyhow::Result<tempfile::NamedTempFile>,
|
||||
_session_id: &str,
|
||||
_target_cwd: &str,
|
||||
) -> SessionStateRestoreResult {
|
||||
SessionStateRestoreResult::skipped()
|
||||
}
|
||||
Reference in New Issue
Block a user