Files
Kigi-CLI/crates/codegen/kigi-tui/src/app/acp_handler/settings.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

388 lines
16 KiB
Rust

use super::*;
use serde::Deserialize;
/// Handle `kigi/models/update` — model list changed (etag-triggered refresh).
pub(super) fn handle_models_update(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
if let Ok(model_state) = serde_json::from_str::<acp::SessionModelState>(notif.params.get()) {
use crate::acp::model_state::ModelState;
let new_models = ModelState::from(Some(model_state));
tracing::info!(
count = new_models.available.len(),
"models updated via kigi/models/update"
);
let shell_fallback_current = new_models.current.clone();
// Override app-level default with the active agent's model.
let mut app_models = new_models.clone();
if let ActiveView::Agent(id) = app.active_view
&& let Some(agent) = app.agents.get(&id)
&& let Some(ref agent_model) = agent.session.models.current
&& app_models.available.contains_key(agent_model)
{
app_models.current = Some(agent_model.clone());
}
app.models = app_models;
for agent in app.agents.values_mut() {
// Log when an update drops the agent's active model — this is the
// moment the status bar visibly "switches model mid-conversation"
// (the agent falls back to the shell's current model below).
if let Some(ref current) = agent.session.models.current
&& !new_models.available.contains_key(current)
{
tracing::warn!(
current_model = %current.0,
fallback = ?shell_fallback_current.as_ref().map(|m| m.0.as_ref()),
available_count = new_models.available.len(),
"models update removed this agent's current model; falling back"
);
}
agent
.session
.models
.update_catalog(new_models.available.clone(), shell_fallback_current.clone());
}
true
} else {
tracing::warn!("Failed to parse kigi/models/update");
false
}
}
/// Handle `kigi/settings/update` — remote settings refreshed on `/new`.
pub(super) fn handle_settings_update(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
let Ok(update) = serde_json::from_str::<PagerSettingsUpdate>(notif.params.get()) else {
tracing::warn!("Failed to parse kigi/settings/update");
return false;
};
if let Some(v) = update.auto_permission_mode_enabled {
// Keep the pager's auto-permission-mode gate live with the remote settings
// remote tier (the leader caches it agent-side; the pager process needs
// its own copy). Refresh the startup snapshot so the Shift+Tab cycle and
// the settings modal both reflect a remote-only enablement/kill-switch
// without a restart.
kigi_shell::util::config::cache_remote_auto_permission_mode_enabled(Some(v));
app.auto_mode_gate = kigi_shell::util::config::auto_permission_mode_enabled_from_disk();
// Mid-session kill switch: when the gate just went off, drop displayed
// Auto to Ask + clear every agent's per-session flag (shared with the
// startup reconcile), AND tell live sessions to leave Auto. Clearing only
// the display would let the agent keep classifier-approving while the UI
// shows "Ask" — the emergency-off must actually disable enforcement.
if !app.auto_mode_gate {
// Sessions to notify: agents that HAD Auto on (capture before the
// downgrade clears the flag) and have a live session id.
let leaving_auto: Vec<acp::SessionId> = app
.agents
.values()
.filter(|a| a.session.is_auto())
.filter_map(|a| a.session.session_id.clone())
.collect();
super::super::dispatch::downgrade_displayed_auto_if_gated(app);
notify_sessions_leave_auto(app, &leaving_auto);
}
// Reveal/hide `/auto` on every slash surface in lockstep with the gate
// (covers both a mid-session kill-switch and re-enablement).
app.sync_permission_mode_slash_gate();
}
// `permission_mode` is presence-aware (omit / null / string). While the
// soft default still owns the mode, a push re-arms `default_yolo` + UI for
// the next `/new`; once the user claims a mode (Shift+Tab / settings /
// `/mode`) the latch is cleared and pushes leave it alone.
if let Some(remote_opt) = update.permission_mode.as_ref()
&& app.permission_mode_from_soft_default
{
// One config read at the I/O boundary; the applier is deterministic.
let root = kigi_shell::config::load_effective_config().ok();
apply_soft_default_permission_mode(
app,
root.as_ref().and_then(|r| r.get("ui")),
remote_opt.as_deref(),
);
}
if let Some(v) = update.show_resolved_model {
app.show_resolved_model = v;
}
// TODO: extract resolve_session_picker_grouped helper (duplicates event_loop.rs:143-160)
// Respect env var > config > remote precedence (mirrors event_loop.rs startup).
if let Some(remote_val) = update.session_picker_grouped {
let resolved = std::env::var("KIGI_SESSION_PICKER_GROUPED")
.ok()
.and_then(|v| match v.as_str() {
"1" | "true" => Some(true),
"0" | "false" => Some(false),
_ => None,
})
.or_else(|| {
kigi_shell::config::load_effective_config()
.ok()
.and_then(|cfg| cfg.get("cli")?.get("session_picker_grouped")?.as_bool())
})
.unwrap_or(remote_val);
app.session_picker_grouped = resolved;
}
// Load config layers once for tips + group_tool_verbs +
// collapsed_edit_blocks resolution. Loaded unconditionally: the UI flags
// re-resolve on every update (see below), and updates are rare (post-auth
// refresh, `/new`), so three small TOML reads are fine.
let (requirements, user_config, managed_config) = (
kigi_shell::config::load_merged_requirements(),
kigi_shell::config::load_from_disk().ok(),
kigi_shell::config::load_managed_config().ok(),
);
// Local layers may beat remote — re-resolve the full chain into the render
// cache (mirrors the event_loop.rs startup resolve). Runs on None too: the
// shell always publishes this field from its live remote tier, so None
// means remote settings cleared it (or an older shell that cannot deliver the
// remote tier at all) — either way resolving without a remote value is
// correct, and it reverts a previously cached remote enable back to the
// local/default (off) resolution instead of leaving Some(true) stuck
// until restart.
let remote = kigi_shell::util::config::RemoteSettings {
group_tool_verbs: update.group_tool_verbs,
..Default::default()
};
let resolved = kigi_shell::util::config::resolve_group_tool_verbs(
requirements.as_ref(),
user_config.as_ref(),
managed_config.as_ref(),
Some(&remote),
)
.value;
// On a real flip, re-fold every live transcript (mirrors dispatch's
// set_group_tool_verbs_inner); unchanged values keep `/new` cheap.
// Stale expansion ids describe the old grouping shape — drop them so the
// re-fold can't reopen a verb slot expanded or mark a coincident dense
// group expanded (see `clear_group_expansion`).
if resolved != crate::appearance::cache::load_group_tool_verbs() {
crate::appearance::cache::set_group_tool_verbs(resolved);
for agent in app.agents.values_mut() {
agent.scrollback.clear_group_expansion();
agent.scrollback.invalidate_heights();
for child in agent.subagent_views.values_mut() {
child.scrollback.clear_group_expansion();
child.scrollback.invalidate_heights();
}
}
}
// Same None-reverts contract as group_tool_verbs above: re-resolve the
// full local chain with the pushed remote tier so a cleared remote settings
// field falls back to local/default instead of staying latched.
let remote = kigi_shell::util::config::RemoteSettings {
collapsed_edit_blocks: update.collapsed_edit_blocks,
..Default::default()
};
let resolved = kigi_shell::util::config::resolve_collapsed_edit_blocks(
requirements.as_ref(),
user_config.as_ref(),
managed_config.as_ref(),
Some(&remote),
)
.value;
// On a real flip, re-materialize on-default Edit rows + repaint suffixes
// in every live transcript (mirrors dispatch's
// set_collapsed_edit_blocks_inner); unchanged values keep `/new` cheap.
let prev = crate::appearance::cache::load_collapsed_edit_blocks();
if resolved != prev {
crate::appearance::cache::set_collapsed_edit_blocks(resolved);
for agent in app.agents.values_mut() {
agent
.scrollback
.apply_collapsed_edit_blocks_flip(prev, resolved);
for child in agent.subagent_views.values_mut() {
child
.scrollback
.apply_collapsed_edit_blocks_flip(prev, resolved);
}
}
}
// Re-resolve tips from config layers + the updated remote tips.
if let Some(remote_tips) = update.tips {
use kigi_shell::util::config::resolve_tips;
app.tips = resolve_tips(
requirements.as_ref(),
user_config.as_ref(),
managed_config.as_ref(),
Some(&remote_tips),
);
if !app.tips.is_empty() {
let kigi_home = kigi_tools::util::kigi_home::kigi_home();
app.tip = kigi_shell::util::tips::pick_and_advance(&app.tips, &kigi_home);
} else {
app.tip = None;
}
}
tracing::info!("settings updated via kigi/settings/update");
true
}
/// Re-arm the soft-defaulted launch mode from a pushed `permission_mode`
/// (TOML `[ui]` > remote > Ask), for the next `/new` only — live sessions are
/// untouched and nothing is persisted. `effective_ui` is injected so the
/// resolve is deterministic under test. Enforcement gating reuses the app's
/// startup snapshots (`yolo_policy_block`, `auto_mode_gate`); the agent's
/// permission manager re-clamps authoritatively at decision time.
pub(super) fn apply_soft_default_permission_mode(
app: &mut AppView,
effective_ui: Option<&toml::Value>,
remote: Option<&str>,
) {
let mode = kigi_shell::util::config::resolve_permission_mode(effective_ui, remote);
app.default_yolo = mode.is_always_approve() && app.yolo_policy_block.is_none();
let auto = mode.is_auto() && app.auto_mode_gate && !app.default_yolo;
app.current_ui.permission_mode = Some(if auto {
"auto".to_string()
} else if app.default_yolo {
"always-approve".to_string()
} else {
kigi_shell::util::config::resolved_display_permission_mode(effective_ui, remote).to_string()
});
}
/// Tell live sessions to leave Auto on the mid-session kill-switch: fire the
/// `kigi/yolo_mode_changed` notification the agent maps to
/// `SetAutoMode { enabled: false }`, fire-and-forget over the shared ACP channel.
/// The notification is CLIENT-scoped (the agent applies it to every session of
/// the sending client), so one send covers all affected sessions. `yolo_mode` is
/// deliberately OMITTED — the agent skips the yolo branch when the key is absent,
/// so a sibling tab's always-approve is preserved; only auto is cleared.
pub(super) fn notify_sessions_leave_auto(app: &AppView, session_ids: &[acp::SessionId]) {
if session_ids.is_empty() {
return;
}
let params = serde_json::json!({
"auto_mode": false,
"permission_mode": "ask",
});
let notification = acp::ExtNotification::new(
"kigi/yolo_mode_changed",
serde_json::value::to_raw_value(&params)
.expect("serialize yolo_mode_changed params")
.into(),
);
let (response_tx, _response_rx) = tokio::sync::oneshot::channel();
let args = kigi_acp_lib::AcpArgs {
request: notification,
response_tx,
};
let _ = app.acp_tx.send(args.into());
}
/// Handle `kigi/sessions/changed` — the leader broadcasts roster
/// upserts/removals to all clients (FleetView dashboard).
pub(super) fn handle_sessions_changed(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
let Ok(changed) = serde_json::from_str::<crate::app::roster::RosterChanged>(notif.params.get())
else {
tracing::warn!("Failed to parse kigi/sessions/changed");
return false;
};
let mut affected = false;
for entry in changed.upserted {
app.upsert_roster_entry(entry);
affected = true;
}
for sid in changed.removed {
app.remove_roster_entry(&sid);
affected = true;
}
affected
}
/// Deserialization type for the `kigi/settings/update` notification payload.
///
/// This is intentionally a separate struct from `SettingsUpdateNotification` in
/// `kigi-shell/src/agent/mvp_agent.rs`. The shell side derives `Serialize`
/// and owns the canonical field set from `RemoteSettings`; this pager side
/// derives `Deserialize` and selectively consumes only the fields relevant to
/// the TUI. Keeping them separate avoids coupling the pager to shell internals
/// and lets each side evolve independently (e.g. adding a shell-only field
/// doesn't require a pager change). All fields are `Option` with
/// `#[serde(default)]` so that partial updates and forward-compatible additions
/// are handled gracefully.
///
/// **Keep in sync** with field names/types in `SettingsUpdateNotification` at
/// `kigi-shell/src/agent/mvp_agent.rs` when adding fields that both sides
/// need.
#[derive(serde::Deserialize)]
pub(super) struct PagerSettingsUpdate {
#[serde(default)]
show_resolved_model: Option<bool>,
#[serde(default)]
session_picker_grouped: Option<bool>,
#[serde(default)]
tips: Option<Vec<String>>,
#[serde(default)]
auto_permission_mode_enabled: Option<bool>,
/// Soft-default permission mode. Presence-aware: omit = no update,
/// `null` = recompute with remote=None, string = that soft-default.
/// Omission happens with older shells that predate the field (they can
/// never clear a mode they don't know about) — that version skew is why
/// this is tri-state instead of a plain `Option`.
#[serde(default, deserialize_with = "deserialize_presence_aware_string")]
permission_mode: Option<Option<String>>,
#[serde(default)]
group_tool_verbs: Option<bool>,
#[serde(default)]
collapsed_edit_blocks: Option<bool>,
}
/// Presence-aware string: omit → `None` (`#[serde(default)]`), null →
/// `Some(None)`, string → `Some(Some(_))`.
fn deserialize_presence_aware_string<'de, D>(
deserializer: D,
) -> Result<Option<Option<String>>, D::Error>
where
D: serde::Deserializer<'de>,
{
Ok(Some(Option::<String>::deserialize(deserializer)?))
}
#[cfg(test)]
mod presence_aware_dto_tests {
use super::*;
#[derive(Deserialize)]
struct Probe {
#[serde(default, deserialize_with = "deserialize_presence_aware_string")]
permission_mode: Option<Option<String>>,
}
#[test]
fn permission_mode_dto_distinguishes_omit_from_null() {
let omit: Probe = serde_json::from_value(serde_json::json!({
"show_resolved_model": true,
}))
.unwrap();
assert_eq!(omit.permission_mode, None, "omit must be None (no update)");
let null_v: Probe = serde_json::from_value(serde_json::json!({
"permission_mode": null,
}))
.unwrap();
assert_eq!(
null_v.permission_mode,
Some(None),
"explicit null must be Some(None)"
);
let some_v: Probe = serde_json::from_value(serde_json::json!({
"permission_mode": "always-approve",
}))
.unwrap();
assert_eq!(
some_v.permission_mode,
Some(Some("always-approve".into())),
"string must be Some(Some(_))"
);
}
}