Merge branch 'merogge/folder' into Main

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>

Author: Git-Hub-Chris

extensions/terminal-suggest/src/completions/index.d.ts

@@ -1296,5 +1296,50 @@ declare namespace Fig {
 		 *
 		 */
 		cache?: Cache;
+
+		/**
+		 * Options related to file paths used in the generator, including filtering options and handling of file extensions.
+		 */
+		filepathOptions?: FilepathsOptions; // <-- VS Code edit to return file resource request config as we resolve files in core
+	}
+
+	type FilepathsOptions = {
+		/**
+		 * Show suggestions with any of these extensions. Do not include the leading dot.
+		 */
+		extensions?: string[];
+		/**
+		 * Show suggestions where the name exactly matches one of these strings
+		 */
+		equals?: string | string[];
+		/**
+		 * Show suggestions where the name matches this expression
+		 */
+		matches?: RegExp;
+		/**
+		 * Will treat folders like files, filtering based on the name.
+		 */
+		filterFolders?: boolean;
+		/**
+		 * Set properties of suggestions of type 'file'.
+		 */
+		editFileSuggestions?: Omit<Fig.Suggestion, 'name' | 'type'>;
+		/**
+		 * Set properties of suggestions of type 'folder'.
+		 */
+		editFolderSuggestions?: Omit<Fig.Suggestion, 'name' | 'type'>;
+		/**
+		 * Start to suggest filepaths and folders from this directory.
+		 */
+		rootDirectory?: string;
+		/**
+		 * Set how the generator should display folders:
+		 * - **Default:** `always` will always suggest folders.
+		 * - `never`: will never suggest folders.
+		 * - `only`: will show only folders and no files.
+		 */
+		showFolders?: 'always' | 'never' | 'only';
 	}
 }
+
+

extensions/terminal-suggest/src/completions/upstream/apt.ts

