Merge pull request #594 from codestoryai/features/add-#-folder-support

features/add # folder support

Author: theskcd

extensions/codestory/src/sidecar/client.ts

@@ -227,13 +227,14 @@ export class SideCarClient {
 		baseUrl.pathname = '/api/agent/followup_chat';
 		const url = baseUrl.toString();
 		const activeWindowData = getCurrentActiveWindow();
+		const folders = folderFromQuery(query);
 		const sideCarModelConfiguration = await getSideCarModelConfiguration(await vscode.modelSelection.getConfiguration());
 		const agentSystemInstruction = readCustomSystemInstruction();
 		const body = {
 			repo_ref: repoRef.getRepresentation(),
 			query: query,
 			thread_id: threadId,
-			user_context: await convertVSCodeVariableToSidecar(variables),
+			user_context: await convertVSCodeVariableToSidecar(variables, folders),
 			project_labels: projectLabels,
 			active_window_data: activeWindowData,
 			model_config: sideCarModelConfiguration,
@@ -789,9 +790,35 @@ interface CodeSelectionUriRange {
 	};
 }
 
+function folderFromQuery(query: string): string[] {
+	const folderRegex = /#folder:([^#\s]+)/g;
+	const matches = query.matchAll(folderRegex);
+	const folders: string[] = [];
+	for (const match of matches) {
+		// add the workspace root path to the folder so we get the relative path
+		// here always
+		console.log(match[1]);
+		folders.push(match[1]);
+	}
+	console.log('folders from query', query);
+	console.log('folders from query', folders);
+	const workspaceFolders = folders.map((folder) => {
+		const rootPath = vscode.workspace.rootPath;
+		if (rootPath) {
+			const newPath = path.join(rootPath, folder);
+			return newPath;
+		} else {
+			return folder;
+		}
+	});
+	console.log('workspace folder', workspaceFolders);
+	return workspaceFolders;
+}
+
 async function convertVSCodeVariableToSidecar(
 	variables: readonly vscode.ChatResolvedVariable[],
-): Promise<{ variables: SidecarVariableTypes[]; file_content_map: { file_path: string; file_content: string; language: string }[]; terminal_selection: string | undefined }> {
+	folders: string[],
+): Promise<{ variables: SidecarVariableTypes[]; file_content_map: { file_path: string; file_content: string; language: string }[]; terminal_selection: string | undefined; folder_paths: string[] }> {
 	const sidecarVariables: SidecarVariableTypes[] = [];
 	let terminalSelection: string | undefined = undefined;
 	const fileCache: Map<string, vscode.TextDocument> = new Map();
@@ -863,6 +890,7 @@ async function convertVSCodeVariableToSidecar(
 			};
 		}),
 		terminal_selection: terminalSelection,
+		folder_paths: folders,
 	};
 }
 

src/vs/workbench/contrib/chat/browser/chat.contribution.ts

