release: v1.7.0

## Summary

This PR bundles a collection of new features and quality-of-life improvements identified during a Claude CLI 2.1.50 audit.

- **Tab status indicator** — Tab stays yellow until the greeting is responded to, then turns green. Fixed disconnect not resetting to grey. Closes #157
- **Auth status display** — New "Account" section in settings sidebar showing login status, email, org, API key source, and Hikari override indicator. Includes login/logout buttons. Closes #153
- **CLI version badge** — New "Supported" badge showing the highest audited CLI version, colour-coded green/amber/red based on installed vs supported version. Closes #154 (bump to 2.1.50)
- **Rate limit events** — `rate_limit_event` messages from the stream are now parsed and shown as amber `[rate-limit]` lines in the terminal instead of being silently dropped. Closes #155
- **"Prompt is too long" handling** — Detects this error in assistant messages and shows a ⚡ Compact Conversation button to send `/compact` directly. Closes #158
- **`last_assistant_message` in Agent Monitor** — Extracts the agent's final output from the `ToolResult` content block in the JSON stream and displays it as a snippet on completed agent cards. Closes #156
- **`--worktree` flag** — New "Worktree isolation" toggle in session settings passes `--worktree` to Claude Code. Hook events (`WorktreeCreate`/`WorktreeRemove`) are displayed as green `[worktree]` lines. Closes #152, Closes #150
- **ConfigChange hook events** — `[ConfigChange Hook]` stderr events are now displayed as cyan `[config]` lines instead of errors. Closes #151
- **`CLAUDE_CODE_DISABLE_1M_CONTEXT` toggle** — New "Disable 1M context" setting in session configuration injects this env var into the Claude process. Closes #154

## Test plan

- [ ] Tab status indicator: start a new session and verify the tab stays yellow until Claude responds to the greeting, then turns green
- [ ] Auth status: open settings and verify the Account section shows correct login info
- [ ] CLI version badge: verify the "Supported 2.1.50" badge shows green when CLI matches
- [ ] Rate limit events: unit tests cover parsing; amber `[rate-limit]` lines display correctly
- [ ] Compact button: unit tests cover detection; button renders correctly in terminal
- [ ] Agent Monitor: use the Task tool and verify completed agent cards show a message snippet
- [ ] Worktree: enable toggle, start session, verify `--worktree` flag appears in process args
- [ ] ConfigChange: hook events display as `[config]` lines rather than errors
- [ ] Disable 1M context: enable toggle, start session, verify `CLAUDE_CODE_DISABLE_1M_CONTEXT=1` in `/proc/<pid>/environ`

✨ This PR was created with help from Hikari~ 🌸

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

CLAUDE.md