@@ -1,4 +1,4 @@
-import { filepaths } from '../../helpers/filepaths';
+import { filepaths } from '../../fig/autocomplete-tools/generators'
 
 const packages: Fig.Generator = {
 	// only trigger when the token length transitions to or from 0
@@ -134,7 +134,11 @@ const completionSpec: Fig.Spec = {
 				name: "package",
 				description: "The package you want to install",
 				isVariadic: true,
-				generators: [packages, filepaths({ extensions: ["deb"] })],
+				template: 'filepaths',
+				generators: [
+					packages,
+					filepaths({ extensions: ["deb"] })
+				],
 			},
 			options: [
 				...installationOptions,

extensions/terminal-suggest/src/completions/upstream/node.ts

@@ -1,11 +1,12 @@
-import { filepaths } from '../../helpers/filepaths';
+import { filepaths } from '../../fig/autocomplete-tools/generators'
 
 const completionSpec: Fig.Subcommand = {
 	name: "node",
 	description: "Run the node interpreter",
 	args: {
 		name: "node script",
 		isScript: true,
+		template: 'filepaths',
 		generators: filepaths({
 			extensions: ["mjs", "js", "cjs"],
 			editFileSuggestions: { priority: 76 },

extensions/terminal-suggest/src/completions/upstream/python.ts

@@ -1,4 +1,4 @@
-import { filepaths } from '../../helpers/filepaths';
+import { filepaths } from '../../fig/autocomplete-tools/generators'
 
 const completionSpec: Fig.Spec = {
 	name: "python",
@@ -21,7 +21,7 @@ const completionSpec: Fig.Spec = {
 	},
 	args: {
 		name: "python script",
-		isScript: true,
+		template: "filepaths",
 		generators: filepaths({
 			extensions: ["py"],
 			editFileSuggestions: { priority: 76 },

extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts

@@ -90,6 +90,7 @@ export type ArgumentParserState = {
 	// Used to exclude subcommand suggestions after user has entered a subcommand arg.
 	haveEnteredSubcommandArgs: boolean;
 	isEndOfOptions: boolean;
+	fileExtensions?: string[];
 };
 
 // Result with derived completionObj/currentArg from cached state.
@@ -101,6 +102,7 @@ export type ArgumentParserResult = {
 	commandIndex: number;
 	suggestionFlags: SuggestionFlags;
 	annotations: Annotation[];
+	fileExtensions?: string[];
 };
 
 export const createArgState = (args?: Internal.Arg[]): ArgArrayState => {
@@ -757,6 +759,7 @@ export const getResultFromState = (
 		currentArg,
 		searchTerm,
 		suggestionFlags,
+		fileExtensions: state.fileExtensions,
 	};
 };
 
@@ -1045,7 +1048,15 @@ const parseArgumentsCached = async (
 	// } else {
 	// 	parseArgumentsCache.set(cacheKey, state);
 	// }
-
+	if ('args' in spec) {
+		for (const arg of Array.isArray(spec.args) ? spec.args : [spec.args]) {
+			for (const generator of Array.isArray(arg?.generators) ? arg.generators : [arg?.generators]) {
+				if (generator?.filepathOptions?.extensions) {
+					state.fileExtensions = generator.filepathOptions.extensions;
+				}
+			}
+		}
+	}
 	return state;
 };
 

extensions/terminal-suggest/src/fig/autocomplete-tools/generators/index.ts

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export { filepaths, FilepathsOptions, folders } from './src/filepaths';
+export * from './src/keyvalue';
+export { ai } from './src/ai';

extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/ai.ts

@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+export type GeneratorFn<T> = (args: {
+	tokens: string[];
+	executeCommand: Fig.ExecuteCommandFunction;
+	generatorContext: Fig.GeneratorContext;
+}) => Promise<T> | T;
+
+const MAX_TOKENS = 4097;
+const TOKEN_TO_CHAR_RATIO = 4;
+const MARGIN_RATIO = 0.8;
+const MAX_CHARS = MAX_TOKENS * TOKEN_TO_CHAR_RATIO * MARGIN_RATIO;
+
+/**
+ * A generator that uses the Fig AI API to generate suggestions.
+ *
+ * @param prompt The prompt to use for the AI. Can be a string or a generator function.
+ * @param message The message to send to the AI. Can be a string or a generator function.
+ * @param postProcess A function to post-process the AI's response.
+ * @param temperature The temperature to use for the AI.
+ * @returns A Fig generator.
+ */
+export function ai({
+	name,
+	prompt,
+	message,
+	postProcess,
+	temperature,
+	splitOn,
+}: {
+	name: string;
+	prompt?: string | GeneratorFn<string>;
+	message: string | GeneratorFn<string | null> | null;
+	postProcess?: (out: string) => Fig.Suggestion[];
+	temperature?: number;
+	splitOn?: string;
+}): Fig.Generator {
+	return {
+		scriptTimeout: 15000,
+		custom: async (tokens, executeCommand, generatorContext) => {
+			const settingOutput = await executeCommand({
+				command: 'fig',
+				args: ['settings', '--format', 'json', 'autocomplete.ai.enabled'],
+			});
+
+			if (!JSON.parse(settingOutput.stdout)) {
+				return [];
+			}
+
+			const promptString =
+				typeof prompt === 'function'
+					? await prompt({
+						tokens,
+						executeCommand,
+						generatorContext,
+					})
+					: prompt;
+
+			const messageString =
+				typeof message === 'function'
+					? await message({
+						tokens,
+						executeCommand,
+						generatorContext,
+					})
+					: message;
+
+			if (messageString === null || messageString.length === 0) {
+				console.warn('No message provided to AI generator');
+				return [];
+			}
+
+			const budget = MAX_CHARS - (promptString?.length ?? 0);
+
+			const body = {
+				model: 'gpt-3.5-turbo',
+				source: 'autocomplete',
+				name,
+				messages: [
+					...(promptString
+						? [
+							{
+								role: 'system',
+								content: promptString,
+							},
+						]
+						: []),
+					{
+						role: 'user',
+						content: messageString.slice(0, budget),
+					},
+				],
+				temperature,
+			};
+
+			const bodyJson = JSON.stringify(body);
+
+			const requestOutput = await executeCommand({
+				command: 'fig',
+				args: ['_', 'request', '--route', '/ai/chat', '--method', 'POST', '--body', bodyJson],
+			});
+			const json = JSON.parse(requestOutput.stdout);
+
+			const a =
+				json?.choices
+					.map((c: any) => c?.message?.content)
+					.filter((c: unknown) => typeof c === 'string')
+					.flatMap((c: string) =>
+						splitOn ? c.split(splitOn).filter((s) => s.trim().length > 0) : [c]
+					)
+					.map((out: string) => {
+						if (postProcess) {
+							return postProcess(out);
+						}
+						const text = out.trim().replace(/\n/g, ' ');
+						// eslint-disable-next-line local/code-no-dangerous-type-assertions allow-any-unicode-next-line
+						return {
+							icon: '🪄',
+							name: text,
+							insertValue: `'${text}'`,
+							description: 'Generated by Fig AI',
+						} as Fig.Suggestion;
+					}) ?? [];
+
+			return a;
+		},
+	};
+}