Files
Kigi-CLI/crates/codegen/kigi-shell/tests/test_subagent_orphan_reconcile.rs
T
ZacharyZhang-NY 6f31415ed6 §9 acceptance: grep-zero sweep — every internal x.ai/grok identifier renamed
The PRD's first acceptance gate now holds: grep -RinE '\bx\.ai\b|grok'
crates/ --include='*.rs' → 0 matches (exempt: NOTICE and third-party
license archives, README provenance, and the required 'Based on Grok
Build Open Source' attribution, now sourced from version_attribution.txt).

Wire-visible renames (both sides in this repo, changed in lockstep):
- Auth method id 'grok.com' → 'kimi-code' (AuthMethodKind::KimiCode).
- Every x.ai/* and _x.ai/* ACP ext method and meta key → kigi/* /
  _kigi/* (~200 names; grokShell → kigiShell). Session-file replay keeps
  a read-side alias for the legacy '_x.ai/session/update' method so
  existing updates.jsonl histories load; writes emit only the new name
  (both directions test-pinned).
- Agent types grok-build* → kigi* with a documented legacy-prefix alias
  at resolution time so persisted sessions keep resolving.
- ToolNamespace/BuiltinAgentName GrokBuild* → Kigi* (wire snake_case
  kigi/kigi_concise/kigi_hashline; schema regenerated); grok_build
  implementation dirs renamed to kigi*.
- x-grok-* headers → x-kigi-*, __GROK_* sentinels → __KIGI_*, themes
  grokday/groknight → kigiday/kiginight (old persisted values fall back
  to the default theme), web_fetch allowlist xAI hosts → kimi.com +
  moonshot platforms, changelog CDN → this repo, grok-build changelog
  archives deleted.
- BYOK default endpoint removed: [endpoints] api_base_url is now truly
  optional with NO default — consumers fail fast with the flag name when
  unset (no silent x.ai egress). Mock harnesses inject it explicitly.
- System-prompt identity fixed: 'released by xAI' → 'an unofficial
  community CLI for Kimi' (template + regenerated encrypted form).

Also repaired pre-existing grok-era test debt found by the sweep: the
stale trace_classify default-model pin, the grok-pager UA label test,
pty-harness stale-binary reuse and non-hermetic moonshot routing (a PTY
test could previously reach the real api.moonshot.cn), and the outdated
oauth fixture scope key.

Gates: §9 grep 0; fmt clean; workspace check/clippy 0/0 (-D warnings);
FULL cargo test --workspace: 234 suites, 21,961 passed, 0 failed;
deny advisories ok.
2026-07-18 02:48:46 -04:00

111 lines
4.2 KiB
Rust

//! 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 `kigi 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 = KigiStdioClient::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.
// KigiStdioClient 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 = KigiStdioClient::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;
}