fix: slash commands populated from SDK init (slash_commands array), merged with IPC list

Author: Swofty-Developments

crates/session/src/claude.rs

@@ -270,9 +270,20 @@ impl ClaudeSession {
                         vec![AgentEvent::SessionReady { claude_session_id: sid, model: confirmed_model }]
                     }
                     "slash_commands" => {
-                        // Slash commands from the SDK init — we just log them,
-                        // the frontend loads them separately via list_slash_commands
-                        vec![]
+                        // Forward slash commands from SDK init to frontend
+                        if let Some(cmds) = obj.get("commands").and_then(|c| c.as_array()) {
+                            let cmd_list: Vec<String> = cmds.iter()
+                                .filter_map(|c| c.as_str().map(String::from))
+                                .collect();
+                            let description = cmd_list.join(",");
+                            // Abuse SessionError to send the command list to the frontend
+                            // The frontend will detect the "slash_commands:" prefix
+                            vec![AgentEvent::SessionError {
+                                message: format!("slash_commands:{description}"),
+                            }]
+                        } else {
+                            vec![]
+                        }
                     }
                     "turn_started" => {
                         vec![AgentEvent::TurnStarted { turn_id: "sidecar".to_string() }]

crates/tauri-app/frontend/src/components/composer/Composer.tsx

@@ -76,16 +76,32 @@ export function Composer() {
   const [slashFilter, setSlashFilter] = createSignal("");
   const [slashIndex, setSlashIndex] = createSignal(0);
 
-  // Load slash commands (and reload when provider changes)
+  // Load slash commands from IPC + merge SDK init commands from store
   createEffect(() => {
     const p = store.selectedProvider;
     ipc.listSlashCommands(p).then(setSlashCommands).catch(() => setSlashCommands([]));
   });
 
+  const allSlashCommands = () => {
+    const ipcCmds = slashCommands();
+    const sdkCmds = store.availableSlashCommands || [];
+    // Merge SDK commands that aren't already in the IPC list
+    const existing = new Set(ipcCmds.map((c) => c.name));
+    const merged = [...ipcCmds];
+    for (const cmd of sdkCmds) {
+      const name = cmd.startsWith("/") ? cmd : `/${cmd}`;
+      if (!existing.has(name)) {
+        merged.push({ name, description: `Skill: ${cmd}`, source: "sdk" });
+      }
+    }
+    return merged;
+  };
+
   const filteredSlash = () => {
     const q = slashFilter().toLowerCase();
-    if (!q) return slashCommands().slice(0, 12);
-    return slashCommands().filter((c) => c.name.toLowerCase().includes(q) || c.description.toLowerCase().includes(q)).slice(0, 12);
+    const cmds = allSlashCommands();
+    if (!q) return cmds.slice(0, 15);
+    return cmds.filter((c) => c.name.toLowerCase().includes(q) || c.description.toLowerCase().includes(q)).slice(0, 15);
   };
 
   function handleSlashSelect(cmd: SlashCommand) {

crates/tauri-app/frontend/src/stores/app-store.ts

@@ -60,6 +60,7 @@ export interface AppStore {
   projectPrMap: Record<string, Record<string, number>>;
   activeModel: string | null;
   unreadTabs: Record<string, boolean>;
+  availableSlashCommands: string[];
   recentlyClosedTabs: string[];
   keyboardHelpOpen: boolean;
 }
@@ -103,6 +104,7 @@ function createAppStore() {
     projectPrMap: {},
     activeModel: null,
     unreadTabs: {},
+    availableSlashCommands: [],
     recentlyClosedTabs: [],
     keyboardHelpOpen: false,
   });
@@ -721,12 +723,17 @@ function createAppStore() {
         }
         break;
       case "session_error": {
+        // Check if this is a slash_commands update (smuggled via session_error)
+        if (payload.message?.startsWith("slash_commands:")) {
+          const cmdList = payload.message.slice("slash_commands:".length).split(",").filter(Boolean);
+          setStore("availableSlashCommands", cmdList);
+          break;
+        }
         setStore("sessionStatuses", thread_id, "error");
         setStore("threadMessages", thread_id, (msgs) => [
           ...(msgs || []),
           { id: crypto.randomUUID(), thread_id, role: "system" as const, content: `Error: ${payload.message}` },
         ]);
-        // Always notify on errors
         const errTitle = getThreadTitle(thread_id);
         sendNotification(`${errTitle} - Error`, payload.message || "Session error");
         break;