Terminal suggest: Support fig additionalSuggestions with proper insertValue handling

extensions/terminal-suggest/src/fig/figInterface.ts

@@ -338,6 +338,11 @@ export async function collectCompletionItemResult(
 	}
 	if (parsedArguments.suggestionFlags & SuggestionFlag.Subcommands) {
 		await addSuggestions(parsedArguments.completionObj.subcommands, vscode.TerminalCompletionItemKind.Method);
+
+		// Add support for additionalSuggestions
+		if (parsedArguments.completionObj.additionalSuggestions) {
+			await addAdditionalSuggestions(parsedArguments.completionObj.additionalSuggestions, terminalContext, prefix, items);
+		}
 	}
 	if (parsedArguments.suggestionFlags & SuggestionFlag.Options) {
 		await addSuggestions(parsedArguments.completionObj.options, vscode.TerminalCompletionItemKind.Flag, parsedArguments);
@@ -346,6 +351,54 @@ export async function collectCompletionItemResult(
 	return { filesRequested, foldersRequested, fileExtensions };
 }
 
+async function addAdditionalSuggestions(
+	additionalSuggestions: (string | Fig.Suggestion)[],
+	terminalContext: { commandLine: string; cursorPosition: number },
+	prefix: string,
+	items: vscode.TerminalCompletionItem[]
+) {
+	for (const suggestion of additionalSuggestions) {
+		if (typeof suggestion === 'string') {
+			// Simple string suggestion
+			items.push(createCompletionItem(
+				terminalContext.cursorPosition,
+				prefix,
+				{ label: suggestion },
+				undefined,
+				undefined,
+				vscode.TerminalCompletionItemKind.Method
+			));
+		} else {
+			// Full suggestion object
+			const suggestionLabels = getFigSuggestionLabel(suggestion);
+			if (!suggestionLabels?.length) {
+				continue;
+			}
+
+			for (const label of suggestionLabels) {
+				const completionItem = createCompletionItem(
+					terminalContext.cursorPosition,
+					prefix,
+					{ label },
+					undefined,
+					suggestion.description,
+					vscode.TerminalCompletionItemKind.Method
+				);
+
+				// Handle icon property (fig://... icons are not directly supported yet,
+				// but we can use a lightbulb icon for additionalSuggestions)
+				if (suggestion.icon) {
+					// Note: Custom icons from fig (fig://...) are not yet supported.
+					// Using lightbulb outline icon as mentioned in issue #239706
+					completionItem.icon = new vscode.ThemeIcon('lightbulb');
+				}
+
+				items.push(completionItem);
+			}
+		}
+	}
+}
+
 function convertEnvRecordToArray(env: Record<string, string>): EnvironmentVariable[] {
 	return Object.entries(env).map(([key, value]) => ({ key, value }));
 }

extensions/terminal-suggest/src/test/fig.test.ts

@@ -183,6 +183,32 @@ export const figGenericTestSuites: ISuiteSpec[] = [
 			{ input: 'foo b|', expectedCompletions: ['b', 'foo'] },
 			{ input: 'foo c|', expectedCompletions: ['c', 'foo'] },
 		]
+	},
+	{
+		name: 'Fig additionalSuggestions support',
+		completionSpecs: [
+			{
+				name: 'git',
+				description: 'Git version control',
+				subcommands: [
+					{ name: 'commit', description: 'Commit changes' },
+					{ name: 'add', description: 'Add files' }
+				],
+				additionalSuggestions: [
+					{
+						name: "commit -m 'msg'",
+						description: "Git commit shortcut",
+						insertValue: "commit -m '{cursor}'",
+						icon: "fig://template?color=2ecc71&badge=🔥",
+					},
+					"quick-commit"
+				]
+			}
+		],
+		availableCommands: 'git',
+		testSpecs: [
+			{ input: 'git |', expectedCompletions: ["commit -m 'msg'", 'quick-commit', 'commit', 'add'] },
+		]
 	}
 ];