Skip to content

fix(chat): disable prompt during loop #6986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

fix(chat): disable prompt during loop #6986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export class Connector extends BaseConnector {
padding: messageData.padding ?? undefined,
fullWidth: messageData.fullWidth ?? undefined,
codeBlockActions: messageData.codeBlockActions ?? undefined,
rootFolderTitle: messageData.rootFolderTitle ?? undefined,
}

if (messageData.relatedSuggestions !== undefined) {
Expand Down Expand Up @@ -257,14 +258,15 @@ export class Connector extends BaseConnector {
}

if (messageData.type === 'asyncEventProgressMessage') {
const enableStopAction = true
const enableStopAction = false
const isPromptInputDisabled = true
this.onAsyncEventProgress(
messageData.tabID,
messageData.inProgress,
messageData.message ?? undefined,
messageData.messageId ?? undefined,
enableStopAction,
false
isPromptInputDisabled
)
return
}
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/amazonq/webview/ui/connector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export interface CWCChatItem extends ChatItem {
codeBlockLanguage?: string
contextList?: Context[]
title?: string
rootFolderTitle?: string
}

export interface Context {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/amazonq/webview/ui/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ export const createMynahUI = (
fileList: {
fileTreeTitle: '',
filePaths: item.contextList.map((file) => file.relativeFilePath),
rootFolderTitle: item.title,
rootFolderTitle: item.rootFolderTitle,
flatList: true,
collapsed: true,
hideFileCount: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/codewhispererChat/controllers/chat/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ export class ChatController {
let response: MessengerResponseType | undefined = undefined
session.createNewTokenSource()
try {
if (!session.context) {
if (!session.context && triggerPayload.context.length) {
// Only show context for the first message in the loop
this.messenger.sendContextMessage(tabID, triggerID, triggerPayload.documentReferences)
session.setContext(triggerPayload.context)
Expand Down
17 changes: 9 additions & 8 deletions packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export class Messenger {
new ChatMessage(
{
message: '',
messageType: 'answer',
messageType: 'answer-stream',
followUps: undefined,
followUpsHeader: undefined,
relatedSuggestions: undefined,
Expand All @@ -139,7 +139,8 @@ export class Messenger {
userIntent: undefined,
codeBlockLanguage: undefined,
contextList: mergedRelevantDocuments,
title: 'Context',
title: '',
rootFolderTitle: 'Context',
buttons: undefined,
fileList: undefined,
canBeVoted: false,
Expand Down Expand Up @@ -452,11 +453,16 @@ export class Messenger {
)
}

const agenticLoopEnded = !eventCounts.has('toolUseEvent')
if (agenticLoopEnded) {
// Reset context for the next request
session.setContext(undefined)
}
this.dispatcher.sendChatMessage(
new ChatMessage(
{
message: undefined,
messageType: 'answer',
messageType: agenticLoopEnded ? 'answer' : 'answer-stream',
followUps: followUps,
followUpsHeader: undefined,
relatedSuggestions: undefined,
Expand All @@ -480,11 +486,6 @@ export class Messenger {
toolUse.input !== '' && { toolUses: [{ ...toolUse }] }),
},
})
const agenticLoopEnded = !eventCounts.has('toolUseEvent')
if (agenticLoopEnded) {
// Reset context for the next request
session.setContext(undefined)
}

getLogger().info(
`All events received. requestId=%s counts=%s`,
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/codewhispererChat/view/connector/connector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ export interface ChatMessageProps {
readonly fullWidth?: boolean
readonly padding?: boolean
readonly codeBlockActions?: CodeBlockActions | null
readonly rootFolderTitle?: string
}

export class ChatMessage extends UiMessage {
Expand All @@ -375,6 +376,7 @@ export class ChatMessage extends UiMessage {
readonly padding?: boolean
readonly codeBlockActions?: CodeBlockActions | null
readonly canBeVoted?: boolean = false
readonly rootFolderTitle?: string
override type = 'chatMessage'

constructor(props: ChatMessageProps, tabID: string) {
Expand All @@ -398,6 +400,7 @@ export class ChatMessage extends UiMessage {
this.fullWidth = props.fullWidth
this.padding = props.padding
this.codeBlockActions = props.codeBlockActions
this.rootFolderTitle = props.rootFolderTitle
}
}

Expand Down