feat: code smell command, display commands error in chat

lib/shared/src/chat/recipes/custom-prompt.ts

@@ -48,22 +48,23 @@ export class CustomPrompt implements Recipe {
             ? (JSON.parse(contextConfig) as CodyPromptContext)
             : defaultCodyPromptContext
 
-        // Check if selection is required
-        const selection = context.editor.getActiveTextEditorSelection() || context.editor.controllers?.inline?.selection
-        if (isContextRequired?.selection && !selection?.selectedText) {
-            await vscode.window.showErrorMessage('This command requires text to be selected in the editor.')
-            return null
-        }
-
         // Get prompt text from the editor command or from the human input
         const promptText = humanChatInput.trim() || (await context.editor.controllers?.command?.get()) || null
         if (!promptText) {
-            await vscode.window.showErrorMessage('Please enter a valid prompt for the custom command.')
-            return null
+            const errorMsg = 'Please enter a valid prompt for the custom command.'
+            return this.getInteractionWithAssistantError(errorMsg)
         }
         const promptName = await context.editor.controllers?.command?.get('current')
         const displayPromptText = promptName ? `Command: ${promptName}` : promptText
 
+        // Check if selection is required
+        const selection =
+            context.editor.getActiveTextEditorSelectionOrEntireFile() || context.editor.controllers?.inline?.selection
+        if ((isContextRequired?.selection || isContextRequired?.currentFile) && !selection?.selectedText) {
+            const errorMsg = 'This command requires text to be selected in the editor.'
+            return this.getInteractionWithAssistantError(errorMsg, displayPromptText)
+        }
+
         // Get output from the command if any
         const commandOutput = await context.editor.controllers?.command?.get('output')
 
@@ -103,6 +104,17 @@ export class CustomPrompt implements Recipe {
         )
     }
 
+    private async getInteractionWithAssistantError(errorMsg: string, displayText = ''): Promise<Interaction> {
+        return Promise.resolve(
+            new Interaction(
+                { speaker: 'human', displayText },
+                { speaker: 'assistant', error: errorMsg },
+                Promise.resolve([]),
+                []
+            )
+        )
+    }
+
     // Get display text for human
     private getHumanDisplayText(humanChatInput: string, fileName: string): string {
         return humanChatInput + InlineTouch.displayPrompt + fileName
@@ -154,7 +166,9 @@ export class CustomPrompt implements Recipe {
         }
 
         const currentFileContextStack = []
-        if (isContextRequired.currentFile) {
+        // If currentFile is true, or when selection is true but there is no selected text
+        // then we want to include the current file context
+        if (isContextRequired.currentFile || (isContextRequired.selection && !selection?.selectedText)) {
             currentFileContextStack.push(...ChatQuestion.getEditorContext(editor))
         }
 

lib/shared/src/chat/transcript/messages.ts

@@ -21,6 +21,7 @@ export interface ChatMessage extends Message {
 export interface InteractionMessage extends Message {
     displayText?: string
     prefix?: string
+    error?: string
 }
 
 export interface UserLocalHistory {

lib/ui/src/Chat.tsx

@@ -271,6 +271,10 @@ export const Chat: React.FunctionComponent<ChatProps> = ({
                     setSelectedChatCommand(-1)
                     setFormInput('')
                 }
+                if (event.key === 'Tab' && selectedChatCommand > -1) {
+                    const newInput = displayCommands?.[selectedChatCommand]?.[1]?.slashCommand
+                    setFormInput(newInput || formInput)
+                }
             }
 
             // Loop through input history on up arrow press

vscode/src/chat/MessageProvider.ts

@@ -355,6 +355,14 @@ export abstract class MessageProvider extends MessageHandler implements vscode.D
         if (!interaction) {
             return
         }
+        const errorMsg = interaction?.getAssistantMessage()?.error
+        if (errorMsg !== undefined) {
+            this.transcript.addInteraction(interaction)
+            this.transcript.addErrorAsAssistantResponse(errorMsg)
+            this.sendTranscript()
+            await this.saveTranscriptToChatHistory()
+            return
+        }
         this.isMessageInProgress = true
         this.transcript.addInteraction(interaction)