diff --git a/CHANGELOG.md b/CHANGELOG.md
index a74faf2f..46d005d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,48 @@
 
 All notable changes to Crystal will be documented in this file.
 
+## [0.2.3] - 2025-08-25
+
+### Fixed
+- **Session completion status updates** - Fixed "Rebase to main" button not updating when a session completed
+- **Session archiving performance** - Made session archiving operation much quicker
+
+## [0.2.2] - 2025-08-23
+
+### Added
+- **Homebrew install** - Crystal can now be installed with `brew install --cask stravu-crystal` on OSX
+
+### Changed
+- **Performance improvements** - Optimized application performance for faster response times and smoother operation
+
+## [0.2.1] - 2025-08-21
+
+### Added
+- **'Auto' model selection** - New automatic model selection option that lets Claude Code choose the best model
+- **Sub-agent output visualization** - Enhanced UX for displaying sub-agent task outputs
+- **Terminal/Logs separation** - Logs from run scripts now have their own dedicated tab with filter and search
+- **Dev mode for debugging** - New developer mode to view raw Claude Code messages in the Messages tab
+- **Canary channel publishing** - Automatic canary builds from main branch for early testing
+
+### Changed
+- **Performance improvements** - Various optimizations for better responsiveness
+- **Auto-scroll reliability** - More reliable auto-scrolling behavior that only activates when at bottom of output
+- **Project panel usage** - Now uses project panel instead of special (main) session
+- **Git branch actions labeling** - Renamed "Branch Actions" to "Git Branch Actions" for clarity
+
+### Fixed
+- **Double prompt submission prevention** - Fixed issue where prompts could be submitted twice
+- **Commit message display** - Fixed showing commit messages in diff viewer
+- **Worktree file references** - Don't show worktree files when using @ to reference files
+- **Git status indicators** - Fixed "Behind Only - No unique changes" status marker
+- **Revert button backend** - Updated backend to use after_commit_hash for revert button functionality
+- **Run script log clearing** - Clear logs on fresh run script execution
+- **Canary build process** - Fixed canary build issues
+
+### Documentation
+- **Demo video updated** - Updated demo video to showcase latest features
+- **Markdown cleanup** - Cleaned up and reorganized documentation structure
+
 ## [0.2.0] - 2025-08-05
 
 ### Added
