code changes for 4/16 bugbash

Author: Randall-Jiang

package-lock.json

@@ -525,7 +525,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.31.0-beta.3",
+        "@aws/mynah-ui": "^4.31.0-beta.5",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",

packages/core/package.json

@@ -816,7 +816,7 @@ export class Messenger {
                 {
                     id: 'reject-code-diff',
                     status: 'clear',
-                    icon: 'revert' as MynahIconsType,
+                    icon: 'undo' as MynahIconsType,
                     text: 'Undo',
                 },
             ]
@@ -860,7 +860,7 @@ export class Messenger {
             new ChatMessage(
                 {
                     message: message,
-                    messageType: 'answer-part',
+                    messageType: 'answer',
                     followUps: undefined,
                     followUpsHeader: undefined,
                     relatedSuggestions: undefined,

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

@@ -431,8 +431,30 @@ export class ExecuteBash {
         return output
     }
 
+    private getDisplayCommand(): string {
+        const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+        if (!workspaceFolder || !this.workingDirectory) {
+            return this.command
+        }
+        const workspacePath = path.normalize(workspaceFolder.uri.fsPath)
+        const cwd = path.normalize(this.workingDirectory)
+
+        const cleanedCommand = this.command.replace(/^cd\s+[^\n]+?&&\s*/, '').trim()
+
+        if (!cwd.startsWith(workspacePath)) {
+            return this.command
+        }
+
+        const relativePath = path.relative(workspacePath, cwd)
+        if (!relativePath || relativePath === '.') {
+            return cleanedCommand
+        }
+
+        return `cd "/${relativePath.replace(/\\/g, '/')}" && ${cleanedCommand}`
+    }
+
     public queueDescription(updates: Writable): void {
-        updates.write('```shell\n' + this.command + '\n```')
+        updates.write('```shell\n' + this.getDisplayCommand() + '\n```')
         updates.end()
     }