diff --git a/.gitignore b/.gitignore
index 6021567..49b3720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+*.bun-build
 
 # Tauri binaries (built executables)
 src-tauri/binaries/
diff --git a/package.json b/package.json
index 43b295a..22c1377 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
+    "predev": "bun run build:executables:current",
     "dev": "vite",
     "build": "tsc && vite build",
     "prebuild": "bun run build:executables:current",
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index b6d7be5..5302b6e 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -88,6 +88,7 @@ fn main() {
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![
+            // Claude & Project Management
             list_projects,
             get_project_sessions,
             get_claude_settings,
@@ -108,6 +109,9 @@ fn main() {
             get_claude_session_output,
             list_directory_contents,
             search_files,
+            get_recently_modified_files,
+            
+            // Checkpoint Management
             create_checkpoint,
             restore_checkpoint,
             list_checkpoints,
@@ -122,7 +126,8 @@ fn main() {
             get_checkpoint_settings,
             clear_checkpoint_manager,
             get_checkpoint_state_stats,
-            get_recently_modified_files,
+            
+            // Agent Management
             list_agents,
             create_agent,
             update_agent,
@@ -151,10 +156,14 @@ fn main() {
             fetch_github_agents,
             fetch_github_agent_content,
             import_agent_from_github,
+            
+            // Usage & Analytics
             get_usage_stats,
             get_usage_by_date_range,
             get_usage_details,
             get_session_stats,
+            
+            // MCP (Model Context Protocol)
             mcp_add,
             mcp_list,
             mcp_get,
@@ -167,6 +176,8 @@ fn main() {
             mcp_get_server_status,
             mcp_read_project_config,
             mcp_save_project_config,
+            
+            // Storage Management
             storage_list_tables,
             storage_read_table,
             storage_update_row,
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 684d941..860c55c 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -57,6 +57,9 @@
       "icons/128x128@2x.png",
       "icons/icon.icns",
       "icons/icon.png"
+    ],
+    "externalBin": [
+      "binaries/claude-code"
     ]
   }
 }