nes: allow using relative paths in diff patches (#410)

Author: ulugbekna

src/extension/xtab/common/promptCrafting.ts

@@ -207,8 +207,10 @@ function getEditDiffHistory(
 	request: StatelessNextEditRequest,
 	docsInPrompt: Set<DocumentId>,
 	computeTokens: (s: string) => number,
-	{ onlyForDocsInPrompt, maxTokens, nEntries }: DiffHistoryOptions
+	{ onlyForDocsInPrompt, maxTokens, nEntries, useRelativePaths }: DiffHistoryOptions
 ) {
+	const workspacePath = useRelativePaths ? request.getActiveDocument().workspaceRoot?.path : undefined;
+
 	let tokenBudget = maxTokens;
 
 	const allDiffs: string[] = [];
@@ -227,7 +229,7 @@ function getEditDiffHistory(
 			continue;
 		}
 
-		const docDiff = generateDocDiff(entry);
+		const docDiff = generateDocDiff(entry, workspacePath);
 		if (docDiff === null) {
 			continue;
 		}
@@ -255,7 +257,7 @@ function getEditDiffHistory(
 	return promptPiece;
 }
 
-function generateDocDiff(entry: IXtabHistoryEditEntry): string | null {
+function generateDocDiff(entry: IXtabHistoryEditEntry, workspacePath: string | undefined): string | null {
 	const docDiffLines: string[] = [];
 
 	const lineEdit = RootedEdit.toLineEdit(entry.edit);
@@ -280,7 +282,7 @@ function generateDocDiff(entry: IXtabHistoryEditEntry): string | null {
 		return null;
 	}
 
-	const uniquePath = toUniquePath(entry.docId, undefined);
+	const uniquePath = toUniquePath(entry.docId, workspacePath);
 
 	const docDiff = [
 		`--- ${uniquePath}`,

src/extension/xtab/node/xtabProvider.ts

@@ -245,6 +245,7 @@ export class XtabProvider extends ChainedStatelessNextEditProvider {
 					nEntries: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabDiffNEntries, this.expService),
 					maxTokens: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabDiffMaxTokens, this.expService),
 					onlyForDocsInPrompt: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabDiffOnlyForDocsInPrompt, this.expService),
+					useRelativePaths: this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabDiffUseRelativePaths, this.expService),
 				}
 			};
 		}

src/platform/configuration/common/configurationService.ts

@@ -679,6 +679,7 @@ export namespace ConfigKey {
 		export const InlineEditsXtabCurrentFileMaxTokens = defineExpSetting<number>('chat.advanced.inlineEdits.xtabProvider.currentFileMaxTokens', xtabPromptOptions.DEFAULT_OPTIONS.currentFile.maxTokens, INTERNAL_RESTRICTED);
 		export const InlineEditsXtabPrioritizeAboveCursor = defineExpSetting<boolean>('chat.advanced.inlineEdits.xtabProvider.currentFile.prioritizeAboveCursor', xtabPromptOptions.DEFAULT_OPTIONS.currentFile.prioritizeAboveCursor, INTERNAL_RESTRICTED);
 		export const InlineEditsXtabDiffOnlyForDocsInPrompt = defineExpSetting<boolean>('chat.advanced.inlineEdits.xtabProvider.diffOnlyForDocsInPrompt', xtabPromptOptions.DEFAULT_OPTIONS.diffHistory.onlyForDocsInPrompt, INTERNAL_RESTRICTED);
+		export const InlineEditsXtabDiffUseRelativePaths = defineExpSetting<boolean>('chat.advanced.inlineEdits.xtabProvider.diffUseRelativePaths', xtabPromptOptions.DEFAULT_OPTIONS.diffHistory.useRelativePaths, INTERNAL_RESTRICTED);
 		export const InlineEditsXtabNNonSignificantLinesToConverge = defineExpSetting<number>('chat.advanced.inlineEdits.xtabProvider.nNonSignificantLinesToConverge', ResponseProcessor.DEFAULT_DIFF_PARAMS.nLinesToConverge, INTERNAL_RESTRICTED);
 		export const InlineEditsXtabNSignificantLinesToConverge = defineExpSetting<number>('chat.advanced.inlineEdits.xtabProvider.nSignificantLinesToConverge', ResponseProcessor.DEFAULT_DIFF_PARAMS.nSignificantLinesToConverge, INTERNAL_RESTRICTED);
 		export const InlineEditsXtabLanguageContextEnabled = defineExpSetting<boolean>('chat.advanced.inlineEdits.xtabProvider.languageContext.enabled', xtabPromptOptions.DEFAULT_OPTIONS.languageContext.enabled, INTERNAL_RESTRICTED);

src/platform/inlineEdits/common/dataTypes/xtabPromptOptions.ts

@@ -18,6 +18,7 @@ export type DiffHistoryOptions = {
 	readonly nEntries: number;
 	readonly maxTokens: number;
 	readonly onlyForDocsInPrompt: boolean;
+	readonly useRelativePaths: boolean;
 }
 
 export type PagedClipping = { pageSize: number };
@@ -74,5 +75,6 @@ export const DEFAULT_OPTIONS: PromptOptions = {
 		nEntries: 25,
 		maxTokens: 1000,
 		onlyForDocsInPrompt: false,
+		useRelativePaths: false,
 	},
 };