push local changes

Author: yueny2020

packages/core/package.json

@@ -522,7 +522,7 @@
         "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws/mynah-ui": "^4.26.1",
+        "@aws/mynah-ui": "^4.27.0",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^3.0.0",

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

@@ -109,8 +109,17 @@ export class Connector extends BaseConnector {
                 title: messageData.title,
                 buttons: messageData.buttons ?? undefined,
                 fileList: messageData.fileList ?? undefined,
+                header: messageData.header ?? undefined,
+                padding: messageData.padding ?? false,
+                fullWidth: messageData.fullWidth ?? undefined,
+                codeBlockActions: messageData.codeBlockActions ?? undefined,
             }
 
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.log('messageData', messageData)
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.log('answer', answer)
+
             if (messageData.relatedSuggestions !== undefined) {
                 answer.relatedContent = {
                     title: 'Sources',

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

@@ -353,6 +353,11 @@ export const createMynahUI = (
                     ...(item.fileList !== undefined ? { fileList: item.fileList } : {}),
                     ...(item.header !== undefined ? { header: item.header } : { header: undefined }),
                     ...(item.buttons !== undefined ? { buttons: item.buttons } : { buttons: undefined }),
+                    ...(item.fullWidth !== undefined ? { fullWidth: item.fullWidth } : { fullWidth: undefined }),
+                    ...(item.padding !== undefined ? { padding: item.padding } : { padding: undefined }),
+                    ...(item.codeBlockActions !== undefined
+                        ? { codeBlockActions: item.codeBlockActions }
+                        : { codeBlockActions: undefined }),
                 })
                 if (
                     item.messageId !== undefined &&

packages/core/src/codewhisperer/client/codewhisperer.ts

@@ -31,8 +31,8 @@ export interface CodeWhispererConfig {
 }
 
 export const defaultServiceConfig: CodeWhispererConfig = {
-    region: 'us-east-1',
-    endpoint: 'https://codewhisperer.us-east-1.amazonaws.com/',
+    region: 'us-west-2',
+    endpoint: 'https://rts.alpha-us-west-2.codewhisperer.ai.aws.dev/',
 }
 
 export function getCodewhispererConfig(): CodeWhispererConfig {

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

@@ -957,7 +957,7 @@ export class ChatController {
                     try {
                         await ToolUtils.validate(tool)
 
-                        const chatStream = new ChatStream(this.messenger, tabID, triggerID, toolUse.toolUseId)
+                        const chatStream = new ChatStream(this.messenger, tabID, triggerID, toolUse)
                         const output = await ToolUtils.invoke(tool, chatStream)
 
                         toolResults.push({

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

@@ -39,9 +39,9 @@ import { LspController } from '../../../../amazonq/lsp/lspController'
 import { extractCodeBlockLanguage } from '../../../../shared/markdown'
 import { extractAuthFollowUp } from '../../../../amazonq/util/authUtils'
 import { helpMessage } from '../../../../amazonq/webview/ui/texts/constants'
-import { ChatItemButton, ChatItemFormItem, MynahUIDataModel } from '@aws/mynah-ui'
+import { ChatItemButton, ChatItemFormItem, MynahIconsType, MynahUIDataModel } from '@aws/mynah-ui'
 import { ChatHistoryManager } from '../../../storages/chatHistory'
-import { ToolUtils } from '../../../tools/toolUtils'
+import { ToolType, ToolUtils } from '../../../tools/toolUtils'
 import { ChatStream } from '../../../tools/chatStream'
 
 export type StaticTextResponseType = 'quick-action-help' | 'onboarding-help' | 'transform' | 'help'
@@ -217,13 +217,7 @@ export class Messenger {
                         if ('type' in tool) {
                             const requiresAcceptance = ToolUtils.requiresAcceptance(tool)
 
-                            const chatStream = new ChatStream(
-                                this,
-                                tabID,
-                                triggerID,
-                                toolUse.toolUseId,
-                                requiresAcceptance
-                            )
+                            const chatStream = new ChatStream(this, tabID, triggerID, toolUse, requiresAcceptance)
                             ToolUtils.queueDescription(tool, chatStream)
 
                             if (!requiresAcceptance) {
@@ -432,15 +426,16 @@ export class Messenger {
         message: string,
         tabID: string,
         triggerID: string,
-        toolUseId: string | undefined,
+        toolUse: ToolUse | undefined,
         requiresAcceptance = false
     ) {
         const buttons: ChatItemButton[] = []
         if (requiresAcceptance) {
             buttons.push({
+                icon: 'play' as MynahIconsType,
                 id: 'confirm-tool-use',
-                text: 'Confirm',
-                position: 'outside',
+                status: 'clear',
+                text: 'Run',
             })
         }
 
@@ -453,12 +448,25 @@ export class Messenger {
                     followUpsHeader: undefined,
                     relatedSuggestions: undefined,
                     triggerID,
-                    messageID: toolUseId ?? `tool-output`,
+                    messageID: toolUse?.toolUseId ?? `tool-output`,
                     userIntent: undefined,
                     codeBlockLanguage: undefined,
                     contextList: undefined,
                     canBeVoted: false,
-                    buttons,
+                    buttons: toolUse?.name === ToolType.ExecuteBash ? undefined : buttons,
+                    fullWidth: true,
+                    header:
+                        toolUse?.name === ToolType.ExecuteBash
+                            ? {
+                                  icon: 'code-block' as MynahIconsType,
+                                  body: 'Terminal command',
+                                  buttons: buttons,
+                              }
+                            : undefined,
+                    codeBlockActions:
+                        // eslint-disable-next-line unicorn/no-null
+                        toolUse?.name === ToolType.ExecuteBash ? { 'insert-to-cursor': null, copy: null } : undefined,
+                    padding: toolUse?.name === ToolType.ExecuteBash ? true : false,
                 },
                 tabID
             )

packages/core/src/codewhispererChat/tools/chatStream.ts

@@ -6,6 +6,7 @@
 import { Writable } from 'stream'
 import { getLogger } from '../../shared/logger/logger'
 import { Messenger } from '../controllers/chat/messenger/messenger'
+import { ToolUse } from '@amzn/codewhisperer-streaming'
 
 /**
  * A writable stream that feeds each chunk/line to the chat UI.
@@ -18,7 +19,7 @@ export class ChatStream extends Writable {
         private readonly messenger: Messenger,
         private readonly tabID: string,
         private readonly triggerID: string,
-        private readonly toolUseId: string | undefined,
+        private readonly toolUse: ToolUse | undefined,
         private readonly requiresAcceptance = false,
         private readonly logger = getLogger('chatStream')
     ) {
@@ -35,19 +36,20 @@ export class ChatStream extends Writable {
             this.accumulatedLogs,
             this.tabID,
             this.triggerID,
-            this.toolUseId,
+            this.toolUse,
             this.requiresAcceptance
         )
         callback()
     }
 
     override _final(callback: (error?: Error | null) => void): void {
+        this.logger.info(`this.accumulatedLogs: ${this.accumulatedLogs}`)
         if (this.accumulatedLogs.trim().length > 0) {
             this.messenger.sendPartialToolLog(
                 this.accumulatedLogs,
                 this.tabID,
                 this.triggerID,
-                this.toolUseId,
+                this.toolUse,
                 this.requiresAcceptance
             )
         }

packages/core/src/codewhispererChat/tools/executeBash.ts

@@ -205,8 +205,7 @@ export class ExecuteBash {
     }
 
     public queueDescription(updates: Writable): void {
-        updates.write(`I will run the following shell command:\n`)
-        updates.write('```bash\n' + this.command + '\n```')
+        updates.write(`\n\`\`\`shell\n${this.command}\n\`\`\`\n`)
         updates.end()
     }
 }

packages/core/src/codewhispererChat/view/connector/connector.ts

@@ -7,7 +7,17 @@ import { Timestamp } from 'aws-sdk/clients/apigateway'
 import { MessagePublisher } from '../../../amazonq/messages/messagePublisher'
 import { EditorContextCommandType } from '../../commands/registerCommands'
 import { AuthFollowUpType } from '../../../amazonq/auth/model'
-import { ChatItemButton, ChatItemContent, ChatItemFormItem, MynahUIDataModel, QuickActionCommand } from '@aws/mynah-ui'
+import {
+    ChatItemButton,
+    ChatItemContent,
+    ChatItemFormItem,
+    CodeBlockActions,
+    MynahIcons,
+    MynahIconsType,
+    MynahUIDataModel,
+    QuickActionCommand,
+    Status,
+} from '@aws/mynah-ui'
 import { DocumentReference } from '../../controllers/chat/model'
 
 class UiMessage {
@@ -212,6 +222,19 @@ export interface ChatMessageProps {
     readonly buttons?: ChatItemButton[]
     readonly fileList?: ChatItemContent['fileList']
     readonly canBeVoted?: boolean
+    readonly codeBlockActions?: CodeBlockActions | null
+    readonly header?:
+        | (ChatItemContent & {
+              icon?: MynahIcons | MynahIconsType
+              status?: {
+                  status?: Status
+                  icon?: MynahIcons | MynahIconsType
+                  text?: string
+              }
+          })
+        | null
+    readonly fullWidth?: boolean
+    readonly padding?: boolean
 }
 
 export class ChatMessage extends UiMessage {
@@ -232,6 +255,19 @@ export class ChatMessage extends UiMessage {
     readonly fileList?: ChatItemContent['fileList']
     readonly canBeVoted?: boolean = false
     override type = 'chatMessage'
+    readonly codeBlockActions?: CodeBlockActions | null
+    readonly header?:
+        | (ChatItemContent & {
+              icon?: MynahIcons | MynahIconsType
+              status?: {
+                  status?: Status
+                  icon?: MynahIcons | MynahIconsType
+                  text?: string
+              }
+          })
+        | null
+    readonly fullWidth?: boolean
+    readonly padding?: boolean
 
     constructor(props: ChatMessageProps, tabID: string) {
         super(tabID)
@@ -250,6 +286,10 @@ export class ChatMessage extends UiMessage {
         this.buttons = props.buttons
         this.fileList = props.fileList
         this.canBeVoted = props.canBeVoted
+        this.codeBlockActions = props.codeBlockActions
+        this.header = props.header
+        this.fullWidth = props.fullWidth
+        this.padding = props.padding
     }
 }
 

packages/core/src/codewhispererChat/view/messages/messageListener.ts

@@ -38,6 +38,7 @@ export class UIMessageListener {
             case 'clear':
             case 'transform':
             case 'chat-prompt':
+                // listen here
                 this.processChatMessage(msg)
                 break
             case 'new-tab-was-created':
@@ -249,6 +250,7 @@ export class UIMessageListener {
         })
     }
 
+    // na yue create someting similar -> web view to mynah
     private processChatMessage(msg: any) {
         this.chatControllerMessagePublishers.processPromptChatMessage.publish({
             message: msg.chatMessage,