deps: update @tauri-apps/plugin-fs to 2.5.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hikari-desktop",
-  "version": "1.15.0",
+  "version": "1.14.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -56,7 +56,7 @@
     "@tauri-apps/api": "2.10.1",
     "@tauri-apps/plugin-clipboard-manager": "2.3.2",
     "@tauri-apps/plugin-dialog": "2.6.0",
-    "@tauri-apps/plugin-fs": "2.4.5",
+    "@tauri-apps/plugin-fs": "2.5.0",
     "@tauri-apps/plugin-notification": "2.3.3",
     "@tauri-apps/plugin-opener": "2.5.3",
     "@tauri-apps/plugin-os": "2.3.2",

pnpm-lock.yaml

@@ -96,8 +96,8 @@ importers:
         specifier: 2.6.0
         version: 2.6.0
       '@tauri-apps/plugin-fs':
-        specifier: 2.4.5
+        specifier: 2.5.0
-        version: 2.4.5
+        version: 2.5.0
       '@tauri-apps/plugin-notification':
         specifier: 2.3.3
         version: 2.3.3
@@ -993,8 +993,8 @@ packages:
   '@tauri-apps/plugin-dialog@2.6.0':
     resolution: {integrity: sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg==}
 
-  '@tauri-apps/plugin-fs@2.4.5':
+  '@tauri-apps/plugin-fs@2.5.0':
-    resolution: {integrity: sha512-dVxWWGE6VrOxC7/jlhyE+ON/Cc2REJlM35R3PJX3UvFw2XwYhLGQVAIyrehenDdKjotipjYEVc4YjOl3qq90fA==}
+    resolution: {integrity: sha512-c83kbz61AK+rKjhS+je9+stIO27nXj7p9cqeg36TwkIUtxpCFTttlHHtqon6h6FN54cXjyAjlMPOJcW3mwE5XQ==}
 
   '@tauri-apps/plugin-notification@2.3.3':
     resolution: {integrity: sha512-Zw+ZH18RJb41G4NrfHgIuofJiymusqN+q8fGUIIV7vyCH+5sSn5coqRv/MWB9qETsUs97vmU045q7OyseCV3Qg==}
@@ -2935,7 +2935,7 @@ snapshots:
     dependencies:
       '@tauri-apps/api': 2.10.1
 
-  '@tauri-apps/plugin-fs@2.4.5':
+  '@tauri-apps/plugin-fs@2.5.0':
     dependencies:
       '@tauri-apps/api': 2.10.1
 

src-tauri/Cargo.lock

@@ -1648,7 +1648,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hikari-desktop"
-version = "1.15.0"
+version = "1.14.0"
 dependencies = [
  "chrono",
  "dirs 5.0.1",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hikari-desktop"
-version = "1.15.0"
+version = "1.14.0"
 description = "Hikari - Claude Code Visual Assistant"
 authors = ["Naomi Carrigan"]
 edition = "2021"

src-tauri/src/config.rs

@@ -70,16 +70,6 @@ pub struct ClaudeStartOptions {
     /// Sets `ANTHROPIC_CUSTOM_MODEL_OPTION` env var for custom model providers (v2.1.81+).
     #[serde(default)]
     pub custom_model_option: Option<String>,
-
-    /// Passes `--effort <level>` to set the effort level (v2.1.111+).
-    /// Valid values: "low", "medium", "high", "xhigh" (Opus 4.7 only), "max". None uses CLI default.
-    #[serde(default)]
-    pub effort_level: Option<String>,
-
-    /// Sets `ENABLE_PROMPT_CACHING_1H=1` or `FORCE_PROMPT_CACHING_5M=1` env var (v2.1.108+).
-    /// Values: "1h" → 1-hour TTL, "5m" → force 5-minute TTL. None uses CLI default.
-    #[serde(default)]
-    pub prompt_caching_ttl: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -246,16 +236,6 @@ pub struct HikariConfig {
     /// Sets `ANTHROPIC_CUSTOM_MODEL_OPTION` env var for custom model providers (v2.1.81+).
     #[serde(default)]
     pub custom_model_option: Option<String>,
-
-    /// Passes `--effort <level>` to set the effort level (v2.1.111+).
-    /// Valid values: "low", "medium", "high", "xhigh" (Opus 4.7 only), "max". None uses CLI default.
-    #[serde(default)]
-    pub effort_level: Option<String>,
-
-    /// Sets `ENABLE_PROMPT_CACHING_1H=1` or `FORCE_PROMPT_CACHING_5M=1` env var (v2.1.108+).
-    /// Values: "1h" → 1-hour TTL, "5m" → force 5-minute TTL. None uses CLI default.
-    #[serde(default)]
-    pub prompt_caching_ttl: Option<String>,
 }
 
 impl Default for HikariConfig {
@@ -311,8 +291,6 @@ impl Default for HikariConfig {
             bare_mode: false,
             show_clear_context_on_plan_accept: true,
             custom_model_option: None,
-            effort_level: None,
-            prompt_caching_ttl: None,
         }
     }
 }
@@ -530,8 +508,6 @@ mod tests {
             bare_mode: false,
             show_clear_context_on_plan_accept: true,
             custom_model_option: None,
-            effort_level: None,
-            prompt_caching_ttl: None,
         };
 
         let json = serde_json::to_string(&config).unwrap();

src-tauri/src/sessions.rs

@@ -81,7 +81,7 @@ pub async fn list_sessions(app: AppHandle) -> Result<Vec<SessionListItem>, Strin
     let mut items: Vec<SessionListItem> = sessions.iter().map(SessionListItem::from).collect();
 
     // Sort by last activity, most recent first
-    items.sort_by_key(|b| std::cmp::Reverse(b.last_activity_at));
+    items.sort_by(|a, b| b.last_activity_at.cmp(&a.last_activity_at));
 
     Ok(items)
 }
