Files
Kigi-CLI/crates/codegen/kigi-tools/src/util/env.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

82 lines
2.9 KiB
Rust

//! Environment variable helpers and process isolation for terminal execution.
//!
//! All implementations now live in the lightweight [`kigi_tty_utils`] crate
//! so that every crate in the workspace can use them without pulling in the
//! heavyweight `kigi-tools` dependency. This module re-exports the public
//! API for backward compatibility.
pub use kigi_tty_utils::{detach_from_tty, pager_env};
/// Env var set on agent-spawned terminal processes so host tools (e.g. `x ban`)
/// can distinguish agent invocations from human interactive shells.
/// Note: the CLI also uses `KIGI_AGENT` as an
/// optional agent-definition selector for launching `kigi` itself; child terminal
/// processes only need the sentinel value `"1"`.
pub const KIGI_AGENT_ENV: &str = "KIGI_AGENT";
/// Sentinel value for [`KIGI_AGENT_ENV`] on agent tool terminals.
pub const KIGI_AGENT_ENV_VALUE: &str = "1";
/// Force `KIGI_AGENT=1` on an agent terminal child so request/login env cannot
/// clear the agent marker.
pub fn apply_kigi_agent_marker(cmd: &mut tokio::process::Command) {
cmd.env(KIGI_AGENT_ENV, KIGI_AGENT_ENV_VALUE);
}
/// Expand the four plugin-path tokens (`${CLAUDE_PLUGIN_ROOT}` / `${KIGI_PLUGIN_ROOT}`
/// and `${CLAUDE_PLUGIN_DATA}` / `${KIGI_PLUGIN_DATA}`) in `s`. Each pair is expanded
/// only when its value is provided. Single source of truth for plugin agent bodies,
/// plugin skill/command bodies, and plugin MCP/hook config substitution.
pub fn substitute_plugin_tokens(
s: &str,
plugin_root: Option<&str>,
plugin_data: Option<&str>,
) -> String {
let mut out = s.to_string();
if let Some(root) = plugin_root {
out = out
.replace("${CLAUDE_PLUGIN_ROOT}", root)
.replace("${KIGI_PLUGIN_ROOT}", root);
}
if let Some(data) = plugin_data {
out = out
.replace("${CLAUDE_PLUGIN_DATA}", data)
.replace("${KIGI_PLUGIN_DATA}", data);
}
out
}
#[cfg(test)]
mod tests {
use super::{KIGI_AGENT_ENV, KIGI_AGENT_ENV_VALUE, substitute_plugin_tokens};
const ALL_TOKENS: &str = "${CLAUDE_PLUGIN_ROOT}/a ${KIGI_PLUGIN_ROOT}/b ${CLAUDE_PLUGIN_DATA}/c ${KIGI_PLUGIN_DATA}/d";
#[test]
fn expands_all_four_tokens_when_both_provided() {
let out = substitute_plugin_tokens(ALL_TOKENS, Some("/root"), Some("/data"));
assert_eq!(out, "/root/a /root/b /data/c /data/d");
}
#[test]
fn leaves_tokens_literal_when_both_none() {
let out = substitute_plugin_tokens(ALL_TOKENS, None, None);
assert_eq!(out, ALL_TOKENS);
}
#[test]
fn expands_only_root_when_data_none() {
let out = substitute_plugin_tokens(ALL_TOKENS, Some("/root"), None);
assert_eq!(
out,
"/root/a /root/b ${CLAUDE_PLUGIN_DATA}/c ${KIGI_PLUGIN_DATA}/d"
);
}
#[test]
fn agent_marker_constants_match_cursor_parity() {
assert_eq!(KIGI_AGENT_ENV, "KIGI_AGENT");
assert_eq!(KIGI_AGENT_ENV_VALUE, "1");
}
}