@@ -303,7 +303,8 @@ class ChatSlashStaticSlashCommandsContribution extends Disposable {
 
 				const variables = [
 					...chatVariablesService.getVariables(),
-					{ name: 'file', description: nls.localize('file', "Choose a file in the workspace") }
+					{ name: 'file', description: nls.localize('file', "Choose a file in the workspace") },
+					{ name: 'folder', description: nls.localize('folder', "Choose a folder in the workspace") },
 				];
 				const variableText = variables
 					.map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`)

src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts

@@ -213,6 +213,95 @@ export class SelectAndInsertFileAction extends Action2 {
 }
 registerAction2(SelectAndInsertFileAction);
 
+export class SelectAndInsertFolderAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.selectAndInsertFolder';
+
+	constructor() {
+		super({
+			id: SelectAndInsertFolderAction.ID,
+			title: '' // not displayed
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]) {
+		const textModelService = accessor.get(ITextModelService);
+		const logService = accessor.get(ILogService);
+		const quickInputService = accessor.get(IQuickInputService);
+		const chatVariablesService = accessor.get(IChatVariablesService);
+
+		const context = args[0];
+		if (!isSelectAndInsertFileActionContext(context)) {
+			return;
+		}
+
+		const doCleanup = () => {
+			// Failed, remove the dangling `folder`
+			context.widget.inputEditor.executeEdits('chatInsertFolder', [{ range: context.range, text: `` }]);
+		};
+
+		let options: IQuickAccessOptions | undefined;
+		const foldersVariableName = 'folders';
+		const foldersItem = {
+			label: localize('allFolders', 'All Folder'),
+			description: localize('allFoldersDescription', 'Search for relevant folders in the workspace and provide context from them'),
+		};
+		// If we have a `files` variable, add an option to select all files in the picker.
+		// This of course assumes that the `files` variable has the behavior that it searches
+		// through files in the workspace.
+		if (chatVariablesService.hasVariable(foldersVariableName)) {
+			options = {
+				providerOptions: <AnythingQuickAccessProviderRunOptions>{
+					additionPicks: [foldersItem, { type: 'separator' }]
+				},
+			};
+		}
+		// TODO: have dedicated UX for this instead of using the quick access picker
+		const picks = await quickInputService.quickAccess.pick('', options);
+		if (!picks?.length) {
+			logService.trace('SelectAndInsertFolderAction: no file selected');
+			doCleanup();
+			return;
+		}
+
+		const editor = context.widget.inputEditor;
+		const range = context.range;
+
+		// Handle the special case of selecting all files
+		if (picks[0] === foldersItem) {
+			const text = `#${foldersVariableName}`;
+			const success = editor.executeEdits('chatInsertFolder', [{ range, text: text + ' ' }]);
+			if (!success) {
+				logService.trace(`SelectAndInsertFolderAction: failed to insert "${text}"`);
+				doCleanup();
+			}
+			return;
+		}
+
+		// Handle the case of selecting a specific file
+		const resource = (picks[0] as unknown as { resource: unknown }).resource as URI;
+		if (!textModelService.canHandleResource(resource)) {
+			logService.trace('SelectAndInsertFolderAction: non-text resource selected');
+			doCleanup();
+			return;
+		}
+
+		const fileName = basename(resource);
+		const text = `#folder:${fileName}`;
+		const success = editor.executeEdits('chatInsertFolder', [{ range, text: text + ' ' }]);
+		if (!success) {
+			logService.trace(`SelectAndInsertFolderAction: failed to insert "${text}"`);
+			doCleanup();
+			return;
+		}
+
+		context.widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID)?.addReference({
+			range: { startLineNumber: range.startLineNumber, startColumn: range.startColumn, endLineNumber: range.endLineNumber, endColumn: range.startColumn + text.length },
+			data: [{ level: 'full', value: resource }]
+		});
+	}
+}
+registerAction2(SelectAndInsertFolderAction);
+
 export interface IAddDynamicVariableContext {
 	widget: IChatWidget;
 	range: IRange;

src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts

@@ -25,7 +25,7 @@ import { SubmitAction } from 'vs/workbench/contrib/chat/browser/actions/chatExec
 import { IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
 import { ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { SelectAndInsertFileAction, dynamicVariableDecorationType } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { SelectAndInsertFileAction, SelectAndInsertFolderAction, dynamicVariableDecorationType } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from 'vs/workbench/contrib/chat/common/chatColors';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
@@ -542,7 +542,8 @@ class BuiltinDynamicCompletions extends Disposable {
 					return null;
 				}
 
-				const afterRange = new Range(position.lineNumber, range.replace.startColumn, position.lineNumber, range.replace.startColumn + '#file:'.length);
+				const fileAfterRange = new Range(position.lineNumber, range.replace.startColumn, position.lineNumber, range.replace.startColumn + '#file:'.length);
+				const folderAfterRange = new Range(position.lineNumber, range.replace.startColumn, position.lineNumber, range.replace.startColumn + '#folder:'.length);
 				return <CompletionList>{
 					suggestions: [
 						<CompletionItem>{
@@ -551,7 +552,16 @@ class BuiltinDynamicCompletions extends Disposable {
 							detail: localize('pickFileLabel', "Pick a file"),
 							range,
 							kind: CompletionItemKind.Text,
-							command: { id: SelectAndInsertFileAction.ID, title: SelectAndInsertFileAction.ID, arguments: [{ widget, range: afterRange }] },
+							command: { id: SelectAndInsertFileAction.ID, title: SelectAndInsertFileAction.ID, arguments: [{ widget, range: fileAfterRange }] },
+							sortText: 'z'
+						},
+						<CompletionItem>{
+							label: `${chatVariableLeader}folder`,
+							insertText: `${chatVariableLeader}folder:`,
+							detail: localize('pickFolderLabel', "Pick a folder"),
+							range,
+							kind: CompletionItemKind.Text,
+							command: { id: SelectAndInsertFolderAction.ID, title: SelectAndInsertFolderAction.ID, arguments: [{ widget, range: folderAfterRange }] },
 							sortText: 'z'
 						}
 					]

src/vs/workbench/contrib/chat/browser/contrib/csChatDynamicVariables.ts

@@ -25,13 +25,14 @@ import { chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserT
 import { ISymbolQuickPickItem } from 'vs/workbench/contrib/search/browser/symbolsQuickAccess';
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
 
+export const FolderReferenceCompletionProviderName = 'chatInplaceFolderReferenceCompletionProvider';
 export const FileReferenceCompletionProviderName = 'chatInplaceFileReferenceCompletionProvider';
 export const CodeSymbolCompletionProviderName = 'chatInplaceCodeCompletionProvider';
 
 interface MultiLevelCodeTriggerActionContext {
 	widget: IChatWidget;
 	range: IRange;
-	pick: 'file' | 'code';
+	pick: 'file' | 'code' | 'folder';
 }
 
 function isMultiLevelCodeTriggerActionContext(context: any): context is MultiLevelCodeTriggerActionContext {
@@ -71,7 +72,7 @@ export class MultiLevelCodeTriggerAction extends Action2 {
 		const completionProviders = languageFeaturesService.completionProvider.getForAllLanguages();
 		const codeSymbolCompletionProvider = completionProviders.find(
 			provider => provider._debugDisplayName === (
-				context.pick === 'code' ? CodeSymbolCompletionProviderName : FileReferenceCompletionProviderName
+				context.pick === 'code' ? CodeSymbolCompletionProviderName : context.pick === 'file' ? FileReferenceCompletionProviderName : FolderReferenceCompletionProviderName
 			));
 
 		if (!codeSymbolCompletionProvider) {
@@ -94,6 +95,62 @@ function isSelectAndInsertFileActionContext(context: any): context is SelectAndI
 	return 'widget' in context && 'range' in context && 'uri' in context;
 }
 
+export class SelectAndInsertFolderAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.csSelectAndInsertFolder';
+
+	constructor() {
+		super({
+			id: SelectAndInsertFolderAction.ID,
+			title: '' // not displayed
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]) {
+		const textModelService = accessor.get(ITextModelService);
+		const logService = accessor.get(ILogService);
+
+		const context = args[0];
+		if (!isSelectAndInsertFileActionContext(context)) {
+			return;
+		}
+
+		const doCleanup = () => {
+			// Failed, remove the dangling `file`
+			context.widget.inputEditor.executeEdits('chatInsertFolder', [{ range: context.range, text: `` }]);
+		};
+
+		const resource = context.uri;
+		if (!resource) {
+			logService.trace('SelectAndInsertFolderAction: no resource selected');
+			doCleanup();
+			return;
+		}
+
+		const model = await textModelService.createModelReference(resource);
+		const fileRange = model.object.textEditorModel.getFullModelRange();
+		model.dispose();
+
+		const fileName = basename(resource);
+		const editor = context.widget.inputEditor;
+		const text = `${chatVariableLeader}folder:${fileName}`;
+		const range = context.range;
+		const success = editor.executeEdits('chatInsertFolder', [{ range, text: text + ' ' }]);
+		if (!success) {
+			logService.trace(`SelectAndInsertFolderAction: failed to insert "${text}"`);
+			doCleanup();
+			return;
+		}
+
+		const valueObj = { uri: resource, range: fileRange };
+		const value = JSON.stringify(valueObj);
+		context.widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID)?.addReference({
+			range: { startLineNumber: range.startLineNumber, startColumn: range.startColumn, endLineNumber: range.endLineNumber, endColumn: range.startColumn + text.length },
+			data: [{ level: 'full', value, kind: 'folder' }]
+		});
+	}
+}
+registerAction2(SelectAndInsertFolderAction);
+
 export class SelectAndInsertFileAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.csSelectAndInsertFile';