@@ -132,7 +132,7 @@ pub async fn search_sessions(app: AppHandle, query: String) -> Result<Vec<Sessio
         .collect();
 
     // Sort by last activity, most recent first
-    matching.sort_by_key(|b| std::cmp::Reverse(b.last_activity_at));
+    matching.sort_by(|a, b| b.last_activity_at.cmp(&a.last_activity_at));
 
     Ok(matching)
 }
@@ -348,7 +348,7 @@ mod tests {
         ];
 
         // Sort by last activity, most recent first (mimics list_sessions behavior)
-        sessions.sort_by_key(|b| std::cmp::Reverse(b.last_activity_at));
+        sessions.sort_by(|a, b| b.last_activity_at.cmp(&a.last_activity_at));
 
         assert_eq!(sessions[0].id, "new");
         assert_eq!(sessions[1].id, "old");

src-tauri/src/stats.rs

@@ -86,10 +86,9 @@ impl ContextWarning {
 /// Get the context window limit (in tokens) for a given model
 fn get_context_window_limit(model: &str) -> u64 {
     match model {
-        // Claude 4.7 - 1M token context window
+        // Claude 4.6 family
-        "claude-opus-4-7" => 1_000_000,
+        "claude-opus-4-6" => 200_000,
-        // Claude 4.6 family - 1M token context window
+        "claude-sonnet-4-6" => 1_000_000, // 1M token context window
-        "claude-opus-4-6" | "claude-sonnet-4-6" => 1_000_000,
         // Claude 4.5 family - 200K standard context
         "claude-opus-4-5-20251101"
         | "claude-sonnet-4-5-20250929"
@@ -491,7 +490,7 @@ fn is_consecutive_day(prev_date: &str, current_date: &str) -> bool {
     }
 }
 
-// Pricing as of May 2026
+// Pricing as of February 2026
 // https://platform.claude.com/docs/en/about-claude/models/overview
 // Cache pricing: https://platform.claude.com/docs/en/build-with-claude/prompt-caching
 pub fn calculate_cost(
@@ -502,17 +501,14 @@ pub fn calculate_cost(
     cache_read_tokens: Option<u64>,
 ) -> f64 {
     let (input_price_per_million, output_price_per_million) = match model {
-        // Current generation (Claude 4.7/4.6/4.5)
+        // Current generation (Claude 4.6)
-        "claude-opus-4-7" => (5.0, 25.0),
-        "claude-sonnet-4-6" => (3.0, 15.0),
-        "claude-haiku-4-5-20251001" => (1.0, 5.0),
-
-        // Previous generation (Claude 4.6)
         "claude-opus-4-6" => (5.0, 25.0),
+        "claude-sonnet-4-6" => (3.0, 15.0),
 
         // Previous generation (Claude 4.5)
         "claude-opus-4-5-20251101" => (5.0, 25.0),
         "claude-sonnet-4-5-20250929" => (3.0, 15.0),
+        "claude-haiku-4-5-20251001" => (1.0, 5.0),
 
         // Previous generation (Claude 4.x)
         "claude-opus-4-1-20250805" => (15.0, 75.0),
@@ -685,15 +681,6 @@ mod tests {
         assert!((cost - 0.165).abs() < 0.0001);
     }
 
-    #[test]
-    fn test_cost_calculation_opus_47() {
-        let cost = calculate_cost(1000, 2000, "claude-opus-4-7", None, None);
-        // Opus 4.7 pricing: $5/MTok input, $25/MTok output
-        // 1000 input tokens = $0.005, 2000 output tokens = $0.05
-        // Total = $0.055
-        assert!((cost - 0.055).abs() < 0.0001);
-    }
-
     #[test]
     fn test_cost_calculation_opus_45() {
         let cost = calculate_cost(1000, 2000, "claude-opus-4-5-20251101", None, None);
@@ -1032,16 +1019,6 @@ mod tests {
     // Context Window Tracking tests
     // =====================
 
-    #[test]
-    fn test_context_window_limit_opus_47() {
-        assert_eq!(get_context_window_limit("claude-opus-4-7"), 1_000_000);
-    }
-
-    #[test]
-    fn test_context_window_limit_opus_46() {
-        assert_eq!(get_context_window_limit("claude-opus-4-6"), 1_000_000);
-    }
-
     #[test]
     fn test_context_window_limit_claude_4() {
         assert_eq!(get_context_window_limit("claude-opus-4-5-20251101"), 200_000);

src-tauri/src/types.rs

@@ -98,10 +98,6 @@ pub enum ClaudeMessage {
         /// Output style hint from Claude Code (v2.1.81+). Informational only.
         #[serde(default)]
         output_style: Option<String>,
-        /// Plugin errors from Claude Code (v2.1.111+). Populated when plugins are demoted
-        /// due to unsatisfied dependencies.
-        #[serde(default)]
-        plugin_errors: Option<serde_json::Value>,
     },
     #[serde(rename = "assistant")]
     Assistant {
@@ -334,14 +330,6 @@ pub struct PostCompactEvent {
     pub conversation_id: Option<String>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PreCompactEvent {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub session_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub conversation_id: Option<String>,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CwdChangedEvent {
     pub cwd: String,
@@ -802,30 +790,6 @@ mod tests {
         assert!(!serialized.contains("conversation_id"));
     }
 
-    #[test]
-    fn test_pre_compact_event_serialization() {
-        let event = PreCompactEvent {
-            session_id: Some("sess-abc".to_string()),
-            conversation_id: Some("conv-123".to_string()),
-        };
-
-        let serialized = serde_json::to_string(&event).unwrap();
-        assert!(serialized.contains("\"session_id\":\"sess-abc\""));
-        assert!(serialized.contains("\"conversation_id\":\"conv-123\""));
-    }
-
-    #[test]
-    fn test_pre_compact_event_omits_none_fields() {
-        let event = PreCompactEvent {
-            session_id: None,
-            conversation_id: None,
-        };
-
-        let serialized = serde_json::to_string(&event).unwrap();
-        assert!(!serialized.contains("session_id"));
-        assert!(!serialized.contains("conversation_id"));
-    }
-
     #[test]
     fn test_cwd_changed_event_serialization() {
         let event = CwdChangedEvent {
@@ -981,44 +945,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_system_init_with_plugin_errors() {
-        let json = r#"{"type":"system","subtype":"init","session_id":"sess-1","plugin_errors":["Plugin 'foo' requires 'bar' which is not installed","Plugin 'baz' failed to load"]}"#;
-        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
-        if let ClaudeMessage::System { plugin_errors, .. } = msg {
-            let errors = plugin_errors.expect("plugin_errors should be present");
-            let arr = errors.as_array().expect("plugin_errors should be an array");
-            assert_eq!(arr.len(), 2);
-            assert_eq!(arr[0].as_str(), Some("Plugin 'foo' requires 'bar' which is not installed"));
-        } else {
-            panic!("Expected System variant");
-        }
-    }
-
-    #[test]
-    fn test_system_init_without_plugin_errors() {
-        let json = r#"{"type":"system","subtype":"init","session_id":"sess-1"}"#;
-        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
-        if let ClaudeMessage::System { plugin_errors, .. } = msg {
-            assert!(plugin_errors.is_none());
-        } else {
-            panic!("Expected System variant");
-        }
-    }
-
-    #[test]
-    fn test_system_init_with_empty_plugin_errors() {
-        let json = r#"{"type":"system","subtype":"init","session_id":"sess-1","plugin_errors":[]}"#;
-        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
-        if let ClaudeMessage::System { plugin_errors, .. } = msg {
-            let errors = plugin_errors.expect("plugin_errors should be present");
-            let arr = errors.as_array().expect("plugin_errors should be an array");
-            assert!(arr.is_empty());
-        } else {
-            panic!("Expected System variant");
-        }
-    }
-
     #[test]
     fn test_result_message_with_fast_mode_state() {
         let json = r#"{"type":"result","subtype":"success","fast_mode_state":"enabled"}"#;

src-tauri/src/wsl_bridge.rs

@@ -17,7 +17,7 @@ use crate::types::{
     AgentEndEvent, AgentStartEvent, CharacterState, ClaudeMessage, ConnectionEvent,
     ConnectionStatus, ContentBlock, CwdChangedEvent, ElicitationEvent, ElicitationResultEvent,
     FileChangedEvent, MessageCost, OutputEvent, PermissionDeniedEvent, PermissionPromptEvent,
-    PermissionPromptEventItem, PostCompactEvent, PreCompactEvent, QuestionOption, SessionEvent, StateChangeEvent,
+    PermissionPromptEventItem, PostCompactEvent, QuestionOption, SessionEvent, StateChangeEvent,
     StopFailureEvent, TaskCreatedEvent, TodoItem, TodoUpdateEvent, UserQuestionEvent,
     WorkingDirectoryEvent, WorktreeEvent, WorktreeInfo,
 };
@@ -308,14 +308,6 @@ impl WslBridge {
                 cmd.arg("--bare");
             }
 
-            // Add effort level if specified (v2.1.111+)
-            if let Some(ref level) = options.effort_level {
-                if !level.is_empty() {
-                    cmd.arg("--effort");
-                    cmd.arg(level);
-                }
-            }
-
             // Pass combined settings via --settings flag if any settings are specified
             {
                 let has_memory_dir = options
@@ -410,15 +402,6 @@ impl WslBridge {
                 }
             }
 
-            // Set prompt caching TTL env var if specified (v2.1.108+)
-            if let Some(ref ttl) = options.prompt_caching_ttl {
-                match ttl.as_str() {
-                    "1h" => { cmd.env("ENABLE_PROMPT_CACHING_1H", "1"); }
-                    "5m" => { cmd.env("FORCE_PROMPT_CACHING_5M", "1"); }
-                    _ => {}
-                }
-            }
-
             cmd
         } else {
             // Running on Windows - use wsl with bash login shell to ensure PATH is loaded
@@ -494,15 +477,6 @@ impl WslBridge {
                 }
             }
 
-            // Set prompt caching TTL env var if specified (v2.1.108+)
-            if let Some(ref ttl) = options.prompt_caching_ttl {
-                match ttl.as_str() {
-                    "1h" => { claude_cmd.push_str("ENABLE_PROMPT_CACHING_1H=1 "); }
-                    "5m" => { claude_cmd.push_str("FORCE_PROMPT_CACHING_5M=1 "); }
-                    _ => {}
-                }
-            }
-
             claude_cmd.push_str(
                 "claude --output-format stream-json --input-format stream-json --verbose",
             );
@@ -558,13 +532,6 @@ impl WslBridge {
                 claude_cmd.push_str(" --bare");
             }
 
-            // Add effort level if specified (v2.1.111+)
-            if let Some(ref level) = options.effort_level {
-                if !level.is_empty() {
-                    claude_cmd.push_str(&format!(" --effort {}", level));
-                }
-            }
-
             // Pass combined settings via --settings flag if any settings are specified
             {
                 let has_memory_dir = options
@@ -920,9 +887,10 @@ impl WslBridge {
             let stats = self.stats.read();
             for tool_name in &tools {
                 if let Some(tool_stats) = stats.session_tools_usage.get(tool_name) {
-                    if let Some(avg_tokens) = (tool_stats.estimated_input_tokens + tool_stats.estimated_output_tokens)
+                    if tool_stats.call_count > 0 {
-                        .checked_div(tool_stats.call_count)
+                        // Use session average tokens per call for this tool
-                    {
+                        let avg_tokens = (tool_stats.estimated_input_tokens + tool_stats.estimated_output_tokens)
+                            / tool_stats.call_count;
                         tool_overhead_tokens += avg_tokens;
                         tracing::info!("[COST ESTIMATION] Tool {} average: {} tokens", tool_name, avg_tokens);
                     }
@@ -1172,7 +1140,6 @@ fn handle_stderr(
                 let is_elicitation = line.contains("[Elicitation Hook]");
                 let is_elicitation_result = line.contains("[ElicitationResult Hook]");
                 let is_stop_failure = line.contains("[StopFailure Hook]");
-                let is_pre_compact = line.contains("[PreCompact Hook]");
                 let is_post_compact = line.contains("[PostCompact Hook]");
                 let is_cwd_changed = line.contains("[CwdChanged Hook]");
                 let is_file_changed = line.contains("[FileChanged Hook]");
@@ -1187,7 +1154,7 @@ fn handle_stderr(
                     "elicitation"
                 } else if is_stop_failure {
                     "error"
-                } else if is_pre_compact || is_post_compact {
+                } else if is_post_compact {
                     "compact-prompt"
                 } else if is_cwd_changed {
                     "cwd-changed"
@@ -1313,28 +1280,6 @@ fn handle_stderr(
                             parent_tool_use_id: None,
                         },
                     );
-                } else if is_pre_compact {
-                    let data = parse_pre_compact_hook(&line);
-
-                    let _ = app.emit(
-                        "claude:pre-compact",
-                        PreCompactEvent {
-                            session_id: data.session_id,
-                            conversation_id: conversation_id.clone(),
-                        },
-                    );
-
-                    let _ = app.emit(
-                        "claude:output",
-                        OutputEvent {
-                            line_type: "compact-prompt".to_string(),
-                            content: "Compacting context — conversation history is being summarised to free up space.".to_string(),
-                            tool_name: None,
-                            conversation_id: conversation_id.clone(),
-                            cost: None,
-                            parent_tool_use_id: None,
-                        },
-                    );
                 } else if is_post_compact {
                     let data = parse_post_compact_hook(&line);
 
@@ -1678,16 +1623,6 @@ fn build_stop_failure_message(data: &StopFailureData) -> String {
     }
 }
 
-#[derive(Debug)]
-struct PreCompactData {
-    session_id: Option<String>,
-}
-
-fn parse_pre_compact_hook(line: &str) -> PreCompactData {
-    let session_id = extract_debug_string_value(line, "session_id");
-    PreCompactData { session_id }
-}
-
 #[derive(Debug)]
 struct PostCompactData {
     session_id: Option<String>,
@@ -1849,7 +1784,6 @@ fn process_json_line(
             subtype,
             session_id,
             cwd,
-            plugin_errors,
             ..
         } => {
             if subtype == "init" {
@@ -1874,31 +1808,6 @@ fn process_json_line(
                         },
                     );
                 }
-
-                // Warn about any plugins that failed to load (v2.1.111+)
-                if let Some(errors) = plugin_errors {
-                    if let Some(arr) = errors.as_array() {
-                        for error in arr {
-                            let msg = if let Some(s) = error.as_str() {
-                                s.to_string()
-                            } else {
-                                error.to_string()
-                            };
-                            let _ = app.emit(
-                                "claude:output",
-                                OutputEvent {
-                                    line_type: "error".to_string(),
-                                    content: format!("Plugin error: {}", msg),
-                                    tool_name: None,
-                                    conversation_id: conversation_id.clone(),
-                                    cost: None,
-                                    parent_tool_use_id: None,
-                                },
-                            );
-                        }
-                    }
-                }
-
                 emit_state_change(app, CharacterState::Idle, None, conversation_id.clone());
             }
         }
@@ -3978,28 +3887,6 @@ mod tests {
         assert_eq!(data.session_id, None);
     }
 
-    #[test]
-    fn test_parse_pre_compact_hook_with_session_id() {
-        let line =
-            r#"[PreCompact Hook] session_id=Some("sess-abc123"), conversation_id=Some("conv-xyz")"#;
-        let data = parse_pre_compact_hook(line);
-        assert_eq!(data.session_id, Some("sess-abc123".to_string()));
-    }
-
-    #[test]
-    fn test_parse_pre_compact_hook_without_session_id() {
-        let line = "[PreCompact Hook] session_id=None";
-        let data = parse_pre_compact_hook(line);
-        assert_eq!(data.session_id, None);
-    }
-
-    #[test]
-    fn test_parse_pre_compact_hook_empty_line() {
-        let line = "[PreCompact Hook]";
-        let data = parse_pre_compact_hook(line);
-        assert_eq!(data.session_id, None);
-    }
-
     #[test]
     fn test_parse_cwd_changed_hook_with_cwd_key() {
         let line = r#"[CwdChanged Hook] cwd="/home/naomi/code/my-project""#;

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "hikari-desktop",
-  "version": "1.15.0",
+  "version": "1.14.0",
   "identifier": "com.naomi.hikari-desktop",
   "build": {
     "beforeDevCommand": "pnpm dev",

src/lib/commands/slashCommands.ts

@@ -77,8 +77,6 @@ async function changeDirectory(path: string): Promise<void> {
         bare_mode: config.bare_mode ?? false,
         show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
         custom_model_option: config.custom_model_option || null,
-        effort_level: config.effort_level || null,
-        prompt_caching_ttl: config.prompt_caching_ttl || null,
       },
     });
 
@@ -166,8 +164,6 @@ async function startNewConversation(): Promise<void> {
         bare_mode: config.bare_mode ?? false,
         show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
         custom_model_option: config.custom_model_option || null,
-        effort_level: config.effort_level || null,
-        prompt_caching_ttl: config.prompt_caching_ttl || null,
       },
     });
 

src/lib/components/CliVersion.svelte

@@ -2,7 +2,7 @@
   import { invoke } from "@tauri-apps/api/core";
   import { onMount } from "svelte";
 
-  const SUPPORTED_CLI_VERSION = "2.1.131";
+  const SUPPORTED_CLI_VERSION = "2.1.104";
 
   let installedVersion = $state("Loading...");
   let latestNpmVersion = $state<string | null>(null);

src/lib/components/ConfigSidebar.svelte

@@ -78,8 +78,6 @@
     task_loop_auto_commit: false,
     task_loop_commit_prefix: "feat",
     task_loop_include_summary: false,
-    effort_level: null,
-    prompt_caching_ttl: null,
   });
 
   let showCustomThemeEditor = $state(false);
@@ -146,20 +144,17 @@
 
   const availableModels = [
     { value: "", label: "Default (from ~/.claude)" },
-    // Current generation (Claude 4.7/4.6/4.5)
+    // Current generation (Claude 4.6)
-    { value: "claude-opus-4-7", label: "Claude Opus 4.7 (Most Capable)" },
+    { value: "claude-opus-4-6", label: "Claude Opus 4.6 (Most Capable)" },
     { value: "claude-sonnet-4-6", label: "Claude Sonnet 4.6 (Recommended)" },
-    { value: "claude-haiku-4-5-20251001", label: "Claude Haiku 4.5 (Fast & Cheap)" },
-    // Previous generation (Claude 4.6)
-    { value: "claude-opus-4-6", label: "Claude Opus 4.6" },
     // Previous generation (Claude 4.5)
     { value: "claude-sonnet-4-5-20250929", label: "Claude Sonnet 4.5" },
+    { value: "claude-haiku-4-5-20251001", label: "Claude Haiku 4.5 (Fast & Cheap)" },
     { value: "claude-opus-4-5-20251101", label: "Claude Opus 4.5" },
     // Previous generation (Claude 4.x)
     { value: "claude-opus-4-1-20250805", label: "Claude Opus 4.1" },
-    // Deprecated — retire June 15, 2026
+    { value: "claude-sonnet-4-20250514", label: "Claude Sonnet 4" },
-    { value: "claude-sonnet-4-20250514", label: "Claude Sonnet 4 (Deprecated)" },
+    { value: "claude-opus-4-20250514", label: "Claude Opus 4" },
-    { value: "claude-opus-4-20250514", label: "Claude Opus 4 (Deprecated)" },
   ];
 
   const commonTools = [
@@ -718,49 +713,6 @@
         </p>
       </div>
 
-      <!-- Effort Level -->
-      <div class="mb-4">
-        <label class="block text-sm text-[var(--text-primary)] mb-1" for="effort-level"
-          >Effort level</label
-        >
-        <select
-          id="effort-level"
-          bind:value={config.effort_level}
-          class="w-full px-3 py-2 rounded border border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--text-primary)] text-sm focus:outline-none focus:ring-1 focus:ring-[var(--accent-primary)]"
-        >
-          <option value={null}>Default (CLI decides)</option>
-          <option value="low">Low</option>
-          <option value="medium">Medium</option>
-          <option value="high">High</option>
-          <option value="xhigh">Extra High (Opus 4.7 only)</option>
-          <option value="max">Max</option>
-        </select>
-        <p class="text-xs text-[var(--text-tertiary)] mt-1">
-          Passes <code class="font-mono">--effort</code> to tune speed vs. intelligence. Requires Claude
-          Code v2.1.111+.
-        </p>
-      </div>
-
-      <!-- Prompt Caching TTL -->
-      <div class="mb-4">
-        <label class="block text-sm text-[var(--text-primary)] mb-1" for="prompt-caching-ttl"
-          >Prompt caching TTL</label
-        >
-        <select
-          id="prompt-caching-ttl"
-          bind:value={config.prompt_caching_ttl}
-          class="w-full px-3 py-2 rounded border border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--text-primary)] text-sm focus:outline-none focus:ring-1 focus:ring-[var(--accent-primary)]"
-        >
-          <option value={null}>Default (CLI decides)</option>
-          <option value="1h">1-hour TTL (reduces cost for long sessions)</option>
-          <option value="5m">Force 5-minute TTL</option>
-        </select>
-        <p class="text-xs text-[var(--text-tertiary)] mt-1">
-          Sets <code class="font-mono">ENABLE_PROMPT_CACHING_1H</code> or
-          <code class="font-mono">FORCE_PROMPT_CACHING_5M</code>. Requires Claude Code v2.1.108+.
-        </p>
-      </div>
-
       <!-- Bare Mode -->
       <div class="mb-4">
         <label class="flex items-center gap-3 cursor-pointer">

src/lib/components/ElicitationModal.svelte

@@ -78,8 +78,6 @@
           bare_mode: config.bare_mode ?? false,
           show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
           custom_model_option: config.custom_model_option || null,
-          effort_level: config.effort_level || null,
-          prompt_caching_ttl: config.prompt_caching_ttl || null,
         },
       });
 

src/lib/components/InputBar.svelte

@@ -412,8 +412,6 @@ User: ${formattedMessage}`;
               bare_mode: config.bare_mode ?? false,
               show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
               custom_model_option: config.custom_model_option || null,
-              effort_level: config.effort_level || null,
-              prompt_caching_ttl: config.prompt_caching_ttl || null,
             },
           });
 

src/lib/components/PermissionModal.svelte

@@ -99,8 +99,6 @@
           bare_mode: config.bare_mode ?? false,
           show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
           custom_model_option: config.custom_model_option || null,
-          effort_level: config.effort_level || null,
-          prompt_caching_ttl: config.prompt_caching_ttl || null,
         },
       });
 

src/lib/components/StatusBar.svelte

@@ -97,8 +97,6 @@
     bare_mode: false,
     show_clear_context_on_plan_accept: true,
     custom_model_option: null,
-    effort_level: null,
-    prompt_caching_ttl: null,
   });
 
   let streamerModeActive = $state(false);
@@ -191,8 +189,6 @@
           show_clear_context_on_plan_accept:
             currentConfig.show_clear_context_on_plan_accept ?? true,
           custom_model_option: currentConfig.custom_model_option || null,
-          effort_level: currentConfig.effort_level || null,
-          prompt_caching_ttl: currentConfig.prompt_caching_ttl || null,
         },
       });
 
@@ -361,8 +357,6 @@
           show_clear_context_on_plan_accept:
             currentConfig.show_clear_context_on_plan_accept ?? true,
           custom_model_option: currentConfig.custom_model_option || null,
-          effort_level: currentConfig.effort_level || null,
-          prompt_caching_ttl: currentConfig.prompt_caching_ttl || null,
         },
       });
 

src/lib/components/TaskLoopPanel.svelte

@@ -228,8 +228,6 @@
           bare_mode: cfg.bare_mode ?? false,
           show_clear_context_on_plan_accept: cfg.show_clear_context_on_plan_accept ?? true,
           custom_model_option: cfg.custom_model_option || null,
-          effort_level: cfg.effort_level || null,
-          prompt_caching_ttl: cfg.prompt_caching_ttl || null,
         },
       });
     } catch (error) {

src/lib/components/UserQuestionModal.svelte

@@ -118,8 +118,6 @@
           bare_mode: config.bare_mode ?? false,
           show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
           custom_model_option: config.custom_model_option || null,
-          effort_level: config.effort_level || null,
-          prompt_caching_ttl: config.prompt_caching_ttl || null,
         },
       });
 

src/lib/stores/config.test.ts

@@ -229,8 +229,6 @@ describe("config store", () => {
         bare_mode: false,
         show_clear_context_on_plan_accept: true,
         custom_model_option: null,
-        effort_level: null,
-        prompt_caching_ttl: null,
       };
 
       expect(config.model).toBe("claude-sonnet-4");
@@ -299,8 +297,6 @@ describe("config store", () => {
         bare_mode: false,
         show_clear_context_on_plan_accept: true,
         custom_model_option: null,
-        effort_level: null,
-        prompt_caching_ttl: null,
       };
 
       expect(config.model).toBeNull();
@@ -924,8 +920,6 @@ describe("config store", () => {
         bare_mode: false,
         show_clear_context_on_plan_accept: true,
         custom_model_option: null,
-        effort_level: null,
-        prompt_caching_ttl: null,
       };
 
       const mockInvokeImpl = vi.mocked(invoke);

src/lib/stores/config.ts

@@ -99,10 +99,6 @@ export interface HikariConfig {
   show_clear_context_on_plan_accept: boolean;
   // Custom model option env var (v2.1.81+)
   custom_model_option: string | null;
-  // Effort level for Claude Code (v2.1.111+) — null means use CLI default
-  effort_level: string | null;
-  // Prompt caching TTL override (v2.1.108+) — null means use CLI default
-  prompt_caching_ttl: string | null;
 }
 
 const defaultConfig: HikariConfig = {
@@ -165,8 +161,6 @@ const defaultConfig: HikariConfig = {
   bare_mode: false,
   show_clear_context_on_plan_accept: true,
   custom_model_option: null,
-  effort_level: null,
-  prompt_caching_ttl: null,
 };
 
 function createConfigStore() {

src/lib/stores/stats.ts

@@ -10,15 +10,13 @@ export type BudgetType = "token" | "cost";
 // Model pricing (per million tokens) - keep in sync with stats.rs
 // Source: https://platform.claude.com/docs/en/about-claude/models/overview
 export const MODEL_PRICING: Record<string, { input: number; output: number }> = {
-  // Current generation (Claude 4.7/4.6/4.5)
+  // Current generation (Claude 4.6)
-  "claude-opus-4-7": { input: 5.0, output: 25.0 },
-  "claude-sonnet-4-6": { input: 3.0, output: 15.0 },
-  "claude-haiku-4-5-20251001": { input: 1.0, output: 5.0 },
-  // Previous generation (Claude 4.6)
   "claude-opus-4-6": { input: 5.0, output: 25.0 },
+  "claude-sonnet-4-6": { input: 3.0, output: 15.0 },
   // Previous generation (Claude 4.5)
   "claude-opus-4-5-20251101": { input: 5.0, output: 25.0 },
   "claude-sonnet-4-5-20250929": { input: 3.0, output: 15.0 },
+  "claude-haiku-4-5-20251001": { input: 1.0, output: 5.0 },
   // Previous generation (Claude 4.x)
   "claude-opus-4-1-20250805": { input: 15.0, output: 75.0 },
   "claude-opus-4-20250514": { input: 15.0, output: 75.0 },

src/lib/tauri.ts

@@ -11,7 +11,6 @@ import type {
   ElicitationEvent,
   PermissionPromptEvent,
   PostCompactEvent,
-  PreCompactEvent,
   StopFailureEvent,
   UserQuestionEvent,
 } from "$lib/types/messages";
@@ -662,12 +661,6 @@ export async function initializeTauriListeners() {
   });
   unlisteners.push(stopFailureUnlisten);
 
-  const preCompactUnlisten = await listen<PreCompactEvent>("claude:pre-compact", () => {
-    toastStore.addInfo("Compacting context...", "🗜️");
-    characterState.setTemporaryState("thinking", 3000);
-  });
-  unlisteners.push(preCompactUnlisten);
-
   const postCompactUnlisten = await listen<PostCompactEvent>("claude:post-compact", () => {
     toastStore.addInfo("Context compacted", "🗜️");
     characterState.setTemporaryState("success", 2000);

src/lib/types/messages.ts

@@ -187,11 +187,6 @@ export interface PostCompactEvent {
   conversation_id?: string;
 }
 
-export interface PreCompactEvent {
-  session_id?: string;
-  conversation_id?: string;
-}
-
 export type ConnectionStatus = "disconnected" | "connecting" | "connected" | "error";
 
 export interface Attachment {