Fix slash command filtering to include commands with empty commandText

Remove commandText requirement from getSlashCommands filter to properly
include commands like help, undo, and redo that have empty commandText
but are still valid slash commands. Also updates terminology from
"subagent" to "trace" throughout the codebase for consistency.

🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>

Author: brandonkachen

npm-app/src/cli-handlers/subagent-list.ts

@@ -14,7 +14,7 @@ import {
 let isInSubagentListBuffer = false
 let originalKeyHandlers: ((str: string, key: any) => void)[] = []
 // Make selectedIndex persistent across menu transitions
-// This maintains selection when navigating between subagent list and individual views
+// This maintains selection when navigating between trace list and individual views
 let persistentSelectedIndex = -1 // -1 means not initialized
 let scrollOffset = 0
 let allContentLines: string[] = []
@@ -34,30 +34,31 @@ export function isInSubagentListMode(): boolean {
 
 export function enterSubagentListBuffer(rl: any, onExit: () => void) {
   if (isInSubagentListBuffer) {
-    console.log(yellow('Already in subagent list mode!'))
+    console.log(yellow('Already in trace list mode!'))
     return
   }
 
-  // Get subagents in chronological order
+  // Get traces in chronological order
   subagentList = getSubagentsChronological(50) // Get more for the list
 
   if (subagentList.length === 0) {
-    console.log(yellow('No subagents found from previous runs.'))
+    console.log(yellow('No traces found from previous runs.'))
     console.log(
       gray(
-        'Subagents will appear here after you use spawn_agents in a conversation.',
+        'Traces will appear here after you use spawn_agents in a conversation.',
       ),
     )
+    onExit() // Return control to user
     return
   }
 
   // Initialize selectedIndex: reset to last item when entering from main screen,
-  // or use persistent value if returning from individual subagent view
+  // or use persistent value if returning from individual trace view
   if (
     persistentSelectedIndex === -1 ||
     persistentSelectedIndex >= subagentList.length
   ) {
-    // First time or invalid index - select the most recent subagent (last in chronological list)
+    // First time or invalid index - select the most recent trace (last in chronological list)
     persistentSelectedIndex = Math.max(0, subagentList.length - 1)
   }
   // Use the persistent selected index
@@ -129,8 +130,8 @@ function centerSelectedItem() {
 
 // Define header lines as a separate function
 const getHeaderLines = (terminalWidth: number) => [
-  bold(cyan('🤖 ')) + bold(magenta('Subagent History')),
-  gray(`${pluralize(subagentList.length, 'subagent run')} `),
+  bold(cyan('🤖 ')) + bold(magenta('Trace History')),
+  gray(`${pluralize(subagentList.length, 'trace run')} `),
   '',
   gray('─'.repeat(terminalWidth)),
   '',
@@ -143,9 +144,9 @@ function buildAllContentLines() {
   const selectedIndex = persistentSelectedIndex
 
   if (subagentList.length === 0) {
-    lines.push(yellow('No subagents found.'))
+    lines.push(yellow('No traces found.'))
   } else {
-    // Build all content lines for all subagents
+    // Build all content lines for all traces
     for (let i = 0; i < subagentList.length; i++) {
       subagentLinePositions.push(lines.length) // Store the starting line number
       const agent = subagentList[i]
@@ -357,7 +358,7 @@ function setupSubagentListKeyHandler(rl: any, onExit: () => void) {
       return
     }
 
-    // Handle Enter - select current subagent
+    // Handle Enter - select current trace
     if (key && key.name === 'return') {
       if (
         subagentList.length > 0 &&
@@ -366,7 +367,7 @@ function setupSubagentListKeyHandler(rl: any, onExit: () => void) {
         const selectedAgent = subagentList[persistentSelectedIndex]
         exitSubagentListBuffer(rl)
 
-        // Enter the individual subagent buffer
+        // Enter the individual trace buffer
         enterSubagentBuffer(rl, selectedAgent.agentId, onExit)
       }
       return
@@ -446,7 +447,7 @@ export function resetSubagentSelectionToLast() {
   persistentSelectedIndex = -1 // This will trigger reset to last item on next entry
 }
 
-// Cleanup function to ensure we exit subagent list buffer on process termination
+// Cleanup function to ensure we exit trace list buffer on process termination
 export function cleanupSubagentListBuffer() {
   if (isInSubagentListBuffer) {
     process.stdout.write(SHOW_CURSOR)

npm-app/src/cli-handlers/subagent.ts

@@ -48,11 +48,11 @@ export function isInSubagentBufferMode(): boolean {
 }
 
 /**
- * Display a formatted list of subagents with enhanced styling
+ * Display a formatted list of traces with enhanced styling
  */
 export function displaySubagentList(agents: SubagentData[]) {
-  console.log(bold(cyan('🤖 Available Subagents')))
-  console.log(gray(`Found ${pluralize(agents.length, 'subagent')}`))
+  console.log(bold(cyan('🤖 Available Traces')))
+  console.log(gray(`Found ${pluralize(agents.length, 'trace')}`))
   console.log()
   if (agents.length === 0) {
     console.log(gray('  (none)'))
@@ -81,10 +81,10 @@ export function enterSubagentBuffer(
     return
   }
 
-  // Validate agent ID exists
+  // Validate trace ID exists
   const agentData = getSubagentData(agentId)
   if (!agentData) {
-    console.log(yellow(`No subagent found with ID: ${agentId}`))
+    console.log(yellow(`No trace found with ID: ${agentId}`))
     const recentSubagents = getRecentSubagents(5)
     displaySubagentList(recentSubagents)
     return

npm-app/src/cli.ts

@@ -397,10 +397,17 @@ export class CLI {
       const slashCommands = getSlashCommands()
       const currentInput = line.substring(1) // Text after '/'
 
-      const matches = slashCommands
-        .map((cmd) => cmd.baseCommand) // Get base command strings
-        .filter((cmdName) => cmdName && cmdName.startsWith(currentInput))
-        .map((cmdName) => `/${cmdName}`) // Add back the slash for display
+      // Get all command names (base commands + aliases) that match the input
+      const allCommandNames = slashCommands.flatMap((cmd) => [
+        cmd.baseCommand,
+        ...(cmd.aliases || []),
+      ])
+      const matches = allCommandNames
+        .filter(
+          (cmdName): cmdName is string =>
+            !!cmdName && cmdName.startsWith(currentInput),
+        )
+        .map((cmdName) => `/${cmdName}`)
 
       if (matches.length > 0) {
         return [matches, line] // Return all matches and the full line typed so far
@@ -704,7 +711,23 @@ export class CLI {
    * @param command The command to check (without leading slash)
    */
   private isKnownSlashCommand(command: string): boolean {
-    return getSlashCommands().some((cmd) => cmd.baseCommand === command)
+    return getSlashCommands().some(
+      (cmd) => cmd.baseCommand === command || cmd.aliases?.includes(command),
+    )
+  }
+
+  /**
+   * Checks if input matches a command (base command or any of its aliases)
+   * @param input The input to check
+   * @param baseCommand The base command to look for
+   */
+  private isCommandOrAlias(input: string, baseCommand: string): boolean {
+    const commandInfo = interactiveCommandDetails.find(
+      (cmd) => cmd.baseCommand === baseCommand,
+    )
+    return (
+      input === baseCommand || (commandInfo?.aliases?.includes(input) ?? false)
+    )
   }
 
   /**
@@ -741,15 +764,14 @@ export class CLI {
       const message = costModeMatch[2]?.trim() || ''
       const hasSlash = userInput.startsWith('/')
 
-      // Check if this command requires a slash for local processing
       const commandInfo = interactiveCommandDetails.find(
         (cmd) => cmd.baseCommand === mode,
       )
       const requiresSlash = commandInfo?.requireSlash ?? false
 
       // If command requires slash but no slash provided, forward to backend
       if (requiresSlash && !hasSlash) {
-        return userInput // Forward to backend
+        return userInput
       }
 
       // Track the cost mode command usage
@@ -789,16 +811,14 @@ export class CLI {
 
       if (!message) {
         this.freshPrompt()
-        return null // Fully handled, no message to forward
+        return null
       }
 
-      // Return the message part to be processed as user input
       return message
     }
 
-    // Handle empty slash command
     if (userInput === '/') {
-      return userInput // Let it be processed as a prompt
+      return userInput
     }
 
     // Track slash command usage if it starts with '/'
@@ -819,17 +839,17 @@ export class CLI {
       })
     }
 
-    if (cleanInput === 'help' || cleanInput === 'h') {
+    if (this.isCommandOrAlias(cleanInput, 'help')) {
       displayMenu()
       this.freshPrompt()
       return null
     }
-    if (cleanInput === 'login' || cleanInput === 'signin') {
+    if (this.isCommandOrAlias(cleanInput, 'login')) {
       await Client.getInstance().login()
       checkpointManager.clearCheckpoints()
       return null
     }
-    if (cleanInput === 'logout' || cleanInput === 'signout') {
+    if (this.isCommandOrAlias(cleanInput, 'logout')) {
       await Client.getInstance().logout()
       this.freshPrompt()
       return null
@@ -854,11 +874,11 @@ export class CLI {
       return null
     }
 
-    if (cleanInput === 'usage' || cleanInput === 'credits') {
+    if (this.isCommandOrAlias(cleanInput, 'usage')) {
       await Client.getInstance().getUsage()
       return null
     }
-    if (cleanInput === 'quit' || cleanInput === 'exit' || cleanInput === 'q') {
+    if (this.isCommandOrAlias(cleanInput, 'exit')) {
       await this.handleExit()
       return null
     }
@@ -886,74 +906,74 @@ export class CLI {
       this.freshPrompt()
       return null
     }
-    if (['diff', 'doff', 'dif', 'iff', 'd'].includes(cleanInput)) {
+    if (this.isCommandOrAlias(cleanInput, 'diff')) {
       handleDiff()
       this.freshPrompt()
       return null
     }
-    if (
-      cleanInput === 'uuddlrlrba' ||
-      cleanInput === 'konami' ||
-      cleanInput === 'codebuffy'
-    ) {
+    if (this.isCommandOrAlias(cleanInput, 'konami')) {
       showEasterEgg(this.freshPrompt.bind(this))
       return null
     }
 
-    // Handle subagent command
-    if (cleanInput.startsWith('subagent ')) {
-      const agentId = cleanInput.substring('subagent '.length).trim()
+    // Handle trace command (with alternate words support)
+    const [commandBase] = cleanInput.split(' ')
+    if (this.isCommandOrAlias(commandBase, 'trace')) {
+      const spaceIndex = cleanInput.indexOf(' ')
+      if (spaceIndex > 0) {
+        // Handle trace with ID
+        const agentId = cleanInput.substring(spaceIndex + 1).trim()
+
+        if (!agentId) {
+          console.log(
+            yellow(
+              `Please provide a trace ID. Usage: ${commandBase} <trace-id>`,
+            ),
+          )
+          const recentSubagents = getRecentSubagents(10)
+          displaySubagentList(recentSubagents)
+          if (recentSubagents.length === 0) {
+            // Give control back to user when no subagents exist
+            this.freshPrompt()
+          } else {
+            // Pre-fill the prompt with the command for easy completion
+            this.freshPrompt(`/${commandBase} `)
+          }
+          return null
+        }
 
-      if (!agentId) {
-        console.log(
-          yellow('Please provide a subagent ID. Usage: subagent <agent-id>'),
-        )
-        const recentSubagents = getRecentSubagents(10)
-        displaySubagentList(recentSubagents)
-        if (recentSubagents.length === 0) {
-          // Give control back to user when no subagents exist
+        if (isInSubagentBufferMode()) {
+          console.log(
+            yellow('Already in trace buffer mode! Press ESC to exit.'),
+          )
           this.freshPrompt()
-        } else {
-          // Pre-fill the prompt with '/subagent ' for easy completion
-          this.freshPrompt('/subagent ')
+          return null
         }
-        return null
-      }
 
-      if (isInSubagentBufferMode()) {
-        console.log(
-          yellow('Already in subagent buffer mode! Press ESC to exit.'),
-        )
-        this.freshPrompt()
+        enterSubagentBuffer(this.rl, agentId, () => {
+          // Callback when exiting subagent buffer
+          console.log(green('\nExited trace buffer mode!'))
+          this.freshPrompt()
+        })
         return null
-      }
-
-      enterSubagentBuffer(this.rl, agentId, () => {
-        // Callback when exiting subagent buffer
-        console.log(green('\nExited subagent buffer mode!'))
-        this.freshPrompt()
-      })
-      return null
-    }
+      } else {
+        // Handle bare trace command - show trace list
+        if (isInSubagentListMode()) {
+          console.log(yellow('Already in trace list mode! Press ESC to exit.'))
+          this.freshPrompt()
+          return null
+        }
 
-    // Handle bare 'subagent' command (without space) - show subagent list
-    if (cleanInput === 'subagent') {
-      if (isInSubagentListMode()) {
-        console.log(yellow('Already in subagent list mode! Press ESC to exit.'))
-        this.freshPrompt()
+        // Reset selection to last item when entering from main screen
+        resetSubagentSelectionToLast()
+        enterSubagentListBuffer(this.rl, () => {
+          this.freshPrompt()
+        })
         return null
       }
-
-      // Reset selection to last item when entering from main screen
-      resetSubagentSelectionToLast()
-      enterSubagentListBuffer(this.rl, () => {
-        this.freshPrompt()
-      })
-      return null
     }
 
-    // Handle 'agents' command - show agent management interface
-    if (cleanInput === 'agents') {
+    if (this.isCommandOrAlias(cleanInput, 'agents')) {
       if (isInAgentsMode()) {
         console.log(yellow('Already in agents mode! Press ESC to exit.'))
         this.freshPrompt()