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.
405 lines
13 KiB
Rust
405 lines
13 KiB
Rust
use serde::{Deserialize, Serialize};
|
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
|
#[serde(default)]
|
|
pub struct NotificationConfig {
|
|
pub method: NotificationMethod,
|
|
pub condition: NotificationCondition,
|
|
pub idle_threshold_secs: u64,
|
|
pub events: Vec<NotificationEventKind>,
|
|
pub sleep_prevention: bool,
|
|
pub progress_bar: bool,
|
|
/// Show an automatic "where was I" session recap when you return to the
|
|
/// terminal after being away. Only applies when the shell has rolled out
|
|
/// session recap (`sessionRecap` on ACP initialize / remote settings). Manual
|
|
/// `/recap` is gated by the shell flag alone, not this toggle.
|
|
pub session_recap: bool,
|
|
/// Minimum seconds the terminal must be unfocused ("stepped away") before
|
|
/// the client requests an automatic recap. A short debounce against quick
|
|
/// tab blips; the authoritative timing ("≥3 min since the last completed
|
|
/// turn") is enforced agent-side.
|
|
pub session_recap_threshold_secs: u64,
|
|
pub title: TitleConfig,
|
|
pub hooks: Vec<NotificationHook>,
|
|
}
|
|
|
|
impl Default for NotificationConfig {
|
|
fn default() -> Self {
|
|
Self {
|
|
method: NotificationMethod::default(),
|
|
condition: NotificationCondition::default(),
|
|
idle_threshold_secs: 3,
|
|
events: vec![
|
|
NotificationEventKind::TurnComplete,
|
|
NotificationEventKind::ApprovalRequired,
|
|
],
|
|
sleep_prevention: true,
|
|
progress_bar: true,
|
|
session_recap: true,
|
|
session_recap_threshold_secs: 30,
|
|
title: TitleConfig::default(),
|
|
hooks: Vec::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq, Eq)]
|
|
#[serde(rename_all = "lowercase")]
|
|
pub enum NotificationMethod {
|
|
#[default]
|
|
Auto,
|
|
Osc9,
|
|
Osc99,
|
|
Osc777,
|
|
Bel,
|
|
None,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq, Eq)]
|
|
#[serde(rename_all = "lowercase")]
|
|
pub enum NotificationCondition {
|
|
#[default]
|
|
Unfocused,
|
|
Always,
|
|
Never,
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
|
#[serde(default)]
|
|
pub struct TitleConfig {
|
|
pub enabled: bool,
|
|
pub items: Vec<TitleItem>,
|
|
}
|
|
|
|
impl Default for TitleConfig {
|
|
fn default() -> Self {
|
|
Self {
|
|
enabled: true,
|
|
items: vec![
|
|
TitleItem::ActionRequired,
|
|
TitleItem::Spinner,
|
|
TitleItem::Activity,
|
|
TitleItem::SessionName,
|
|
TitleItem::Kigi,
|
|
],
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
#[serde(rename_all = "kebab-case")]
|
|
pub enum TitleItem {
|
|
Spinner,
|
|
Activity,
|
|
SessionName,
|
|
Cwd,
|
|
Model,
|
|
TurnTimer,
|
|
Kigi,
|
|
ActionRequired,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum NotificationEventKind {
|
|
TurnComplete,
|
|
ApprovalRequired,
|
|
SessionReady,
|
|
TaskComplete,
|
|
AgentError,
|
|
}
|
|
|
|
impl NotificationEventKind {
|
|
pub fn as_str(&self) -> &'static str {
|
|
match self {
|
|
Self::TurnComplete => "Turn complete",
|
|
Self::ApprovalRequired => "Approval required",
|
|
Self::SessionReady => "Session ready",
|
|
Self::TaskComplete => "Task complete",
|
|
Self::AgentError => "Agent error",
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
|
|
pub struct NotificationHook {
|
|
pub command: String,
|
|
#[serde(default)]
|
|
pub events: Vec<NotificationEventKind>,
|
|
#[serde(default = "default_only_unfocused")]
|
|
pub only_unfocused: bool,
|
|
#[serde(default = "default_hook_timeout")]
|
|
pub timeout_secs: u64,
|
|
}
|
|
|
|
fn default_only_unfocused() -> bool {
|
|
true
|
|
}
|
|
|
|
fn default_hook_timeout() -> u64 {
|
|
10
|
|
}
|
|
|
|
impl NotificationConfig {
|
|
/// Generate a commented TOML template for the `[ui.notifications]` section.
|
|
///
|
|
/// Mirrors the pattern used by `RawAppearanceConfig::to_toml_with_comments()`
|
|
/// for `pager.toml`. The output is suitable for inclusion in documentation
|
|
/// or as a starter config snippet.
|
|
pub fn to_toml_with_comments() -> String {
|
|
"\
|
|
[ui.notifications]
|
|
# Notification protocol: auto|osc9|osc99|osc777|bel|none
|
|
# \"auto\" selects the best protocol for your terminal.
|
|
method = \"auto\"
|
|
# When to notify: unfocused|always|never
|
|
# \"unfocused\" only fires when the terminal has lost focus.
|
|
condition = \"unfocused\"
|
|
# Minimum seconds the terminal must be unfocused before notifications fire.
|
|
idle_threshold_secs = 3
|
|
# Events that trigger notifications.
|
|
# Options: turn_complete, approval_required, session_ready, task_complete, agent_error
|
|
events = [\"turn_complete\", \"approval_required\"]
|
|
# Prevent display sleep during agent turns (macOS/Linux).
|
|
sleep_prevention = true
|
|
# Show a progress indicator in the terminal tab (OSC 9;4).
|
|
progress_bar = true
|
|
# Show an automatic \"where was I\" session recap when you return after being away.
|
|
# Shell session_recap is on by default; disable via [features] session_recap or
|
|
# KIGI_SESSION_RECAP=0. Manual /recap uses only the shell flag.
|
|
session_recap = true
|
|
# Minimum seconds unfocused (\"stepped away\") before requesting a recap; a
|
|
# debounce against quick tab blips. The \"3 min since the last turn\" timing is
|
|
# enforced agent-side.
|
|
session_recap_threshold_secs = 30
|
|
|
|
[ui.notifications.title]
|
|
# Set the terminal/tab title to reflect agent state.
|
|
enabled = true
|
|
# Items shown in the title. Options: action-required, spinner, activity,
|
|
# session-name, cwd, model, turn-timer, kigi
|
|
items = [\"action-required\", \"spinner\", \"activity\", \"session-name\", \"kigi\"]
|
|
|
|
# [[ui.notifications.hooks]]
|
|
# command = \"terminal-notifier -title 'Kigi' -message '$KIGI_MESSAGE'\"
|
|
# events = [\"turn_complete\", \"approval_required\"]
|
|
# only_unfocused = true
|
|
# timeout_secs = 10
|
|
"
|
|
.to_owned()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn config_round_trips_through_toml() {
|
|
let config = NotificationConfig {
|
|
method: NotificationMethod::Osc99,
|
|
condition: NotificationCondition::Always,
|
|
idle_threshold_secs: 10,
|
|
events: vec![
|
|
NotificationEventKind::TurnComplete,
|
|
NotificationEventKind::AgentError,
|
|
],
|
|
sleep_prevention: false,
|
|
progress_bar: false,
|
|
session_recap: false,
|
|
session_recap_threshold_secs: 90,
|
|
title: TitleConfig {
|
|
enabled: false,
|
|
items: vec![TitleItem::Kigi, TitleItem::Cwd],
|
|
},
|
|
hooks: vec![NotificationHook {
|
|
command: "notify-send".into(),
|
|
events: vec![NotificationEventKind::TurnComplete],
|
|
only_unfocused: false,
|
|
timeout_secs: 5,
|
|
}],
|
|
};
|
|
|
|
let toml_str = toml::to_string(&config).expect("serialize");
|
|
let parsed: NotificationConfig = toml::from_str(&toml_str).expect("deserialize");
|
|
|
|
assert_eq!(config, parsed);
|
|
}
|
|
|
|
#[test]
|
|
fn missing_fields_use_defaults() {
|
|
let parsed: NotificationConfig = toml::from_str("").expect("deserialize empty");
|
|
|
|
assert_eq!(parsed.method, NotificationMethod::Auto);
|
|
assert_eq!(parsed.condition, NotificationCondition::Unfocused);
|
|
assert_eq!(parsed.idle_threshold_secs, 3);
|
|
assert_eq!(
|
|
parsed.events,
|
|
vec![
|
|
NotificationEventKind::TurnComplete,
|
|
NotificationEventKind::ApprovalRequired,
|
|
]
|
|
);
|
|
assert!(parsed.sleep_prevention);
|
|
assert!(parsed.progress_bar);
|
|
assert!(parsed.session_recap);
|
|
assert_eq!(parsed.session_recap_threshold_secs, 30);
|
|
assert!(parsed.title.enabled);
|
|
assert!(parsed.hooks.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn partial_toml_merges_with_defaults() {
|
|
let toml_str = r#"
|
|
method = "bel"
|
|
idle_threshold_secs = 60
|
|
"#;
|
|
let parsed: NotificationConfig = toml::from_str(toml_str).expect("deserialize partial");
|
|
|
|
assert_eq!(parsed.method, NotificationMethod::Bel);
|
|
assert_eq!(parsed.idle_threshold_secs, 60);
|
|
// Rest should be defaults
|
|
assert_eq!(parsed.condition, NotificationCondition::Unfocused);
|
|
assert!(parsed.sleep_prevention);
|
|
assert!(parsed.progress_bar);
|
|
}
|
|
|
|
#[test]
|
|
fn hook_defaults_applied() {
|
|
let toml_str = r#"
|
|
[[hooks]]
|
|
command = "my-script.sh"
|
|
"#;
|
|
let parsed: NotificationConfig = toml::from_str(toml_str).expect("deserialize hooks");
|
|
|
|
assert_eq!(parsed.hooks.len(), 1);
|
|
let hook = &parsed.hooks[0];
|
|
assert_eq!(hook.command, "my-script.sh");
|
|
assert!(hook.events.is_empty());
|
|
assert!(hook.only_unfocused);
|
|
assert_eq!(hook.timeout_secs, 10);
|
|
}
|
|
|
|
#[test]
|
|
fn all_notification_methods_deserialize() {
|
|
for (input, expected) in [
|
|
("\"auto\"", NotificationMethod::Auto),
|
|
("\"osc9\"", NotificationMethod::Osc9),
|
|
("\"osc99\"", NotificationMethod::Osc99),
|
|
("\"osc777\"", NotificationMethod::Osc777),
|
|
("\"bel\"", NotificationMethod::Bel),
|
|
("\"none\"", NotificationMethod::None),
|
|
] {
|
|
let parsed: NotificationMethod = toml::from_str(&format!("method = {input}\n"))
|
|
.map(|c: MethodWrapper| c.method)
|
|
.unwrap_or_else(|e| panic!("failed to parse {input}: {e}"));
|
|
assert_eq!(parsed, expected, "mismatch for {input}");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn all_conditions_deserialize() {
|
|
for (input, expected) in [
|
|
("\"unfocused\"", NotificationCondition::Unfocused),
|
|
("\"always\"", NotificationCondition::Always),
|
|
("\"never\"", NotificationCondition::Never),
|
|
] {
|
|
let parsed: NotificationCondition = toml::from_str(&format!("condition = {input}\n"))
|
|
.map(|c: ConditionWrapper| c.condition)
|
|
.unwrap_or_else(|e| panic!("failed to parse {input}: {e}"));
|
|
assert_eq!(parsed, expected, "mismatch for {input}");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn title_items_kebab_case() {
|
|
let toml_str = r#"
|
|
[title]
|
|
enabled = true
|
|
items = ["action-required", "turn-timer", "session-name"]
|
|
"#;
|
|
let parsed: NotificationConfig = toml::from_str(toml_str).expect("deserialize");
|
|
assert_eq!(
|
|
parsed.title.items,
|
|
vec![
|
|
TitleItem::ActionRequired,
|
|
TitleItem::TurnTimer,
|
|
TitleItem::SessionName,
|
|
]
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn to_toml_with_comments_contains_all_sections() {
|
|
let toml = NotificationConfig::to_toml_with_comments();
|
|
assert!(toml.contains("[ui.notifications]"));
|
|
assert!(toml.contains("[ui.notifications.title]"));
|
|
assert!(toml.contains("[[ui.notifications.hooks]]"));
|
|
}
|
|
|
|
#[test]
|
|
fn to_toml_with_comments_matches_defaults() {
|
|
let template = NotificationConfig::to_toml_with_comments();
|
|
let defaults = NotificationConfig::default();
|
|
|
|
assert!(
|
|
template.contains(&format!(
|
|
"idle_threshold_secs = {}",
|
|
defaults.idle_threshold_secs
|
|
)),
|
|
"template idle_threshold_secs does not match default"
|
|
);
|
|
assert!(
|
|
template.contains(&format!("sleep_prevention = {}", defaults.sleep_prevention)),
|
|
"template sleep_prevention does not match default"
|
|
);
|
|
assert!(
|
|
template.contains(&format!("progress_bar = {}", defaults.progress_bar)),
|
|
"template progress_bar does not match default"
|
|
);
|
|
assert!(
|
|
template.contains(&format!("enabled = {}", defaults.title.enabled)),
|
|
"template title.enabled does not match default"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn to_toml_with_comments_hook_section_is_valid_toml() {
|
|
let template = NotificationConfig::to_toml_with_comments();
|
|
// Uncomment only TOML structural lines (table headers and key = value).
|
|
// Doc-comment lines (plain English) are left as comments so they
|
|
// don't produce parse errors.
|
|
let uncommented: String = template
|
|
.lines()
|
|
.map(|line| {
|
|
if let Some(stripped) = line.strip_prefix("# ") {
|
|
let trimmed = stripped.trim_start();
|
|
if trimmed.starts_with("[[") || trimmed.contains(" = ") {
|
|
return format!("{stripped}\n");
|
|
}
|
|
}
|
|
format!("{line}\n")
|
|
})
|
|
.collect();
|
|
let parsed: toml::Value =
|
|
toml::from_str(&uncommented).expect("uncommented template should be valid TOML");
|
|
let hooks = parsed
|
|
.get("ui")
|
|
.and_then(|u| u.get("notifications"))
|
|
.and_then(|n| n.get("hooks"))
|
|
.expect("hooks key must exist after uncommenting");
|
|
assert!(hooks.is_array(), "hooks should be an array of tables");
|
|
}
|
|
|
|
// Helper wrappers for single-field deserialization tests
|
|
#[derive(Deserialize)]
|
|
struct MethodWrapper {
|
|
method: NotificationMethod,
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
struct ConditionWrapper {
|
|
condition: NotificationCondition,
|
|
}
|
|
}
|