Merge pull request aws#7027 from jguoamz/fixMerge

mr-lee · web-flow · commit 90c0d1b52f8e · 2025-04-11T19:54:03.000-04:00
fix(chat): Fix failure caused by merge conflicts
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) {`