Fix remote issues with task tools (microsoft#259033)

Author: meganrogge

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/task/createAndRunTaskTool.ts

@@ -84,18 +84,25 @@ export class CreateAndRunTaskTool implements IToolImpl {
 		if (!exists) {
 			await this._fileService.createFile(tasksJsonUri, VSBuffer.fromString(tasksJsonContent), { overwrite: true });
 			_progress.report({ message: 'Created tasks.json file' });
-			await timeout(200);
 		} else {
 			// add to the existing tasks.json file
 			const content = await this._fileService.readFile(tasksJsonUri);
 			const tasksJson = JSON.parse(content.value.toString());
 			tasksJson.tasks.push(newTask);
 			await this._fileService.writeFile(tasksJsonUri, VSBuffer.fromString(JSON.stringify(tasksJson, null, '\t')));
 			_progress.report({ message: 'Updated tasks.json file' });
-			await timeout(200);
 		}
 		_progress.report({ message: new MarkdownString(localize('copilotChat.fetchingTask', 'Resolving the task')) });
-		const task = (await this._tasksService.tasks())?.find(t => t._label === args.task.label);
+
+		let task: Task | undefined;
+		const start = Date.now();
+		while (Date.now() - start < 5000 && !token.isCancellationRequested) {
+			task = (await this._tasksService.tasks())?.find(t => t._label === args.task.label);
+			if (task) {
+				break;
+			}
+			await timeout(100);
+		}
 		if (!task) {
 			return { content: [{ kind: 'text', value: `Task not found: ${args.task.label}` }], toolResultMessage: new MarkdownString(localize('copilotChat.taskNotFound', 'Task not found: `{0}`', args.task.label)) };
 		}

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/task/taskHelpers.ts

@@ -36,7 +36,14 @@ export function getTaskRepresentation(task: IConfiguredTask | Task): string {
 export async function getTaskForTool(id: string | undefined, taskDefinition: { taskLabel?: string; taskType?: string }, workspaceFolder: string, configurationService: IConfigurationService, taskService: ITaskService): Promise<Task | undefined> {
 	let index = 0;
 	let task: IConfiguredTask | undefined;
-	const configTasks: IConfiguredTask[] = (configurationService.getValue('tasks') as { tasks: IConfiguredTask[] }).tasks ?? [];
+	const workspaceFolderToTaskMap = await taskService.getWorkspaceTasks();
+	let configTasks: IConfiguredTask[] = [];
+	for (const folder of workspaceFolderToTaskMap.keys()) {
+		const tasksConfig = configurationService.getValue('tasks', { resource: URI.parse(folder) }) as { tasks: IConfiguredTask[] } | undefined;
+		if (tasksConfig?.tasks) {
+			configTasks = configTasks.concat(tasksConfig.tasks);
+		}
+	}
 	for (const configTask of configTasks) {
 		if (!configTask.type || 'hide' in configTask && configTask.hide) {
 			// Skip these as they are not included in the agent prompt and we need to align with
@@ -56,7 +63,18 @@ export async function getTaskForTool(id: string | undefined, taskDefinition: { t
 	if (!task) {
 		return;
 	}
-	const configuringTasks: IStringDictionary<ConfiguringTask> | undefined = (await taskService.getWorkspaceTasks())?.get(URI.file(workspaceFolder).toString())?.configurations?.byIdentifier;
+
+	let tasksForWorkspace;
+	for (const [folder, tasks] of workspaceFolderToTaskMap) {
+		if (URI.parse(folder).path === workspaceFolder) {
+			tasksForWorkspace = tasks;
+			break;
+		}
+	}
+	if (!tasksForWorkspace) {
+		return;
+	}
+	const configuringTasks: IStringDictionary<ConfiguringTask> | undefined = tasksForWorkspace.configurations?.byIdentifier;
 	const configuredTask: ConfiguringTask | undefined = Object.values(configuringTasks ?? {}).find(t => {
 		return t.type === task.type && (t._label === task.label || t._label === `${task.type}: ${getTaskRepresentation(task)}` || t._label === getTaskRepresentation(task));
 	});
@@ -65,9 +83,8 @@ export async function getTaskForTool(id: string | undefined, taskDefinition: { t
 		resolvedTask = await taskService.tryResolveTask(configuredTask);
 	}
 	if (!resolvedTask) {
-		const customTasks: Task[] | undefined = (await taskService.getWorkspaceTasks())?.get(URI.file(workspaceFolder).toString())?.set?.tasks;
+		const customTasks: Task[] | undefined = tasksForWorkspace.set?.tasks;
 		resolvedTask = customTasks?.find(t => task.label === t._label || task.label === t._label);
-
 	}
 	return resolvedTask;
 }