Skip to content

feat(amazonq): passing partialResultToken for the next trigger if user accepts an EDITS suggestion #7611

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
Jul 7, 2025
+39 −14
Merged

feat(amazonq): passing partialResultToken for the next trigger if user accepts an EDITS suggestion #7611

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
2 changes: 1 addition & 1 deletion packages/amazonq/src/app/inline/EditRendering/displayImage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export async function displaySvgDecoration(
selectedCompletionInfo: undefined,
},
new vscode.CancellationTokenSource().token,
{ emitTelemetry: false, showUi: false }
{ emitTelemetry: false, showUi: false, editsStreakToken: session.editsStreakPartialResultToken }
)
}
},
Expand Down
42 changes: 29 additions & 13 deletions packages/amazonq/src/app/inline/recommendationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { globals, getLogger } from 'aws-core-vscode/shared'
export interface GetAllRecommendationsOptions {
emitTelemetry?: boolean
showUi?: boolean
editsStreakToken?: number | string
}

export class RecommendationService {
Expand Down Expand Up @@ -47,13 +48,16 @@ export class RecommendationService {
// Record that a regular request is being made
this.cursorUpdateRecorder?.recordCompletionRequest()

const request: InlineCompletionWithReferencesParams = {
let request: InlineCompletionWithReferencesParams = {
textDocument: {
uri: document.uri.toString(),
},
position,
context,
}
if (options.editsStreakToken) {
request = { ...request, partialResultToken: options.editsStreakToken }
}
const requestStartTime = globals.clock.Date.now()
const statusBar = CodeWhispererStatusBarManager.instance

Expand Down Expand Up @@ -112,19 +116,31 @@ export class RecommendationService {
firstCompletionDisplayLatency
)

// If there are more results to fetch, handle them in the background
try {
while (result.partialResultToken) {
const paginatedRequest = { ...request, partialResultToken: result.partialResultToken }
result = await languageClient.sendRequest(
inlineCompletionWithReferencesRequestType.method,
paginatedRequest,
token
)
this.sessionManager.updateSessionSuggestions(result.items)
const isInlineEdit = result.items.some((item) => item.isInlineEdit)
if (!isInlineEdit) {
// If the suggestion is COMPLETIONS and there are more results to fetch, handle them in the background
getLogger().info(
'Suggestion type is COMPLETIONS. Start fetching for more items if partialResultToken exists.'
)
try {
while (result.partialResultToken) {
const paginatedRequest = { ...request, partialResultToken: result.partialResultToken }
result = await languageClient.sendRequest(
inlineCompletionWithReferencesRequestType.method,
paginatedRequest,
token
)
this.sessionManager.updateSessionSuggestions(result.items)
}
} catch (error) {
languageClient.warn(`Error when getting suggestions: ${error}`)
}
} catch (error) {
languageClient.warn(`Error when getting suggestions: ${error}`)
} else {
// Skip fetching for more items if the suggesion is EDITS. If it is EDITS suggestion, only fetching for more
// suggestions when the user start to accept a suggesion.
// Save editsStreakPartialResultToken for the next EDITS suggestion trigger if user accepts.
getLogger().info('Suggestion type is EDITS. Skip fetching for more items.')
this.sessionManager.updateActiveEditsStreakToken(result.partialResultToken)
Copy link
Contributor

@floralph floralph Jul 7, 2025

Choose a reason for hiding this comment

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

This assumes the first result is an edit, but the check on line 120 is just for at one edit anywhere in the results. Is there some undocumented assumption here about how the results are returned? Even if there is, there should be checks in code that the assumptions hold.

Copy link
Contributor Author

@atonaamz atonaamz Jul 7, 2025

Choose a reason for hiding this comment

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

We can only return either EDITS or COMPLETIONS so if one item is EDITS, we should follow the EDITS flow.

Copy link
Contributor Author

@atonaamz atonaamz Jul 7, 2025

Choose a reason for hiding this comment

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

https://github.com/aws/language-servers/blob/main/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts#L834

}

// Close session and finalize telemetry regardless of pagination path
Expand Down
9 changes: 9 additions & 0 deletions packages/amazonq/src/app/inline/sessionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export interface CodeWhispererSession {
requestStartTime: number
firstCompletionDisplayLatency?: number
startPosition: vscode.Position
// partialResultToken for the next trigger if user accepts an EDITS suggestion
editsStreakPartialResultToken?: number | string
}

export class SessionManager {
Expand Down Expand Up @@ -69,6 +71,13 @@ export class SessionManager {
this._acceptedSuggestionCount += 1
}

public updateActiveEditsStreakToken(partialResultToken?: number | string) {
if (!this.activeSession || !partialResultToken) {
return
}
this.activeSession.editsStreakPartialResultToken = partialResultToken
}

public clear() {
this.activeSession = undefined
}
Expand Down
Loading