pair programming mode

Author: chungjac

packages/core/src/amazonq/webview/ui/apps/baseConnector.ts

@@ -194,6 +194,15 @@ export abstract class BaseConnector {
         })
     }
 
+    onPromptInputOptionChange = (tabId: string, optionsValues: Record<string, string>): void => {
+        this.sendMessageToExtension({
+            command: 'prompt-input-option-change',
+            optionsValues,
+            tabType: this.getTabType(),
+            tabID: tabId,
+        })
+    }
+
     requestGenerativeAIAnswer = (tabID: string, messageId: string, payload: ChatPayload): Promise<any> => {
         /**
          * When a user presses "enter" send an event that indicates

packages/core/src/amazonq/webview/ui/commands.ts

@@ -25,6 +25,7 @@ type MessageCommand =
     | 'help'
     | 'chat-item-voted'
     | 'chat-item-feedback'
+    | 'prompt-input-option-change'
     | 'link-was-clicked'
     | 'onboarding-page-interaction'
     | 'source-link-click'

packages/core/src/amazonq/webview/ui/connector.ts

@@ -97,6 +97,7 @@ export interface ConnectorProps {
     onUpdateAuthentication: (featureDevEnabled: boolean, authenticatingTabIDs: string[]) => void
     onNewTab: (tabType: TabType) => void
     onFileActionClick: (tabID: string, messageId: string, filePath: string, actionName: string) => void
+    onPromptInputOptionChange: (tabId: string, optionsValues: Record<string, string>, eventId?: string) => void
     handleCommand: (chatPrompt: ChatPrompt, tabId: string) => void
     sendStaticMessages: (tabID: string, messages: ChatItem[]) => void
     onContextCommandDataReceived: (message: MynahUIDataModel['contextCommands']) => void
@@ -617,6 +618,14 @@ export class Connector {
         }
     }
 
+    onPromptInputOptionChange = (tabId: string, optionsValues: Record<string, string>): void => {
+        switch (this.tabsStorage.getTab(tabId)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onPromptInputOptionChange(tabId, optionsValues)
+                break
+        }
+    }
+
     sendFeedback = (tabId: string, feedbackPayload: FeedbackPayload): void | undefined => {
         switch (this.tabsStorage.getTab(tabId)?.type) {
             case 'featuredev':

packages/core/src/amazonq/webview/ui/main.ts

@@ -239,6 +239,7 @@ export const createMynahUI = (
             }
         },
         onFileActionClick: (tabID: string, messageId: string, filePath: string, actionName: string): void => {},
+        onPromptInputOptionChange: (tabId: string, optionsValues: Record<string, string>, eventId?: string): void => {},
         onQuickHandlerCommand: (tabID: string, command?: string, eventId?: string) => {
             tabsStorage.updateTabLastCommand(tabID, command)
             if (command === 'aws.awsq.transform') {
@@ -926,6 +927,9 @@ export const createMynahUI = (
         onFileActionClick: async (tabID: string, messageId: string, filePath: string, actionName: string) => {
             connector.onFileActionClick(tabID, messageId, filePath, actionName)
         },
+        onPromptInputOptionChange: (tabId, optionsValues) => {
+            connector.onPromptInputOptionChange(tabId, optionsValues)
+        },
         onFileClick: connector.onFileClick,
         tabs: {
             'tab-1': {

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -72,6 +72,23 @@ export class TabDataGenerator {
                       },
                   ]
                 : [],
+            promptInputOptions: [
+                {
+                    type: 'toggle',
+                    id: 'prompt-type',
+                    value: 'ask',
+                    options: [
+                        {
+                            value: 'pair-programming-on',
+                            icon: 'code-block', // TODO: correct icons
+                        },
+                        {
+                            value: 'pair-programming-off',
+                            icon: 'chat', // TODO: correct icons
+                        },
+                    ],
+                },
+            ],
         }
         return tabData
     }

packages/core/src/codewhispererChat/app.ts

@@ -28,6 +28,7 @@ import {
     AcceptDiff,
     QuickCommandGroupActionClick,
     FileClick,
+    PromptInputOptionChange,
 } from './controllers/chat/model'
 import { EditorContextCommand, registerCommands } from './commands/registerCommands'
 import { ContextSelectedMessage, CustomFormActionMessage } from './view/connector/connector'
@@ -56,6 +57,7 @@ export function init(appContext: AmazonQAppInitContext) {
         processCustomFormAction: new EventEmitter<CustomFormActionMessage>(),
         processContextSelected: new EventEmitter<ContextSelectedMessage>(),
         processFileClick: new EventEmitter<FileClick>(),
+        processPromptInputOptionChange: new EventEmitter<PromptInputOptionChange>(),
     }
 
     const cwChatControllerMessageListeners = {
@@ -117,6 +119,9 @@ export function init(appContext: AmazonQAppInitContext) {
             cwChatControllerEventEmitters.processContextSelected
         ),
         processFileClick: new MessageListener<FileClick>(cwChatControllerEventEmitters.processFileClick),
+        processPromptInputOptionChange: new MessageListener<PromptInputOptionChange>(
+            cwChatControllerEventEmitters.processPromptInputOptionChange
+        ),
     }
 
     const cwChatControllerMessagePublishers = {
@@ -180,6 +185,9 @@ export function init(appContext: AmazonQAppInitContext) {
             cwChatControllerEventEmitters.processContextSelected
         ),
         processFileClick: new MessagePublisher<FileClick>(cwChatControllerEventEmitters.processFileClick),
+        processPromptInputOptionChange: new MessagePublisher<PromptInputOptionChange>(
+            cwChatControllerEventEmitters.processPromptInputOptionChange
+        ),
     }
 
     new CwChatController(

packages/core/src/codewhispererChat/constants.ts

@@ -30,6 +30,11 @@ export const tools: Tool[] = Object.entries(toolsJson).map(([, toolSpec]) => ({
         inputSchema: { json: toolSpec.inputSchema },
     },
 }))
+
+export const noWriteTools: Tool[] = tools.filter(
+    (tool) => !['fsWrite', 'executeBash'].includes(tool.toolSpecification?.name || '')
+)
+
 export const defaultContextLengths: ContextLengths = {
     additionalContextLengths: {
         fileContextLength: 0,

packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts

@@ -6,7 +6,6 @@
 import { ConversationState, CursorState, DocumentSymbol, SymbolType, TextDocument } from '@amzn/codewhisperer-streaming'
 import { AdditionalContentEntryAddition, ChatTriggerType, RelevantTextDocumentAddition, TriggerPayload } from '../model'
 import { undefinedIfEmpty } from '../../../../shared/utilities/textUtilities'
-import { tools } from '../../../constants'
 import { getLogger } from '../../../../shared/logger/logger'
 import vscode from 'vscode'
 
@@ -164,7 +163,7 @@ export function triggerPayloadToChatRequest(triggerPayload: TriggerPayload): { c
                             workspaceFolders: vscode.workspace.workspaceFolders?.map(({ uri }) => uri.fsPath) ?? [],
                         },
                         additionalContext: triggerPayload.additionalContents,
-                        tools,
+                        tools: triggerPayload.tools,
                         ...(triggerPayload.toolResults !== undefined &&
                             triggerPayload.toolResults !== null && { toolResults: triggerPayload.toolResults }),
                     },

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -32,6 +32,7 @@ import {
     DocumentReference,
     FileClick,
     RelevantTextDocumentAddition,
+    PromptInputOptionChange,
 } from './model'
 import {
     AppToWebViewMessageDispatcher,
@@ -85,6 +86,7 @@ import {
     tools,
     workspaceChunkMaxSize,
     defaultContextLengths,
+    noWriteTools,
 } from '../../constants'
 import { ChatSession } from '../../clients/chat/v0/chat'
 import { amazonQTabSuffix } from '../../../shared/constants'
@@ -118,6 +120,7 @@ export interface ChatControllerMessagePublishers {
     readonly processCustomFormAction: MessagePublisher<CustomFormActionMessage>
     readonly processContextSelected: MessagePublisher<ContextSelectedMessage>
     readonly processFileClick: MessagePublisher<FileClick>
+    readonly processPromptInputOptionChange: MessagePublisher<PromptInputOptionChange>
 }
 
 export interface ChatControllerMessageListeners {
@@ -143,6 +146,7 @@ export interface ChatControllerMessageListeners {
     readonly processCustomFormAction: MessageListener<CustomFormActionMessage>
     readonly processContextSelected: MessageListener<ContextSelectedMessage>
     readonly processFileClick: MessageListener<FileClick>
+    readonly processPromptInputOptionChange: MessageListener<PromptInputOptionChange>
 }
 
 export class ChatController {
@@ -278,6 +282,9 @@ export class ChatController {
         this.chatControllerMessageListeners.processFileClick.onMessage((data) => {
             return this.processFileClickMessage(data)
         })
+        this.chatControllerMessageListeners.processPromptInputOptionChange.onMessage((data) => {
+            return this.processPromptInputOptionChange(data)
+        })
     }
 
     private registerUserPromptsWatcher() {
@@ -760,6 +767,17 @@ export class ChatController {
             this.handlePromptCreate(message.tabID)
         }
     }
+
+    private async processPromptInputOptionChange(message: PromptInputOptionChange) {
+        const promptTypeValue = message.optionsValues['prompt-type']
+        // TODO: display message: You turned off pair programmer mode. Q will not include code diffs or run commands in the chat.
+        if (promptTypeValue === 'pair-programming-on') {
+            this.chatHistoryStorage.setTabAvailableTools(message.tabID, tools)
+        } else {
+            this.chatHistoryStorage.setTabAvailableTools(message.tabID, noWriteTools)
+        }
+    }
+
     private async processFileClickMessage(message: FileClick) {
         const session = this.sessionStorage.getSession(message.tabID)
         // Check if user clicked on filePath in the contextList or in the fileListTree and perform the functionality accordingly.
@@ -1326,6 +1344,7 @@ export class ChatController {
 
         triggerPayload.contextLengths.userInputContextLength = triggerPayload.message.length
         triggerPayload.contextLengths.focusFileContextLength = triggerPayload.fileText.length
+        triggerPayload.tools = this.chatHistoryStorage.getTabAvailableTools(tabID)
 
         const chatHistory = this.chatHistoryStorage.getTabHistory(tabID)
         const newUserMessage = {
@@ -1334,7 +1353,7 @@ export class ChatController {
                 userIntent: triggerPayload.userIntent,
                 ...(triggerPayload.origin && { origin: triggerPayload.origin }),
                 userInputMessageContext: {
-                    tools: tools,
+                    tools: triggerPayload.tools,
                     ...(triggerPayload.toolResults && { toolResults: triggerPayload.toolResults }),
                 },
             },

packages/core/src/codewhispererChat/controllers/chat/model.ts

@@ -9,6 +9,7 @@ import {
     ChatMessage,
     Origin,
     RelevantTextDocument,
+    Tool,
     ToolResult,
     UserIntent,
 } from '@amzn/codewhisperer-streaming'
@@ -161,6 +162,13 @@ export interface FileClick {
     filePath: string
 }
 
+export interface PromptInputOptionChange {
+    command: string
+    tabID: string
+    messageId: string
+    optionsValues: Record<string, string>
+}
+
 export interface ChatItemVotedMessage {
     tabID: string
     command: string
@@ -206,6 +214,7 @@ export interface TriggerPayload {
     chatHistory?: ChatMessage[]
     toolResults?: ToolResult[]
     origin?: Origin
+    tools?: Tool[]
 }
 
 export type ContextLengths = {