Skip to content

Commit 3b0d826

Browse files
committed
fix(amazonq): Don't send agentic chat fields in the message to mynah-ui
1 parent de4b24f commit 3b0d826

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import * as vscode from 'vscode'
1313
import { Messenger } from './messenger/messenger'
1414
import { Database } from '../../../shared/db/chatDb/chatDb'
1515
import { TabBarButtonClick, SaveChatMessage } from './model'
16-
import { Conversation, Tab } from '../../../shared/db/chatDb/util'
16+
import { Conversation, messageToChatItem, Tab } from '../../../shared/db/chatDb/util'
1717
import { DetailedListItemGroup, MynahIconsType } from '@aws/mynah-ui'
1818

1919
export class TabBarController {
@@ -87,7 +87,9 @@ export class TabBarController {
8787
this.messenger.sendRestoreTabMessage(
8888
selectedTab.historyId,
8989
selectedTab.tabType,
90-
selectedTab.conversations.flatMap((conv: Conversation) => conv.messages),
90+
selectedTab.conversations.flatMap((conv: Conversation) =>
91+
conv.messages.map((message) => messageToChatItem(message))
92+
),
9193
exportTab
9294
)
9395
}

packages/core/src/shared/db/chatDb/util.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import path from 'path'
77

88
import { TabType } from '../../../amazonq/webview/ui/storages/tabsStorage'
99
import {
10+
ChatItem,
1011
ChatItemButton,
1112
ChatItemType,
1213
DetailedListItem,
@@ -80,6 +81,18 @@ export function messageToChatMessage(msg: Message): ChatMessage {
8081
}
8182
}
8283

84+
/**
85+
* Converts Message to MynahUI Chat Item
86+
*/
87+
export function messageToChatItem(msg: Message): ChatItem {
88+
return {
89+
body: msg.body,
90+
type: msg.type as ChatItemType,
91+
codeReference: msg.codeReference,
92+
relatedContent: msg.relatedContent && msg.relatedContent?.content.length > 0 ? msg.relatedContent : undefined,
93+
}
94+
}
95+
8396
/**
8497
*
8598
* This adapter implements the LokiPersistenceAdapter interface for file system operations using web-compatible shared fs utils.

0 commit comments

Comments
 (0)