fix the import parameter in controller and the programmer mode UI

Randall-Jiang · Randall-Jiang · commit fba7fc5f4417 · 2025-04-12T09:27:15.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.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.30.1",
+        "@aws/mynah-ui": "^4.31.0-beta.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/core/src/amazonq/webview/ui/tabs/generator.ts b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
@@ -91,20 +91,11 @@ export class TabDataGenerator {
                 tabType === 'cwc'
                     ? [
                           {
-                              type: 'toggle',
-                              id: 'prompt-type',
-                              value: 'pair-programming-on',
-                              tooltip: 'Pair programmer on',
-                              options: [
-                                  {
-                                      value: 'pair-programming-on',
-                                      icon: 'code-block', // TODO: correct icons
-                                  },
-                                  {
-                                      value: 'pair-programming-off',
-                                      icon: 'chat', // TODO: correct icons
-                                  },
-                              ],
+                              type: 'switch',
+                              id: 'pair-programmer-mode',
+                              tooltip: 'Enable or disable pair programmer mode',
+                              value: 'true',
+                              icon: 'code-block',
                           },
                       ]
                     : [],
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -787,7 +787,7 @@ export class ChatController {
                                 chatStream,
                                 ConversationTracker.getInstance().getTokenForTrigger(triggerID)
                             )
-                            ToolUtils.validateOutput(output)
+                            ToolUtils.validateOutput(output, tool.type)
 
                             let status: ToolResultStatus = ToolResultStatus.SUCCESS
                             if (output.output.success === false) {

Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ export class ChatController {`
`787`	`787`	`chatStream,`
`788`	`788`	`ConversationTracker.getInstance().getTokenForTrigger(triggerID)`
`789`	`789`	`)`
`790`		`- ToolUtils.validateOutput(output)`
	`790`	`+ ToolUtils.validateOutput(output, tool.type)`
`791`	`791`
`792`	`792`	`let status: ToolResultStatus = ToolResultStatus.SUCCESS`
`793`	`793`	`if (output.output.success === false) {`