Skip to content

fix(chat): preserve context in agentic loop #6897

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
justinmk3 merged 2 commits into from
Apr 1, 2025
Merged

fix(chat): preserve context in agentic loop #6897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7165245
fix(chat): preserve context in agentic loop
ctlai95 Apr 1, 2025
dcbb90f
Merge branch 'feature/agentic-chat' into agentic-loop-context
ctlai95 Apr 1, 2025
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
11 changes: 11 additions & 0 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 @@ -14,16 +14,19 @@ import { ToolkitError } from '../../../../shared/errors'
import { createCodeWhispererChatStreamingClient } from '../../../../shared/clients/codewhispererChatClient'
import { createQDeveloperStreamingClient } from '../../../../shared/clients/qDeveloperChatClient'
import { UserWrittenCodeTracker } from '../../../../codewhisperer/tracker/userWrittenCodeTracker'
import { PromptMessage } from '../../../controllers/chat/model'

export class ChatSession {
private sessionId?: string
/**
* _readFiles = list of files read from the project to gather context before generating response.
* _showDiffOnFileWrite = Controls whether to show diff view (true) or file context view (false) to the user
* _context = Additional context to be passed to the LLM for generating the response
*/
private _readFiles: string[] = []
private _toolUse: ToolUse | undefined
private _showDiffOnFileWrite: boolean = false
private _context: PromptMessage['context']

contexts: Map<string, { first: number; second: number }[]> = new Map()
// TODO: doesn't handle the edge case when two files share the same relativePath string but from different root
Expand All @@ -41,6 +44,14 @@ export class ChatSession {
this._toolUse = toolUse
}

public get context(): PromptMessage['context'] {
return this._context
}

public setContext(context: PromptMessage['context']) {
this._context = context
}

public tokenSource!: vscode.CancellationTokenSource

constructor() {
Expand Down
6 changes: 5 additions & 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 @@ -709,7 +709,7 @@ export class ChatController {
toolResults: toolResults,
origin: Origin.IDE,
chatHistory: this.chatHistoryManager.getHistory(),
context: [],
context: session.context ?? [],
relevantTextDocuments: [],
additionalContents: [],
documentReferences: [],
Expand Down Expand Up @@ -1081,6 +1081,10 @@ export class ChatController {
type: 'chat_message',
context,
})

// Save the context for the agentic loop
session.setContext(message.context)

await this.generateResponse(
{
message: message.message ?? '',
Expand Down
Loading