Skip to content

fix(chat): Fix ChatStream error caused by tool error #6954

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

fix(chat): Fix ChatStream error caused by tool error #6954

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
15 changes: 10 additions & 5 deletions packages/core/src/codewhispererChat/clients/chat/v0/chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ import { createQDeveloperStreamingClient } from '../../../../shared/clients/qDev
import { UserWrittenCodeTracker } from '../../../../codewhisperer/tracker/userWrittenCodeTracker'
import { PromptMessage } from '../../../controllers/chat/model'

export type ToolUseWithError = {
toolUse: ToolUse
error: Error | undefined
}

export class ChatSession {
private sessionId?: string
/**
Expand All @@ -24,7 +29,7 @@ export class ChatSession {
* _context = Additional context to be passed to the LLM for generating the response
*/
private _readFiles: string[] = []
private _toolUse: ToolUse | undefined
private _toolUseWithError: ToolUseWithError | undefined
private _showDiffOnFileWrite: boolean = false
private _context: PromptMessage['context']
private _pairProgrammingModeOn: boolean = true
Expand All @@ -49,12 +54,12 @@ export class ChatSession {
this._pairProgrammingModeOn = pairProgrammingModeOn
}

public get toolUse(): ToolUse | undefined {
return this._toolUse
public get toolUseWithError(): ToolUseWithError | undefined {
return this._toolUseWithError
}

public setToolUse(toolUse: ToolUse | undefined) {
this._toolUse = toolUse
public setToolUseWithError(toolUseWithError: ToolUseWithError | undefined) {
this._toolUseWithError = toolUseWithError
}

public get context(): PromptMessage['context'] {
Expand Down
168 changes: 56 additions & 112 deletions 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 @@ -675,69 +675,6 @@ export class ChatController {
telemetry.ui_click.emit({ elementId: 'amazonq_createSavedPrompt' })
}

private async processUnavailableToolUseMessage(message: CustomFormActionMessage) {
const tabID = message.tabID
if (!tabID) {
return
}
this.editorContextExtractor
.extractContextForTrigger('ChatMessage')
.then(async (context) => {
const triggerID = randomUUID()
this.triggerEventsStorage.addTriggerEvent({
id: triggerID,
tabID: message.tabID,
message: undefined,
type: 'chat_message',
context,
})
const session = this.sessionStorage.getSession(tabID)
const toolUse = session.toolUse
if (!toolUse || !toolUse.input) {
return
}
session.setToolUse(undefined)

const toolResults: ToolResult[] = []

toolResults.push({
content: [{ text: 'This tool is not an available tool in this mode' }],
toolUseId: toolUse.toolUseId,
status: ToolResultStatus.ERROR,
})

await this.generateResponse(
{
message: '',
trigger: ChatTriggerType.ChatMessage,
query: undefined,
codeSelection: context?.focusAreaContext?.selectionInsideExtendedCodeBlock,
fileText: context?.focusAreaContext?.extendedCodeBlock ?? '',
fileLanguage: context?.activeFileContext?.fileLanguage,
filePath: context?.activeFileContext?.filePath,
matchPolicy: context?.activeFileContext?.matchPolicy,
codeQuery: context?.focusAreaContext?.names,
userIntent: undefined,
customization: getSelectedCustomization(),
toolResults: toolResults,
origin: Origin.IDE,
context: session.context ?? [],
relevantTextDocuments: [],
additionalContents: [],
documentReferences: [],
useRelevantDocuments: false,
contextLengths: {
...defaultContextLengths,
},
},
triggerID
)
})
.catch((e) => {
this.processException(e, tabID)
})
}

private async processToolUseMessage(message: CustomFormActionMessage) {
const tabID = message.tabID
if (!tabID) {
Expand All @@ -756,59 +693,69 @@ export class ChatController {
})
this.messenger.sendAsyncEventProgress(tabID, true, '')
const session = this.sessionStorage.getSession(tabID)
const toolUse = session.toolUse
if (!toolUse || !toolUse.input) {
const toolUseWithError = session.toolUseWithError
if (!toolUseWithError || !toolUseWithError.toolUse || !toolUseWithError.toolUse.input) {
// Turn off AgentLoop flag if there's no tool use
this.sessionStorage.setAgentLoopInProgress(tabID, false)
return
}
session.setToolUse(undefined)
session.setToolUseWithError(undefined)

const toolUse = toolUseWithError.toolUse
const toolUseError = toolUseWithError.error
const toolResults: ToolResult[] = []

const result = ToolUtils.tryFromToolUse(toolUse)
if ('type' in result) {
const tool: Tool = result

try {
await ToolUtils.validate(tool)

const chatStream = new ChatStream(this.messenger, tabID, triggerID, toolUse, {
requiresAcceptance: false,
})
const output = await ToolUtils.invoke(tool, chatStream)
if (output.output.content.length > maxToolOutputCharacterLength) {
throw Error(
`Tool output exceeds maximum character limit of ${maxToolOutputCharacterLength}`
)
if (toolUseError) {
toolResults.push({
content: [{ text: toolUseError.message }],
toolUseId: toolUse.toolUseId,
status: ToolResultStatus.ERROR,
})
} else {
const result = ToolUtils.tryFromToolUse(toolUse)
if ('type' in result) {
const tool: Tool = result

try {
await ToolUtils.validate(tool)

const chatStream = new ChatStream(this.messenger, tabID, triggerID, toolUse, {
requiresAcceptance: false,
})
const output = await ToolUtils.invoke(tool, chatStream)
if (output.output.content.length > maxToolOutputCharacterLength) {
throw Error(
`Tool output exceeds maximum character limit of ${maxToolOutputCharacterLength}`
)
}

toolResults.push({
content: [
output.output.kind === OutputKind.Text
? { text: output.output.content }
: { json: output.output.content },
],
toolUseId: toolUse.toolUseId,
status: ToolResultStatus.SUCCESS,
})
} catch (e: any) {
toolResults.push({
content: [{ text: e.message }],
toolUseId: toolUse.toolUseId,
status: ToolResultStatus.ERROR,
})
}

toolResults.push({
content: [
output.output.kind === OutputKind.Text
? { text: output.output.content }
: { json: output.output.content },
],
toolUseId: toolUse.toolUseId,
status: ToolResultStatus.SUCCESS,
})
} catch (e: any) {
toolResults.push({
content: [{ text: e.message }],
toolUseId: toolUse.toolUseId,
status: ToolResultStatus.ERROR,
})
} else {
const toolResult: ToolResult = result
toolResults.push(toolResult)
}
} else {
const toolResult: ToolResult = result
toolResults.push(toolResult)
}

if (toolUse.name === ToolType.FsWrite) {
await vscode.commands.executeCommand(
'vscode.open',
vscode.Uri.file((toolUse.input as unknown as FsWriteParams).path)
)
if (toolUse.name === ToolType.FsWrite) {
await vscode.commands.executeCommand(
'vscode.open',
vscode.Uri.file((toolUse.input as unknown as FsWriteParams).path)
)
}
}

await this.generateResponse(
Expand Down Expand Up @@ -879,9 +826,6 @@ export class ChatController {
case 'reject-shell-command':
await this.rejectShellCommand(message)
break
case 'tool-unavailable':
await this.processUnavailableToolUseMessage(message)
break
default:
getLogger().warn(`Unhandled action: ${message.action.id}`)
}
Expand Down Expand Up @@ -920,19 +864,19 @@ export class ChatController {
await fs.mkdir(resultArtifactsDir)
const tempFilePath = path.join(
resultArtifactsDir,
`temp-${path.basename((session.toolUse?.input as unknown as FsWriteParams).path)}`
`temp-${path.basename((session.toolUseWithError?.toolUse.input as unknown as FsWriteParams).path)}`
)

// If we have existing filePath copy file content from existing file to temporary file.
const filePath = (session.toolUse?.input as any).path ?? message.filePath
const filePath = (session.toolUseWithError?.toolUse.input as any).path ?? message.filePath
const fileExists = await fs.existsFile(filePath)
if (fileExists) {
const fileContent = await fs.readFileText(filePath)
await fs.writeFile(tempFilePath, fileContent)
}

// Create a deep clone of the toolUse object and pass this toolUse to FsWrite tool execution to get the modified temporary file.
const clonedToolUse = structuredClone(session.toolUse)
const clonedToolUse = structuredClone(session.toolUseWithError?.toolUse)
if (!clonedToolUse) {
return
}
Expand Down
83 changes: 45 additions & 38 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 @@ -240,49 +240,56 @@ export class Messenger {
toolUse.input = JSON.parse(toolUseInput)
toolUse.toolUseId = cwChatEvent.toolUseEvent.toolUseId ?? ''
toolUse.name = cwChatEvent.toolUseEvent.name ?? ''
session.setToolUse(toolUse)

const availableToolsNames = (session.pairProgrammingModeOn ? tools : noWriteTools).map(
(item) => item.toolSpecification?.name
)
if (!availableToolsNames.includes(toolUse.name)) {
this.dispatcher.sendCustomFormActionMessage(
new CustomFormActionMessage(tabID, {
id: 'tool-unavailable',
})
let toolError = undefined
try {
const availableToolsNames = (session.pairProgrammingModeOn ? tools : noWriteTools).map(
(item) => item.toolSpecification?.name
)
return
}

const tool = ToolUtils.tryFromToolUse(toolUse)
if ('type' in tool) {
let changeList: Change[] | undefined = undefined
if (tool.type === ToolType.FsWrite) {
session.setShowDiffOnFileWrite(true)
changeList = await tool.tool.getDiffChanges()
if (!availableToolsNames.includes(toolUse.name)) {
throw new Error(`Tool ${toolUse.name} is not available in the current mode`)
}
const validation = ToolUtils.requiresAcceptance(tool)
const chatStream = new ChatStream(this, tabID, triggerID, toolUse, validation, changeList)
await ToolUtils.queueDescription(tool, chatStream)

if (!validation.requiresAcceptance) {
// Need separate id for read tool and safe bash command execution as 'run-shell-command' id is required to state in cwChatConnector.ts which will impact generic tool execution.
if (tool.type === ToolType.ExecuteBash) {
this.dispatcher.sendCustomFormActionMessage(
new CustomFormActionMessage(tabID, {
id: 'run-shell-command',
})
)
} else {
this.dispatcher.sendCustomFormActionMessage(
new CustomFormActionMessage(tabID, {
id: 'generic-tool-execution',
})
)
const tool = ToolUtils.tryFromToolUse(toolUse)
if ('type' in tool) {
let changeList: Change[] | undefined = undefined
if (tool.type === ToolType.FsWrite) {
session.setShowDiffOnFileWrite(true)
changeList = await tool.tool.getDiffChanges()
}
const validation = ToolUtils.requiresAcceptance(tool)
const chatStream = new ChatStream(
this,
tabID,
triggerID,
toolUse,
validation,
changeList
)
await ToolUtils.queueDescription(tool, chatStream)

if (!validation.requiresAcceptance) {
// Need separate id for read tool and safe bash command execution as 'run-shell-command' id is required to state in cwChatConnector.ts which will impact generic tool execution.
if (tool.type === ToolType.ExecuteBash) {
this.dispatcher.sendCustomFormActionMessage(
new CustomFormActionMessage(tabID, {
id: 'run-shell-command',
})
)
} else {
this.dispatcher.sendCustomFormActionMessage(
new CustomFormActionMessage(tabID, {
id: 'generic-tool-execution',
})
)
}
}
} else {
toolError = new Error('Tool not found')
}
} else {
// TODO: Handle the error
} catch (error: any) {
toolError = error
} finally {
session.setToolUseWithError({ toolUse, error: toolError })
}
} else if (cwChatEvent.toolUseEvent?.stop === undefined && toolUseInput !== '') {
// This is for the case when writing tool is executed. The toolUseEvent is non stop but in toolUseInput is not empty. In this case we need show user the current spinner UI.
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/shared/utilities/messageUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface MessageErrorInfo {
}

export function extractErrorInfo(error: any): MessageErrorInfo {
let errorMessage = 'Error reading chat stream.'
let errorMessage = 'Error reading chat response stream: ' + error.message
let statusCode = undefined
let requestId = undefined

Expand Down