diff --git a/CLAUDE.md b/CLAUDE.md
index 4ae23502..f7cd84e0 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,3 +1,7 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
 # Crystal - Multi-Session Claude Code Manager
 
 Created by [Stravu](https://stravu.com/?utm_source=Crystal&utm_medium=OS&utm_campaign=Crystal&utm_id=1)
@@ -569,74 +573,194 @@ The react-diff-viewer-continued library uses emotion/styled-components internall
 5. **Real-time Updates**: IPC streams session status and terminal output
 6. **Session Management**: Users can switch between sessions, continue conversations
 
-## Available Commands
+## Development Commands
+
+### Essential Commands for Development
 
 ```bash
-# One-time setup (install, build, and rebuild native modules)
+# One-time setup (install, build, and rebuild native modules) - REQUIRED FIRST
 pnpm run setup
 
-# Run as Electron app in development mode
+# Development mode - Run Electron app with live reload
 pnpm electron-dev
 # Or use the shorthand:
 pnpm run dev
 
-# Run frontend only (without Electron shell)
-pnpm dev
+# Build main process only (required after changes to main/ directory)
+pnpm run build:main
+
+# Build frontend only 
+pnpm run build:frontend
+
+# Run frontend in browser (without Electron shell) - for UI development
+pnpm --filter frontend dev
 
-# Build for production
+# Full production build
 pnpm build
+```
+
+### Code Quality Commands
 
-# Type checking
+```bash
+# Type checking across all packages
 pnpm typecheck
 
-# Linting
+# Linting across all packages
 pnpm lint
+
+# Type check individual packages
+pnpm --filter frontend typecheck
+pnpm --filter main typecheck
+
+# Lint individual packages  
+pnpm --filter frontend lint
+pnpm --filter main lint
+```
+
+### Testing Commands
+
+```bash
+# Run Playwright tests
+pnpm test
+
+# Run tests with UI
+pnpm test:ui
+
+# Run tests in headed mode (see browser)
+pnpm test:headed
+
+# Main process unit tests
+pnpm --filter main test
 ```
 
-**Note:** You must run `pnpm run build:main` at least once before running `pnpm electron-dev` to compile the main process.
+### Building for Production
 
-### Building Packaged Electron App
+```bash
+# macOS builds (universal binary - works on both Intel and Apple Silicon)
+pnpm build:mac
+
+# macOS specific architectures
+pnpm build:mac:x64      # Intel only
+pnpm build:mac:arm64    # Apple Silicon only
+
+# Linux builds
+pnpm build:linux        # All Linux formats (deb, AppImage, pacman)
+pnpm build:arch         # Arch Linux only (pacman)
+
+# Release builds (with publishing to GitHub)
+pnpm release:mac
+pnpm release:linux      # All Linux formats
+pnpm release:arch       # Arch Linux only
+```
+
+### Database and Development Tools
 
 ```bash
-# Build for macOS
-pnpm build:mac    # macOS (only works on macOS)
+# Rebuild native dependencies (if you get node-pty or better-sqlite3 errors)
+pnpm run electron:rebuild
+
+# Generate third-party license notices
+pnpm run generate-notices
+
+# Inject build information (used by CI)
+pnpm run inject-build-info
 ```
 
-## Project Structure
+**Critical Notes:**
+- You MUST run `pnpm run setup` at least once before development
+- You MUST run `pnpm run build:main` after changes to main/ directory before running `pnpm electron-dev`
+- The main process must be compiled before Electron can start
+- Use separate terminals for main process compilation (`pnpm --filter main dev`) and Electron runtime during development
+- **For Arch Linux builds**: Install `bsdtar` package before building: `sudo pacman -S bsdtar` (Arch) or `sudo apt-get install bsdtar` (Ubuntu/Debian)
+
+## Project Architecture and Structure
+
+### High-Level Architecture
+
+Crystal is a modular Electron application with clear separation between the main process (Node.js backend) and renderer process (React frontend), connected via secure IPC communication.
 
 ```
 crystal/
-├── frontend/         # React renderer process
+├── frontend/                 # React 19 renderer process (Vite + TypeScript)
 │   ├── src/
-│   │   ├── components/      # React components
-│   │   │   ├── Help.tsx    # Help dialog
-│   │   │   └── ...        # Other UI components
-│   │   ├── hooks/          # Custom React hooks
-│   │   │   └── useSessionView.ts # Session view logic (941 lines)
-│   │   ├── stores/         # Zustand state stores
-│   │   └── utils/          # Utility functions
-├── main/            # Electron main process
+│   │   ├── components/       # React UI components
+│   │   │   ├── Help.tsx     # Comprehensive help dialog
+│   │   │   ├── SessionView.tsx        # Main session interface
+│   │   │   ├── DraggableProjectTreeView.tsx # Project/session tree
+│   │   │   ├── DiffViewer.tsx         # Git diff visualization
+│   │   │   └── CombinedDiffView.tsx   # Combined diff viewer
+│   │   ├── hooks/           # Custom React hooks
+│   │   │   ├── useSessionView.ts      # Session view logic (941 lines)
+│   │   │   └── useProjects.ts         # Project management state
+│   │   ├── stores/          # Zustand state management
+│   │   │   ├── useSessionStore.ts     # Session state
+│   │   │   └── useAppStore.ts         # Global app state
+│   │   └── utils/           # Frontend utilities
+│   │       ├── timestampUtils.ts      # Timezone-safe timestamp handling
+│   │       └── ipcRenderer.ts         # IPC communication helpers
+│
+├── main/                     # Electron main process (Node.js + TypeScript)
 │   ├── src/
-│   │   ├── index.ts         # Main entry point (reduced to 414 lines)
-│   │   ├── preload.ts       # Preload script
-│   │   ├── events.ts        # Event handling (359 lines)
-│   │   ├── database/        # SQLite database
-│   │   ├── ipc/            # IPC handlers (modular)
-│   │   │   ├── git.ts      # Git operation handlers (843 lines)
-│   │   │   ├── session.ts  # Session operation handlers (428 lines)
-│   │   │   └── ...         # Other IPC handlers
-│   │   ├── services/        # Business logic services
-│   │   │   ├── taskQueue.ts # Bull queue for async tasks
-│   │   │   └── ...         # Other service modules
-│   │   ├── routes/          # API routes
-│   │   └── types/           # TypeScript types
-│   └── dist/               # Compiled output
-├── shared/          # Shared TypeScript types
-├── dist-electron/   # Packaged Electron app
-├── package.json     # Root workspace configuration
-└── pnpm-workspace.yaml
+│   │   ├── index.ts          # Main entry point (414 lines)
+│   │   ├── preload.ts        # Secure IPC bridge
+│   │   ├── events.ts         # Event coordination (359 lines)
+│   │   │
+│   │   ├── ipc/              # Modular IPC handlers
+│   │   │   ├── git.ts        # Git operations (843 lines)
+│   │   │   ├── session.ts    # Session management (428 lines)
+│   │   │   ├── project.ts    # Project operations
+│   │   │   ├── config.ts     # Configuration management
+│   │   │   └── index.ts      # IPC handler registration
+│   │   │
+│   │   ├── services/         # Core business logic
+│   │   │   ├── sessionManager.ts      # Claude Code process management
+│   │   │   ├── worktreeManager.ts     # Git worktree operations
+│   │   │   ├── claudeCodeManager.ts   # Claude Code SDK integration
+│   │   │   ├── gitDiffManager.ts      # Diff generation and parsing
+│   │   │   ├── taskQueue.ts           # Async task management (Bull)
+│   │   │   └── configManager.ts       # Application configuration
+│   │   │
+│   │   ├── database/         # SQLite database layer
+│   │   │   ├── database.ts   # Database connection and setup
+│   │   │   ├── models.ts     # Database models and queries
+│   │   │   ├── schema.sql    # Database schema
+│   │   │   └── migrations/   # Schema migrations
+│   │   │
+│   │   └── utils/            # Backend utilities
+│   │       ├── timestampUtils.ts      # Database timestamp handling
+│   │       └── fileUtils.ts           # File system operations
+│   │
+├── shared/                   # Shared TypeScript types
+│   ├── types.ts             # Core type definitions
+│   └── ipcTypes.ts          # IPC message types
+│
+├── package.json             # Root workspace config (pnpm workspace)
+├── pnpm-workspace.yaml      # Workspace definition
+└── dist-electron/           # Built Electron app
 ```
 
+### Key Architectural Patterns
+
+**IPC Communication Pattern:**
+- All backend operations are exposed via IPC handlers in `main/src/ipc/`
+- Frontend uses typed IPC calls through `utils/ipcRenderer.ts`
+- Events flow from main process to renderer for real-time updates
+
+**Service Layer Architecture:**
+- Business logic is encapsulated in service classes in `main/src/services/`
+- Services are stateful and manage their own lifecycle
+- Database operations are centralized in the database layer
+
+**State Management:**
+- Frontend uses Zustand for reactive state management
+- State updates follow targeted update patterns (avoid global refreshes)
+- Backend state is the single source of truth
+
+**Database Schema:**
+- SQLite database with tables: sessions, session_outputs, conversation_messages, execution_diffs, prompt_markers, projects
+- UTC timestamp storage with frontend timezone conversion
+- Migration system for schema evolution
+
 ## User Guide
 
 ### Quick Start
@@ -713,6 +837,56 @@ In development mode, Crystal automatically captures all frontend console logs an
 
 Crystal is an independent project created by [Stravu](https://stravu.com/?utm_source=Crystal&utm_medium=OS&utm_campaign=Crystal&utm_id=1). Claude™ is a trademark of Anthropic, PBC. Crystal is not affiliated with, endorsed by, or sponsored by Anthropic. This tool is designed to work with Claude Code, which must be installed separately.
 
+## Common Development Workflows
+
+### Adding New Features
+1. **Create a git worktree or branch** for your feature development
+2. **Understand the architecture**: Features typically span IPC handlers, services, and React components
+3. **Update TypeScript types** in `shared/types.ts` if adding new data structures
+4. **Add IPC handlers** in `main/src/ipc/` for backend operations
+5. **Implement business logic** in appropriate service classes in `main/src/services/`
+6. **Create React components** in `frontend/src/components/` for UI
+7. **Update state management** in Zustand stores if needed
+8. **Run tests** with `pnpm test` to ensure nothing breaks
+9. **Test the feature** with `pnpm electron-dev`
+
+### Debugging Session Issues
+- **Check main process logs**: Enable verbose logging in settings
+- **Inspect SQLite database**: Located in `~/.crystal/crystal.db` (use DB Browser for SQLite)
+- **Review IPC communication**: Add console.logs in IPC handlers and frontend
+- **Monitor Claude Code processes**: Sessions spawn separate Claude Code processes via node-pty
+- **Frontend debugging logs**: Development mode writes to `crystal-frontend-debug.log`
+
+### Working with Git Worktrees
+- **Worktree creation**: Handled by `worktreeManager.ts` service
+- **Branch naming**: Generated by `worktreeNameGenerator.ts`
+- **Git operations**: All git commands go through `ipc/git.ts` handlers
+- **Cleanup**: Worktrees are automatically cleaned up when sessions are deleted
+
+### Database Changes
+1. **Create migration** in `main/src/database/migrations/`
+2. **Update schema.sql** with the new structure
+3. **Update TypeScript types** in `shared/types.ts`
+4. **Update database queries** in `main/src/database/models.ts`
+5. **Test migration** by deleting `~/.crystal/crystal.db` and restarting
+
+### Performance Considerations
+- **Targeted updates**: Never reload entire lists when only one item changes (see State Management Guidelines)
+- **Session output handling**: The session output system is fragile - avoid modifications without explicit permission
+- **IPC efficiency**: Batch IPC calls when possible, avoid rapid successive calls
+- **Database queries**: Use proper indexes and limit result sets for large datasets
+
+## Important Development Reminders
+
+- **NEVER modify session output handling** without explicit permission - it's complex and fragile
+- **ALWAYS use timestamp utility functions** instead of raw Date parsing for timezone safety
+- **PREFER targeted state updates** over global refreshes for better performance
+- **RUN `pnpm run build:main`** after any changes to the main process before testing
+- **USE the existing service layer** rather than creating new architectural patterns
+- **FOLLOW the modular IPC pattern** - keep related handlers together in appropriate files
+- **TEST timestamp handling** across different timezones when working with time-based features
+- **VALIDATE database operations** with proper error handling and transactions where needed
+
 ## important-instruction-reminders
 Do what has been asked; nothing more, nothing less.
 NEVER create files unless they're absolutely necessary for achieving your goal.
diff --git a/NOTICES b/NOTICES
index 5c83c854..f3ac29b9 100644
--- a/NOTICES
+++ b/NOTICES
@@ -32,6 +32,7 @@ The following packages are licensed under the MIT license:
   - @babel/template (7.27.2) - The Babel Team (https://babel.dev/team)
   - @babel/traverse (7.28.0) - The Babel Team (https://babel.dev/team)
   - @babel/types (7.28.1) - The Babel Team (https://babel.dev/team)
+  - @bcoe/v8-coverage (0.2.3) - Charles Samborski <demurgos@demurgos.net> (https://demurgos.net)
   - @braintree/sanitize-url (7.1.1)
   - @develar/schema-utils (2.6.5) - webpack Contrib (https://github.com/webpack-contrib)
   - @electron/asar (3.4.1)
@@ -49,7 +50,8 @@ The following packages are licensed under the MIT license:
   - @emotion/unitless (0.10.0)
   - @emotion/utils (1.4.2)
   - @emotion/weak-memoize (0.4.0)
-  - @esbuild/darwin-arm64 (0.25.7)
+  - @esbuild/linux-x64 (0.21.5)
+  - @esbuild/linux-x64 (0.25.7)
   - @eslint-community/regexpp (4.12.1) - Toru Nagashima
   - @floating-ui/core (1.7.2) - atomiks
   - @floating-ui/dom (1.7.2) - atomiks
@@ -61,6 +63,7 @@ The following packages are licensed under the MIT license:
   - @ioredis/commands (1.2.0) - Zihua Li <i@zihua.li> (http://zihua.li)
   - @isaacs/balanced-match (4.0.1)
   - @isaacs/brace-expansion (5.0.0)
+  - @istanbuljs/schema (0.1.3) - Corey Farrell
   - @jridgewell/gen-mapping (0.3.12) - Justin Ridgewell <justin@ridgewell.name>
   - @jridgewell/resolve-uri (3.1.2) - Justin Ridgewell <justin@ridgewell.name>
   - @jridgewell/sourcemap-codec (1.5.4) - Justin Ridgewell <justin@ridgewell.name>
@@ -69,7 +72,7 @@ The following packages are licensed under the MIT license:
   - @mermaid-js/parser (0.6.2) - Yokozuna59
   - @modelcontextprotocol/sdk (1.16.0) - Anthropic, PBC (https://anthropic.com)
   - @monaco-editor/loader (1.5.0) - Suren Atoyan <contact@surenatoyan.com>
-  - @msgpackr-extract/msgpackr-extract-darwin-arm64 (3.0.3) - Kris Zyp
+  - @msgpackr-extract/msgpackr-extract-linux-x64 (3.0.3) - Kris Zyp
   - @nodelib/fs.scandir (2.1.5)
   - @nodelib/fs.stat (2.0.5)
   - @nodelib/fs.walk (1.2.8)
@@ -79,10 +82,17 @@ The following packages are licensed under the MIT license:
   - @radix-ui/primitive (1.1.2)
   - @radix-ui/rect (1.1.1)
   - @rolldown/pluginutils (1.0.0-beta.27)
-  - @rollup/rollup-darwin-arm64 (4.45.1) - Lukas Taegert-Atkinson
+  - @rollup/rollup-linux-x64-gnu (4.45.1) - Lukas Taegert-Atkinson
+  - @rollup/rollup-linux-x64-musl (4.45.1) - Lukas Taegert-Atkinson
   - @sindresorhus/is (4.6.0) - Sindre Sorhus
   - @szmarczak/http-timer (4.0.6) - Szymon Marczak
   - @tootallnate/once (2.0.0) - Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)
+  - @vitest/expect (2.1.9)
+  - @vitest/pretty-format (2.1.9)
+  - @vitest/runner (2.1.9)
+  - @vitest/snapshot (2.1.9)
+  - @vitest/spy (2.1.9)
+  - @vitest/utils (2.1.9)
   - @xmldom/xmldom (0.8.10)
   - @xterm/xterm (5.5.0)
   - 7zip-bin (5.2.0)
@@ -101,16 +111,13 @@ The following packages are licensed under the MIT license:
   - ansi-regex (6.1.0) - Sindre Sorhus
   - ansi-styles (4.3.0) - Sindre Sorhus
   - ansi-styles (6.2.1) - Sindre Sorhus
+  - ansi-to-html (0.7.2) - Rob Burns
   - any-promise (1.3.0) - Kevin Beaty
   - app-builder-bin (5.0.0-alpha.10)
   - app-builder-lib (25.1.8) - Vladimir Krivosheev
-  - archiver (5.3.2) - Chris Talkington
-  - archiver-utils (2.1.0) - Chris Talkington
-  - archiver-utils (3.0.4) - Chris Talkington
   - arg (5.0.2) - Josh Junon <junon@wavetilt.com>
   - aria-hidden (1.2.6) - Anton Korzunov <thekashey@gmail.com>
-  - assert-plus (1.0.0) - Mark Cavage <mcavage@gmail.com>
-  - astral-regex (2.0.0) - Kevin Mårtensson
+  - assertion-error (2.0.1) - Jake Luer <jake@qualiancy.com> (http://qualiancy.com)
   - async (3.2.6) - Caolan McMahon
   - async-exit-hook (2.0.1) - Tapani Moilanen
   - asynckit (0.4.0) - Alex Indigo <iam@alexindigo.com>
@@ -139,6 +146,7 @@ The following packages are licensed under the MIT license:
   - builder-util-runtime (9.3.1) - Vladimir Krivosheev
   - bull (4.16.5) - OptimalBits
   - bytes (3.1.2) - TJ Holowaychuk <tj@vision-media.ca> (http://tjholowaychuk.com)
+  - cac (6.7.14) - egoist <0x142857@gmail.com>
   - cacheable-lookup (5.0.4) - Szymon Marczak
   - cacheable-request (7.0.4) - Luke Childs <lukechilds123@gmail.com> (http://lukechilds.co.uk)
   - call-bind-apply-helpers (1.0.2) - Jordan Harband <ljharb@gmail.com>
@@ -146,11 +154,13 @@ The following packages are licensed under the MIT license:
   - callsites (3.1.0) - Sindre Sorhus
   - camelcase-css (2.0.1) - Steven Vachon <contact@svachon.com> (https://www.svachon.com/)
   - ccount (2.0.1) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
+  - chai (5.2.1) - Jake Luer <jake@alogicalparadox.com>
   - chalk (4.1.2)
   - character-entities (2.0.2) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - character-entities-html4 (2.1.0) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - character-entities-legacy (3.0.0) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - character-reference-invalid (2.0.1) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
+  - check-error (2.1.1) - Jake Luer <jake@alogicalparadox.com> (http://alogicalparadox.com)
   - chevrotain-allstar (0.3.1) - TypeFox
   - chokidar (3.6.0) - Paul Miller (https://paulmillr.com)
   - chromium-pickle-js (0.2.0)
@@ -159,7 +169,6 @@ The following packages are licensed under the MIT license:
   - clean-stack (2.2.0) - Sindre Sorhus
   - cli-cursor (3.1.0) - Sindre Sorhus
   - cli-spinners (2.9.2) - Sindre Sorhus
-  - cli-truncate (2.1.0) - Sindre Sorhus
   - clone (1.0.4) - Paul Vorbach <paul@vorba.ch> (http://paul.vorba.ch/)
   - clone-response (1.0.3) - Luke Childs <lukechilds123@gmail.com> (http://lukechilds.co.uk)
   - clsx (2.1.1) - Luke Edwards
@@ -172,7 +181,6 @@ The following packages are licensed under the MIT license:
   - commander (7.2.0) - TJ Holowaychuk <tj@vision-media.ca>
   - commander (8.3.0) - TJ Holowaychuk <tj@vision-media.ca>
   - compare-version (0.1.2) - Kevin Mårtensson
-  - compress-commons (4.1.2) - Chris Talkington
   - concat-map (0.0.1) - James Halliday
   - conf (14.0.0) - Sindre Sorhus
   - confbox (0.1.8)
@@ -184,14 +192,10 @@ The following packages are licensed under the MIT license:
   - convert-source-map (2.0.0) - Thorsten Lorenz
   - cookie (0.7.2) - Roman Shtylman <shtylman@gmail.com>
   - cookie-signature (1.2.2) - TJ Holowaychuk <tj@learnboost.com>
-  - core-util-is (1.0.2) - Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
-  - core-util-is (1.0.3) - Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
   - cors (2.8.5) - Troy Goode <troygoode@gmail.com> (https://github.com/troygoode/)
   - cose-base (1.0.3)
   - cose-base (2.2.0)
   - cosmiconfig (7.1.0) - David Clark <david.dave.clark@gmail.com>
-  - crc (3.8.0) - Alex Gorbatchev
-  - crc32-stream (4.0.3) - Chris Talkington
   - cron-parser (4.9.0) - Harri Siirak
   - cross-spawn (7.0.6) - André Cruz <andre@moxy.studio>
   - cssesc (3.0.0) - Mathias Bynens
@@ -206,6 +210,7 @@ The following packages are licensed under the MIT license:
   - debug (4.4.1) - Josh Junon (https://github.com/qix-)
   - decode-named-character-reference (1.2.0) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - decompress-response (6.0.0) - Sindre Sorhus
+  - deep-eql (5.0.2) - Jake Luer <jake@alogicalparadox.com>
   - deep-extend (0.6.0) - Viacheslav Lotsmanov <lotsmanov89@gmail.com>
   - deep-is (0.1.4) - Thorsten Lorenz
   - defaults (1.0.4) - Elijah Insua <tmpvar@gmail.com>
@@ -222,7 +227,6 @@ The following packages are licensed under the MIT license:
   - dir-compare (4.2.0) - Liviu Grigorescu
   - dlv (1.1.3) - Jason Miller <jason@developit.ca> (http://jasonformat.com)
   - dmg-builder (25.1.8) - Vladimir Krivosheev
-  - dmg-license (1.0.11) - argvminusone
   - dot-prop (9.0.0) - Sindre Sorhus
   - dunder-proto (1.0.1) - Jordan Harband <ljharb@gmail.com>
   - eastasianwidth (0.2.0) - Masaki Komagata
@@ -242,15 +246,18 @@ The following packages are licensed under the MIT license:
   - error-ex (1.3.2)
   - es-define-property (1.0.1) - Jordan Harband <ljharb@gmail.com>
   - es-errors (1.3.0) - Jordan Harband <ljharb@gmail.com>
+  - es-module-lexer (1.7.0) - Guy Bedford
   - es-object-atoms (1.1.1) - Jordan Harband <ljharb@gmail.com>
   - es-set-tostringtag (2.1.0) - Jordan Harband <ljharb@gmail.com>
   - es6-error (4.1.1) - Ben Youngblood
+  - esbuild (0.21.5)
   - esbuild (0.25.7)
   - escalade (3.2.0) - Luke Edwards
   - escape-html (1.0.3)
   - escape-string-regexp (4.0.0) - Sindre Sorhus
   - escape-string-regexp (5.0.0) - Sindre Sorhus
   - estree-util-is-identifier-name (3.0.0) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
+  - estree-walker (3.0.3) - Rich Harris
   - etag (1.8.1)
   - eventsource (3.0.7) - Espen Hovlandsdal <espen@hovlandsdal.com>
   - eventsource-parser (3.0.3) - Espen Hovlandsdal <espen@hovlandsdal.com>
@@ -258,7 +265,6 @@ The following packages are licensed under the MIT license:
   - express-rate-limit (7.5.1) - Nathan Friedly
   - exsolve (1.0.7)
   - extend (3.0.2) - Stefan Thomas <justmoon@members.fsf.org> (http://www.justmoon.net)
-  - extsprintf (1.4.1)
   - fast-deep-equal (3.1.3) - Evgeny Poberezkin
   - fast-glob (3.3.3) - Denis Malinochkin
   - fast-json-stable-stringify (2.1.0) - James Halliday
@@ -282,8 +288,6 @@ The following packages are licensed under the MIT license:
   - fs-extra (11.3.0) - JP Richardson <jprichardson@gmail.com>
   - fs-extra (8.1.0) - JP Richardson <jprichardson@gmail.com>
   - fs-extra (9.1.0) - JP Richardson <jprichardson@gmail.com>
-  - fsevents (2.3.2)
-  - fsevents (2.3.3)
   - function-bind (1.1.2) - Raynos <raynos2@gmail.com>
   - gensync (1.0.0-beta.2) - Logan Smyth <loganfsmyth@gmail.com>
   - get-intrinsic (1.3.0) - Jordan Harband <ljharb@gmail.com>
@@ -304,6 +308,7 @@ The following packages are licensed under the MIT license:
   - hasown (2.0.2) - Jordan Harband <ljharb@gmail.com>
   - hast-util-to-jsx-runtime (2.3.6) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - hast-util-whitespace (3.0.0) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
+  - html-escaper (2.0.2) - Andrea Giammarchi
   - html-url-attributes (3.0.1) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - http-errors (2.0.0) - Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)
   - http-proxy-agent (5.0.0) - Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)
@@ -312,7 +317,6 @@ The following packages are licensed under the MIT license:
   - https-proxy-agent (5.0.1) - Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)
   - https-proxy-agent (7.0.6) - Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)
   - humanize-ms (1.2.1) - dead-horse
-  - iconv-corefoundation (1.1.7) - argv-minus-one
   - iconv-lite (0.6.3) - Alexander Shtuchkin <ashtuchkin@gmail.com>
   - ignore (5.3.2) - kael
   - ignore (7.0.5) - kael
@@ -340,7 +344,6 @@ The following packages are licensed under the MIT license:
   - is-plain-obj (4.1.0) - Sindre Sorhus
   - is-promise (4.0.0) - ForbesLindesay
   - is-unicode-supported (0.1.0) - Sindre Sorhus
-  - isarray (1.0.0) - Julian Gruber
   - isbinaryfile (4.0.10)
   - isbinaryfile (5.0.4)
   - jiti (1.21.7)
@@ -363,7 +366,6 @@ The following packages are licensed under the MIT license:
   - layout-base (1.0.2)
   - layout-base (2.0.1)
   - lazy-val (1.0.5) - Vladimir Krivosheev
-  - lazystream (1.0.1) - Jonas Pommerening
   - levn (0.4.1) - George Zahariev <z@georgezahariev.com>
   - lilconfig (3.1.3) - antonk52
   - lines-and-columns (1.2.4) - Brian Donovan <brian@donovans.cc>
@@ -372,20 +374,20 @@ The following packages are licensed under the MIT license:
   - lodash (4.17.21) - John-David Dalton <john.david.dalton@gmail.com>
   - lodash-es (4.17.21) - John-David Dalton <john.david.dalton@gmail.com>
   - lodash.defaults (4.2.0) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
-  - lodash.difference (4.5.0) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
   - lodash.escaperegexp (4.1.2) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
-  - lodash.flatten (4.4.0) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
   - lodash.isarguments (3.1.0) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
   - lodash.isequal (4.5.0) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
-  - lodash.isplainobject (4.0.6) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
   - lodash.merge (4.6.2) - John-David Dalton <john.david.dalton@gmail.com>
-  - lodash.union (4.6.0) - John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)
   - log-symbols (4.1.0) - Sindre Sorhus
   - longest-streak (3.1.0) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - loose-envify (1.4.0) - Andres Suarez <zertosh@gmail.com>
+  - loupe (3.1.4) - Veselin Todorov <hi@vesln.com>
   - lowercase-keys (2.0.0) - Sindre Sorhus
   - luxon (3.7.1) - Isaac Cambron
   - lzma-native (8.0.6) - Anna Henningsen
+  - magic-string (0.30.17) - Rich Harris
+  - magicast (0.3.5)
+  - make-dir (4.0.0) - Sindre Sorhus
   - markdown-table (3.0.4) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - marked (16.1.1) - Christopher Jeffrey
   - matcher (3.0.0) - Sindre Sorhus
@@ -463,7 +465,6 @@ The following packages are licensed under the MIT license:
   - negotiator (0.6.4)
   - negotiator (1.0.0)
   - node-abi (3.75.0) - Lukas Geiger
-  - node-addon-api (1.7.2)
   - node-addon-api (3.2.1)
   - node-addon-api (7.1.1)
   - node-api-version (0.1.4) - Tim Fish <tim@timfish.uk>
@@ -499,7 +500,9 @@ The following packages are licensed under the MIT license:
   - path-parse (1.0.7) - Javier Blanco <http://jbgutierrez.info>
   - path-to-regexp (8.2.0)
   - path-type (4.0.0) - Sindre Sorhus
+  - pathe (1.1.2)
   - pathe (2.0.3)
+  - pathval (2.0.1) - Veselin Todorov <hi@vesln.com>
   - pe-library (0.4.1) - jet
   - pend (1.2.0) - Andrew Kelley <superjoe30@gmail.com>
   - picomatch (2.3.1) - Jon Schlinkert (https://github.com/jonschlinkert)
@@ -514,7 +517,6 @@ The following packages are licensed under the MIT license:
   - points-on-path (0.2.1) - Preet Shihn
   - prebuild-install (7.1.3) - Mathias Buus (@mafintosh)
   - prelude-ls (1.2.1) - George Zahariev <z@georgezahariev.com>
-  - process-nextick-args (2.0.1)
   - progress (2.0.3) - TJ Holowaychuk <tj@vision-media.ca>
   - promise-retry (2.0.1) - IndigoUnited <hello@indigounited.com> (http://indigounited.com)
   - prop-types (15.8.1)
@@ -536,7 +538,6 @@ The following packages are licensed under the MIT license:
   - react-refresh (0.17.0)
   - read-binary-file-arch (1.0.6) - Samuel Maddock
   - read-cache (1.0.0) - Bogdan Chadkin <trysound@yandex.ru>
-  - readable-stream (2.3.8)
   - readable-stream (3.6.2)
   - readdirp (3.6.0) - Thorsten Lorenz <thlorenz@gmx.de> (thlorenz.com)
   - redis-errors (1.2.0) - Ruben Bridgewater
@@ -559,7 +560,6 @@ The following packages are licensed under the MIT license:
   - roughjs (4.6.6) - Preet Shihn <preetshihn@gmail.com>
   - router (2.2.0) - Douglas Christopher Wilson <doug@somethingdoug.com>
   - run-parallel (1.2.0) - Feross Aboukhadijeh
-  - safe-buffer (5.1.2) - Feross Aboukhadijeh
   - safe-buffer (5.2.1) - Feross Aboukhadijeh
   - safer-buffer (2.1.2) - Nikita Skovoroda
   - scheduler (0.26.0)
@@ -577,18 +577,18 @@ The following packages are licensed under the MIT license:
   - simple-concat (1.0.1) - Feross Aboukhadijeh
   - simple-get (4.0.1) - Feross Aboukhadijeh
   - simple-update-notifier (2.0.0) - alexbrazier
-  - slice-ansi (3.0.0)
   - smart-buffer (4.2.0) - Josh Glazebrook
   - socks (2.8.6) - Josh Glazebrook
   - socks-proxy-agent (7.0.0) - Nathan Rajlich
   - source-map-support (0.5.21)
   - space-separated-tokens (2.0.2) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
+  - stackback (0.0.2) - Roman Shtylman <shtylman@gmail.com>
   - standard-as-callback (2.1.0) - luin <i@zihua.li>
   - stat-mode (1.0.0) - Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)
   - state-local (1.0.7) - Suren Atoyan <contact@surenatoyan.com>
   - statuses (2.0.1)
   - statuses (2.0.2)
-  - string_decoder (1.1.1)
+  - std-env (3.9.0)
   - string_decoder (1.3.0)
   - string-width (4.2.3) - Sindre Sorhus
   - string-width (5.1.2) - Sindre Sorhus
@@ -612,8 +612,13 @@ The following packages are licensed under the MIT license:
   - thenify (3.3.1) - Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)
   - thenify-all (1.6.0) - Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)
   - tiny-typed-emitter (2.1.0) - Zurab Benashvili <zura.benashvili@gmail.com>
+  - tinybench (2.9.0)
+  - tinyexec (0.3.2) - James Garbutt (https://github.com/43081j)
   - tinyexec (1.0.1) - James Garbutt (https://github.com/43081j)
   - tinyglobby (0.2.14) - Superchupu
+  - tinypool (1.1.1)
+  - tinyrainbow (1.2.0)
+  - tinyspy (3.0.2)
   - tmp (0.2.3) - KARASZI István <github@spam.raszi.hu> (http://raszi.hu/)
   - tmp-promise (3.0.3) - Benjamin Gruenbaum and Collaborators.
   - to-regex-range (5.0.1) - Jon Schlinkert (https://github.com/jonschlinkert)
@@ -642,7 +647,6 @@ The following packages are licensed under the MIT license:
   - uuid (11.1.0)
   - uuid (8.3.2)
   - vary (1.1.2) - Douglas Christopher Wilson <doug@somethingdoug.com>
-  - verror (1.10.1)
   - vfile (6.0.3) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - vfile-message (4.0.2) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
   - vscode-jsonrpc (8.2.0) - Microsoft Corporation
@@ -652,7 +656,9 @@ The following packages are licensed under the MIT license:
   - vscode-languageserver-types (3.17.5) - Microsoft Corporation
   - vscode-uri (3.0.8) - Microsoft
   - wcwidth (1.0.1) - Tim Oxley
+  - web-streams-polyfill (3.3.3) - Mattias Buelens <mattias@buelens.com>
   - when-exit (2.1.4)
+  - why-is-node-running (2.3.0) - Mathias Buus (@mafintosh)
   - word-wrap (1.2.5) - Jon Schlinkert (https://github.com/jonschlinkert)
   - wrap-ansi (7.0.0) - Sindre Sorhus
   - wrap-ansi (8.1.0) - Sindre Sorhus
@@ -660,7 +666,6 @@ The following packages are licensed under the MIT license:
   - yargs (17.7.2)
   - yauzl (2.10.0) - Josh Wolfe <thejoshwolfe@gmail.com>
   - yocto-queue (0.1.0) - Sindre Sorhus
-  - zip-stream (4.1.1) - Chris Talkington
   - zod (3.25.76) - Colin McDonnell <zod@colinhacks.com>
   - zwitch (2.0.4) - Titus Wormer <tituswormer@gmail.com> (https://wooorm.com)
 
@@ -778,10 +783,12 @@ The following packages are licensed under the ISC license:
   - semver (7.7.2) - GitHub Inc.
   - set-blocking (2.0.0) - Ben Coe <ben@npmjs.com>
   - setprototypeof (1.2.0) - Wes Todd
+  - siginfo (2.0.0) - Emil Bay <github@tixz.dk>
   - signal-exit (3.0.7) - Ben Coe <ben@npmjs.com>
   - signal-exit (4.1.0) - Ben Coe <ben@npmjs.com>
   - ssri (9.0.1) - GitHub Inc.
   - tar (6.2.1) - GitHub Inc.
+  - test-exclude (7.0.1) - Ben Coe <ben@npmjs.com>
   - unique-filename (2.0.1) - GitHub Inc.
   - unique-slug (3.0.0) - GitHub Inc.
   - which (2.0.2) - Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)
@@ -827,21 +834,20 @@ The following packages are licensed under the Apache-2.0 license:
   - @humanwhocodes/module-importer (1.0.1) - Nicholas C. Zaks
   - @humanwhocodes/retry (0.3.1) - Nicholas C. Zaks
   - @humanwhocodes/retry (0.4.3) - Nicholas C. Zaks
-  - @img/sharp-darwin-arm64 (0.33.5) - Lovell Fuller <npm@lovell.info>
+  - @img/sharp-linux-x64 (0.33.5) - Lovell Fuller <npm@lovell.info>
   - @malept/cross-spawn-promise (2.0.0) - Mark Lee
   - chevrotain (11.0.3) - Shahar Soel
   - class-variance-authority (0.7.1) - Joe Bell (https://joebell.co.uk)
   - cluster-key-slot (1.1.2) - Mike Diarmid
-  - crc-32 (1.2.2) - sheetjs
   - denque (2.1.0) - Invertase
   - detect-libc (2.0.4) - Lovell Fuller <npm@lovell.info>
   - didyoumean (1.2.2) - Dave Porter
   - ejs (3.1.10) - Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)
+  - expect-type (1.2.2)
   - exponential-backoff (3.1.2) - Sami Sayegh
   - filelist (1.0.4) - Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)
   - jake (10.9.2) - Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)
   - openai (5.10.1) - OpenAI <support@openai.com>
-  - readdir-glob (1.1.3) - Yann Armelin
   - rxjs (7.8.2) - Ben Lesh <ben@benlesh.com>
   - sumchecker (3.0.1) - Mark Lee
   - ts-interface-checker (0.1.13) - Dmitry S, Grist Labs
@@ -1471,6 +1477,134 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 --------------------------------------------------------------------------------
 
+Package: istanbul-lib-coverage
+Version: 3.2.2
+Author: Krishnan Anantheswaran <kananthmail-github@yahoo.com>
+Homepage: https://istanbul.js.org/
+
+Copyright 2012-2015 Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Yahoo! Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+
+Package: istanbul-lib-report
+Version: 3.0.1
+Author: Krishnan Anantheswaran <kananthmail-github@yahoo.com>
+Homepage: https://istanbul.js.org/
+
+Copyright 2012-2015 Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Yahoo! Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+
+Package: istanbul-lib-source-maps
+Version: 5.0.6
+Author: Krishnan Anantheswaran <kananthmail-github@yahoo.com>
+Homepage: https://istanbul.js.org/
+
+Copyright 2015 Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Yahoo! Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+
+Package: istanbul-reports
+Version: 3.1.7
+Author: Krishnan Anantheswaran <kananthmail-github@yahoo.com>
+Homepage: https://istanbul.js.org/
+
+Copyright 2012-2015 Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Yahoo! Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------------
+
 Package: joi
 Version: 17.13.3
 Repository: git://github.com/hapijs/joi
@@ -1737,6 +1871,7 @@ The following packages are licensed under the BSD-2-Clause license:
   - @electron/osx-sign (1.3.1) - electron
   - dotenv (16.6.1)
   - dotenv-expand (11.0.7) - motdotla
+  - entities (2.2.0) - Felix Boehm <me@feedic.com>
   - espree (10.4.0) - Nicholas C. Zakas <nicholas+npm@nczconsulting.com>
   - esrecurse (4.3.0)
   - estraverse (5.3.0)
@@ -3212,7 +3347,7 @@ Creative Commons may be contacted at creativecommons.org.
 ## LGPL-3.0-or-later LICENSE
 ================================================================================
 
-Package: @img/sharp-libvips-darwin-arm64
+Package: @img/sharp-libvips-linux-x64
 Version: 1.0.4
 Author: Lovell Fuller <npm@lovell.info>
 Homepage: https://sharp.pixelplumbing.com
@@ -3540,7 +3675,7 @@ For more information, please refer to <http://unlicense.org>
 ================================================================================
 
 Package: Crystal
-Version: 0.1.16
+Version: 0.2.3
 Author: [object Object]
 License: MIT
 
diff --git a/README.md b/README.md
index ca0e90db..6cb87b34 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,44 @@ When everything looks good:
   - Open the DMG file and drag Crystal to your Applications folder
   - On first launch, you may need to right-click and select "Open" due to macOS security settings
 
+- **Linux**: Download from the [latest release](https://github.com/stravu/crystal/releases/latest)
+  - **Debian/Ubuntu**: `Crystal-{version}-linux-x64.deb` - Install with `sudo dpkg -i Crystal-{version}-linux-x64.deb`
+  - **Arch Linux**: `Crystal-{version}-linux-x64.pkg.tar.xz` - Install with `sudo pacman -U Crystal-{version}-linux-x64.pkg.tar.xz`
+  - **Universal**: `Crystal-{version}-linux-x64.AppImage` (works on any Linux distribution) - Make executable and run directly
+
+### Arch Linux Installation
+
+For Arch Linux users, you can install Crystal using the pre-built pacman package:
+
+```bash
+# Download and install the package
+wget https://github.com/stravu/crystal/releases/latest/download/Crystal-{version}-linux-x64.pkg.tar.xz
+sudo pacman -U Crystal-{version}-linux-x64.pkg.tar.xz
+```
+
+Alternatively, for AUR maintainers, see `docs/PKGBUILD.example` for a template PKGBUILD.
+
+### Homebrew
+```bash
+brew install --cask stravu-crystal
+```
+- **Linux**: Download from the [latest release](https://github.com/stravu/crystal/releases/latest)
+  - **Debian/Ubuntu**: `Crystal-{version}-linux-x64.deb` - Install with `sudo dpkg -i Crystal-{version}-linux-x64.deb`
+  - **Arch Linux**: `stravu-crystal-{version}-linux-x64.pkg.tar.xz` - Install with `sudo pacman -U stravu-crystal-{version}-linux-x64.pkg.tar.xz`
+  - **Universal**: `Crystal-{version}-linux-x64.AppImage` (works on any Linux distribution) - Make executable and run directly
+
+### Arch Linux Installation
+
+For Arch Linux users, you can install Crystal using the pre-built pacman package:
+
+```bash
+# Download and install the package
+wget https://github.com/stravu/crystal/releases/latest/download/stravu-crystal-{version}-linux-x64.pkg.tar.xz
+sudo pacman -U stravu-crystal-{version}-linux-x64.pkg.tar.xz
+```
+
+Alternatively, for AUR maintainers, see `docs/PKGBUILD.example` for a template PKGBUILD.
+
 
 ## Building from Source
 
@@ -101,8 +139,26 @@ pnpm run electron-dev
 ```bash
 # Build for macOS
 pnpm build:mac
+
+# Build for Linux (all formats: deb, AppImage, pacman)
+pnpm build:linux
+
+# Build for Arch Linux only (pacman format)
+pnpm build:arch
 ```
 
+### Build Dependencies
+
+- **Arch Linux builds**: Requires `bsdtar` package
+  ```bash
+  # On Arch Linux
+  sudo pacman -S bsdtar
+
+  
+  # On Ubuntu/Debian (for cross-platform builds)
+  sudo apt-get install bsdtar
+  ```
+
 
 
 ## 🤝 Contributing
@@ -120,7 +176,7 @@ pnpm run setup && pnpm run build:main && CRYSTAL_DIR=~/.crystal_test pnpm electr
 
 This ensures:
 - Your development Crystal instance uses `~/.crystal_test` for its data
-- Your main Crystal instance continues using `~/.crystal` 
+- Your main Crystal instance continues using `~/.crystal`
 - Worktrees won't conflict between the two instances
 - You can safely test changes without affecting your primary Crystal setup
 
diff --git a/docs/PKGBUILD.example b/docs/PKGBUILD.example
new file mode 100644
index 00000000..950208de
--- /dev/null
+++ b/docs/PKGBUILD.example
@@ -0,0 +1,44 @@
+# Maintainer: Your Name <your.email@example.com>
+pkgname=stravu-crystal-bin
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="Claude Code Commander for managing multiple Claude Code instances"
+arch=('x86_64')
+url="https://github.com/stravu/crystal"
+license=('MIT')
+depends=('gtk3' 'libnotify' 'nss' 'libxss' 'libxtst' 'xdg-utils' 'at-spi2-core' 'util-linux-libs')
+provides=('stravu-crystal')
+conflicts=('stravu-crystal')
+source=("https://github.com/stravu/crystal/releases/download/v${pkgver}/stravu-crystal-${pkgver}-linux-x64.pkg.tar.xz")
+sha256sums=('SKIP')  # Update with actual checksum
+
+package() {
+    # Extract the pre-built electron-builder pacman package
+    bsdtar -xf "${srcdir}/stravu-crystal-${pkgver}-linux-x64.pkg.tar.xz" -C "${pkgdir}/"
+}
+
+# Alternative implementation using AppImage (if pacman target fails):
+# source=("https://github.com/stravu/crystal/releases/download/v${pkgver}/stravu-crystal-${pkgver}-linux-x64.AppImage")
+# 
+# package() {
+#     # Install AppImage
+#     install -Dm755 "${srcdir}/stravu-crystal-${pkgver}-linux-x64.AppImage" "${pkgdir}/opt/stravu-crystal/stravu-crystal.AppImage"
+#     
+#     # Create launcher script
+#     install -Dm755 /dev/stdin "${pkgdir}/usr/bin/stravu-crystal" <<EOF
+# #!/bin/sh
+# exec /opt/stravu-crystal/stravu-crystal.AppImage "\$@"
+# EOF
+#     
+#     # Install desktop file
+#     install -Dm644 /dev/stdin "${pkgdir}/usr/share/applications/stravu-crystal.desktop" <<EOF
+# [Desktop Entry]
+# Name=stravu-crystal
+# Comment=Claude Code Commander for managing multiple Claude Code instances
+# Exec=stravu-crystal
+# Icon=stravu-crystal
+# Type=Application
+# Categories=Development;IDE;
+# StartupWMClass=stravu-crystal
+# EOF
+# }
\ No newline at end of file
diff --git a/frontend/package.json b/frontend/package.json
index ef2db7b2..0102f6c5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index a6efcdb6..4e2bacd1 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -15,6 +15,7 @@ import { PermissionDialog } from './components/PermissionDialog';
 import { DiscordPopup } from './components/DiscordPopup';
 import { useErrorStore } from './stores/errorStore';
 import { useSessionStore } from './stores/sessionStore';
+import { useConfigStore } from './stores/configStore';
 import { API } from './utils/api';
 import { ContextMenuProvider } from './contexts/ContextMenuContext';
 import { TokenTest } from './components/TokenTest';
@@ -40,6 +41,7 @@ function App() {
   const [isTokenTestOpen, setIsTokenTestOpen] = useState(false);
   const { currentError, clearError } = useErrorStore();
   const { sessions, isLoaded } = useSessionStore();
+  const { fetchConfig } = useConfigStore();
   
   const { width: sidebarWidth, startResize } = useResizable({
     defaultWidth: 500,  // Increased to show git status labels without truncation
@@ -50,6 +52,55 @@ function App() {
   
   useIPCEvents();
   const { showNotification } = useNotifications();
+  
+  // Load config on app startup
+  useEffect(() => {
+    fetchConfig();
+  }, [fetchConfig]);
+  
+  // CRITICAL PERFORMANCE FIX: Very aggressive cleanup to prevent V8 array iteration issues
+  useEffect(() => {
+    // Run cleanup every 30 seconds to prevent array buildup that causes CPU spikes
+    const cleanupInterval = setInterval(() => {
+      const store = useSessionStore.getState();
+      // Always cleanup when we have multiple sessions to prevent memory issues
+      if (store.sessions.length > 0) {
+        console.log('[Performance] Running aggressive periodic session cleanup');
+        store.cleanupInactiveSessions();
+      }
+    }, 30 * 1000); // 30 seconds - much more frequent to prevent V8 optimization failures
+    
+    // Immediate cleanup when switching sessions
+    const handleSessionSwitch = () => {
+      // Immediate cleanup to free memory right away
+      const store = useSessionStore.getState();
+      if (store.sessions.length > 0) {
+        console.log('[Performance] Immediate cleanup on session switch');
+        store.cleanupInactiveSessions();
+      }
+    };
+    
+    window.addEventListener('session-switched', handleSessionSwitch);
+    
+    // Also cleanup on visibility change to free memory when app is in background
+    const handleVisibilityChange = () => {
+      if (document.hidden) {
+        const store = useSessionStore.getState();
+        if (store.sessions.length > 0) {
+          console.log('[Performance] Cleanup on app background');
+          store.cleanupInactiveSessions();
+        }
+      }
+    };
+    
+    document.addEventListener('visibilitychange', handleVisibilityChange);
+    
+    return () => {
+      clearInterval(cleanupInterval);
+      window.removeEventListener('session-switched', handleSessionSwitch);
+      document.removeEventListener('visibilitychange', handleVisibilityChange);
+    };
+  }, []);
 
   // Add keyboard shortcut for prompt history
   useEffect(() => {
diff --git a/frontend/src/components/ArchiveProgress.tsx b/frontend/src/components/ArchiveProgress.tsx
new file mode 100644
index 00000000..05ce37bb
--- /dev/null
+++ b/frontend/src/components/ArchiveProgress.tsx
@@ -0,0 +1,196 @@
+import { useState, useEffect } from 'react';
+import { Loader2, Archive, CheckCircle, AlertCircle } from 'lucide-react';
+
+interface ArchiveTask {
+  sessionId: string;
+  sessionName: string;
+  worktreeName: string;
+  projectName: string;
+  status: 'pending' | 'queued' | 'removing-worktree' | 'cleaning-artifacts' | 'completed' | 'failed';
+  startTime: string;
+  endTime?: string;
+  error?: string;
+}
+
+interface ArchiveProgressData {
+  tasks: ArchiveTask[];
+  activeCount: number;
+  totalCount: number;
+}
+
+export function ArchiveProgress() {
+  const [progress, setProgress] = useState<ArchiveProgressData | null>(null);
+  const [isExpanded, setIsExpanded] = useState(false);
+
+  useEffect(() => {
+    // Initial load
+    loadProgress();
+
+    // Listen for progress updates
+    const handleProgress = (_event: any, data: ArchiveProgressData) => {
+      setProgress(data);
+      // Auto-expand when there are active tasks
+      if (data.activeCount > 0 && !isExpanded) {
+        setIsExpanded(true);
+      }
+    };
+
+    window.electron?.on('archive:progress', handleProgress);
+
+    // Poll for initial state in case we missed events
+    const interval = setInterval(loadProgress, 2000);
+
+    return () => {
+      window.electron?.off('archive:progress', handleProgress);
+      clearInterval(interval);
+    };
+  }, [isExpanded]);
+
+  const loadProgress = async () => {
+    if (!window.electron) return;
+    try {
+      const response = await window.electron.invoke('archive:get-progress');
+      if (response.success) {
+        setProgress(response.data);
+      }
+    } catch (error) {
+      console.error('Failed to load archive progress:', error);
+    }
+  };
+
+  if (!progress || progress.totalCount === 0) {
+    return null;
+  }
+
+  const getStatusIcon = (status: ArchiveTask['status']) => {
+    switch (status) {
+      case 'completed':
+        return <CheckCircle className="w-3 h-3 text-status-success" />;
+      case 'failed':
+        return <AlertCircle className="w-3 h-3 text-status-error" />;
+      case 'queued':
+        return <Archive className="w-3 h-3 text-status-waiting" />;
+      default:
+        return <Loader2 className="w-3 h-3 text-status-info animate-spin" />;
+    }
+  };
+
+  const getStatusText = (status: ArchiveTask['status']) => {
+    switch (status) {
+      case 'queued':
+        return 'Queued (waiting for other archives to complete)...';
+      case 'pending':
+        return 'Preparing...';
+      case 'removing-worktree':
+        return 'Removing worktree (this may take a while)...';
+      case 'cleaning-artifacts':
+        return 'Cleaning artifacts...';
+      case 'completed':
+        return 'Completed';
+      case 'failed':
+        return 'Failed';
+      default:
+        return status;
+    }
+  };
+
+  const formatElapsedTime = (startTime: string, endTime?: string) => {
+    const start = new Date(startTime).getTime();
+    const end = endTime ? new Date(endTime).getTime() : Date.now();
+    const elapsed = Math.floor((end - start) / 1000);
+    
+    if (elapsed < 60) {
+      return `${elapsed}s`;
+    }
+    const minutes = Math.floor(elapsed / 60);
+    const seconds = elapsed % 60;
+    return `${minutes}m ${seconds}s`;
+  };
+
+  return (
+    <div className="border-t border-border-primary flex-shrink-0">
+      <button
+        onClick={() => setIsExpanded(!isExpanded)}
+        className="w-full px-4 py-2 flex items-center justify-between hover:bg-surface-hover transition-colors"
+      >
+        <div className="flex items-center gap-2">
+          <Archive className="w-3.5 h-3.5 text-text-tertiary" />
+          <span className="text-xs text-text-tertiary">
+            Archive Tasks
+          </span>
+          {progress.activeCount > 0 && (
+            <span className="px-1.5 py-0.5 bg-status-info/20 text-status-info text-xs rounded-full animate-pulse">
+              {progress.activeCount} active
+            </span>
+          )}
+          {progress.tasks.filter(t => t.status === 'queued').length > 0 && (
+            <span className="px-1.5 py-0.5 bg-status-waiting/20 text-status-waiting text-xs rounded-full">
+              {progress.tasks.filter(t => t.status === 'queued').length} queued
+            </span>
+          )}
+        </div>
+        <svg
+          className={`w-3.5 h-3.5 text-text-tertiary transition-transform ${
+            isExpanded ? 'rotate-180' : ''
+          }`}
+          fill="none"
+          stroke="currentColor"
+          viewBox="0 0 24 24"
+        >
+          <path
+            strokeLinecap="round"
+            strokeLinejoin="round"
+            strokeWidth={2}
+            d="M19 9l-7 7-7-7"
+          />
+        </svg>
+      </button>
+
+      {isExpanded && (
+        <div className="border-t border-border-primary max-h-48 overflow-y-auto bg-surface-secondary">
+          {progress.tasks.length === 0 ? (
+            <div className="px-4 py-2 text-xs text-text-tertiary">
+              No archive tasks
+            </div>
+          ) : (
+            <div className="divide-y divide-border-primary">
+              {progress.tasks.map((task) => (
+                <div key={task.sessionId} className="px-4 py-2 space-y-1">
+                  <div className="flex items-start justify-between gap-2">
+                    <div className="flex items-start gap-2 flex-1 min-w-0">
+                      {getStatusIcon(task.status)}
+                      <div className="flex-1 min-w-0">
+                        <div className="text-xs text-text-secondary truncate" title={task.sessionName}>
+                          {task.sessionName}
+                        </div>
+                        <div className="text-xs text-text-tertiary truncate">
+                          {task.projectName} / {task.worktreeName}
+                        </div>
+                      </div>
+                    </div>
+                    <span className="text-xs text-text-tertiary whitespace-nowrap">
+                      {formatElapsedTime(task.startTime, task.endTime)}
+                    </span>
+                  </div>
+                  <div className="text-xs text-text-tertiary pl-5">
+                    {getStatusText(task.status)}
+                  </div>
+                  {task.error && (
+                    <div className="text-xs text-status-error pl-5 mt-1">
+                      {task.error}
+                    </div>
+                  )}
+                  {task.status === 'removing-worktree' && (
+                    <div className="text-xs text-status-warning/80 pl-5 mt-1 italic">
+                      ⚠️ Worktree removal can take several minutes for large repositories
+                    </div>
+                  )}
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      )}
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/frontend/src/components/CreateSessionDialog.tsx b/frontend/src/components/CreateSessionDialog.tsx
index 277e28a3..92af2ca6 100644
--- a/frontend/src/components/CreateSessionDialog.tsx
+++ b/frontend/src/components/CreateSessionDialog.tsx
@@ -25,7 +25,7 @@ export function CreateSessionDialog({ isOpen, onClose, projectName, projectId }:
     worktreeTemplate: '',
     count: 1,
     permissionMode: 'ignore',
-    model: 'claude-sonnet-4-20250514' // Default to Sonnet
+    model: 'auto' // Default to auto (Claude Code's default selection)
   });
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [worktreeError, setWorktreeError] = useState<string | null>(null);
@@ -296,68 +296,89 @@ export function CreateSessionDialog({ isOpen, onClose, projectName, projectId }:
                 <label className="block text-sm font-medium text-text-primary mb-2">
                   Model
                 </label>
-                <div className="grid grid-cols-3 gap-2">
+                <div className="grid grid-cols-4 gap-2">
                   <Card
-                    variant={formData.model === 'claude-sonnet-4-20250514' ? 'interactive' : 'bordered'}
+                    variant={formData.model === 'auto' ? 'interactive' : 'bordered'}
                     padding="sm"
                     className={`relative cursor-pointer transition-all ${
-                      formData.model === 'claude-sonnet-4-20250514'
+                      formData.model === 'auto'
                         ? 'border-interactive bg-interactive/10'
                         : ''
                     }`}
-                    onClick={() => setFormData({ ...formData, model: 'claude-sonnet-4-20250514' })}
+                    onClick={() => setFormData({ ...formData, model: 'auto' })}
                   >
                     <div className="flex flex-col items-center gap-1 py-2">
-                      <Target className={`w-5 h-5 ${formData.model === 'claude-sonnet-4-20250514' ? 'text-interactive' : ''}`} />
-                      <span className={`text-sm font-medium ${formData.model === 'claude-sonnet-4-20250514' ? 'text-interactive' : ''}`}>Sonnet</span>
+                      <Sparkles className={`w-5 h-5 ${formData.model === 'auto' ? 'text-interactive' : ''}`} />
+                      <span className={`text-sm font-medium ${formData.model === 'auto' ? 'text-interactive' : ''}`}>Auto</span>
+                      <span className="text-xs opacity-75">Default</span>
+                    </div>
+                    {formData.model === 'auto' && (
+                      <div className="absolute top-1 right-1 w-2 h-2 bg-interactive rounded-full" />
+                    )}
+                  </Card>
+                  
+                  <Card
+                    variant={formData.model === 'sonnet' ? 'interactive' : 'bordered'}
+                    padding="sm"
+                    className={`relative cursor-pointer transition-all ${
+                      formData.model === 'sonnet'
+                        ? 'border-interactive bg-interactive/10'
+                        : ''
+                    }`}
+                    onClick={() => setFormData({ ...formData, model: 'sonnet' })}
+                  >
+                    <div className="flex flex-col items-center gap-1 py-2">
+                      <Target className={`w-5 h-5 ${formData.model === 'sonnet' ? 'text-interactive' : ''}`} />
+                      <span className={`text-sm font-medium ${formData.model === 'sonnet' ? 'text-interactive' : ''}`}>Sonnet</span>
                       <span className="text-xs opacity-75">Balanced</span>
                     </div>
-                    {formData.model === 'claude-sonnet-4-20250514' && (
+                    {formData.model === 'sonnet' && (
                       <div className="absolute top-1 right-1 w-2 h-2 bg-interactive rounded-full" />
                     )}
                   </Card>
                   
                   <Card
-                    variant={formData.model === 'claude-opus-4-20250514' ? 'interactive' : 'bordered'}
+                    variant={formData.model === 'opus' ? 'interactive' : 'bordered'}
                     padding="sm"
                     className={`relative cursor-pointer transition-all ${
-                      formData.model === 'claude-opus-4-20250514'
+                      formData.model === 'opus'
                         ? 'border-interactive bg-interactive/10'
                         : ''
                     }`}
-                    onClick={() => setFormData({ ...formData, model: 'claude-opus-4-20250514' })}
+                    onClick={() => setFormData({ ...formData, model: 'opus' })}
                   >
                     <div className="flex flex-col items-center gap-1 py-2">
-                      <Brain className={`w-5 h-5 ${formData.model === 'claude-opus-4-20250514' ? 'text-interactive' : ''}`} />
-                      <span className={`text-sm font-medium ${formData.model === 'claude-opus-4-20250514' ? 'text-interactive' : ''}`}>Opus</span>
+                      <Brain className={`w-5 h-5 ${formData.model === 'opus' ? 'text-interactive' : ''}`} />
+                      <span className={`text-sm font-medium ${formData.model === 'opus' ? 'text-interactive' : ''}`}>Opus</span>
                       <span className="text-xs opacity-75">Maximum</span>
                     </div>
-                    {formData.model === 'claude-opus-4-20250514' && (
+                    {formData.model === 'opus' && (
                       <div className="absolute top-1 right-1 w-2 h-2 bg-interactive rounded-full" />
                     )}
                   </Card>
                   
                   <Card
-                    variant={formData.model === 'claude-3-5-haiku-20241022' ? 'interactive' : 'bordered'}
+                    variant={formData.model === 'haiku' ? 'interactive' : 'bordered'}
                     padding="sm"
                     className={`relative cursor-pointer transition-all ${
-                      formData.model === 'claude-3-5-haiku-20241022'
+                      formData.model === 'haiku'
                         ? 'border-status-success bg-status-success/10'
                         : ''
                     }`}
-                    onClick={() => setFormData({ ...formData, model: 'claude-3-5-haiku-20241022' })}
+                    onClick={() => setFormData({ ...formData, model: 'haiku' })}
                   >
                     <div className="flex flex-col items-center gap-1 py-2">
-                      <Zap className={`w-5 h-5 ${formData.model === 'claude-3-5-haiku-20241022' ? 'text-status-success' : ''}`} />
-                      <span className={`text-sm font-medium ${formData.model === 'claude-3-5-haiku-20241022' ? 'text-status-success' : ''}`}>Haiku</span>
+                      <Zap className={`w-5 h-5 ${formData.model === 'haiku' ? 'text-status-success' : ''}`} />
+                      <span className={`text-sm font-medium ${formData.model === 'haiku' ? 'text-status-success' : ''}`}>Haiku</span>
                       <span className="text-xs opacity-75">Fast</span>
                     </div>
-                    {formData.model === 'claude-3-5-haiku-20241022' && (
+                    {formData.model === 'haiku' && (
                       <div className="absolute top-1 right-1 w-2 h-2 bg-status-success rounded-full" />
                     )}
                   </Card>
                 </div>
                 <p className="text-xs text-text-tertiary mt-2">
+                  {formData.model === 'auto' && 'Uses Claude Code\'s default model selection'}
                   {formData.model?.includes('opus') && 'Best for complex architecture and challenging problems'}
                   {formData.model?.includes('haiku') && 'Fast and cost-effective for simple tasks'}
                   {formData.model?.includes('sonnet') && 'Excellent balance of speed and capability for most tasks'}
diff --git a/frontend/src/components/DraggableProjectTreeView.tsx b/frontend/src/components/DraggableProjectTreeView.tsx
index 44769912..157ec032 100644
--- a/frontend/src/components/DraggableProjectTreeView.tsx
+++ b/frontend/src/components/DraggableProjectTreeView.tsx
@@ -88,9 +88,6 @@ export function DraggableProjectTreeView() {
     overFolderId: null
   });
   const dragCounter = useRef(0);
-
-  // Count of sessions currently loading git status
-  const gitStatusLoadingCount = useSessionStore((state) => state.gitStatusLoading.size);
   
   // Performance monitoring - track render count
   const renderCountRef = useRef(0);
@@ -105,8 +102,7 @@ export function DraggableProjectTreeView() {
     if (process.env.NODE_ENV === 'development' && timeSinceLastRender < 100) {
       console.warn('[DraggableProjectTreeView] Rapid re-render detected:', {
         renderCount: renderCountRef.current,
-        timeSinceLastRender,
-        gitStatusLoadingCount
+        timeSinceLastRender
       });
     }
     
@@ -115,27 +111,21 @@ export function DraggableProjectTreeView() {
   
   // Create debounced save function
   const saveUIState = useCallback(
-    debounce(async (projectIds: number[], folderIds: string[], skipDuringGitLoading: boolean) => {
-      // Skip saving during heavy git status loading to avoid performance issues
-      if (skipDuringGitLoading && gitStatusLoadingCount > 5) {
-        return;
-      }
-      
+    debounce(async (projectIds: number[], folderIds: string[]) => {
       try {
         await window.electronAPI?.uiState?.saveExpanded(projectIds, folderIds);
       } catch (error) {
         console.error('[DraggableProjectTreeView] Failed to save UI state:', error);
       }
     }, 500),
-    [gitStatusLoadingCount]
+    []
   );
 
   // Save UI state whenever expanded state changes
   useEffect(() => {
     const projectIds = Array.from(expandedProjects);
     const folderIds = Array.from(expandedFolders);
-    // Pass true to skip saving during heavy git loading
-    saveUIState(projectIds, folderIds, true);
+    saveUIState(projectIds, folderIds);
   }, [expandedProjects, expandedFolders, saveUIState]);
 
   // Ensure paths are expanded when active session changes (for auto-selection)
@@ -775,7 +765,7 @@ export function DraggableProjectTreeView() {
     setRefreshingProjects(prev => new Set([...prev, project.id]));
     
     try {
-      // Refresh git status for all sessions in this project
+      // Start git status refresh for all sessions in this project (non-blocking)
       const response = await window.electronAPI.invoke('projects:refresh-git-status', project.id);
       
       if (!response.success) {
@@ -784,7 +774,30 @@ export function DraggableProjectTreeView() {
       
       // Log summary only if there were sessions to refresh
       if (response.data.count > 0) {
-        console.log(`[GitStatus] Refreshed ${response.data.count} sessions in ${project.name}`);
+        if (response.data.backgroundRefresh) {
+          console.log(`[GitStatus] Started background refresh for ${response.data.count} sessions in ${project.name}`);
+        } else {
+          console.log(`[GitStatus] Refreshed ${response.data.count} sessions in ${project.name}`);
+        }
+      }
+      
+      // For background refresh, keep the spinner for a bit to show something is happening
+      if (response.data.backgroundRefresh) {
+        // Remove spinner after a short delay to indicate background process started
+        setTimeout(() => {
+          setRefreshingProjects(prev => {
+            const newSet = new Set(prev);
+            newSet.delete(project.id);
+            return newSet;
+          });
+        }, 1500); // Show spinner for 1.5 seconds
+      } else {
+        // Remove immediately if not background
+        setRefreshingProjects(prev => {
+          const newSet = new Set(prev);
+          newSet.delete(project.id);
+          return newSet;
+        });
       }
     } catch (error: any) {
       console.error('Failed to refresh git status:', error);
@@ -792,8 +805,7 @@ export function DraggableProjectTreeView() {
         title: 'Failed to refresh git status',
         error: error.message || 'Unknown error occurred'
       });
-    } finally {
-      // Remove from refreshing set
+      // Remove from refreshing set on error
       setRefreshingProjects(prev => {
         const newSet = new Set(prev);
         newSet.delete(project.id);
diff --git a/frontend/src/components/ExecutionList.tsx b/frontend/src/components/ExecutionList.tsx
index 83042d00..fd8eaa93 100644
--- a/frontend/src/components/ExecutionList.tsx
+++ b/frontend/src/components/ExecutionList.tsx
@@ -130,7 +130,7 @@ const ExecutionList: React.FC<ExecutionListProps> = memo(({
                       {isUncommitted ? (
                         <span className="text-status-warning">Uncommitted changes</span>
                       ) : (
-                        <span>{truncateMessage(execution.prompt_text || `Commit ${execution.execution_sequence}`)}</span>
+                        <span>{truncateMessage(execution.commit_message || execution.prompt_text || `Commit ${execution.execution_sequence}`)}</span>
                       )}
                     </div>
                     {isUncommitted && (
diff --git a/frontend/src/components/ProjectView.tsx b/frontend/src/components/ProjectView.tsx
index e92add92..222ab76b 100644
--- a/frontend/src/components/ProjectView.tsx
+++ b/frontend/src/components/ProjectView.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect, useCallback } from 'react';
+import React, { useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import { ProjectDashboard } from './ProjectDashboard';
 import { FileEditor } from './FileEditor';
 import { SessionInputWithImages } from './session/SessionInputWithImages';
@@ -12,6 +12,7 @@ import { useSessionStore } from '../stores/sessionStore';
 import { Session } from '../types/session';
 import { useSessionView } from '../hooks/useSessionView';
 import { cn } from '../utils/cn';
+import { createVisibilityAwareInterval } from '../utils/performanceUtils';
 import { BarChart3, Eye, FolderTree, Terminal as TerminalIcon } from 'lucide-react';
 import '@xterm/xterm/css/xterm.css';
 
@@ -279,13 +280,16 @@ export const ProjectView: React.FC<ProjectViewProps> = ({
     getMainRepoSession();
   }, [projectId, viewMode]);
   
-  // Subscribe to session updates
+  // Subscribe to session updates - optimized to check for actual changes
   useEffect(() => {
     if (!mainRepoSessionId) return;
     
+    let previousSession = useSessionStore.getState().sessions.find(s => s.id === mainRepoSessionId);
     const unsubscribe = useSessionStore.subscribe((state) => {
       const session = state.sessions.find(s => s.id === mainRepoSessionId);
-      if (session) {
+      // Only update if session actually changed
+      if (session && session !== previousSession) {
+        previousSession = session;
         setMainRepoSession(session);
       }
     });
@@ -311,13 +315,18 @@ export const ProjectView: React.FC<ProjectViewProps> = ({
 
   // Output loading is now handled by useSessionView hook
 
-  // Subscribe to script output for this session
+  // Subscribe to script output for this session - optimized to check for actual changes
   useEffect(() => {
     if (!mainRepoSessionId) return;
 
+    let previousOutput = useSessionStore.getState().terminalOutput[mainRepoSessionId];
     const unsubscribe = useSessionStore.subscribe((state) => {
       const sessionOutput = state.terminalOutput[mainRepoSessionId] || [];
-      setScriptOutput(sessionOutput);
+      // Only update if output actually changed
+      if (sessionOutput !== previousOutput) {
+        previousOutput = sessionOutput;
+        setScriptOutput(sessionOutput);
+      }
     });
 
     // Get initial state
@@ -329,11 +338,29 @@ export const ProjectView: React.FC<ProjectViewProps> = ({
 
   // Session output updates are now handled by useSessionView hook
 
+  // Performance: Memoize terminal output join
+  const fullScriptOutputMemo = useMemo(() => {
+    if (!scriptOutput || scriptOutput.length === 0) return '';
+    
+    // For very large arrays, join in chunks
+    const CHUNK_SIZE = 500;
+    if (scriptOutput.length > CHUNK_SIZE) {
+      let result = '';
+      for (let i = 0; i < scriptOutput.length; i += CHUNK_SIZE) {
+        const chunk = scriptOutput.slice(i, Math.min(i + CHUNK_SIZE, scriptOutput.length));
+        result += chunk.join('');
+      }
+      return result;
+    }
+    
+    return scriptOutput.join('');
+  }, [scriptOutput]);
+  
   // Write script output to terminal
   useEffect(() => {
     if (!terminalInstance.current || !mainRepoSessionId) return;
     
-    const fullScriptOutput = scriptOutput.join('');
+    const fullScriptOutput = fullScriptOutputMemo;
     
     // Handle case where output was cleared
     if (fullScriptOutput.length === 0 && lastProcessedOutputLength.current > 0) {
@@ -348,13 +375,13 @@ export const ProjectView: React.FC<ProjectViewProps> = ({
       terminalInstance.current.write(newOutput);
       lastProcessedOutputLength.current = fullScriptOutput.length;
     }
-  }, [scriptOutput, mainRepoSessionId]);
+  }, [fullScriptOutputMemo, mainRepoSessionId]);
 
   // Output terminal updates are now handled by useSessionView hook
   
   // Elapsed time tracking is now handled by useSessionView hook
   
-  // Check Stravu connection status
+  // Check Stravu connection status with visibility-aware updates
   useEffect(() => {
     const checkStravuConnection = async () => {
       try {
@@ -365,8 +392,14 @@ export const ProjectView: React.FC<ProjectViewProps> = ({
       }
     };
     checkStravuConnection();
-    const interval = setInterval(checkStravuConnection, 30000);
-    return () => clearInterval(interval);
+    
+    // Use visibility-aware interval to reduce background processing
+    const cleanup = createVisibilityAwareInterval(
+      checkStravuConnection,
+      30000,  // 30 seconds when visible
+      120000  // 2 minutes when not visible
+    );
+    return cleanup;
   }, []);
   
   // formatElapsedTime is now provided by useSessionView hook
diff --git a/frontend/src/components/PromptNavigation.tsx b/frontend/src/components/PromptNavigation.tsx
index aacd4ebb..a8d70d69 100644
--- a/frontend/src/components/PromptNavigation.tsx
+++ b/frontend/src/components/PromptNavigation.tsx
@@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
 import { formatDistanceToNow } from '../utils/formatters';
 import { formatDuration, getTimeDifference, isValidTimestamp, parseTimestamp } from '../utils/timestampUtils';
 import { API } from '../utils/api';
-import { useSessionStore } from '../stores/sessionStore';
 import { PromptDetailModal } from './PromptDetailModal';
+import type { Session } from '../types/session';
 
 interface PromptMarker {
   id: number;
@@ -25,7 +25,36 @@ export function PromptNavigation({ sessionId, onNavigateToPrompt }: PromptNaviga
   const [isLoading, setIsLoading] = useState(false);
   const [selectedPromptId, setSelectedPromptId] = useState<number | null>(null);
   const [modalPrompt, setModalPrompt] = useState<{ prompt: PromptMarker; index: number } | null>(null);
-  const activeSession = useSessionStore((state) => state.sessions.find(s => s.id === sessionId));
+  const [activeSession, setActiveSession] = useState<Session | undefined>(undefined);
+
+  // Fetch session data when sessionId changes
+  useEffect(() => {
+    if (!sessionId) return;
+    
+    const fetchSession = async () => {
+      try {
+        const response = await window.electronAPI.invoke('sessions:get', sessionId);
+        if (response.success && response.session) {
+          setActiveSession(response.session);
+        }
+      } catch (error) {
+        console.error('Error fetching session:', error);
+      }
+    };
+    
+    fetchSession();
+    
+    // Listen for session updates
+    const unsubscribe = window.electronAPI?.events?.onSessionUpdated?.((updatedSession: Session) => {
+      if (updatedSession.id === sessionId) {
+        setActiveSession(updatedSession);
+      }
+    });
+    
+    return () => {
+      unsubscribe?.();
+    };
+  }, [sessionId]);
 
   const calculateDuration = (currentPrompt: PromptMarker, currentIndex: number): string => {
     try {
diff --git a/frontend/src/components/SessionListItem.tsx b/frontend/src/components/SessionListItem.tsx
index 50da858e..f73ac4c0 100644
--- a/frontend/src/components/SessionListItem.tsx
+++ b/frontend/src/components/SessionListItem.tsx
@@ -30,31 +30,12 @@ export const SessionListItem = memo(function SessionListItem({ session, isNested
   const [gitStatus, setGitStatus] = useState<GitStatus | undefined>(session.gitStatus);
   const { menuState, openMenu, closeMenu, isMenuOpen } = useContextMenu();
   const [showArchiveConfirm, setShowArchiveConfirm] = useState(false);
+  const [gitStatusLoading, setGitStatusLoading] = useState(false);
   
-  // Selective subscription for git status loading state
-  const gitStatusLoading = useSessionStore((state) => state.gitStatusLoading.has(session.id));
   
-  
-  // Subscribe to session status updates specifically for this session
-  useEffect(() => {
-    const unsubscribe = useSessionStore.subscribe((state, prevState) => {
-      // Check if this session's status changed
-      const currentSession = state.sessions.find(s => s.id === session.id) || 
-        (state.activeMainRepoSession?.id === session.id ? state.activeMainRepoSession : null);
-      
-      const previousSession = prevState.sessions.find(s => s.id === session.id) || 
-        (prevState.activeMainRepoSession?.id === session.id ? prevState.activeMainRepoSession : null);
-      
-      // Compare store status with prop status
-      
-      // Force component update if status changed
-      if (currentSession && previousSession && currentSession.status !== previousSession.status) {
-        // Status changed - component will re-render due to prop change
-      }
-    });
-    
-    return unsubscribe;
-  }, [session.id, session.status]);
+  // Performance optimization: Remove unnecessary subscription
+  // The component already receives the session as a prop, which will cause re-render when it changes
+  // No need for an additional store subscription that runs for every session item on every store change
   
   useEffect(() => {
     // Check if this session's project has a run script
@@ -121,16 +102,28 @@ export const SessionListItem = memo(function SessionListItem({ session, isNested
   }, [session.id]);
 
   useEffect(() => {
-    // Fetch Git status for this session
+    // Fetch Git status for this session (non-blocking)
     const fetchGitStatus = async () => {
       try {
-        // Don't set loading state here anymore - it's handled by backend events
-        const response = await window.electronAPI.invoke('sessions:get-git-status', session.id);
-        if (response.success && response.gitStatus) {
-          setGitStatus(response.gitStatus);
+        setGitStatusLoading(true);
+        // Use non-blocking fetch (true as second parameter)
+        const response = await window.electronAPI.invoke('sessions:get-git-status', session.id, true);
+        if (response.success) {
+          // If we got cached status, use it immediately
+          if (response.gitStatus) {
+            setGitStatus(response.gitStatus);
+          }
+          // Loading indicator will be cleared when the background refresh completes
+          // via the git-status-updated event
+          if (!response.backgroundRefresh) {
+            setGitStatusLoading(false);
+          }
+        } else {
+          setGitStatusLoading(false);
         }
       } catch (error) {
         console.error('Error fetching git status:', error);
+        setGitStatusLoading(false);
       }
     };
 
@@ -146,6 +139,7 @@ export const SessionListItem = memo(function SessionListItem({ session, isNested
       unsubscribeGitStatus = window.electronAPI.events.onGitStatusUpdated((data) => {
         if (data.sessionId === session.id) {
           setGitStatus(data.gitStatus);
+          setGitStatusLoading(false);
         }
       });
     }
diff --git a/frontend/src/components/SessionView.tsx b/frontend/src/components/SessionView.tsx
index ce49dd85..1484fc62 100644
--- a/frontend/src/components/SessionView.tsx
+++ b/frontend/src/components/SessionView.tsx
@@ -18,23 +18,26 @@ import { RichOutputWithSidebar } from './session/RichOutputWithSidebar';
 import { RichOutputSettings } from './session/RichOutputView';
 import { RichOutputSettingsPanel } from './session/RichOutputSettingsPanel';
 import { LogView } from './session/LogView';
+import { MessagesView } from './session/MessagesView';
 
 export const SessionView = memo(() => {
-  const activeSessionId = useSessionStore((state) => state.activeSessionId);
-  const sessions = useSessionStore((state) => state.sessions);
-  const activeMainRepoSession = useSessionStore((state) => state.activeMainRepoSession);
   const { activeView, activeProjectId } = useNavigationStore();
   const [projectData, setProjectData] = useState<any>(null);
   const [isProjectLoading, setIsProjectLoading] = useState(false);
   const [isMergingProject, setIsMergingProject] = useState(false);
   const [sessionProject, setSessionProject] = useState<any>(null);
 
-  // Define activeSession early so it can be used in effects
-  const activeSession = activeSessionId 
-    ? (activeMainRepoSession && activeMainRepoSession.id === activeSessionId 
-        ? activeMainRepoSession 
-        : sessions.find(s => s.id === activeSessionId))
-    : undefined;
+  // Get active session by subscribing directly to store state
+  // This ensures the component re-renders when git status or other session properties update
+  const activeSession = useSessionStore((state) => {
+    if (!state.activeSessionId) return undefined;
+    // Check main repo session first
+    if (state.activeMainRepoSession && state.activeMainRepoSession.id === state.activeSessionId) {
+      return state.activeMainRepoSession;
+    }
+    // Otherwise look in regular sessions
+    return state.sessions.find(session => session.id === state.activeSessionId);
+  });
 
 
   // Load project data for active session
@@ -224,22 +227,26 @@ export const SessionView = memo(() => {
           {hook.isLoadingOutput && hook.viewMode !== 'richOutput' && (
             <div className="absolute top-4 left-4 text-text-secondary z-10">Loading output...</div>
           )}
-          <div className={`h-full ${hook.viewMode === 'richOutput' ? 'block' : 'hidden'}`}>
-            <RichOutputWithSidebar 
-              sessionId={activeSession.id}
-              settings={richOutputSettings}
-              onSettingsChange={handleRichOutputSettingsChange}
-            />
-          </div>
-          <div className={`h-full ${hook.viewMode === 'changes' ? 'block' : 'hidden'} overflow-hidden`}>
-            <CombinedDiffView 
-              sessionId={activeSession.id} 
-              selectedExecutions={emptySelectedExecutions} 
-              isGitOperationRunning={hook.isMerging}
-              isMainRepo={isMainRepo}
-              isVisible={hook.viewMode === 'changes'}
-            />
-          </div>
+          {hook.viewMode === 'richOutput' && (
+            <div className="h-full block">
+              <RichOutputWithSidebar 
+                sessionId={activeSession.id}
+                settings={richOutputSettings}
+                onSettingsChange={handleRichOutputSettingsChange}
+              />
+            </div>
+          )}
+          {hook.viewMode === 'changes' && (
+            <div className="h-full block overflow-hidden">
+              <CombinedDiffView 
+                sessionId={activeSession.id} 
+                selectedExecutions={emptySelectedExecutions} 
+                isGitOperationRunning={hook.isMerging}
+                isMainRepo={isMainRepo}
+                isVisible={true}
+              />
+            </div>
+          )}
           <div className={`h-full ${hook.viewMode === 'terminal' ? 'flex flex-col' : 'hidden'} bg-bg-primary`}>
             <div className="flex items-center justify-between px-4 py-2 bg-surface-secondary border-b border-border-primary">
               <div className="text-sm text-text-secondary">
@@ -293,12 +300,21 @@ export const SessionView = memo(() => {
               </>
             )}
           </div>
-          <div className={`h-full ${hook.viewMode === 'logs' ? 'block' : 'hidden'}`}>
-            <LogView sessionId={activeSession.id} isVisible={hook.viewMode === 'logs'} />
-          </div>
-          <div className={`h-full ${hook.viewMode === 'editor' ? 'block' : 'hidden'}`}>
-            <FileEditor sessionId={activeSession.id} />
-          </div>
+          {hook.viewMode === 'logs' && (
+            <div className="h-full block">
+              <LogView sessionId={activeSession.id} isVisible={true} />
+            </div>
+          )}
+          {hook.viewMode === 'editor' && (
+            <div className="h-full block">
+              <FileEditor sessionId={activeSession.id} />
+            </div>
+          )}
+          {hook.viewMode === 'messages' && (
+            <div className="h-full flex flex-col overflow-hidden">
+              <MessagesView sessionId={activeSession.id} />
+            </div>
+          )}
         </div>
       </div>
       
diff --git a/frontend/src/components/Settings.tsx b/frontend/src/components/Settings.tsx
index eb82300d..4c611216 100644
--- a/frontend/src/components/Settings.tsx
+++ b/frontend/src/components/Settings.tsx
@@ -4,6 +4,7 @@ import { StravuConnection } from './StravuConnection';
 import { useNotifications } from '../hooks/useNotifications';
 import { API } from '../utils/api';
 import type { AppConfig } from '../types/config';
+import { useConfigStore } from '../stores/configStore';
 import { 
   Shield, 
   ShieldOff, 
@@ -36,6 +37,7 @@ export function Settings({ isOpen, onClose }: SettingsProps) {
   const [claudeExecutablePath, setClaudeExecutablePath] = useState('');
   const [defaultPermissionMode, setDefaultPermissionMode] = useState<'approve' | 'ignore'>('ignore');
   const [autoCheckUpdates, setAutoCheckUpdates] = useState(true);
+  const [devMode, setDevMode] = useState(false);
   const [notificationSettings, setNotificationSettings] = useState({
     enabled: true,
     playSound: true,
@@ -48,6 +50,7 @@ export function Settings({ isOpen, onClose }: SettingsProps) {
   const [activeTab, setActiveTab] = useState<'general' | 'notifications' | 'stravu'>('general');
   const { updateSettings } = useNotifications();
   const { theme, toggleTheme } = useTheme();
+  const { fetchConfig: refreshConfigStore } = useConfigStore();
 
   useEffect(() => {
     if (isOpen) {
@@ -67,6 +70,7 @@ export function Settings({ isOpen, onClose }: SettingsProps) {
       setClaudeExecutablePath(data.claudeExecutablePath || '');
       setDefaultPermissionMode(data.defaultPermissionMode || 'ignore');
       setAutoCheckUpdates(data.autoCheckUpdates !== false); // Default to true
+      setDevMode(data.devMode || false);
       
       // Load notification settings
       if (data.notifications) {
@@ -92,6 +96,7 @@ export function Settings({ isOpen, onClose }: SettingsProps) {
         claudeExecutablePath,
         defaultPermissionMode,
         autoCheckUpdates,
+        devMode,
         notifications: notificationSettings
       });
 
@@ -104,6 +109,10 @@ export function Settings({ isOpen, onClose }: SettingsProps) {
 
       // Refresh config from server
       await fetchConfig();
+      
+      // Also refresh the global config store
+      await refreshConfigStore();
+      
       onClose();
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to update configuration');
@@ -349,6 +358,17 @@ export function Settings({ isOpen, onClose }: SettingsProps) {
                 <p className="text-xs text-text-tertiary mt-1">
                   Shows detailed logs for session creation and Claude Code execution. Useful for debugging issues.
                 </p>
+                
+                <div className="mt-4">
+                  <Checkbox
+                    label="Enable dev mode"
+                    checked={devMode}
+                    onChange={(e) => setDevMode(e.target.checked)}
+                  />
+                  <p className="text-xs text-text-tertiary mt-1">
+                    Adds a "Messages" tab to each session showing raw JSON responses from Claude Code. Useful for debugging and development.
+                  </p>
+                </div>
               </SettingsSection>
 
               <SettingsSection
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index d7ad4c1c..94ba80f9 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -1,6 +1,7 @@
 import { useState, useEffect } from 'react';
 import { Settings } from './Settings';
 import { DraggableProjectTreeView } from './DraggableProjectTreeView';
+import { ArchiveProgress } from './ArchiveProgress';
 import { Info, Clock, Check, Edit, CircleArrowDown, AlertTriangle, GitMerge } from 'lucide-react';
 import crystalLogo from '../assets/crystal-logo.svg';
 import { IconButton } from './ui/Button';
@@ -131,18 +132,24 @@ export function Sidebar({ onHelpClick, onAboutClick, onPromptHistoryClick, width
           <DraggableProjectTreeView />
         </div>
         
-        {/* Version display at bottom */}
-        {version && (
-          <div className="px-4 py-2 border-t border-border-primary">
-            <div 
-              className="text-xs text-text-tertiary text-center cursor-pointer hover:text-text-secondary transition-colors truncate"
-              onClick={onAboutClick}
-              title="Click to view version details"
-            >
-              v{version}{worktreeName && ` • ${worktreeName}`}{gitCommit && ` • ${gitCommit}`}
+        {/* Bottom section - always visible */}
+        <div className="flex-shrink-0">
+          {/* Archive progress indicator above version */}
+          <ArchiveProgress />
+          
+          {/* Version display at bottom */}
+          {version && (
+            <div className="px-4 py-2 border-t border-border-primary">
+              <div 
+                className="text-xs text-text-tertiary text-center cursor-pointer hover:text-text-secondary transition-colors truncate"
+                onClick={onAboutClick}
+                title="Click to view version details"
+              >
+                v{version}{worktreeName && ` • ${worktreeName}`}{gitCommit && ` • ${gitCommit}`}
+              </div>
             </div>
-          </div>
-        )}
+          )}
+        </div>
     </div>
 
       <Settings isOpen={isSettingsOpen} onClose={() => setIsSettingsOpen(false)} />
diff --git a/frontend/src/components/StatusIndicator.tsx b/frontend/src/components/StatusIndicator.tsx
index 9c8f395a..fde4aabf 100644
--- a/frontend/src/components/StatusIndicator.tsx
+++ b/frontend/src/components/StatusIndicator.tsx
@@ -5,7 +5,6 @@ import { isDocumentVisible } from '../utils/performanceUtils';
 import { Badge } from './ui/Badge';
 import { StatusDot } from './ui/StatusDot';
 import { cn } from '../utils/cn';
-import { useSessionStore } from '../stores/sessionStore';
 
 interface StatusIndicatorProps {
   session: Session;
@@ -22,14 +21,8 @@ export const StatusIndicator = React.memo(({
 }: StatusIndicatorProps) => {
   const [animationsEnabled, setAnimationsEnabled] = useState(isDocumentVisible());
   
-  // Get the current session status from the store - this is the source of truth
-  const storeSession = useSessionStore((state) => 
-    state.sessions.find(s => s.id === session.id) || 
-    (state.activeMainRepoSession?.id === session.id ? state.activeMainRepoSession : null)
-  );
-  
-  // Use store session status if available, otherwise fall back to prop
-  const currentStatus = storeSession?.status || session.status;
+  // Use the session status from the prop - parent component manages the session state
+  const currentStatus = session.status;
 
   useEffect(() => {
     const handleVisibilityChange = () => {
diff --git a/frontend/src/components/session/MessagesView.tsx b/frontend/src/components/session/MessagesView.tsx
new file mode 100644
index 00000000..9de96013
--- /dev/null
+++ b/frontend/src/components/session/MessagesView.tsx
@@ -0,0 +1,385 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { API } from '../../utils/api';
+import { cn } from '../../utils/cn';
+import { ChevronRight, ChevronDown, Copy, Check, Terminal, FileText } from 'lucide-react';
+
+interface MessagesViewProps {
+  sessionId: string;
+}
+
+interface JSONMessage {
+  type: 'json';
+  data: string;
+  timestamp: string;
+}
+
+interface SessionInfo {
+  type: 'session_info';
+  initial_prompt: string;
+  claude_command: string;
+  worktree_path: string;
+  model: string;
+  permission_mode: string;
+  timestamp: string;
+}
+
+export const MessagesView: React.FC<MessagesViewProps> = ({ sessionId }) => {
+  const [messages, setMessages] = useState<JSONMessage[]>([]);
+  const [sessionInfo, setSessionInfo] = useState<SessionInfo | null>(null);
+  const [expandedMessages, setExpandedMessages] = useState<Set<number>>(new Set());
+  const [copiedIndex, setCopiedIndex] = useState<number | null>(null);
+  const [showSessionInfo, setShowSessionInfo] = useState(true);
+  const messagesEndRef = useRef<HTMLDivElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
+  const autoScrollRef = useRef(true);
+
+  // Load messages for the session
+  useEffect(() => {
+    const loadMessages = async () => {
+      try {
+        const response = await API.sessions.getJsonMessages(sessionId);
+        if (response.success && response.data) {
+          // Filter out session_info messages and handle them separately
+          const regularMessages: JSONMessage[] = [];
+          let foundSessionInfo: SessionInfo | null = null;
+          
+          response.data.forEach((msg: any) => {
+            try {
+              // Try to parse the message data to check its type
+              let msgData: any;
+              if (typeof msg === 'string') {
+                try {
+                  msgData = JSON.parse(msg);
+                } catch {
+                  // If it's a string but not valid JSON, treat as regular message
+                  regularMessages.push({
+                    type: 'json' as const,
+                    data: msg,
+                    timestamp: new Date().toISOString()
+                  });
+                  return;
+                }
+              } else {
+                msgData = msg;
+              }
+              
+              // Check if this is a session_info message
+              if (msgData && msgData.type === 'session_info') {
+                foundSessionInfo = msgData as SessionInfo;
+              } else {
+                // Regular JSON message
+                regularMessages.push({
+                  type: 'json' as const,
+                  data: typeof msg === 'string' ? msg : JSON.stringify(msg),
+                  timestamp: msg.timestamp || new Date().toISOString()
+                });
+              }
+            } catch (error) {
+              console.error('Error processing message:', error, msg);
+              // If there's any error, treat it as a regular message
+              regularMessages.push({
+                type: 'json' as const,
+                data: typeof msg === 'string' ? msg : JSON.stringify(msg),
+                timestamp: msg.timestamp || new Date().toISOString()
+              });
+            }
+          });
+          
+          setSessionInfo(foundSessionInfo);
+          setMessages(regularMessages);
+        }
+      } catch (error) {
+        console.error('Failed to load messages:', error);
+      }
+    };
+
+    loadMessages();
+  }, [sessionId]);
+
+  // Subscribe to new messages
+  useEffect(() => {
+    const handleSessionOutput = (data: any) => {
+      if (data.sessionId === sessionId && data.type === 'json') {
+        try {
+          // Check if this is a session_info message
+          let parsedData: any;
+          if (typeof data.data === 'string') {
+            try {
+              parsedData = JSON.parse(data.data);
+            } catch {
+              // If it's not valid JSON, treat as regular message
+              setMessages(prev => [...prev, {
+                type: 'json',
+                data: data.data,
+                timestamp: new Date().toISOString()
+              }]);
+              return;
+            }
+          } else {
+            parsedData = data.data;
+          }
+          
+          if (parsedData && parsedData.type === 'session_info') {
+            setSessionInfo(parsedData as SessionInfo);
+          } else {
+            setMessages(prev => [...prev, {
+              type: 'json',
+              data: typeof data.data === 'string' ? data.data : JSON.stringify(data.data),
+              timestamp: new Date().toISOString()
+            }]);
+            
+            // Auto-scroll to bottom if enabled
+            if (autoScrollRef.current) {
+              setTimeout(() => {
+                messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
+              }, 100);
+            }
+          }
+        } catch (error) {
+          console.error('Error handling session output:', error, data);
+          // On error, just add as regular message
+          setMessages(prev => [...prev, {
+            type: 'json',
+            data: typeof data.data === 'string' ? data.data : JSON.stringify(data.data),
+            timestamp: new Date().toISOString()
+          }]);
+        }
+      }
+    };
+
+    window.electron?.on('session:output', handleSessionOutput);
+    return () => {
+      window.electron?.off('session:output', handleSessionOutput);
+    };
+  }, [sessionId]);
+
+  // Handle scroll to detect if user is at bottom
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    const handleScroll = () => {
+      const { scrollTop, scrollHeight, clientHeight } = container;
+      const isAtBottom = scrollHeight - scrollTop - clientHeight < 100;
+      autoScrollRef.current = isAtBottom;
+    };
+
+    container.addEventListener('scroll', handleScroll);
+    return () => container.removeEventListener('scroll', handleScroll);
+  }, []);
+
+  const toggleMessage = (index: number) => {
+    setExpandedMessages(prev => {
+      const newSet = new Set(prev);
+      if (newSet.has(index)) {
+        newSet.delete(index);
+      } else {
+        newSet.add(index);
+      }
+      return newSet;
+    });
+  };
+
+  const copyToClipboard = async (text: string, index: number) => {
+    try {
+      await navigator.clipboard.writeText(text);
+      setCopiedIndex(index);
+      setTimeout(() => setCopiedIndex(null), 2000);
+    } catch (error) {
+      console.error('Failed to copy:', error);
+    }
+  };
+
+  const formatJSON = (jsonString: string): string => {
+    try {
+      const parsed = JSON.parse(jsonString);
+      return JSON.stringify(parsed, null, 2);
+    } catch {
+      return jsonString;
+    }
+  };
+
+  const getMessagePreview = (jsonString: string): string => {
+    try {
+      const parsed = JSON.parse(jsonString);
+      if (parsed.type) {
+        return `${parsed.type}${parsed.role ? ` (${parsed.role})` : ''}`;
+      }
+      return 'JSON Message';
+    } catch {
+      return 'Invalid JSON';
+    }
+  };
+
+  if (messages.length === 0 && !sessionInfo) {
+    return (
+      <div className="flex-1 flex items-center justify-center p-8">
+        <div className="text-center">
+          <div className="text-text-tertiary mb-2">No JSON messages yet</div>
+          <div className="text-sm text-text-quaternary">
+            JSON messages from Claude Code will appear here
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div 
+      ref={containerRef}
+      className="h-full overflow-y-auto overflow-x-hidden bg-surface-primary p-4 font-mono text-sm scrollbar-thin scrollbar-thumb-border-secondary"
+    >
+      <div className="space-y-2">
+        {/* Session Info Card */}
+        {sessionInfo && (
+          <div className="bg-surface-secondary rounded-lg border border-border-primary mb-4">
+            <div
+              className="flex items-center justify-between p-3 cursor-pointer hover:bg-surface-hover transition-colors"
+              onClick={() => setShowSessionInfo(!showSessionInfo)}
+            >
+              <div className="flex items-center gap-2">
+                <button className="text-text-tertiary hover:text-text-primary">
+                  {showSessionInfo ? 
+                    <ChevronDown className="w-4 h-4" /> : 
+                    <ChevronRight className="w-4 h-4" />
+                  }
+                </button>
+                <span className="text-text-primary font-medium flex items-center gap-2">
+                  <Terminal className="w-4 h-4" />
+                  Session Information
+                </span>
+                <span className="text-text-quaternary text-xs">
+                  {new Date(sessionInfo.timestamp).toLocaleTimeString()}
+                </span>
+              </div>
+              <button
+                onClick={(e) => {
+                  e.stopPropagation();
+                  const infoText = `User Prompt:\n${sessionInfo.initial_prompt}\n\nClaude Command:\n${sessionInfo.claude_command}\n\nWorktree Path:\n${sessionInfo.worktree_path}\n\nModel: ${sessionInfo.model}\nPermission Mode: ${sessionInfo.permission_mode}`;
+                  copyToClipboard(infoText, -1);
+                }}
+                className={cn(
+                  "p-1.5 rounded transition-colors",
+                  copiedIndex === -1
+                    ? "text-status-success bg-status-success/10"
+                    : "text-text-tertiary hover:text-text-primary hover:bg-surface-hover"
+                )}
+                title={copiedIndex === -1 ? "Copied!" : "Copy Session Info"}
+              >
+                {copiedIndex === -1 ? (
+                  <Check className="w-4 h-4" />
+                ) : (
+                  <Copy className="w-4 h-4" />
+                )}
+              </button>
+            </div>
+            
+            {showSessionInfo && (
+              <div className="border-t border-border-primary">
+                <div className="p-4 space-y-3">
+                  {/* User Prompt */}
+                  <div>
+                    <div className="flex items-center gap-2 text-text-secondary mb-1">
+                      <FileText className="w-3.5 h-3.5" />
+                      <span className="text-xs font-semibold uppercase tracking-wider">User Prompt</span>
+                    </div>
+                    <div className="bg-surface-primary rounded p-3 text-text-primary whitespace-pre-wrap break-words">
+                      {sessionInfo.initial_prompt}
+                    </div>
+                  </div>
+                  
+                  {/* Claude Command */}
+                  <div>
+                    <div className="flex items-center gap-2 text-text-secondary mb-1">
+                      <Terminal className="w-3.5 h-3.5" />
+                      <span className="text-xs font-semibold uppercase tracking-wider">Claude Command</span>
+                    </div>
+                    <div className="bg-surface-primary rounded p-3 text-text-primary font-mono text-xs overflow-x-auto">
+                      {sessionInfo.claude_command}
+                    </div>
+                  </div>
+                  
+                  {/* Additional Info */}
+                  <div className="grid grid-cols-2 gap-3 text-xs">
+                    <div>
+                      <span className="text-text-quaternary">Worktree Path:</span>
+                      <div className="text-text-secondary mt-1 font-mono truncate" title={sessionInfo.worktree_path}>
+                        {sessionInfo.worktree_path}
+                      </div>
+                    </div>
+                    <div>
+                      <span className="text-text-quaternary">Model:</span>
+                      <div className="text-text-secondary mt-1">
+                        {sessionInfo.model}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            )}
+          </div>
+        )}
+        
+        {/* Regular Messages */}
+        {messages.map((message, index) => {
+          const isExpanded = expandedMessages.has(index);
+          const preview = getMessagePreview(message.data);
+          const formatted = formatJSON(message.data);
+          
+          return (
+            <div
+              key={index}
+              className="bg-surface-secondary rounded-lg border border-border-primary"
+            >
+              <div
+                className="flex items-center justify-between p-3 cursor-pointer hover:bg-surface-hover transition-colors"
+                onClick={() => toggleMessage(index)}
+              >
+                <div className="flex items-center gap-2">
+                  <button className="text-text-tertiary hover:text-text-primary">
+                    {isExpanded ? 
+                      <ChevronDown className="w-4 h-4" /> : 
+                      <ChevronRight className="w-4 h-4" />
+                    }
+                  </button>
+                  <span className="text-text-primary font-medium">{preview}</span>
+                  <span className="text-text-quaternary text-xs">
+                    {new Date(message.timestamp).toLocaleTimeString()}
+                  </span>
+                </div>
+                <button
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    copyToClipboard(formatted, index);
+                  }}
+                  className={cn(
+                    "p-1.5 rounded transition-colors",
+                    copiedIndex === index
+                      ? "text-status-success bg-status-success/10"
+                      : "text-text-tertiary hover:text-text-primary hover:bg-surface-hover"
+                  )}
+                  title={copiedIndex === index ? "Copied!" : "Copy JSON"}
+                >
+                  {copiedIndex === index ? (
+                    <Check className="w-4 h-4" />
+                  ) : (
+                    <Copy className="w-4 h-4" />
+                  )}
+                </button>
+              </div>
+              
+              {isExpanded && (
+                <div className="border-t border-border-primary">
+                  <pre className="p-4 text-text-secondary overflow-x-auto max-h-96">
+                    <code>{formatted}</code>
+                  </pre>
+                </div>
+              )}
+            </div>
+          );
+        })}
+        <div ref={messagesEndRef} />
+      </div>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/frontend/src/components/session/RichOutputView.tsx b/frontend/src/components/session/RichOutputView.tsx
index cf7ae663..6832f8f6 100644
--- a/frontend/src/components/session/RichOutputView.tsx
+++ b/frontend/src/components/session/RichOutputView.tsx
@@ -16,6 +16,8 @@ interface RawMessage {
   name?: string;
   input?: any;
   tool_use_id?: string;
+  parent_tool_use_id?: string; // For sub-agent tool calls
+  session_id?: string; // Sub-agent session ID
   [key: string]: any;
 }
 
@@ -49,6 +51,10 @@ interface ToolCall {
   input?: any;
   result?: ToolResult;
   status: 'pending' | 'success' | 'error';
+  isSubAgent?: boolean; // Is this a Task sub-agent call
+  subAgentType?: string; // Type of sub-agent (e.g., 'test-runner')
+  parentToolId?: string; // Parent Task tool call ID
+  childToolCalls?: ToolCall[]; // Child tool calls for Task agents
 }
 
 
@@ -102,6 +108,7 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
   const isLoadingRef = useRef(false);
   const userMessageRefs = useRef<Map<number, HTMLDivElement>>(new Map());
   const wasAtBottomRef = useRef(false);
+  const loadMessagesRef = useRef<(() => Promise<void>) | null>(null);
 
   // Save local settings to localStorage when they change
   useEffect(() => {
@@ -177,22 +184,79 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
   const transformMessages = (rawMessages: RawMessage[]): ConversationMessage[] => {
     const transformed: ConversationMessage[] = [];
     
-    // First pass: Build tool result map
+    // Performance optimization: Use traditional for loops instead of forEach for large arrays
+    // First pass: Build tool result map and identify sub-agent relationships
     const toolResults = new Map<string, ToolResult>();
-    rawMessages.forEach(msg => {
+    const parentToolMap = new Map<string, string>(); // Map tool ID to parent tool ID
+    
+    // Identify all tool calls and their parent relationships first
+    for (let i = 0; i < rawMessages.length; i++) {
+      const msg = rawMessages[i];
+      // Check for parent_tool_use_id to identify sub-agent tool calls
+      if (msg.parent_tool_use_id && msg.message?.content && Array.isArray(msg.message.content)) {
+        const content = msg.message.content;
+        for (let j = 0; j < content.length; j++) {
+          const block = content[j];
+          if (block.type === 'tool_use' && block.id) {
+            parentToolMap.set(block.id, msg.parent_tool_use_id!);
+          }
+        }
+      }
+      
       if (msg.type === 'user' && msg.message?.content && Array.isArray(msg.message.content)) {
-        msg.message.content.forEach((block: any) => {
+        const content = msg.message.content;
+        for (let j = 0; j < content.length; j++) {
+          const block = content[j];
           if (block.type === 'tool_result' && block.tool_use_id) {
             toolResults.set(block.tool_use_id, {
               content: typeof block.content === 'string' ? block.content : JSON.stringify(block.content),
               isError: block.is_error || false
             });
           }
-        });
+        }
       }
-    });
+    }
     
-    // Second pass: Build conversation messages
+    // Second pass: Build all tool calls to prepare for hierarchy
+    const allToolCalls = new Map<string, ToolCall>();
+    for (let i = 0; i < rawMessages.length; i++) {
+      const msg = rawMessages[i];
+      if (msg.type === 'assistant' && msg.message?.content && Array.isArray(msg.message.content)) {
+        const content = msg.message.content;
+        for (let j = 0; j < content.length; j++) {
+          const block = content[j];
+          if (block.type === 'tool_use') {
+            const isTaskAgent = block.name === 'Task';
+            const toolCall: ToolCall = {
+              id: block.id,
+              name: block.name,
+              input: block.input,
+              status: toolResults.has(block.id) ? 'success' : 'pending',
+              result: toolResults.get(block.id),
+              isSubAgent: isTaskAgent,
+              subAgentType: isTaskAgent ? block.input?.subagent_type : undefined,
+              parentToolId: parentToolMap.get(block.id),
+              childToolCalls: []
+            };
+            allToolCalls.set(block.id, toolCall);
+          }
+        }
+      }
+    }
+    
+    // Build parent-child relationships
+    const toolCallsArray = Array.from(allToolCalls.values());
+    for (let i = 0; i < toolCallsArray.length; i++) {
+      const toolCall = toolCallsArray[i];
+      if (toolCall.parentToolId) {
+        const parentTool = allToolCalls.get(toolCall.parentToolId);
+        if (parentTool && parentTool.childToolCalls) {
+          parentTool.childToolCalls.push(toolCall);
+        }
+      }
+    }
+    
+    // Third pass: Build conversation messages
     for (let i = 0; i < rawMessages.length; i++) {
       const msg = rawMessages[i];
       
@@ -202,8 +266,18 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
         let hasOnlyText = true;
         
         if (msg.message?.content && Array.isArray(msg.message.content)) {
-          hasToolResult = msg.message.content.some((block: any) => block.type === 'tool_result');
-          hasOnlyText = msg.message.content.every((block: any) => block.type === 'text');
+          // Performance optimization: Use for loops instead of array methods
+          const content = msg.message.content;
+          for (let j = 0; j < content.length; j++) {
+            if (content[j].type === 'tool_result') {
+              hasToolResult = true;
+              hasOnlyText = false;
+              break;
+            }
+            if (content[j].type !== 'text') {
+              hasOnlyText = false;
+            }
+          }
         }
         
         // Only show real user prompts (text-only messages without tool results)
@@ -234,8 +308,10 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
         if (msg.text && typeof msg.text === 'string') {
           segments.push({ type: 'text', content: msg.text.trim() });
         } else if (msg.message?.content && Array.isArray(msg.message.content)) {
-          // Process each content block
-          msg.message.content.forEach((block: any) => {
+          // Process each content block - use for loop for better performance
+          const content = msg.message.content;
+          for (let j = 0; j < content.length; j++) {
+            const block = content[j];
             if (block.type === 'text' && block.text?.trim()) {
               segments.push({ type: 'text', content: block.text.trim() });
             } else if (block.type === 'thinking') {
@@ -244,16 +320,13 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
                 segments.push({ type: 'thinking', content: thinkingContent.trim() });
               }
             } else if (block.type === 'tool_use') {
-              const toolCall: ToolCall = {
-                id: block.id,
-                name: block.name,
-                input: block.input,
-                status: toolResults.has(block.id) ? 'success' : 'pending',
-                result: toolResults.get(block.id)
-              };
-              segments.push({ type: 'tool_call', tool: toolCall });
+              const toolCall = allToolCalls.get(block.id);
+              // Only add top-level tools (those without parents)
+              if (toolCall && !toolCall.parentToolId) {
+                segments.push({ type: 'tool_call', tool: toolCall });
+              }
             }
-          });
+          }
         } else {
           // Fallback for other formats
           const textContent = extractTextContent(msg);
@@ -465,6 +538,11 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
     }
   }, [sessionId]);
 
+  // Store loadMessages in ref to avoid dependency cycles
+  useEffect(() => {
+    loadMessagesRef.current = loadMessages;
+  }, [loadMessages]);
+
   // Listen for real-time output updates - debounced to prevent performance issues
   useEffect(() => {
     let debounceTimer: NodeJS.Timeout;
@@ -474,7 +552,7 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
         // Debounce message reloading to prevent excessive re-renders
         clearTimeout(debounceTimer);
         debounceTimer = setTimeout(() => {
-          loadMessages();
+          loadMessagesRef.current?.();
         }, 500); // Wait 500ms after last event
       }
     };
@@ -485,7 +563,7 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
       clearTimeout(debounceTimer);
       window.removeEventListener('session-output-available', handleOutputAvailable as any);
     };
-  }, [sessionId, loadMessages]);
+  }, [sessionId]); // Only depend on sessionId, not loadMessages
 
   // Initial load
   useEffect(() => {
@@ -590,21 +668,47 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
 
 
   // Render a tool call segment
-  const renderToolCall = (tool: ToolCall) => {
+  const renderToolCall = (tool: ToolCall, depth: number = 0) => {
     const isExpanded = !settings.collapseTools || expandedTools.has(tool.id);
+    const isTaskAgent = tool.isSubAgent && tool.name === 'Task';
+    const hasChildTools = tool.childToolCalls && tool.childToolCalls.length > 0;
+    
+    // Different styling for Task sub-agents
+    const bgColor = isTaskAgent 
+      ? 'bg-interactive/10' 
+      : depth > 0 
+        ? 'bg-surface-tertiary/30' 
+        : 'bg-surface-tertiary/50';
+    
+    const borderColor = isTaskAgent
+      ? 'border-interactive/30'
+      : 'border-border-primary/50';
     
     return (
-      <div className="rounded-md bg-surface-tertiary/50 overflow-hidden border border-border-primary/50">
+      <div className={`rounded-md ${bgColor} overflow-hidden border ${borderColor} ${depth > 0 ? 'ml-4' : ''}`}>
         <button
           onClick={() => toggleToolExpand(tool.id)}
           className="w-full px-3 py-2 bg-surface-tertiary/30 flex items-center gap-2 hover:bg-surface-tertiary/50 transition-colors text-left"
         >
-          <Wrench className="w-3.5 h-3.5 text-interactive-on-dark flex-shrink-0" />
-          <span className="font-mono text-xs text-text-primary flex-1">{tool.name}</span>
+          {isTaskAgent ? (
+            <svg className="w-3.5 h-3.5 text-interactive flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={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 2" />
+            </svg>
+          ) : (
+            <Wrench className="w-3.5 h-3.5 text-interactive-on-dark flex-shrink-0" />
+          )}
+          <span className="font-mono text-xs text-text-primary flex-1">
+            {isTaskAgent ? 'Sub-Agent' : tool.name}
+            {isTaskAgent && tool.subAgentType && (
+              <span className="ml-2 text-interactive font-semibold">
+                [{tool.subAgentType}]
+              </span>
+            )}
+          </span>
           {tool.status === 'success' && <CheckCircle className="w-3.5 h-3.5 text-status-success flex-shrink-0" />}
           {tool.status === 'error' && <XCircle className="w-3.5 h-3.5 text-status-error flex-shrink-0" />}
           {tool.status === 'pending' && <Clock className="w-3.5 h-3.5 text-text-tertiary flex-shrink-0 animate-pulse" />}
-          {settings.collapseTools && (
+          {(settings.collapseTools || hasChildTools) && (
             isExpanded ? <ChevronDown className="w-3 h-3 text-text-tertiary" /> : <ChevronRight className="w-3 h-3 text-text-tertiary" />
           )}
         </button>
@@ -619,9 +723,28 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
               </div>
             )}
             
+            {/* Child tool calls for Task agents */}
+            {hasChildTools && (
+              <div className="mt-2">
+                <div className="text-text-secondary text-xs font-semibold mb-2 flex items-center gap-1">
+                  <svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+                  </svg>
+                  Sub-agent Actions:
+                </div>
+                <div className="space-y-2">
+                  {tool.childToolCalls!.map((childTool, idx) => (
+                    <div key={`${tool.id}-child-${idx}`}>
+                      {renderToolCall(childTool, depth + 1)}
+                    </div>
+                  ))}
+                </div>
+              </div>
+            )}
+            
             {/* Tool Result */}
             {tool.result && (
-              <div>
+              <div className="mt-2">
                 <div className="text-text-tertiary mb-1">
                   {tool.result.isError ? 'Error:' : 'Result:'}
                 </div>
@@ -632,7 +755,7 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
             )}
             
             {/* Pending state */}
-            {tool.status === 'pending' && (
+            {tool.status === 'pending' && !hasChildTools && (
               <div className="text-text-tertiary italic">Waiting for result...</div>
             )}
           </div>
@@ -694,6 +817,34 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
           </div>
         );
       
+      case 'Task':
+        return (
+          <div className="text-sm space-y-1.5">
+            {input.description && (
+              <div className="flex items-start gap-2">
+                <span className="text-text-tertiary">Task:</span>
+                <span className="text-interactive font-medium">{input.description}</span>
+              </div>
+            )}
+            {input.subagent_type && (
+              <div className="flex items-start gap-2">
+                <span className="text-text-tertiary">Agent Type:</span>
+                <span className="text-status-warning font-mono text-xs">{input.subagent_type}</span>
+              </div>
+            )}
+            {input.prompt && (
+              <details className="mt-1">
+                <summary className="cursor-pointer text-text-secondary hover:text-text-primary text-xs">
+                  View Prompt
+                </summary>
+                <div className="mt-1 p-2 bg-surface-secondary rounded text-xs whitespace-pre-wrap max-h-32 overflow-y-auto">
+                  {input.prompt}
+                </div>
+              </details>
+            )}
+          </div>
+        );
+      
       case 'TodoWrite':
         return (
           <div className="text-sm space-y-1">
@@ -722,7 +873,7 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
   };
 
   // Format tool result for display
-  const formatToolResult = (_toolName: string, result: string): React.ReactNode => {
+  const formatToolResult = (toolName: string, result: string): React.ReactNode => {
     if (!result) {
       return <div className="text-sm text-text-tertiary italic">No result</div>;
     }
@@ -731,6 +882,23 @@ export const RichOutputView = React.forwardRef<{ scrollToPrompt: (promptIndex: n
       // Check if result is JSON
       const parsed = JSON.parse(result);
       
+      // Handle Task tool results (array with text objects)
+      if (toolName === 'Task' && Array.isArray(parsed)) {
+        // Extract text content from Task results
+        const textContent = parsed
+          .filter(item => item.type === 'text' && item.text)
+          .map(item => item.text)
+          .join('\n\n');
+        
+        if (textContent) {
+          return (
+            <div className="text-sm text-text-primary whitespace-pre-wrap max-h-64 overflow-y-auto">
+              {textContent}
+            </div>
+          );
+        }
+      }
+      
       // Handle image reads
       if (Array.isArray(parsed) && parsed[0]?.type === 'image') {
         return (
diff --git a/frontend/src/components/session/SessionInput.tsx b/frontend/src/components/session/SessionInput.tsx
index 33640066..209c5164 100644
--- a/frontend/src/components/session/SessionInput.tsx
+++ b/frontend/src/components/session/SessionInput.tsx
@@ -35,7 +35,8 @@ export const SessionInput: React.FC<SessionInputProps> = ({
   setUltrathink,
   handleToggleAutoCommit,
 }) => {
-  const [selectedModel, setSelectedModel] = useState<string>(activeSession.model || 'claude-sonnet-4-20250514');
+  const [selectedModel, setSelectedModel] = useState<string>(activeSession.model || 'auto');
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   useEffect(() => {
     // Update selected model when switching to a different session
@@ -44,30 +45,57 @@ export const SessionInput: React.FC<SessionInputProps> = ({
       model: activeSession.model,
       name: activeSession.name
     });
-    setSelectedModel(activeSession.model || 'claude-sonnet-4-20250514');
+    setSelectedModel(activeSession.model || 'auto');
   }, [activeSession.id]); // Only reset when session ID changes, not when model updates
 
-  const onKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+  const onKeyDown = async (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
     const shouldSend = e.key === 'Enter' && (e.metaKey || e.ctrlKey);
     if (shouldSend) {
       e.preventDefault();
-      if (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting') {
-        handleTerminalCommand();
-      } else if (activeSession.status === 'waiting') {
-        handleSendInput();
-      } else {
-        handleContinueConversation(selectedModel);
+      
+      // Prevent duplicate submissions
+      if (isSubmitting) {
+        console.log('[SessionInput] Ignoring duplicate submission attempt');
+        return;
+      }
+      
+      setIsSubmitting(true);
+      
+      try {
+        if (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting') {
+          await handleTerminalCommand();
+        } else if (activeSession.status === 'waiting') {
+          await handleSendInput();
+        } else {
+          await handleContinueConversation(selectedModel);
+        }
+      } finally {
+        // Reset submission state after a short delay to prevent rapid resubmissions
+        setTimeout(() => setIsSubmitting(false), 500);
       }
     }
   };
   
-  const onClickSend = () => {
-    if (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting') {
-      handleTerminalCommand();
-    } else if (activeSession.status === 'waiting') {
-      handleSendInput();
-    } else {
-      handleContinueConversation(selectedModel);
+  const onClickSend = async () => {
+    // Prevent duplicate submissions
+    if (isSubmitting) {
+      console.log('[SessionInput] Ignoring duplicate submission attempt');
+      return;
+    }
+    
+    setIsSubmitting(true);
+    
+    try {
+      if (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting') {
+        await handleTerminalCommand();
+      } else if (activeSession.status === 'waiting') {
+        await handleSendInput();
+      } else {
+        await handleContinueConversation(selectedModel);
+      }
+    } finally {
+      // Reset submission state after a short delay to prevent rapid resubmissions
+      setTimeout(() => setIsSubmitting(false), 500);
     }
   };
 
@@ -102,10 +130,15 @@ export const SessionInput: React.FC<SessionInputProps> = ({
         </div>
         <button 
           onClick={onClickSend} 
-          className="px-4 bg-interactive text-white rounded-md hover:bg-interactive-hover min-w-[100px] font-medium transition-colors"
+          disabled={isSubmitting}
+          className={`px-4 text-white rounded-md min-w-[100px] font-medium transition-colors ${
+            isSubmitting 
+              ? 'bg-gray-500 cursor-not-allowed' 
+              : 'bg-interactive hover:bg-interactive-hover'
+          }`}
           style={{ height: '67px' }}
         >
-          {viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting' ? 'Run' : (activeSession.status === 'waiting' ? 'Send' : 'Continue')}
+          {isSubmitting ? 'Processing...' : (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting' ? 'Run' : (activeSession.status === 'waiting' ? 'Send' : 'Continue'))}
         </button>
       </div>
       <div className="mt-2 flex items-center gap-4">
@@ -140,9 +173,10 @@ export const SessionInput: React.FC<SessionInputProps> = ({
               className="text-sm px-2 py-1 border border-border-primary rounded focus:outline-none focus:ring-1 focus:ring-interactive text-text-primary bg-surface-secondary"
               title="AI model to use for continuing the conversation"
             >
-              <option value="claude-sonnet-4-20250514">Sonnet: Best for most coding tasks</option>
-              <option value="claude-opus-4-20250514">Opus: Complex architecture, large refactors</option>
-              <option value="claude-3-5-haiku-20241022">Haiku: Fast & cost-effective for simple tasks</option>
+              <option value="auto">Auto: Claude Code's default selection</option>
+              <option value="sonnet">Sonnet: Best for most coding tasks</option>
+              <option value="opus">Opus: Complex architecture, large refactors</option>
+              <option value="haiku">Haiku: Fast & cost-effective for simple tasks</option>
             </select>
           </div>
         )}
diff --git a/frontend/src/components/session/SessionInputWithImages.tsx b/frontend/src/components/session/SessionInputWithImages.tsx
index 5344b8ac..93cc39cb 100644
--- a/frontend/src/components/session/SessionInputWithImages.tsx
+++ b/frontend/src/components/session/SessionInputWithImages.tsx
@@ -64,8 +64,9 @@ export const SessionInputWithImages: React.FC<SessionInputWithImagesProps> = mem
   const [isDragging, setIsDragging] = useState(false);
   const [isFocused, setIsFocused] = useState(false);
   const [isToolbarActive, setIsToolbarActive] = useState(false);
-  const [selectedModel, setSelectedModel] = useState<string>(activeSession.model || 'claude-sonnet-4-20250514');
+  const [selectedModel, setSelectedModel] = useState<string>(activeSession.model || 'auto');
   const [textareaHeight, setTextareaHeight] = useState<number>(52);
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const fileInputRef = useRef<HTMLInputElement>(null);
 
   // Calculate auto-commit enabled state
@@ -74,7 +75,7 @@ export const SessionInputWithImages: React.FC<SessionInputWithImagesProps> = mem
 
   useEffect(() => {
     // Update selected model when switching to a different session
-    setSelectedModel(activeSession.model || 'claude-sonnet-4-20250514');
+    setSelectedModel(activeSession.model || 'auto');
   }, [activeSession.id]); // Only reset when session ID changes, not when model updates
 
   const generateImageId = () => `img_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
@@ -164,7 +165,7 @@ export const SessionInputWithImages: React.FC<SessionInputWithImagesProps> = mem
     setAttachedImages(prev => prev.filter(img => img.id !== id));
   }, []);
 
-  const onKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement | HTMLInputElement>) => {
+  const onKeyDown = async (e: React.KeyboardEvent<HTMLTextAreaElement | HTMLInputElement>) => {
     const shouldSend = e.key === 'Enter' && (e.metaKey || e.ctrlKey);
     const shouldCancel = e.key === 'Escape' && activeSession.status === 'running' && handleCancelRequest;
     
@@ -173,27 +174,54 @@ export const SessionInputWithImages: React.FC<SessionInputWithImagesProps> = mem
       handleCancelRequest();
     } else if (shouldSend) {
       e.preventDefault();
+      
+      // Prevent duplicate submissions
+      if (isSubmitting) {
+        console.log('[SessionInputWithImages] Ignoring duplicate submission attempt');
+        return;
+      }
+      
+      setIsSubmitting(true);
+      
+      try {
+        if (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting') {
+          await handleTerminalCommand();
+        } else if (activeSession.status === 'waiting') {
+          await handleSendInput(attachedImages);
+          setAttachedImages([]);
+        } else {
+          await handleContinueConversation(attachedImages, selectedModel);
+          setAttachedImages([]);
+        }
+      } finally {
+        // Reset submission state after a short delay to prevent rapid resubmissions
+        setTimeout(() => setIsSubmitting(false), 500);
+      }
+    }
+  };
+  
+  const onClickSend = async () => {
+    // Prevent duplicate submissions
+    if (isSubmitting) {
+      console.log('[SessionInputWithImages] Ignoring duplicate submission attempt');
+      return;
+    }
+    
+    setIsSubmitting(true);
+    
+    try {
       if (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting') {
-        handleTerminalCommand();
+        await handleTerminalCommand();
       } else if (activeSession.status === 'waiting') {
-        handleSendInput(attachedImages);
+        await handleSendInput(attachedImages);
         setAttachedImages([]);
       } else {
-        handleContinueConversation(attachedImages, selectedModel);
+        await handleContinueConversation(attachedImages, selectedModel);
         setAttachedImages([]);
       }
-    }
-  };
-  
-  const onClickSend = () => {
-    if (viewMode === 'terminal' && !activeSession.isRunning && activeSession.status !== 'waiting') {
-      handleTerminalCommand();
-    } else if (activeSession.status === 'waiting') {
-      handleSendInput(attachedImages);
-      setAttachedImages([]);
-    } else {
-      handleContinueConversation(attachedImages, selectedModel);
-      setAttachedImages([]);
+    } finally {
+      // Reset submission state after a short delay to prevent rapid resubmissions
+      setTimeout(() => setIsSubmitting(false), 500);
     }
   };
 
@@ -578,24 +606,27 @@ export const SessionInputWithImages: React.FC<SessionInputWithImagesProps> = mem
               ) : (
                 <button 
                   onClick={onClickSend}
+                  disabled={isSubmitting}
                   className={`
                     px-4 py-2 font-medium group
                     flex items-center gap-2 transition-all duration-200
                     rounded-lg border
                     active:scale-[0.98]
                     focus:outline-none focus:ring-2 focus:ring-inset focus:ring-offset-0
-                    ${buttonConfig.isPrimary 
-                      ? `bg-gradient-to-r from-interactive to-interactive-hover hover:from-interactive-hover hover:to-interactive 
-                         text-white border-interactive shadow-[inset_0_1px_0_rgba(255,255,255,0.1)] 
-                         focus:ring-interactive hover:shadow-[0_4px_12px_rgba(59,130,246,0.3)]`
-                      : buttonConfig.color === 'green' 
-                        ? 'bg-surface-secondary hover:bg-surface-hover text-status-success hover:text-status-success/90 border-border-primary focus:ring-status-success' 
-                        : 'bg-surface-secondary hover:bg-surface-hover text-interactive hover:text-interactive-hover border-border-primary focus:ring-interactive'
+                    ${isSubmitting 
+                      ? 'bg-gray-500 text-gray-300 border-gray-500 cursor-not-allowed opacity-60'
+                      : buttonConfig.isPrimary 
+                        ? `bg-gradient-to-r from-interactive to-interactive-hover hover:from-interactive-hover hover:to-interactive 
+                           text-white border-interactive shadow-[inset_0_1px_0_rgba(255,255,255,0.1)] 
+                           focus:ring-interactive hover:shadow-[0_4px_12px_rgba(59,130,246,0.3)]`
+                        : buttonConfig.color === 'green' 
+                          ? 'bg-surface-secondary hover:bg-surface-hover text-status-success hover:text-status-success/90 border-border-primary focus:ring-status-success' 
+                          : 'bg-surface-secondary hover:bg-surface-hover text-interactive hover:text-interactive-hover border-border-primary focus:ring-interactive'
                     }
                   `}
                 >
                   <ButtonIcon className="w-4 h-4 transition-transform duration-200 group-hover:translate-x-0.5" />
-                  <span className="font-semibold">{buttonConfig.text}</span>
+                  <span className="font-semibold">{isSubmitting ? 'Processing...' : buttonConfig.text}</span>
                   
                   {/* Inline keyboard shortcut */}
                   <span 
@@ -640,19 +671,25 @@ const ModelSelector: React.FC<ModelSelectorProps> = ({
 
   // Model configurations
   const modelConfigs = {
-    'claude-sonnet-4-20250514': {
+    'auto': {
+      label: 'Auto',
+      icon: CheckCircle,
+      iconColor: 'text-interactive',
+      description: 'Default',
+    },
+    'sonnet': {
       label: 'Sonnet',
       icon: Target,
       iconColor: 'text-interactive',
       description: 'Balanced',
     },
-    'claude-opus-4-20250514': {
+    'opus': {
       label: 'Opus',
       icon: Brain,
       iconColor: 'text-interactive',
       description: 'Maximum',
     },
-    'claude-3-5-haiku-20241022': {
+    'haiku': {
       label: 'Haiku',
       icon: Zap,
       iconColor: 'text-status-success',
diff --git a/frontend/src/components/session/ViewTabs.tsx b/frontend/src/components/session/ViewTabs.tsx
index 2a2fdf8f..13064294 100644
--- a/frontend/src/components/session/ViewTabs.tsx
+++ b/frontend/src/components/session/ViewTabs.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { ViewMode } from '../../hooks/useSessionView';
 import { cn } from '../../utils/cn';
-import { GitCompare, Terminal, FileEdit, Eye, Settings, GitBranch, MoreVertical, ScrollText } from 'lucide-react';
+import { GitCompare, Terminal, FileEdit, Eye, Settings, GitBranch, MoreVertical, ScrollText, Code } from 'lucide-react';
 import { Button } from '../ui/Button';
 import { Dropdown } from '../ui/Dropdown';
+import { useConfigStore } from '../../stores/configStore';
 
 interface ViewTabsProps {
   viewMode: ViewMode;
@@ -14,6 +15,7 @@ interface ViewTabsProps {
     logs: boolean;
     editor: boolean;
     richOutput: boolean;
+    messages?: boolean;
   };
   setUnreadActivity: (activity: any) => void;
   isTerminalRunning: boolean;
@@ -42,6 +44,14 @@ export const ViewTabs: React.FC<ViewTabsProps> = ({
   branchActions,
   isMerging,
 }) => {
+  const { config, fetchConfig } = useConfigStore();
+  
+  // Fetch config on mount if not loaded
+  useEffect(() => {
+    if (!config) {
+      fetchConfig();
+    }
+  }, [config, fetchConfig]);
   const tabs: { 
     mode: ViewMode; 
     label: string; 
@@ -82,6 +92,16 @@ export const ViewTabs: React.FC<ViewTabsProps> = ({
       activity: unreadActivity.editor 
     },
   ];
+  
+  // Add Messages tab if dev mode is enabled
+  if (config?.devMode) {
+    tabs.push({
+      mode: 'messages' as ViewMode,
+      label: 'Messages',
+      icon: <Code className="w-4 h-4" />,
+      activity: unreadActivity.messages
+    });
+  }
 
   return (
     <div className="flex items-center px-4 bg-surface-secondary" role="tablist">
diff --git a/frontend/src/hooks/useSessionView.ts b/frontend/src/hooks/useSessionView.ts
index bcff1434..b132a18f 100644
--- a/frontend/src/hooks/useSessionView.ts
+++ b/frontend/src/hooks/useSessionView.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef, useCallback } from 'react';
+import { useState, useEffect, useRef, useCallback, useMemo } from 'react';
 import { useSessionStore } from '../stores/sessionStore';
 import { useTheme } from '../contexts/ThemeContext';
 import { useErrorStore } from '../stores/errorStore';
@@ -9,7 +9,7 @@ import { Session, GitCommands, GitErrorDetails } from '../types/session';
 import { getTerminalTheme, getScriptTerminalTheme } from '../utils/terminalTheme';
 import { createVisibilityAwareInterval } from '../utils/performanceUtils';
 
-export type ViewMode = 'richOutput' | 'changes' | 'terminal' | 'logs' | 'editor';
+export type ViewMode = 'richOutput' | 'changes' | 'terminal' | 'logs' | 'editor' | 'messages';
 
 export const useSessionView = (
   activeSession: Session | undefined,
@@ -33,6 +33,7 @@ export const useSessionView = (
     logs: false,
     editor: false,
     richOutput: false,
+    messages: false,
   });
   const [isEditingName, setIsEditingName] = useState(false);
   const [editName, setEditName] = useState('');
@@ -272,12 +273,16 @@ export const useSessionView = (
 
   useEffect(() => {
     if (!activeSessionId) return;
+    // Performance optimization: Check session status only, not entire state
+    let previousStatus = activeSession?.status;
     const unsubscribe = useSessionStore.subscribe((state) => {
       const updatedSession = state.activeMainRepoSession?.id === activeSessionId
         ? state.activeMainRepoSession
         : state.sessions.find(s => s.id === activeSessionId);
       
-      if (updatedSession && updatedSession.status !== activeSession?.status) {
+      // Only trigger update if status actually changed
+      if (updatedSession && updatedSession.status !== previousStatus) {
+        previousStatus = updatedSession.status;
         if (activeSession?.status === 'initializing' && updatedSession.status === 'running') {
           // Only clear terminal and reload for new sessions, not when continuing conversations
           const hasExistingOutput = activeSession.output && activeSession.output.length > 0;
@@ -304,11 +309,17 @@ export const useSessionView = (
       setScriptOutput([]);
       return;
     }
+    // Performance optimization: Track previous terminal output to avoid unnecessary updates
+    let previousOutput = useSessionStore.getState().terminalOutput[activeSession.id];
     const unsubscribe = useSessionStore.subscribe((state) => {
       const sessionTerminalOutput = state.terminalOutput[activeSession.id] || [];
-      setScriptOutput(sessionTerminalOutput);
-      // Terminal is now independent - no automatic unread indicators
-      // Users explicitly interact with the terminal, so they know when there's output
+      // Only update if output actually changed
+      if (sessionTerminalOutput !== previousOutput) {
+        previousOutput = sessionTerminalOutput;
+        setScriptOutput(sessionTerminalOutput);
+        // Terminal is now independent - no automatic unread indicators
+        // Users explicitly interact with the terminal, so they know when there's output
+      }
     });
     setScriptOutput(useSessionStore.getState().terminalOutput[activeSession.id] || []);
     return unsubscribe;
@@ -334,6 +345,7 @@ export const useSessionView = (
       logs: false,
       editor: false,
       richOutput: false,
+      messages: false,
     });
     
     // Reset context compaction state when switching sessions
@@ -399,6 +411,40 @@ export const useSessionView = (
   const messageCount = activeSession?.jsonMessages?.length || 0;
   const outputCount = activeSession?.output?.length || 0;
 
+  // Performance optimization: Use useMemo to cache the expensive join operation
+  const formattedOutputMemo = useMemo(() => {
+    if (!activeSession || currentSessionIdForOutput !== activeSession.id) {
+      return '';
+    }
+    
+    const outputArray = activeSession.output || [];
+    if (outputArray.length === 0) {
+      return '';
+    }
+    
+    // CRITICAL PERFORMANCE FIX: Much more aggressive limiting
+    // Process only recent output to avoid massive array operations that lock up V8
+    const MAX_OUTPUT_TO_PROCESS = 500; // Drastically reduced from 2000
+    const outputToProcess = outputArray.length > MAX_OUTPUT_TO_PROCESS 
+      ? outputArray.slice(-MAX_OUTPUT_TO_PROCESS)
+      : outputArray;
+    
+    // PERFORMANCE: Build string in chunks to avoid V8 string concatenation issues
+    if (outputToProcess.length > 100) {
+      // For large arrays, build in chunks to avoid V8 optimization bailouts
+      const chunks: string[] = [];
+      const chunkSize = 50;
+      for (let i = 0; i < outputToProcess.length; i += chunkSize) {
+        const chunk = outputToProcess.slice(i, Math.min(i + chunkSize, outputToProcess.length));
+        chunks.push(chunk.join(''));
+      }
+      return chunks.join('');
+    } else {
+      // For small arrays, direct join is fine
+      return outputToProcess.join('');
+    }
+  }, [activeSession?.id, currentSessionIdForOutput, outputCount]);
+  
   useEffect(() => {
     if (!activeSession) return;
     
@@ -420,38 +466,14 @@ export const useSessionView = (
       setIsWaitingForFirstOutput(false);
     }
 
-    const formatOutput = () => {
-      const currentActiveSession = useSessionStore.getState().getActiveSession();
-      if (!currentActiveSession || currentActiveSession.id !== activeSession.id) {
-        console.log(`[formatOutput] Session changed during formatting, aborting`);
-        return;
-      }
-      
-      // The output array should already contain formatted strings from the IPC handler
-      const outputArray = currentActiveSession.output || [];
-      console.log(`[formatOutput] Session ${activeSession.id} has ${outputArray.length} output items`);
-      
-      if (outputArray.length > 0) {
-        console.log(`[formatOutput] First output item preview: ${outputArray[0].substring(0, 200)}`);
-      }
-      
-      const formatted = outputArray.join('');
-      
-      // Double-check we're still on the same session before updating
-      const finalActiveSession = useSessionStore.getState().getActiveSession();
-      if (finalActiveSession && finalActiveSession.id === activeSession.id && currentSessionIdForOutput === activeSession.id) {
-        console.log(`[formatOutput] Setting formatted output for session ${activeSession.id}, length: ${formatted.length}, first 100 chars: ${formatted.substring(0, 100)}`);
-        setFormattedOutput(formatted);
-      } else {
-        console.log(`[formatOutput] Session mismatch during final check - finalActiveSession.id: ${finalActiveSession?.id}, activeSession.id: ${activeSession.id}, currentSessionIdForOutput: ${currentSessionIdForOutput}`);
-      }
-    };
+    // PERFORMANCE FIX: More aggressive debouncing for large outputs
+    const delay = outputCount > 100 ? 200 : 50; // Longer delay for large outputs
+    const timeoutId = setTimeout(() => {
+      setFormattedOutput(formattedOutputMemo);
+    }, delay);
     
-    // Use requestAnimationFrame to ensure state is settled
-    requestAnimationFrame(() => {
-      formatOutput();
-    });
-  }, [activeSession?.id, messageCount, outputCount, currentSessionIdForOutput, isWaitingForFirstOutput]);
+    return () => clearTimeout(timeoutId);
+  }, [activeSession?.id, messageCount, outputCount, currentSessionIdForOutput, isWaitingForFirstOutput, formattedOutputMemo]);
   
   // Consolidated effect for loading output
   useEffect(() => {
@@ -522,8 +544,12 @@ export const useSessionView = (
     forceResetLoadingState
   ]);
   
-  // Listen for output available events
+  // Listen for output available events with aggressive throttling for performance
   useEffect(() => {
+    let reloadDebounceTimer: NodeJS.Timeout | null = null;
+    let lastReloadTime = 0;
+    const MIN_RELOAD_INTERVAL = 1000; // Increased to 1 second to prevent rapid reloads
+    
     const handleOutputAvailable = (event: CustomEvent) => {
       const { sessionId } = event.detail;
       
@@ -531,14 +557,37 @@ export const useSessionView = (
       if (activeSession?.id === sessionId) {
         // Trigger reload if we're loaded or if we're continuing a conversation
         if (outputLoadState === 'loaded' || isContinuingConversationRef.current) {
-          console.log(`[Output Available] New output for active session ${sessionId}, requesting reload (state: ${outputLoadState}, continuing: ${isContinuingConversationRef.current})`);
-          setShouldReloadOutput(true);
+          const now = Date.now();
+          const timeSinceLastReload = now - lastReloadTime;
+          
+          // PERFORMANCE FIX: Throttle reloads to prevent CPU overload
+          if (timeSinceLastReload < MIN_RELOAD_INTERVAL) {
+            // Schedule for later if too soon
+            if (reloadDebounceTimer) {
+              clearTimeout(reloadDebounceTimer);
+            }
+            reloadDebounceTimer = setTimeout(() => {
+              setShouldReloadOutput(true);
+              lastReloadTime = Date.now();
+              reloadDebounceTimer = null;
+            }, MIN_RELOAD_INTERVAL - timeSinceLastReload);
+          } else {
+            // Can reload immediately
+            console.log(`[Output Available] Reloading output for session ${sessionId}`);
+            setShouldReloadOutput(true);
+            lastReloadTime = now;
+          }
         }
       }
     };
     
     window.addEventListener('session-output-available', handleOutputAvailable as EventListener);
-    return () => window.removeEventListener('session-output-available', handleOutputAvailable as EventListener);
+    return () => {
+      window.removeEventListener('session-output-available', handleOutputAvailable as EventListener);
+      if (reloadDebounceTimer) {
+        clearTimeout(reloadDebounceTimer);
+      }
+    };
   }, [activeSession?.id, outputLoadState]);
 
   const initTerminal = useCallback((termRef: React.RefObject<HTMLDivElement | null> | undefined, instanceRef: React.MutableRefObject<Terminal | null>, fitAddonRef: React.MutableRefObject<FitAddon | null>, isScript: boolean) => {
@@ -559,7 +608,7 @@ export const useSessionView = (
         convertEol: true,
         rows: 30,
         cols: 80,
-        scrollback: 100000, // Unlimited terminal output support
+        scrollback: 10000, // Further reduced to prevent memory issues
         fastScrollModifier: 'ctrl',
         fastScrollSensitivity: 5,
         scrollSensitivity: 1,
@@ -679,14 +728,38 @@ export const useSessionView = (
     lastProcessedScriptOutputLength.current = 0;
   }, [activeSessionId]);
 
+  // Performance: Memoize terminal output join operation
+  const fullScriptOutputMemo = useMemo(() => {
+    if (!scriptOutput || scriptOutput.length === 0) return '';
+    
+    // CRITICAL PERFORMANCE FIX: Much more aggressive limit
+    const MAX_TERMINAL_OUTPUT = 300; // Drastically reduced from 1000
+    const outputToProcess = scriptOutput.length > MAX_TERMINAL_OUTPUT
+      ? scriptOutput.slice(-MAX_TERMINAL_OUTPUT)
+      : scriptOutput;
+    
+    // Build in chunks for better performance
+    if (outputToProcess.length > 50) {
+      const chunks: string[] = [];
+      const chunkSize = 25;
+      for (let i = 0; i < outputToProcess.length; i += chunkSize) {
+        const chunk = outputToProcess.slice(i, Math.min(i + chunkSize, outputToProcess.length));
+        chunks.push(chunk.join(''));
+      }
+      return chunks.join('');
+    } else {
+      return outputToProcess.join('');
+    }
+  }, [scriptOutput]);
+  
   useEffect(() => {
     if (!scriptTerminalInstance.current || !activeSession) return;
-    const existingOutput = scriptOutput.join('');
+    const existingOutput = fullScriptOutputMemo;
     if (existingOutput && lastProcessedScriptOutputLength.current === 0) {
       scriptTerminalInstance.current.write(existingOutput);
       lastProcessedScriptOutputLength.current = existingOutput.length;
     }
-  }, [activeSessionId, scriptOutput]);
+  }, [activeSessionId, fullScriptOutputMemo, activeSession]);
   
   useEffect(() => {
     if (!scriptTerminalInstance.current || viewMode !== 'terminal' || !activeSession) return;
@@ -775,7 +848,7 @@ export const useSessionView = (
 
   useEffect(() => {
     if (!scriptTerminalInstance.current || !activeSession) return;
-    const fullScriptOutput = scriptOutput.join('');
+    const fullScriptOutput = fullScriptOutputMemo;
     
     // Handle case where output was cleared (e.g., user clicked clear button)
     if (fullScriptOutput.length === 0 && lastProcessedScriptOutputLength.current > 0) {
@@ -799,7 +872,7 @@ export const useSessionView = (
         scriptTerminalInstance.current.scrollToBottom();
       }
     }
-  }, [scriptOutput, activeSessionId]);
+  }, [fullScriptOutputMemo, activeSessionId, activeSession]);
 
   useEffect(() => {
     // Listen for session deletion events
@@ -977,7 +1050,7 @@ export const useSessionView = (
   }, [activeSession?.status, activeSession?.runStartedAt, activeSessionId]);
 
   useEffect(() => {
-    setUnreadActivity({ changes: false, terminal: false, logs: false, editor: false, richOutput: false });
+    setUnreadActivity({ changes: false, terminal: false, logs: false, editor: false, richOutput: false, messages: false });
   }, [activeSessionId]);
 
 
diff --git a/frontend/src/stores/configStore.ts b/frontend/src/stores/configStore.ts
new file mode 100644
index 00000000..57d0a486
--- /dev/null
+++ b/frontend/src/stores/configStore.ts
@@ -0,0 +1,45 @@
+import { create } from 'zustand';
+import { API } from '../utils/api';
+import type { AppConfig } from '../types/config';
+
+interface ConfigStore {
+  config: AppConfig | null;
+  isLoading: boolean;
+  error: string | null;
+  fetchConfig: () => Promise<void>;
+  updateConfig: (updates: Partial<AppConfig>) => Promise<void>;
+}
+
+export const useConfigStore = create<ConfigStore>((set, get) => ({
+  config: null,
+  isLoading: false,
+  error: null,
+
+  fetchConfig: async () => {
+    set({ isLoading: true, error: null });
+    try {
+      const response = await API.config.get();
+      if (response.success && response.data) {
+        set({ config: response.data, isLoading: false });
+      } else {
+        set({ error: response.error || 'Failed to fetch config', isLoading: false });
+      }
+    } catch (error) {
+      set({ error: 'Failed to fetch config', isLoading: false });
+    }
+  },
+
+  updateConfig: async (updates: Partial<AppConfig>) => {
+    try {
+      const response = await API.config.update(updates);
+      if (response.success) {
+        // Refetch to ensure we have the latest config
+        await get().fetchConfig();
+      } else {
+        set({ error: response.error || 'Failed to update config' });
+      }
+    } catch (error) {
+      set({ error: 'Failed to update config' });
+    }
+  },
+}));
\ No newline at end of file
diff --git a/frontend/src/stores/sessionStore.ts b/frontend/src/stores/sessionStore.ts
index 55e0abec..fb8ba8df 100644
--- a/frontend/src/stores/sessionStore.ts
+++ b/frontend/src/stores/sessionStore.ts
@@ -52,6 +52,9 @@ interface SessionStore {
   setGitStatusLoadingBatch: (updates: Array<{ sessionId: string; loading: boolean }>) => void;
   updateSessionGitStatusBatch: (updates: Array<{ sessionId: string; status: GitStatus }>) => void;
   processPendingGitStatusUpdates: () => void;
+  
+  // Performance cleanup methods
+  cleanupInactiveSessions: () => void;
 }
 
 export const useSessionStore = create<SessionStore>((set, get) => ({
@@ -106,19 +109,22 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
     }
     
     // Otherwise update in regular sessions
-    const newSessions = state.sessions.map(session => {
-      if (session.id === updatedSession.id) {
+    // Performance: Only clone array if session exists
+    let newSessions = state.sessions;
+    for (let i = 0; i < state.sessions.length; i++) {
+      if (state.sessions[i].id === updatedSession.id) {
+        newSessions = state.sessions.slice();
         const updatedSessionWithOutput = {
-          ...session,
+          ...state.sessions[i],
           ...updatedSession,
-          output: session.output,
-          jsonMessages: session.jsonMessages
+          output: state.sessions[i].output,
+          jsonMessages: state.sessions[i].jsonMessages
         };
-        console.log(`[SessionStore] Updated session ${updatedSession.id} model: ${session.model} -> ${updatedSessionWithOutput.model}`);
-        return updatedSessionWithOutput;
+        console.log(`[SessionStore] Updated session ${updatedSession.id} model: ${state.sessions[i].model} -> ${updatedSessionWithOutput.model}`);
+        newSessions[i] = updatedSessionWithOutput;
+        break;
       }
-      return session;
-    });
+    }
     
     return {
       ...state,
@@ -132,10 +138,15 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
       ? null 
       : state.activeMainRepoSession;
     
+    // Clean up terminal output for deleted session to free memory
+    const newTerminalOutput = { ...state.terminalOutput };
+    delete newTerminalOutput[deletedSession.id];
+    
     return {
       sessions: state.sessions.filter(session => session.id !== deletedSession.id),
       activeSessionId: state.activeSessionId === deletedSession.id ? null : state.activeSessionId,
-      activeMainRepoSession: newActiveMainRepoSession
+      activeMainRepoSession: newActiveMainRepoSession,
+      terminalOutput: newTerminalOutput
     };
   }),
   
@@ -147,6 +158,11 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
       return;
     }
     
+    // Emit session-switched event for cleanup
+    if (get().activeSessionId !== sessionId) {
+      window.dispatchEvent(new CustomEvent('session-switched', { detail: { sessionId } }));
+    }
+    
     // First check if the session is already in our local store
     const state = get();
     const existingSession = state.sessions.find(s => s.id === sessionId);
@@ -245,19 +261,28 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
       return state;
     }
     
-    // Update sessions array
-    const sessions = [...state.sessions];
+    // Performance: Only clone sessions array once
+    const sessions = state.sessions.slice();
     const session = sessions[sessionIndex];
     
+    // CRITICAL PERFORMANCE FIX: Much stricter limits to prevent V8 array iteration issues
+    const MAX_OUTPUTS = 300; // Drastically reduced from 1000
+    const MAX_MESSAGES = 100; // Drastically reduced from 500
+    
     if (output.type === 'json') {
-      // Update jsonMessages array
-      const newJsonMessages = [...(session.jsonMessages || [])];
-      newJsonMessages.push({...output.data, timestamp: output.timestamp});
+      // Update jsonMessages array with limit
+      const currentMessages = session.jsonMessages || [];
+      const newMessage = {...output.data, timestamp: output.timestamp};
+      const newJsonMessages = currentMessages.length >= MAX_MESSAGES
+        ? [...currentMessages.slice(1), newMessage] // Remove oldest when at limit
+        : [...currentMessages, newMessage];
       sessions[sessionIndex] = { ...session, jsonMessages: newJsonMessages };
     } else {
-      // Add stdout/stderr to output array
-      const newOutput = [...(session.output || [])];
-      newOutput.push(output.data);
+      // Add stdout/stderr to output array with limit
+      const currentOutput = session.output || [];
+      const newOutput = currentOutput.length >= MAX_OUTPUTS
+        ? [...currentOutput.slice(1), output.data] // Remove oldest when at limit
+        : [...currentOutput, output.data];
       sessions[sessionIndex] = { ...session, output: newOutput };
     }
     
@@ -265,12 +290,17 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
     let updatedActiveMainRepoSession = state.activeMainRepoSession;
     if (state.activeMainRepoSession && state.activeMainRepoSession.id === output.sessionId) {
       if (output.type === 'json') {
-        const newJsonMessages = [...(state.activeMainRepoSession.jsonMessages || [])];
-        newJsonMessages.push({...output.data, timestamp: output.timestamp});
+        const currentMessages = state.activeMainRepoSession.jsonMessages || [];
+        const newMessage = {...output.data, timestamp: output.timestamp};
+        const newJsonMessages = currentMessages.length >= MAX_MESSAGES
+          ? [...currentMessages.slice(1), newMessage]
+          : [...currentMessages, newMessage];
         updatedActiveMainRepoSession = { ...state.activeMainRepoSession, jsonMessages: newJsonMessages };
       } else {
-        const newOutput = [...(state.activeMainRepoSession.output || [])];
-        newOutput.push(output.data);
+        const currentOutput = state.activeMainRepoSession.output || [];
+        const newOutput = currentOutput.length >= MAX_OUTPUTS
+          ? [...currentOutput.slice(1), output.data]
+          : [...currentOutput, output.data];
         updatedActiveMainRepoSession = { ...state.activeMainRepoSession, output: newOutput };
       }
     }
@@ -283,12 +313,15 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
   }),
   
   setSessionOutput: (sessionId, output) => set((state) => {
-    // Update sessions array
-    const updatedSessions = state.sessions.map(session => 
-      session.id === sessionId
-        ? { ...session, output: [output] }
-        : session
-    );
+    // Performance: Only clone array if session exists
+    let updatedSessions = state.sessions;
+    for (let i = 0; i < state.sessions.length; i++) {
+      if (state.sessions[i].id === sessionId) {
+        updatedSessions = state.sessions.slice();
+        updatedSessions[i] = { ...state.sessions[i], output: [output] };
+        break;
+      }
+    }
     
     // Update activeMainRepoSession if it matches
     let updatedActiveMainRepoSession = state.activeMainRepoSession;
@@ -306,32 +339,76 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
   setSessionOutputs: (sessionId, outputs) => set((state) => {
     console.log(`[SessionStore] Setting ${outputs.length} outputs for session ${sessionId}`);
     
-    // Separate outputs and JSON messages
+    // PERFORMANCE: Process arrays in chunks to avoid V8 optimization bailouts
     const stdOutputs: string[] = [];
     const jsonMessages: any[] = [];
     
-    outputs.forEach(output => {
-      if (output.type === 'json') {
-        jsonMessages.push({ ...output.data, timestamp: output.timestamp });
-      } else if (output.type === 'stdout' || output.type === 'stderr') {
-        stdOutputs.push(output.data);
+    // Process in smaller batches to avoid long-running loops that trigger V8 deoptimization
+    const BATCH_SIZE = 100;
+    for (let batch = 0; batch < outputs.length; batch += BATCH_SIZE) {
+      const batchEnd = Math.min(batch + BATCH_SIZE, outputs.length);
+      
+      for (let i = batch; i < batchEnd; i++) {
+        const output = outputs[i];
+        if (output.type === 'json') {
+          jsonMessages.push({ ...output.data, timestamp: output.timestamp });
+        } else if (output.type === 'stdout' || output.type === 'stderr') {
+          stdOutputs.push(output.data);
+        }
       }
-    });
+      
+      // Allow event loop to breathe between batches for very large arrays
+      if (batchEnd < outputs.length && outputs.length > 500) {
+        // This is a synchronous operation, so we can't truly yield,
+        // but we can at least break up the work
+        if (stdOutputs.length > 300 || jsonMessages.length > 100) {
+          // Stop early if we already have enough data
+          console.warn(`[SessionStore] Stopping early at ${batchEnd} of ${outputs.length} outputs due to limits`);
+          break;
+        }
+      }
+    }
+    
+    // CRITICAL PERFORMANCE FIX: Even more aggressive limits to prevent V8 optimization failures
+    // V8 was getting stuck in recursive array iterations with large arrays
+    const MAX_STORED_OUTPUTS = 300; // Further reduced to prevent CPU spikes
+    const MAX_STORED_MESSAGES = 100; // Further reduced to prevent memory pressure
     
+    const trimmedOutputs = stdOutputs.length > MAX_STORED_OUTPUTS 
+      ? stdOutputs.slice(-MAX_STORED_OUTPUTS) 
+      : stdOutputs;
     
-    // Always update the sessions array
-    const updatedSessions = state.sessions.map(session => {
-      if (session.id === sessionId) {
-        return { ...session, output: stdOutputs, jsonMessages };
+    const trimmedMessages = jsonMessages.length > MAX_STORED_MESSAGES
+      ? jsonMessages.slice(-MAX_STORED_MESSAGES)
+      : jsonMessages;
+    
+    if (stdOutputs.length > MAX_STORED_OUTPUTS) {
+      console.warn(`[SessionStore] Trimmed outputs from ${stdOutputs.length} to ${MAX_STORED_OUTPUTS} for performance`);
+    }
+    
+    // Performance optimization: Only create new array if session is found
+    let updatedSessions = state.sessions;
+    let sessionFound = false;
+    
+    // Use a for loop for better performance with large arrays
+    for (let i = 0; i < state.sessions.length; i++) {
+      if (state.sessions[i].id === sessionId) {
+        const newSession = { ...state.sessions[i], output: trimmedOutputs, jsonMessages: trimmedMessages };
+        // Only create new array when we actually find the session to update
+        if (!sessionFound) {
+          updatedSessions = state.sessions.slice(); // Shallow copy is more efficient than spread
+          sessionFound = true;
+        }
+        updatedSessions[i] = newSession;
+        break;
       }
-      return session;
-    });
+    }
     
     // Also update activeMainRepoSession if it matches
     let updatedActiveMainRepoSession = state.activeMainRepoSession;
     if (state.activeMainRepoSession && state.activeMainRepoSession.id === sessionId) {
       console.log(`[SessionStore] Also updating activeMainRepoSession`);
-      updatedActiveMainRepoSession = { ...state.activeMainRepoSession, output: stdOutputs, jsonMessages };
+      updatedActiveMainRepoSession = { ...state.activeMainRepoSession, output: trimmedOutputs, jsonMessages: trimmedMessages };
     }
     
     return {
@@ -342,12 +419,15 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
   }),
   
   clearSessionOutput: (sessionId) => set((state) => {
-    // Update sessions array
-    const updatedSessions = state.sessions.map(session => 
-      session.id === sessionId
-        ? { ...session, output: [], jsonMessages: [] }
-        : session
-    );
+    // Performance: Only clone array if session exists
+    let updatedSessions = state.sessions;
+    for (let i = 0; i < state.sessions.length; i++) {
+      if (state.sessions[i].id === sessionId) {
+        updatedSessions = state.sessions.slice();
+        updatedSessions[i] = { ...state.sessions[i], output: [], jsonMessages: [] };
+        break;
+      }
+    }
     
     // Update activeMainRepoSession if it matches
     let updatedActiveMainRepoSession = state.activeMainRepoSession;
@@ -377,15 +457,29 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
     }
   },
   
-  addTerminalOutput: (output) => set((state) => ({
-    terminalOutput: {
-      ...state.terminalOutput,
-      [output.sessionId]: [
-        ...(state.terminalOutput[output.sessionId] || []),
-        output.data
-      ]
+  addTerminalOutput: (output) => set((state) => {
+    // Performance optimization: Much stricter limit to prevent memory issues
+    const MAX_TERMINAL_LINES = 1000; // Drastically reduced from 5000
+    
+    const existingOutput = state.terminalOutput[output.sessionId] || [];
+    
+    // If already at max, remove oldest before adding new
+    let updatedOutput: string[];
+    if (existingOutput.length >= MAX_TERMINAL_LINES) {
+      // Shift array instead of creating new one for better performance
+      updatedOutput = existingOutput.slice(-(MAX_TERMINAL_LINES - 1));
+      updatedOutput.push(output.data);
+    } else {
+      updatedOutput = [...existingOutput, output.data];
     }
-  })),
+    
+    return {
+      terminalOutput: {
+        ...state.terminalOutput,
+        [output.sessionId]: updatedOutput
+      }
+    };
+  }),
 
   clearTerminalOutput: (sessionId: string) => set((state) => ({
     terminalOutput: {
@@ -515,11 +609,20 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
         newLoadingSet.delete(sessionId);
       });
       
-      // Update sessions in one pass
-      const sessions = state.sessions.map(session => {
-        const newStatus = statusUpdates.get(session.id);
-        return newStatus ? { ...session, gitStatus: newStatus } : session;
-      });
+      // Performance: Only clone sessions array if updates affect sessions
+      let sessions = state.sessions;
+      let sessionsModified = false;
+      
+      for (let i = 0; i < state.sessions.length; i++) {
+        const newStatus = statusUpdates.get(state.sessions[i].id);
+        if (newStatus) {
+          if (!sessionsModified) {
+            sessions = state.sessions.slice();
+            sessionsModified = true;
+          }
+          sessions[i] = { ...state.sessions[i], gitStatus: newStatus };
+        }
+      }
       
       // Update main repo session if needed
       let activeMainRepoSession = state.activeMainRepoSession;
@@ -560,5 +663,51 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
       get().updateSessionGitStatusBatch(statusUpdates);
       state.pendingGitStatusUpdates.clear();
     }
-  }
+  },
+  
+  cleanupInactiveSessions: () => set((state) => {
+    // Performance: Clear output data for inactive sessions to free memory
+    const activeId = state.activeSessionId;
+    const MAX_INACTIVE_OUTPUTS = 50; // Even less for inactive sessions
+    
+    // Create new sessions array with trimmed outputs for inactive sessions
+    const cleanedSessions = state.sessions.map(session => {
+      if (session.id === activeId) {
+        // Don't touch active session
+        return session;
+      }
+      
+      // For inactive sessions, aggressively trim outputs
+      if (session.output && session.output.length > MAX_INACTIVE_OUTPUTS) {
+        return {
+          ...session,
+          output: session.output.slice(-MAX_INACTIVE_OUTPUTS),
+          jsonMessages: session.jsonMessages ? session.jsonMessages.slice(-25) : []
+        };
+      }
+      
+      return session;
+    });
+    
+    // Also cleanup terminal outputs for inactive sessions
+    const cleanedTerminalOutput: Record<string, string[]> = {};
+    Object.keys(state.terminalOutput).forEach(sessionId => {
+      if (sessionId === activeId) {
+        // Keep active session's terminal output
+        cleanedTerminalOutput[sessionId] = state.terminalOutput[sessionId];
+      } else if (state.terminalOutput[sessionId].length > 50) {
+        // Trim inactive session's terminal output more aggressively
+        cleanedTerminalOutput[sessionId] = state.terminalOutput[sessionId].slice(-50);
+      } else {
+        cleanedTerminalOutput[sessionId] = state.terminalOutput[sessionId];
+      }
+    });
+    
+    console.log('[SessionStore] Cleaned up inactive session data');
+    
+    return {
+      sessions: cleanedSessions,
+      terminalOutput: cleanedTerminalOutput
+    };
+  })
 }));
\ No newline at end of file
diff --git a/frontend/src/types/config.ts b/frontend/src/types/config.ts
index d4516128..b013beed 100644
--- a/frontend/src/types/config.ts
+++ b/frontend/src/types/config.ts
@@ -17,4 +17,5 @@ export interface AppConfig {
     notifyOnWaiting: boolean;
     notifyOnComplete: boolean;
   };
+  devMode?: boolean;
 }
\ No newline at end of file
diff --git a/frontend/src/types/diff.ts b/frontend/src/types/diff.ts
index 90dec1ea..b1c95742 100644
--- a/frontend/src/types/diff.ts
+++ b/frontend/src/types/diff.ts
@@ -11,6 +11,7 @@ export interface ExecutionDiff {
   stats_files_changed: number;
   before_commit_hash?: string;
   after_commit_hash?: string;
+  commit_message?: string;
   timestamp: string;
 }
 
diff --git a/frontend/src/types/electron.d.ts b/frontend/src/types/electron.d.ts
index 04d71189..1f130552 100644
--- a/frontend/src/types/electron.d.ts
+++ b/frontend/src/types/electron.d.ts
@@ -41,7 +41,7 @@ interface ElectronAPI {
     delete: (sessionId: string) => Promise<IPCResponse>;
     sendInput: (sessionId: string, input: string) => Promise<IPCResponse>;
     continue: (sessionId: string, prompt?: string, model?: string) => Promise<IPCResponse>;
-    getOutput: (sessionId: string) => Promise<IPCResponse>;
+    getOutput: (sessionId: string, limit?: number) => Promise<IPCResponse>;
     getJsonMessages: (sessionId: string) => Promise<IPCResponse>;
     getConversation: (sessionId: string) => Promise<IPCResponse>;
     getConversationMessages: (sessionId: string) => Promise<IPCResponse>;
diff --git a/frontend/src/utils/api.ts b/frontend/src/utils/api.ts
index a8d62de1..8905c175 100644
--- a/frontend/src/utils/api.ts
+++ b/frontend/src/utils/api.ts
@@ -58,9 +58,9 @@ export class API {
       return window.electronAPI.sessions.continue(sessionId, prompt, model);
     },
 
-    async getOutput(sessionId: string) {
+    async getOutput(sessionId: string, limit?: number) {
       if (!isElectron()) throw new Error('Electron API not available');
-      return window.electronAPI.sessions.getOutput(sessionId);
+      return window.electronAPI.sessions.getOutput(sessionId, limit);
     },
     async getJsonMessages(sessionId: string) {
       if (!isElectron()) throw new Error('Electron API not available');
diff --git a/main/package.json b/main/package.json
index af21eeb9..2128fc16 100644
--- a/main/package.json
+++ b/main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "main",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "Electron main process for Claude Code Commander",
   "main": "dist/main/src/index.js",
   "type": "commonjs",
@@ -16,8 +16,8 @@
     "test:coverage": "vitest --coverage"
   },
   "dependencies": {
-    "@anthropic-ai/claude-code": "^1.0.33",
-    "@anthropic-ai/sdk": "^0.53.0",
+    "@anthropic-ai/claude-code": "^1.0.86",
+    "@anthropic-ai/sdk": "^0.60.0",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "better-sqlite3": "^11.7.0",
diff --git a/main/src/database/database.ts b/main/src/database/database.ts
index c863cc8d..89908257 100644
--- a/main/src/database/database.ts
+++ b/main/src/database/database.ts
@@ -632,7 +632,7 @@ export class DatabaseService {
     const hasModelColumn = sessionTableInfoModel.some((col: any) => col.name === 'model');
     
     if (!hasModelColumn) {
-      this.db.prepare("ALTER TABLE sessions ADD COLUMN model TEXT DEFAULT 'claude-sonnet-4-20250514'").run();
+      this.db.prepare("ALTER TABLE sessions ADD COLUMN model TEXT DEFAULT 'sonnet'").run();
       console.log('[Database] Added model column to sessions table');
     }
 
@@ -689,7 +689,7 @@ export class DatabaseService {
     const hasLastUsedModelColumn = projectsTableInfoModel.some((col: any) => col.name === 'lastUsedModel');
     
     if (!hasLastUsedModelColumn) {
-      this.db.prepare("ALTER TABLE projects ADD COLUMN lastUsedModel TEXT DEFAULT 'claude-sonnet-4-20250514'").run();
+      this.db.prepare("ALTER TABLE projects ADD COLUMN lastUsedModel TEXT DEFAULT 'sonnet'").run();
       console.log('[Database] Added lastUsedModel column to projects table');
     }
 
@@ -1174,7 +1174,7 @@ export class DatabaseService {
     this.db.prepare(`
       INSERT INTO sessions (id, name, initial_prompt, worktree_name, worktree_path, status, project_id, folder_id, permission_mode, is_main_repo, display_order, auto_commit, model, base_commit, base_branch, commit_mode, commit_mode_settings)
       VALUES (?, ?, ?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(data.id, data.name, data.initial_prompt, data.worktree_name, data.worktree_path, data.project_id, data.folder_id || null, data.permission_mode || 'ignore', data.is_main_repo ? 1 : 0, displayOrder, data.auto_commit !== undefined ? (data.auto_commit ? 1 : 0) : 1, data.model || 'claude-sonnet-4-20250514', data.base_commit || null, data.base_branch || null, data.commit_mode || null, data.commit_mode_settings || null);
+    `).run(data.id, data.name, data.initial_prompt, data.worktree_name, data.worktree_path, data.project_id, data.folder_id || null, data.permission_mode || 'ignore', data.is_main_repo ? 1 : 0, displayOrder, data.auto_commit !== undefined ? (data.auto_commit ? 1 : 0) : 1, data.model || 'sonnet', data.base_commit || null, data.base_branch || null, data.commit_mode || null, data.commit_mode_settings || null);
     
     const session = this.getSession(data.id);
     if (!session) {
diff --git a/main/src/events.ts b/main/src/events.ts
index 54c5c60d..143f7fb9 100644
--- a/main/src/events.ts
+++ b/main/src/events.ts
@@ -12,7 +12,8 @@ export function setupEventListeners(services: AppServices, getMainWindow: () =>
     runCommandManager,
     gitDiffManager,
     gitStatusManager,
-    worktreeManager
+    worktreeManager,
+    archiveProgressManager
   } = services;
 
   // Listen to sessionManager events and broadcast to renderer
@@ -490,4 +491,18 @@ export function setupEventListeners(services: AppServices, getMainWindow: () =>
       }
     }
   });
+
+  // Listen for archive progress events
+  if (archiveProgressManager) {
+    archiveProgressManager.on('archive-progress', (progress) => {
+      const mw = getMainWindow();
+      if (mw && !mw.isDestroyed()) {
+        try {
+          mw.webContents.send('archive:progress', progress);
+        } catch (error) {
+          console.error('[Main] Failed to send archive:progress event:', error);
+        }
+      }
+    });
+  }
 } 
\ No newline at end of file
diff --git a/main/src/index.ts b/main/src/index.ts
index 2ca663ce..8f0411a5 100644
--- a/main/src/index.ts
+++ b/main/src/index.ts
@@ -9,7 +9,7 @@ if (process.platform === 'linux') {
 }
 
 // Now import the rest of electron
-import { BrowserWindow, ipcMain, shell } from 'electron';
+import { BrowserWindow, ipcMain, shell, dialog } from 'electron';
 import * as path from 'path';
 import { TaskQueue } from './services/taskQueue';
 import { SessionManager } from './services/sessionManager';
@@ -26,6 +26,7 @@ import { VersionChecker } from './services/versionChecker';
 import { StravuAuthManager } from './services/stravuAuthManager';
 import { StravuNotebookService } from './services/stravuNotebookService';
 import { Logger } from './utils/logger';
+import { ArchiveProgressManager } from './services/archiveProgressManager';
 import { setCrystalDirectory } from './utils/crystalDirectory';
 import { getCurrentWorktreeName } from './utils/worktreeUtils';
 import { registerIpcHandlers } from './ipc';
@@ -79,6 +80,7 @@ let permissionIpcServer: PermissionIpcServer | null;
 let versionChecker: VersionChecker;
 let stravuAuthManager: StravuAuthManager;
 let stravuNotebookService: StravuNotebookService;
+let archiveProgressManager: ArchiveProgressManager;
 
 // Store original console methods before overriding
 // These must be captured immediately when the module loads
@@ -407,6 +409,8 @@ async function initializeServices() {
 
   sessionManager = new SessionManager(databaseService);
   sessionManager.initializeFromDatabase();
+  
+  archiveProgressManager = new ArchiveProgressManager();
 
   // Start permission IPC server
   console.log('[Main] Initializing Permission IPC server...');
@@ -474,6 +478,7 @@ async function initializeServices() {
     taskQueue,
     getMainWindow: () => mainWindow,
     logger,
+    archiveProgressManager,
   };
 
   // Set up IPC event listeners for real-time updates
@@ -537,7 +542,42 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.on('before-quit', async () => {
+app.on('before-quit', async (event) => {
+  // Check if there are active archive tasks
+  if (archiveProgressManager && archiveProgressManager.hasActiveTasks()) {
+    event.preventDefault();
+    
+    console.log('[Main] Archive tasks in progress, showing warning dialog...');
+    const activeCount = archiveProgressManager.getActiveTaskCount();
+    const choice = mainWindow 
+      ? dialog.showMessageBoxSync(mainWindow, {
+          type: 'warning',
+          title: 'Archive Tasks In Progress',
+          message: `Crystal is removing ${activeCount} worktree${activeCount > 1 ? 's' : ''} in the background.`,
+          detail: 'Git worktree removal can take time, especially for large repositories with many files. If you quit now, the worktree directories may not be fully cleaned up and you may need to remove them manually.\n\nDo you want to quit anyway?',
+          buttons: ['Wait', 'Quit Anyway'],
+          defaultId: 0,
+          cancelId: 0
+        })
+      : dialog.showMessageBoxSync({
+          type: 'warning',
+          title: 'Archive Tasks In Progress',
+          message: `Crystal is removing ${activeCount} worktree${activeCount > 1 ? 's' : ''} in the background.`,
+          detail: 'Git worktree removal can take time, especially for large repositories with many files. If you quit now, the worktree directories may not be fully cleaned up and you may need to remove them manually.\n\nDo you want to quit anyway?',
+          buttons: ['Wait', 'Quit Anyway'],
+          defaultId: 0,
+          cancelId: 0
+        });
+    
+    if (choice === 1) {
+      // User chose to quit anyway
+      archiveProgressManager.clearAll();
+      app.exit(0);
+    }
+    // Otherwise, the quit is cancelled and app continues
+    return;
+  }
+  
   // Cleanup all sessions and terminate child processes
   if (sessionManager) {
     console.log('[Main] Cleaning up sessions and terminating child processes...');
diff --git a/main/src/ipc/file.ts b/main/src/ipc/file.ts
index 5e3435b0..01b4e153 100644
--- a/main/src/ipc/file.ts
+++ b/main/src/ipc/file.ts
@@ -563,11 +563,58 @@ EOF
         return { success: true, files: [] };
       }
 
+      // Get list of tracked files (not gitignored) using git
+      const { exec } = require('child_process');
+      const { promisify } = require('util');
+      const execAsync = promisify(exec);
+      
+      let gitTrackedFiles = new Set<string>();
+      let isGitRepo = true;
+      try {
+        // Get list of all tracked files in the repository
+        const { stdout: trackedStdout } = await execAsync('git ls-files', {
+          cwd: searchDirectory,
+          maxBuffer: 10 * 1024 * 1024 // 10MB buffer
+        });
+        
+        if (trackedStdout) {
+          trackedStdout.split('\n').forEach((file: string) => {
+            if (file.trim()) {
+              gitTrackedFiles.add(file.trim());
+            }
+          });
+        }
+        
+        // Also get untracked files that are not ignored
+        const { stdout: untrackedStdout } = await execAsync('git ls-files --others --exclude-standard', {
+          cwd: searchDirectory,
+          maxBuffer: 10 * 1024 * 1024 // 10MB buffer
+        });
+        
+        if (untrackedStdout) {
+          untrackedStdout.split('\n').forEach((file: string) => {
+            if (file.trim()) {
+              gitTrackedFiles.add(file.trim());
+            }
+          });
+        }
+      } catch (err) {
+        // Git command failed, likely not a git repo
+        isGitRepo = false;
+        console.log('Could not get git tracked files:', err);
+      }
+
       // Use glob to find matching files
       const globPattern = filePattern ? `**/*${filePattern}*` : '**/*';
       const files = await glob(globPattern, {
         cwd: searchDir,
-        ignore: ['**/node_modules/**', '**/.git/**', '**/dist/**', '**/build/**'],
+        ignore: [
+          '**/node_modules/**', 
+          '**/.git/**', 
+          '**/dist/**', 
+          '**/build/**',
+          '**/worktrees/**' // Exclude worktree folders
+        ],
         nodir: false,
         dot: true,
         absolute: false,
@@ -580,6 +627,24 @@ EOF
           const fullPath = path.join(searchDir, file);
           const relativePath = path.relative(searchDirectory, fullPath);
           
+          // Skip worktree directories
+          if (relativePath.includes('worktrees/') || relativePath.startsWith('worktrees/')) {
+            return null;
+          }
+          
+          // If we're in a git repo, only include tracked/untracked-but-not-ignored files
+          if (isGitRepo && gitTrackedFiles.size > 0 && !gitTrackedFiles.has(relativePath)) {
+            // Check if it's a directory - directories might not be in git ls-files
+            try {
+              const stats = await fs.stat(fullPath);
+              if (!stats.isDirectory()) {
+                return null; // Skip non-directory files that aren't tracked
+              }
+            } catch {
+              return null;
+            }
+          }
+          
           try {
             const stats = await fs.stat(fullPath);
             return {
diff --git a/main/src/ipc/git.ts b/main/src/ipc/git.ts
index 6d97dc40..1e33f847 100644
--- a/main/src/ipc/git.ts
+++ b/main/src/ipc/git.ts
@@ -1068,7 +1068,7 @@ export function registerGitHandlers(ipcMain: IpcMain, services: AppServices): vo
     }
   });
 
-  ipcMain.handle('sessions:get-git-status', async (_event, sessionId: string) => {
+  ipcMain.handle('sessions:get-git-status', async (_event, sessionId: string, nonBlocking?: boolean) => {
     try {
       const session = await sessionManager.getSession(sessionId);
       if (!session || !session.worktreePath) {
@@ -1079,11 +1079,28 @@ export function registerGitHandlers(ipcMain: IpcMain, services: AppServices): vo
         return { success: false, error: 'Cannot get git status for archived session' };
       }
 
-      // Use refreshSessionGitStatus with user-initiated flag
-      // This is called when user clicks on a session, so show loading state
-      const gitStatus = await gitStatusManager.refreshSessionGitStatus(sessionId, true);
-
-      return { success: true, gitStatus };
+      // If nonBlocking is true, start refresh in background and return immediately
+      if (nonBlocking) {
+        // Start the refresh in background
+        setImmediate(() => {
+          gitStatusManager.refreshSessionGitStatus(sessionId, true).catch(error => {
+            console.error(`[Git] Background git status refresh failed for session ${sessionId}:`, error);
+          });
+        });
+        
+        // Return the cached status if available, or indicate background refresh started
+        const cachedStatus = await gitStatusManager.getGitStatus(sessionId);
+        return { 
+          success: true, 
+          gitStatus: cachedStatus,
+          backgroundRefresh: true 
+        };
+      } else {
+        // Use refreshSessionGitStatus with user-initiated flag
+        // This is called when user clicks on a session, so show loading state
+        const gitStatus = await gitStatusManager.refreshSessionGitStatus(sessionId, true);
+        return { success: true, gitStatus };
+      }
     } catch (error) {
       console.error('Error getting git status:', error);
       return { success: false, error: (error as Error).message };
diff --git a/main/src/ipc/project.ts b/main/src/ipc/project.ts
index d672990d..f5dfd0ea 100644
--- a/main/src/ipc/project.ts
+++ b/main/src/ipc/project.ts
@@ -283,25 +283,35 @@ export function registerProjectHandlers(ipcMain: IpcMain, services: AppServices)
       // Use gitStatusManager from services
       const { gitStatusManager } = services;
       
-      // Refresh git status for each session (parallel for better performance)
-      const refreshPromises = projectSessions
-        .filter(session => session.worktreePath)
-        .map(session => 
-          gitStatusManager.refreshSessionGitStatus(session.id, true) // true = user initiated
-            .catch(error => {
-              console.error(`[Main] Failed to refresh git status for session ${session.id}:`, error);
-              return null;
-            })
-        );
+      // Count the sessions that will be refreshed
+      const sessionsToRefresh = projectSessions.filter(session => session.worktreePath);
+      const sessionCount = sessionsToRefresh.length;
       
-      const results = await Promise.allSettled(refreshPromises);
-      const refreshedCount = results.filter(result => result.status === 'fulfilled').length;
+      // Start the refresh in background (non-blocking)
+      // Don't await this - let it run asynchronously
+      setImmediate(() => {
+        const refreshPromises = sessionsToRefresh
+          .map(session => 
+            gitStatusManager.refreshSessionGitStatus(session.id, true) // true = user initiated
+              .catch(error => {
+                console.error(`[Main] Failed to refresh git status for session ${session.id}:`, error);
+                return null;
+              })
+          );
+        
+        // Log when all refreshes complete (in background)
+        Promise.allSettled(refreshPromises).then(results => {
+          const refreshedCount = results.filter(result => result.status === 'fulfilled').length;
+          console.log(`[Main] Background refresh completed: ${refreshedCount}/${sessionCount} sessions`);
+        });
+      });
       
-      console.log(`[Main] Refreshed git status for ${refreshedCount} sessions`);
+      // Return immediately with the count of sessions that will be refreshed
+      console.log(`[Main] Starting background refresh for ${sessionCount} sessions`);
       
-      return { success: true, data: { count: refreshedCount } };
+      return { success: true, data: { count: sessionCount, backgroundRefresh: true } };
     } catch (error) {
-      console.error('[Main] Failed to refresh project git status:', error);
+      console.error('[Main] Failed to start project git status refresh:', error);
       return { success: false, error: 'Failed to refresh git status' };
     }
   });
diff --git a/main/src/ipc/session.ts b/main/src/ipc/session.ts
index a8f00e4d..d709631e 100644
--- a/main/src/ipc/session.ts
+++ b/main/src/ipc/session.ts
@@ -15,7 +15,8 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
     worktreeManager,
     claudeCodeManager,
     worktreeNameGenerator,
-    gitStatusManager
+    gitStatusManager,
+    archiveProgressManager
   } = services;
 
   // Session management handlers
@@ -198,47 +199,10 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
       // Add a message to session output about archiving
       const timestamp = new Date().toLocaleTimeString();
       let archiveMessage = `\r\n\x1b[36m[${timestamp}]\x1b[0m \x1b[1m\x1b[44m\x1b[37m 📦 ARCHIVING SESSION \x1b[0m\r\n`;
+      archiveMessage += `\x1b[90mSession will be archived and removed from the active sessions list.\x1b[0m\r\n`;
 
-      // Clean up the worktree if session has one (but not for main repo sessions)
-      if (dbSession.worktree_name && dbSession.project_id && !dbSession.is_main_repo) {
-        const project = databaseService.getProject(dbSession.project_id);
-        if (project) {
-          try {
-            console.log(`[Main] Removing worktree ${dbSession.worktree_name} for session ${sessionId}`);
-            archiveMessage += `\x1b[90mRemoving git worktree: ${dbSession.worktree_name}\x1b[0m\r\n`;
-
-            await worktreeManager.removeWorktree(project.path, dbSession.worktree_name, project.worktree_folder);
-
-            console.log(`[Main] Successfully removed worktree ${dbSession.worktree_name}`);
-            archiveMessage += `\x1b[32m✓ Worktree removed successfully\x1b[0m\r\n`;
-          } catch (worktreeError) {
-            // Log the error but don't fail the session deletion
-            console.error(`[Main] Failed to remove worktree ${dbSession.worktree_name}:`, worktreeError);
-            archiveMessage += `\x1b[33m⚠ Failed to remove worktree (manual cleanup may be needed)\x1b[0m\r\n`;
-            // Continue with session deletion even if worktree removal fails
-          }
-        }
-      }
-
-      // Clean up session artifacts (images)
-      const artifactsDir = getCrystalSubdirectory('artifacts', sessionId);
-      if (existsSync(artifactsDir)) {
-        try {
-          console.log(`[Main] Removing artifacts directory for session ${sessionId}`);
-          archiveMessage += `\x1b[90mRemoving session artifacts...\x1b[0m\r\n`;
-          
-          await fs.rm(artifactsDir, { recursive: true, force: true });
-          
-          console.log(`[Main] Successfully removed artifacts for session ${sessionId}`);
-          archiveMessage += `\x1b[32m✓ Artifacts removed successfully\x1b[0m\r\n`;
-        } catch (artifactsError) {
-          console.error(`[Main] Failed to remove artifacts for session ${sessionId}:`, artifactsError);
-          archiveMessage += `\x1b[33m⚠ Failed to remove artifacts (manual cleanup may be needed)\x1b[0m\r\n`;
-          // Continue with session deletion even if artifacts removal fails
-        }
-      }
-
-      archiveMessage += `\x1b[90mSession archived. It will no longer appear in the active sessions list.\x1b[0m\r\n\r\n`;
+      // Archive the session immediately to provide fast feedback to the user
+      await sessionManager.archiveSession(sessionId);
 
       // Add the archive message to session output
       sessionManager.addSessionOutput(sessionId, {
@@ -247,8 +211,94 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
         timestamp: new Date()
       });
 
-      // Archive the session
-      await sessionManager.archiveSession(sessionId);
+      // Create cleanup callback for background operations
+      const cleanupCallback = async () => {
+        let cleanupMessage = '';
+        
+        // Clean up the worktree if session has one (but not for main repo sessions)
+        if (dbSession.worktree_name && dbSession.project_id && !dbSession.is_main_repo) {
+          const project = databaseService.getProject(dbSession.project_id);
+          if (project) {
+            try {
+              console.log(`[Main] Removing worktree ${dbSession.worktree_name} for session ${sessionId} (queued)`);
+              
+              // Update progress: removing worktree
+              if (archiveProgressManager) {
+                archiveProgressManager.updateTaskStatus(sessionId, 'removing-worktree');
+              }
+              
+              await worktreeManager.removeWorktree(project.path, dbSession.worktree_name, project.worktree_folder);
+              
+              console.log(`[Main] Successfully removed worktree ${dbSession.worktree_name}`);
+              cleanupMessage += `\x1b[32m✓ Worktree removed successfully\x1b[0m\r\n`;
+            } catch (worktreeError) {
+              // Log the error but don't fail
+              console.error(`[Main] Failed to remove worktree ${dbSession.worktree_name}:`, worktreeError);
+              cleanupMessage += `\x1b[33m⚠ Failed to remove worktree (manual cleanup may be needed)\x1b[0m\r\n`;
+              
+              // Update progress: failed
+              if (archiveProgressManager) {
+                archiveProgressManager.updateTaskStatus(sessionId, 'failed', 'Failed to remove worktree');
+              }
+            }
+          }
+        }
+
+        // Clean up session artifacts (images)
+        const artifactsDir = getCrystalSubdirectory('artifacts', sessionId);
+        if (existsSync(artifactsDir)) {
+          try {
+            console.log(`[Main] Removing artifacts directory for session ${sessionId} (queued)`);
+            
+            // Update progress: cleaning artifacts
+            if (archiveProgressManager) {
+              archiveProgressManager.updateTaskStatus(sessionId, 'cleaning-artifacts');
+            }
+            
+            await fs.rm(artifactsDir, { recursive: true, force: true });
+            
+            console.log(`[Main] Successfully removed artifacts for session ${sessionId}`);
+            cleanupMessage += `\x1b[32m✓ Artifacts removed successfully\x1b[0m\r\n`;
+          } catch (artifactsError) {
+            console.error(`[Main] Failed to remove artifacts for session ${sessionId}:`, artifactsError);
+            cleanupMessage += `\x1b[33m⚠ Failed to remove artifacts (manual cleanup may be needed)\x1b[0m\r\n`;
+          }
+        }
+
+        // If there were any cleanup messages, add them to the session output
+        if (cleanupMessage) {
+          sessionManager.addSessionOutput(sessionId, {
+            type: 'stdout',
+            data: cleanupMessage,
+            timestamp: new Date()
+          });
+        }
+      };
+
+      // Queue the cleanup task if we have worktree cleanup to do
+      if (dbSession.worktree_name && dbSession.project_id && !dbSession.is_main_repo) {
+        const project = databaseService.getProject(dbSession.project_id);
+        console.log('[Main] Archive progress tracking:', {
+          hasWorktree: !!dbSession.worktree_name,
+          projectId: dbSession.project_id,
+          isMainRepo: dbSession.is_main_repo,
+          project: !!project,
+          archiveProgressManager: !!archiveProgressManager
+        });
+        if (project && archiveProgressManager) {
+          console.log('[Main] Adding archive task to queue for session:', sessionId);
+          archiveProgressManager.addTask(
+            sessionId,
+            dbSession.name,
+            dbSession.worktree_name,
+            project.name,
+            cleanupCallback
+          );
+        }
+      } else {
+        // No worktree cleanup needed, just run artifact cleanup immediately
+        setImmediate(() => cleanupCallback());
+      }
 
       return { success: true };
     } catch (error) {
@@ -363,6 +413,12 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
         throw new Error('Session not found');
       }
 
+      // Check if Claude is already running for this session to prevent duplicate starts
+      if (claudeCodeManager.isSessionRunning(sessionId)) {
+        console.log(`[IPC] Session ${sessionId} is already running, preventing duplicate continue`);
+        return { success: false, error: 'Session is already processing a request' };
+      }
+
       // Get conversation history
       const conversationHistory = sessionManager.getConversationMessages(sessionId);
 
@@ -427,7 +483,7 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
 
         // Start Claude Code with the user's prompt
         // Use the provided model if specified, otherwise fall back to the session's original model
-        const modelToUse = model || dbSession?.model || 'claude-sonnet-4-20250514';
+        const modelToUse = model || dbSession?.model || 'sonnet';
         await claudeCodeManager.startSession(sessionId, session.worktreePath, continuePrompt, dbSession?.permission_mode, modelToUse);
       } else {
         // Normal continue for existing sessions
@@ -437,7 +493,7 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
 
         // Continue the session with the existing conversation
         // Use the provided model if specified, otherwise fall back to the session's original model
-        const modelToUse = model || dbSession?.model || 'claude-sonnet-4-20250514';
+        const modelToUse = model || dbSession?.model || 'sonnet';
         
         console.log(`[IPC] Continue session ${sessionId} - provided model: ${model}, current model: ${dbSession?.model}, modelToUse: ${modelToUse}`);
         
@@ -452,10 +508,14 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
     }
   });
 
-  ipcMain.handle('sessions:get-output', async (_event, sessionId: string) => {
+  ipcMain.handle('sessions:get-output', async (_event, sessionId: string, limit?: number) => {
     try {
-      console.log(`[IPC] sessions:get-output called for session: ${sessionId}`);
-      const outputs = await sessionManager.getSessionOutputs(sessionId);
+      // Performance optimization: Default to loading only recent outputs
+      const DEFAULT_OUTPUT_LIMIT = 5000;
+      const outputLimit = limit || DEFAULT_OUTPUT_LIMIT;
+      
+      console.log(`[IPC] sessions:get-output called for session: ${sessionId} with limit: ${outputLimit}`);
+      const outputs = await sessionManager.getSessionOutputs(sessionId, outputLimit);
       console.log(`[IPC] Retrieved ${outputs.length} outputs for session ${sessionId}`);
       
       // Refresh git status when session is loaded/viewed
@@ -466,26 +526,35 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
         });
       }
 
-      // Transform JSON messages to formatted stdout on the fly
+      // Performance optimization: Process outputs in batches to avoid blocking
       const { formatJsonForOutputEnhanced } = await import('../utils/toolFormatter');
-      const transformedOutputs = outputs.map(output => {
-        if (output.type === 'json') {
-          // Generate formatted output from JSON
-          const outputText = formatJsonForOutputEnhanced(output.data);
-          if (outputText) {
-            // Return as stdout for the Output view
-            return {
-              ...output,
-              type: 'stdout' as const,
-              data: outputText
-            };
+      const BATCH_SIZE = 100;
+      const transformedOutputs = [];
+      
+      for (let i = 0; i < outputs.length; i += BATCH_SIZE) {
+        const batch = outputs.slice(i, Math.min(i + BATCH_SIZE, outputs.length));
+        
+        const transformedBatch = batch.map(output => {
+          if (output.type === 'json') {
+            // Generate formatted output from JSON
+            const outputText = formatJsonForOutputEnhanced(output.data);
+            if (outputText) {
+              // Return as stdout for the Output view
+              return {
+                ...output,
+                type: 'stdout' as const,
+                data: outputText
+              };
+            }
+            // If no output format can be generated, skip this JSON message
+            return null;
           }
-          // If no output format can be generated, skip this JSON message
-          return null;
-        }
-        // Pass through all other output types including 'error'
-        return output; 
-      }).filter(Boolean); // Remove any null entries
+          // Pass through all other output types including 'error'
+          return output; 
+        }).filter(Boolean);
+        
+        transformedOutputs.push(...transformedBatch);
+      } // Remove any null entries
       return { success: true, data: transformedOutputs };
     } catch (error) {
       console.error('Failed to get session outputs:', error);
@@ -855,4 +924,30 @@ export function registerSessionHandlers(ipcMain: IpcMain, services: AppServices)
     }
   });
 
+  // Archive progress handler
+  ipcMain.handle('archive:get-progress', async () => {
+    try {
+      if (!archiveProgressManager) {
+        return { success: true, data: { tasks: [], activeCount: 0, totalCount: 0 } };
+      }
+      
+      const tasks = archiveProgressManager.getActiveTasks();
+      const activeCount = tasks.filter((t: any) => 
+        t.status !== 'completed' && t.status !== 'failed'
+      ).length;
+      
+      return { 
+        success: true, 
+        data: { 
+          tasks, 
+          activeCount, 
+          totalCount: tasks.length 
+        } 
+      };
+    } catch (error) {
+      console.error('Failed to get archive progress:', error);
+      return { success: false, error: 'Failed to get archive progress' };
+    }
+  });
+
 } 
\ No newline at end of file
diff --git a/main/src/ipc/types.ts b/main/src/ipc/types.ts
index dd2c13e9..47203dd4 100644
--- a/main/src/ipc/types.ts
+++ b/main/src/ipc/types.ts
@@ -14,6 +14,7 @@ import type { StravuAuthManager } from '../services/stravuAuthManager';
 import type { StravuNotebookService } from '../services/stravuNotebookService';
 import type { ClaudeCodeManager } from '../services/claudeCodeManager';
 import type { Logger } from '../utils/logger';
+import type { ArchiveProgressManager } from '../services/archiveProgressManager';
 
 export interface AppServices {
   app: App;
@@ -33,4 +34,5 @@ export interface AppServices {
   taskQueue: TaskQueue | null;
   getMainWindow: () => BrowserWindow | null;
   logger?: Logger;
+  archiveProgressManager?: ArchiveProgressManager;
 } 
\ No newline at end of file
diff --git a/main/src/preload.ts b/main/src/preload.ts
index 30c36390..e0955cdf 100644
--- a/main/src/preload.ts
+++ b/main/src/preload.ts
@@ -84,7 +84,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
     delete: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:delete', sessionId),
     sendInput: (sessionId: string, input: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:input', sessionId, input),
     continue: (sessionId: string, prompt?: string, model?: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:continue', sessionId, prompt, model),
-    getOutput: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-output', sessionId),
+    getOutput: (sessionId: string, limit?: number): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-output', sessionId, limit),
     getJsonMessages: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-json-messages', sessionId),
     getConversation: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-conversation', sessionId),
     getConversationMessages: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-conversation-messages', sessionId),
@@ -124,7 +124,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
     // Git pull/push operations
     gitPull: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:git-pull', sessionId),
     gitPush: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:git-push', sessionId),
-    getGitStatus: (sessionId: string): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-git-status', sessionId),
+    getGitStatus: (sessionId: string, nonBlocking?: boolean): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-git-status', sessionId, nonBlocking),
     getLastCommits: (sessionId: string, count: number): Promise<IPCResponse> => ipcRenderer.invoke('sessions:get-last-commits', sessionId, count),
     
     // Git operation helpers
diff --git a/main/src/services/archiveProgressManager.ts b/main/src/services/archiveProgressManager.ts
new file mode 100644
index 00000000..06c960f8
--- /dev/null
+++ b/main/src/services/archiveProgressManager.ts
@@ -0,0 +1,172 @@
+import { EventEmitter } from 'events';
+
+export interface ArchiveTask {
+  sessionId: string;
+  sessionName: string;
+  worktreeName: string;
+  projectName: string;
+  status: 'pending' | 'queued' | 'removing-worktree' | 'cleaning-artifacts' | 'completed' | 'failed';
+  startTime: Date;
+  endTime?: Date;
+  error?: string;
+  executeCallback?: () => Promise<void>;
+}
+
+export interface SerializedArchiveTask {
+  sessionId: string;
+  sessionName: string;
+  worktreeName: string;
+  projectName: string;
+  status: 'pending' | 'queued' | 'removing-worktree' | 'cleaning-artifacts' | 'completed' | 'failed';
+  startTime: string;
+  endTime?: string;
+  error?: string;
+}
+
+export class ArchiveProgressManager extends EventEmitter {
+  private activeTasks: Map<string, ArchiveTask> = new Map();
+  private taskQueue: ArchiveTask[] = [];
+  private isProcessing: boolean = false;
+
+  addTask(
+    sessionId: string, 
+    sessionName: string, 
+    worktreeName: string,
+    projectName: string,
+    executeCallback?: () => Promise<void>
+  ): void {
+    const task: ArchiveTask = {
+      sessionId,
+      sessionName,
+      worktreeName,
+      projectName,
+      status: 'queued',
+      startTime: new Date(),
+      executeCallback
+    };
+    
+    this.activeTasks.set(sessionId, task);
+    this.taskQueue.push(task);
+    this.emitProgress();
+    
+    // Start processing if not already processing
+    if (!this.isProcessing) {
+      this.processQueue();
+    }
+  }
+
+  private async processQueue(): Promise<void> {
+    if (this.isProcessing || this.taskQueue.length === 0) {
+      return;
+    }
+
+    this.isProcessing = true;
+
+    while (this.taskQueue.length > 0) {
+      const task = this.taskQueue.shift();
+      if (!task) continue;
+
+      // Update status to pending (actively processing)
+      task.status = 'pending';
+      this.emitProgress();
+
+      if (task.executeCallback) {
+        try {
+          console.log(`[ArchiveProgressManager] Starting archive for session ${task.sessionId}`);
+          await task.executeCallback();
+          
+          // If the task wasn't explicitly marked as failed, mark it as completed
+          const currentTask = this.activeTasks.get(task.sessionId);
+          if (currentTask && currentTask.status !== 'failed') {
+            this.updateTaskStatus(task.sessionId, 'completed');
+          }
+        } catch (error) {
+          console.error(`[ArchiveProgressManager] Error processing archive for session ${task.sessionId}:`, error);
+          this.updateTaskStatus(task.sessionId, 'failed', error instanceof Error ? error.message : 'Unknown error');
+        }
+      }
+    }
+
+    this.isProcessing = false;
+    console.log('[ArchiveProgressManager] Queue processing completed');
+  }
+
+  updateTaskStatus(sessionId: string, status: ArchiveTask['status'], error?: string): void {
+    const task = this.activeTasks.get(sessionId);
+    if (!task) return;
+
+    task.status = status;
+    
+    if (error) {
+      task.error = error;
+    }
+    
+    if (status === 'completed' || status === 'failed') {
+      task.endTime = new Date();
+    }
+    
+    this.emitProgress();
+    
+    // Remove completed/failed tasks after a delay to show completion
+    if (status === 'completed' || status === 'failed') {
+      setTimeout(() => {
+        this.activeTasks.delete(sessionId);
+        this.emitProgress();
+      }, 3000); // Keep visible for 3 seconds
+    }
+  }
+
+  getActiveTasks(): SerializedArchiveTask[] {
+    // Return a serializable version without the executeCallback
+    return Array.from(this.activeTasks.values()).map(task => ({
+      sessionId: task.sessionId,
+      sessionName: task.sessionName,
+      worktreeName: task.worktreeName,
+      projectName: task.projectName,
+      status: task.status,
+      startTime: task.startTime.toISOString(),
+      endTime: task.endTime?.toISOString(),
+      error: task.error
+    }));
+  }
+
+  hasActiveTasks(): boolean {
+    // Consider both active tasks and queued tasks
+    const hasActive = Array.from(this.activeTasks.values()).some(
+      task => task.status !== 'completed' && task.status !== 'failed'
+    );
+    return hasActive || this.taskQueue.length > 0;
+  }
+
+  getActiveTaskCount(): number {
+    return this.activeTasks.size;
+  }
+
+  getQueuedTaskCount(): number {
+    return this.taskQueue.length;
+  }
+
+  private emitProgress(): void {
+    const tasks = this.getActiveTasks();
+    const activeCount = tasks.filter(t => 
+      t.status !== 'completed' && t.status !== 'failed'
+    ).length;
+    
+    console.log('[ArchiveProgressManager] Emitting progress:', {
+      tasks: tasks.length,
+      activeCount,
+      totalCount: tasks.length
+    });
+    
+    this.emit('archive-progress', {
+      tasks,
+      activeCount,
+      totalCount: tasks.length
+    });
+  }
+
+  clearAll(): void {
+    this.activeTasks.clear();
+    this.emitProgress();
+  }
+}
\ No newline at end of file
diff --git a/main/src/services/claudeCodeManager.ts b/main/src/services/claudeCodeManager.ts
index 475ed7db..f0c63910 100644
--- a/main/src/services/claudeCodeManager.ts
+++ b/main/src/services/claudeCodeManager.ts
@@ -164,19 +164,13 @@ export class ClaudeCodeManager extends EventEmitter {
       // Build the command arguments
       const args = ['--verbose', '--output-format', 'stream-json'];
       
-      // Add model argument if specified
-      if (model) {
-        // Map full model identifiers to shorthand for Bedrock compatibility
-        // Only opus and sonnet have shorthand versions, haiku passes through
-        let modelOrAlias = model;
-        if (model.includes('opus')) {
-          modelOrAlias = 'opus';
-        } else if (model.includes('sonnet')) {
-          modelOrAlias = 'sonnet';
-        }
-
-        args.push('--model', modelOrAlias);
+      // Add model argument if specified and not 'auto'
+      if (model && model !== 'auto') {
+        // Pass the model shorthand directly (opus, sonnet, or haiku)
+        args.push('--model', model);
         this.logger?.verbose(`Using model: ${model}`);
+      } else if (model === 'auto') {
+        this.logger?.verbose(`Using auto model selection (Claude Code's default)`);
       }
       
       // Log commit mode for debugging (but don't pass to Claude Code)
@@ -743,6 +737,24 @@ export class ClaudeCodeManager extends EventEmitter {
       // Emit spawned event to update session status
       this.emit('spawned', { sessionId });
 
+      // Emit initial session info message with prompt and command
+      const sessionInfoMessage = {
+        type: 'session_info',
+        initial_prompt: prompt,
+        claude_command: `${claudeCommand || 'claude'} ${args.join(' ')}`,
+        worktree_path: worktreePath,
+        model: model || 'default',
+        permission_mode: permissionMode || 'default',
+        timestamp: new Date().toISOString()
+      };
+      
+      this.emit('output', {
+        sessionId,
+        type: 'json',
+        data: sessionInfoMessage,
+        timestamp: new Date()
+      });
+
       let hasReceivedOutput = false;
       let lastOutput = '';
       let buffer = '';
@@ -1092,7 +1104,16 @@ export class ClaudeCodeManager extends EventEmitter {
   async continueSession(sessionId: string, worktreePath: string, prompt: string, conversationHistory: any[], model?: string): Promise<void> {
     // Kill any existing process for this session first
     if (this.processes.has(sessionId)) {
+      console.log(`[ClaudeCodeManager] Killing existing process for session ${sessionId} before continuing`);
       await this.killProcess(sessionId);
+      // Add a small delay to ensure the process is fully cleaned up
+      await new Promise(resolve => setTimeout(resolve, 100));
+    }
+    
+    // Double-check that the process was actually killed
+    if (this.processes.has(sessionId)) {
+      console.error(`[ClaudeCodeManager] Process ${sessionId} still exists after kill attempt, aborting continue`);
+      throw new Error('Failed to stop previous session instance');
     }
     
     // Get the session's permission mode from database
diff --git a/main/src/services/configManager.ts b/main/src/services/configManager.ts
index 543f1792..89d32210 100644
--- a/main/src/services/configManager.ts
+++ b/main/src/services/configManager.ts
@@ -21,7 +21,7 @@ export class ConfigManager extends EventEmitter {
       systemPromptAppend: undefined,
       runScript: undefined,
       defaultPermissionMode: 'ignore',
-      defaultModel: 'claude-sonnet-4-20250514',
+      defaultModel: 'sonnet',
       stravuApiKey: undefined,
       stravuServerUrl: 'https://api.stravu.com',
       notifications: {
@@ -109,6 +109,6 @@ export class ConfigManager extends EventEmitter {
   }
 
   getDefaultModel(): string {
-    return this.config.defaultModel || 'claude-sonnet-4-20250514';
+    return this.config.defaultModel || 'sonnet';
   }
 }
\ No newline at end of file
diff --git a/main/src/services/sessionManager.ts b/main/src/services/sessionManager.ts
index 98476b0e..2bd5cc0a 100644
--- a/main/src/services/sessionManager.ts
+++ b/main/src/services/sessionManager.ts
@@ -266,7 +266,7 @@ export class SessionManager extends EventEmitter {
       true, // isMainRepo = true
       true, // autoCommit = true (default for main repo sessions)
       undefined, // folderId
-      'claude-sonnet-4-20250514', // default model for main repo sessions
+      'sonnet', // default model for main repo sessions
       project.commit_mode, // Use project's commit mode
       undefined // commit_mode_settings - let it use project defaults
     );
diff --git a/main/src/types/config.ts b/main/src/types/config.ts
index 515e151b..7d81395b 100644
--- a/main/src/types/config.ts
+++ b/main/src/types/config.ts
@@ -26,6 +26,8 @@ export interface AppConfig {
     notifyOnWaiting: boolean;
     notifyOnComplete: boolean;
   };
+  // Dev mode for debugging
+  devMode?: boolean;
 }
 
 export interface UpdateConfigRequest {
@@ -46,4 +48,5 @@ export interface UpdateConfigRequest {
     notifyOnWaiting: boolean;
     notifyOnComplete: boolean;
   };
+  devMode?: boolean;
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index eccee5f3..9aa5c882 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crystal",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "private": true,
   "description": "Crystal - Claude Code Commander for managing multiple Claude Code instances",
   "author": {
@@ -32,13 +32,16 @@
     "build:mac:arm64": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-build.js && electron-builder --mac --arm64 --publish never",
     "build:linux": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && electron-builder --linux --publish never",
     "build:linux:ci": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && electron-builder --linux --publish never",
+    "build:arch": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-arch-build.js && SHELL=bash electron-builder --linux pacman --publish never && node scripts/configure-arch-build.js restore",
     "build:mac:ci": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-build.js && electron-builder --mac --publish never",
     "inject-build-info": "node scripts/inject-build-info.js",
     "release:mac": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-build.js && electron-builder --mac --publish always",
     "release:mac:universal": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-build.js && electron-builder --mac --universal --publish always",
     "release:linux": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && electron-builder --linux --publish always",
+    "release:arch": "pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-arch-build.js && SHELL=bash electron-builder --linux pacman --publish always && node scripts/configure-arch-build.js restore",
     "canary:mac": "node scripts/prepare-canary.js && CANARY_BUILD=true pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-build.js && electron-builder --mac --publish always --config.releaseInfo.releaseNotes=\"Canary build from main branch\"",
     "canary:linux": "node scripts/prepare-canary.js && CANARY_BUILD=true pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && electron-builder --linux --publish always --config.releaseInfo.releaseNotes=\"Canary build from main branch\"",
+    "canary:arch": "node scripts/prepare-canary.js && CANARY_BUILD=true pnpm run build:frontend && pnpm run build:main && pnpm run inject-build-info && pnpm run generate-notices && node scripts/configure-arch-build.js && SHELL=bash electron-builder --linux pacman --publish always --config.releaseInfo.releaseNotes=\"Canary build from main branch\" && node scripts/configure-arch-build.js restore",
     "preview": "pnpm run --filter frontend preview",
     "lint": "pnpm run -r lint",
     "typecheck": "pnpm run -r typecheck",
@@ -53,8 +56,8 @@
     "test:headed": "playwright test --headed"
   },
   "dependencies": {
-    "@anthropic-ai/claude-code": "^1.0.33",
-    "@anthropic-ai/sdk": "^0.53.0",
+    "@anthropic-ai/claude-code": "^1.0.86",
+    "@anthropic-ai/sdk": "^0.60.0",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "better-sqlite3": "^11.7.0",
@@ -133,6 +136,12 @@
           "arch": [
             "x64"
           ]
+        },
+        {
+          "target": "pacman",
+          "arch": [
+            "x64"
+          ]
         }
       ],
       "category": "Development",
@@ -160,6 +169,19 @@
     "appImage": {
       "artifactName": "${productName}-${version}-linux-${arch}.${ext}"
     },
+    "pacman": {
+      "depends": [
+        "gtk3",
+        "libnotify",
+        "nss",
+        "libxss",
+        "libxtst",
+        "xdg-utils",
+        "at-spi2-core",
+        "util-linux-libs"
+      ],
+      "artifactName": "${productName}-${version}-linux-${arch}.pkg.tar.xz"
+    },
     "publish": {
       "provider": "github",
       "owner": "stravu",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 828d4a11..3668b0e3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,11 +9,11 @@ importers:
   .:
     dependencies:
       '@anthropic-ai/claude-code':
-        specifier: ^1.0.33
-        version: 1.0.56
+        specifier: ^1.0.86
+        version: 1.0.86
       '@anthropic-ai/sdk':
-        specifier: ^0.53.0
-        version: 0.53.0
+        specifier: ^0.60.0
+        version: 0.60.0
       '@homebridge/node-pty-prebuilt-multiarch':
         specifier: ^0.12.0
         version: 0.12.0
@@ -221,11 +221,11 @@ importers:
   main:
     dependencies:
       '@anthropic-ai/claude-code':
-        specifier: ^1.0.33
-        version: 1.0.56
+        specifier: ^1.0.86
+        version: 1.0.86
       '@anthropic-ai/sdk':
-        specifier: ^0.53.0
-        version: 0.53.0
+        specifier: ^0.60.0
+        version: 0.60.0
       '@homebridge/node-pty-prebuilt-multiarch':
         specifier: ^0.12.0
         version: 0.12.0
@@ -318,13 +318,13 @@ packages:
   '@antfu/utils@8.1.1':
     resolution: {integrity: sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==}
 
-  '@anthropic-ai/claude-code@1.0.56':
-    resolution: {integrity: sha512-LYOlv9uXtLrJcJqSLvQlhy7shhC6MHEXuSGZ/+BazM4LY36ng3cmKjTCDny0kZQxa+u/+MYOXUrkmkJm2qR75Q==}
+  '@anthropic-ai/claude-code@1.0.86':
+    resolution: {integrity: sha512-js1h6JUnFJ1dHvFPBiCxwFChaWjh28XOFamrwebmhOIUBVhQZwMfDJYsNfRyv0qEwpxKxYedvK4nv4WqMCwu9Q==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
-  '@anthropic-ai/sdk@0.53.0':
-    resolution: {integrity: sha512-bl2frVo0cgHCXTzQEIHXPH329uQXC4YKBaLBkZmUc59tNiR3GgcGpBZU7mwfyv5tPuU/yT7tGHyoe5AnjN02QA==}
+  '@anthropic-ai/sdk@0.60.0':
+    resolution: {integrity: sha512-9zu/TXaUy8BZhXedDtt1wT3H4LOlpKDO1/ftiFpeR3N1PCr3KJFKkxxlQWWt1NNp08xSwUNJ3JNY8yhl8av6eQ==}
     hasBin: true
 
   '@babel/code-frame@7.27.1':
@@ -5056,7 +5056,7 @@ snapshots:
 
   '@antfu/utils@8.1.1': {}
 
-  '@anthropic-ai/claude-code@1.0.56':
+  '@anthropic-ai/claude-code@1.0.86':
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.33.5
       '@img/sharp-darwin-x64': 0.33.5
@@ -5065,7 +5065,7 @@ snapshots:
       '@img/sharp-linux-x64': 0.33.5
       '@img/sharp-win32-x64': 0.33.5
 
-  '@anthropic-ai/sdk@0.53.0': {}
+  '@anthropic-ai/sdk@0.60.0': {}
 
   '@babel/code-frame@7.27.1':
     dependencies:
diff --git a/scripts/configure-arch-build.js b/scripts/configure-arch-build.js
new file mode 100644
index 00000000..0643c075
--- /dev/null
+++ b/scripts/configure-arch-build.js
@@ -0,0 +1,106 @@
+#!/usr/bin/env node
+
+/**
+ * Configure build settings specifically for Arch Linux builds
+ * This script modifies electron-builder configuration to use "stravu-crystal" naming
+ * for Arch Linux to avoid conflicts with the existing "crystal" package (Crystal language)
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+function configureArchBuild() {
+  console.log('Configuring build for Arch Linux with stravu-crystal naming...');
+  
+  // Read the package.json file
+  const packageJsonPath = path.join(__dirname, '..', 'package.json');
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  
+  if (!packageJson.build || !packageJson.build.linux) {
+    console.error('Error: No Linux build configuration found in package.json');
+    process.exit(1);
+  }
+  
+  // Store original values for restoration
+  const originalProductName = packageJson.build.productName;
+  const originalStartupWMClass = packageJson.build.linux.desktop?.StartupWMClass;
+  const originalPacmanArtifactName = packageJson.build.pacman?.artifactName;
+  
+  console.log('Original configuration:');
+  console.log(`  - Product Name: ${originalProductName || packageJson.name}`);
+  console.log(`  - StartupWMClass: ${originalStartupWMClass || 'crystal'}`);
+  console.log(`  - Pacman Artifact Name: ${originalPacmanArtifactName || 'default'}`);
+  
+  // Update configuration for Arch Linux
+  packageJson.build.productName = 'stravu-crystal';
+  
+  // Ensure desktop configuration exists
+  if (!packageJson.build.linux.desktop) {
+    packageJson.build.linux.desktop = {};
+  }
+  
+  // Update desktop entry
+  packageJson.build.linux.desktop.Name = 'stravu-crystal';
+  packageJson.build.linux.desktop.StartupWMClass = 'stravu-crystal';
+  
+  // Update pacman artifact name
+  if (!packageJson.build.pacman) {
+    packageJson.build.pacman = {};
+  }
+  packageJson.build.pacman.artifactName = 'stravu-crystal-${version}-linux-${arch}.pkg.tar.xz';
+  
+  console.log('Updated configuration:');
+  console.log(`  - Product Name: ${packageJson.build.productName}`);
+  console.log(`  - Desktop Name: ${packageJson.build.linux.desktop.Name}`);
+  console.log(`  - StartupWMClass: ${packageJson.build.linux.desktop.StartupWMClass}`);
+  console.log(`  - Pacman Artifact Name: ${packageJson.build.pacman.artifactName}`);
+  
+  // Write the updated package.json back
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+  
+  console.log('Arch Linux build configuration updated successfully!');
+  
+  // Return original values for potential restoration
+  return {
+    originalProductName,
+    originalStartupWMClass,
+    originalPacmanArtifactName
+  };
+}
+
+function restoreOriginalConfig() {
+  console.log('Restoring original build configuration...');
+  
+  // Read the package.json file
+  const packageJsonPath = path.join(__dirname, '..', 'package.json');
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  
+  // Restore original values
+  packageJson.build.productName = 'Crystal';
+  
+  if (packageJson.build.linux && packageJson.build.linux.desktop) {
+    packageJson.build.linux.desktop.Name = 'Crystal';
+    packageJson.build.linux.desktop.StartupWMClass = 'crystal';
+  }
+  
+  if (packageJson.build.pacman) {
+    packageJson.build.pacman.artifactName = '${productName}-${version}-linux-${arch}.pkg.tar.xz';
+  }
+  
+  // Write the restored package.json back
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+  
+  console.log('Original build configuration restored successfully!');
+}
+
+if (require.main === module) {
+  const command = process.argv[2];
+  
+  if (command === 'restore') {
+    restoreOriginalConfig();
+  } else {
+    configureArchBuild();
+  }
+}
+
+module.exports = { configureArchBuild, restoreOriginalConfig };
\ No newline at end of file
diff --git a/shared/package.json b/shared/package.json
index 0289da03..402468b7 100644
--- a/shared/package.json
+++ b/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shared",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "private": true,
   "main": "index.js",
   "types": "index.d.ts",
diff --git a/test-duplicate-submission.md b/test-duplicate-submission.md
new file mode 100644
index 00000000..a422d29f
--- /dev/null
+++ b/test-duplicate-submission.md
@@ -0,0 +1,73 @@
+# Test Plan for Duplicate Submission Fix
+
+## Bug Description
+When CMD+Enter is pressed twice rapidly, two Claude Code interactions are kicked off. When Cancel is pressed, only one stops and the Cancel button changes back to "Continue" even though the second Claude instance keeps running.
+
+## Changes Made
+
+### Frontend Protection (Session Input Components)
+1. **SessionInput.tsx**:
+   - Added `isSubmitting` state to track submission status
+   - Modified `onKeyDown` and `onClickSend` to check `isSubmitting` before processing
+   - Added 500ms cooldown period after each submission
+   - Visual feedback: button shows "Processing..." and becomes disabled during submission
+
+2. **SessionInputWithImages.tsx**:
+   - Same protection as SessionInput.tsx
+   - Prevents duplicate submissions with images attached
+
+### Backend Protection
+1. **ipc/session.ts**:
+   - Added check in `sessions:continue` handler to prevent duplicate starts
+   - Returns error if Claude is already running for the session
+
+2. **claudeCodeManager.ts**:
+   - Enhanced `continueSession` to properly kill existing processes
+   - Added 100ms delay after kill to ensure cleanup
+   - Double-checks that process was actually killed before starting new one
+
+## Test Steps
+
+### Test 1: Rapid CMD+Enter Prevention
+1. Open Crystal app
+2. Create or select a session
+3. Type a prompt in the input field
+4. Press CMD+Enter twice rapidly (within 500ms)
+5. **Expected**: Only one Claude instance should start, second press should be ignored
+6. **Verify**: Console should show "Ignoring duplicate submission attempt"
+
+### Test 2: Button Disable During Processing
+1. Start a new session or continue an existing one
+2. Type a prompt and click Continue/Send button
+3. **Expected**: Button should show "Processing..." and be disabled (grayed out)
+4. After submission completes, button should re-enable
+
+### Test 3: Cancel Button Behavior
+1. Start a Claude session with a long-running task
+2. While it's running, click Cancel
+3. **Expected**: Session should stop completely
+4. **Verify**: Cancel button should not revert to Continue if Claude is still running
+
+### Test 4: Backend Protection
+1. Try to continue a session that's already processing
+2. **Expected**: Backend should reject with "Session is already processing a request"
+3. **Verify**: Check logs for "[IPC] Session X is already running, preventing duplicate continue"
+
+## Verification Commands
+
+Run the app in development mode to see console logs:
+```bash
+pnpm electron-dev
+```
+
+Check for protection messages in console:
+- Frontend: "[SessionInput] Ignoring duplicate submission attempt"
+- Backend: "[IPC] Session X is already running, preventing duplicate continue"
+- Backend: "[ClaudeCodeManager] Killing existing process for session X before continuing"
+
+## Success Criteria
+- [ ] No duplicate Claude instances can be started from rapid CMD+Enter
+- [ ] Button shows visual feedback during processing
+- [ ] Cancel properly stops all running instances
+- [ ] Backend rejects duplicate continue requests
+- [ ] 500ms cooldown prevents accidental double-submissions
\ No newline at end of file