fix: improvements to next edit (#8129)

* refactor: autocomplete feedback

* fix: don't hardcode outcome to false on aborted completion

* fix: correctly parse out backticks

* fix: correctly parse out backticks

* fix: next edit diff formatting

* fix: reduce context lines

* improv: track profile type for autocomplete

* fix: lint err

* fix: test

Author: sestinj

core/autocomplete/CompletionProvider.ts

@@ -268,6 +268,8 @@ export class CompletionProvider {
         gitRepo: await this.ide.getRepoName(helper.filepath),
         uniqueId: await this.ide.getUniqueId(),
         timestamp: new Date().toISOString(),
+        profileType:
+          this.configHandler.currentProfile?.profileDescription.profileType,
         ...helper.options,
       };
 

core/autocomplete/postprocessing/index.ts

@@ -54,7 +54,8 @@ function isBlank(completion: string): boolean {
 
 /**
  * Removes markdown code block delimiters from completion.
- * Removes the first line if it starts with "```" and the last line if it is exactly "```".
+ * Removes the first line if it starts with backticks (with optional language name).
+ * Removes the last line if it contains only backticks.
  */
 function removeBackticks(completion: string): string {
   const lines = completion.split("\n");
@@ -66,14 +67,18 @@ function removeBackticks(completion: string): string {
   let startIdx = 0;
   let endIdx = lines.length;
 
-  // Remove first line if it starts with ```
-  if (lines[0].trimStart().startsWith("```")) {
+  // Remove first line if it starts with backticks (``` or ```language)
+  const firstLineTrimmed = lines[0].trim();
+  if (firstLineTrimmed.startsWith("```")) {
     startIdx = 1;
   }
 
-  // Remove last line if it is exactly ```
-  if (lines.length > startIdx && lines[lines.length - 1].trim() === "```") {
-    endIdx = lines.length - 1;
+  // Remove last line if it contains only backticks (one or more)
+  if (lines.length > startIdx) {
+    const lastLineTrimmed = lines[lines.length - 1].trim();
+    if (lastLineTrimmed.length > 0 && /^`+$/.test(lastLineTrimmed)) {
+      endIdx = lines.length - 1;
+    }
   }
 
   // If we removed lines, return the modified completion

core/autocomplete/util/AutocompleteLoggingService.ts

@@ -119,6 +119,7 @@ export class AutocompleteLoggingService {
       time: restOfOutcome.time,
       useRecentlyEdited: restOfOutcome.useRecentlyEdited,
       numLines: restOfOutcome.numLines,
+      profileType: restOfOutcome.profileType,
     };
 
     outcome.enabledStaticContextualization

core/autocomplete/util/types.ts

@@ -43,4 +43,5 @@ export interface AutocompleteOutcome extends TabAutocompleteOptions {
   uniqueId: string;
   timestamp: string;
   enabledStaticContextualization?: boolean;
+  profileType?: "local" | "platform" | "control-plane";
 }

core/config/ConfigHandler.ts

@@ -537,12 +537,19 @@ export class ConfigHandler {
     // Track config loading telemetry
     const endTime = performance.now();
     const duration = endTime - startTime;
-    void Telemetry.capture("config_reload", {
+
+    const profileDescription = this.currentProfile.profileDescription;
+    const telemetryData: Record<string, any> = {
       duration,
       reason,
       totalConfigLoads: this.totalConfigReloads,
       configLoadInterrupted,
-    });
+      profileType: profileDescription.profileType,
+      isPersonalOrg: this.currentOrg?.id === this.PERSONAL_ORG_DESC.id,
+      errorCount: errors.length,
+    };
+
+    void Telemetry.capture("config_reload", telemetryData);
 
     return {
       config,

core/nextEdit/NextEditLoggingService.ts

@@ -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;
     }
@@ -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;
     }
@@ -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);
@@ -197,44 +188,15 @@ export class NextEditLoggingService {
       this._logRejectionTimeouts.delete(completionId);
     }
 
-    // If we have the full outcome, log it as aborted.
+    // Only log if the completion was displayed to the user.
+    // This aligns with Autocomplete behavior and prevents logging
+    // of cancelled requests that never reached the user.
     if (this._outcomes.has(completionId)) {
       const outcome = this._outcomes.get(completionId)!;
-      outcome.accepted = false;
+      // outcome.accepted = false;
       outcome.aborted = true;
       this.logNextEditOutcome(outcome);
       this._outcomes.delete(completionId);
-    } else {
-      // Log minimal abort event for requests that never got displayed.
-      const pendingData = this._pendingCompletions.get(completionId);
-
-      const minimalAbortOutcome: Partial<NextEditOutcome> = {
-        completionId,
-        accepted: false,
-        aborted: true,
-        timestamp: Date.now(),
-        uniqueId: completionId,
-        elapsed: pendingData ? Date.now() - pendingData.startTime : 0,
-        modelName: pendingData?.modelName || "unknown",
-        modelProvider: pendingData?.modelProvider || "unknown",
-        fileUri: pendingData?.filepath || "unknown",
-
-        // Empty/default values for fields we don't have.
-        completion: "",
-        prompt: "",
-        userEdits: "",
-        userExcerpts: "",
-        originalEditableRange: "",
-        workspaceDirUri: "",
-        cursorPosition: { line: -1, character: -1 },
-        finalCursorPosition: { line: -1, character: -1 },
-        editableRegionStartLine: -1,
-        editableRegionEndLine: -1,
-        diffLines: [],
-        completionOptions: {},
-      };
-
-      this.logNextEditOutcome(minimalAbortOutcome as NextEditOutcome);
     }
 
     // Clean up.
@@ -255,6 +217,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);
   }
 
@@ -268,7 +233,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",

core/nextEdit/NextEditPrefetchQueue.ts

@@ -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}`,
       );
     });

core/nextEdit/NextEditProvider.ts

@@ -8,6 +8,7 @@ import { ContextRetrievalService } from "../autocomplete/context/ContextRetrieva
 
 import { BracketMatchingService } from "../autocomplete/filtering/BracketMatchingService.js";
 import { CompletionStreamer } from "../autocomplete/generation/CompletionStreamer.js";
+import { postprocessCompletion } from "../autocomplete/postprocessing/index.js";
 import { shouldPrefilter } from "../autocomplete/prefiltering/index.js";
 import { getAllSnippetsWithoutRace } from "../autocomplete/snippets/index.js";
 import { AutocompleteCodeSnippet } from "../autocomplete/snippets/types.js";
@@ -415,6 +416,7 @@ export class NextEditProvider {
         filePath: helper.filepath,
         diffType: DiffFormatType.Unified,
         contextLines: 3,
+        workspaceDir: workspaceDirs[0], // Use first workspace directory
       }),
     };
 
@@ -468,33 +470,53 @@ export class NextEditProvider {
     }
 
     // Extract completion using model-specific logic.
-    const nextCompletion = this.modelProvider.extractCompletion(msg.content);
+    let nextCompletion = this.modelProvider.extractCompletion(msg.content);
+
+    // Postprocess the completion (same as autocomplete).
+    const postprocessed = postprocessCompletion({
+      completion: nextCompletion,
+      llm,
+      prefix: helper.prunedPrefix,
+      suffix: helper.prunedSuffix,
+    });
+
+    // Return early if postprocessing filtered out the completion.
+    if (!postprocessed) {
+      return undefined;
+    }
+
+    nextCompletion = postprocessed;
 
     let outcome: NextEditOutcome | undefined;
 
     // Handle based on diff type.
+    const profileType =
+      this.configHandler.currentProfile?.profileDescription.profileType;
+
     if (opts?.usingFullFileDiff === false || !opts?.usingFullFileDiff) {
-      outcome = await this.modelProvider.handlePartialFileDiff(
+      outcome = await this.modelProvider.handlePartialFileDiff({
         helper,
         editableRegionStartLine,
         editableRegionEndLine,
         startTime,
         llm,
         nextCompletion,
-        this.promptMetadata!,
-        this.ide,
-      );
+        promptMetadata: this.promptMetadata!,
+        ide: this.ide,
+        profileType,
+      });
     } else {
-      outcome = await this.modelProvider.handleFullFileDiff(
+      outcome = await this.modelProvider.handleFullFileDiff({
         helper,
         editableRegionStartLine,
         editableRegionEndLine,
         startTime,
         llm,
         nextCompletion,
-        this.promptMetadata!,
-        this.ide,
-      );
+        promptMetadata: this.promptMetadata!,
+        ide: this.ide,
+        profileType,
+      });
     }
 
     if (outcome) {

core/nextEdit/context/diffFormatting.ts

@@ -1,4 +1,5 @@
 import { createPatch } from "diff";
+import { getUriPathBasename } from "../../util/uri";
 
 export enum DiffFormatType {
   Unified = "unified",
@@ -18,6 +19,7 @@ export interface CreateDiffArgs {
   filePath: string;
   diffType: DiffFormatType;
   contextLines: number;
+  workspaceDir?: string;
 }
 
 export const createDiff = ({
@@ -26,6 +28,7 @@ export const createDiff = ({
   filePath,
   diffType,
   contextLines,
+  workspaceDir,
 }: CreateDiffArgs) => {
   switch (diffType) {
     case DiffFormatType.Unified:
@@ -34,6 +37,7 @@ export const createDiff = ({
         afterContent,
         filePath,
         contextLines,
+        workspaceDir,
       );
     case DiffFormatType.TokenLineDiff:
       return createTokenLineDiff(beforeContent, afterContent, filePath);
@@ -46,6 +50,7 @@ const createUnifiedDiff = (
   afterContent: string,
   filePath: string,
   contextLines: number,
+  workspaceDir?: string,
 ) => {
   const normalizedBefore = beforeContent.endsWith("\n")
     ? beforeContent
@@ -54,12 +59,21 @@ const createUnifiedDiff = (
     ? afterContent
     : afterContent + "\n";
 
+  // Use relative path if workspace directory is provided
+  let displayPath = filePath;
+  if (workspaceDir && filePath.startsWith(workspaceDir)) {
+    displayPath = filePath.slice(workspaceDir.length).replace(/^[\/]/, "");
+  } else if (workspaceDir) {
+    // Fallback to just the basename if we can't determine relative path
+    displayPath = getUriPathBasename(filePath);
+  }
+
   const patch = createPatch(
-    filePath,
+    displayPath,
     normalizedBefore,
     normalizedAfter,
-    "before",
-    "after",
+    undefined,
+    undefined,
     { context: contextLines },
   );