Skip to content

feat(chat): use ChatStream to show tool description #6873

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
Mar 27, 2025
Merged

feat(chat): use ChatStream to show tool description #6873

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
113 changes: 15 additions & 98 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 @@ -41,8 +41,8 @@ import { extractAuthFollowUp } from '../../../../amazonq/util/authUtils'
import { helpMessage } from '../../../../amazonq/webview/ui/texts/constants'
import { ChatItemButton, ChatItemFormItem, MynahUIDataModel } from '@aws/mynah-ui'
import { ChatHistoryManager } from '../../../storages/chatHistory'
import { ExecuteBashParams } from '../../../tools/executeBash'
import { FsWriteParams } from '../../../tools/fsWrite'
import { ToolUtils } from '../../../tools/toolUtils'
import { ChatStream } from '../../../tools/chatStream'

export type StaticTextResponseType = 'quick-action-help' | 'onboarding-help' | 'transform' | 'help'

Expand Down Expand Up @@ -213,39 +213,19 @@ export class Messenger {
toolUse.name = cwChatEvent.toolUseEvent.name ?? ''
session.setToolUse(toolUse)

const message = this.getToolUseMessage(toolUse)
// const isConfirmationRequired = this.getIsConfirmationRequired(toolUse)
const tool = ToolUtils.tryFromToolUse(toolUse)
if ('type' in tool) {
const chatStream = new ChatStream(this, tabID, triggerID, toolUse.toolUseId)
ToolUtils.queueDescription(tool, chatStream)

// TODO: If toolUse is fs_write then session.setShowDiffOnFileWrite(true)

this.dispatcher.sendChatMessage(
new ChatMessage(
{
message,
messageType: 'answer',
followUps: undefined,
followUpsHeader: undefined,
relatedSuggestions: undefined,
codeReference,
triggerID,
messageID: toolUse.toolUseId,
userIntent: triggerPayload.userIntent,
codeBlockLanguage: codeBlockLanguage,
contextList: undefined,
// TODO: confirmation buttons
},
tabID
this.dispatcher.sendCustomFormActionMessage(
new CustomFormActionMessage(tabID, {
id: 'confirm-tool-use',
})
)
)

this.dispatcher.sendCustomFormActionMessage(
new CustomFormActionMessage(tabID, {
id: 'confirm-tool-use',
})
)
// TODO: setup permission action
// if (!isConfirmationRequired) {
// }
} else {
// TODO: Handle the error
}
}

if (
Expand Down Expand Up @@ -438,7 +418,7 @@ export class Messenger {
)
}

public sendPartialBashToolLog(message: string, tabID: string, triggerID: string, toolUseId: string | undefined) {
public sendPartialToolLog(message: string, tabID: string, triggerID: string, toolUseId: string | undefined) {
this.dispatcher.sendChatMessage(
new ChatMessage(
{
Expand All @@ -450,7 +430,7 @@ export class Messenger {
triggerID,
messageID: toolUseId ?? `tool-output`,
userIntent: undefined,
codeBlockLanguage: 'plaintext',
codeBlockLanguage: undefined,
Copy link
Contributor

@ashishrp-aws ashishrp-aws Mar 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: why is it undefined here for tool logs?

Copy link
Contributor Author

@ctlai95 ctlai95 Mar 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking it should be generic, not always plaintext

contextList: undefined,
canBeVoted: false,
},
Expand Down Expand Up @@ -617,67 +597,4 @@ export class Messenger {
new ShowCustomFormMessage(tabID, formItems, buttons, title, description)
)
}

// TODO: Make this cleaner
// private getIsConfirmationRequired(toolUse: ToolUse) {
// if (toolUse.name === 'execute_bash') {
// const executeBash = new ExecuteBash(toolUse.input as unknown as ExecuteBashParams)
// return executeBash.requiresAcceptance()
// }
// return toolUse.name === 'fs_write'
// }
private getToolUseMessage(toolUse: ToolUse) {
if (toolUse.name === 'fsRead') {
return `Reading the file at \`${(toolUse.input as any)?.path}\` using the \`fsRead\` tool.`
}
if (toolUse.name === 'executeBash') {
const input = toolUse.input as unknown as ExecuteBashParams
return `Executing the bash command
\`\`\`bash
${input.command}
\`\`\`
using the \`executeBash\` tool.`
}
if (toolUse.name === 'fsWrite') {
const input = toolUse.input as unknown as FsWriteParams
switch (input.command) {
case 'create': {
return `Writing
\`\`\`
${input.fileText}
\`\`\`
into the file at \`${input.path}\` using the \`fsWrite\` tool.`
}
case 'strReplace': {
return `Replacing
\`\`\`
${input.oldStr}
\`\`\`
with
\`\`\`
${input.newStr}
\`\`\`
at \`${input.path}\` using the \`fsWrite\` tool.`
}
case 'insert': {
return `Inserting
\`\`\`
${input.newStr}
\`\`\`
at line
\`\`\`
${input.insertLine}
\`\`\`
at \`${input.path}\` using the \`fsWrite\` tool.`
}
case 'append': {
return `Appending
\`\`\`
${input.newStr}
\`\`\`
at \`${input.path}\` using the \`fsWrite\` tool.`
}
}
}
}
}
15 changes: 3 additions & 12 deletions packages/core/src/codewhispererChat/tools/chatStream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,20 @@ export class ChatStream extends Writable {
) {
super()
this.logger.debug(`ChatStream created for tabID: ${tabID}, triggerID: ${triggerID}`)
this.messenger.sendInitalStream(tabID, triggerID, undefined)
}

override _write(chunk: Buffer, encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
const text = chunk.toString()
this.accumulatedLogs += text
this.logger.debug(`ChatStream received chunk: ${text}`)
this.messenger.sendPartialBashToolLog(
`\`\`\`bash\n${this.accumulatedLogs}\`\`\``,
this.tabID,
this.triggerID,
this.toolUseId
)
this.messenger.sendPartialToolLog(this.accumulatedLogs, this.tabID, this.triggerID, this.toolUseId)
callback()
}

override _final(callback: (error?: Error | null) => void): void {
if (this.accumulatedLogs.trim().length > 0) {
this.messenger.sendPartialBashToolLog(
`\`\`\`bash\n${this.accumulatedLogs}\`\`\``,
this.tabID,
this.triggerID,
this.toolUseId
)
this.messenger.sendPartialToolLog(this.accumulatedLogs, this.tabID, this.triggerID, this.toolUseId)
}
callback()
}
Expand Down
13 changes: 6 additions & 7 deletions packages/core/src/codewhispererChat/tools/executeBash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export class ExecuteBash {
const stdoutBuffer: string[] = []
const stderrBuffer: string[] = []

let firstChunk = true
const childProcessOptions: ChildProcessOptions = {
spawnOptions: {
cwd: this.workingDirectory,
Expand All @@ -82,7 +83,8 @@ export class ExecuteBash {
collect: false,
waitForStreams: true,
onStdout: (chunk: string) => {
ExecuteBash.handleChunk(chunk, stdoutBuffer, updates)
ExecuteBash.handleChunk(firstChunk ? '```console\n' + chunk : chunk, stdoutBuffer, updates)
firstChunk = false
},
onStderr: (chunk: string) => {
ExecuteBash.handleChunk(chunk, stderrBuffer, updates)
Expand Down Expand Up @@ -203,11 +205,8 @@ export class ExecuteBash {
}

public queueDescription(updates: Writable): void {
updates.write(`I will run the following shell command: `)

if (this.command.length > 20) {
updates.write('\n')
}
updates.write(`\x1b[32m${this.command}\x1b[0m\n`)
updates.write(`I will run the following shell command:\n`)
updates.write('```bash\n' + this.command + '\n```')
updates.end()
}
}