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,110 @@
|
||||
//! End-to-end test for subagent orphan reconciliation on session resume.
|
||||
//!
|
||||
//! When a process dies mid-subagent, the subagent's `meta.json` is left
|
||||
//! `status: "running"` with no `SubagentFinished` — so on resume the client
|
||||
//! shows it Running forever. `MvpAgent::load_session` heals this: it scans the
|
||||
//! session's `subagents/` dir and flips any stale `running` meta (not tracked by
|
||||
//! the live coordinator) to `cancelled` (mechanism A, the meta pass).
|
||||
//!
|
||||
//! This test spawns a real `grok agent stdio` process, seeds an orphaned
|
||||
//! `running` meta on disk, resumes the session, and asserts the meta was
|
||||
//! reconciled to `cancelled`.
|
||||
//!
|
||||
//! Run locally (needs a pre-built binary):
|
||||
//! ```bash
|
||||
//! cargo test -p kigi-shell --test test_subagent_orphan_reconcile -- --ignored
|
||||
//! ```
|
||||
|
||||
use std::future::Future;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use kigi_test_support::*;
|
||||
|
||||
async fn with_local_set<F, Fut>(f: F)
|
||||
where
|
||||
F: FnOnce() -> Fut,
|
||||
Fut: Future<Output = ()>,
|
||||
{
|
||||
tokio::task::LocalSet::new().run_until(f()).await;
|
||||
}
|
||||
|
||||
/// Find `<home>/sessions/<enc-cwd>/<id>` without depending on the internal cwd
|
||||
/// encoder: scan the one level of cwd dirs for a child named `<id>`.
|
||||
fn locate_session_dir(home: &Path, id: &str) -> PathBuf {
|
||||
let sessions = home.join("sessions");
|
||||
for entry in std::fs::read_dir(&sessions)
|
||||
.expect("read sessions dir")
|
||||
.flatten()
|
||||
{
|
||||
let candidate = entry.path().join(id);
|
||||
if candidate.is_dir() {
|
||||
return candidate;
|
||||
}
|
||||
}
|
||||
panic!(
|
||||
"session dir for {id} not found under {}",
|
||||
sessions.display()
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires pre-built binary
|
||||
async fn resume_reconciles_orphaned_running_subagent() {
|
||||
with_local_set(|| async {
|
||||
let server = MockInferenceServer::start()
|
||||
.await
|
||||
.expect("start mock server");
|
||||
let workdir = git_workdir();
|
||||
|
||||
// Phase 1: create a real session, then take its home so we can seed it.
|
||||
let mut writer = GrokStdioClient::spawn(&server, workdir.path()).await;
|
||||
writer.initialize_with_timeout().await;
|
||||
let session_id = writer.create_session_with_timeout(workdir.path()).await;
|
||||
let shared_home = writer.take_home();
|
||||
drop(writer);
|
||||
|
||||
// Simulate a crash: inject a subagent meta left `running` on disk (no
|
||||
// terminal write, no SubagentFinished) — exactly what a dead process
|
||||
// leaves behind.
|
||||
// GrokStdioClient sets HOME=<temp>; the binary uses <HOME>/.kigi as KIGI_SHARE_DIR.
|
||||
let kigi_home = shared_home.path().join(".kigi");
|
||||
let session_dir = locate_session_dir(&kigi_home, session_id.0.as_ref());
|
||||
let sub_id = "sa-orphan";
|
||||
let meta_path = session_dir.join("subagents").join(sub_id).join("meta.json");
|
||||
std::fs::create_dir_all(meta_path.parent().unwrap()).unwrap();
|
||||
std::fs::write(
|
||||
&meta_path,
|
||||
serde_json::json!({
|
||||
"subagent_id": sub_id,
|
||||
"parent_session_id": session_id.0.as_ref(),
|
||||
"child_session_id": "child-orphan",
|
||||
"subagent_type": "general-purpose",
|
||||
"description": "stuck task",
|
||||
"prompt": "do work",
|
||||
"status": "running",
|
||||
"started_at": chrono::Utc::now().to_rfc3339(),
|
||||
})
|
||||
.to_string(),
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
// Phase 2: resume in a fresh process. `load_session` runs the reconcile.
|
||||
let reader = GrokStdioClient::spawn_with_home(&server, workdir.path(), shared_home).await;
|
||||
reader.initialize_with_timeout().await;
|
||||
let _ = reader
|
||||
.load_session_with_timeout(&session_id, workdir.path())
|
||||
.await;
|
||||
|
||||
// The orphan's on-disk meta must now be terminal (cancelled), not running.
|
||||
let reread: serde_json::Value =
|
||||
serde_json::from_str(&std::fs::read_to_string(&meta_path).expect("read orphan meta"))
|
||||
.expect("parse orphan meta");
|
||||
assert_eq!(
|
||||
reread.get("status").and_then(|s| s.as_str()),
|
||||
Some("cancelled"),
|
||||
"resume must reconcile the orphaned running subagent to cancelled\nstderr:\n{}",
|
||||
stderr_tail(&reader.stderr(), 2000)
|
||||
);
|
||||
})
|
||||
.await;
|
||||
}
|
||||
Reference in New Issue
Block a user