Skip to content

fix: improvements to next edit #8129

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 10 commits into from
Oct 8, 2025
Merged

fix: improvements to next edit #8129

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
633293b
refactor: autocomplete feedback
sestinj Oct 7, 2025
9b6b1bf
fix: don't hardcode outcome to false on aborted completion
sestinj Oct 7, 2025
d386b86
fix: correctly parse out backticks
sestinj Oct 7, 2025
96d5fcc
fix: correctly parse out backticks
sestinj Oct 7, 2025
56ccd43
fix: next edit diff formatting
sestinj Oct 7, 2025
2c09973
fix: reduce context lines
sestinj Oct 7, 2025
3fb6893
improv: track profile type for autocomplete
sestinj Oct 7, 2025
e395ad3
Merge branch 'main' into nate/mercury-improvements-2
sestinj Oct 8, 2025
9224b57
fix: lint err
sestinj Oct 8, 2025
56fb333
fix: test
sestinj Oct 8, 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
15 changes: 4 additions & 11 deletions core/nextEdit/NextEditLoggingService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@ export class NextEditLoggingService {
outcome.accepted = true;
outcome.aborted = false;
this.logNextEditOutcome(outcome);
if (outcome.requestId) {
void this.logAcceptReject(outcome.requestId, true);
}
this._outcomes.delete(completionId);
return outcome;
}
Expand All @@ -116,9 +113,6 @@ export class NextEditLoggingService {
outcome.accepted = false;
outcome.aborted = false;
this.logNextEditOutcome(outcome);
if (outcome.requestId) {
void this.logAcceptReject(outcome.requestId, false);
}
this._outcomes.delete(completionId);
return outcome;
}
Expand Down Expand Up @@ -151,9 +145,6 @@ export class NextEditLoggingService {
outcome.accepted = false;
outcome.aborted = false;
this.logNextEditOutcome(outcome);
if (outcome.requestId) {
void this.logAcceptReject(outcome.requestId, false);
}
this._logRejectionTimeouts.delete(completionId);
this._outcomes.delete(completionId);
}, COUNT_COMPLETION_REJECTED_AFTER);
Expand Down Expand Up @@ -200,7 +191,6 @@ export class NextEditLoggingService {
// If we have the full outcome, log it as aborted.
if (this._outcomes.has(completionId)) {
const outcome = this._outcomes.get(completionId)!;
outcome.accepted = false;
outcome.aborted = true;
this.logNextEditOutcome(outcome);
this._outcomes.delete(completionId);
Expand Down Expand Up @@ -255,6 +245,9 @@ export class NextEditLoggingService {
});

// const { prompt, completion, prefix, suffix, ...restOfOutcome } = outcome;
if (outcome.requestId && outcome.accepted !== undefined) {
void this.logAcceptReject(outcome.requestId, outcome.accepted);
}
void Telemetry.capture("nextEditOutcome", outcome, true);
}

Expand All @@ -268,7 +261,7 @@ export class NextEditLoggingService {
}

const controlPlaneEnv = getControlPlaneEnvSync("production");
await fetchwithRequestOptions(
const resp = await fetchwithRequestOptions(
new URL("model-proxy/v1/feedback", controlPlaneEnv.CONTROL_PLANE_URL),
{
method: "POST",
Expand Down
2 changes: 1 addition & 1 deletion core/nextEdit/NextEditPrefetchQueue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export class PrefetchQueue {
const count = Math.min(3, this.processedQueue.length);
const firstThree = this.processedQueue.slice(0, count);
firstThree.forEach((item, index) => {
console.log(
console.debug(
`Item ${index + 1}: ${item.location.range.start.line} to ${item.location.range.end.line}`,
);
});
Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode/src/autocomplete/GhostTextAcceptanceTracker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export class GhostTextAcceptanceTracker {
);

if (wasGhostTextAccepted) {
console.log(
console.debug(
"GhostTextAcceptanceTracker: ghost text was accepted, preserving chain",
);
return true;
Expand Down
Loading