refactor: commands

agent/src/agent.ts

@@ -621,7 +621,7 @@ export class Agent extends MessageHandler {
         })
 
         // The arguments to pass to the command to make sure edit commands would also run in chat mode
-        const commandArgs = [{ runInChatMode: true, source: 'editor' }]
+        const commandArgs = [{ source: 'editor' }]
 
         this.registerAuthenticatedRequest('commands/explain', () => {
             return this.createChatPanel(

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

@@ -1,8 +1,8 @@
 import type { ContextFile, PreciseContext } from '../../codebase-context/messages'
-import type { CodyDefaultCommands } from '../../commands'
 import type { Message } from '../../sourcegraph-api'
 
 import type { TranscriptJSON } from '.'
+import type { DefaultCodyCommands } from '../../commands/types'
 
 export interface ChatButton {
     label: string
@@ -68,7 +68,7 @@ export type ChatEventSource =
     | 'custom-commands'
     | 'test'
     | 'code-lens'
-    | CodyDefaultCommands
+    | DefaultCodyCommands
 
 /**
  * Converts an Error to a ChatError. Note that this cannot be done naively,

lib/shared/src/commands/types.ts

@@ -0,0 +1,74 @@
+// The default Cody Commands
+export type DefaultCodyCommands = DefaultChatCommands | DefaultEditCommands
+
+// Default Cody Commands that runs as a Chat request
+export enum DefaultChatCommands {
+    Ask = 'chat', // Submit a question in chat
+    Explain = 'explain', // Explain code
+    Test = 'test', // Generate unit tests in Chat
+    Smell = 'smell', // Generate code smell report in Chat
+}
+
+// Default Cody Commands that runs as an Inline Edit command
+export enum DefaultEditCommands {
+    Edit = 'edit', // Inline edit request
+    Unit = 'unit', // Generate unit tests with inline edit
+    Doc = 'doc', // Generate documentation with inline edit
+}
+
+// The blueprint of a Cody Custom Command
+export interface CodyCommand {
+    slashCommand: string
+    prompt: string
+    description?: string
+    context?: CodyCommandContext
+    type?: CodyCommandType
+    mode?: CodyCommandMode
+
+    // Internal use - the ID of the request
+    requestID?: string
+}
+
+/**
+ * - 'ask' mode is the default mode, run prompt in chat view
+ * - 'edit' mode will run prompt with edit command which replace selection with cody's response
+ * - 'insert' mode is the same as edit, it adds to the top of the selection instead of replacing selection
+ * - 'file' mode create a new file with cody's response as content
+ */
+type CodyCommandMode = 'ask' | 'edit' | 'insert' | 'file'
+
+// Type of context available for prompt building
+export interface CodyCommandContext {
+    // Exclude any context.
+    // It takes precedence over all other context.
+    none?: boolean
+
+    // Tabs from the current workspace
+    openTabs?: boolean
+    // The directory with the current file opened in the editor
+    currentDir?: boolean
+    // The current file opened in the editor
+    currentFile?: boolean
+    // The current selection in the editor
+    // Default to use smart selection unless set to false specifically
+    selection?: boolean
+    // Shell command to run to get context
+    command?: string
+    // The relative path of a file within your workspace root
+    filePath?: string
+    // The relative path of a directory within your workspace root
+    directoryPath?: string
+
+    // NOTE: Currently not supported
+    // Codebase context from current codebase
+    codebase?: boolean
+}
+
+export type CodyCommandType = CustomCommandType | DefaultCommandType | 'recently used'
+
+export enum CustomCommandType {
+    Workspace = 'workspace',
+    User = 'user',
+}
+
+export type DefaultCommandType = 'default' | 'experimental'

lib/shared/src/editor/index.ts

@@ -47,19 +47,7 @@ export interface ActiveTextEditorVisibleContent {
     revision?: string
 }
 
-export interface VsCodeCommandsController {
-    menu(type: 'custom' | 'config' | 'default', showDesc?: boolean): Promise<void>
-}
-
-export interface ActiveTextEditorViewControllers<
-    C extends VsCodeCommandsController = VsCodeCommandsController,
-> {
-    readonly command?: C
-}
-
-export interface Editor<P extends VsCodeCommandsController = VsCodeCommandsController> {
-    controllers?: ActiveTextEditorViewControllers<P>
-
+export interface Editor {
     /** The URI of the workspace root. */
     getWorkspaceRootUri(): URI | null
 
@@ -93,8 +81,6 @@ export interface Editor<P extends VsCodeCommandsController = VsCodeCommandsContr
 }
 
 export class NoopEditor implements Editor {
-    public controllers?: ActiveTextEditorViewControllers<VsCodeCommandsController> | undefined
-
     public getWorkspaceRootUri(): URI | null {
         return null
     }

lib/shared/src/index.ts

@@ -49,8 +49,8 @@ export type {
     PreciseContext,
     SymbolKind,
 } from './codebase-context/messages'
-export { defaultCodyCommandContext, isFixupCommand } from './commands'
-export type { CodyCommand, CodyCommandContext, CustomCommandType } from './commands'
+export type { CodyCommand, CodyCommandContext, CodyCommandType } from './commands/types'
+export { DefaultCodyCommands, DefaultChatCommands } from './commands/types'
 export { dedupeWith, isDefined, isErrorLike, pluralize } from './common'
 export {
     ProgrammingLanguage,
@@ -84,10 +84,8 @@ export type {
     ActiveTextEditorDiagnosticType,
     ActiveTextEditorSelection,
     ActiveTextEditorSelectionRange,
-    ActiveTextEditorViewControllers,
     ActiveTextEditorVisibleContent,
     Editor,
-    VsCodeCommandsController,
 } from './editor'
 export {
     displayPath,

vscode/package.json

@@ -313,7 +313,7 @@
         "when": "cody.activated && editorFocus"
       },
       {
-        "command": "cody.action.commands.custom.menu",
+        "command": "cody.menu.custom-commands",
         "category": "Cody Command",
         "title": "Custom Commands",
         "icon": "$(tools)",
@@ -384,7 +384,7 @@
         "enablement": "config.cody.experimental.guardrails && editorHasSelection"
       },
       {
-        "command": "cody.action.commands.menu",
+        "command": "cody.menu.commands",
         "category": "Cody",
         "title": "Commands",
         "when": "cody.activated",
@@ -522,7 +522,7 @@
         "when": "cody.activated && !editorReadonly && config.cody.internal.unstable"
       },
       {
-        "command": "cody.action.commands.menu",
+        "command": "cody.menu.commands",
         "key": "alt+c",
         "mac": "alt+c",
         "when": "cody.activated"
@@ -574,7 +574,7 @@
           "when": "cody.activated && editorIsOpen"
         },
         {
-          "command": "cody.action.commands.custom.menu",
+          "command": "cody.menu.custom-commands",
           "when": "cody.activated"
         },
         {
@@ -642,7 +642,7 @@
           "group": "command"
         },
         {
-          "command": "cody.action.commands.custom.menu",
+          "command": "cody.menu.custom-commands",
           "when": "cody.activated",
           "group": "custom-commands"
         },
@@ -693,7 +693,7 @@
       ],
       "editor/title": [
         {
-          "command": "cody.action.commands.menu",
+          "command": "cody.menu.commands",
           "when": "cody.activated && config.cody.editorTitleCommandIcon && resourceScheme == file && !editorReadonly",
           "group": "navigation",
           "visibility": "visible"

vscode/src/chat/chat-view/ChatManager.ts

@@ -2,18 +2,10 @@ import { debounce } from 'lodash'
 import * as uuid from 'uuid'
 import * as vscode from 'vscode'
 
-import {
-    ChatModelProvider,
-    type ChatClient,
-    type ChatEventSource,
-    type CodyCommand,
-    type Guardrails,
-} from '@sourcegraph/cody-shared'
+import { ChatModelProvider, type ChatClient, type Guardrails } from '@sourcegraph/cody-shared'
 
 import type { View } from '../../../webviews/NavBar'
-import type { CodyCommandArgs } from '../../commands'
-import type { CommandsController } from '../../commands/CommandsController'
-import { CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID } from '../../commands/prompt/display-text'
+import { CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID } from '../../commands/utils/display-text'
 import { isRunningInsideAgent } from '../../jsonrpc/isRunningInsideAgent'
 import type { LocalEmbeddingsController } from '../../local-context/local-embeddings'
 import type { SymfRunner } from '../../local-context/symf'
@@ -26,6 +18,7 @@ import type { AuthStatus } from '../protocol'
 import { ChatPanelsManager } from './ChatPanelsManager'
 import { SidebarViewController, type SidebarViewOptions } from './SidebarViewController'
 import type { ChatSession, SimpleChatPanelProvider } from './SimpleChatPanelProvider'
+import type { ExecuteChatArguments } from '../../commands/default/ask'
 import type { EnterpriseContextFactory } from '../../context/enterprise-context-factory'
 
 export const CodyChatPanelViewType = 'cody.chatPanel'
@@ -50,8 +43,7 @@ export class ChatManager implements vscode.Disposable {
         private enterpriseContext: EnterpriseContextFactory | null,
         private localEmbeddings: LocalEmbeddingsController | null,
         private symf: SymfRunner | null,
-        private guardrails: Guardrails,
-        private commandsController?: CommandsController
+        private guardrails: Guardrails
     ) {
         logDebug(
             'ChatManager:constructor',
@@ -68,15 +60,12 @@ export class ChatManager implements vscode.Disposable {
             this.localEmbeddings,
             this.symf,
             this.enterpriseContext,
-            this.guardrails,
-            this.commandsController
+            this.guardrails
         )
 
         // Register Commands
         this.disposables.push(
-            vscode.commands.registerCommand('cody.action.chat', (input, args) =>
-                this.executeChat(input, args)
-            ),
+            vscode.commands.registerCommand('cody.action.chat', args => this.executeChat(args)),
             vscode.commands.registerCommand('cody.chat.history.export', () => this.exportHistory()),
             vscode.commands.registerCommand('cody.chat.history.clear', () => this.clearHistory()),
             vscode.commands.registerCommand('cody.chat.history.delete', item => this.clearHistory(item)),
@@ -119,40 +108,25 @@ export class ChatManager implements vscode.Disposable {
         await chatProvider?.setWebviewView(view)
     }
 
-    // Execute a chat request in a new chat panel
-    public async executeChat(question: string, args?: { source?: ChatEventSource }): Promise<void> {
+    /**
+     * Execute a chat request in a new chat panel
+     */
+    public async executeChat(args: ExecuteChatArguments): Promise<ChatSession | undefined> {
         const requestID = uuid.v4()
         telemetryService.log('CodyVSCodeExtension:chat-question:submitted', {
             requestID,
-            ...args,
+            source: args?.source,
         })
-        const chatProvider = await this.getChatProvider()
-        await chatProvider.handleUserMessageSubmission(requestID, question, 'user-newchat', [], true)
-    }
-
-    // Execute a command request in a new chat panel
-    public async executeCommand(
-        command: CodyCommand,
-        args: CodyCommandArgs,
-        enabled = true
-    ): Promise<ChatSession | undefined> {
-        if (!enabled) {
-            void vscode.window.showErrorMessage(
-                'This feature has been disabled by your Sourcegraph site admin.'
-            )
-            return
-        }
 
-        logDebug('ChatManager:executeCommand:called', command.slashCommand)
-        if (!vscode.window.visibleTextEditors.length) {
-            void vscode.window.showErrorMessage('Please open a file before running a command.')
-            return
-        }
-
-        // Else, open a new chanel panel and run the command in the new panel
-        const chatProvider = await this.getChatProvider()
-        await chatProvider.handleCommand(command, args)
-        return chatProvider
+        const provider = await this.getChatProvider()
+        await provider?.handleUserMessageSubmission(
+            requestID,
+            args.text,
+            args?.submitType,
+            args?.contextFiles ?? [],
+            args?.addEnhancedContext ?? true
+        )
+        return provider
     }
 
     private async editChatHistory(treeItem?: vscode.TreeItem): Promise<void> {

vscode/src/chat/chat-view/ChatPanelsManager.ts

@@ -9,7 +9,6 @@ import {
     type Guardrails,
 } from '@sourcegraph/cody-shared'
 
-import type { CommandsController } from '../../commands/CommandsController'
 import type { LocalEmbeddingsController } from '../../local-context/local-embeddings'
 import type { SymfRunner } from '../../local-context/symf'
 import { logDebug } from '../../log'
@@ -67,8 +66,7 @@ export class ChatPanelsManager implements vscode.Disposable {
         private readonly localEmbeddings: LocalEmbeddingsController | null,
         private readonly symf: SymfRunner | null,
         private readonly enterpriseContext: EnterpriseContextFactory | null,
-        private readonly guardrails: Guardrails,
-        private readonly commandsController?: CommandsController
+        private readonly guardrails: Guardrails
     ) {
         logDebug('ChatPanelsManager:constructor', 'init')
         this.options = {
@@ -218,7 +216,6 @@ export class ChatPanelsManager implements vscode.Disposable {
             symf: isConsumer ? this.symf : null,
             enterpriseContext: isConsumer ? null : this.enterpriseContext,
             models,
-            commandsController: this.commandsController,
             guardrails: this.guardrails,
         })
     }