diff --git a/src/apps/cli/src/modes/chat/external_editor.rs b/src/apps/cli/src/modes/chat/external_editor.rs
index ec27b3901d..0cd228a675 100644
--- a/src/apps/cli/src/modes/chat/external_editor.rs
+++ b/src/apps/cli/src/modes/chat/external_editor.rs
@@ -1,4 +1,6 @@
-use std::ffi::{OsStr, OsString};
+#[cfg(windows)]
+use std::ffi::OsStr;
+use std::ffi::OsString;
 use std::io::Write;
 use std::path::PathBuf;
 use std::process::{Command, Stdio};
diff --git a/src/apps/cli/src/runtime/mod.rs b/src/apps/cli/src/runtime/mod.rs
index c4bf40ce7b..98cca53f14 100644
--- a/src/apps/cli/src/runtime/mod.rs
+++ b/src/apps/cli/src/runtime/mod.rs
@@ -118,10 +118,6 @@ impl CliRuntimeContext {
         &self.agent_runtime
     }
 
-    pub(crate) fn agent_event_source(&self) -> AgentEventSource {
-        self._agent_event_queue_owner.runtime_source()
-    }
-
     pub(crate) fn compatibility(&self) -> &CoreAgentRuntimeCompatibility {
         &self.compatibility
     }
diff --git a/src/apps/cli/src/ui/startup.rs b/src/apps/cli/src/ui/startup.rs
index 79e9708604..bb81dcea81 100644
--- a/src/apps/cli/src/ui/startup.rs
+++ b/src/apps/cli/src/ui/startup.rs
@@ -30,7 +30,6 @@ use crate::config::CliConfig;
 /// - Model/Agent/Session/Skill/Subagent selector popups
 /// - Random tips
 use anyhow::{anyhow, Result};
-use bitfun_core_types::model::ModelMutation;
 use bitfun_product_domains::agent_catalog::{SkillSummary, SubagentSummary};
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 use ratatui::{