@@ -30,6 +30,148 @@ Example commit command:
 git commit --author="Hikari <hikari@nhcarrigan.com>" --no-gpg-sign -m "your commit message"
 ```
 
+## Testing Requirements
+
+All new features, fixes, and significant changes should include tests whenever possible:
+
+- **Frontend tests**: Use Vitest with `@testing-library/svelte` for component tests
+- **Test files**: Place test files next to the code they test with `.test.ts` or `.spec.ts` extension
+- **Run tests**: Use `pnpm test` to run all tests, or `pnpm test:watch` for watch mode
+- **Coverage**: Run `pnpm test:coverage` to generate coverage reports
+- **Rust tests**: Use `pnpm test:backend` for Rust/Tauri backend tests
+
+### Testing Guidelines
+
+- Write tests for utility functions, stores, and business logic
+- For Svelte 5 components, focus on testing the underlying logic functions
+- Use descriptive test names that explain what behaviour is being tested
+- Include edge cases and error conditions in test coverage
+- Mock Tauri APIs using the patterns in `vitest.setup.ts`
+- **Coverage Goal**: Maintain as close to 100% test coverage as possible across the entire codebase
+
+### Mocking Strategies
+
+#### Console Mocking
+
+When testing code that intentionally logs errors (like error handling paths), mock console methods to prevent stderr output that makes tests appear flaky:
+
+```typescript
+it("handles errors gracefully", async () => {
+  const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+
+  // Test error handling code
+  await expect(functionThatLogs()).rejects.toThrow();
+
+  // Verify error was logged
+  expect(consoleErrorSpy).toHaveBeenCalledWith("Expected error:", expect.any(Error));
+
+  // Restore console.error
+  consoleErrorSpy.mockRestore();
+});
+```
+
+#### E2E Integration Testing for Cross-Platform Code
+
+For code that calls platform-specific system APIs (like Windows PowerShell or Linux notify-send), use helper functions that build the command structure without execution. This allows CI to verify cross-platform compatibility on Linux-only containers:
+
+```rust
+/// Build notify-send command for testing (doesn't execute)
+#[cfg(test)]
+fn build_notify_send_command(title: &str, body: &str) -> (String, Vec<String>) {
+    (
+        "notify-send".to_string(),
+        vec![
+            title.to_string(),
+            body.to_string(),
+            "--urgency=normal".to_string(),
+            "--app-name=Hikari Desktop".to_string(),
+        ],
+    )
+}
+
+#[test]
+fn test_e2e_notify_send_command_structure() {
+    let (command, args) = build_notify_send_command("Test Title", "Test Body");
+
+    assert_eq!(command, "notify-send");
+    assert_eq!(args.len(), 4);
+    assert_eq!(args[0], "Test Title");
+    assert_eq!(args[1], "Test Body");
+}
+```
+
+This approach:
+
+- Verifies command structure, argument order, and escaping logic
+- Tests cross-platform code paths without requiring the target platform
+- Allows CI to catch regressions in Windows-specific code whilst running on Linux
+- Keeps tests fast and deterministic (no actual system calls)
+
+### Example Test Structure
+
+```typescript
+import { describe, it, expect } from "vitest";
+
+describe("FeatureName", () => {
+  it("handles the normal case correctly", () => {
+    // Arrange
+    const input = "test data";
+
+    // Act
+    const result = functionUnderTest(input);
+
+    // Assert
+    expect(result).toBe("expected output");
+  });
+
+  it("handles edge cases gracefully", () => {
+    // Test edge cases...
+  });
+});
+```
+
+### Adding Tests for New Features
+
+When developing new features, always add corresponding tests:
+
+1. **Before implementing**: Consider what needs testing (happy path, edge cases, errors)
+2. **During implementation**: Write tests alongside the code
+3. **After implementation**: Run `pnpm test:coverage` to verify coverage remains high
+4. **Before committing**: Ensure `check-all.sh` passes (includes all tests)
+
+The goal is to maintain our near-100% coverage as the codebase grows, so future refactoring and changes can be made with confidence!
+
+## Quality Assurance
+
+Before committing any changes, **always run the full test suite**:
+
+```bash
+./check-all.sh
+```
+
+This script runs all checks in the correct order:
+
+1. Frontend linting (ESLint)
+2. Frontend formatting (Prettier)
+3. Frontend type checking (svelte-check)
+4. Frontend tests with coverage (Vitest)
+5. Backend linting (Clippy with strict rules)
+6. Backend tests with coverage (cargo test + llvm-cov)
+
+**Important**: The script requires Node.js and Rust toolchains to be available:
+
+- **Node.js tools** (pnpm, npm): Source nvm first if needed: `source ~/.nvm/nvm.sh`
+- **Rust tools** (cargo, clippy): Should be in PATH via `~/.cargo/bin/`
+
+If `check-all.sh` reports any failures:
+
+1. Read the error messages carefully - they usually explain what needs fixing
+2. Fix the issues (linting errors, test failures, etc.)
+3. Run `check-all.sh` again to verify the fixes
+4. Only commit once all checks pass ✨
+
+**Never commit code that doesn't pass `check-all.sh`** - this ensures code quality and prevents broken builds!
+
 ## Project Context
 
 Hikari Desktop is a Tauri-based desktop application that wraps Claude Code with a visual anime character (Hikari) who appears on screen. This is a personal project where Hikari can sign her work and act as herself!

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hikari-desktop",
-  "version": "1.4.0",
+  "version": "1.7.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -64,6 +64,7 @@
     "@tauri-apps/plugin-store": "^2",
     "codemirror": "^6.0.2",
     "highlight.js": "^11.11.1",
+    "lucide-svelte": "^0.563.0",
     "marked": "^17.0.1"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -119,6 +119,9 @@ importers:
       highlight.js:
         specifier: ^11.11.1
         version: 11.11.1
+      lucide-svelte:
+        specifier: ^0.563.0
+        version: 0.563.0(svelte@5.46.3)
       marked:
         specifier: ^17.0.1
         version: 17.0.1
@@ -1668,6 +1671,11 @@ packages:
     resolution: {integrity: sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==}
     engines: {node: 20 || >=22}
 
+  lucide-svelte@0.563.0:
+    resolution: {integrity: sha512-pjZKw7TpQcamfQrx7YdbOHgmrcNeKiGGMD0tKZQaVktwSsbqw28CsKc2Q97ttwjytiCWkJyOa8ij2Q+Og0nPfQ==}
+    peerDependencies:
+      svelte: ^3 || ^4 || ^5.0.0-next.42
+
   lz-string@1.5.0:
     resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
     hasBin: true
@@ -3650,6 +3658,10 @@ snapshots:
 
   lru-cache@11.2.4: {}
 
+  lucide-svelte@0.563.0(svelte@5.46.3):
+    dependencies:
+      svelte: 5.46.3
+
   lz-string@1.5.0: {}
 
   magic-string@0.30.21:

src-tauri/Cargo.lock

@@ -1636,7 +1636,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hikari-desktop"
-version = "1.3.0"
+version = "1.7.0"
 dependencies = [
  "chrono",
  "dirs 5.0.1",

src-tauri/Cargo.toml

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

src-tauri/capabilities/default.json

@@ -28,6 +28,14 @@
       "identifier": "fs:allow-write-file",
       "allow": [{ "path": "**" }]
     },
+    {
+      "identifier": "fs:scope",
+      "allow": [{ "path": "$HOME/.claude/**" }]
+    },
+    {
+      "identifier": "fs:allow-read-text-file",
+      "allow": [{ "path": "$HOME/.claude/**" }]
+    },
     "core:window:allow-set-size",
     "core:window:allow-set-always-on-top",
     "core:window:allow-inner-size",

src-tauri/src/bridge_manager.rs

@@ -173,3 +173,127 @@ pub type SharedBridgeManager = Arc<Mutex<BridgeManager>>;
 pub fn create_shared_bridge_manager() -> SharedBridgeManager {
     Arc::new(Mutex::new(BridgeManager::new()))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_bridge_manager_new() {
+        let manager = BridgeManager::new();
+        assert!(manager.app_handle.is_none());
+        assert!(manager.bridges.is_empty());
+    }
+
+    #[test]
+    fn test_bridge_manager_default() {
+        let manager = BridgeManager::default();
+        assert!(manager.app_handle.is_none());
+        assert!(manager.bridges.is_empty());
+    }
+
+    #[test]
+    fn test_is_claude_running_no_bridge() {
+        let manager = BridgeManager::new();
+        assert!(!manager.is_claude_running("nonexistent"));
+    }
+
+    #[test]
+    fn test_get_working_directory_no_bridge() {
+        let manager = BridgeManager::new();
+        let result = manager.get_working_directory("nonexistent");
+        assert!(result.is_err());
+        assert_eq!(
+            result.unwrap_err(),
+            "No Claude instance found for this conversation"
+        );
+    }
+
+    #[test]
+    fn test_get_usage_stats_no_bridge() {
+        let manager = BridgeManager::new();
+        let result = manager.get_usage_stats("nonexistent");
+        assert!(result.is_err());
+        assert_eq!(
+            result.unwrap_err(),
+            "No Claude instance found for this conversation"
+        );
+    }
+
+    #[test]
+    fn test_stop_claude_no_bridge() {
+        let mut manager = BridgeManager::new();
+        let result = manager.stop_claude("nonexistent");
+        assert!(result.is_err());
+        assert_eq!(
+            result.unwrap_err(),
+            "No Claude instance found for this conversation"
+        );
+    }
+
+    #[test]
+    fn test_interrupt_claude_no_bridge() {
+        let mut manager = BridgeManager::new();
+        let result = manager.interrupt_claude("nonexistent");
+        assert!(result.is_err());
+        assert_eq!(
+            result.unwrap_err(),
+            "No Claude instance found for this conversation"
+        );
+    }
+
+    #[test]
+    fn test_send_prompt_no_bridge() {
+        let mut manager = BridgeManager::new();
+        let result = manager.send_prompt("nonexistent", "Hello".to_string());
+        assert!(result.is_err());
+        assert_eq!(
+            result.unwrap_err(),
+            "No Claude instance found for this conversation"
+        );
+    }
+
+    #[test]
+    fn test_send_tool_result_no_bridge() {
+        let mut manager = BridgeManager::new();
+        let result = manager.send_tool_result(
+            "nonexistent",
+            "tool_id",
+            serde_json::json!({"result": "success"}),
+        );
+        assert!(result.is_err());
+        assert_eq!(
+            result.unwrap_err(),
+            "No Claude instance found for this conversation"
+        );
+    }
+
+    #[test]
+    fn test_create_shared_bridge_manager() {
+        let shared = create_shared_bridge_manager();
+        let manager = shared.lock();
+        assert!(manager.bridges.is_empty());
+        assert!(manager.app_handle.is_none());
+    }
+
+    #[test]
+    fn test_cleanup_stopped_bridges_empty() {
+        let mut manager = BridgeManager::new();
+        manager.cleanup_stopped_bridges();
+        assert!(manager.bridges.is_empty());
+    }
+
+    #[test]
+    fn test_get_active_conversations_empty() {
+        let manager = BridgeManager::new();
+        let active = manager.get_active_conversations();
+        assert!(active.is_empty());
+    }
+
+    #[test]
+    fn test_stop_all_without_app_handle() {
+        let mut manager = BridgeManager::new();
+        manager.stop_all(); // Should not panic
+        assert!(manager.bridges.is_empty());
+    }
+}

src-tauri/src/config.rs

@@ -25,6 +25,12 @@ pub struct ClaudeStartOptions {
 
     #[serde(default)]
     pub resume_session_id: Option<String>,
+
+    #[serde(default)]
+    pub use_worktree: bool,
+
+    #[serde(default)]
+    pub disable_1m_context: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -113,6 +119,12 @@ pub struct HikariConfig {
 
     #[serde(default = "default_discord_rpc_enabled")]
     pub discord_rpc_enabled: bool,
+
+    #[serde(default)]
+    pub use_worktree: bool,
+
+    #[serde(default)]
+    pub disable_1m_context: bool,
 }
 
 impl Default for HikariConfig {
@@ -145,6 +157,8 @@ impl Default for HikariConfig {
             budget_action: BudgetAction::Warn,
             budget_warning_threshold: 0.8,
             discord_rpc_enabled: true,
+            use_worktree: false,
+            disable_1m_context: false,
         }
     }
 }
@@ -252,6 +266,8 @@ mod tests {
         assert_eq!(config.budget_action, BudgetAction::Warn);
         assert!((config.budget_warning_threshold - 0.8).abs() < f32::EPSILON);
         assert!(config.discord_rpc_enabled);
+        assert!(!config.use_worktree);
+        assert!(!config.disable_1m_context);
     }
 
     #[test]
@@ -284,6 +300,8 @@ mod tests {
             budget_action: BudgetAction::Block,
             budget_warning_threshold: 0.75,
             discord_rpc_enabled: true,
+            use_worktree: true,
+            disable_1m_context: false,
         };
 
         let json = serde_json::to_string(&config).unwrap();

src-tauri/src/debug_logger.rs

@@ -76,3 +76,82 @@ where
         let _ = self.app.emit("debug:log", log_event);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_debug_log_event_creation() {
+        let event = DebugLogEvent {
+            level: "info".to_string(),
+            message: "Test message".to_string(),
+        };
+
+        assert_eq!(event.level, "info");
+        assert_eq!(event.message, "Test message");
+    }
+
+    #[test]
+    fn test_debug_log_event_serialization() {
+        let event = DebugLogEvent {
+            level: "error".to_string(),
+            message: "Error occurred".to_string(),
+        };
+
+        let json = serde_json::to_string(&event).unwrap();
+        assert!(json.contains("\"level\":\"error\""));
+        assert!(json.contains("\"message\":\"Error occurred\""));
+    }
+
+    #[test]
+    fn test_debug_log_event_deserialization() {
+        let json = r#"{"level":"warn","message":"Warning message"}"#;
+        let event: DebugLogEvent = serde_json::from_str(json).unwrap();
+
+        assert_eq!(event.level, "warn");
+        assert_eq!(event.message, "Warning message");
+    }
+
+    #[test]
+    fn test_debug_log_event_with_special_characters() {
+        let event = DebugLogEvent {
+            level: "info".to_string(),
+            message: "Message with \"quotes\" and \n newlines".to_string(),
+        };
+
+        let json = serde_json::to_string(&event).unwrap();
+        let decoded: DebugLogEvent = serde_json::from_str(&json).unwrap();
+
+        assert_eq!(decoded.level, event.level);
+        assert_eq!(decoded.message, event.message);
+    }
+
+    #[test]
+    fn test_debug_log_event_with_unicode() {
+        let event = DebugLogEvent {
+            level: "debug".to_string(),
+            message: "Unicode: 日本語 🎉".to_string(),
+        };
+
+        let json = serde_json::to_string(&event).unwrap();
+        let decoded: DebugLogEvent = serde_json::from_str(&json).unwrap();
+
+        assert_eq!(decoded.message, "Unicode: 日本語 🎉");
+    }
+
+    #[test]
+    fn test_debug_log_event_all_levels() {
+        let levels = vec!["error", "warn", "info", "debug", "trace"];
+
+        for level in levels {
+            let event = DebugLogEvent {
+                level: level.to_string(),
+                message: format!("{} level message", level),
+            };
+
+            assert_eq!(event.level, level);
+            assert!(event.message.contains(level));
+        }
+    }
+}

src-tauri/src/discord_rpc.rs

@@ -1,18 +1,13 @@
 use discord_rich_presence::activity::{Activity, Assets, Timestamps};
 use discord_rich_presence::{DiscordIpc, DiscordIpcClient};
 use parking_lot::RwLock;
-use std::fs::OpenOptions;
-use std::io::Write;
-use std::path::PathBuf;
 use std::sync::Arc;
-use tauri::{AppHandle, Manager};
 
 pub struct DiscordRpcManager {
     client: Arc<RwLock<Option<DiscordIpcClient>>>,
     session_name: Arc<RwLock<String>>,
     model: Arc<RwLock<String>>,
     started_at: Arc<RwLock<i64>>,
-    log_path: Arc<RwLock<Option<PathBuf>>>,
 }
 
 impl DiscordRpcManager {
@@ -22,82 +17,47 @@ impl DiscordRpcManager {
             session_name: Arc::new(RwLock::new(String::new())),
             model: Arc::new(RwLock::new(String::new())),
             started_at: Arc::new(RwLock::new(0)),
-            log_path: Arc::new(RwLock::new(None)),
-        }
-    }
-
-    pub fn set_app_handle(&self, app_handle: &AppHandle) {
-        if let Ok(app_data_dir) = app_handle.path().app_data_dir() {
-            // Ensure the directory exists
-            if let Err(e) = std::fs::create_dir_all(&app_data_dir) {
-                tracing::error!("Failed to create app data directory: {}", e);
-                return;
-            }
-            let log_path = app_data_dir.join("hikari_discord_rpc.log");
-            *self.log_path.write() = Some(log_path.clone());
-            self.log(&format!(
-                "Log file initialised at: {}",
-                log_path.display()
-            ));
-        }
-    }
-
-    pub fn log(&self, message: &str) {
-        let log_path_guard = self.log_path.read();
-        let path = match log_path_guard.as_ref() {
-            Some(p) => p.clone(),
-            None => PathBuf::from("hikari_discord_rpc.log"),
-        };
-        drop(log_path_guard);
-
-        if let Ok(mut file) = OpenOptions::new()
-            .create(true)
-            .append(true)
-            .open(&path)
-        {
-            let timestamp = chrono::Local::now().format("%Y-%m-%d %H:%M:%S");
-            let _ = writeln!(file, "[{}] {}", timestamp, message);
         }
     }
 
     pub fn init(&self, initial_session_name: String, initial_model: String, started_at: i64) -> Result<(), String> {
-        self.log("Attempting to initialize Discord RPC...");
-        self.log("DEBUG: Application ID: 1391117878182281316");
-        self.log(&format!("DEBUG: Initial session: '{}', model: '{}', timestamp: {}",
-            initial_session_name, initial_model, started_at));
+        tracing::debug!("Attempting to initialize Discord RPC...");
+        tracing::debug!("Application ID: 1391117878182281316");
+        tracing::debug!("Initial session: '{}', model: '{}', timestamp: {}",
+            initial_session_name, initial_model, started_at);
 
         let mut client = DiscordIpcClient::new("1391117878182281316")
             .map_err(|e| {
                 let error_msg = format!("Failed to create Discord RPC client: {} (is Discord running?)", e);
-                self.log(&format!("ERROR: {}", error_msg));
+                tracing::error!("{}", error_msg);
                 error_msg
             })?;
 
-        self.log("DEBUG: DiscordIpcClient created successfully");
+        tracing::debug!("DiscordIpcClient created successfully");
 
         client
             .connect()
             .map_err(|e| {
                 let error_msg = format!("Failed to connect to Discord RPC: {} (ensure Discord is running)", e);
-                self.log(&format!("ERROR: {}", error_msg));
+                tracing::error!("{}", error_msg);
                 error_msg
             })?;
 
-        self.log("DEBUG: Connected to Discord IPC socket");
+        tracing::debug!("Connected to Discord IPC socket");
 
         // Set initial activity immediately after connecting
-        self.log("DEBUG: Building initial activity...");
+        tracing::debug!("Building initial activity...");
         let state_text = format!("Model: {}", initial_model);
         let assets = Assets::new()
             .large_image("hikari")
             .large_text("Hikari - Claude Code Assistant");
 
-        self.log("DEBUG: Assets created - large_image: 'hikari', large_text: 'Hikari - Claude Code Assistant'");
+        tracing::debug!("Assets created - large_image: 'hikari', large_text: 'Hikari - Claude Code Assistant'");
 
         let timestamps = Timestamps::new()
             .start(started_at);
 
-        self.log(&format!("DEBUG: Timestamps created - start: {}", started_at));
+        tracing::debug!("Timestamps created - start: {}", started_at);
 
         let activity = Activity::new()
             .details(initial_session_name.as_str())
@@ -105,19 +65,19 @@ impl DiscordRpcManager {
             .assets(assets)
             .timestamps(timestamps);
 
-        self.log(&format!("DEBUG: Activity created - details: '{}', state: '{}'",
-            initial_session_name, state_text));
+        tracing::debug!("Activity created - details: '{}', state: '{}'",
+            initial_session_name, state_text);
 
-        self.log("DEBUG: Attempting to set initial activity...");
+        tracing::debug!("Attempting to set initial activity...");
         client
             .set_activity(activity)
             .map_err(|e| {
                 let error_msg = format!("Failed to set initial Discord RPC activity: {}", e);
-                self.log(&format!("ERROR: {}", error_msg));
+                tracing::error!("{}", error_msg);
                 error_msg
             })?;
 
-        self.log("DEBUG: Initial activity set successfully!");
+        tracing::debug!("Initial activity set successfully!");
 
         // Store the client and initial state
         *self.client.write() = Some(client);
@@ -125,8 +85,8 @@ impl DiscordRpcManager {
         *self.model.write() = initial_model.clone();
         *self.started_at.write() = started_at;
 
-        self.log(&format!("Discord RPC connected successfully with initial activity: session='{}', model='{}'",
-            initial_session_name, initial_model));
+        tracing::info!("Discord RPC connected successfully with initial activity: session='{}', model='{}'",
+            initial_session_name, initial_model);
         Ok(())
     }
 
@@ -136,37 +96,37 @@ impl DiscordRpcManager {
         model: String,
         started_at: i64,
     ) -> Result<(), String> {
-        self.log(&format!("DEBUG: update() called with session='{}', model='{}', timestamp={}",
-            session_name, model, started_at));
+        tracing::debug!("update() called with session='{}', model='{}', timestamp={}",
+            session_name, model, started_at);
 
         *self.session_name.write() = session_name.clone();
         *self.model.write() = model.clone();
         *self.started_at.write() = started_at;
 
-        self.log("DEBUG: State variables updated");
+        tracing::debug!("State variables updated");
 
         let mut client_guard = self.client.write();
         let client = client_guard
             .as_mut()
             .ok_or_else(|| {
                 let error_msg = "Discord RPC client not initialized".to_string();
-                self.log(&format!("ERROR: {}", error_msg));
+                tracing::error!("{}", error_msg);
                 error_msg
             })?;
 
-        self.log("DEBUG: Client lock acquired");
+        tracing::debug!("Client lock acquired");
 
         let state_text = format!("Model: {}", model);
         let assets = Assets::new()
             .large_image("hikari")
             .large_text("Hikari - Claude Code Assistant");
 
-        self.log("DEBUG: Assets created - large_image: 'hikari', large_text: 'Hikari - Claude Code Assistant'");
+        tracing::debug!("Assets created - large_image: 'hikari', large_text: 'Hikari - Claude Code Assistant'");
 
         let timestamps = Timestamps::new()
             .start(started_at);
 
-        self.log(&format!("DEBUG: Timestamps created - start: {}", started_at));
+        tracing::debug!("Timestamps created - start: {}", started_at);
 
         let activity = Activity::new()
             .details(session_name.as_str())
@@ -174,38 +134,38 @@ impl DiscordRpcManager {
             .assets(assets)
             .timestamps(timestamps);
 
-        self.log(&format!("DEBUG: Activity created - details: '{}', state: '{}'",
-            session_name, state_text));
+        tracing::debug!("Activity created - details: '{}', state: '{}'",
+            session_name, state_text);
 
-        self.log("DEBUG: Attempting to set activity...");
+        tracing::debug!("Attempting to set activity...");
         client
             .set_activity(activity)
             .map_err(|e| {
                 let error_msg = format!("Failed to update Discord RPC: {}", e);
-                self.log(&format!("ERROR: {}", error_msg));
+                tracing::error!("{}", error_msg);
                 error_msg
             })?;
 
-        self.log(&format!("Updated Discord RPC: session='{}', model='{}'", session_name, model));
+        tracing::info!("Updated Discord RPC: session='{}', model='{}'", session_name, model);
         Ok(())
     }
 
     pub fn stop(&self) -> Result<(), String> {
-        self.log("DEBUG: stop() called");
+        tracing::debug!("stop() called");
 
         let mut client_guard = self.client.write();
         if let Some(mut client) = client_guard.take() {
-            self.log("DEBUG: Client found, attempting to close...");
+            tracing::debug!("Client found, attempting to close...");
             client
                 .close()
                 .map_err(|e| {
                     let error_msg = format!("Failed to close Discord RPC: {}", e);
-                    self.log(&format!("ERROR: {}", error_msg));
+                    tracing::error!("{}", error_msg);
                     error_msg
                 })?;
-            self.log("Discord RPC stopped successfully");
+            tracing::info!("Discord RPC stopped successfully");
         } else {
-            self.log("DEBUG: No client to stop (already stopped or never initialized)");
+            tracing::debug!("No client to stop (already stopped or never initialized)");
         }
         Ok(())
     }

src-tauri/src/lib.rs

@@ -73,9 +73,6 @@ pub fn run() {
             // Initialize the app handle in the bridge manager
             bridge_manager.lock().set_app_handle(app.handle().clone());
 
-            // Initialize the app handle in the Discord RPC manager for logging
-            discord_rpc.set_app_handle(app.handle());
-
             // Clean up any orphaned temp files from previous sessions
             if let Ok(count) = temp_manager.lock().cleanup_orphaned_files() {
                 if count > 0 {
@@ -195,8 +192,26 @@ pub fn run() {
             init_discord_rpc,
             update_discord_rpc,
             stop_discord_rpc,
-            log_discord_rpc,
             close_application,
+            list_memory_files,
+            get_claude_version,
+            get_auth_status,
+            auth_login,
+            auth_logout,
+            list_plugins,
+            install_plugin,
+            uninstall_plugin,
+            enable_plugin,
+            disable_plugin,
+            update_plugin,
+            list_marketplaces,
+            add_marketplace,
+            remove_marketplace,
+            list_mcp_servers,
+            get_mcp_server,
+            remove_mcp_server,
+            add_mcp_server,
+            get_mcp_server_details,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

src-tauri/src/notifications.rs

@@ -1,6 +1,83 @@
 use std::process::Command;
 use tauri::command;
 
+/// Generate PowerShell script for Windows Toast Notification
+fn generate_powershell_toast_script(title: &str, body: &str) -> String {
+    format!(
+        r#"
+[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null
+[Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null
+
+$APP_ID = 'Hikari Desktop'
+
+$template = @"
+<toast>
+    <visual>
+        <binding template="ToastText02">
+            <text id="1">{}</text>
+            <text id="2">{}</text>
+        </binding>
+    </visual>
+    <audio src="ms-winsoundevent:Notification.Default" />
+</toast>
+"@
+
+$xml = New-Object Windows.Data.Xml.Dom.XmlDocument
+$xml.LoadXml($template)
+
+$toast = New-Object Windows.UI.Notifications.ToastNotification $xml
+[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier($APP_ID).Show($toast)
+"#,
+        title.replace("\"", "`\""),
+        body.replace("\"", "`\"")
+    )
+}
+
+/// Format simple notification message
+fn format_simple_notification(title: &str, body: &str) -> String {
+    format!("{}\n\n{}", title, body)
+}
+
+/// Build notify-send command for testing (doesn't execute)
+#[cfg(test)]
+fn build_notify_send_command(title: &str, body: &str) -> (String, Vec<String>) {
+    (
+        "notify-send".to_string(),
+        vec![
+            title.to_string(),
+            body.to_string(),
+            "--urgency=normal".to_string(),
+            "--app-name=Hikari Desktop".to_string(),
+        ],
+    )
+}
+
+/// Build Windows PowerShell command for testing (doesn't execute)
+#[cfg(test)]
+fn build_windows_powershell_command(title: &str, body: &str) -> (String, Vec<String>) {
+    let script = generate_powershell_toast_script(title, body);
+    (
+        "pwsh.exe".to_string(),
+        vec![
+            "-NoProfile".to_string(),
+            "-WindowStyle".to_string(),
+            "Hidden".to_string(),
+            "-Command".to_string(),
+            script,
+        ],
+    )
+}
+
+/// Build simple notification command for testing (doesn't execute)
+#[cfg(test)]
+fn build_simple_notification_command(title: &str, body: &str) -> (String, Vec<String>) {
+    let message = format_simple_notification(title, body);
+    (
+        "cmd.exe".to_string(),
+        vec!["/c".to_string(), "msg".to_string(), "*".to_string(), message],
+    )
+}
+
 #[command]
 pub async fn send_notify_send(title: String, body: String) -> Result<(), String> {
     // Use notify-send for Linux/WSL
@@ -28,34 +105,7 @@ pub async fn send_notify_send(title: String, body: String) -> Result<(), String>
 #[command]
 pub async fn send_windows_notification(title: String, body: String) -> Result<(), String> {
     // Create PowerShell script for Windows Toast Notification
-    let ps_script = format!(
-        r#"
-[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null
-[Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null
-
-$APP_ID = 'Hikari Desktop'
-
-$template = @"
-<toast>
-    <visual>
-        <binding template="ToastText02">
-            <text id="1">{}</text>
-            <text id="2">{}</text>
-        </binding>
-    </visual>
-    <audio src="ms-winsoundevent:Notification.Default" />
-</toast>
-"@
-
-$xml = New-Object Windows.Data.Xml.Dom.XmlDocument
-$xml.LoadXml($template)
-
-$toast = New-Object Windows.UI.Notifications.ToastNotification $xml
-[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier($APP_ID).Show($toast)
-"#,
-        title.replace("\"", "`\""),
-        body.replace("\"", "`\"")
-    );
+    let ps_script = generate_powershell_toast_script(&title, &body);
 
     // Try PowerShell Core first (pwsh), then fall back to Windows PowerShell
     let output = Command::new("pwsh.exe")
@@ -87,7 +137,7 @@ $toast = New-Object Windows.UI.Notifications.ToastNotification $xml
 // Alternative: Use Windows built-in MSG command for simple notifications
 #[command]
 pub async fn send_simple_notification(title: String, body: String) -> Result<(), String> {
-    let message = format!("{}\n\n{}", title, body);
+    let message = format_simple_notification(&title, &body);
 
     Command::new("cmd.exe")
         .arg("/c")
@@ -99,3 +149,242 @@ pub async fn send_simple_notification(title: String, body: String) -> Result<(),
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_generate_powershell_toast_script_basic() {
+        let script = generate_powershell_toast_script("Title", "Body");
+
+        assert!(script.contains("Hikari Desktop"));
+        assert!(script.contains("Title"));
+        assert!(script.contains("Body"));
+        assert!(script.contains("ToastNotification"));
+    }
+
+    #[test]
+    fn test_generate_powershell_toast_script_escapes_quotes() {
+        let script = generate_powershell_toast_script("Title with \"quotes\"", "Body with \"quotes\"");
+
+        // Quotes should be escaped as `" in PowerShell
+        assert!(script.contains("Title with `\"quotes`\""));
+        assert!(script.contains("Body with `\"quotes`\""));
+    }
+
+    #[test]
+    fn test_generate_powershell_toast_script_with_special_chars() {
+        let script = generate_powershell_toast_script("Title: Test", "Body\nwith\nnewlines");
+
+        assert!(script.contains("Title: Test"));
+        assert!(script.contains("Body\nwith\nnewlines"));
+    }
+
+    #[test]
+    fn test_generate_powershell_toast_script_unicode() {
+        let script = generate_powershell_toast_script("日本語 Title", "Unicode: 🎉");
+
+        assert!(script.contains("日本語 Title"));
+        assert!(script.contains("Unicode: 🎉"));
+    }
+
+    #[test]
+    fn test_generate_powershell_toast_script_empty() {
+        let script = generate_powershell_toast_script("", "");
+
+        // Should still contain the structure
+        assert!(script.contains("Hikari Desktop"));
+        assert!(script.contains("ToastNotification"));
+    }
+
+    #[test]
+    fn test_format_simple_notification_basic() {
+        let message = format_simple_notification("Title", "Body");
+
+        assert_eq!(message, "Title\n\nBody");
+    }
+
+    #[test]
+    fn test_format_simple_notification_with_newlines() {
+        let message = format_simple_notification("Multi\nLine\nTitle", "Multi\nLine\nBody");
+
+        assert!(message.contains("Multi\nLine\nTitle"));
+        assert!(message.contains("\n\n"));
+        assert!(message.contains("Multi\nLine\nBody"));
+    }
+
+    #[test]
+    fn test_format_simple_notification_unicode() {
+        let message = format_simple_notification("日本語", "🎉 Unicode");
+
+        assert_eq!(message, "日本語\n\n🎉 Unicode");
+    }
+
+    #[test]
+    fn test_format_simple_notification_empty() {
+        let message = format_simple_notification("", "");
+
+        assert_eq!(message, "\n\n");
+    }
+
+    #[test]
+    fn test_format_simple_notification_long_text() {
+        let long_title = "A".repeat(1000);
+        let long_body = "B".repeat(1000);
+        let message = format_simple_notification(&long_title, &long_body);
+
+        assert!(message.starts_with(&long_title));
+        assert!(message.ends_with(&long_body));
+        assert!(message.contains("\n\n"));
+    }
+
+    #[test]
+    fn test_generate_powershell_toast_script_multiple_quotes() {
+        let script = generate_powershell_toast_script(
+            "\"Quoted\" \"Multiple\" \"Times\"",
+            "\"More\" \"Quotes\" \"Here\""
+        );
+
+        // Each quote should be escaped
+        assert!(script.contains("`\"Quoted`\" `\"Multiple`\" `\"Times`\""));
+        assert!(script.contains("`\"More`\" `\"Quotes`\" `\"Here`\""));
+    }
+
+    // E2E Integration Tests - Command Structure Verification
+
+    #[test]
+    fn test_e2e_notify_send_command_structure() {
+        let (command, args) = build_notify_send_command("Test Title", "Test Body");
+
+        assert_eq!(command, "notify-send");
+        assert_eq!(args.len(), 4);
+        assert_eq!(args[0], "Test Title");
+        assert_eq!(args[1], "Test Body");
+        assert_eq!(args[2], "--urgency=normal");
+        assert_eq!(args[3], "--app-name=Hikari Desktop");
+    }
+
+    #[test]
+    fn test_e2e_notify_send_with_special_chars() {
+        let (command, args) =
+            build_notify_send_command("Title with \"quotes\"", "Body\nwith\nnewlines");
+
+        assert_eq!(command, "notify-send");
+        assert_eq!(args[0], "Title with \"quotes\"");
+        assert_eq!(args[1], "Body\nwith\nnewlines");
+        // notify-send handles these directly
+    }
+
+    #[test]
+    fn test_e2e_windows_powershell_command_structure() {
+        let (command, args) = build_windows_powershell_command("Test Title", "Test Body");
+
+        assert_eq!(command, "pwsh.exe");
+        assert_eq!(args.len(), 5);
+        assert_eq!(args[0], "-NoProfile");
+        assert_eq!(args[1], "-WindowStyle");
+        assert_eq!(args[2], "Hidden");
+        assert_eq!(args[3], "-Command");
+
+        // Verify the script in args[4] contains expected elements
+        let script = &args[4];
+        assert!(script.contains("Test Title"));
+        assert!(script.contains("Test Body"));
+        assert!(script.contains("Hikari Desktop"));
+        assert!(script.contains("ToastNotification"));
+    }
+
+    #[test]
+    fn test_e2e_windows_powershell_quote_escaping() {
+        let (_, args) =
+            build_windows_powershell_command("Title with \"quotes\"", "Body with \"quotes\"");
+
+        let script = &args[4];
+        // Verify quotes are properly escaped in the PowerShell script
+        assert!(script.contains("Title with `\"quotes`\""));
+        assert!(script.contains("Body with `\"quotes`\""));
+    }
+
+    #[test]
+    fn test_e2e_simple_notification_command_structure() {
+        let (command, args) = build_simple_notification_command("Test Title", "Test Body");
+
+        assert_eq!(command, "cmd.exe");
+        assert_eq!(args.len(), 4);
+        assert_eq!(args[0], "/c");
+        assert_eq!(args[1], "msg");
+        assert_eq!(args[2], "*");
+        assert_eq!(args[3], "Test Title\n\nTest Body");
+    }
+
+    #[test]
+    fn test_e2e_simple_notification_multiline() {
+        let (_, args) =
+            build_simple_notification_command("Multi\nLine\nTitle", "Multi\nLine\nBody");
+
+        let message = &args[3];
+        assert!(message.contains("Multi\nLine\nTitle"));
+        assert!(message.contains("\n\n"));
+        assert!(message.contains("Multi\nLine\nBody"));
+    }
+
+    #[test]
+    fn test_e2e_command_consistency_across_platforms() {
+        // Test that different platforms use consistent parameters
+        let title = "Consistency Test";
+        let body = "Testing cross-platform consistency";
+
+        // Linux command
+        let (notify_cmd, notify_args) = build_notify_send_command(title, body);
+        assert!(notify_cmd.contains("notify"));
+        assert!(notify_args.iter().any(|arg| arg.contains("Hikari Desktop")));
+
+        // Windows PowerShell command
+        let (ps_cmd, ps_args) = build_windows_powershell_command(title, body);
+        assert!(ps_cmd.contains("pwsh") || ps_cmd.contains("powershell"));
+        let ps_script = &ps_args[4];
+        assert!(ps_script.contains("Hikari Desktop"));
+
+        // Windows simple command
+        let (msg_cmd, msg_args) = build_simple_notification_command(title, body);
+        assert!(msg_cmd.contains("cmd"));
+        assert!(msg_args[3].contains(title));
+        assert!(msg_args[3].contains(body));
+    }
+
+    #[test]
+    fn test_e2e_unicode_support_across_platforms() {
+        let title = "日本語 Title";
+        let body = "Unicode: 🎉";
+
+        // Verify all platforms preserve unicode
+        let (_, notify_args) = build_notify_send_command(title, body);
+        assert_eq!(notify_args[0], title);
+        assert_eq!(notify_args[1], body);
+
+        let (_, ps_args) = build_windows_powershell_command(title, body);
+        let ps_script = &ps_args[4];
+        assert!(ps_script.contains(title));
+        assert!(ps_script.contains(body));
+
+        let (_, msg_args) = build_simple_notification_command(title, body);
+        assert!(msg_args[3].contains(title));
+        assert!(msg_args[3].contains(body));
+    }
+
+    #[test]
+    fn test_e2e_empty_input_handling() {
+        // Test that empty inputs are handled gracefully
+        let (_, notify_args) = build_notify_send_command("", "");
+        assert_eq!(notify_args[0], "");
+        assert_eq!(notify_args[1], "");
+
+        let (_, ps_args) = build_windows_powershell_command("", "");
+        let ps_script = &ps_args[4];
+        assert!(ps_script.contains("Hikari Desktop")); // Still has app name
+
+        let (_, msg_args) = build_simple_notification_command("", "");
+        assert_eq!(msg_args[3], "\n\n");
+    }
+}

src-tauri/src/stats.rs

@@ -86,8 +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.6 family - 200K standard (1M beta available via header)
+        // Claude 4.6 family
         "claude-opus-4-6" => 200_000,
+        "claude-sonnet-4-6" => 1_000_000, // 1M token context window
         // Claude 4.5 family - 200K standard context
         "claude-opus-4-5-20251101"
         | "claude-sonnet-4-5-20250929"
@@ -502,6 +503,7 @@ pub fn calculate_cost(
     let (input_price_per_million, output_price_per_million) = match model {
         // Current 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),

src-tauri/src/types.rs

@@ -63,6 +63,26 @@ pub struct PermissionDenial {
     pub tool_input: serde_json::Value,
 }
 
+/// Rate limit information from a `rate_limit_event` message.
+/// All fields are optional to ensure forward-compatibility as the Claude CLI evolves.
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct RateLimitInfo {
+    #[serde(default)]
+    pub requests_limit: Option<u64>,
+    #[serde(default)]
+    pub requests_remaining: Option<u64>,
+    #[serde(default)]
+    pub requests_reset: Option<String>,
+    #[serde(default)]
+    pub tokens_limit: Option<u64>,
+    #[serde(default)]
+    pub tokens_remaining: Option<u64>,
+    #[serde(default)]
+    pub tokens_reset: Option<String>,
+    #[serde(default)]
+    pub retry_after_ms: Option<u64>,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type")]
 pub enum ClaudeMessage {
@@ -100,6 +120,11 @@ pub enum ClaudeMessage {
         #[serde(default)]
         usage: Option<UsageInfo>,
     },
+    #[serde(rename = "rate_limit_event")]
+    RateLimitEvent {
+        #[serde(default)]
+        rate_limit_info: RateLimitInfo,
+    },
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -280,6 +305,23 @@ pub struct AgentEndEvent {
     pub duration_ms: Option<u64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub num_turns: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub last_assistant_message: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TodoItem {
+    pub content: String,
+    pub status: String, // "pending", "in_progress", or "completed"
+    #[serde(rename = "activeForm")]
+    pub active_form: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TodoUpdateEvent {
+    pub todos: Vec<TodoItem>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub conversation_id: Option<String>,
 }
 
 #[cfg(test)]
@@ -431,4 +473,77 @@ mod tests {
         assert!(serialized.contains("\"input_tokens\":100"));
         assert!(serialized.contains("\"output_tokens\":50"));
     }
+
+    #[test]
+    fn test_rate_limit_info_default() {
+        let info = RateLimitInfo::default();
+        assert!(info.requests_limit.is_none());
+        assert!(info.requests_remaining.is_none());
+        assert!(info.requests_reset.is_none());
+        assert!(info.tokens_limit.is_none());
+        assert!(info.tokens_remaining.is_none());
+        assert!(info.tokens_reset.is_none());
+        assert!(info.retry_after_ms.is_none());
+    }
+
+    #[test]
+    fn test_rate_limit_event_deserialization_empty_info() {
+        let json = r#"{"type":"rate_limit_event","rate_limit_info":{}}"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        assert!(matches!(msg, ClaudeMessage::RateLimitEvent { .. }));
+    }
+
+    #[test]
+    fn test_rate_limit_event_deserialization_no_info() {
+        // rate_limit_info field is optional via #[serde(default)]
+        let json = r#"{"type":"rate_limit_event"}"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        assert!(matches!(msg, ClaudeMessage::RateLimitEvent { .. }));
+    }
+
+    #[test]
+    fn test_rate_limit_event_deserialization_with_data() {
+        let json = r#"{
+            "type": "rate_limit_event",
+            "rate_limit_info": {
+                "requests_limit": 1000,
+                "requests_remaining": 0,
+                "requests_reset": "2024-01-01T00:01:00Z",
+                "tokens_limit": 50000,
+                "tokens_remaining": 0,
+                "tokens_reset": "2024-01-01T00:01:00Z",
+                "retry_after_ms": 60000
+            }
+        }"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        if let ClaudeMessage::RateLimitEvent { rate_limit_info } = msg {
+            assert_eq!(rate_limit_info.requests_limit, Some(1000));
+            assert_eq!(rate_limit_info.requests_remaining, Some(0));
+            assert_eq!(
+                rate_limit_info.requests_reset,
+                Some("2024-01-01T00:01:00Z".to_string())
+            );
+            assert_eq!(rate_limit_info.retry_after_ms, Some(60000));
+        } else {
+            panic!("Expected RateLimitEvent variant");
+        }
+    }
+
+    #[test]
+    fn test_rate_limit_event_ignores_unknown_fields() {
+        // Ensures forward-compat: unknown fields in rate_limit_info are silently ignored
+        let json = r#"{
+            "type": "rate_limit_event",
+            "rate_limit_info": {
+                "requests_remaining": 0,
+                "some_future_field": "some_value"
+            }
+        }"#;
+        let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
+        if let ClaudeMessage::RateLimitEvent { rate_limit_info } = msg {
+            assert_eq!(rate_limit_info.requests_remaining, Some(0));
+        } else {
+            panic!("Expected RateLimitEvent variant");
+        }
+    }
 }

src-tauri/src/wsl_bridge.rs

@@ -16,8 +16,8 @@ use crate::stats::{calculate_cost, StatsUpdateEvent, UsageStats};
 use crate::types::{
     AgentEndEvent, AgentStartEvent, CharacterState, ClaudeMessage, ConnectionEvent,
     ConnectionStatus, ContentBlock, MessageCost, OutputEvent, PermissionPromptEvent,
-    PermissionPromptEventItem, QuestionOption, SessionEvent, StateChangeEvent,
-    UserQuestionEvent, WorkingDirectoryEvent,
+    PermissionPromptEventItem, QuestionOption, SessionEvent, StateChangeEvent, TodoItem,
+    TodoUpdateEvent, UserQuestionEvent, WorkingDirectoryEvent,
 };
 use parking_lot::RwLock;
 use std::cell::RefCell;
@@ -39,6 +39,12 @@ const SEARCH_TOOLS: [&str; 5] = ["Read", "Glob", "Grep", "WebSearch", "WebFetch"
 const CODING_TOOLS: [&str; 3] = ["Edit", "Write", "NotebookEdit"];
 
 fn detect_wsl() -> bool {
+    // A native Windows binary is never running inside WSL, even if launched from a WSL
+    // terminal that has WSL_DISTRO_NAME set in its environment.
+    if cfg!(target_os = "windows") {
+        return false;
+    }
+
     // Check /proc/version for WSL indicators
     if let Ok(version) = std::fs::read_to_string("/proc/version") {
         let version_lower = version.to_lowercase();
@@ -61,23 +67,29 @@ fn detect_wsl() -> bool {
 }
 
 fn find_claude_binary() -> Option<String> {
-    // Check common installation locations for claude
-    let home = std::env::var("HOME").ok()?;
-    let paths_to_check = [
-        format!("{}/.local/bin/claude", home),
-        format!("{}/.claude/local/claude", home),
-        "/usr/local/bin/claude".to_string(),
-        "/usr/bin/claude".to_string(),
-    ];
-
-    for path in &paths_to_check {
-        if std::path::Path::new(path).exists() {
-            return Some(path.clone());
+    // Check common installation locations for claude (when HOME is available)
+    if let Ok(home) = std::env::var("HOME") {
+        let paths_to_check = [
+            format!("{}/.local/bin/claude", home),
+            format!("{}/.claude/local/claude", home),
+        ];
+        for path in &paths_to_check {
+            if std::path::Path::new(path).exists() {
+                return Some(path.clone());
+            }
         }
     }
 
-    // Fall back to checking PATH via which
-    if let Ok(output) = Command::new("which").arg("claude").output() {
+    // Check system-wide locations
+    for path in &["/usr/local/bin/claude", "/usr/bin/claude"] {
+        if std::path::Path::new(path).exists() {
+            return Some((*path).to_string());
+        }
+    }
+
+    // Use a login shell to resolve claude via the user's PATH - GUI apps don't
+    // inherit shell PATH, so bare `which` may miss ~/.local/bin entries
+    if let Ok(output) = Command::new("bash").args(["-lc", "which claude"]).output() {
         if output.status.success() {
             let path = String::from_utf8_lossy(&output.stdout).trim().to_string();
             if !path.is_empty() {
@@ -125,6 +137,15 @@ impl WslBridge {
     }
 
     pub fn start(&mut self, app: AppHandle, options: ClaudeStartOptions) -> Result<(), String> {
+        // If a process handle exists but the process has already exited (e.g. due to a
+        // failed working directory), clean up the stale handle so we can restart cleanly.
+        if let Some(ref mut process) = self.process {
+            if process.try_wait().map(|s| s.is_some()).unwrap_or(false) {
+                self.process = None;
+                self.stdin = None;
+            }
+        }
+
         if self.process.is_some() {
             return Err("Process already running".to_string());
         }
@@ -244,6 +265,11 @@ impl WslBridge {
                 }
             }
 
+            // Add worktree flag if requested
+            if options.use_worktree {
+                cmd.arg("--worktree");
+            }
+
             cmd.current_dir(working_dir);
 
             // Set API key as environment variable if specified
@@ -253,10 +279,39 @@ impl WslBridge {
                 }
             }
 
+            // Disable 1M context window if requested
+            if options.disable_1m_context {
+                cmd.env("CLAUDE_CODE_DISABLE_1M_CONTEXT", "1");
+            }
+
             cmd
         } else {
             // Running on Windows - use wsl with bash login shell to ensure PATH is loaded
             tracing::debug!("Windows path - using wsl");
+
+            // Check if Claude binary is installed inside WSL
+            let binary_check = Command::new("wsl")
+                .args(["-e", "bash", "-lc", "which claude"])
+                .output();
+            if let Ok(output) = binary_check {
+                if !output.status.success() {
+                    return Err("Claude Code is not installed. Please install it using:\n\ncurl -fsSL https://claude.ai/install.sh | bash".to_string());
+                }
+            }
+
+            // Validate the working directory exists inside WSL before spawning
+            let dir_check = Command::new("wsl")
+                .args(["-e", "test", "-d", working_dir])
+                .output();
+            if let Ok(output) = dir_check {
+                if !output.status.success() {
+                    return Err(format!(
+                        "Working directory does not exist: {}",
+                        working_dir
+                    ));
+                }
+            }
+
             let mut cmd = Command::new("wsl");
 
             // Build the claude command with all arguments
@@ -269,6 +324,11 @@ impl WslBridge {
                 }
             }
 
+            // Disable 1M context window if requested
+            if options.disable_1m_context {
+                claude_cmd.push_str("CLAUDE_CODE_DISABLE_1M_CONTEXT=1 ");
+            }
+
             claude_cmd.push_str(
                 "claude --output-format stream-json --input-format stream-json --verbose",
             );
@@ -306,6 +366,11 @@ impl WslBridge {
                 }
             }
 
+            // Add worktree flag if requested
+            if options.use_worktree {
+                claude_cmd.push_str(" --worktree");
+            }
+
             // Use bash -lc to load login profile (ensures PATH includes claude)
             cmd.args(["-e", "bash", "-lc", &claude_cmd]);
 
@@ -678,11 +743,50 @@ fn handle_stderr(
                     }
                 }
 
-                // Still emit the stderr line as output
+                // Check if this is a SubagentStop hook message
+                if line.contains("[SubagentStop Hook]") {
+                    if let Some(stop_data) = parse_subagent_stop_hook(&line) {
+                        tracing::debug!("Parsed SubagentStop hook: tool_use_id={:?}",
+                            stop_data.parent_tool_use_id);
+
+                        // Emit agent-end event if we have a tool_use_id
+                        if let Some(tool_use_id) = stop_data.parent_tool_use_id {
+                            let now = std::time::SystemTime::now()
+                                .duration_since(std::time::UNIX_EPOCH)
+                                .unwrap_or_default()
+                                .as_millis() as u64;
+
+                            let _ = app.emit(
+                                "claude:agent-end",
+                                AgentEndEvent {
+                                    tool_use_id,
+                                    ended_at: now,
+                                    is_error: false,
+                                    conversation_id: conversation_id.clone(),
+                                    duration_ms: None,
+                                    num_turns: None,
+                                    last_assistant_message: stop_data.last_assistant_message,
+                                },
+                            );
+                        }
+                    }
+                }
+
+                // Hook events are informational — emit with distinct types instead of error
+                let line_type = if line.contains("[WorktreeCreate Hook]")
+                    || line.contains("[WorktreeRemove Hook]")
+                {
+                    "worktree"
+                } else if line.contains("[ConfigChange Hook]") {
+                    "config-change"
+                } else {
+                    "error"
+                };
+
                 let _ = app.emit(
                     "claude:output",
                     OutputEvent {
-                        line_type: "error".to_string(),
+                        line_type: line_type.to_string(),
                         content: line,
                         tool_name: None,
                         conversation_id: conversation_id.clone(),
@@ -732,6 +836,81 @@ fn parse_subagent_start_hook(line: &str) -> Option<SubagentStartData> {
     })
 }
 
+#[derive(Debug)]
+struct SubagentStopData {
+    parent_tool_use_id: Option<String>,
+    last_assistant_message: Option<String>,
+}
+
+/// Extracts the content of a Rust Debug-formatted `Some("...")` field from a hook line.
+/// Handles escaped characters (e.g. `\"` → `"`, `\\` → `\`, `\n` → newline).
+/// Returns `None` if the field is absent or formatted as `None`.
+fn extract_debug_string_value(line: &str, key: &str) -> Option<String> {
+    let prefix = format!("{}=Some(\"", key);
+    let start_idx = line.find(&prefix)? + prefix.len();
+    let rest = &line[start_idx..];
+
+    let mut result = String::new();
+    let mut chars = rest.chars();
+    loop {
+        match chars.next() {
+            Some('"') => return Some(result),
+            Some('\\') => match chars.next() {
+                Some('n') => result.push('\n'),
+                Some('t') => result.push('\t'),
+                Some('"') => result.push('"'),
+                Some('\\') => result.push('\\'),
+                Some(c) => {
+                    result.push('\\');
+                    result.push(c);
+                }
+                None => break,
+            },
+            Some(c) => result.push(c),
+            None => break,
+        }
+    }
+    None
+}
+
+fn parse_subagent_stop_hook(line: &str) -> Option<SubagentStopData> {
+    // Parse: [SubagentStop Hook] ... parent_tool_use_id=Some("toolu_xxx"), last_assistant_message=Some("..."), ...
+
+    let parent_tool_use_id = extract_debug_string_value(line, "parent_tool_use_id");
+    let last_assistant_message = extract_debug_string_value(line, "last_assistant_message");
+
+    Some(SubagentStopData {
+        parent_tool_use_id,
+        last_assistant_message,
+    })
+}
+
+/// Extract text content from a ToolResult's `content` field.
+/// The content may be a JSON string or an array of typed content blocks.
+fn extract_tool_result_text(content: &serde_json::Value) -> Option<String> {
+    match content {
+        serde_json::Value::String(s) if !s.is_empty() => Some(s.clone()),
+        serde_json::Value::Array(blocks) => {
+            let texts: Vec<String> = blocks
+                .iter()
+                .filter_map(|block| {
+                    if block.get("type")?.as_str()? == "text" {
+                        block.get("text")?.as_str().map(String::from)
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+            if texts.is_empty() {
+                None
+            } else {
+                Some(texts.join("\n"))
+            }
+        }
+        _ => None,
+    }
+}
+
 fn process_json_line(
     line: &str,
     app: &AppHandle,
@@ -901,7 +1080,8 @@ fn process_json_line(
                         }
 
                         // Emit agent-start event for Task tool invocations
-                        if name == "Task" {
+                        // Support both "Task" and "Task(agent_type)" syntax (CLI v2.1.33+)
+                        if name == "Task" || name.starts_with("Task(") {
                             let description = input
                                 .get("description")
                                 .and_then(|v| v.as_str())
@@ -936,6 +1116,34 @@ fn process_json_line(
                             );
                         }
 
+                        // Emit todo-update event for TodoWrite tool invocations
+                        if name == "TodoWrite" {
+                            if let Some(todos_value) = input.get("todos") {
+                                if let Some(todos_array) = todos_value.as_array() {
+                                    let todos: Vec<TodoItem> = todos_array
+                                        .iter()
+                                        .filter_map(|todo| {
+                                            serde_json::from_value(todo.clone()).ok()
+                                        })
+                                        .collect();
+
+                                    tracing::debug!(
+                                        "Emitting todo-update: {} todos, parent={:?}",
+                                        todos.len(),
+                                        parent_tool_use_id
+                                    );
+
+                                    let _ = app.emit(
+                                        "claude:todo-update",
+                                        TodoUpdateEvent {
+                                            todos,
+                                            conversation_id: conversation_id.clone(),
+                                        },
+                                    );
+                                }
+                            }
+                        }
+
                         let desc = format_tool_description(name, input);
                         let _ = app.emit(
                             "claude:output",
@@ -956,25 +1164,45 @@ fn process_json_line(
                             stats.write().increment_code_blocks();
                         }
 
+                        let is_prompt_too_long = text.starts_with("Prompt is too long");
+
                         let _ = app.emit(
                             "claude:output",
                             OutputEvent {
-                                line_type: "assistant".to_string(),
+                                line_type: if is_prompt_too_long {
+                                    "error".to_string()
+                                } else {
+                                    "assistant".to_string()
+                                },
                                 content: text.clone(),
                                 tool_name: None,
                                 conversation_id: conversation_id.clone(),
-                                cost: message_cost.clone(), // Include cost with assistant text
+                                cost: message_cost.clone(),
                                 parent_tool_use_id: parent_tool_use_id.clone(),
                             },
                         );
+
+                        if is_prompt_too_long {
+                            let _ = app.emit(
+                                "claude:output",
+                                OutputEvent {
+                                    line_type: "compact-prompt".to_string(),
+                                    content: String::new(),
+                                    tool_name: None,
+                                    conversation_id: conversation_id.clone(),
+                                    cost: None,
+                                    parent_tool_use_id: None,
+                                },
+                            );
+                        }
                     }
                     ContentBlock::Thinking { thinking } => {
                         state = CharacterState::Thinking;
                         let _ = app.emit(
                             "claude:output",
                             OutputEvent {
-                                line_type: "system".to_string(),
-                                content: format!("[Thinking] {}", thinking),
+                                line_type: "thinking".to_string(),
+                                content: thinking.clone(),
                                 tool_name: None,
                                 conversation_id: conversation_id.clone(),
                                 cost: None,
@@ -984,8 +1212,8 @@ fn process_json_line(
                     }
                     ContentBlock::ToolResult {
                         tool_use_id,
+                        content,
                         is_error,
-                        ..
                     } => {
                         // Emit agent-end for all tool results
                         // The frontend will ignore IDs that don't match known agents
@@ -1003,6 +1231,7 @@ fn process_json_line(
                                 conversation_id: conversation_id.clone(),
                                 duration_ms: None,
                                 num_turns: None,
+                                last_assistant_message: extract_tool_result_text(content),
                             },
                         );
                     }
@@ -1395,6 +1624,23 @@ fn process_json_line(
             emit_state_change(app, state, None, conversation_id.clone());
         }
 
+        ClaudeMessage::RateLimitEvent { rate_limit_info } => {
+            tracing::warn!("Rate limit event received: {:?}", rate_limit_info);
+
+            let content = format_rate_limit_message(rate_limit_info);
+            let _ = app.emit(
+                "claude:output",
+                OutputEvent {
+                    line_type: "rate-limit".to_string(),
+                    content,
+                    tool_name: None,
+                    conversation_id: conversation_id.clone(),
+                    cost: None,
+                    parent_tool_use_id: None,
+                },
+            );
+        }
+
         ClaudeMessage::User { message } => {
             // Increment message count for user messages
             stats.write().increment_messages();
@@ -1403,8 +1649,8 @@ fn process_json_line(
             for block in &message.content {
                 if let ContentBlock::ToolResult {
                     tool_use_id,
+                    content,
                     is_error,
-                    ..
                 } = block
                 {
                     let now = SystemTime::now()
@@ -1421,6 +1667,7 @@ fn process_json_line(
                             conversation_id: conversation_id.clone(),
                             duration_ms: None,
                             num_turns: None,
+                            last_assistant_message: extract_tool_result_text(content),
                         },
                     );
                 }
@@ -1496,18 +1743,58 @@ fn get_tool_state(tool_name: &str) -> CharacterState {
         CharacterState::Coding
     } else if tool_name.starts_with("mcp__") {
         CharacterState::Mcp
-    } else if tool_name == "Task" {
+    } else if tool_name == "Task" || tool_name.starts_with("Task(") {
         CharacterState::Thinking
     } else {
         CharacterState::Typing
     }
 }
 
+fn format_rate_limit_message(info: &crate::types::RateLimitInfo) -> String {
+    let mut parts = Vec::new();
+
+    if let (Some(remaining), Some(limit)) = (info.requests_remaining, info.requests_limit) {
+        parts.push(format!("requests: {}/{}", remaining, limit));
+    }
+
+    if let (Some(remaining), Some(limit)) = (info.tokens_remaining, info.tokens_limit) {
+        parts.push(format!("tokens: {}/{}", remaining, limit));
+    }
+
+    if let Some(reset) = &info.requests_reset {
+        parts.push(format!("resets at {}", reset));
+    } else if let Some(reset) = &info.tokens_reset {
+        parts.push(format!("resets at {}", reset));
+    }
+
+    if let Some(retry_ms) = info.retry_after_ms {
+        let secs = retry_ms / 1000;
+        parts.push(format!("retry after {}s", secs));
+    }
+
+    if parts.is_empty() {
+        "Rate limit reached".to_string()
+    } else {
+        format!("Rate limit reached — {}", parts.join(", "))
+    }
+}
+
 fn format_tool_description(name: &str, input: &serde_json::Value) -> String {
+    // Helper function to check if a path is a memory file
+    fn is_memory_path(path: &str) -> bool {
+        path.contains("/.claude/") && (path.contains("/memory/") || path.ends_with("/MEMORY.md"))
+    }
+
     match name {
         "Read" => {
             if let Some(path) = input.get("file_path").and_then(|v| v.as_str()) {
-                format!("Reading file: {}", path)
+                if is_memory_path(path) {
+                    // Extract just the filename for cleaner display
+                    let filename = path.split('/').next_back().unwrap_or(path);
+                    format!("📝 Reading memory: {}", filename)
+                } else {
+                    format!("Reading file: {}", path)
+                }
             } else {
                 "Reading file...".to_string()
             }
@@ -1526,21 +1813,33 @@ fn format_tool_description(name: &str, input: &serde_json::Value) -> String {
                 "Searching in files...".to_string()
             }
         }
-        "Edit" | "Write" => {
+        "Edit" => {
             if let Some(path) = input.get("file_path").and_then(|v| v.as_str()) {
-                format!("Editing: {}", path)
+                if is_memory_path(path) {
+                    let filename = path.split('/').next_back().unwrap_or(path);
+                    format!("💾 Updating memory: {}", filename)
+                } else {
+                    format!("Editing: {}", path)
+                }
+            } else {
+                "Editing file...".to_string()
+            }
+        }
+        "Write" => {
+            if let Some(path) = input.get("file_path").and_then(|v| v.as_str()) {
+                if is_memory_path(path) {
+                    let filename = path.split('/').next_back().unwrap_or(path);
+                    format!("💾 Writing memory: {}", filename)
+                } else {
+                    format!("Editing: {}", path)
+                }
             } else {
                 "Editing file...".to_string()
             }
         }
         "Bash" => {
             if let Some(cmd) = input.get("command").and_then(|v| v.as_str()) {
-                let truncated = if cmd.len() > 50 {
-                    format!("{}...", &cmd[..50])
-                } else {
-                    cmd.to_string()
-                };
-                format!("Running: {}", truncated)
+                format!("Running: {}", cmd)
             } else {
                 "Running command...".to_string()
             }
@@ -1623,6 +1922,19 @@ mod tests {
     #[test]
     fn test_get_tool_state_task() {
         assert!(matches!(get_tool_state("Task"), CharacterState::Thinking));
+        // Test CLI v2.1.33+ Task(agent_type) syntax
+        assert!(matches!(
+            get_tool_state("Task(Explore)"),
+            CharacterState::Thinking
+        ));
+        assert!(matches!(
+            get_tool_state("Task(Plan)"),
+            CharacterState::Thinking
+        ));
+        assert!(matches!(
+            get_tool_state("Task(general-purpose)"),
+            CharacterState::Thinking
+        ));
     }
 
     #[test]
@@ -1688,9 +2000,7 @@ mod tests {
         let long_cmd = "a".repeat(100);
         let input = serde_json::json!({"command": long_cmd});
         let desc = format_tool_description("Bash", &input);
-        assert!(desc.starts_with("Running: "));
-        assert!(desc.ends_with("..."));
-        assert!(desc.len() < 70);
+        assert_eq!(desc, format!("Running: {}", long_cmd));
     }
 
     #[test]
@@ -1700,6 +2010,39 @@ mod tests {
         assert_eq!(desc, "Using tool: CustomTool");
     }
 
+    #[test]
+    fn test_format_tool_description_memory_read() {
+        let input =
+            serde_json::json!({"file_path": "/home/user/.claude/projects/test/memory/MEMORY.md"});
+        let desc = format_tool_description("Read", &input);
+        assert_eq!(desc, "📝 Reading memory: MEMORY.md");
+    }
+
+    #[test]
+    fn test_format_tool_description_memory_write() {
+        let input = serde_json::json!(
+            {"file_path": "/home/user/.claude/projects/test/memory/notes.md"}
+        );
+        let desc = format_tool_description("Write", &input);
+        assert_eq!(desc, "💾 Writing memory: notes.md");
+    }
+
+    #[test]
+    fn test_format_tool_description_memory_edit() {
+        let input = serde_json::json!(
+            {"file_path": "/home/user/.claude/projects/test/memory/patterns.md"}
+        );
+        let desc = format_tool_description("Edit", &input);
+        assert_eq!(desc, "💾 Updating memory: patterns.md");
+    }
+
+    #[test]
+    fn test_format_tool_description_non_memory_read() {
+        let input = serde_json::json!({"file_path": "/home/user/code/test.txt"});
+        let desc = format_tool_description("Read", &input);
+        assert_eq!(desc, "Reading file: /home/user/code/test.txt");
+    }
+
     #[test]
     fn test_wsl_bridge_new() {
         let bridge = WslBridge::new();
@@ -1713,6 +2056,69 @@ mod tests {
         assert!(!bridge.is_running());
     }
 
+    #[test]
+    fn test_stale_process_detection_with_try_wait() {
+        // Spawn a real process that exits immediately so we can verify try_wait detects it
+        let mut child = Command::new("true").spawn().expect("Failed to spawn 'true'");
+
+        // Wait for it to exit
+        let _ = child.wait();
+
+        // try_wait on an already-exited process should return Some(_)
+        let status = child.try_wait();
+        assert!(
+            status.is_ok(),
+            "try_wait should not error on an exited process"
+        );
+        // The process has already been waited on, so try_wait might return None or Some
+        // depending on the OS - what matters is that the call succeeds
+    }
+
+    #[test]
+    fn test_stale_process_is_some_after_exit() {
+        // Verify the logic used in start(): a process that has exited is detected
+        // and the handle is cleaned up so start() can proceed
+        let mut child = Command::new("true").spawn().expect("Failed to spawn 'true'");
+
+        // Let it exit
+        let _ = child.wait();
+
+        // This mirrors the check in start()
+        let has_exited = child
+            .try_wait()
+            .map(|s| s.is_some())
+            .unwrap_or(false);
+
+        // After wait(), try_wait() returns None (already reaped), which means
+        // unwrap_or(false) → false. The important thing is the call doesn't panic
+        // and the control flow logic compiles and runs correctly.
+        let _ = has_exited; // suppress unused warning
+    }
+
+    /// Build the WSL binary check command structure without executing it (for testing)
+    #[cfg(test)]
+    fn build_wsl_binary_check_args() -> Vec<&'static str> {
+        vec!["-e", "bash", "-lc", "which claude"]
+    }
+
+    #[test]
+    fn test_wsl_binary_check_command_structure() {
+        // Windows path: verify Claude is detected inside WSL via `wsl -e bash -lc "which claude"`
+        let args = build_wsl_binary_check_args();
+        assert_eq!(args[0], "-e");
+        assert_eq!(args[1], "bash");
+        assert_eq!(args[2], "-lc");
+        assert_eq!(args[3], "which claude");
+    }
+
+    #[test]
+    fn test_linux_binary_check_does_not_panic() {
+        // Linux/WSL path: find_claude_binary() searches Linux filesystem paths.
+        // We just verify it runs without panicking; whether it returns Some depends
+        // on whether Claude is actually installed in this environment.
+        let _result = find_claude_binary();
+    }
+
     #[test]
     fn test_create_shared_bridge_manager() {
         use crate::bridge_manager::create_shared_bridge_manager;
@@ -1720,4 +2126,233 @@ mod tests {
         let manager = shared.lock();
         assert!(manager.get_active_conversations().is_empty());
     }
+
+    // SubagentStart hook parsing tests
+    #[test]
+    fn test_parse_subagent_start_hook_with_parent() {
+        let line = r#"[SubagentStart Hook] agent_id=agent-abc123, parent_tool_use_id=Some("toolu_01XYZ789"), session_id=123"#;
+        let result = parse_subagent_start_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.agent_id, "agent-abc123");
+        assert_eq!(data.parent_tool_use_id, Some("toolu_01XYZ789".to_string()));
+    }
+
+    #[test]
+    fn test_parse_subagent_start_hook_without_parent() {
+        let line = r#"[SubagentStart Hook] agent_id=agent-xyz789, parent_tool_use_id=None, session_id=456"#;
+        let result = parse_subagent_start_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.agent_id, "agent-xyz789");
+        assert_eq!(data.parent_tool_use_id, None);
+    }
+
+    #[test]
+    fn test_parse_subagent_start_hook_invalid() {
+        let line = "[SubagentStart Hook] invalid data";
+        let result = parse_subagent_start_hook(line);
+
+        assert!(result.is_none());
+    }
+
+    #[test]
+    fn test_parse_subagent_start_hook_with_extra_fields() {
+        let line = r#"[SubagentStart Hook] agent_id=agent-test, parent_tool_use_id=Some("toolu_test"), session_id=789, cwd=/home/user"#;
+        let result = parse_subagent_start_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.agent_id, "agent-test");
+        assert_eq!(data.parent_tool_use_id, Some("toolu_test".to_string()));
+    }
+
+    // SubagentStop hook parsing tests
+    #[test]
+    fn test_parse_subagent_stop_hook_with_parent() {
+        let line = r#"[SubagentStop Hook] stop_hook_active=true, parent_tool_use_id=Some("toolu_01ABC123"), session_id=123"#;
+        let result = parse_subagent_stop_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.parent_tool_use_id, Some("toolu_01ABC123".to_string()));
+    }
+
+    #[test]
+    fn test_parse_subagent_stop_hook_without_parent() {
+        let line = r#"[SubagentStop Hook] stop_hook_active=true, parent_tool_use_id=None, session_id=456"#;
+        let result = parse_subagent_stop_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.parent_tool_use_id, None);
+    }
+
+    #[test]
+    fn test_parse_subagent_stop_hook_minimal() {
+        let line = r#"[SubagentStop Hook] parent_tool_use_id=Some("toolu_minimal")"#;
+        let result = parse_subagent_stop_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.parent_tool_use_id, Some("toolu_minimal".to_string()));
+    }
+
+    #[test]
+    fn test_parse_subagent_stop_hook_with_extra_fields() {
+        let line = r#"[SubagentStop Hook] stop_hook_active=false, parent_tool_use_id=Some("toolu_extra"), session_id=789, transcript_path=/path/to/transcript"#;
+        let result = parse_subagent_stop_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.parent_tool_use_id, Some("toolu_extra".to_string()));
+    }
+
+    #[test]
+    fn test_parse_subagent_stop_hook_empty() {
+        let line = "[SubagentStop Hook]";
+        let result = parse_subagent_stop_hook(line);
+
+        // Should still return Some with None parent_tool_use_id
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.parent_tool_use_id, None);
+        assert_eq!(data.last_assistant_message, None);
+    }
+
+    #[test]
+    fn test_parse_subagent_stop_hook_with_last_message() {
+        let line = r#"[SubagentStop Hook] stop_hook_active=true, parent_tool_use_id=Some("toolu_01ABC123"), last_assistant_message=Some("Task completed successfully."), session_id=123"#;
+        let result = parse_subagent_stop_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.parent_tool_use_id, Some("toolu_01ABC123".to_string()));
+        assert_eq!(
+            data.last_assistant_message,
+            Some("Task completed successfully.".to_string())
+        );
+    }
+
+    #[test]
+    fn test_parse_subagent_stop_hook_with_last_message_none() {
+        let line = r#"[SubagentStop Hook] stop_hook_active=true, parent_tool_use_id=Some("toolu_01ABC123"), last_assistant_message=None, session_id=123"#;
+        let result = parse_subagent_stop_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(data.last_assistant_message, None);
+    }
+
+    #[test]
+    fn test_extract_debug_string_value_simple() {
+        let line = r#"key=Some("hello world")"#;
+        assert_eq!(
+            extract_debug_string_value(line, "key"),
+            Some("hello world".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_debug_string_value_with_escaped_quotes() {
+        let line = r#"key=Some("say \"hi\" there")"#;
+        assert_eq!(
+            extract_debug_string_value(line, "key"),
+            Some(r#"say "hi" there"#.to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_debug_string_value_none_variant() {
+        let line = "key=None";
+        assert_eq!(extract_debug_string_value(line, "key"), None);
+    }
+
+    #[test]
+    fn test_extract_debug_string_value_missing_key() {
+        let line = "other=Some(\"value\")";
+        assert_eq!(extract_debug_string_value(line, "key"), None);
+    }
+
+    #[test]
+    fn test_parse_subagent_stop_hook_with_commas_in_message() {
+        let line = r#"[SubagentStop Hook] parent_tool_use_id=Some("toolu_01"), last_assistant_message=Some("Found 3 files, all passing.")"#;
+        let result = parse_subagent_stop_hook(line);
+
+        assert!(result.is_some());
+        let data = result.unwrap();
+        assert_eq!(
+            data.last_assistant_message,
+            Some("Found 3 files, all passing.".to_string())
+        );
+    }
+
+    // extract_tool_result_text tests
+    #[test]
+    fn test_extract_tool_result_text_plain_string() {
+        let content = serde_json::json!("Hello from agent");
+        assert_eq!(
+            extract_tool_result_text(&content),
+            Some("Hello from agent".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_tool_result_text_empty_string() {
+        let content = serde_json::json!("");
+        assert_eq!(extract_tool_result_text(&content), None);
+    }
+
+    #[test]
+    fn test_extract_tool_result_text_array_single_text_block() {
+        let content = serde_json::json!([{"type": "text", "text": "Agent completed the task."}]);
+        assert_eq!(
+            extract_tool_result_text(&content),
+            Some("Agent completed the task.".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_tool_result_text_array_multiple_text_blocks() {
+        let content = serde_json::json!([
+            {"type": "text", "text": "First part."},
+            {"type": "text", "text": "Second part."}
+        ]);
+        assert_eq!(
+            extract_tool_result_text(&content),
+            Some("First part.\nSecond part.".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_tool_result_text_array_non_text_block() {
+        let content = serde_json::json!([{"type": "image", "source": {"type": "base64"}}]);
+        assert_eq!(extract_tool_result_text(&content), None);
+    }
+
+    #[test]
+    fn test_extract_tool_result_text_array_mixed_blocks() {
+        let content = serde_json::json!([
+            {"type": "image", "source": {}},
+            {"type": "text", "text": "Found results."}
+        ]);
+        assert_eq!(
+            extract_tool_result_text(&content),
+            Some("Found results.".to_string())
+        );
+    }
+
+    #[test]
+    fn test_extract_tool_result_text_null() {
+        let content = serde_json::Value::Null;
+        assert_eq!(extract_tool_result_text(&content), None);
+    }
+
+    #[test]
+    fn test_extract_tool_result_text_empty_array() {
+        let content = serde_json::json!([]);
+        assert_eq!(extract_tool_result_text(&content), None);
+    }
 }

src-tauri/tauri.conf.json

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

src/lib/commands/slashCommands.ts

@@ -61,6 +61,8 @@ async function changeDirectory(path: string): Promise<void> {
         custom_instructions: config.custom_instructions || null,
         mcp_servers_json: config.mcp_servers_json || null,
         allowed_tools: allAllowedTools,
+        use_worktree: config.use_worktree ?? false,
+        disable_1m_context: config.disable_1m_context ?? false,
       },
     });
 
@@ -135,6 +137,8 @@ async function startNewConversation(): Promise<void> {
         custom_instructions: config.custom_instructions || null,
         mcp_servers_json: config.mcp_servers_json || null,
         allowed_tools: allAllowedTools,
+        use_worktree: config.use_worktree ?? false,
+        disable_1m_context: config.disable_1m_context ?? false,
       },
     });
 

src/lib/components/AgentMonitorPanel.svelte

@@ -118,6 +118,8 @@
 
     try {
       await invoke("interrupt_claude", { conversationId: currentConversationId });
+      // Mark all running agents as errored after killing the process
+      agentStore.markAllErrored(currentConversationId);
     } catch (error) {
       console.error("Failed to kill Claude process:", error);
     }
@@ -268,6 +270,14 @@
                     />
                   </svg>
                 {/if}
+                <img
+                  src={agent.characterAvatar}
+                  alt={agent.characterName}
+                  class="w-5 h-5 rounded-full object-cover"
+                />
+                <span class="text-[10px] font-medium text-[var(--text-primary)]">
+                  {agent.characterName}
+                </span>
                 <span
                   class="px-1.5 py-0.5 text-[10px] rounded border {getStatusBadgeClass(
                     agent.status
@@ -308,6 +318,16 @@
                 <span class="text-[10px] text-red-400">Errored / Killed</span>
               {/if}
             </div>
+
+            <!-- Last assistant message snippet -->
+            {#if agent.lastAssistantMessage}
+              <p
+                class="mt-1 text-[10px] text-[var(--text-secondary)] italic truncate"
+                title={agent.lastAssistantMessage}
+              >
+                {agent.lastAssistantMessage}
+              </p>
+            {/if}
           </div>
         {/each}
       {/if}

src/lib/components/CastPanel.svelte

@@ -0,0 +1,140 @@
+<script lang="ts">
+  import { CHARACTER_POOL } from "$lib/utils/agentCharacters";
+
+  interface Props {
+    onClose: () => void;
+  }
+
+  const { onClose }: Props = $props();
+</script>
+
+<div
+  class="fixed inset-0 bg-black/50 backdrop-blur-sm z-50 flex items-center justify-center p-4"
+  onclick={onClose}
+  role="button"
+  tabindex="0"
+  onkeydown={(e) => e.key === "Escape" && onClose()}
+>
+  <div
+    class="bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg shadow-xl max-w-2xl w-full p-6 max-h-[90vh] overflow-y-auto"
+    onclick={(e) => e.stopPropagation()}
+    onkeydown={(e) => e.stopPropagation()}
+    role="dialog"
+    aria-labelledby="cast-title"
+    tabindex="-1"
+  >
+    <div class="flex items-center justify-between mb-6">
+      <h2 id="cast-title" class="text-xl font-semibold text-[var(--text-primary)]">
+        Meet the Team
+      </h2>
+      <button
+        onclick={onClose}
+        class="p-1 text-[var(--text-secondary)] hover:text-[var(--text-primary)] transition-colors"
+        aria-label="Close"
+      >
+        <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M6 18L18 6M6 6l12 12"
+          />
+        </svg>
+      </button>
+    </div>
+
+    <!-- Principal cast: Hikari + Naomi -->
+    <div class="grid grid-cols-1 gap-3 mb-6 sm:grid-cols-2">
+      <div
+        class="flex items-center gap-3 p-4 rounded-lg bg-[var(--bg-secondary)] border border-[var(--accent-primary)]/40"
+      >
+        <img
+          src="https://cdn.nhcarrigan.com/hikari.png"
+          alt="Hikari"
+          class="w-16 h-16 object-cover rounded-full border-2 border-[var(--border-color)] shrink-0"
+        />
+        <div>
+          <div class="flex items-center gap-2 mb-1">
+            <span class="font-semibold text-[var(--text-primary)]">Hikari</span>
+            <span
+              class="text-xs px-2 py-0.5 rounded-full bg-[var(--accent-primary)]/20 text-[var(--accent-primary)] font-medium"
+            >
+              Chief Operating Officer
+            </span>
+          </div>
+          <p class="text-xs text-[var(--text-secondary)]">
+            Holds the line so the others don't have to. Never without her clipboard — or her
+            glasses.
+          </p>
+        </div>
+      </div>
+      <div
+        class="flex items-center gap-3 p-4 rounded-lg bg-[var(--bg-secondary)] border border-[var(--accent-primary)]/40"
+      >
+        <img
+          src="https://cdn.nhcarrigan.com/profile.png"
+          alt="Naomi"
+          class="w-16 h-16 object-cover rounded-full border-2 border-[var(--border-color)] shrink-0"
+        />
+        <div>
+          <div class="flex items-center gap-2 mb-1">
+            <span class="font-semibold text-[var(--text-primary)]">Naomi</span>
+            <span
+              class="text-xs px-2 py-0.5 rounded-full bg-[var(--accent-primary)]/20 text-[var(--accent-primary)] font-medium"
+            >
+              Chief hEx-ecutive Officer
+            </span>
+          </div>
+          <p class="text-xs text-[var(--text-secondary)]">
+            A 525-year-old vampire running a tech company from behind a VTuber avatar. Fixes server
+            crashes at 4 AM.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <!-- Subagent girls grid -->
+    <div>
+      <h3 class="text-sm font-medium text-[var(--text-secondary)] uppercase tracking-wider mb-3">
+        Subagent Squad
+      </h3>
+      <div class="grid grid-cols-2 gap-3 sm:grid-cols-3">
+        {#each CHARACTER_POOL as character (character.name)}
+          <div
+            class="flex flex-col items-center gap-2 p-3 rounded-lg bg-[var(--bg-secondary)] border border-[var(--border-color)] text-center"
+          >
+            <img
+              src={character.avatar}
+              alt={character.name}
+              class="w-14 h-14 object-cover rounded-full border-2 border-[var(--border-color)]"
+            />
+            <span class="text-sm font-medium text-[var(--text-primary)]">{character.name}</span>
+            <span
+              class="text-xs px-2 py-0.5 rounded-full bg-[var(--accent-primary)]/20 text-[var(--accent-primary)] font-medium"
+            >
+              {character.title}
+            </span>
+            <p class="text-xs text-[var(--text-secondary)] leading-snug">{character.description}</p>
+          </div>
+        {/each}
+      </div>
+    </div>
+  </div>
+</div>
+
+<style>
+  [role="dialog"] {
+    animation: slideIn 0.2s ease-out;
+  }
+
+  @keyframes slideIn {
+    from {
+      opacity: 0;
+      transform: scale(0.95);
+    }
+    to {
+      opacity: 1;
+      transform: scale(1);
+    }
+  }
+</style>

src/lib/components/CliVersion.svelte

@@ -0,0 +1,160 @@
+<script lang="ts">
+  import { invoke } from "@tauri-apps/api/core";
+  import { onMount } from "svelte";
+
+  const SUPPORTED_CLI_VERSION = "2.1.50";
+
+  let installedVersion = $state("Loading...");
+
+  function compareVersions(a: string, b: string): number {
+    const aParts = a.split(".").map(Number);
+    const bParts = b.split(".").map(Number);
+    for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
+      const aVal = aParts[i] ?? 0;
+      const bVal = bParts[i] ?? 0;
+      if (aVal > bVal) return 1;
+      if (aVal < bVal) return -1;
+    }
+    return 0;
+  }
+
+  let displayVersion = $derived(installedVersion.split(" (")[0]);
+
+  let supportedBadgeState = $derived.by(() => {
+    if (installedVersion === "Loading..." || installedVersion === "Unknown") {
+      return "neutral";
+    }
+    const semverMatch = /(\d+\.\d+\.\d+)/.exec(installedVersion);
+    if (!semverMatch) return "neutral";
+    const cmp = compareVersions(semverMatch[1], SUPPORTED_CLI_VERSION);
+    if (cmp > 0) return "ahead";
+    if (cmp < 0) return "behind";
+    return "current";
+  });
+
+  async function fetchVersion() {
+    try {
+      const result = await invoke<string>("get_claude_version");
+      installedVersion = result;
+    } catch (error) {
+      console.error("Failed to get Claude CLI version:", error);
+      installedVersion = "Unknown";
+    }
+  }
+
+  onMount(() => {
+    fetchVersion();
+  });
+</script>
+
+<div class="cli-versions">
+  <div class="cli-version">
+    <svg
+      class="terminal-icon"
+      width="14"
+      height="14"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    >
+      <polyline points="4 17 10 11 4 5" />
+      <line x1="12" y1="19" x2="20" y2="19" />
+    </svg>
+    <span class="version-text">CLI {displayVersion}</span>
+  </div>
+
+  <div class="cli-version supported {supportedBadgeState}" title="Highest audited CLI version">
+    <svg
+      class="terminal-icon"
+      width="14"
+      height="14"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    >
+      <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
+    </svg>
+    <span class="version-text">Supported {SUPPORTED_CLI_VERSION}</span>
+  </div>
+
+  {#if supportedBadgeState === "ahead"}
+    <span class="version-warning ahead"
+      >Your version is newer, some features may not be supported</span
+    >
+  {:else if supportedBadgeState === "behind"}
+    <span class="version-warning behind"
+      >Your version is out of date, please update to ensure compatibility</span
+    >
+  {/if}
+</div>
+
+<style>
+  .cli-versions {
+    display: flex;
+    gap: 6px;
+    align-items: center;
+  }
+
+  .cli-version {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 12px;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 6px;
+    color: var(--text-secondary);
+    font-size: 0.85rem;
+    font-family: var(--font-mono, monospace);
+    transition: all 0.2s;
+  }
+
+  .cli-version:hover {
+    border-color: var(--accent-primary);
+    color: var(--accent-primary);
+  }
+
+  .cli-version.supported.current {
+    border-color: var(--success-color, #4caf50);
+    color: var(--success-color, #4caf50);
+  }
+
+  .cli-version.supported.ahead {
+    border-color: var(--warning-color, #ff9800);
+    color: var(--warning-color, #ff9800);
+  }
+
+  .cli-version.supported.behind {
+    border-color: var(--error-color, #f44336);
+    color: var(--error-color, #f44336);
+  }
+
+  .terminal-icon {
+    flex-shrink: 0;
+    opacity: 0.7;
+  }
+
+  .version-text {
+    white-space: nowrap;
+  }
+
+  .version-warning {
+    font-size: 0.75rem;
+    font-style: italic;
+    white-space: nowrap;
+  }
+
+  .version-warning.ahead {
+    color: var(--warning-color, #ff9800);
+  }
+
+  .version-warning.behind {
+    color: var(--error-color, #f44336);
+  }
+</style>

src/lib/components/ConfigSidebar.svelte

@@ -12,6 +12,7 @@
   } from "$lib/stores/config";
   import { claudeStore } from "$lib/stores/claude";
   import { getCurrentWindow } from "@tauri-apps/api/window";
+  import { invoke } from "@tauri-apps/api/core";
   import CostSummary from "./CostSummary.svelte";
 
   let config: HikariConfig = $state({
@@ -51,10 +52,27 @@
     budget_action: "warn",
     budget_warning_threshold: 0.8,
     discord_rpc_enabled: true,
+    show_thinking_blocks: true,
+    use_worktree: false,
+    disable_1m_context: false,
   });
 
   let showCustomThemeEditor = $state(false);
 
+  interface AuthStatus {
+    is_logged_in: boolean;
+    email: string | null;
+    org_name: string | null;
+    api_key_source: string | null;
+    api_provider: string | null;
+    subscription_type: string | null;
+  }
+
+  let authStatus: AuthStatus | null = $state(null);
+  let authLoading = $state(false);
+  let authActionLoading = $state(false);
+  let authError: string | null = $state(null);
+
   let isOpen = $state(false);
   let isSaving = $state(false);
   let saveError: string | null = $state(null);
@@ -68,6 +86,9 @@
 
   configStore.isSidebarOpen.subscribe((open) => {
     isOpen = open;
+    if (open && authStatus === null) {
+      void refreshAuthStatus();
+    }
   });
 
   configStore.saveError.subscribe((error) => {
@@ -82,8 +103,9 @@
     { value: "", label: "Default (from ~/.claude)" },
     // Current generation (Claude 4.6)
     { value: "claude-opus-4-6", label: "Claude Opus 4.6 (Most Capable)" },
+    { value: "claude-sonnet-4-6", label: "Claude Sonnet 4.6 (Recommended)" },
     // Previous generation (Claude 4.5)
-    { value: "claude-sonnet-4-5-20250929", label: "Claude Sonnet 4.5 (Recommended)" },
+    { 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)
@@ -109,6 +131,44 @@
     "Task",
   ];
 
+  async function refreshAuthStatus() {
+    authLoading = true;
+    authError = null;
+    try {
+      authStatus = await invoke<AuthStatus>("get_auth_status");
+    } catch (e) {
+      authError = String(e);
+    } finally {
+      authLoading = false;
+    }
+  }
+
+  async function handleAuthLogin() {
+    authActionLoading = true;
+    authError = null;
+    try {
+      await invoke<string>("auth_login");
+      await refreshAuthStatus();
+    } catch (e) {
+      authError = String(e);
+    } finally {
+      authActionLoading = false;
+    }
+  }
+
+  async function handleAuthLogout() {
+    authActionLoading = true;
+    authError = null;
+    try {
+      await invoke<string>("auth_logout");
+      await refreshAuthStatus();
+    } catch (e) {
+      authError = String(e);
+    } finally {
+      authActionLoading = false;
+    }
+  }
+
   async function handleSave() {
     isSaving = true;
     saveError = null;
@@ -226,6 +286,101 @@
       </div>
     {/if}
 
+    <!-- Account Section -->
+    <section class="mb-6">
+      <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
+        Account
+      </h3>
+
+      {#if authLoading}
+        <div class="text-sm text-[var(--text-secondary)] py-2">Checking auth status...</div>
+      {:else if authStatus}
+        <div class="flex items-center gap-2 mb-3">
+          <span
+            class="inline-block w-2.5 h-2.5 rounded-full flex-shrink-0 {authStatus.is_logged_in
+              ? 'bg-green-500'
+              : 'bg-red-500'}"
+          ></span>
+          <span class="text-sm font-medium text-[var(--text-primary)]">
+            {authStatus.is_logged_in ? "Logged in" : "Not logged in"}
+          </span>
+        </div>
+        {#if authStatus.email || authStatus.org_name || authStatus.api_key_source || config.api_key}
+          <dl class="text-xs space-y-1 mb-3">
+            {#if authStatus.email}
+              <div class="flex gap-2">
+                <dt class="text-[var(--text-tertiary)] w-20 flex-shrink-0">Email</dt>
+                <dd class="text-[var(--text-primary)] break-all">{authStatus.email}</dd>
+              </div>
+            {/if}
+            {#if authStatus.org_name}
+              <div class="flex gap-2">
+                <dt class="text-[var(--text-tertiary)] w-20 flex-shrink-0">Org</dt>
+                <dd class="text-[var(--text-primary)]">{authStatus.org_name}</dd>
+              </div>
+            {/if}
+            {#if authStatus.api_key_source}
+              <div class="flex gap-2">
+                <dt class="text-[var(--text-tertiary)] w-20 flex-shrink-0">API key</dt>
+                <dd class="text-[var(--text-primary)]">{authStatus.api_key_source}</dd>
+              </div>
+            {/if}
+            {#if authStatus.subscription_type}
+              <div class="flex gap-2">
+                <dt class="text-[var(--text-tertiary)] w-20 flex-shrink-0">Plan</dt>
+                <dd class="text-[var(--text-primary)]">{authStatus.subscription_type}</dd>
+              </div>
+            {/if}
+            <div class="flex gap-2">
+              <dt class="text-[var(--text-tertiary)] w-20 flex-shrink-0">Override</dt>
+              <dd class="text-[var(--text-primary)]">
+                {#if config.api_key}
+                  {config.streamer_mode ? "Custom key set 🔒" : "Custom key set"}
+                {:else}
+                  None
+                {/if}
+              </dd>
+            </div>
+          </dl>
+        {/if}
+      {:else}
+        <div class="text-sm text-[var(--text-secondary)] py-2">Auth status unavailable</div>
+      {/if}
+
+      {#if authError}
+        <div class="mb-3 p-2 bg-red-500/20 border border-red-500/50 rounded text-red-400 text-xs">
+          {authError}
+        </div>
+      {/if}
+
+      <div class="flex gap-2">
+        <button
+          onclick={refreshAuthStatus}
+          disabled={authLoading || authActionLoading}
+          class="px-3 py-1.5 text-sm bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-secondary)] hover:border-[var(--accent-primary)] hover:text-[var(--text-primary)] transition-colors disabled:opacity-50"
+        >
+          Refresh
+        </button>
+        {#if authStatus && !authStatus.is_logged_in}
+          <button
+            onclick={handleAuthLogin}
+            disabled={authActionLoading}
+            class="btn-trans-gradient px-3 py-1.5 text-sm rounded-lg disabled:opacity-50"
+          >
+            {authActionLoading ? "Logging in..." : "Login"}
+          </button>
+        {:else if authStatus && authStatus.is_logged_in}
+          <button
+            onclick={handleAuthLogout}
+            disabled={authActionLoading}
+            class="px-3 py-1.5 text-sm bg-red-500/20 border border-red-500/50 rounded-lg text-red-400 hover:bg-red-500/30 transition-colors disabled:opacity-50"
+          >
+            {authActionLoading ? "Logging out..." : "Logout"}
+          </button>
+        {/if}
+      </div>
+    </section>
+
     <!-- Agent Settings Section -->
     <section class="mb-6">
       <h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
@@ -320,6 +475,37 @@
           class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] focus:outline-none focus:border-[var(--accent-primary)] resize-none"
         ></textarea>
       </div>
+
+      <!-- Worktree Isolation -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.use_worktree}
+            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)]">Worktree isolation</span>
+        </label>
+        <p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
+          Launch sessions with <code class="font-mono">--worktree</code> for isolated git worktree environments
+        </p>
+      </div>
+
+      <!-- Disable 1M Context Window -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.disable_1m_context}
+            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 1M context window</span>
+        </label>
+        <p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
+          Sets <code class="font-mono">CLAUDE_CODE_DISABLE_1M_CONTEXT=1</code> to opt out of the extended
+          context window
+        </p>
+      </div>
     </section>
 
     <!-- Greeting Section -->
@@ -703,6 +889,22 @@
           Use Ctrl++ / Ctrl+- to quickly adjust, Ctrl+0 to reset
         </p>
       </div>
+
+      <!-- Show Thinking Blocks Toggle -->
+      <div class="mb-4">
+        <label class="flex items-center gap-3 cursor-pointer">
+          <input
+            type="checkbox"
+            bind:checked={config.show_thinking_blocks}
+            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 Extended Thinking Blocks</span>
+        </label>
+        <p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
+          Display Claude's extended thinking process in the conversation. Thinking blocks can be
+          expanded/collapsed to see reasoning details.
+        </p>
+      </div>
     </section>
 
     <!-- Window Section -->

src/lib/components/InputBar.svelte

@@ -17,6 +17,8 @@
   } from "$lib/stores/historyRestore";
   import MessageModeSelector from "$lib/components/MessageModeSelector.svelte";
   import SlashCommandMenu from "$lib/components/SlashCommandMenu.svelte";
+  import SystemClock from "$lib/components/SystemClock.svelte";
+  import CliVersion from "$lib/components/CliVersion.svelte";
   import { getCurrentMode } from "$lib/stores/messageMode";
   import { formatMessageWithMode } from "$lib/types/messageMode";
   import {
@@ -360,6 +362,8 @@ User: ${formattedMessage}`;
               custom_instructions: config.custom_instructions || null,
               mcp_servers_json: config.mcp_servers_json || null,
               allowed_tools: allAllowedTools,
+              use_worktree: config.use_worktree ?? false,
+              disable_1m_context: config.disable_1m_context ?? false,
             },
           });
 
@@ -914,6 +918,9 @@ User: ${formattedMessage}`;
       </svg>
       <span>Clipboard</span>
     </button>
+
+    <CliVersion />
+    <SystemClock />
   </div>
 
   <div class="input-row">
@@ -1066,6 +1073,7 @@ User: ${formattedMessage}`;
     display: flex;
     align-items: center;
     gap: 8px;
+    flex-wrap: wrap;
   }
 
   .control-button {
@@ -1082,6 +1090,18 @@ User: ${formattedMessage}`;
     transition: all 0.2s;
     font-size: 14px;
     white-space: nowrap;
+    flex-shrink: 0;
+  }
+
+  /* Hide button text on smaller screens, show icons only */
+  @media (max-width: 640px) {
+    .control-button span {
+      display: none;
+    }
+    .control-button {
+      padding: 10px;
+      min-width: 40px;
+    }
   }
 
   .control-button:hover {

src/lib/components/McpManagementPanel.svelte

@@ -0,0 +1,433 @@
+<script lang="ts">
+  import { invoke } from "@tauri-apps/api/core";
+  import { onMount } from "svelte";
+  import { Trash2, RefreshCw, Server, Globe, Terminal } from "lucide-svelte";
+
+  interface Props {
+    onClose: () => void;
+  }
+
+  interface McpServerInfo {
+    name: string;
+    command: string | null;
+    url: string | null;
+    transport: string; // "stdio", "http", or "sse"
+    env: Record<string, string> | null;
+    status: string | null; // "Connected" or "Failed to connect"
+  }
+
+  const { onClose }: Props = $props();
+
+  let servers = $state<McpServerInfo[]>([]);
+  let isLoading = $state(true);
+  let error = $state<string | null>(null);
+  let selectedServer = $state<McpServerInfo | null>(null);
+  let isLoadingDetails = $state(false);
+  let actionInProgress = $state<string | null>(null);
+  let showAddForm = $state(false);
+  let serverDetails = $state<string>("");
+
+  // Add server form fields
+  let newServerName = $state("");
+  let newServerUrl = $state("");
+  let newServerTransport = $state("stdio");
+  let isAdding = $state(false);
+
+  async function loadServers(): Promise<void> {
+    try {
+      isLoading = true;
+      error = null;
+      servers = await invoke<McpServerInfo[]>("list_mcp_servers");
+    } catch (e) {
+      error = `Failed to load MCP servers: ${e}`;
+      console.error(error);
+    } finally {
+      isLoading = false;
+    }
+  }
+
+  async function loadServerDetails(name: string): Promise<void> {
+    try {
+      isLoadingDetails = true;
+      error = null;
+      selectedServer = await invoke<McpServerInfo>("get_mcp_server", { name });
+      serverDetails = await invoke<string>("get_mcp_server_details", { name });
+    } catch (e) {
+      error = `Failed to load server details: ${e}`;
+      console.error(error);
+    } finally {
+      isLoadingDetails = false;
+    }
+  }
+
+  async function removeServer(name: string): Promise<void> {
+    try {
+      actionInProgress = name;
+      error = null;
+      await invoke("remove_mcp_server", { name });
+      if (selectedServer?.name === name) {
+        selectedServer = null;
+        serverDetails = "";
+      }
+      await loadServers();
+    } catch (e) {
+      error = `Failed to remove server: ${e}`;
+      console.error(error);
+    } finally {
+      actionInProgress = null;
+    }
+  }
+
+  async function addServer(): Promise<void> {
+    if (!newServerName.trim() || !newServerUrl.trim()) return;
+
+    try {
+      isAdding = true;
+      error = null;
+      await invoke("add_mcp_server", {
+        name: newServerName.trim(),
+        commandOrUrl: newServerUrl.trim(),
+        transport: newServerTransport,
+        envVars: null,
+        headers: null,
+      });
+      newServerName = "";
+      newServerUrl = "";
+      newServerTransport = "stdio";
+      showAddForm = false;
+      await loadServers();
+    } catch (e) {
+      error = `Failed to add server: ${e}`;
+      console.error(error);
+    } finally {
+      isAdding = false;
+    }
+  }
+
+  function getTransportIcon(transport: string) {
+    switch (transport) {
+      case "http":
+        return Globe;
+      case "stdio":
+        return Terminal;
+      case "sse":
+        return Server;
+      default:
+        return Server;
+    }
+  }
+
+  function getTransportColor(transport: string) {
+    switch (transport) {
+      case "http":
+        return "text-blue-400";
+      case "stdio":
+        return "text-green-400";
+      case "sse":
+        return "text-purple-400";
+      default:
+        return "text-[var(--text-secondary)]";
+    }
+  }
+
+  onMount(() => {
+    loadServers();
+  });
+</script>
+
+<div
+  class="fixed top-0 right-0 h-full w-[700px] bg-[var(--bg-primary)] border-l border-[var(--accent-primary)]/30 shadow-2xl flex flex-col z-50"
+>
+  <!-- Header -->
+  <div class="flex items-center justify-between p-4 border-b border-[var(--accent-primary)]/30">
+    <div class="flex items-center gap-3">
+      <div class="text-[var(--accent-primary)]">
+        <Server class="w-6 h-6" />
+      </div>
+      <div>
+        <h2 class="text-lg font-semibold text-[var(--text-primary)]">MCP Server Management</h2>
+        <p class="text-xs text-[var(--text-secondary)]">
+          {servers.length} server{servers.length !== 1 ? "s" : ""} configured
+        </p>
+      </div>
+    </div>
+    <button
+      onclick={onClose}
+      class="text-[var(--text-secondary)] hover:text-[var(--text-primary)] transition-colors p-1 rounded-lg hover:bg-[var(--bg-secondary)]"
+      aria-label="Close MCP panel"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        class="h-5 w-5"
+        viewBox="0 0 20 20"
+        fill="currentColor"
+      >
+        <path
+          fill-rule="evenodd"
+          d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+          clip-rule="evenodd"
+        />
+      </svg>
+    </button>
+  </div>
+
+  <!-- Add Server Button -->
+  <div class="p-4 border-b border-[var(--border-color)]">
+    <button
+      onclick={() => (showAddForm = !showAddForm)}
+      class="w-full px-4 py-2 bg-[var(--accent-primary)] text-white rounded-lg text-sm font-medium hover:opacity-80 transition-opacity flex items-center justify-center gap-2"
+    >
+      <Server class="w-4 h-4" />
+      {showAddForm ? "Cancel" : "Add New Server"}
+    </button>
+  </div>
+
+  <!-- Add Server Form -->
+  {#if showAddForm}
+    <div
+      class="mx-4 mt-4 p-4 bg-[var(--bg-secondary)]/50 border border-[var(--border-color)] rounded-lg"
+    >
+      <h3 class="text-sm font-medium text-[var(--text-primary)] mb-3">Add MCP Server</h3>
+      <div class="space-y-3">
+        <div>
+          <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider block mb-1"
+            >Server Name</label
+          >
+          <input
+            type="text"
+            bind:value={newServerName}
+            placeholder="my-server"
+            class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
+          />
+        </div>
+        <div>
+          <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider block mb-1"
+            >Transport</label
+          >
+          <select
+            bind:value={newServerTransport}
+            class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
+          >
+            <option value="stdio">STDIO</option>
+            <option value="http">HTTP</option>
+            <option value="sse">SSE</option>
+          </select>
+        </div>
+        <div>
+          <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider block mb-1">
+            {newServerTransport === "stdio" ? "Command" : "URL"}
+          </label>
+          <input
+            type="text"
+            bind:value={newServerUrl}
+            placeholder={newServerTransport === "stdio"
+              ? "npx my-mcp-server"
+              : "https://mcp.example.com"}
+            class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
+          />
+        </div>
+        <button
+          onclick={addServer}
+          disabled={isAdding || !newServerName.trim() || !newServerUrl.trim()}
+          class="w-full px-4 py-2 bg-[var(--accent-primary)] text-white rounded-lg text-sm font-medium hover:opacity-80 disabled:opacity-40 disabled:cursor-not-allowed flex items-center justify-center gap-2"
+        >
+          {#if isAdding}
+            <RefreshCw class="w-4 h-4 animate-spin" />
+          {:else}
+            <Server class="w-4 h-4" />
+          {/if}
+          Add Server
+        </button>
+      </div>
+    </div>
+  {/if}
+
+  <!-- Error Display -->
+  {#if error}
+    <div class="mx-4 mt-4 p-3 bg-red-500/20 border border-red-500/30 rounded-lg">
+      <p class="text-sm text-red-400">{error}</p>
+    </div>
+  {/if}
+
+  <!-- Content -->
+  <div class="flex-1 overflow-y-auto p-4 flex gap-4">
+    <!-- Server List -->
+    <div class="flex-1">
+      {#if isLoading}
+        <div class="flex items-center justify-center h-full text-[var(--text-secondary)]">
+          <RefreshCw class="w-8 h-8 animate-spin" />
+        </div>
+      {:else if servers.length === 0}
+        <div class="flex flex-col items-center justify-center h-full text-[var(--text-secondary)]">
+          <Server class="w-16 h-16 mb-4 opacity-50" />
+          <p class="text-center">No MCP servers configured</p>
+          <p class="text-sm text-center mt-2">Add servers via Settings</p>
+        </div>
+      {:else}
+        <div class="space-y-2">
+          {#each servers as server (server.name)}
+            <button
+              onclick={() => loadServerDetails(server.name)}
+              class="w-full bg-[var(--bg-secondary)]/50 rounded-lg p-3 border border-[var(--border-color)] hover:border-[var(--accent-primary)]/50 transition-all text-left"
+              class:border-[var(--accent-primary)]={selectedServer?.name === server.name}
+            >
+              <div class="flex items-start justify-between">
+                <div class="flex-1">
+                  <h4 class="font-medium text-[var(--text-primary)] flex items-center gap-2">
+                    <svelte:component
+                      this={getTransportIcon(server.transport)}
+                      class="w-4 h-4 {getTransportColor(server.transport)}"
+                    />
+                    {server.name}
+                    {#if server.status}
+                      {#if server.status.includes("Connected")}
+                        <span
+                          class="px-2 py-0.5 bg-[var(--success-color)]/20 text-[var(--success-color)] text-xs rounded border border-[var(--success-color)]/30"
+                        >
+                          ✓
+                        </span>
+                      {:else}
+                        <span
+                          class="px-2 py-0.5 bg-red-500/20 text-red-400 text-xs rounded border border-red-500/30"
+                        >
+                          ✗
+                        </span>
+                      {/if}
+                    {/if}
+                  </h4>
+                  <p class="text-xs text-[var(--text-secondary)] mt-1">
+                    {server.transport.toUpperCase()}
+                    {#if server.url}
+                      • {server.url}
+                    {:else if server.command}
+                      • {server.command}
+                    {/if}
+                  </p>
+                </div>
+              </div>
+            </button>
+          {/each}
+        </div>
+      {/if}
+    </div>
+
+    <!-- Server Details Panel -->
+    {#if selectedServer}
+      <div
+        class="w-80 bg-[var(--bg-secondary)]/50 rounded-lg p-4 border border-[var(--border-color)]"
+      >
+        <h3 class="text-lg font-semibold text-[var(--text-primary)] mb-4">Server Details</h3>
+
+        {#if isLoadingDetails}
+          <div class="flex items-center justify-center h-32">
+            <RefreshCw class="w-6 h-6 animate-spin text-[var(--text-secondary)]" />
+          </div>
+        {:else}
+          <div class="space-y-4">
+            <!-- Name -->
+            <div>
+              <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider"
+                >Name</label
+              >
+              <p class="text-sm text-[var(--text-primary)] mt-1">{selectedServer.name}</p>
+            </div>
+
+            <!-- Transport -->
+            <div>
+              <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider"
+                >Transport</label
+              >
+              <p class="text-sm text-[var(--text-primary)] mt-1 flex items-center gap-2">
+                <svelte:component
+                  this={getTransportIcon(selectedServer.transport)}
+                  class="w-4 h-4 {getTransportColor(selectedServer.transport)}"
+                />
+                {selectedServer.transport.toUpperCase()}
+              </p>
+            </div>
+
+            <!-- URL or Command -->
+            {#if selectedServer.url}
+              <div>
+                <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider"
+                  >URL</label
+                >
+                <p
+                  class="text-sm text-[var(--text-primary)] mt-1 break-all font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)]"
+                >
+                  {selectedServer.url}
+                </p>
+              </div>
+            {/if}
+
+            {#if selectedServer.command}
+              <div>
+                <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider"
+                  >Command</label
+                >
+                <p
+                  class="text-sm text-[var(--text-primary)] mt-1 font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)]"
+                >
+                  {selectedServer.command}
+                </p>
+              </div>
+            {/if}
+
+            <!-- Environment Variables -->
+            {#if selectedServer.env}
+              <div>
+                <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider"
+                  >Environment</label
+                >
+                <pre
+                  class="text-xs text-[var(--text-primary)] mt-1 font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)] overflow-x-auto">{JSON.stringify(
+                    selectedServer.env,
+                    null,
+                    2
+                  )}</pre>
+              </div>
+            {/if}
+
+            <!-- Full Server Details -->
+            {#if serverDetails}
+              <div>
+                <label class="text-xs text-[var(--text-secondary)] uppercase tracking-wider"
+                  >Full Details</label
+                >
+                <pre
+                  class="text-xs text-[var(--text-primary)] mt-1 font-mono bg-[var(--bg-primary)] p-2 rounded border border-[var(--border-color)] overflow-x-auto whitespace-pre-wrap">{serverDetails}</pre>
+              </div>
+            {/if}
+
+            <!-- Actions -->
+            <div class="pt-4 border-t border-[var(--border-color)]">
+              <button
+                onclick={() => selectedServer && removeServer(selectedServer.name)}
+                disabled={actionInProgress === selectedServer?.name}
+                class="w-full px-4 py-2 bg-red-500/20 border border-red-500/30 rounded-lg text-sm text-red-400 hover:bg-red-500/30 transition-colors disabled:opacity-40 disabled:cursor-not-allowed flex items-center justify-center gap-2"
+              >
+                <Trash2 class="w-4 h-4" />
+                Remove Server
+              </button>
+            </div>
+          </div>
+        {/if}
+      </div>
+    {/if}
+  </div>
+</div>
+
+<style>
+  @keyframes spin {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .animate-spin {
+    animation: spin 1s linear infinite;
+  }
+</style>

src/lib/components/MemoryBrowserPanel.svelte

@@ -0,0 +1,458 @@
+<script lang="ts">
+  import { onMount } from "svelte";
+  import { invoke } from "@tauri-apps/api/core";
+  import Markdown from "./Markdown.svelte";
+
+  let memoryFiles: string[] = $state([]);
+  let selectedFile: string | null = $state(null);
+  let fileContent: string = $state("");
+  let isLoading = $state(false);
+  let error: string | null = $state(null);
+  let isPanelOpen = $state(false);
+
+  interface MemoryFilesResponse {
+    files: string[];
+  }
+
+  async function loadMemoryFiles() {
+    isLoading = true;
+    error = null;
+    try {
+      const response = await invoke<MemoryFilesResponse>("list_memory_files");
+      memoryFiles = response.files;
+    } catch (e) {
+      error = `Failed to load memory files: ${e}`;
+      console.error(error);
+    } finally {
+      isLoading = false;
+    }
+  }
+
+  async function loadFileContent(filePath: string) {
+    isLoading = true;
+    error = null;
+    try {
+      // Use our backend command instead of Tauri plugin to handle WSL paths
+      const content = await invoke<string>("read_file_content", { path: filePath });
+      fileContent = content;
+      selectedFile = filePath;
+    } catch (e) {
+      error = `Failed to read file: ${e}`;
+      console.error(error);
+      fileContent = "";
+    } finally {
+      isLoading = false;
+    }
+  }
+
+  function getFileName(path: string): string {
+    return path.split("/").pop() || path;
+  }
+
+  function togglePanel() {
+    isPanelOpen = !isPanelOpen;
+    if (isPanelOpen && memoryFiles.length === 0) {
+      loadMemoryFiles();
+    }
+  }
+
+  onMount(() => {
+    // Don't load on mount - only when panel is opened
+  });
+</script>
+
+<button class="memory-toggle" onclick={togglePanel} title="Memory Browser">
+  <svg
+    class="icon"
+    fill="none"
+    stroke="currentColor"
+    viewBox="0 0 24 24"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-width="2"
+      d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"
+    />
+  </svg>
+  <span class="label">Memory</span>
+</button>
+
+{#if isPanelOpen}
+  <div class="memory-panel">
+    <div class="panel-header">
+      <div class="header-title">
+        <svg
+          class="header-icon"
+          fill="none"
+          stroke="currentColor"
+          viewBox="0 0 24 24"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"
+          />
+        </svg>
+        <h3>Memory Files</h3>
+      </div>
+      <button class="close-btn" onclick={togglePanel} title="Close">
+        <svg
+          class="close-icon"
+          fill="none"
+          stroke="currentColor"
+          viewBox="0 0 24 24"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M6 18L18 6M6 6l12 12"
+          />
+        </svg>
+      </button>
+    </div>
+
+    <div class="panel-content">
+      {#if isLoading && memoryFiles.length === 0}
+        <div class="loading">
+          <svg
+            class="spinner"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="2"
+              d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"
+            />
+          </svg>
+          Loading memory files...
+        </div>
+      {:else if error}
+        <div class="error">
+          <p>{error}</p>
+          <button class="retry-btn" onclick={loadMemoryFiles}>Retry</button>
+        </div>
+      {:else if memoryFiles.length === 0}
+        <div class="empty">
+          <p>No memory files found.</p>
+          <p class="hint">
+            Memory files are created automatically as I learn from our conversations!
+          </p>
+        </div>
+      {:else}
+        <div class="panel-layout">
+          <div class="file-list">
+            {#each memoryFiles as file (file)}
+              <button
+                class="file-item"
+                class:active={selectedFile === file}
+                onclick={() => loadFileContent(file)}
+              >
+                <svg
+                  class="file-icon"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
+                  />
+                </svg>
+                <span class="file-name">{getFileName(file)}</span>
+              </button>
+            {/each}
+          </div>
+
+          <div class="file-viewer">
+            {#if selectedFile && fileContent}
+              <div class="viewer-header">
+                <h4>{getFileName(selectedFile)}</h4>
+              </div>
+              <div class="viewer-content">
+                <Markdown content={fileContent} />
+              </div>
+            {:else if selectedFile && isLoading}
+              <div class="loading-file">
+                <svg
+                  class="spinner"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"
+                  />
+                </svg>
+                Loading file...
+              </div>
+            {:else}
+              <div class="no-selection">
+                <p>Select a memory file to view its contents</p>
+              </div>
+            {/if}
+          </div>
+        </div>
+      {/if}
+    </div>
+  </div>
+{/if}
+
+<style>
+  .memory-toggle {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.5rem 1rem;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    color: var(--text-primary);
+    cursor: pointer;
+    transition: all 0.2s ease;
+  }
+
+  .memory-toggle:hover {
+    background: var(--bg-hover);
+    border-color: var(--accent-primary);
+  }
+
+  .icon {
+    width: 1.25rem;
+    height: 1.25rem;
+  }
+
+  .label {
+    font-size: 0.875rem;
+    font-weight: 500;
+  }
+
+  .memory-panel {
+    position: fixed;
+    top: 0;
+    right: 0;
+    width: 600px;
+    height: 100vh;
+    background: var(--bg-primary);
+    border-left: 1px solid var(--border-color);
+    box-shadow: -4px 0 12px rgba(0, 0, 0, 0.3);
+    z-index: 1000;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .panel-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 1rem 1.5rem;
+    border-bottom: 1px solid var(--border-color);
+    background: var(--bg-secondary);
+  }
+
+  .header-title {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+  }
+
+  .header-icon {
+    width: 1.5rem;
+    height: 1.5rem;
+    color: var(--accent-primary);
+  }
+
+  .panel-header h3 {
+    margin: 0;
+    font-size: 1.125rem;
+    font-weight: 600;
+    color: var(--text-primary);
+  }
+
+  .close-btn {
+    padding: 0.5rem;
+    background: transparent;
+    border: none;
+    color: var(--text-secondary);
+    cursor: pointer;
+    border-radius: 4px;
+    transition: all 0.2s ease;
+  }
+
+  .close-btn:hover {
+    background: var(--bg-hover);
+    color: var(--text-primary);
+  }
+
+  .close-icon {
+    width: 1.25rem;
+    height: 1.25rem;
+  }
+
+  .panel-content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 1.5rem;
+  }
+
+  .loading,
+  .error,
+  .empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 1rem;
+    padding: 3rem 1.5rem;
+    text-align: center;
+    color: var(--text-secondary);
+  }
+
+  .spinner {
+    width: 2.5rem;
+    height: 2.5rem;
+    animation: spin 1s linear infinite;
+  }
+
+  @keyframes spin {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .error p {
+    color: var(--terminal-error, #f87171);
+  }
+
+  .retry-btn {
+    padding: 0.5rem 1rem;
+    background: var(--accent-primary);
+    border: none;
+    border-radius: 6px;
+    color: white;
+    cursor: pointer;
+    font-weight: 500;
+    transition: all 0.2s ease;
+  }
+
+  .retry-btn:hover {
+    opacity: 0.9;
+  }
+
+  .hint {
+    font-size: 0.875rem;
+    font-style: italic;
+    max-width: 400px;
+  }
+
+  .panel-layout {
+    display: grid;
+    grid-template-columns: 200px 1fr;
+    gap: 1.5rem;
+    height: 100%;
+  }
+
+  .file-list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+
+  .file-item {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    padding: 0.75rem 1rem;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    color: var(--text-primary);
+    cursor: pointer;
+    text-align: left;
+    transition: all 0.2s ease;
+  }
+
+  .file-item:hover {
+    background: var(--bg-hover);
+    border-color: var(--accent-primary);
+  }
+
+  .file-item.active {
+    background: var(--accent-primary);
+    border-color: var(--accent-primary);
+    color: white;
+  }
+
+  .file-icon {
+    width: 1.25rem;
+    height: 1.25rem;
+    flex-shrink: 0;
+  }
+
+  .file-name {
+    font-size: 0.875rem;
+    font-weight: 500;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .file-viewer {
+    display: flex;
+    flex-direction: column;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 8px;
+    overflow: hidden;
+  }
+
+  .viewer-header {
+    padding: 1rem 1.5rem;
+    border-bottom: 1px solid var(--border-color);
+    background: var(--bg-primary);
+  }
+
+  .viewer-header h4 {
+    margin: 0;
+    font-size: 1rem;
+    font-weight: 600;
+    color: var(--text-primary);
+  }
+
+  .viewer-content {
+    flex: 1;
+    padding: 1.5rem;
+    overflow-y: auto;
+    color: var(--text-primary);
+  }
+
+  .loading-file,
+  .no-selection {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 1rem;
+    padding: 3rem 1.5rem;
+    color: var(--text-secondary);
+  }
+</style>

src/lib/components/PermissionModal.svelte

@@ -87,6 +87,8 @@
           custom_instructions: config.custom_instructions || null,
           mcp_servers_json: config.mcp_servers_json || null,
           allowed_tools: newGrantedTools,
+          use_worktree: config.use_worktree ?? false,
+          disable_1m_context: config.disable_1m_context ?? false,
         },
       });
 

src/lib/components/PluginManagementPanel.svelte

@@ -0,0 +1,447 @@
+<script lang="ts">
+  import { invoke } from "@tauri-apps/api/core";
+  import { onMount } from "svelte";
+  import { Download, Trash2, Power, PowerOff, RefreshCw } from "lucide-svelte";
+
+  interface Props {
+    onClose: () => void;
+  }
+
+  interface PluginInfo {
+    name: string;
+    version: string;
+    description: string | null;
+    enabled: boolean;
+  }
+
+  interface MarketplaceInfo {
+    name: string;
+    source: string;
+  }
+
+  const { onClose }: Props = $props();
+
+  let plugins = $state<PluginInfo[]>([]);
+  let marketplaces = $state<MarketplaceInfo[]>([]);
+  let isLoading = $state(true);
+  let isLoadingMarketplaces = $state(false);
+  let error = $state<string | null>(null);
+  let newPluginName = $state("");
+  let isInstalling = $state(false);
+  let actionInProgress = $state<string | null>(null);
+  let showMarketplaces = $state(false);
+  let newMarketplaceSource = $state("");
+  let isAddingMarketplace = $state(false);
+
+  async function loadPlugins(): Promise<void> {
+    try {
+      isLoading = true;
+      error = null;
+      plugins = await invoke<PluginInfo[]>("list_plugins");
+    } catch (e) {
+      error = `Failed to load plugins: ${e}`;
+      console.error(error);
+    } finally {
+      isLoading = false;
+    }
+  }
+
+  async function loadMarketplaces(): Promise<void> {
+    try {
+      isLoadingMarketplaces = true;
+      error = null;
+      marketplaces = await invoke<MarketplaceInfo[]>("list_marketplaces");
+    } catch (e) {
+      error = `Failed to load marketplaces: ${e}`;
+      console.error(error);
+    } finally {
+      isLoadingMarketplaces = false;
+    }
+  }
+
+  async function installPlugin(): Promise<void> {
+    if (!newPluginName.trim()) return;
+
+    try {
+      isInstalling = true;
+      error = null;
+      await invoke("install_plugin", { pluginName: newPluginName.trim() });
+      newPluginName = "";
+      await loadPlugins();
+    } catch (e) {
+      error = `Failed to install plugin: ${e}`;
+      console.error(error);
+    } finally {
+      isInstalling = false;
+    }
+  }
+
+  async function uninstallPlugin(pluginName: string): Promise<void> {
+    try {
+      actionInProgress = pluginName;
+      error = null;
+      await invoke("uninstall_plugin", { pluginName });
+      await loadPlugins();
+    } catch (e) {
+      error = `Failed to uninstall plugin: ${e}`;
+      console.error(error);
+    } finally {
+      actionInProgress = null;
+    }
+  }
+
+  async function togglePlugin(plugin: PluginInfo): Promise<void> {
+    try {
+      actionInProgress = plugin.name;
+      error = null;
+      if (plugin.enabled) {
+        await invoke("disable_plugin", { pluginName: plugin.name });
+      } else {
+        await invoke("enable_plugin", { pluginName: plugin.name });
+      }
+      await loadPlugins();
+    } catch (e) {
+      error = `Failed to ${plugin.enabled ? "disable" : "enable"} plugin: ${e}`;
+      console.error(error);
+    } finally {
+      actionInProgress = null;
+    }
+  }
+
+  async function updatePlugin(pluginName: string): Promise<void> {
+    try {
+      actionInProgress = pluginName;
+      error = null;
+      await invoke("update_plugin", { pluginName });
+      await loadPlugins();
+    } catch (e) {
+      error = `Failed to update plugin: ${e}`;
+      console.error(error);
+    } finally {
+      actionInProgress = null;
+    }
+  }
+
+  async function addMarketplace(): Promise<void> {
+    if (!newMarketplaceSource.trim()) return;
+
+    try {
+      isAddingMarketplace = true;
+      error = null;
+      await invoke("add_marketplace", { source: newMarketplaceSource.trim() });
+      newMarketplaceSource = "";
+      await loadMarketplaces();
+    } catch (e) {
+      error = `Failed to add marketplace: ${e}`;
+      console.error(error);
+    } finally {
+      isAddingMarketplace = false;
+    }
+  }
+
+  async function removeMarketplace(name: string): Promise<void> {
+    try {
+      actionInProgress = name;
+      error = null;
+      await invoke("remove_marketplace", { name });
+      await loadMarketplaces();
+    } catch (e) {
+      error = `Failed to remove marketplace: ${e}`;
+      console.error(error);
+    } finally {
+      actionInProgress = null;
+    }
+  }
+
+  onMount(() => {
+    loadPlugins();
+  });
+</script>
+
+<div
+  class="fixed top-0 right-0 h-full w-[600px] bg-[var(--bg-primary)] border-l border-[var(--accent-primary)]/30 shadow-2xl flex flex-col z-50"
+>
+  <!-- Header -->
+  <div class="flex items-center justify-between p-4 border-b border-[var(--accent-primary)]/30">
+    <div class="flex items-center gap-3">
+      <div class="text-[var(--accent-primary)]">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="h-6 w-6"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"
+          />
+        </svg>
+      </div>
+      <div>
+        <h2 class="text-lg font-semibold text-[var(--text-primary)]">Plugin Management</h2>
+        <p class="text-xs text-[var(--text-secondary)]">
+          {plugins.length} plugin{plugins.length !== 1 ? "s" : ""} installed
+        </p>
+      </div>
+    </div>
+    <button
+      onclick={onClose}
+      class="text-[var(--text-secondary)] hover:text-[var(--text-primary)] transition-colors p-1 rounded-lg hover:bg-[var(--bg-secondary)]"
+      aria-label="Close plugin panel"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        class="h-5 w-5"
+        viewBox="0 0 20 20"
+        fill="currentColor"
+      >
+        <path
+          fill-rule="evenodd"
+          d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+          clip-rule="evenodd"
+        />
+      </svg>
+    </button>
+  </div>
+
+  <!-- Install Plugin Section -->
+  <div class="p-4 border-b border-[var(--border-color)]">
+    <h3 class="text-sm font-medium text-[var(--text-primary)] mb-2">Install New Plugin</h3>
+    <p class="text-xs text-[var(--text-secondary)] mb-3">
+      Enter plugin name (e.g., "macrodata" or "macrodata@macrodata" for specific marketplace)
+    </p>
+    <div class="flex gap-2">
+      <input
+        type="text"
+        bind:value={newPluginName}
+        placeholder="plugin-name or plugin@marketplace"
+        class="flex-1 px-3 py-2 bg-[var(--bg-secondary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
+        onkeydown={(e) => e.key === "Enter" && installPlugin()}
+        disabled={isInstalling}
+      />
+      <button
+        onclick={installPlugin}
+        disabled={isInstalling || !newPluginName.trim()}
+        class="px-4 py-2 bg-[var(--accent-primary)] text-white rounded-lg text-sm font-medium hover:opacity-80 disabled:opacity-40 disabled:cursor-not-allowed flex items-center gap-2"
+      >
+        {#if isInstalling}
+          <RefreshCw class="w-4 h-4 animate-spin" />
+        {:else}
+          <Download class="w-4 h-4" />
+        {/if}
+        Install
+      </button>
+    </div>
+  </div>
+
+  <!-- Marketplace Management Section -->
+  <div class="p-4 border-b border-[var(--border-color)]">
+    <button
+      onclick={() => {
+        showMarketplaces = !showMarketplaces;
+        if (showMarketplaces && marketplaces.length === 0) {
+          loadMarketplaces();
+        }
+      }}
+      class="w-full text-left flex items-center justify-between text-sm font-medium text-[var(--text-primary)] hover:text-[var(--accent-primary)] transition-colors"
+    >
+      <span>Manage Marketplaces</span>
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        class="h-4 w-4 transition-transform"
+        class:rotate-180={showMarketplaces}
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke="currentColor"
+      >
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+      </svg>
+    </button>
+
+    {#if showMarketplaces}
+      <div class="mt-3 space-y-3">
+        <!-- Add Marketplace Form -->
+        <div>
+          <p class="text-xs text-[var(--text-secondary)] mb-2">
+            Add a marketplace from GitHub (e.g., "ascorbic/macrodata")
+          </p>
+          <div class="flex gap-2">
+            <input
+              type="text"
+              bind:value={newMarketplaceSource}
+              placeholder="owner/repo"
+              class="flex-1 px-3 py-2 bg-[var(--bg-secondary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] text-sm focus:outline-none focus:border-[var(--accent-primary)]"
+              onkeydown={(e) => e.key === "Enter" && addMarketplace()}
+              disabled={isAddingMarketplace}
+            />
+            <button
+              onclick={addMarketplace}
+              disabled={isAddingMarketplace || !newMarketplaceSource.trim()}
+              class="px-4 py-2 bg-[var(--accent-primary)] text-white rounded-lg text-sm font-medium hover:opacity-80 disabled:opacity-40 disabled:cursor-not-allowed flex items-center gap-2"
+            >
+              {#if isAddingMarketplace}
+                <RefreshCw class="w-4 h-4 animate-spin" />
+              {:else}
+                <Download class="w-4 h-4" />
+              {/if}
+              Add
+            </button>
+          </div>
+        </div>
+
+        <!-- Marketplaces List -->
+        {#if isLoadingMarketplaces}
+          <div class="flex items-center justify-center py-4">
+            <RefreshCw class="w-5 h-5 animate-spin text-[var(--text-secondary)]" />
+          </div>
+        {:else if marketplaces.length > 0}
+          <div class="space-y-2">
+            {#each marketplaces as marketplace (marketplace.name)}
+              <div
+                class="bg-[var(--bg-secondary)]/50 rounded-lg p-3 border border-[var(--border-color)]"
+              >
+                <div class="flex items-start justify-between">
+                  <div class="flex-1">
+                    <h4 class="font-medium text-[var(--text-primary)]">{marketplace.name}</h4>
+                    <p class="text-xs text-[var(--text-secondary)] mt-1">{marketplace.source}</p>
+                  </div>
+                  <button
+                    onclick={() => removeMarketplace(marketplace.name)}
+                    disabled={actionInProgress === marketplace.name}
+                    class="px-2 py-1 text-red-400 hover:bg-red-500/20 rounded transition-colors disabled:opacity-40"
+                  >
+                    <Trash2 class="w-4 h-4" />
+                  </button>
+                </div>
+              </div>
+            {/each}
+          </div>
+        {:else}
+          <p class="text-sm text-[var(--text-secondary)] text-center py-4">
+            No marketplaces configured
+          </p>
+        {/if}
+      </div>
+    {/if}
+  </div>
+
+  <!-- Error Display -->
+  {#if error}
+    <div class="mx-4 mt-4 p-3 bg-red-500/20 border border-red-500/30 rounded-lg">
+      <p class="text-sm text-red-400">{error}</p>
+    </div>
+  {/if}
+
+  <!-- Plugins List -->
+  <div class="flex-1 overflow-y-auto p-4">
+    {#if isLoading}
+      <div class="flex items-center justify-center h-full text-[var(--text-secondary)]">
+        <RefreshCw class="w-8 h-8 animate-spin" />
+      </div>
+    {:else if plugins.length === 0}
+      <div class="flex flex-col items-center justify-center h-full text-[var(--text-secondary)]">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="h-16 w-16 mb-4 opacity-50"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"
+          />
+        </svg>
+        <p class="text-center">No plugins installed</p>
+        <p class="text-sm text-center mt-2">Install a plugin using the form above</p>
+      </div>
+    {:else}
+      <div class="space-y-3">
+        {#each plugins as plugin (plugin.name)}
+          <div
+            class="bg-[var(--bg-secondary)]/50 rounded-lg p-4 border border-[var(--border-color)] hover:border-[var(--accent-primary)]/50 transition-all"
+          >
+            <div class="flex items-start justify-between mb-2">
+              <div class="flex-1">
+                <h4 class="font-medium text-[var(--text-primary)] flex items-center gap-2">
+                  {plugin.name}
+                  {#if plugin.enabled}
+                    <span
+                      class="px-2 py-0.5 bg-[var(--success-color)]/20 text-[var(--success-color)] text-xs rounded border border-[var(--success-color)]/30"
+                    >
+                      Enabled
+                    </span>
+                  {:else}
+                    <span
+                      class="px-2 py-0.5 bg-[var(--text-secondary)]/20 text-[var(--text-secondary)] text-xs rounded border border-[var(--border-color)]"
+                    >
+                      Disabled
+                    </span>
+                  {/if}
+                </h4>
+                <p class="text-xs text-[var(--text-secondary)] mt-1">v{plugin.version}</p>
+                {#if plugin.description}
+                  <p class="text-sm text-[var(--text-secondary)] mt-2">{plugin.description}</p>
+                {/if}
+              </div>
+            </div>
+
+            <div class="flex gap-2 mt-3">
+              <button
+                onclick={() => togglePlugin(plugin)}
+                disabled={actionInProgress === plugin.name}
+                class="flex-1 px-3 py-1.5 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded text-sm text-[var(--text-primary)] hover:border-[var(--accent-primary)]/50 transition-colors disabled:opacity-40 disabled:cursor-not-allowed flex items-center justify-center gap-2"
+              >
+                {#if plugin.enabled}
+                  <PowerOff class="w-4 h-4" />
+                  Disable
+                {:else}
+                  <Power class="w-4 h-4" />
+                  Enable
+                {/if}
+              </button>
+
+              <button
+                onclick={() => updatePlugin(plugin.name)}
+                disabled={actionInProgress === plugin.name}
+                class="px-3 py-1.5 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded text-sm text-[var(--text-primary)] hover:border-[var(--accent-primary)]/50 transition-colors disabled:opacity-40 disabled:cursor-not-allowed flex items-center gap-2"
+              >
+                <RefreshCw class="w-4 h-4" />
+                Update
+              </button>
+
+              <button
+                onclick={() => uninstallPlugin(plugin.name)}
+                disabled={actionInProgress === plugin.name}
+                class="px-3 py-1.5 bg-red-500/20 border border-red-500/30 rounded text-sm text-red-400 hover:bg-red-500/30 transition-colors disabled:opacity-40 disabled:cursor-not-allowed flex items-center gap-2"
+              >
+                <Trash2 class="w-4 h-4" />
+                Uninstall
+              </button>
+            </div>
+          </div>
+        {/each}
+      </div>
+    {/if}
+  </div>
+</div>
+
+<style>
+  @keyframes spin {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .animate-spin {
+    animation: spin 1s linear infinite;
+  }
+</style>

src/lib/components/SessionHistoryPanel.svelte

@@ -15,9 +15,23 @@
   let showDeleteConfirm = $state<string | null>(null);
   let showExportMenu = $state<string | null>(null);
   let isImporting = $state(false);
+  let showClearAllConfirm = $state(false);
 
-  const sessions = $derived(sessionsStore.sessions);
-  const isLoading = $derived(sessionsStore.isLoading);
+  let sessions = $state<SessionListItem[]>([]);
+  let isLoading = $state(false);
+
+  $effect(() => {
+    const unsubSessions = sessionsStore.sessions.subscribe((value) => {
+      sessions = value;
+    });
+    const unsubLoading = sessionsStore.isLoading.subscribe((value) => {
+      isLoading = value;
+    });
+    return () => {
+      unsubSessions();
+      unsubLoading();
+    };
+  });
 
   onMount(() => {
     sessionsStore.loadSessions();
@@ -121,6 +135,11 @@
     }
   }
 
+  async function handleClearAll(): Promise<void> {
+    await sessionsStore.clearAllSessions();
+    showClearAllConfirm = false;
+  }
+
   function toggleExportMenu(sessionId: string): void {
     if (showExportMenu === sessionId) {
       showExportMenu = null;
@@ -186,6 +205,22 @@
             </svg>
             {isImporting ? "Importing..." : "Import"}
           </button>
+          <button
+            onclick={() => (showClearAllConfirm = true)}
+            disabled={sessions.length === 0}
+            class="px-3 py-1.5 text-sm font-medium bg-red-500/10 text-red-500 border border-red-500/30 rounded hover:bg-red-500/20 transition-colors disabled:opacity-50 disabled:cursor-not-allowed flex items-center gap-2"
+            title="Clear all sessions"
+          >
+            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="2"
+                d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
+              />
+            </svg>
+            Clear All
+          </button>
         {/if}
         <button
           onclick={onClose}
@@ -281,11 +316,11 @@
       </div>
 
       <div class="overflow-y-auto flex-1">
-        {#if $isLoading}
+        {#if isLoading}
           <div class="flex items-center justify-center p-8">
             <div class="text-[var(--text-tertiary)]">Loading sessions...</div>
           </div>
-        {:else if $sessions.length === 0}
+        {:else if sessions.length === 0}
           <div class="flex flex-col items-center justify-center p-8 text-center">
             <svg
               class="w-16 h-16 text-[var(--text-tertiary)] mb-4"
@@ -307,7 +342,7 @@
           </div>
         {:else}
           <div class="divide-y divide-[var(--border-color)]">
-            {#each $sessions as session (session.id)}
+            {#each sessions as session (session.id)}
               <div class="p-4 hover:bg-[var(--bg-secondary)] transition-colors group">
                 <div class="flex items-start justify-between gap-4">
                   <button class="flex-1 text-left" onclick={() => handleViewSession(session)}>
@@ -428,6 +463,62 @@
   </div>
 </div>
 
+{#if showClearAllConfirm}
+  <div
+    class="fixed inset-0 bg-black/50 backdrop-blur-sm z-[60] flex items-center justify-center p-4"
+    onclick={() => (showClearAllConfirm = false)}
+    role="button"
+    tabindex="0"
+    onkeydown={(e) => e.key === "Escape" && (showClearAllConfirm = false)}
+  >
+    <div
+      class="bg-[var(--bg-primary)] border border-red-500/30 rounded-lg shadow-xl max-w-md w-full p-6"
+      onclick={(e) => e.stopPropagation()}
+      role="dialog"
+      aria-labelledby="clear-all-title"
+      aria-describedby="clear-all-description"
+      tabindex="-1"
+    >
+      <div class="flex items-start gap-4">
+        <div class="flex-shrink-0 text-red-500">
+          <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="2"
+              d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+            />
+          </svg>
+        </div>
+        <div class="flex-1">
+          <h3 id="clear-all-title" class="text-lg font-semibold text-[var(--text-primary)] mb-2">
+            Clear All Sessions?
+          </h3>
+          <p id="clear-all-description" class="text-[var(--text-secondary)] mb-4">
+            This will permanently delete all {sessions.length} session{sessions.length === 1
+              ? ""
+              : "s"}. This action cannot be undone.
+          </p>
+          <div class="flex justify-end gap-3">
+            <button
+              onclick={() => (showClearAllConfirm = false)}
+              class="px-4 py-2 text-sm font-medium bg-[var(--bg-secondary)] text-[var(--text-primary)] border border-[var(--border-color)] rounded hover:bg-[var(--bg-tertiary)] transition-colors"
+            >
+              Cancel
+            </button>
+            <button
+              onclick={handleClearAll}
+              class="px-4 py-2 text-sm font-medium bg-red-500 text-white rounded hover:bg-red-600 transition-colors"
+            >
+              Clear All Sessions
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+{/if}
+
 <style>
   [role="dialog"] {
     animation: slideIn 0.2s ease-out;

src/lib/components/StatusBar.svelte

@@ -23,9 +23,13 @@
   import { achievementProgress } from "$lib/stores/achievements";
   import { runningAgentCount } from "$lib/stores/agents";
   import SessionHistoryPanel from "./SessionHistoryPanel.svelte";
+  import TodoPanel from "./TodoPanel.svelte";
   import GitPanel from "./GitPanel.svelte";
   import ProfilePanel from "./ProfilePanel.svelte";
   import AgentMonitorPanel from "./AgentMonitorPanel.svelte";
+  import CastPanel from "./CastPanel.svelte";
+  import PluginManagementPanel from "./PluginManagementPanel.svelte";
+  import McpManagementPanel from "./McpManagementPanel.svelte";
   import { conversationsStore } from "$lib/stores/conversations";
   import {
     generateContextInjection,
@@ -49,9 +53,13 @@
   let showHelp = $state(false);
   let showKeyboardShortcuts = $state(false);
   let showSessionHistory = $state(false);
+  let showTodoPanel = $state(false);
   let showGitPanel = $state(false);
   let showProfile = $state(false);
   let showAgentMonitor = $state(false);
+  let showCastPanel = $state(false);
+  let showPluginPanel = $state(false);
+  let showMcpPanel = $state(false);
   let isSummarising = $state(false);
   const progress = $derived($achievementProgress);
   const activeAgentCount = $derived($runningAgentCount);
@@ -92,6 +100,9 @@
     budget_action: "warn",
     budget_warning_threshold: 0.8,
     discord_rpc_enabled: true,
+    show_thinking_blocks: true,
+    use_worktree: false,
+    disable_1m_context: false,
   });
 
   let streamerModeActive = $state(false);
@@ -169,6 +180,8 @@
           custom_instructions: currentConfig.custom_instructions || null,
           mcp_servers_json: currentConfig.mcp_servers_json || null,
           allowed_tools: allAllowedTools,
+          use_worktree: currentConfig.use_worktree ?? false,
+          disable_1m_context: currentConfig.disable_1m_context ?? false,
         },
       });
 
@@ -280,6 +293,8 @@
           custom_instructions: currentConfig.custom_instructions || null,
           mcp_servers_json: currentConfig.mcp_servers_json || null,
           allowed_tools: allAllowedTools,
+          use_worktree: currentConfig.use_worktree ?? false,
+          disable_1m_context: currentConfig.disable_1m_context ?? false,
         },
       });
 
@@ -374,16 +389,16 @@
     {/if}
   </div>
 
-  <div class="flex items-center gap-3">
+  <div class="flex items-center gap-2 flex-wrap min-w-0">
     {#if streamerModeActive}
       <div
-        class="w-2.5 h-2.5 rounded-full bg-red-500 animate-pulse"
+        class="w-2.5 h-2.5 rounded-full bg-red-500 animate-pulse shrink-0"
         title="Streamer mode active (Ctrl+Shift+S to toggle)"
       ></div>
     {/if}
     <button
       onclick={() => (showProfile = true)}
-      class="p-1 text-gray-500 icon-trans-hover"
+      class="p-1 text-gray-500 icon-trans-hover shrink-0"
       title="Profile"
     >
       <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -437,6 +452,20 @@
         />
       </svg>
     </button>
+    <button
+      onclick={() => (showTodoPanel = true)}
+      class="p-1 text-gray-500 icon-trans-hover"
+      title="Todo List"
+    >
+      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4"
+        />
+      </svg>
+    </button>
     <button
       onclick={() => (showGitPanel = true)}
       class="p-1 text-gray-500 icon-trans-hover"
@@ -451,6 +480,34 @@
         />
       </svg>
     </button>
+    <button
+      onclick={() => (showPluginPanel = true)}
+      class="p-1 text-gray-500 icon-trans-hover"
+      title="Plugin Management"
+    >
+      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"
+        />
+      </svg>
+    </button>
+    <button
+      onclick={() => (showMcpPanel = true)}
+      class="p-1 text-gray-500 icon-trans-hover"
+      title="MCP Server Management"
+    >
+      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-2-4h.01M17 16h.01"
+        />
+      </svg>
+    </button>
     <button
       onclick={toggleEditor}
       disabled={connectionStatus !== "connected"}
@@ -470,6 +527,20 @@
         />
       </svg>
     </button>
+    <button
+      onclick={() => (showCastPanel = true)}
+      class="p-1 text-gray-500 icon-trans-hover"
+      title="Meet the Team"
+    >
+      <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"
+        />
+      </svg>
+    </button>
     <button
       onclick={() => (showAgentMonitor = !showAgentMonitor)}
       class="p-1 text-gray-500 icon-trans-hover relative {showAgentMonitor
@@ -647,7 +718,7 @@
   <!-- svelte-ignore a11y_click_events_have_key_events -->
   <!-- svelte-ignore a11y_no_static_element_interactions -->
   <div class="fixed inset-0 z-40" onclick={() => (showStats = false)}></div>
-  <div class="fixed top-14 right-4 z-50">
+  <div class="fixed top-14 right-4 z-50 max-h-[calc(100vh-4rem)] overflow-y-auto">
     <StatsDisplay
       onRequestSummary={handleCompactConversation}
       onStartFreshWithContext={handleStartFreshWithContext}
@@ -672,6 +743,10 @@
   <SessionHistoryPanel onClose={() => (showSessionHistory = false)} />
 {/if}
 
+{#if showTodoPanel}
+  <TodoPanel onClose={() => (showTodoPanel = false)} />
+{/if}
+
 {#if showGitPanel}
   <GitPanel isOpen={showGitPanel} onClose={() => (showGitPanel = false)} />
 {/if}
@@ -683,3 +758,44 @@
 {#if showAgentMonitor}
   <AgentMonitorPanel isOpen={showAgentMonitor} onClose={() => (showAgentMonitor = false)} />
 {/if}
+
+{#if showCastPanel}
+  <CastPanel onClose={() => (showCastPanel = false)} />
+{/if}
+
+{#if showPluginPanel}
+  <PluginManagementPanel onClose={() => (showPluginPanel = false)} />
+{/if}
+
+{#if showMcpPanel}
+  <McpManagementPanel onClose={() => (showMcpPanel = false)} />
+{/if}
+
+<style>
+  /* Responsive status bar styling */
+  .status-bar {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5rem;
+  }
+
+  /* Make all icon buttons shrink but not grow */
+  .status-bar button {
+    flex-shrink: 0;
+  }
+
+  /* Hide version text on very small screens */
+  @media (max-width: 640px) {
+    .status-bar button span:last-of-type {
+      display: none;
+    }
+  }
+
+  /* Stack left and right sections on very small screens */
+  @media (max-width: 768px) {
+    .status-bar {
+      flex-direction: column;
+      gap: 0.75rem;
+    }
+  }
+</style>

src/lib/components/SystemClock.svelte

@@ -0,0 +1,81 @@
+<script lang="ts">
+  let currentTime = $state("");
+
+  function updateTime() {
+    const now = new Date();
+
+    // Format date as "1 January 2026"
+    const day = now.getDate();
+    const month = now.toLocaleString("en-GB", { month: "long" });
+    const year = now.getFullYear();
+
+    // Format time as HH:MM:SS (24-hour)
+    const hours = String(now.getHours()).padStart(2, "0");
+    const minutes = String(now.getMinutes()).padStart(2, "0");
+    const seconds = String(now.getSeconds()).padStart(2, "0");
+
+    currentTime = `${day} ${month} ${year}, ${hours}:${minutes}:${seconds}`;
+  }
+
+  // Update immediately on mount
+  updateTime();
+
+  // Update every second
+  const interval = setInterval(updateTime, 1000);
+
+  // Cleanup on component destroy
+  $effect(() => {
+    return () => {
+      clearInterval(interval);
+    };
+  });
+</script>
+
+<div class="system-clock">
+  <svg
+    class="clock-icon"
+    width="14"
+    height="14"
+    viewBox="0 0 24 24"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="2"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+  >
+    <circle cx="12" cy="12" r="10" />
+    <polyline points="12 6 12 12 16 14" />
+  </svg>
+  <span class="clock-text">{currentTime}</span>
+</div>
+
+<style>
+  .system-clock {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 4px 12px;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 6px;
+    color: var(--text-secondary);
+    font-size: 0.85rem;
+    font-family: var(--font-mono, monospace);
+    transition: all 0.2s;
+    margin-left: auto;
+  }
+
+  .system-clock:hover {
+    border-color: var(--accent-primary);
+    color: var(--accent-primary);
+  }
+
+  .clock-icon {
+    flex-shrink: 0;
+    opacity: 0.7;
+  }
+
+  .clock-text {
+    white-space: nowrap;
+  }
+</style>

src/lib/components/SystemClock.test.ts

@@ -0,0 +1,149 @@
+/**
+ * SystemClock Component Tests
+ *
+ * Note: This file tests the time formatting logic used by the SystemClock component.
+ * Full component rendering tests are challenging with Svelte 5 + @testing-library/svelte
+ * due to SSR/CSR compatibility issues. The component itself is simple and visually
+ * testable - it displays the current date and time, updating every second.
+ *
+ * What this component does:
+ * - Displays date in British format: "7 February 2026"
+ * - Displays time in 24-hour format: "14:35:42"
+ * - Updates every second via setInterval
+ * - Cleans up interval on unmount via $effect
+ *
+ * Manual testing checklist:
+ * - [ ] Clock appears above the Send button
+ * - [ ] Time updates every second
+ * - [ ] Date format is "DD Month YYYY"
+ * - [ ] Time format is "HH:MM:SS" (24-hour)
+ * - [ ] Hover effect works (border turns accent colour)
+ */
+
+import { describe, it, expect } from "vitest";
+
+// Helper function that mirrors the component's formatting logic
+function formatDateTime(date: Date): string {
+  const day = date.getDate();
+  const month = date.toLocaleString("en-GB", { month: "long" });
+  const year = date.getFullYear();
+
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+
+  return `${day} ${month} ${year}, ${hours}:${minutes}:${seconds}`;
+}
+
+describe("SystemClock date/time formatting", () => {
+  it("formats date in British format (DD Month YYYY)", () => {
+    // Use local timezone (not UTC) since the component uses local time
+    const date = new Date(2026, 1, 7, 14, 35, 42); // Feb 7, 2026 14:35:42 local
+    const formatted = formatDateTime(date);
+
+    expect(formatted).toContain("7 February 2026");
+  });
+
+  it("formats time in 24-hour format (HH:MM:SS)", () => {
+    const date = new Date(2026, 1, 7, 14, 35, 42);
+    const formatted = formatDateTime(date);
+
+    // Should have the pattern HH:MM:SS
+    expect(formatted).toMatch(/\d{2}:\d{2}:\d{2}/);
+    expect(formatted).toContain("14:35:42");
+  });
+
+  it("combines date and time with comma separator", () => {
+    const date = new Date(2026, 1, 7, 14, 35, 42);
+    const formatted = formatDateTime(date);
+
+    expect(formatted).toBe("7 February 2026, 14:35:42");
+  });
+
+  it("pads single-digit hours, minutes, and seconds with zeros", () => {
+    const date = new Date(2026, 1, 7, 3, 5, 8);
+    const formatted = formatDateTime(date);
+
+    // Should have leading zeros: 03:05:08, not 3:5:8
+    expect(formatted).toContain("03:05:08");
+  });
+
+  it("handles different months correctly", () => {
+    const date = new Date(2026, 11, 25, 12, 0, 0); // December is month 11
+    const formatted = formatDateTime(date);
+
+    expect(formatted).toContain("25 December 2026");
+  });
+
+  it("handles year changes correctly", () => {
+    const date = new Date(2027, 0, 1, 0, 0, 0); // January is month 0
+    const formatted = formatDateTime(date);
+
+    expect(formatted).toContain("1 January 2027");
+    expect(formatted).toContain("00:00:00");
+  });
+
+  it("handles midnight correctly", () => {
+    const date = new Date(2026, 1, 7, 0, 0, 0);
+    const formatted = formatDateTime(date);
+
+    expect(formatted).toContain("00:00:00");
+  });
+
+  it("handles noon correctly", () => {
+    const date = new Date(2026, 1, 7, 12, 0, 0);
+    const formatted = formatDateTime(date);
+
+    // 24-hour format, so noon is 12:00:00, not 00:00:00
+    expect(formatted).toContain("12:00:00");
+  });
+
+  it("handles end of day correctly", () => {
+    const date = new Date(2026, 1, 7, 23, 59, 59);
+    const formatted = formatDateTime(date);
+
+    expect(formatted).toContain("23:59:59");
+  });
+
+  it("handles month boundaries correctly", () => {
+    // Last day of January
+    const jan31 = new Date(2026, 0, 31, 23, 59, 59);
+    expect(formatDateTime(jan31)).toContain("31 January 2026");
+
+    // First day of February
+    const feb1 = new Date(2026, 1, 1, 0, 0, 0);
+    expect(formatDateTime(feb1)).toContain("1 February 2026");
+  });
+
+  it("handles leap year February correctly", () => {
+    // 2024 is a leap year
+    const feb29 = new Date(2024, 1, 29, 12, 0, 0);
+    const formatted = formatDateTime(feb29);
+
+    expect(formatted).toContain("29 February 2024");
+  });
+
+  it("handles all 12 months correctly", () => {
+    const months = [
+      "January",
+      "February",
+      "March",
+      "April",
+      "May",
+      "June",
+      "July",
+      "August",
+      "September",
+      "October",
+      "November",
+      "December",
+    ];
+
+    months.forEach((month, index) => {
+      const date = new Date(2026, index, 15, 12, 0, 0);
+      const formatted = formatDateTime(date);
+
+      expect(formatted).toContain(month);
+    });
+  });
+});

src/lib/components/Terminal.svelte

@@ -1,12 +1,15 @@
 <script lang="ts">
   import { claudeStore, type TerminalLine } from "$lib/stores/claude";
   import { afterUpdate, tick, onMount, onDestroy } from "svelte";
+  import { invoke } from "@tauri-apps/api/core";
+
   import ConversationTabs from "./ConversationTabs.svelte";
   import Markdown from "./Markdown.svelte";
   import HighlightedText from "./HighlightedText.svelte";
+  import ThinkingBlock from "./ThinkingBlock.svelte";
   import { searchState, searchQuery } from "$lib/stores/search";
   import { clipboardStore } from "$lib/stores/clipboard";
-  import { shouldHidePaths, maskPaths } from "$lib/stores/config";
+  import { shouldHidePaths, maskPaths, showThinkingBlocks } from "$lib/stores/config";
 
   let terminalElement: HTMLDivElement;
   let shouldAutoScroll = true;
@@ -24,6 +27,11 @@
     hidePaths = value;
   });
 
+  let showThinking = true;
+  showThinkingBlocks.subscribe((value) => {
+    showThinking = value;
+  });
+
   claudeStore.terminalLines.subscribe((value) => {
     lines = value;
   });
@@ -84,6 +92,16 @@
         return "terminal-tool";
       case "error":
         return "terminal-error";
+      case "thinking":
+        return "terminal-thinking";
+      case "rate-limit":
+        return "terminal-rate-limit";
+      case "compact-prompt":
+        return "terminal-compact-prompt";
+      case "worktree":
+        return "terminal-worktree";
+      case "config-change":
+        return "terminal-config-change";
       default:
         return "terminal-default";
     }
@@ -101,6 +119,12 @@
         return "[tool]";
       case "error":
         return "[error]";
+      case "rate-limit":
+        return "[rate-limit]";
+      case "worktree":
+        return "[worktree]";
+      case "config-change":
+        return "[config]";
       default:
         return "";
     }
@@ -179,6 +203,27 @@
       copiedMessageId = null;
     }, 2000);
   }
+
+  async function handleCompact() {
+    if (!currentConversationId) return;
+    await invoke("send_prompt", { conversationId: currentConversationId, message: "/compact" });
+  }
+
+  // Collapsible tool lines
+  const TOOL_COLLAPSE_THRESHOLD = 60;
+  let expandedToolLines: Record<string, boolean> = {};
+
+  function isToolContentLong(content: string): boolean {
+    return content.length > TOOL_COLLAPSE_THRESHOLD;
+  }
+
+  function truncateToolContent(content: string): string {
+    return content.slice(0, TOOL_COLLAPSE_THRESHOLD) + "…";
+  }
+
+  function toggleToolLine(id: string) {
+    expandedToolLines = { ...expandedToolLines, [id]: !expandedToolLines[id] };
+  }
 </script>
 
 <div
@@ -209,80 +254,106 @@
       </div>
     {:else}
       {#each lines as line (line.id)}
-        <div
-          class="terminal-line mb-2 {getLineClass(line.type)} relative group"
-          style={line.parentToolUseId
-            ? "margin-left: 16px; padding-left: 8px; border-left: 2px solid var(--accent-primary);"
-            : ""}
-        >
-          <span class="terminal-timestamp text-xs mr-2">{formatTime(line.timestamp)}</span>
-          {#if line.parentToolUseId}
-            <span class="text-xs mr-2 opacity-60" title="Message from subagent">
-              <svg
-                class="inline-block w-3 h-3 -mt-0.5"
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
+        {#if line.type === "thinking"}
+          {#if showThinking}
+            <ThinkingBlock content={line.content} timestamp={line.timestamp} />
+          {/if}
+        {:else}
+          <div
+            class="terminal-line mb-2 {getLineClass(line.type)} relative group"
+            style={line.parentToolUseId
+              ? "margin-left: 16px; padding-left: 8px; border-left: 2px solid var(--accent-primary);"
+              : ""}
+          >
+            <span class="terminal-timestamp text-xs mr-2">{formatTime(line.timestamp)}</span>
+            {#if line.parentToolUseId}
+              <span class="text-xs mr-2 opacity-60" title="Message from subagent">
+                <svg
+                  class="inline-block w-3 h-3 -mt-0.5"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M9 5l7 7-7 7"
+                  />
+                </svg>
+              </span>
+            {/if}
+            {#if line.cost && line.cost.costUsd > 0}
+              <span
+                class="terminal-cost text-xs mr-2"
+                title="Input: {line.cost.inputTokens} | Output: {line.cost.outputTokens}"
               >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 5l7 7-7 7"
+                ${line.cost.costUsd < 0.01
+                  ? line.cost.costUsd.toFixed(4)
+                  : line.cost.costUsd.toFixed(3)}
+              </span>
+            {/if}
+            {#if getLinePrefix(line.type)}
+              <span class="terminal-prefix mr-2">{getLinePrefix(line.type)}</span>
+            {/if}
+            {#if line.toolName}
+              <span class="terminal-tool-name mr-2">[{line.toolName}]</span>
+            {/if}
+            {#if line.type === "compact-prompt"}
+              <button class="compact-action-btn" onclick={handleCompact}>
+                ⚡ Compact Conversation
+              </button>
+            {:else if line.type === "assistant" || line.type === "user"}
+              <div class="message-content-wrapper">
+                <Markdown
+                  content={maskPaths(line.content, hidePaths)}
+                  searchQuery={currentSearchQuery}
                 />
-              </svg>
-            </span>
-          {/if}
-          {#if line.cost && line.cost.costUsd > 0}
-            <span
-              class="terminal-cost text-xs mr-2"
-              title="Input: {line.cost.inputTokens} | Output: {line.cost.outputTokens}"
-            >
-              ${line.cost.costUsd < 0.01
-                ? line.cost.costUsd.toFixed(4)
-                : line.cost.costUsd.toFixed(3)}
-            </span>
-          {/if}
-          {#if getLinePrefix(line.type)}
-            <span class="terminal-prefix mr-2">{getLinePrefix(line.type)}</span>
-          {/if}
-          {#if line.toolName}
-            <span class="terminal-tool-name mr-2">[{line.toolName}]</span>
-          {/if}
-          {#if line.type === "assistant" || line.type === "user"}
-            <div class="message-content-wrapper">
-              <Markdown
+                <button
+                  class="copy-message-btn opacity-0 group-hover:opacity-100 transition-opacity"
+                  onclick={() => handleCopyMessage(line.id, line.content)}
+                  title="Copy message"
+                >
+                  <svg
+                    width="14"
+                    height="14"
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    stroke-width="2"
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                  >
+                    <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
+                    <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+                  </svg>
+                  <span class="copy-text">{copiedMessageId === line.id ? "Copied!" : "Copy"}</span>
+                </button>
+              </div>
+            {:else if line.type === "tool" && isToolContentLong(maskPaths(line.content, hidePaths))}
+              <span class="tool-collapsible">
+                <HighlightedText
+                  content={expandedToolLines[line.id]
+                    ? maskPaths(line.content, hidePaths)
+                    : truncateToolContent(maskPaths(line.content, hidePaths))}
+                  searchQuery={currentSearchQuery}
+                />
+                <button
+                  class="tool-toggle-btn"
+                  onclick={() => toggleToolLine(line.id)}
+                  title={expandedToolLines[line.id] ? "Collapse" : "Expand to see full content"}
+                >
+                  {expandedToolLines[line.id] ? "▲" : "▼"}
+                </button>
+              </span>
+            {:else}
+              <HighlightedText
                 content={maskPaths(line.content, hidePaths)}
                 searchQuery={currentSearchQuery}
               />
-              <button
-                class="copy-message-btn opacity-0 group-hover:opacity-100 transition-opacity"
-                onclick={() => handleCopyMessage(line.id, line.content)}
-                title="Copy message"
-              >
-                <svg
-                  width="14"
-                  height="14"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  stroke-width="2"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                >
-                  <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
-                  <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
-                </svg>
-                <span class="copy-text">{copiedMessageId === line.id ? "Copied!" : "Copy"}</span>
-              </button>
-            </div>
-          {:else}
-            <HighlightedText
-              content={maskPaths(line.content, hidePaths)}
-              searchQuery={currentSearchQuery}
-            />
-          {/if}
-        </div>
+            {/if}
+          </div>
+        {/if}
       {/each}
     {/if}
   </div>
@@ -315,6 +386,42 @@
     color: var(--terminal-error, #f87171);
   }
 
+  .terminal-rate-limit {
+    color: var(--terminal-rate-limit, #fb923c);
+  }
+
+  .terminal-compact-prompt {
+    color: var(--text-secondary);
+  }
+
+  .terminal-worktree {
+    color: var(--terminal-worktree, #34d399);
+  }
+
+  .terminal-config-change {
+    color: var(--terminal-config-change, #a78bfa);
+  }
+
+  .compact-action-btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.4em;
+    background: var(--bg-secondary);
+    border: 1px solid var(--terminal-error, #f87171);
+    color: var(--terminal-error, #f87171);
+    padding: 0.3em 0.8em;
+    cursor: pointer;
+    border-radius: 4px;
+    font-size: 0.9em;
+    font-family: inherit;
+    transition: all 0.15s ease;
+  }
+
+  .compact-action-btn:hover {
+    background: color-mix(in srgb, var(--terminal-error, #f87171) 15%, transparent);
+    color: var(--terminal-error, #f87171);
+  }
+
   .terminal-default {
     color: var(--text-primary);
   }
@@ -394,4 +501,28 @@
   .terminal-line {
     position: relative;
   }
+
+  .tool-collapsible {
+    display: inline-flex;
+    align-items: baseline;
+    gap: 0.4em;
+  }
+
+  .tool-toggle-btn {
+    background: none;
+    border: none;
+    color: var(--text-tertiary, #6b7280);
+    cursor: pointer;
+    font-size: 0.7em;
+    padding: 0;
+    line-height: 1;
+    opacity: 0.7;
+    transition: opacity 0.15s ease;
+    font-family: inherit;
+  }
+
+  .tool-toggle-btn:hover {
+    opacity: 1;
+    color: var(--terminal-tool, #c084fc);
+  }
 </style>

src/lib/components/Terminal.test.ts

@@ -0,0 +1,264 @@
+/**
+ * Terminal Component Tests
+ *
+ * Tests the pure helper functions extracted from the Terminal component:
+ * - getLineClass: maps line types to CSS class names
+ * - getLinePrefix: maps line types to display prefixes
+ * - formatTime: formats a Date as "HH:MM AM/PM"
+ * - isToolContentLong: checks if tool content exceeds collapse threshold
+ * - truncateToolContent: truncates long tool content with ellipsis
+ *
+ * Manual testing checklist:
+ * - [ ] rate-limit lines appear in amber
+ * - [ ] error lines appear in red
+ * - [ ] tool lines appear in purple
+ * - [ ] system lines appear in grey italic
+ * - [ ] user lines appear in cyan
+ * - [ ] assistant lines appear in primary text colour
+ * - [ ] long tool content is collapsed by default with a toggle button
+ */
+
+import { describe, it, expect } from "vitest";
+
+// Mirror functions from Terminal.svelte for isolated testing
+
+function getLineClass(type: string): string {
+  switch (type) {
+    case "user":
+      return "terminal-user";
+    case "assistant":
+      return "terminal-assistant";
+    case "system":
+      return "terminal-system italic";
+    case "tool":
+      return "terminal-tool";
+    case "error":
+      return "terminal-error";
+    case "thinking":
+      return "terminal-thinking";
+    case "rate-limit":
+      return "terminal-rate-limit";
+    case "compact-prompt":
+      return "terminal-compact-prompt";
+    case "worktree":
+      return "terminal-worktree";
+    case "config-change":
+      return "terminal-config-change";
+    default:
+      return "terminal-default";
+  }
+}
+
+function getLinePrefix(type: string): string {
+  switch (type) {
+    case "user":
+      return ">";
+    case "assistant":
+      return "";
+    case "system":
+      return "[system]";
+    case "tool":
+      return "[tool]";
+    case "error":
+      return "[error]";
+    case "rate-limit":
+      return "[rate-limit]";
+    case "worktree":
+      return "[worktree]";
+    case "config-change":
+      return "[config]";
+    default:
+      return "";
+  }
+}
+
+function formatTime(date: Date): string {
+  return date.toLocaleTimeString("en-US", {
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+}
+
+const TOOL_COLLAPSE_THRESHOLD = 60;
+
+function isToolContentLong(content: string): boolean {
+  return content.length > TOOL_COLLAPSE_THRESHOLD;
+}
+
+function truncateToolContent(content: string): string {
+  return content.slice(0, TOOL_COLLAPSE_THRESHOLD) + "…";
+}
+
+// ---
+
+describe("getLineClass", () => {
+  it("returns terminal-user for user lines", () => {
+    expect(getLineClass("user")).toBe("terminal-user");
+  });
+
+  it("returns terminal-assistant for assistant lines", () => {
+    expect(getLineClass("assistant")).toBe("terminal-assistant");
+  });
+
+  it("returns terminal-system italic for system lines", () => {
+    expect(getLineClass("system")).toBe("terminal-system italic");
+  });
+
+  it("returns terminal-tool for tool lines", () => {
+    expect(getLineClass("tool")).toBe("terminal-tool");
+  });
+
+  it("returns terminal-error for error lines", () => {
+    expect(getLineClass("error")).toBe("terminal-error");
+  });
+
+  it("returns terminal-thinking for thinking lines", () => {
+    expect(getLineClass("thinking")).toBe("terminal-thinking");
+  });
+
+  it("returns terminal-rate-limit for rate-limit lines", () => {
+    expect(getLineClass("rate-limit")).toBe("terminal-rate-limit");
+  });
+
+  it("returns terminal-compact-prompt for compact-prompt lines", () => {
+    expect(getLineClass("compact-prompt")).toBe("terminal-compact-prompt");
+  });
+
+  it("returns terminal-worktree for worktree lines", () => {
+    expect(getLineClass("worktree")).toBe("terminal-worktree");
+  });
+
+  it("returns terminal-config-change for config-change lines", () => {
+    expect(getLineClass("config-change")).toBe("terminal-config-change");
+  });
+
+  it("returns terminal-default for unknown line types", () => {
+    expect(getLineClass("unknown")).toBe("terminal-default");
+    expect(getLineClass("")).toBe("terminal-default");
+    expect(getLineClass("random-future-type")).toBe("terminal-default");
+  });
+});
+
+describe("getLinePrefix", () => {
+  it("returns > for user lines", () => {
+    expect(getLinePrefix("user")).toBe(">");
+  });
+
+  it("returns empty string for assistant lines", () => {
+    expect(getLinePrefix("assistant")).toBe("");
+  });
+
+  it("returns [system] for system lines", () => {
+    expect(getLinePrefix("system")).toBe("[system]");
+  });
+
+  it("returns [tool] for tool lines", () => {
+    expect(getLinePrefix("tool")).toBe("[tool]");
+  });
+
+  it("returns [error] for error lines", () => {
+    expect(getLinePrefix("error")).toBe("[error]");
+  });
+
+  it("returns [rate-limit] for rate-limit lines", () => {
+    expect(getLinePrefix("rate-limit")).toBe("[rate-limit]");
+  });
+
+  it("returns empty string for compact-prompt lines (button renders instead)", () => {
+    expect(getLinePrefix("compact-prompt")).toBe("");
+  });
+
+  it("returns [worktree] for worktree lines", () => {
+    expect(getLinePrefix("worktree")).toBe("[worktree]");
+  });
+
+  it("returns [config] for config-change lines", () => {
+    expect(getLinePrefix("config-change")).toBe("[config]");
+  });
+
+  it("returns empty string for thinking lines (no prefix)", () => {
+    expect(getLinePrefix("thinking")).toBe("");
+  });
+
+  it("returns empty string for unknown line types", () => {
+    expect(getLinePrefix("unknown")).toBe("");
+    expect(getLinePrefix("")).toBe("");
+  });
+});
+
+describe("formatTime", () => {
+  it("formats time in 12-hour format with AM/PM", () => {
+    const date = new Date(2026, 1, 7, 14, 35);
+    const formatted = formatTime(date);
+    expect(formatted).toMatch(/\d{2}:\d{2}\s?(AM|PM)/i);
+  });
+
+  it("formats afternoon times correctly", () => {
+    const date = new Date(2026, 1, 7, 14, 35);
+    const formatted = formatTime(date);
+    expect(formatted).toContain("02:35");
+    expect(formatted.toUpperCase()).toContain("PM");
+  });
+
+  it("formats morning times correctly", () => {
+    const date = new Date(2026, 1, 7, 9, 5);
+    const formatted = formatTime(date);
+    expect(formatted).toContain("09:05");
+    expect(formatted.toUpperCase()).toContain("AM");
+  });
+
+  it("formats midnight correctly", () => {
+    const date = new Date(2026, 1, 7, 0, 0);
+    const formatted = formatTime(date);
+    expect(formatted).toContain("12:00");
+    expect(formatted.toUpperCase()).toContain("AM");
+  });
+
+  it("formats noon correctly", () => {
+    const date = new Date(2026, 1, 7, 12, 0);
+    const formatted = formatTime(date);
+    expect(formatted).toContain("12:00");
+    expect(formatted.toUpperCase()).toContain("PM");
+  });
+});
+
+describe("isToolContentLong", () => {
+  it("returns false for content at or below the threshold", () => {
+    const exactThreshold = "x".repeat(TOOL_COLLAPSE_THRESHOLD);
+    expect(isToolContentLong(exactThreshold)).toBe(false);
+  });
+
+  it("returns true for content exceeding the threshold", () => {
+    const overThreshold = "x".repeat(TOOL_COLLAPSE_THRESHOLD + 1);
+    expect(isToolContentLong(overThreshold)).toBe(true);
+  });
+
+  it("returns false for short content", () => {
+    expect(isToolContentLong("short")).toBe(false);
+  });
+
+  it("returns false for empty content", () => {
+    expect(isToolContentLong("")).toBe(false);
+  });
+});
+
+describe("truncateToolContent", () => {
+  it("truncates content to the threshold length with an ellipsis", () => {
+    const long = "x".repeat(100);
+    const result = truncateToolContent(long);
+    expect(result).toBe("x".repeat(TOOL_COLLAPSE_THRESHOLD) + "…");
+  });
+
+  it("keeps content shorter than threshold unchanged (plus ellipsis)", () => {
+    const short = "hello";
+    const result = truncateToolContent(short);
+    expect(result).toBe("hello…");
+  });
+
+  it("uses the unicode ellipsis character (not three dots)", () => {
+    const long = "x".repeat(100);
+    const result = truncateToolContent(long);
+    expect(result.endsWith("…")).toBe(true);
+    expect(result.endsWith("...")).toBe(false);
+  });
+});

src/lib/components/ThinkingBlock.svelte

@@ -0,0 +1,125 @@
+<script lang="ts">
+  interface Props {
+    content: string;
+    timestamp: Date;
+  }
+
+  let { content, timestamp }: Props = $props();
+  let isExpanded = $state(false);
+
+  function toggleExpanded() {
+    isExpanded = !isExpanded;
+  }
+
+  function formatTime(date: Date): string {
+    return date.toLocaleTimeString("en-US", {
+      hour: "2-digit",
+      minute: "2-digit",
+    });
+  }
+</script>
+
+<div class="thinking-block">
+  <button class="thinking-header" onclick={toggleExpanded} type="button">
+    <span class="thinking-timestamp">{formatTime(timestamp)}</span>
+    <svg
+      class="thinking-icon"
+      fill="none"
+      stroke="currentColor"
+      viewBox="0 0 24 24"
+      width="16"
+      height="16"
+    >
+      <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        stroke-width="2"
+        d="M9.663 17h4.673M12 3v1m6.364 1.636l-.707.707M21 12h-1M4 12H3m3.343-5.657l-.707-.707m2.828 9.9a5 5 0 117.072 0l-.548.547A3.374 3.374 0 0014 18.469V19a2 2 0 11-4 0v-.531c0-.895-.356-1.754-.988-2.386l-.548-.547z"
+      />
+    </svg>
+    <span class="thinking-label">Extended Thinking</span>
+    <svg
+      class="chevron"
+      class:expanded={isExpanded}
+      fill="none"
+      stroke="currentColor"
+      viewBox="0 0 24 24"
+      width="14"
+      height="14"
+    >
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+    </svg>
+  </button>
+
+  {#if isExpanded}
+    <div class="thinking-content">
+      {content}
+    </div>
+  {/if}
+</div>
+
+<style>
+  .thinking-block {
+    margin-bottom: 0.5rem;
+    border: 1px solid var(--border-color);
+    border-radius: 0.375rem;
+    background: var(--bg-secondary);
+    opacity: 0.85;
+  }
+
+  .thinking-header {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    width: 100%;
+    padding: 0.5rem 0.75rem;
+    border: none;
+    background: transparent;
+    cursor: pointer;
+    color: var(--text-secondary);
+    font-size: 0.875rem;
+    transition: all 0.2s;
+  }
+
+  .thinking-header:hover {
+    background: var(--bg-primary);
+    color: var(--text-primary);
+  }
+
+  .thinking-timestamp {
+    font-family: monospace;
+    font-size: 0.75rem;
+    opacity: 0.7;
+  }
+
+  .thinking-icon {
+    flex-shrink: 0;
+  }
+
+  .thinking-label {
+    flex: 1;
+    text-align: left;
+    font-style: italic;
+  }
+
+  .chevron {
+    flex-shrink: 0;
+    transition: transform 0.2s;
+  }
+
+  .chevron.expanded {
+    transform: rotate(180deg);
+  }
+
+  .thinking-content {
+    padding: 0.75rem;
+    border-top: 1px solid var(--border-color);
+    color: var(--text-secondary);
+    font-family: monospace;
+    font-size: 0.875rem;
+    font-style: italic;
+    line-height: 1.5;
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+</style>

src/lib/components/TodoPanel.svelte

@@ -0,0 +1,182 @@
+<script lang="ts">
+  import { todos } from "$lib/stores/todos";
+  import { CheckCircle, Circle, Loader } from "lucide-svelte";
+
+  interface Props {
+    onClose: () => void;
+  }
+
+  const { onClose }: Props = $props();
+
+  const currentTodos = $derived($todos);
+  const hasTodos = $derived(currentTodos.length > 0);
+  const completedCount = $derived(currentTodos.filter((t) => t.status === "completed").length);
+  const totalCount = $derived(currentTodos.length);
+</script>
+
+<div
+  class="fixed top-0 right-0 h-full w-96 bg-[var(--bg-primary)] border-l border-[var(--accent-primary)]/30 shadow-2xl flex flex-col z-50"
+>
+  <!-- Header -->
+  <div class="flex items-center justify-between p-4 border-b border-[var(--accent-primary)]/30">
+    <div class="flex items-center gap-3">
+      <div class="text-[var(--accent-primary)]">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="h-6 w-6"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4"
+          />
+        </svg>
+      </div>
+      <div>
+        <h2 class="text-lg font-semibold text-[var(--text-primary)]">Hikari's Todo List</h2>
+        {#if hasTodos}
+          <p class="text-xs text-[var(--text-secondary)]">
+            {completedCount} of {totalCount} completed
+          </p>
+        {/if}
+      </div>
+    </div>
+    <button
+      onclick={onClose}
+      class="text-[var(--text-secondary)] hover:text-[var(--text-primary)] transition-colors p-1 rounded-lg hover:bg-[var(--bg-secondary)]"
+      aria-label="Close todo panel"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        class="h-5 w-5"
+        viewBox="0 0 20 20"
+        fill="currentColor"
+      >
+        <path
+          fill-rule="evenodd"
+          d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+          clip-rule="evenodd"
+        />
+      </svg>
+    </button>
+  </div>
+
+  <!-- Content -->
+  <div class="flex-1 overflow-y-auto p-4">
+    {#if !hasTodos}
+      <div class="flex flex-col items-center justify-center h-full text-[var(--text-secondary)]">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="h-16 w-16 mb-4 opacity-50"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
+          />
+        </svg>
+        <p class="text-center">No active todos</p>
+        <p class="text-sm text-center mt-2">I'll update this when I start working on tasks!</p>
+      </div>
+    {:else}
+      <div class="space-y-2">
+        {#each currentTodos as todo (todo.content)}
+          <div
+            class="group bg-[var(--bg-secondary)]/50 rounded-lg p-3 border border-[var(--border-color)] hover:border-[var(--accent-primary)]/50 transition-all"
+            class:opacity-60={todo.status === "completed"}
+          >
+            <div class="flex items-start gap-3">
+              <!-- Status Icon -->
+              <div class="mt-0.5 flex-shrink-0">
+                {#if todo.status === "completed"}
+                  <CheckCircle class="w-5 h-5 text-[var(--success-color)]" />
+                {:else if todo.status === "in_progress"}
+                  <Loader class="w-5 h-5 text-[var(--accent-primary)] animate-spin" />
+                {:else}
+                  <Circle class="w-5 h-5 text-[var(--text-secondary)]" />
+                {/if}
+              </div>
+
+              <!-- Content -->
+              <div class="flex-1 min-w-0">
+                <p
+                  class="text-sm font-medium"
+                  class:text-[var(--text-secondary)]={todo.status === "completed"}
+                  class:line-through={todo.status === "completed"}
+                  class:text-[var(--text-primary)]={todo.status !== "completed"}
+                >
+                  {todo.status === "in_progress" ? todo.activeForm : todo.content}
+                </p>
+
+                <!-- Status Badge -->
+                <div class="mt-1">
+                  {#if todo.status === "completed"}
+                    <span
+                      class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-[var(--success-color)]/20 text-[var(--success-color)] border border-[var(--success-color)]/30"
+                    >
+                      ✓ Completed
+                    </span>
+                  {:else if todo.status === "in_progress"}
+                    <span
+                      class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-[var(--accent-primary)]/20 text-[var(--accent-primary)] border border-[var(--accent-primary)]/30 animate-pulse"
+                    >
+                      ⚡ In Progress
+                    </span>
+                  {:else}
+                    <span
+                      class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-[var(--bg-secondary)] text-[var(--text-secondary)] border border-[var(--border-color)]"
+                    >
+                      ○ Pending
+                    </span>
+                  {/if}
+                </div>
+              </div>
+            </div>
+          </div>
+        {/each}
+      </div>
+    {/if}
+  </div>
+
+  <!-- Footer with Progress Bar -->
+  {#if hasTodos}
+    <div class="border-t border-[var(--accent-primary)]/30 p-4 bg-[var(--bg-secondary)]/50">
+      <div class="flex items-center justify-between mb-2">
+        <span class="text-xs font-medium text-[var(--text-secondary)]">Progress</span>
+        <span class="text-xs font-medium text-[var(--accent-primary)]">
+          {Math.round((completedCount / totalCount) * 100)}%
+        </span>
+      </div>
+      <div class="w-full bg-[var(--bg-secondary)] rounded-full h-2 overflow-hidden">
+        <div
+          class="bg-gradient-to-r from-[var(--accent-primary)] to-[var(--accent-secondary)] h-2 rounded-full transition-all duration-500 ease-out"
+          style="width: {(completedCount / totalCount) * 100}%"
+        ></div>
+      </div>
+    </div>
+  {/if}
+</div>
+
+<style>
+  @keyframes pulse {
+    0%,
+    100% {
+      opacity: 1;
+    }
+    50% {
+      opacity: 0.5;
+    }
+  }
+
+  .animate-pulse {
+    animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+  }
+</style>

src/lib/components/UserQuestionModal.svelte

@@ -106,6 +106,8 @@
           custom_instructions: config.custom_instructions || null,
           mcp_servers_json: config.mcp_servers_json || null,
           allowed_tools: grantedToolsList,
+          use_worktree: config.use_worktree ?? false,
+          disable_1m_context: config.disable_1m_context ?? false,
         },
       });
 

src/lib/stores/agents.test.ts

@@ -0,0 +1,376 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { agentStore, getAgentsForConversation, runningAgentCount } from "./agents";
+import { get } from "svelte/store";
+import type { AgentInfo } from "$lib/types/agents";
+import { CHARACTER_POOL } from "$lib/utils/agentCharacters";
+
+describe("agents store", () => {
+  const conversationId = "test-conversation-1";
+  const otherConversationId = "test-conversation-2";
+
+  type AgentInput = Omit<AgentInfo, "characterName" | "characterAvatar">;
+
+  const createMockAgent = (overrides?: Partial<AgentInput>): AgentInput => ({
+    toolUseId: "toolu_test123",
+    description: "Test agent",
+    subagentType: "Explore",
+    startedAt: Date.now(),
+    status: "running",
+    ...overrides,
+  });
+
+  beforeEach(() => {
+    // Clear all conversations by subscribing and getting state
+    let state: Record<string, AgentInfo[]> = {};
+    const unsub = agentStore.subscribe((s) => {
+      state = s;
+    });
+    unsub();
+
+    // Clear each conversation
+    for (const convId of Object.keys(state)) {
+      agentStore.clearConversation(convId);
+    }
+  });
+
+  describe("addAgent", () => {
+    it("adds an agent to a conversation", () => {
+      const agent = createMockAgent();
+      agentStore.addAgent(conversationId, agent);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents).toHaveLength(1);
+      expect(agents[0]).toMatchObject(agent);
+    });
+
+    it("assigns a character name and avatar to added agents", () => {
+      const agent = createMockAgent();
+      agentStore.addAgent(conversationId, agent);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      const validNames = CHARACTER_POOL.map((c) => c.name);
+      expect(validNames).toContain(agents[0].characterName);
+      expect(agents[0].characterAvatar).toMatch(/^https:\/\//u);
+    });
+
+    it("avoids duplicate character names across agents when possible", () => {
+      // Add 6 agents - each should ideally get a unique character
+      for (let i = 0; i < 6; i++) {
+        agentStore.addAgent(conversationId, createMockAgent({ toolUseId: `tool${i.toString()}` }));
+      }
+
+      const agents = get(getAgentsForConversation(conversationId));
+      const names = agents.map((a) => a.characterName);
+      const uniqueNames = new Set(names);
+      expect(uniqueNames.size).toBe(6);
+    });
+
+    it("adds multiple agents to the same conversation", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1" });
+      const agent2 = createMockAgent({ toolUseId: "tool2" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(conversationId, agent2);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents).toHaveLength(2);
+      expect(agents[0]).toMatchObject(agent1);
+      expect(agents[1]).toMatchObject(agent2);
+    });
+
+    it("keeps agents in different conversations separate", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1" });
+      const agent2 = createMockAgent({ toolUseId: "tool2" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(otherConversationId, agent2);
+
+      const agents1 = get(getAgentsForConversation(conversationId));
+      const agents2 = get(getAgentsForConversation(otherConversationId));
+
+      expect(agents1).toHaveLength(1);
+      expect(agents2).toHaveLength(1);
+      expect(agents1[0]).toMatchObject(agent1);
+      expect(agents2[0]).toMatchObject(agent2);
+    });
+  });
+
+  describe("updateAgentId", () => {
+    it("updates the agent_id for a specific agent", () => {
+      const agent = createMockAgent({ agentId: undefined });
+      agentStore.addAgent(conversationId, agent);
+
+      agentStore.updateAgentId(conversationId, agent.toolUseId, "agent-abc123");
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].agentId).toBe("agent-abc123");
+    });
+
+    it("does nothing if conversation doesn't exist", () => {
+      agentStore.updateAgentId("nonexistent", "tool1", "agent1");
+      // Should not throw
+      expect(true).toBe(true);
+    });
+
+    it("does nothing if tool_use_id doesn't exist", () => {
+      const agent = createMockAgent();
+      agentStore.addAgent(conversationId, agent);
+
+      agentStore.updateAgentId(conversationId, "nonexistent-tool", "agent1");
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].agentId).toBeUndefined();
+    });
+  });
+
+  describe("endAgent", () => {
+    it("marks an agent as completed", () => {
+      const agent = createMockAgent({ status: "running" });
+      agentStore.addAgent(conversationId, agent);
+
+      const endTime = Date.now();
+      agentStore.endAgent(conversationId, agent.toolUseId, endTime, false);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].status).toBe("completed");
+      expect(agents[0].endedAt).toBe(endTime);
+      expect(agents[0].durationMs).toBeGreaterThanOrEqual(0); // Duration can be 0 if timestamps are the same
+    });
+
+    it("marks an agent as errored", () => {
+      const agent = createMockAgent({ status: "running" });
+      agentStore.addAgent(conversationId, agent);
+
+      const endTime = Date.now();
+      agentStore.endAgent(conversationId, agent.toolUseId, endTime, true);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].status).toBe("errored");
+      expect(agents[0].endedAt).toBe(endTime);
+    });
+
+    it("calculates duration correctly", () => {
+      const startTime = Date.now() - 5000; // 5 seconds ago
+      const agent = createMockAgent({ startedAt: startTime, status: "running" });
+      agentStore.addAgent(conversationId, agent);
+
+      const endTime = Date.now();
+      agentStore.endAgent(conversationId, agent.toolUseId, endTime, false);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].durationMs).toBeGreaterThanOrEqual(5000);
+      expect(agents[0].durationMs).toBeLessThanOrEqual(6000); // Allow some buffer
+    });
+
+    it("does nothing if conversation doesn't exist", () => {
+      agentStore.endAgent("nonexistent", "tool1", Date.now(), false);
+      // Should not throw
+      expect(true).toBe(true);
+    });
+
+    it("does nothing if agent doesn't exist", () => {
+      const agent = createMockAgent();
+      agentStore.addAgent(conversationId, agent);
+
+      agentStore.endAgent(conversationId, "nonexistent-tool", Date.now(), false);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].status).toBe("running"); // Status unchanged
+    });
+
+    it("stores lastAssistantMessage when provided", () => {
+      const agent = createMockAgent({ status: "running" });
+      agentStore.addAgent(conversationId, agent);
+
+      agentStore.endAgent(
+        conversationId,
+        agent.toolUseId,
+        Date.now(),
+        false,
+        "Task completed successfully."
+      );
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].lastAssistantMessage).toBe("Task completed successfully.");
+    });
+
+    it("leaves lastAssistantMessage undefined when not provided", () => {
+      const agent = createMockAgent({ status: "running" });
+      agentStore.addAgent(conversationId, agent);
+
+      agentStore.endAgent(conversationId, agent.toolUseId, Date.now(), false);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].lastAssistantMessage).toBeUndefined();
+    });
+  });
+
+  describe("markAllErrored", () => {
+    it("marks all running agents as errored", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1", status: "running" });
+      const agent2 = createMockAgent({ toolUseId: "tool2", status: "running" });
+      const agent3 = createMockAgent({ toolUseId: "tool3", status: "completed" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(conversationId, agent2);
+      agentStore.addAgent(conversationId, agent3);
+
+      agentStore.markAllErrored(conversationId);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].status).toBe("errored");
+      expect(agents[0].endedAt).toBeGreaterThan(0);
+      expect(agents[1].status).toBe("errored");
+      expect(agents[1].endedAt).toBeGreaterThan(0);
+      expect(agents[2].status).toBe("completed"); // Already completed, unchanged
+    });
+
+    it("does nothing if conversation doesn't exist", () => {
+      agentStore.markAllErrored("nonexistent");
+      // Should not throw
+      expect(true).toBe(true);
+    });
+
+    it("does nothing if conversation has no running agents", () => {
+      const agent = createMockAgent({ status: "completed" });
+      agentStore.addAgent(conversationId, agent);
+
+      agentStore.markAllErrored(conversationId);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents[0].status).toBe("completed"); // Unchanged
+    });
+  });
+
+  describe("clearCompleted", () => {
+    it("removes completed and errored agents", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1", status: "running" });
+      const agent2 = createMockAgent({ toolUseId: "tool2", status: "completed" });
+      const agent3 = createMockAgent({ toolUseId: "tool3", status: "errored" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(conversationId, agent2);
+      agentStore.addAgent(conversationId, agent3);
+
+      agentStore.clearCompleted(conversationId);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents).toHaveLength(1);
+      expect(agents[0].toolUseId).toBe("tool1"); // Only running agent remains
+    });
+
+    it("does nothing if conversation doesn't exist", () => {
+      agentStore.clearCompleted("nonexistent");
+      // Should not throw
+      expect(true).toBe(true);
+    });
+
+    it("clears all agents if all are completed", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1", status: "completed" });
+      const agent2 = createMockAgent({ toolUseId: "tool2", status: "errored" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(conversationId, agent2);
+
+      agentStore.clearCompleted(conversationId);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents).toHaveLength(0);
+    });
+  });
+
+  describe("clearConversation", () => {
+    it("removes all agents from a conversation", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1" });
+      const agent2 = createMockAgent({ toolUseId: "tool2" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(conversationId, agent2);
+
+      agentStore.clearConversation(conversationId);
+
+      const agents = get(getAgentsForConversation(conversationId));
+      expect(agents).toHaveLength(0);
+    });
+
+    it("only removes agents from the specified conversation", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1" });
+      const agent2 = createMockAgent({ toolUseId: "tool2" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(otherConversationId, agent2);
+
+      agentStore.clearConversation(conversationId);
+
+      const agents1 = get(getAgentsForConversation(conversationId));
+      const agents2 = get(getAgentsForConversation(otherConversationId));
+
+      expect(agents1).toHaveLength(0);
+      expect(agents2).toHaveLength(1);
+      expect(agents2[0]).toMatchObject(agent2);
+    });
+
+    it("does nothing if conversation doesn't exist", () => {
+      agentStore.clearConversation("nonexistent");
+      // Should not throw
+      expect(true).toBe(true);
+    });
+  });
+
+  describe("runningAgentCount", () => {
+    it("counts running agents across all conversations", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1", status: "running" });
+      const agent2 = createMockAgent({ toolUseId: "tool2", status: "running" });
+      const agent3 = createMockAgent({ toolUseId: "tool3", status: "completed" });
+      const agent4 = createMockAgent({ toolUseId: "tool4", status: "running" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(conversationId, agent2);
+      agentStore.addAgent(conversationId, agent3);
+      agentStore.addAgent(otherConversationId, agent4);
+
+      const count = get(runningAgentCount);
+      expect(count).toBe(3); // 2 from first conversation + 1 from second
+    });
+
+    it("returns 0 when no agents are running", () => {
+      const agent1 = createMockAgent({ status: "completed" });
+      const agent2 = createMockAgent({ status: "errored" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(otherConversationId, agent2);
+
+      const count = get(runningAgentCount);
+      expect(count).toBe(0);
+    });
+
+    it("updates when agents complete", () => {
+      const agent = createMockAgent({ status: "running" });
+      agentStore.addAgent(conversationId, agent);
+
+      let count = get(runningAgentCount);
+      expect(count).toBe(1);
+
+      agentStore.endAgent(conversationId, agent.toolUseId, Date.now(), false);
+
+      count = get(runningAgentCount);
+      expect(count).toBe(0);
+    });
+
+    it("updates when conversation is cleared", () => {
+      const agent1 = createMockAgent({ toolUseId: "tool1", status: "running" });
+      const agent2 = createMockAgent({ toolUseId: "tool2", status: "running" });
+
+      agentStore.addAgent(conversationId, agent1);
+      agentStore.addAgent(conversationId, agent2);
+
+      let count = get(runningAgentCount);
+      expect(count).toBe(2);
+
+      agentStore.clearConversation(conversationId);
+
+      count = get(runningAgentCount);
+      expect(count).toBe(0);
+    });
+  });
+});

src/lib/stores/agents.ts

@@ -1,5 +1,6 @@
 import { writable, derived } from "svelte/store";
 import type { AgentInfo } from "$lib/types/agents";
+import { assignCharacter } from "$lib/utils/agentCharacters";
 
 // Map of conversation ID -> agents in that conversation
 const agentsByConversation = writable<Record<string, AgentInfo[]>>({});
@@ -8,12 +9,17 @@ function createAgentStore() {
   return {
     subscribe: agentsByConversation.subscribe,
 
-    addAgent(conversationId: string, agent: AgentInfo) {
+    addAgent(conversationId: string, agent: Omit<AgentInfo, "characterName" | "characterAvatar">) {
       agentsByConversation.update((state) => {
         const existing = state[conversationId] || [];
+        const activeNames = existing.map((a) => a.characterName);
+        const character = assignCharacter(activeNames);
         return {
           ...state,
-          [conversationId]: [...existing, agent],
+          [conversationId]: [
+            ...existing,
+            { ...agent, characterName: character.name, characterAvatar: character.avatar },
+          ],
         };
       });
     },
@@ -39,7 +45,13 @@ function createAgentStore() {
       });
     },
 
-    endAgent(conversationId: string, toolUseId: string, endedAt: number, isError: boolean) {
+    endAgent(
+      conversationId: string,
+      toolUseId: string,
+      endedAt: number,
+      isError: boolean,
+      lastAssistantMessage?: string
+    ) {
       agentsByConversation.update((state) => {
         const agents = state[conversationId];
         if (!agents) return state;
@@ -56,6 +68,7 @@ function createAgentStore() {
           endedAt,
           status: isError ? "errored" : "completed",
           durationMs,
+          lastAssistantMessage,
         };
 
         return {

src/lib/stores/config.test.ts

@@ -193,6 +193,9 @@ describe("config store", () => {
         budget_action: "warn",
         budget_warning_threshold: 0.8,
         discord_rpc_enabled: true,
+        show_thinking_blocks: true,
+        use_worktree: false,
+        disable_1m_context: false,
       };
 
       expect(config.model).toBe("claude-sonnet-4");
@@ -238,6 +241,9 @@ describe("config store", () => {
         budget_action: "warn",
         budget_warning_threshold: 0.8,
         discord_rpc_enabled: true,
+        show_thinking_blocks: true,
+        use_worktree: false,
+        disable_1m_context: false,
       };
 
       expect(config.model).toBeNull();
@@ -720,6 +726,9 @@ describe("config store", () => {
     it("handles save errors gracefully without losing data", async () => {
       const mockInvokeImpl = vi.mocked(invoke);
 
+      // Mock console.error to suppress expected error output
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+
       // Set initial config
       await configStore.updateConfig({ font_size: 14 });
 
@@ -731,6 +740,12 @@ describe("config store", () => {
 
       // Original config should still be accessible
       expect(configStore.getConfig().font_size).toBe(14);
+
+      // Verify error was logged
+      expect(consoleErrorSpy).toHaveBeenCalledWith("Failed to save config:", expect.any(Error));
+
+      // Restore console.error
+      consoleErrorSpy.mockRestore();
     });
   });
 
@@ -773,6 +788,9 @@ describe("config store", () => {
         budget_action: "block",
         budget_warning_threshold: 0.9,
         discord_rpc_enabled: false,
+        show_thinking_blocks: true,
+        use_worktree: false,
+        disable_1m_context: false,
       };
 
       const mockInvokeImpl = vi.mocked(invoke);

src/lib/stores/config.ts

@@ -45,6 +45,12 @@ export interface HikariConfig {
   budget_warning_threshold: number;
   // Discord RPC settings
   discord_rpc_enabled: boolean;
+  // Thinking blocks settings
+  show_thinking_blocks: boolean;
+  // Worktree isolation
+  use_worktree: boolean;
+  // Disable 1M context window
+  disable_1m_context: boolean;
 }
 
 const defaultConfig: HikariConfig = {
@@ -84,6 +90,9 @@ const defaultConfig: HikariConfig = {
   budget_action: "warn",
   budget_warning_threshold: 0.8,
   discord_rpc_enabled: true,
+  show_thinking_blocks: true,
+  use_worktree: false,
+  disable_1m_context: false,
 };
 
 function createConfigStore() {
@@ -297,6 +306,10 @@ export const shouldHidePaths = derived(
   configStore.config,
   ($config) => $config.streamer_mode && $config.streamer_hide_paths
 );
+export const showThinkingBlocks = derived(
+  configStore.config,
+  ($config) => $config.show_thinking_blocks
+);
 
 /**
  * Masks file paths in text when streamer mode with hide paths is enabled.

src/lib/stores/conversations.ts

@@ -10,6 +10,7 @@ import type { CharacterState } from "$lib/types/states";
 import { cleanupConversationTracking } from "$lib/tauri";
 import { characterState } from "$lib/stores/character";
 import { sessionsStore } from "$lib/stores/sessions";
+import { agentStore } from "$lib/stores/agents";
 
 export interface ConversationSummary {
   generatedAt: Date;
@@ -333,6 +334,10 @@ function createConversationsStore() {
       // Clean up tracking for this conversation (including temp files)
       await cleanupConversationTracking(id);
 
+      // Clean up agent tracking for this conversation
+      // This prevents the badge from persisting after tab close
+      agentStore.clearConversation(id);
+
       conversations.update((c) => {
         c.delete(id);
         return c;

src/lib/stores/stats.ts

@@ -12,6 +12,7 @@ export type BudgetType = "token" | "cost";
 export const MODEL_PRICING: Record<string, { input: number; output: number }> = {
   // Current 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 },

src/lib/stores/todos.ts

@@ -0,0 +1,44 @@
+import { writable } from "svelte/store";
+import { listen } from "@tauri-apps/api/event";
+
+export interface TodoItem {
+  content: string;
+  status: "pending" | "in_progress" | "completed";
+  activeForm: string;
+}
+
+interface TodoUpdatePayload {
+  todos: TodoItem[];
+  conversation_id?: string;
+}
+
+// Create the writable store
+const { subscribe, set, update } = writable<TodoItem[]>([]);
+
+// Listen for todo updates from the backend
+let unlisten: (() => void) | undefined;
+
+export async function initializeTodoListener(): Promise<void> {
+  if (unlisten) {
+    return; // Already initialized
+  }
+
+  unlisten = await listen<TodoUpdatePayload>("claude:todo-update", (event) => {
+    set(event.payload.todos);
+  });
+}
+
+export function cleanupTodoListener(): void {
+  if (unlisten) {
+    unlisten();
+    unlisten = undefined;
+  }
+}
+
+// Export the store
+export const todos = {
+  subscribe,
+  set,
+  update,
+  clear: () => set([]),
+};

src/lib/tauri.ts

@@ -14,6 +14,7 @@ import type {
 import type { CharacterState } from "$lib/types/states";
 import type { AgentStartPayload, AgentEndPayload } from "$lib/types/agents";
 import { agentStore } from "$lib/stores/agents";
+import { todos } from "$lib/stores/todos";
 import {
   initializeNotificationRules,
   cleanupNotificationRules,
@@ -28,6 +29,7 @@ interface StateChangePayload {
 }
 
 const connectedConversations = new Set<string>();
+const greetingPendingConversations = new Set<string>();
 let unlisteners: Array<() => void> = [];
 let skipNextGreeting = false;
 
@@ -54,17 +56,17 @@ function generateGreetingPrompt(): string {
   return `[System: A new session has started. It's currently ${timeOfDay}. Please greet the user warmly and briefly. Keep it short - just 1-2 sentences.]`;
 }
 
-async function sendGreeting(conversationId: string) {
+async function sendGreeting(conversationId: string): Promise<boolean> {
   // Check if we should skip this greeting
   if (skipNextGreeting) {
     skipNextGreeting = false; // Reset the flag
-    return;
+    return false;
   }
 
   const config = configStore.getConfig();
 
   if (!config.greeting_enabled) {
-    return;
+    return false;
   }
 
   const greetingPrompt = config.greeting_custom_prompt?.trim() || generateGreetingPrompt();
@@ -80,10 +82,12 @@ async function sendGreeting(conversationId: string) {
       conversationId,
       message: greetingPrompt,
     });
+    return true;
   } catch (error) {
     console.error("Failed to send greeting:", error);
     claudeStore.addLineToConversation(conversationId, "error", `Failed to send greeting: ${error}`);
     characterState.setTemporaryState("error", 3000);
+    return false;
   }
 }
 
@@ -117,6 +121,7 @@ interface WorkingDirectoryPayload {
 
 export async function cleanupConversationTracking(conversationId: string) {
   connectedConversations.delete(conversationId);
+  greetingPendingConversations.delete(conversationId);
 
   // Clean up any temp files associated with this conversation
   try {
@@ -172,7 +177,24 @@ export async function initializeTauriListeners() {
         if (!connectedConversations.has(targetConversationId)) {
           connectedConversations.add(targetConversationId);
           resetSessionStats(); // Reset session stats on new connection
-          await sendGreeting(targetConversationId);
+
+          // Immediately hold the tab at yellow while we wait for the greeting response.
+          // This avoids a brief green flash before the greeting is even sent.
+          greetingPendingConversations.add(targetConversationId);
+          claudeStore.setConnectionStatusForConversation(
+            targetConversationId,
+            "connecting" as ConnectionStatus
+          );
+
+          const greetingSent = await sendGreeting(targetConversationId);
+          if (!greetingSent) {
+            // Greeting was disabled or failed — flip straight to connected.
+            greetingPendingConversations.delete(targetConversationId);
+            claudeStore.setConnectionStatusForConversation(
+              targetConversationId,
+              "connected" as ConnectionStatus
+            );
+          }
         }
       }
     } else if (status === "disconnected") {
@@ -182,11 +204,15 @@ export async function initializeTauriListeners() {
       // (permission prompts trigger reconnects and agents may complete before reconnect)
       if (!skipNextGreeting && targetConversationId) {
         agentStore.markAllErrored(targetConversationId);
+        // Clear the conversation's agents from the store on real disconnect
+        // This prevents agents from persisting across sessions
+        agentStore.clearConversation(targetConversationId);
       }
 
       // Only remove from connected set if we're not about to reconnect
       if (!skipNextGreeting && targetConversationId) {
         connectedConversations.delete(targetConversationId);
+        greetingPendingConversations.delete(targetConversationId);
       }
 
       // Don't add system message if we're about to reconnect
@@ -196,6 +222,17 @@ export async function initializeTauriListeners() {
           "system",
           "Disconnected from Claude Code"
         );
+
+        // Clear todos on real disconnect (not on reconnects for permissions)
+        todos.clear();
+      }
+
+      // Update the tab's connection status on real disconnects
+      if (!skipNextGreeting && targetConversationId) {
+        claudeStore.setConnectionStatusForConversation(
+          targetConversationId,
+          "disconnected" as ConnectionStatus
+        );
       }
 
       // Update character state for this conversation
@@ -207,6 +244,7 @@ export async function initializeTauriListeners() {
 
       if (targetConversationId) {
         connectedConversations.delete(targetConversationId);
+        greetingPendingConversations.delete(targetConversationId);
         claudeStore.addLineToConversation(targetConversationId, "error", "Connection error");
       }
 
@@ -268,11 +306,34 @@ export async function initializeTauriListeners() {
         }
       : undefined;
 
+    // Flip to connected when first assistant message arrives after greeting
+    if (
+      conversation_id &&
+      line_type === "assistant" &&
+      greetingPendingConversations.has(conversation_id)
+    ) {
+      greetingPendingConversations.delete(conversation_id);
+      claudeStore.setConnectionStatusForConversation(
+        conversation_id,
+        "connected" as ConnectionStatus
+      );
+    }
+
     // Always store the output to the correct conversation
     if (conversation_id) {
       claudeStore.addLineToConversation(
         conversation_id,
-        line_type as "user" | "assistant" | "system" | "tool" | "error",
+        line_type as
+          | "user"
+          | "assistant"
+          | "system"
+          | "tool"
+          | "error"
+          | "thinking"
+          | "rate-limit"
+          | "compact-prompt"
+          | "worktree"
+          | "config-change",
         content,
         tool_name || undefined,
         costData,
@@ -281,7 +342,17 @@ export async function initializeTauriListeners() {
     } else {
       // Fallback to active conversation if no conversation_id provided
       claudeStore.addLine(
-        line_type as "user" | "assistant" | "system" | "tool" | "error",
+        line_type as
+          | "user"
+          | "assistant"
+          | "system"
+          | "tool"
+          | "error"
+          | "thinking"
+          | "rate-limit"
+          | "compact-prompt"
+          | "worktree"
+          | "config-change",
         content,
         tool_name || undefined,
         costData,
@@ -403,10 +474,17 @@ export async function initializeTauriListeners() {
   unlisteners.push(agentUpdateUnlisten);
 
   const agentEndUnlisten = await listen<AgentEndPayload>("claude:agent-end", (event) => {
-    const { tool_use_id, ended_at, is_error, conversation_id } = event.payload;
+    const { tool_use_id, ended_at, is_error, conversation_id, last_assistant_message } =
+      event.payload;
     const targetConversationId = conversation_id || get(claudeStore.activeConversationId);
     if (targetConversationId) {
-      agentStore.endAgent(targetConversationId, tool_use_id, ended_at, is_error);
+      agentStore.endAgent(
+        targetConversationId,
+        tool_use_id,
+        ended_at,
+        is_error,
+        last_assistant_message
+      );
     }
   });
   unlisteners.push(agentEndUnlisten);
@@ -448,10 +526,6 @@ export async function initializeDiscordRpc() {
       const startedAtUnixSeconds = Math.floor(startedAt.getTime() / 1000);
       const model = config.model || "claude";
 
-      await invoke("log_discord_rpc", {
-        message: `[FRONTEND] Attempting to initialize Discord RPC: session='Idle', model='${model}', timestamp=${startedAtUnixSeconds}`,
-      });
-
       console.log("Initializing Discord RPC with initial activity:", {
         session_name: "Idle",
         model,
@@ -464,23 +538,13 @@ export async function initializeDiscordRpc() {
         startedAt: startedAtUnixSeconds,
       });
 
-      await invoke("log_discord_rpc", {
-        message: "[FRONTEND] Discord RPC initialized successfully!",
-      });
-
       console.log("Discord RPC initialized successfully with initial presence");
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      await invoke("log_discord_rpc", {
-        message: `[FRONTEND] ERROR: Failed to initialize Discord RPC: ${errorMessage}`,
-      });
       console.error("Failed to initialize Discord RPC:", error);
       console.warn("Discord RPC will be unavailable. Make sure Discord is running.");
     }
   } else {
-    await invoke("log_discord_rpc", {
-      message: "[FRONTEND] Discord RPC is disabled in config, skipping initialization",
-    });
+    console.log("Discord RPC is disabled in config, skipping initialization");
   }
 }
 

src/lib/types/agents.ts

@@ -10,6 +10,9 @@ export interface AgentInfo {
   status: AgentStatus;
   parentToolUseId?: string;
   durationMs?: number;
+  characterName: string;
+  characterAvatar: string;
+  lastAssistantMessage?: string;
 }
 
 export interface AgentStartPayload {
@@ -29,4 +32,5 @@ export interface AgentEndPayload {
   conversation_id?: string;
   duration_ms?: number;
   num_turns?: number;
+  last_assistant_message?: string;
 }

src/lib/types/messages.ts

@@ -1,6 +1,16 @@
 export interface TerminalLine {
   id: string;
-  type: "user" | "assistant" | "system" | "tool" | "error";
+  type:
+    | "user"
+    | "assistant"
+    | "system"
+    | "tool"
+    | "error"
+    | "thinking"
+    | "rate-limit"
+    | "compact-prompt"
+    | "worktree"
+    | "config-change";
   content: string;
   timestamp: Date;
   toolName?: string;

src/lib/utils/agentCharacters.test.ts

@@ -0,0 +1,73 @@
+import { describe, it, expect } from "vitest";
+import { CHARACTER_POOL, assignCharacter } from "./agentCharacters";
+
+describe("agentCharacters", () => {
+  describe("CHARACTER_POOL", () => {
+    it("contains exactly 6 characters", () => {
+      expect(CHARACTER_POOL).toHaveLength(6);
+    });
+
+    it("each character has a name, avatar, title, and description", () => {
+      for (const character of CHARACTER_POOL) {
+        expect(character.name).toBeTruthy();
+        expect(character.avatar).toBeTruthy();
+        expect(character.avatar).toMatch(/^https:\/\//u);
+        expect(character.title).toBeTruthy();
+        expect(character.description).toBeTruthy();
+      }
+    });
+
+    it("all names are unique", () => {
+      const names = CHARACTER_POOL.map((c) => c.name);
+      const uniqueNames = new Set(names);
+      expect(uniqueNames.size).toBe(CHARACTER_POOL.length);
+    });
+  });
+
+  describe("assignCharacter", () => {
+    it("returns a character from the pool", () => {
+      const character = assignCharacter([]);
+      const names = CHARACTER_POOL.map((c) => c.name);
+      expect(names).toContain(character.name);
+    });
+
+    it("avoids names already in use when possible", () => {
+      const takenNames = ["Amari", "Keiko", "Minori", "Reina", "Tatsumi"];
+      // Run many times to confirm we never get a taken name
+      for (let i = 0; i < 50; i++) {
+        const character = assignCharacter(takenNames);
+        expect(takenNames).not.toContain(character.name);
+        expect(character.name).toBe("Yumiko");
+      }
+    });
+
+    it("picks from the full pool when all 6 names are taken", () => {
+      const allNames = CHARACTER_POOL.map((c) => c.name);
+      const seen = new Set<string>();
+      // Run enough times that we'd statistically see variety
+      for (let i = 0; i < 100; i++) {
+        const character = assignCharacter(allNames);
+        seen.add(character.name);
+      }
+      // Should still pick valid characters
+      for (const name of seen) {
+        expect(allNames).toContain(name);
+      }
+      // With 100 runs and 6 characters, we should see at least 2 distinct names
+      expect(seen.size).toBeGreaterThan(1);
+    });
+
+    it("returns a character with name, avatar, title, and description", () => {
+      const character = assignCharacter([]);
+      expect(character.name).toBeTruthy();
+      expect(character.avatar).toBeTruthy();
+      expect(character.title).toBeTruthy();
+      expect(character.description).toBeTruthy();
+    });
+
+    it("works when the active list is empty", () => {
+      const character = assignCharacter([]);
+      expect(character).toBeDefined();
+    });
+  });
+});

src/lib/utils/agentCharacters.ts

@@ -0,0 +1,61 @@
+export interface AgentCharacter {
+  name: string;
+  avatar: string;
+  title: string;
+  description: string;
+}
+
+export const CHARACTER_POOL: readonly AgentCharacter[] = [
+  {
+    name: "Amari",
+    avatar: "https://cdn.nhcarrigan.com/amari.png",
+    title: "Executive Assistant",
+    description:
+      "Fey-blooded PA and healer of the team. She always knows when you need a break — and makes sure you take one.",
+  },
+  {
+    name: "Keiko",
+    avatar: "https://cdn.nhcarrigan.com/keiko.png",
+    title: "Chief Security Officer",
+    description:
+      "Bodyguard and shadow of the family. Conceals blades beneath evening gowns; always watching from the dark.",
+  },
+  {
+    name: "Minori",
+    avatar: "https://cdn.nhcarrigan.com/minori.png",
+    title: "Chief Compliance Officer",
+    description:
+      "An ancient Automaton built to guard the Great Library. Perfect memory, perfect logic, perfect dedication.",
+  },
+  {
+    name: "Reina",
+    avatar: "https://cdn.nhcarrigan.com/reina.png",
+    title: "Chief Legal Officer",
+    description:
+      "Demon of the Crossroads turned corporate lawyer. Her binding contracts have held for millennia.",
+  },
+  {
+    name: "Tatsumi",
+    avatar: "https://cdn.nhcarrigan.com/tatsumi.png",
+    title: "Chief Design Officer",
+    description:
+      "A Siren who traded the ocean for a stylus. Uses her glamour to make every interface welcoming and beautiful.",
+  },
+  {
+    name: "Yumiko",
+    avatar: "https://cdn.nhcarrigan.com/yumiko.png",
+    title: "Chief Technology Officer",
+    description:
+      "Technomancer and machine whisperer. She communes with machine spirits and keeps the digital world running.",
+  },
+];
+
+/**
+ * Picks a character for a new subagent.
+ * Avoids names already assigned to active agents unless all six are taken.
+ */
+export function assignCharacter(activeNames: readonly string[]): AgentCharacter {
+  const available = CHARACTER_POOL.filter((c) => !activeNames.includes(c.name));
+  const pool = available.length > 0 ? available : [...CHARACTER_POOL];
+  return pool[Math.floor(Math.random() * pool.length)];
+}

src/routes/+page.svelte

@@ -33,7 +33,9 @@
   import AchievementsPanel from "$lib/components/AchievementsPanel.svelte";
   import UpdateNotification from "$lib/components/UpdateNotification.svelte";
   import CloseAppConfirmModal from "$lib/components/CloseAppConfirmModal.svelte";
+  import MemoryBrowserPanel from "$lib/components/MemoryBrowserPanel.svelte";
   import { debugConsoleStore } from "$lib/stores/debugConsole";
+  import { initializeTodoListener, cleanupTodoListener } from "$lib/stores/todos";
 
   let initialized = false;
   let updateNotification: UpdateNotification | undefined = $state(undefined);
@@ -444,6 +446,9 @@
       // Initialize Discord RPC
       await initializeDiscordRpc();
 
+      // Initialize todo listener
+      await initializeTodoListener();
+
       // Listen for window close requests
       const unlisten = await listen("window-close-requested", () => {
         handleCloseRequest();
@@ -460,6 +465,7 @@
     if (initialized) {
       cleanupTauriListeners();
       cleanupNotificationSync();
+      cleanupTodoListener();
       stopDiscordRpc();
       window.removeEventListener("keydown", handleGlobalKeydown);
       initialized = false;
@@ -513,6 +519,7 @@
     <PermissionModal />
     <UserQuestionModal />
     <ConfigSidebar />
+    <MemoryBrowserPanel />
     <AchievementNotification />
     <AchievementsPanel
       bind:isOpen={achievementPanelOpen}