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

## Summary

- `get_global_claude_md` and `save_global_claude_md` were using `dirs::home_dir()` which resolves to the Windows home directory (`C:\Users\accou`) on Windows builds
- The actual `~/.claude/CLAUDE.md` lives in the WSL home directory, so the editor was always showing an empty text box and would have written to the wrong location on save
- Added `get_global_claude_md_via_wsl()` and `save_global_claude_md_via_wsl()` helpers that shell out to WSL (matching the existing pattern used by `list_skills` and `list_memory_files`)
- Both Tauri commands now branch on `cfg!(target_os = "windows")` to use the appropriate path

## Test plan

- [ ] Open Settings sidebar on a Windows build — Global Instructions textarea should load the contents of `~/.claude/CLAUDE.md` from WSL
- [ ] Edit the content and click Save — verify the WSL file is updated
- [ ] Verify Linux/macOS builds are unaffected (native filesystem path unchanged)

✨ This issue was created with help from Hikari~ 🌸

Reviewed-on: #264
Co-authored-by: Hikari <hikari@nhcarrigan.com>
Co-committed-by: Hikari <hikari@nhcarrigan.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hikari-desktop",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -46,7 +46,7 @@
     "@codemirror/lang-vue": "0.1.3",
     "@codemirror/lang-wast": "6.0.2",
     "@codemirror/lang-xml": "6.1.0",
-    "@codemirror/lang-yaml": "6.1.3",
+    "@codemirror/lang-yaml": "6.1.2",
     "@codemirror/language": "6.12.2",
     "@codemirror/legacy-modes": "6.5.2",
     "@codemirror/state": "6.5.4",
@@ -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

@@ -66,8 +66,8 @@ importers:
         specifier: 6.1.0
         version: 6.1.0
       '@codemirror/lang-yaml':
-        specifier: 6.1.3
-        version: 6.1.3
+        specifier: 6.1.2
+        version: 6.1.2
       '@codemirror/language':
         specifier: 6.12.2
         version: 6.12.2
@@ -96,8 +96,8 @@ importers:
         specifier: 2.6.0
         version: 2.6.0
       '@tauri-apps/plugin-fs':
-        specifier: 2.4.5
-        version: 2.4.5
+        specifier: 2.5.0
+        version: 2.5.0
       '@tauri-apps/plugin-notification':
         specifier: 2.3.3
         version: 2.3.3
@@ -307,8 +307,8 @@ packages:
   '@codemirror/lang-xml@6.1.0':
     resolution: {integrity: sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==}
 
-  '@codemirror/lang-yaml@6.1.3':
-    resolution: {integrity: sha512-AZ8DJBuXGVHybpBQhmZtgew5//4hv3tdkXnr3vDmOUMJRuB6vn/uuwtmTOTlqEaQFg3hQSVeA90NmvIQyUV6FQ==}
+  '@codemirror/lang-yaml@6.1.2':
+    resolution: {integrity: sha512-dxrfG8w5Ce/QbT7YID7mWZFKhdhsaTNOYjOkSIMt1qmC4VQnXSDSYVHHHn8k6kJUfIhtLo8t1JJgltlxWdsITw==}
 
   '@codemirror/language@6.12.2':
     resolution: {integrity: sha512-jEPmz2nGGDxhRTg3lTpzmIyGKxz3Gp3SJES4b0nAuE5SWQoKdT5GoQ69cwMmFd+wvFUhYirtDTr0/DRHpQAyWg==}
@@ -993,8 +993,8 @@ packages:
   '@tauri-apps/plugin-dialog@2.6.0':
     resolution: {integrity: sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg==}
 
-  '@tauri-apps/plugin-fs@2.4.5':
-    resolution: {integrity: sha512-dVxWWGE6VrOxC7/jlhyE+ON/Cc2REJlM35R3PJX3UvFw2XwYhLGQVAIyrehenDdKjotipjYEVc4YjOl3qq90fA==}
+  '@tauri-apps/plugin-fs@2.5.0':
+    resolution: {integrity: sha512-c83kbz61AK+rKjhS+je9+stIO27nXj7p9cqeg36TwkIUtxpCFTttlHHtqon6h6FN54cXjyAjlMPOJcW3mwE5XQ==}
 
   '@tauri-apps/plugin-notification@2.3.3':
     resolution: {integrity: sha512-Zw+ZH18RJb41G4NrfHgIuofJiymusqN+q8fGUIIV7vyCH+5sSn5coqRv/MWB9qETsUs97vmU045q7OyseCV3Qg==}
@@ -2355,7 +2355,7 @@ snapshots:
       '@lezer/common': 1.5.0
       '@lezer/xml': 1.0.6
 
-  '@codemirror/lang-yaml@6.1.3':
+  '@codemirror/lang-yaml@6.1.2':
     dependencies:
       '@codemirror/autocomplete': 6.20.0
       '@codemirror/language': 6.12.2
@@ -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.13.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.13.0"
+version = "1.14.0"
 description = "Hikari - Claude Code Visual Assistant"
 authors = ["Naomi Carrigan"]
 edition = "2021"

src-tauri/src/commands.rs

@@ -2618,6 +2618,103 @@ pub async fn open_binary_file(app: AppHandle, path: String) -> Result<(), String
     }
 }
 
+/// Read `~/.claude/CLAUDE.md` via WSL (for Windows).
+/// Returns an empty string if the file does not exist.
+#[cfg(target_os = "windows")]
+async fn get_global_claude_md_via_wsl() -> Result<String, String> {
+    use std::process::Command;
+
+    let output = Command::new("wsl")
+        .hide_window()
+        .args(["-e", "bash", "-l", "-c", "cat ~/.claude/CLAUDE.md 2>/dev/null || true"])
+        .output()
+        .map_err(|e| format!("Failed to execute WSL command: {}", e))?;
+
+    Ok(String::from_utf8_lossy(&output.stdout).to_string())
+}
+
+/// Write content to `~/.claude/CLAUDE.md` via WSL (for Windows).
+/// Creates the file (and `~/.claude/` directory) if they do not exist.
+#[cfg(target_os = "windows")]
+async fn save_global_claude_md_via_wsl(content: String) -> Result<(), String> {
+    use std::io::Write;
+    use std::process::{Command, Stdio};
+
+    let mut child = Command::new("wsl")
+        .hide_window()
+        .args([
+            "-e",
+            "bash",
+            "-l",
+            "-c",
+            "mkdir -p ~/.claude && cat > ~/.claude/CLAUDE.md",
+        ])
+        .stdin(Stdio::piped())
+        .spawn()
+        .map_err(|e| format!("Failed to execute WSL command: {}", e))?;
+
+    if let Some(stdin) = child.stdin.as_mut() {
+        stdin
+            .write_all(content.as_bytes())
+            .map_err(|e| format!("Failed to write content to WSL stdin: {}", e))?;
+    }
+
+    let status = child
+        .wait()
+        .map_err(|e| format!("Failed to wait for WSL command: {}", e))?;
+
+    if !status.success() {
+        return Err("Failed to save CLAUDE.md via WSL".to_string());
+    }
+
+    Ok(())
+}
+
+/// Read the contents of `~/.claude/CLAUDE.md`.
+/// Returns an empty string if the file does not exist.
+#[tauri::command]
+pub async fn get_global_claude_md() -> Result<String, String> {
+    #[cfg(target_os = "windows")]
+    return get_global_claude_md_via_wsl().await;
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        let path = dirs::home_dir()
+            .ok_or_else(|| "Could not determine home directory".to_string())?
+            .join(".claude")
+            .join("CLAUDE.md");
+
+        if !path.exists() {
+            return Ok(String::new());
+        }
+
+        std::fs::read_to_string(&path).map_err(|e| format!("Failed to read CLAUDE.md: {}", e))
+    }
+}
+
+/// Write content to `~/.claude/CLAUDE.md`.
+/// Creates the file (and `~/.claude/` directory) if they do not exist.
+#[tauri::command]
+pub async fn save_global_claude_md(content: String) -> Result<(), String> {
+    #[cfg(target_os = "windows")]
+    return save_global_claude_md_via_wsl(content).await;
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        let claude_dir = dirs::home_dir()
+            .ok_or_else(|| "Could not determine home directory".to_string())?
+            .join(".claude");
+
+        if !claude_dir.exists() {
+            std::fs::create_dir_all(&claude_dir)
+                .map_err(|e| format!("Failed to create ~/.claude directory: {}", e))?;
+        }
+
+        let path = claude_dir.join("CLAUDE.md");
+        std::fs::write(&path, content).map_err(|e| format!("Failed to write CLAUDE.md: {}", e))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -3367,4 +3464,22 @@ gitea: gitea-mcp -t stdio (STDIO) - ✓ Connected"#;
         let (_, args) = build_wslpath_command(path);
         assert_eq!(args[2], path);
     }
