Slash command shortcut for mentioning GPT-5 Agent

Author: jahooma

cli/src/chat.tsx

@@ -75,6 +75,7 @@ import { trackEvent } from './utils/analytics'
 import { logger } from './utils/logger'
 
 import type { CommandResult } from './commands/command-registry'
+import type { MatchedSlashCommand } from './hooks/use-suggestion-engine'
 import type { MultilineInputHandle } from './components/multiline-input'
 import type { User } from './utils/auth'
 import type { AgentMode } from './utils/constants'
@@ -669,14 +670,10 @@ export const Chat = ({
     ],
   )
 
-  // Click handler for slash menu items - executes command immediately
-  const handleSlashItemClick = useCallback(
-    async (index: number) => {
-      const selected = slashMatches[index]
-      if (!selected) return
-
-      // If the command has insertText, insert it instead of executing
-      if (selected.insertText && slashContext.startIndex >= 0) {
+  // Helper to apply insertText for slash commands - returns true if handled
+  const applySlashInsertText = useCallback(
+    (selected: MatchedSlashCommand): boolean => {
+      if (selected.insertText != null && slashContext.startIndex >= 0) {
         const before = inputValue.slice(0, slashContext.startIndex)
         const after = inputValue.slice(
           slashContext.startIndex + 1 + slashContext.query.length,
@@ -687,8 +684,21 @@ export const Chat = ({
           lastEditDueToNav: false,
         })
         setSlashSelectedIndex(0)
-        return
+        return true
       }
+      return false
+    },
+    [slashContext, inputValue, setInputValue, setSlashSelectedIndex],
+  )
+
+  // Click handler for slash menu items - executes command or inserts text
+  const handleSlashItemClick = useCallback(
+    async (index: number) => {
+      const selected = slashMatches[index]
+      if (!selected) return
+
+      // If the command has insertText, insert it instead of executing
+      if (applySlashInsertText(selected)) return
 
       // Execute the selected slash command immediately
       const commandString = `/${selected.id}`
@@ -699,9 +709,7 @@ export const Chat = ({
     },
     [
       slashMatches,
-      slashContext,
-      inputValue,
-      setInputValue,
+      applySlashInsertText,
       setSlashSelectedIndex,
       onSubmitPrompt,
       agentMode,
@@ -903,19 +911,7 @@ export const Chat = ({
         if (!selected) return
 
         // If the command has insertText, insert it instead of executing
-        if (selected.insertText && slashContext.startIndex >= 0) {
-          const before = inputValue.slice(0, slashContext.startIndex)
-          const after = inputValue.slice(
-            slashContext.startIndex + 1 + slashContext.query.length,
-          )
-          setInputValue({
-            text: before + selected.insertText + after,
-            cursorPosition: before.length + selected.insertText.length,
-            lastEditDueToNav: false,
-          })
-          setSlashSelectedIndex(0)
-          return
-        }
+        if (applySlashInsertText(selected)) return
 
         // Execute the selected slash command immediately
         const commandString = `/${selected.id}`
@@ -929,6 +925,10 @@ export const Chat = ({
         // Complete the word without executing - same as clicking on the item
         const selected = slashMatches[slashSelectedIndex] || slashMatches[0]
         if (!selected || slashContext.startIndex < 0) return
+
+        // If the command has insertText, insert it instead of the command
+        if (applySlashInsertText(selected)) return
+
         const before = inputValue.slice(0, slashContext.startIndex)
         const after = inputValue.slice(
           slashContext.startIndex + 1 + slashContext.query.length,
@@ -1096,6 +1096,9 @@ export const Chat = ({
       setSlashSelectedIndex,
       slashMatches,
       slashSelectedIndex,
+      slashContext,
+      inputValue,
+      applySlashInsertText,
       onSubmitPrompt,
       agentMode,
       handleCommandResult,

cli/src/commands/__tests__/router-input.test.ts

@@ -360,7 +360,11 @@ describe('command-registry', () => {
         ...COMMAND_REGISTRY.flatMap((c) => c.aliases),
       ])
 
-      for (const slashCommand of SLASH_COMMANDS) {
+      // Commands with insertText are UI-only shortcuts that insert text into
+      // the input field instead of executing a command.
+      const executableCommands = SLASH_COMMANDS.filter((cmd) => !cmd.insertText)
+
+      for (const slashCommand of executableCommands) {
         expect(registered.has(slashCommand.id)).toBe(true)
         for (const alias of slashCommand.aliases ?? []) {
           expect(registered.has(alias)).toBe(true)

cli/src/commands/command-registry.ts

@@ -454,6 +454,19 @@ export const COMMAND_REGISTRY: CommandDefinition[] = [
       return { openPublishMode: true }
     },
   }),
+  defineCommand({
+    name: 'gpt-5-agent',
+    handler: (params) => {
+      // Insert @ GPT-5 Agent into the input field (UI shortcut, not a real command)
+      params.setInputValue({
+        text: '@GPT-5 Agent ',
+        cursorPosition: '@GPT-5 Agent '.length,
+        lastEditDueToNav: false,
+      })
+      params.inputRef.current?.focus()
+      // Don't save to history - this is just a UI shortcut
+    },
+  }),
   defineCommand({
     name: 'connect:claude',
     aliases: ['claude'],

cli/src/data/slash-commands.ts

@@ -121,7 +121,7 @@ export const SLASH_COMMANDS: SlashCommand[] = [
     id: 'gpt-5-agent',
     label: 'gpt-5-agent',
     description: 'Mention the GPT-5 agent to help solve complex problems',
-    insertText: '@gpt-5-agent ',
+    insertText: '@GPT-5 Agent ',
   },
   {
     id: 'logout',