ZacharyZhang-NY
6f31415ed6
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.
47 lines
1.8 KiB
Rust
47 lines
1.8 KiB
Rust
//! General subprocess plumbing shared by the harnesses in this crate.
|
|
|
|
use std::sync::Arc;
|
|
|
|
/// Pipe all three stdio handles, `kill_on_drop`, spawn, and drain the child's
|
|
/// stderr into the returned buffer on a background task. The one spawn path
|
|
/// shared by every subprocess harness in this crate (`KigiStdioClient`,
|
|
/// `RawStdioClient`, `leader::LeaderStdioClient`); env/args stay with the
|
|
/// callers, whose hermeticity models differ (sandbox-inherit vs `env_clear`).
|
|
/// The drain future is `Send`, so this works on and off a `LocalSet`.
|
|
pub(crate) fn spawn_piped_with_stderr_capture(
|
|
mut cmd: tokio::process::Command,
|
|
) -> (tokio::process::Child, Arc<std::sync::Mutex<Vec<u8>>>) {
|
|
cmd.stdin(std::process::Stdio::piped())
|
|
.stdout(std::process::Stdio::piped())
|
|
.stderr(std::process::Stdio::piped())
|
|
.kill_on_drop(true);
|
|
|
|
// Derived from `cmd` itself so the panic can never name a different binary
|
|
// than the one actually spawned.
|
|
let program = cmd.as_std().get_program().to_string_lossy().into_owned();
|
|
let mut child = cmd
|
|
.spawn()
|
|
.unwrap_or_else(|e| panic!("failed to spawn kigi at {program}: {e}"));
|
|
|
|
let stderr = Arc::new(std::sync::Mutex::new(Vec::new()));
|
|
let stderr_capture = stderr.clone();
|
|
let mut child_stderr = child.stderr.take().expect("child stderr missing");
|
|
tokio::spawn(async move {
|
|
use tokio::io::AsyncReadExt as _;
|
|
|
|
let mut buf = [0_u8; 1024];
|
|
loop {
|
|
match child_stderr.read(&mut buf).await {
|
|
Ok(0) => break,
|
|
Ok(read) => stderr_capture
|
|
.lock()
|
|
.unwrap()
|
|
.extend_from_slice(&buf[..read]),
|
|
Err(_) => break,
|
|
}
|
|
}
|
|
});
|
|
|
|
(child, stderr)
|
|
}
|