+
+    #[test]
+    fn test_get_global_claude_md_path_construction() {
+        // Verify that home_dir() resolves successfully on the test platform
+        let home = dirs::home_dir();
+        assert!(home.is_some(), "home_dir() should be available in test environment");
+        let expected = home.unwrap().join(".claude").join("CLAUDE.md");
+        assert!(expected.to_string_lossy().contains(".claude"));
+        assert!(expected.to_string_lossy().ends_with("CLAUDE.md"));
+    }
+
+    #[test]
+    fn test_save_global_claude_md_dir_path_construction() {
+        let home = dirs::home_dir();
+        assert!(home.is_some());
+        let dir = home.unwrap().join(".claude");
+        assert!(dir.to_string_lossy().contains(".claude"));
+    }
 }

src-tauri/src/config.rs

@@ -54,6 +54,22 @@ pub struct ClaudeStartOptions {
 
     #[serde(default)]
     pub session_name: Option<String>,
+
+    #[serde(default)]
+    pub disable_skill_shell_execution: bool,
+
+    /// Pass `--bare` flag to suppress UI chrome, useful for scripted headless `-p` calls (v2.1.81+).
+    #[serde(default)]
+    pub bare_mode: bool,
+
+    /// Controls `showClearContextOnPlanAccept` in `--settings` (v2.1.81+).
+    /// Defaults to true (matching CLI default). Set to false to suppress the dialog.
+    #[serde(default = "default_show_clear_context")]
+    pub show_clear_context_on_plan_accept: bool,
+
+    /// Sets `ANTHROPIC_CUSTOM_MODEL_OPTION` env var for custom model providers (v2.1.81+).
+    #[serde(default)]
+    pub custom_model_option: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -203,6 +219,23 @@ pub struct HikariConfig {
 
     #[serde(default)]
     pub model_overrides: Option<HashMap<String, String>>,
+
+    /// Prevents skill scripts from executing shell commands (Claude Code v2.1.91+).
+    /// Passes `"disableSkillShellExecution": true` via the `--settings` flag.
+    #[serde(default)]
+    pub disable_skill_shell_execution: bool,
+
+    /// Pass `--bare` flag to suppress UI chrome, useful for scripted headless `-p` calls (v2.1.81+).
+    #[serde(default)]
+    pub bare_mode: bool,
+
+    /// Controls `showClearContextOnPlanAccept` in `--settings` (v2.1.81+).
+    #[serde(default = "default_show_clear_context")]
+    pub show_clear_context_on_plan_accept: bool,
+
+    /// Sets `ANTHROPIC_CUSTOM_MODEL_OPTION` env var for custom model providers (v2.1.81+).
+    #[serde(default)]
+    pub custom_model_option: Option<String>,
 }
 
 impl Default for HikariConfig {
@@ -254,6 +287,10 @@ impl Default for HikariConfig {
             enable_claudeai_mcp_servers: true,
             auto_memory_directory: None,
             model_overrides: None,
+            disable_skill_shell_execution: false,
+            bare_mode: false,
+            show_clear_context_on_plan_accept: true,
+            custom_model_option: None,
         }
     }
 }
@@ -306,6 +343,10 @@ fn default_enable_claudeai_mcp_servers() -> bool {
     true
 }
 
+fn default_show_clear_context() -> bool {
+    true
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
 #[serde(rename_all = "lowercase")]
 pub enum BudgetAction {
@@ -405,6 +446,10 @@ mod tests {
         assert!(config.enable_claudeai_mcp_servers);
         assert!(config.auto_memory_directory.is_none());
         assert!(config.model_overrides.is_none());
+        assert!(!config.disable_skill_shell_execution);
+        assert!(!config.bare_mode);
+        assert!(config.show_clear_context_on_plan_accept);
+        assert!(config.custom_model_option.is_none());
     }
 
     #[test]
@@ -459,6 +504,10 @@ mod tests {
                 "claude-opus-4-6".to_string(),
                 "arn:aws:bedrock:us-east-1::foundation-model/anthropic.claude-opus-4-6-v1".to_string(),
             )])),
+            disable_skill_shell_execution: true,
+            bare_mode: false,
+            show_clear_context_on_plan_accept: true,
+            custom_model_option: None,
         };
 
         let json = serde_json::to_string(&config).unwrap();

src-tauri/src/lib.rs

@@ -224,6 +224,8 @@ pub fn run() {
             delete_all_drafts,
             scan_project,
             open_binary_file,
+            get_global_claude_md,
+            save_global_claude_md,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

src-tauri/src/types.rs

@@ -95,6 +95,9 @@ pub enum ClaudeMessage {
         cwd: Option<String>,
         #[serde(default)]
         tools: Option<Vec<String>>,
+        /// Output style hint from Claude Code (v2.1.81+). Informational only.
+        #[serde(default)]
+        output_style: Option<String>,
     },
     #[serde(rename = "assistant")]
     Assistant {
@@ -119,6 +122,15 @@ pub enum ClaudeMessage {
         permission_denials: Option<Vec<PermissionDenial>>,
         #[serde(default)]
         usage: Option<UsageInfo>,
+        /// Fast mode state from Claude Code v2.1.81+. Values: "default" | "enabled" | "disabled".
+        #[serde(default)]
+        fast_mode_state: Option<String>,
+        /// Per-model usage breakdown from Claude Code v2.1.81+.
+        #[serde(default)]
+        model_usage: Option<serde_json::Value>,
+        /// Authoritative total cost in USD reported by Claude Code v2.1.81+.
+        #[serde(default)]
+        total_cost_usd: Option<f64>,
     },
     #[serde(rename = "rate_limit_event")]
     RateLimitEvent {
@@ -318,6 +330,42 @@ pub struct PostCompactEvent {
     pub conversation_id: Option<String>,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CwdChangedEvent {
+    pub cwd: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub conversation_id: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct FileChangedEvent {
+    pub file: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub conversation_id: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TaskCreatedEvent {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub task_id: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_tool_use_id: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub conversation_id: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PermissionDeniedEvent {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_name: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub conversation_id: Option<String>,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AgentStartEvent {
     pub tool_use_id: String,
@@ -741,4 +789,200 @@ mod tests {
         assert!(serialized.contains("\"session_id\":\"sess-xyz\""));
         assert!(!serialized.contains("conversation_id"));
     }
+
+    #[test]
+    fn test_cwd_changed_event_serialization() {
+        let event = CwdChangedEvent {
+            cwd: "/home/naomi/code/my-project".to_string(),
+            conversation_id: Some("conv-abc".to_string()),
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"cwd\":\"/home/naomi/code/my-project\""));
+        assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
+    }
+
+    #[test]
+    fn test_cwd_changed_event_omits_none_fields() {
+        let event = CwdChangedEvent {
+            cwd: "/tmp/workspace".to_string(),
+            conversation_id: None,
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"cwd\":\"/tmp/workspace\""));
+        assert!(!serialized.contains("conversation_id"));
+    }
+
+    #[test]
+    fn test_file_changed_event_serialization() {
+        let event = FileChangedEvent {
+            file: "/home/naomi/code/my-project/src/main.rs".to_string(),
+            conversation_id: Some("conv-abc".to_string()),
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"file\":\"/home/naomi/code/my-project/src/main.rs\""));
+        assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
+    }
+
+    #[test]
+    fn test_file_changed_event_omits_none_fields() {
+        let event = FileChangedEvent {
+            file: "/tmp/test.txt".to_string(),
+            conversation_id: None,
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"file\":\"/tmp/test.txt\""));
+        assert!(!serialized.contains("conversation_id"));
+    }
+
+    #[test]
+    fn test_task_created_event_serialization() {
+        let event = TaskCreatedEvent {
+            task_id: Some("task-abc123".to_string()),
+            description: Some("Explore the codebase".to_string()),
+            parent_tool_use_id: Some("toolu_xyz".to_string()),
+            conversation_id: Some("conv-abc".to_string()),
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"task_id\":\"task-abc123\""));
+        assert!(serialized.contains("\"description\":\"Explore the codebase\""));
+        assert!(serialized.contains("\"parent_tool_use_id\":\"toolu_xyz\""));
+        assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
+    }
+
+    #[test]
+    fn test_task_created_event_omits_none_fields() {
+        let event = TaskCreatedEvent {
+            task_id: None,
+            description: None,
+            parent_tool_use_id: None,
+            conversation_id: None,
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert_eq!(serialized, "{}");
+    }
+
+    #[test]
+    fn test_task_created_event_partial_fields() {
+        let event = TaskCreatedEvent {
+            task_id: Some("task-001".to_string()),
+            description: None,
+            parent_tool_use_id: None,
+            conversation_id: None,
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"task_id\":\"task-001\""));
+        assert!(!serialized.contains("description"));
+        assert!(!serialized.contains("parent_tool_use_id"));
+        assert!(!serialized.contains("conversation_id"));
+    }
+
+    #[test]
+    fn test_permission_denied_event_serialization() {
+        let event = PermissionDeniedEvent {
+            tool_name: Some("Bash".to_string()),
+            reason: Some("Tool not in allow list".to_string()),
+            conversation_id: Some("conv-abc".to_string()),
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"tool_name\":\"Bash\""));
+        assert!(serialized.contains("\"reason\":\"Tool not in allow list\""));
+        assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
+    }
+
+    #[test]
+    fn test_permission_denied_event_omits_none_fields() {
+        let event = PermissionDeniedEvent {
+            tool_name: None,
+            reason: None,
+            conversation_id: None,
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert_eq!(serialized, "{}");
+    }
+
+    #[test]
+    fn test_permission_denied_event_partial_fields() {
+        let event = PermissionDeniedEvent {
+            tool_name: Some("Edit".to_string()),
+            reason: None,
+            conversation_id: None,
+        };
+
+        let serialized = serde_json::to_string(&event).unwrap();
+        assert!(serialized.contains("\"tool_name\":\"Edit\""));
+        assert!(!serialized.contains("reason"));
+        assert!(!serialized.contains("conversation_id"));
+    }
+
+    #[test]
+    fn test_system_init_with_output_style() {
+        let json = r#"{"type":"system","subtype":"init","session_id":"sess-1","output_style":"auto"}"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        if let ClaudeMessage::System { output_style, .. } = msg {
+            assert_eq!(output_style, Some("auto".to_string()));
+        } else {
+            panic!("Expected System variant");
+        }
+    }
+
+    #[test]
+    fn test_system_init_without_output_style() {
+        let json = r#"{"type":"system","subtype":"init","session_id":"sess-1"}"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        if let ClaudeMessage::System { output_style, .. } = msg {
+            assert!(output_style.is_none());
+        } 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"}"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        if let ClaudeMessage::Result { fast_mode_state, .. } = msg {
+            assert_eq!(fast_mode_state, Some("enabled".to_string()));
+        } else {
+            panic!("Expected Result variant");
+        }
+    }
+
+    #[test]
+    fn test_result_message_with_total_cost_usd() {
+        let json = r#"{"type":"result","subtype":"success","total_cost_usd":0.05}"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        if let ClaudeMessage::Result { total_cost_usd, .. } = msg {
+            assert!((total_cost_usd.unwrap() - 0.05).abs() < f64::EPSILON);
+        } else {
+            panic!("Expected Result variant");
+        }
+    }
+
+    #[test]
+    fn test_result_message_without_new_fields() {
+        let json = r#"{"type":"result","subtype":"success"}"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        if let ClaudeMessage::Result {
+            fast_mode_state,
+            model_usage,
+            total_cost_usd,
+            ..
+        } = msg
+        {
+            assert!(fast_mode_state.is_none());
+            assert!(model_usage.is_none());
+            assert!(total_cost_usd.is_none());
+        } else {
+            panic!("Expected Result variant");
+        }
+    }
 }

src-tauri/src/wsl_bridge.rs

@@ -15,10 +15,11 @@ use crate::process_ext::HideWindow;
 use crate::stats::{calculate_cost, StatsUpdateEvent, UsageStats};
 use crate::types::{
     AgentEndEvent, AgentStartEvent, CharacterState, ClaudeMessage, ConnectionEvent,
-    ConnectionStatus, ContentBlock, ElicitationEvent, ElicitationResultEvent, MessageCost,
-    OutputEvent, PermissionPromptEvent, PermissionPromptEventItem, QuestionOption, SessionEvent,
-    PostCompactEvent, StateChangeEvent, StopFailureEvent, TodoItem, TodoUpdateEvent,
-    UserQuestionEvent, WorkingDirectoryEvent, WorktreeEvent, WorktreeInfo,
+    ConnectionStatus, ContentBlock, CwdChangedEvent, ElicitationEvent, ElicitationResultEvent,
+    FileChangedEvent, MessageCost, OutputEvent, PermissionDeniedEvent, PermissionPromptEvent,
+    PermissionPromptEventItem, PostCompactEvent, QuestionOption, SessionEvent, StateChangeEvent,
+    StopFailureEvent, TaskCreatedEvent, TodoItem, TodoUpdateEvent, UserQuestionEvent,
+    WorkingDirectoryEvent, WorktreeEvent, WorktreeInfo,
 };
 use parking_lot::RwLock;
 use std::cell::RefCell;
@@ -36,7 +37,10 @@ struct PendingToolUse {
     tool_input: serde_json::Value,
 }
 
-const SEARCH_TOOLS: [&str; 5] = ["Read", "Glob", "Grep", "WebSearch", "WebFetch"];
+// "Monitor" added in Claude Code v2.1.98 — it streams events and is observational in nature,
+// so it maps to the Searching character state. It may appear as name "Monitor" in tool_use
+// blocks (confirmed by CLI source inspection; it is a local_bash with kind="monitor" internally).
+const SEARCH_TOOLS: [&str; 6] = ["Read", "Glob", "Grep", "WebSearch", "WebFetch", "Monitor"];
 const CODING_TOOLS: [&str; 3] = ["Edit", "Write", "NotebookEdit"];
 
 fn detect_wsl() -> bool {
@@ -299,6 +303,11 @@ impl WslBridge {
                 cmd.arg("--worktree");
             }
 
+            // Add bare flag if requested (v2.1.81+)
+            if options.bare_mode {
+                cmd.arg("--bare");
+            }
+
             // Pass combined settings via --settings flag if any settings are specified
             {
                 let has_memory_dir = options
@@ -311,8 +320,13 @@ impl WslBridge {
                     .as_ref()
                     .map(|m| !m.is_empty())
                     .unwrap_or(false);
+                let suppress_clear_context = !options.show_clear_context_on_plan_accept;
 
-                if has_memory_dir || has_overrides {
+                if has_memory_dir
+                    || has_overrides
+                    || options.disable_skill_shell_execution
+                    || suppress_clear_context
+                {
                     let mut settings = serde_json::Map::new();
                     if let Some(ref dir) = options.auto_memory_directory {
                         if !dir.is_empty() {
@@ -329,6 +343,18 @@ impl WslBridge {
                             }
                         }
                     }
+                    if options.disable_skill_shell_execution {
+                        settings.insert(
+                            "disableSkillShellExecution".to_string(),
+                            serde_json::Value::Bool(true),
+                        );
+                    }
+                    if suppress_clear_context {
+                        settings.insert(
+                            "showClearContextOnPlanAccept".to_string(),
+                            serde_json::Value::Bool(false),
+                        );
+                    }
                     if let Ok(settings_json) = serde_json::to_string(&settings) {
                         cmd.args(["--settings", &settings_json]);
                     }
@@ -369,6 +395,13 @@ impl WslBridge {
                 cmd.env("ENABLE_CLAUDEAI_MCP_SERVERS", "false");
             }
 
+            // Set custom model option if specified (v2.1.81+)
+            if let Some(ref custom_opt) = options.custom_model_option {
+                if !custom_opt.is_empty() {
+                    cmd.env("ANTHROPIC_CUSTOM_MODEL_OPTION", custom_opt);
+                }
+            }
+
             cmd
         } else {
             // Running on Windows - use wsl with bash login shell to ensure PATH is loaded
@@ -436,6 +469,14 @@ impl WslBridge {
                 claude_cmd.push_str("ENABLE_CLAUDEAI_MCP_SERVERS=false ");
             }
 
+            // Set custom model option if specified (v2.1.81+)
+            if let Some(ref custom_opt) = options.custom_model_option {
+                if !custom_opt.is_empty() {
+                    let escaped = custom_opt.replace('\'', "'\\''");
+                    claude_cmd.push_str(&format!("ANTHROPIC_CUSTOM_MODEL_OPTION='{}' ", escaped));
+                }
+            }
+
             claude_cmd.push_str(
                 "claude --output-format stream-json --input-format stream-json --verbose",
             );
@@ -486,6 +527,11 @@ impl WslBridge {
                 claude_cmd.push_str(" --worktree");
             }
 
+            // Add bare flag if requested (v2.1.81+)
+            if options.bare_mode {
+                claude_cmd.push_str(" --bare");
+            }
+
             // Pass combined settings via --settings flag if any settings are specified
             {
                 let has_memory_dir = options
@@ -498,8 +544,13 @@ impl WslBridge {
                     .as_ref()
                     .map(|m| !m.is_empty())
                     .unwrap_or(false);
+                let suppress_clear_context = !options.show_clear_context_on_plan_accept;
 
-                if has_memory_dir || has_overrides {
+                if has_memory_dir
+                    || has_overrides
+                    || options.disable_skill_shell_execution
+                    || suppress_clear_context
+                {
                     let mut settings = serde_json::Map::new();
                     if let Some(ref dir) = options.auto_memory_directory {
                         if !dir.is_empty() {
@@ -516,6 +567,18 @@ impl WslBridge {
                             }
                         }
                     }
+                    if options.disable_skill_shell_execution {
+                        settings.insert(
+                            "disableSkillShellExecution".to_string(),
+                            serde_json::Value::Bool(true),
+                        );
+                    }
+                    if suppress_clear_context {
+                        settings.insert(
+                            "showClearContextOnPlanAccept".to_string(),
+                            serde_json::Value::Bool(false),
+                        );
+                    }
                     if let Ok(settings_json) = serde_json::to_string(&settings) {
                         let escaped = settings_json.replace('\'', "'\\''");
                         claude_cmd.push_str(&format!(" --settings '{}'", escaped));
@@ -1078,6 +1141,10 @@ fn handle_stderr(
                 let is_elicitation_result = line.contains("[ElicitationResult Hook]");
                 let is_stop_failure = line.contains("[StopFailure 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]");
+                let is_task_created = line.contains("[TaskCreated Hook]");
+                let is_permission_denied = line.contains("[PermissionDenied Hook]");
 
                 let line_type = if is_worktree_create || is_worktree_remove {
                     "worktree"
@@ -1089,6 +1156,14 @@ fn handle_stderr(
                     "error"
                 } else if is_post_compact {
                     "compact-prompt"
+                } else if is_cwd_changed {
+                    "cwd-changed"
+                } else if is_file_changed {
+                    "file-changed"
+                } else if is_task_created {
+                    "task-created"
+                } else if is_permission_denied {
+                    "permission-denied"
                 } else {
                     "error"
                 };
@@ -1227,6 +1302,124 @@ fn handle_stderr(
                             parent_tool_use_id: None,
                         },
                     );
+                } else if is_cwd_changed {
+                    let data = parse_cwd_changed_hook(&line);
+                    let friendly_content =
+                        format!("Working directory changed to: {}", data.cwd);
+
+                    let _ = app.emit(
+                        "claude:cwd-changed",
+                        CwdChangedEvent {
+                            cwd: data.cwd,
+                            conversation_id: conversation_id.clone(),
+                        },
+                    );
+
+                    let _ = app.emit(
+                        "claude:output",
+                        OutputEvent {
+                            line_type: "cwd-changed".to_string(),
+                            content: friendly_content,
+                            tool_name: None,
+                            conversation_id: conversation_id.clone(),
+                            cost: None,
+                            parent_tool_use_id: None,
+                        },
+                    );
+                } else if is_file_changed {
+                    let data = parse_file_changed_hook(&line);
+                    let friendly_content = if data.file.is_empty() {
+                        "File changed".to_string()
+                    } else {
+                        format!("File changed: {}", data.file)
+                    };
+
+                    let _ = app.emit(
+                        "claude:file-changed",
+                        FileChangedEvent {
+                            file: data.file,
+                            conversation_id: conversation_id.clone(),
+                        },
+                    );
+
+                    let _ = app.emit(
+                        "claude:output",
+                        OutputEvent {
+                            line_type: "file-changed".to_string(),
+                            content: friendly_content,
+                            tool_name: None,
+                            conversation_id: conversation_id.clone(),
+                            cost: None,
+                            parent_tool_use_id: None,
+                        },
+                    );
+                } else if is_task_created {
+                    let data = parse_task_created_hook(&line);
+                    let friendly_content = match data.description.as_deref() {
+                        Some(desc) if !desc.is_empty() => format!("Task created: {}", desc),
+                        _ => "Task created".to_string(),
+                    };
+
+                    let _ = app.emit(
+                        "claude:task-created",
+                        TaskCreatedEvent {
+                            task_id: data.task_id,
+                            description: data.description,
+                            parent_tool_use_id: data.parent_tool_use_id,
+                            conversation_id: conversation_id.clone(),
+                        },
+                    );
+
+                    let _ = app.emit(
+                        "claude:output",
+                        OutputEvent {
+                            line_type: "task-created".to_string(),
+                            content: friendly_content,
+                            tool_name: None,
+                            conversation_id: conversation_id.clone(),
+                            cost: None,
+                            parent_tool_use_id: None,
+                        },
+                    );
+                } else if is_permission_denied {
+                    let data = parse_permission_denied_hook(&line);
+                    let friendly_content = match (data.tool_name.as_deref(), data.reason.as_deref()) {
+                        (Some(tool), Some(reason)) => {
+                            format!("Permission denied for {}: {}", tool, reason)
+                        }
+                        (Some(tool), None) => format!("Permission denied for {}", tool),
+                        _ => "Permission denied".to_string(),
+                    };
+
+                    let _ = app.emit(
+                        "claude:state-change",
+                        StateChangeEvent {
+                            state: CharacterState::Permission,
+                            tool_name: data.tool_name.clone(),
+                            conversation_id: conversation_id.clone(),
+                        },
+                    );
+
+                    let _ = app.emit(
+                        "claude:permission-denied",
+                        PermissionDeniedEvent {
+                            tool_name: data.tool_name,
+                            reason: data.reason,
+                            conversation_id: conversation_id.clone(),
+                        },
+                    );
+
+                    let _ = app.emit(
+                        "claude:output",
+                        OutputEvent {
+                            line_type: "permission-denied".to_string(),
+                            content: friendly_content,
+                            tool_name: None,
+                            conversation_id: conversation_id.clone(),
+                            cost: None,
+                            parent_tool_use_id: None,
+                        },
+                    );
                 } else {
                     let _ = app.emit(
                         "claude:output",
@@ -1440,6 +1633,85 @@ fn parse_post_compact_hook(line: &str) -> PostCompactData {
     PostCompactData { session_id }
 }
 
+#[derive(Debug)]
+struct CwdChangedData {
+    cwd: String,
+}
+
+fn parse_cwd_changed_hook(line: &str) -> CwdChangedData {
+    let cwd = extract_quoted_value(line, "cwd")
+        .or_else(|| extract_quoted_value(line, "path"))
+        .or_else(|| {
+            line.split("[CwdChanged Hook]")
+                .nth(1)
+                .map(|s| s.trim().to_string())
+                .filter(|s| !s.is_empty())
+        })
+        .unwrap_or_default();
+    CwdChangedData { cwd }
+}
+
+#[derive(Debug)]
+struct FileChangedData {
+    file: String,
+}
+
+fn parse_file_changed_hook(line: &str) -> FileChangedData {
+    let file = extract_quoted_value(line, "file")
+        .or_else(|| extract_quoted_value(line, "path"))
+        .or_else(|| {
+            line.split("[FileChanged Hook]")
+                .nth(1)
+                .map(|s| s.trim().to_string())
+                .filter(|s| !s.is_empty())
+        })
+        .unwrap_or_default();
+    FileChangedData { file }
+}
+
+#[derive(Debug)]
+struct TaskCreatedData {
+    task_id: Option<String>,
+    description: Option<String>,
+    parent_tool_use_id: Option<String>,
+}
+
+fn parse_task_created_hook(line: &str) -> TaskCreatedData {
+    let task_id = extract_debug_string_value(line, "task_id")
+        .or_else(|| extract_quoted_value(line, "task_id"));
+
+    let description = extract_quoted_value(line, "description")
+        .or_else(|| extract_quoted_value(line, "prompt"));
+
+    let parent_tool_use_id = if line.contains("parent_tool_use_id=Some") {
+        line.split("parent_tool_use_id=Some(\"")
+            .nth(1)
+            .and_then(|s| s.split('"').next())
+            .map(|s| s.to_string())
+    } else {
+        None
+    };
+
+    TaskCreatedData { task_id, description, parent_tool_use_id }
+}
+
+#[derive(Debug)]
+struct PermissionDeniedData {
+    tool_name: Option<String>,
+    reason: Option<String>,
+}
+
+fn parse_permission_denied_hook(line: &str) -> PermissionDeniedData {
+    let tool_name = extract_quoted_value(line, "tool_name")
+        .or_else(|| extract_quoted_value(line, "tool"))
+        .or_else(|| extract_debug_string_value(line, "tool_name"));
+
+    let reason = extract_quoted_value(line, "reason")
+        .or_else(|| extract_quoted_value(line, "message"));
+
+    PermissionDeniedData { tool_name, reason }
+}
+
 /// Extracts a double-quoted string value from a `key="value"` pair in a hook line.
 /// Handles escape sequences within the quoted value.
 fn extract_quoted_value(line: &str, key: &str) -> Option<String> {
@@ -1897,6 +2169,9 @@ fn process_json_line(
             usage,
             duration_ms,
             num_turns,
+            fast_mode_state,
+            model_usage,
+            total_cost_usd,
         } => {
             tracing::info!(
                 "Received Result message: subtype={}, has_denials={}, denial_count={:?}",
@@ -1981,6 +2256,25 @@ fn process_json_line(
                 });
             }
 
+            // Log fast mode state if present (v2.1.81+)
+            if let Some(ref state) = fast_mode_state {
+                tracing::debug!("Fast mode state: {}", state);
+            }
+
+            // Log per-model usage if available (v2.1.81+)
+            if let Some(ref model_usage_val) = model_usage {
+                if let Some(map) = model_usage_val.as_object() {
+                    for (model_name, _usage_val) in map {
+                        tracing::debug!("Per-model usage logged for: {}", model_name);
+                    }
+                }
+            }
+
+            // Log authoritative cost from Claude Code if available (v2.1.81+)
+            if let Some(auth_cost) = total_cost_usd {
+                tracing::debug!("Authoritative total cost from Claude Code: ${:.6}", auth_cost);
+            }
+
             // Clear tracking fields since request completed successfully
             {
                 let mut stats_guard = stats.write();
@@ -2546,6 +2840,11 @@ mod tests {
             get_tool_state("WebFetch"),
             CharacterState::Searching
         ));
+        // Monitor tool added in v2.1.98 — observational/streaming, maps to Searching
+        assert!(matches!(
+            get_tool_state("Monitor"),
+            CharacterState::Searching
+        ));
     }
 
     #[test]
@@ -3588,6 +3887,130 @@ mod tests {
         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""#;
+        let data = parse_cwd_changed_hook(line);
+        assert_eq!(data.cwd, "/home/naomi/code/my-project");
+    }
+
+    #[test]
+    fn test_parse_cwd_changed_hook_with_path_key() {
+        let line = r#"[CwdChanged Hook] path="/tmp/workspace""#;
+        let data = parse_cwd_changed_hook(line);
+        assert_eq!(data.cwd, "/tmp/workspace");
+    }
+
+    #[test]
+    fn test_parse_cwd_changed_hook_bare_path_fallback() {
+        let line = "[CwdChanged Hook] /home/naomi/code/project";
+        let data = parse_cwd_changed_hook(line);
+        assert_eq!(data.cwd, "/home/naomi/code/project");
+    }
+
+    #[test]
+    fn test_parse_cwd_changed_hook_empty_line() {
+        let line = "[CwdChanged Hook]";
+        let data = parse_cwd_changed_hook(line);
+        assert_eq!(data.cwd, "");
+    }
+
+    #[test]
+    fn test_parse_file_changed_hook_with_file_key() {
+        let line = r#"[FileChanged Hook] file="/home/naomi/code/project/src/main.rs""#;
+        let data = parse_file_changed_hook(line);
+        assert_eq!(data.file, "/home/naomi/code/project/src/main.rs");
+    }
+
+    #[test]
+    fn test_parse_file_changed_hook_with_path_key() {
+        let line = r#"[FileChanged Hook] path="/tmp/test.txt""#;
+        let data = parse_file_changed_hook(line);
+        assert_eq!(data.file, "/tmp/test.txt");
+    }
+
+    #[test]
+    fn test_parse_file_changed_hook_bare_path_fallback() {
+        let line = "[FileChanged Hook] /home/naomi/code/project/README.md";
+        let data = parse_file_changed_hook(line);
+        assert_eq!(data.file, "/home/naomi/code/project/README.md");
+    }
+
+    #[test]
+    fn test_parse_file_changed_hook_empty_line() {
+        let line = "[FileChanged Hook]";
+        let data = parse_file_changed_hook(line);
+        assert_eq!(data.file, "");
+    }
+
+    #[test]
+    fn test_parse_task_created_hook_with_all_fields() {
+        let line = r#"[TaskCreated Hook] task_id=Some("task-abc123"), description="Explore the codebase", parent_tool_use_id=Some("toolu_xyz")"#;
+        let data = parse_task_created_hook(line);
+        assert_eq!(data.task_id, Some("task-abc123".to_string()));
+        assert_eq!(data.description, Some("Explore the codebase".to_string()));
+        assert_eq!(data.parent_tool_use_id, Some("toolu_xyz".to_string()));
+    }
+
+    #[test]
+    fn test_parse_task_created_hook_with_description_only() {
+        let line = r#"[TaskCreated Hook] description="Search for relevant files""#;
+        let data = parse_task_created_hook(line);
+        assert_eq!(data.description, Some("Search for relevant files".to_string()));
+        assert_eq!(data.task_id, None);
+        assert_eq!(data.parent_tool_use_id, None);
+    }
+
+    #[test]
+    fn test_parse_task_created_hook_no_parent() {
+        let line = r#"[TaskCreated Hook] task_id=Some("task-001"), description="Run tests""#;
+        let data = parse_task_created_hook(line);
+        assert_eq!(data.task_id, Some("task-001".to_string()));
+        assert_eq!(data.description, Some("Run tests".to_string()));
+        assert_eq!(data.parent_tool_use_id, None);
+    }
+
+    #[test]
+    fn test_parse_task_created_hook_empty_line() {
+        let line = "[TaskCreated Hook]";
+        let data = parse_task_created_hook(line);
+        assert_eq!(data.task_id, None);
+        assert_eq!(data.description, None);
+        assert_eq!(data.parent_tool_use_id, None);
+    }
+
+    #[test]
+    fn test_parse_permission_denied_hook_with_all_fields() {
+        let line = r#"[PermissionDenied Hook] tool_name="Bash", reason="Tool not in allow list""#;
+        let data = parse_permission_denied_hook(line);
+        assert_eq!(data.tool_name, Some("Bash".to_string()));
+        assert_eq!(data.reason, Some("Tool not in allow list".to_string()));
+    }
+
+    #[test]
+    fn test_parse_permission_denied_hook_tool_only() {
+        let line = r#"[PermissionDenied Hook] tool_name="Edit""#;
+        let data = parse_permission_denied_hook(line);
+        assert_eq!(data.tool_name, Some("Edit".to_string()));
+        assert_eq!(data.reason, None);
+    }
+
+    #[test]
+    fn test_parse_permission_denied_hook_tool_key_alias() {
+        let line = r#"[PermissionDenied Hook] tool="Write", reason="Workspace not trusted""#;
+        let data = parse_permission_denied_hook(line);
+        assert_eq!(data.tool_name, Some("Write".to_string()));
+        assert_eq!(data.reason, Some("Workspace not trusted".to_string()));
+    }
+
+    #[test]
+    fn test_parse_permission_denied_hook_empty_line() {
+        let line = "[PermissionDenied Hook]";
+        let data = parse_permission_denied_hook(line);
+        assert_eq!(data.tool_name, None);
+        assert_eq!(data.reason, None);
+    }
+
     #[test]
     fn test_build_stop_failure_message_no_fields() {
         let data = StopFailureData {

src-tauri/tauri.conf.json

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

src/lib/commands/slashCommands.ts

@@ -67,11 +67,16 @@ async function changeDirectory(path: string): Promise<void> {
         use_worktree: config.use_worktree ?? false,
         disable_1m_context: config.disable_1m_context ?? false,
         max_output_tokens: config.max_output_tokens ?? null,
+        disable_cron: config.disable_cron ?? false,
+        disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
         include_git_instructions: config.include_git_instructions ?? true,
         enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
         auto_memory_directory: config.auto_memory_directory || null,
         model_overrides: config.model_overrides || null,
         session_name: null,
+        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,
       },
     });
 
@@ -149,11 +154,16 @@ async function startNewConversation(): Promise<void> {
         use_worktree: config.use_worktree ?? false,
         disable_1m_context: config.disable_1m_context ?? false,
         max_output_tokens: config.max_output_tokens ?? null,
+        disable_cron: config.disable_cron ?? false,
+        disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
         include_git_instructions: config.include_git_instructions ?? true,
         enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
         auto_memory_directory: config.auto_memory_directory || null,
         model_overrides: config.model_overrides || null,
         session_name: null,
+        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,
       },
     });
 

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.80";
+  const SUPPORTED_CLI_VERSION = "2.1.104";
 
   let installedVersion = $state("Loading...");
   let latestNpmVersion = $state<string | null>(null);

src/lib/components/ConfigSidebar.svelte

@@ -63,6 +63,10 @@
     enable_claudeai_mcp_servers: true,
     auto_memory_directory: null,
     model_overrides: null,
+    disable_skill_shell_execution: false,
+    bare_mode: false,
+    show_clear_context_on_plan_accept: true,
+    custom_model_option: null,
     max_output_tokens: null,
     trusted_workspaces: [],
     background_image_path: null,
@@ -85,6 +89,9 @@
   let customUiFontStatus: string | null = $state(null);
   let modelOverridesJson = $state("");
   let modelOverridesError: string | null = $state(null);
+  let globalClaudeMd = $state("");
+  let globalClaudeMdSaving = $state(false);
+  let globalClaudeMdSaveStatus: string | null = $state(null);
 
   interface AuthStatus {
     is_logged_in: boolean;
@@ -122,6 +129,9 @@
     if (open && authStatus === null) {
       void refreshAuthStatus();
     }
+    if (open) {
+      void loadGlobalClaudeMd();
+    }
   });
 
   configStore.saveError.subscribe((error) => {
@@ -197,6 +207,30 @@
     }
   }
 
+  async function loadGlobalClaudeMd() {
+    try {
+      globalClaudeMd = await invoke<string>("get_global_claude_md");
+    } catch (error) {
+      console.error("Failed to load global CLAUDE.md:", error);
+    }
+  }
+
+  async function saveGlobalClaudeMd() {
+    globalClaudeMdSaving = true;
+    globalClaudeMdSaveStatus = null;
+    try {
+      await invoke("save_global_claude_md", { content: globalClaudeMd });
+      globalClaudeMdSaveStatus = "Saved!";
+      setTimeout(() => {
+        globalClaudeMdSaveStatus = null;
+      }, 2000);
+    } catch (error) {
+      globalClaudeMdSaveStatus = `Error: ${error}`;
+    } finally {
+      globalClaudeMdSaving = false;
+    }
+  }
+
   async function handleSave() {
     isSaving = true;
     saveError = null;
@@ -585,6 +619,22 @@
         </p>
       </div>
 
+      <!-- Disable Skill Shell Execution -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.disable_skill_shell_execution}
+            class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
+          />
+          <span class="text-sm text-[var(--text-primary)]">Disable skill shell execution</span>
+        </label>
+        <p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
+          Passes <code class="font-mono">disableSkillShellExecution: true</code> to prevent skill scripts
+          from executing shell commands (requires Claude Code v2.1.91+)
+        </p>
+      </div>
+
       <!-- Include Git Instructions -->
       <div class="mb-4">
         <label class="flex items-center gap-3 cursor-pointer">
@@ -662,6 +712,59 @@
           defaults.
         </p>
       </div>
+
+      <!-- Bare Mode -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.bare_mode}
+            class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
+          />
+          <span class="text-sm text-[var(--text-primary)]">Bare mode</span>
+        </label>
+        <p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
+          Passes <code class="font-mono">--bare</code> to suppress UI chrome — useful for scripted
+          headless <code class="font-mono">-p</code> calls (requires Claude Code v2.1.81+)
+        </p>
+      </div>
+
+      <!-- Show Clear Context on Plan Accept -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.show_clear_context_on_plan_accept}
+            class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
+          />
+          <span class="text-sm text-[var(--text-primary)]"
+            >Show clear context prompt on plan accept</span
+          >
+        </label>
+        <p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
+          When enabled, prompts to clear context when accepting a plan. Passes
+          <code class="font-mono">showClearContextOnPlanAccept: false</code> in
+          <code class="font-mono">--settings</code> when disabled (requires Claude Code v2.1.81+)
+        </p>
+      </div>
+
+      <!-- Custom Model Option -->
+      <div class="mb-4">
+        <label for="custom-model-option" class="block text-sm text-[var(--text-primary)] mb-1">
+          Custom model option <span class="text-[var(--text-tertiary)]">(optional)</span>
+        </label>
+        <input
+          id="custom-model-option"
+          type="text"
+          placeholder="Leave blank to use default"
+          bind:value={config.custom_model_option}
+          class="w-full px-3 py-2 text-sm bg-[var(--bg-primary)] border border-[var(--border-color)] rounded text-[var(--text-primary)] placeholder-[var(--text-tertiary)] focus:outline-none focus:border-[var(--accent-primary)]"
+        />
+        <p class="text-xs text-[var(--text-tertiary)] mt-1">
+          Sets <code class="font-mono">ANTHROPIC_CUSTOM_MODEL_OPTION</code> environment variable for custom
+          model providers (requires Claude Code v2.1.81+)
+        </p>
+      </div>
     </section>
 
     <!-- Greeting Section -->
@@ -702,6 +805,47 @@
       {/if}
     </section>
 
+    <!-- Global Instructions Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        Global Instructions
+      </h3>
+      <div class="mb-2">
+        <label for="global-claude-md" class="block text-sm text-[var(--text-secondary)] mb-1">
+          ~/.claude/CLAUDE.md
+        </label>
+        <textarea
+          id="global-claude-md"
+          bind:value={globalClaudeMd}
+          rows="12"
+          placeholder="Add persistent instructions for all Claude Code sessions..."
+          class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] font-mono text-sm focus:outline-none focus:border-[var(--accent-primary)] resize-y"
+        ></textarea>
+      </div>
+      <div class="flex items-center gap-2">
+        <button
+          onclick={saveGlobalClaudeMd}
+          disabled={globalClaudeMdSaving}
+          class="px-3 py-1.5 text-sm bg-[var(--accent-primary)] text-white rounded hover:opacity-90 disabled:opacity-50 disabled:cursor-not-allowed"
+        >
+          {globalClaudeMdSaving ? "Saving..." : "Save"}
+        </button>
+        {#if globalClaudeMdSaveStatus}
+          <span
+            class="text-xs {globalClaudeMdSaveStatus.startsWith('Error')
+              ? 'text-red-500'
+              : 'text-green-500'}"
+          >
+            {globalClaudeMdSaveStatus}
+          </span>
+        {/if}
+      </div>
+      <p class="text-xs text-[var(--text-tertiary)] mt-2">
+        Persistent instructions applied to all Claude Code sessions. Changes take effect on the next
+        session start.
+      </p>
+    </section>
+
     <!-- MCP Servers Section -->
     <section class="mb-6">
       <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">

src/lib/components/ElicitationModal.svelte

@@ -68,11 +68,16 @@
           allowed_tools: grantedToolsList,
           use_worktree: config.use_worktree ?? false,
           disable_1m_context: config.disable_1m_context ?? false,
+          disable_cron: config.disable_cron ?? false,
+          disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
           include_git_instructions: config.include_git_instructions ?? true,
           enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
           auto_memory_directory: config.auto_memory_directory || null,
           model_overrides: config.model_overrides || null,
           session_name: null,
+          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,
         },
       });
 

src/lib/components/InputBar.svelte

@@ -402,11 +402,16 @@ User: ${formattedMessage}`;
               allowed_tools: allAllowedTools,
               use_worktree: config.use_worktree ?? false,
               disable_1m_context: config.disable_1m_context ?? false,
+              disable_cron: config.disable_cron ?? false,
+              disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
               include_git_instructions: config.include_git_instructions ?? true,
               enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
               auto_memory_directory: config.auto_memory_directory || null,
               model_overrides: config.model_overrides || null,
               session_name: null,
+              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,
             },
           });
 

src/lib/components/PermissionModal.svelte

@@ -89,11 +89,16 @@
           allowed_tools: [...new Set([...newGrantedTools, ...config.auto_granted_tools])],
           use_worktree: config.use_worktree ?? false,
           disable_1m_context: config.disable_1m_context ?? false,
+          disable_cron: config.disable_cron ?? false,
+          disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
           include_git_instructions: config.include_git_instructions ?? true,
           enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
           auto_memory_directory: config.auto_memory_directory || null,
           model_overrides: config.model_overrides || null,
           session_name: null,
+          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,
         },
       });
 

src/lib/components/StatusBar.svelte

@@ -93,6 +93,10 @@
     enable_claudeai_mcp_servers: true,
     auto_memory_directory: null,
     model_overrides: null,
+    disable_skill_shell_execution: false,
+    bare_mode: false,
+    show_clear_context_on_plan_accept: true,
+    custom_model_option: null,
   });
 
   let streamerModeActive = $state(false);
@@ -174,11 +178,17 @@
           use_worktree: currentConfig.use_worktree ?? false,
           disable_1m_context: currentConfig.disable_1m_context ?? false,
           max_output_tokens: currentConfig.max_output_tokens ?? null,
+          disable_cron: currentConfig.disable_cron ?? false,
+          disable_skill_shell_execution: currentConfig.disable_skill_shell_execution ?? false,
           include_git_instructions: currentConfig.include_git_instructions ?? true,
           enable_claudeai_mcp_servers: currentConfig.enable_claudeai_mcp_servers ?? true,
           auto_memory_directory: currentConfig.auto_memory_directory || null,
           model_overrides: currentConfig.model_overrides || null,
           session_name: activeConversationForName?.name || null,
+          bare_mode: currentConfig.bare_mode ?? false,
+          show_clear_context_on_plan_accept:
+            currentConfig.show_clear_context_on_plan_accept ?? true,
+          custom_model_option: currentConfig.custom_model_option || null,
         },
       });
 
@@ -336,11 +346,17 @@
           use_worktree: currentConfig.use_worktree ?? false,
           disable_1m_context: currentConfig.disable_1m_context ?? false,
           max_output_tokens: currentConfig.max_output_tokens ?? null,
+          disable_cron: currentConfig.disable_cron ?? false,
+          disable_skill_shell_execution: currentConfig.disable_skill_shell_execution ?? false,
           include_git_instructions: currentConfig.include_git_instructions ?? true,
           enable_claudeai_mcp_servers: currentConfig.enable_claudeai_mcp_servers ?? true,
           auto_memory_directory: currentConfig.auto_memory_directory || null,
           model_overrides: currentConfig.model_overrides || null,
           session_name: null,
+          bare_mode: currentConfig.bare_mode ?? false,
+          show_clear_context_on_plan_accept:
+            currentConfig.show_clear_context_on_plan_accept ?? true,
+          custom_model_option: currentConfig.custom_model_option || null,
         },
       });
 

src/lib/components/TaskLoopPanel.svelte

@@ -218,11 +218,16 @@
           use_worktree: cfg.use_worktree ?? false,
           disable_1m_context: cfg.disable_1m_context ?? false,
           max_output_tokens: cfg.max_output_tokens ?? null,
+          disable_cron: cfg.disable_cron ?? false,
+          disable_skill_shell_execution: cfg.disable_skill_shell_execution ?? false,
           include_git_instructions: cfg.include_git_instructions ?? true,
           enable_claudeai_mcp_servers: cfg.enable_claudeai_mcp_servers ?? true,
           auto_memory_directory: cfg.auto_memory_directory || null,
           model_overrides: cfg.model_overrides || null,
           session_name: null,
+          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,
         },
       });
     } catch (error) {

src/lib/components/UserQuestionModal.svelte

@@ -108,11 +108,16 @@
           allowed_tools: grantedToolsList,
           use_worktree: config.use_worktree ?? false,
           disable_1m_context: config.disable_1m_context ?? false,
+          disable_cron: config.disable_cron ?? false,
+          disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
           include_git_instructions: config.include_git_instructions ?? true,
           enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
           auto_memory_directory: config.auto_memory_directory || null,
           model_overrides: config.model_overrides || null,
           session_name: null,
+          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,
         },
       });
 

src/lib/stores/config.test.ts

@@ -225,6 +225,10 @@ describe("config store", () => {
         enable_claudeai_mcp_servers: true,
         auto_memory_directory: null,
         model_overrides: null,
+        disable_skill_shell_execution: false,
+        bare_mode: false,
+        show_clear_context_on_plan_accept: true,
+        custom_model_option: null,
       };
 
       expect(config.model).toBe("claude-sonnet-4");
@@ -289,6 +293,10 @@ describe("config store", () => {
         enable_claudeai_mcp_servers: true,
         auto_memory_directory: null,
         model_overrides: null,
+        disable_skill_shell_execution: false,
+        bare_mode: false,
+        show_clear_context_on_plan_accept: true,
+        custom_model_option: null,
       };
 
       expect(config.model).toBeNull();
@@ -908,6 +916,10 @@ describe("config store", () => {
         enable_claudeai_mcp_servers: true,
         auto_memory_directory: null,
         model_overrides: null,
+        disable_skill_shell_execution: false,
+        bare_mode: false,
+        show_clear_context_on_plan_accept: true,
+        custom_model_option: null,
       };
 
       const mockInvokeImpl = vi.mocked(invoke);

src/lib/stores/config.ts

@@ -91,6 +91,14 @@ export interface HikariConfig {
   auto_memory_directory: string | null;
   // Model overrides for provider-specific model IDs (AWS Bedrock, Google Vertex, etc.)
   model_overrides: Record<string, string> | null;
+  // Prevents skill scripts from executing shell commands (Claude Code v2.1.91+)
+  disable_skill_shell_execution: boolean;
+  // Bare mode — suppress UI chrome for scripted headless -p calls (v2.1.81+)
+  bare_mode: boolean;
+  // Show clear context dialog when accepting a plan (v2.1.81+)
+  show_clear_context_on_plan_accept: boolean;
+  // Custom model option env var (v2.1.81+)
+  custom_model_option: string | null;
 }
 
 const defaultConfig: HikariConfig = {
@@ -149,6 +157,10 @@ const defaultConfig: HikariConfig = {
   enable_claudeai_mcp_servers: true,
   auto_memory_directory: null,
   model_overrides: null,
+  disable_skill_shell_execution: false,
+  bare_mode: false,
+  show_clear_context_on_plan_accept: true,
+  custom_model_option: null,
 };
 
 function createConfigStore() {