Improve save prompt (microsoft#256960)

* improve save prompt

* update

Author: aeschli

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

@@ -109,7 +109,7 @@ import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ChatModeService, IChatModeService } from '../common/chatModes.js';
 import { ChatResponseResourceFileSystemProvider } from '../common/chatResponseResourceFileSystemProvider.js';
-import { runSaveToPromptAction, SAVE_TO_PROMPT_SLASH_COMMAND_NAME } from './promptSyntax/saveToPromptAction.js';
+import { SAVE_TO_PROMPT_ACTION_ID, SAVE_TO_PROMPT_SLASH_COMMAND_NAME } from './promptSyntax/saveToPromptAction.js';
 import { ChatDynamicVariableModel } from './contrib/chatDynamicVariables.js';
 import { ChatAttachmentResolveService, IChatAttachmentResolveService } from './chatAttachmentResolveService.js';
 import { registerLanguageModelActions } from './actions/chatLanguageModelActions.js';
@@ -636,8 +636,8 @@ class ChatSlashStaticSlashCommandsContribution extends Disposable {
 				lastFocusedWidget,
 				'No currently active chat widget found.',
 			);
-
-			runSaveToPromptAction({ chat: lastFocusedWidget }, commandService);
+			const options = { chat: lastFocusedWidget };
+			return commandService.executeCommand(SAVE_TO_PROMPT_ACTION_ID, options,);
 		}));
 		this._store.add(slashCommandService.registerSlashCommand({
 			command: 'help',

src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.ts

@@ -46,28 +46,28 @@ export class PromptFileRewriter {
 			return undefined;
 		}
 		editor.setSelection(tools.range);
-		await this.rewriteTools(model, newTools, tools.range);
+		this.rewriteTools(model, newTools, tools.range);
 	}
 
 
 	public rewriteTools(model: ITextModel, newTools: IToolAndToolSetEnablementMap | undefined, range: Range): void {
+		const newString = newTools === undefined ? '' : `tools: ${this.getNewValueString(newTools)}`;
+		model.pushStackElement();
+		model.pushEditOperations(null, [EditOperation.replaceMove(range, newString)], () => null);
+		model.pushStackElement();
+	}
 
+	public getNewValueString(tools: IToolAndToolSetEnablementMap): string {
 		const newToolNames: string[] = [];
-		if (newTools === undefined) {
-			model.pushStackElement();
-			model.pushEditOperations(null, [EditOperation.replaceMove(range, '')], () => null);
-			model.pushStackElement();
-			return;
-		}
 		const toolsCoveredBySets = new Set<IToolData>();
-		for (const [item, picked] of newTools) {
+		for (const [item, picked] of tools) {
 			if (picked && item instanceof ToolSet) {
 				for (const tool of item.getTools()) {
 					toolsCoveredBySets.add(tool);
 				}
 			}
 		}
-		for (const [item, picked] of newTools) {
+		for (const [item, picked] of tools) {
 			if (picked) {
 				if (item instanceof ToolSet) {
 					newToolNames.push(item.referenceName);
@@ -76,10 +76,7 @@ export class PromptFileRewriter {
 				}
 			}
 		}
-
-		model.pushStackElement();
-		model.pushEditOperations(null, [EditOperation.replaceMove(range, `tools: [${newToolNames.map(s => `'${s}'`).join(', ')}]`)], () => null);
-		model.pushStackElement();
+		return `[${newToolNames.map(s => `'${s}'`).join(', ')}]`;
 	}
 }
 

src/vs/workbench/contrib/chat/browser/promptSyntax/saveToPromptAction.ts

@@ -3,28 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assertDefined } from '../../../../../base/common/types.js';
 import { localize2 } from '../../../../../nls.js';
 import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { PromptsConfig } from '../../common/promptSyntax/config/config.js';
-import { IEditorPane } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { chatSubcommandLeader, IParsedChatRequest } from '../../common/chatParserTypes.js';
-import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
 import { PROMPT_LANGUAGE_ID } from '../../common/promptSyntax/promptTypes.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { IChatWidget } from '../chat.js';
-
+import { ChatModeKind } from '../../common/constants.js';
+import { PromptFileRewriter } from './promptFileRewriter.js';
+import { ILanguageModelChatMetadata } from '../../common/languageModels.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Schemas } from '../../../../../base/common/network.js';
 
 /**
  * Action ID for the `Save Prompt` action.
  */
-const SAVE_TO_PROMPT_ACTION_ID = 'workbench.action.chat.save-to-prompt';
+export const SAVE_TO_PROMPT_ACTION_ID = 'workbench.action.chat.save-to-prompt';
 
 /**
  * Name of the in-chat slash command associated with this action.
@@ -38,7 +39,7 @@ interface ISaveToPromptActionOptions {
 	/**
 	 * Chat widget reference to save session of.
 	 */
-	chat: IChatWidget;
+	readonly chat: IChatWidget;
 }
 
 /**
@@ -61,77 +62,69 @@ class SaveToPromptAction extends Action2 {
 	public async run(
 		accessor: ServicesAccessor,
 		options: ISaveToPromptActionOptions,
-	): Promise<IEditorPane> {
+	): Promise<void> {
 		const logService = accessor.get(ILogService);
 		const editorService = accessor.get(IEditorService);
-		const toolsService = accessor.get(ILanguageModelToolsService);
+		const rewriter = accessor.get(IInstantiationService).createInstance(PromptFileRewriter);
 
 		const logPrefix = 'save to prompt';
-		const { chat } = options;
-
-		const { viewModel } = chat;
-		assertDefined(
-			viewModel,
-			'No view model found on currently the active chat widget.',
-		);
-
-		const { model } = viewModel;
-
-		const turns: ITurn[] = [];
-		for (const request of model.getRequests()) {
-			const { message, response: responseModel } = request;
-
-			if (isSaveToPromptSlashCommand(message)) {
-				continue;
-			}
-
-			if (responseModel === undefined) {
-				logService.warn(
-					`[${logPrefix}]: skipping request '${request.id}' with no response`,
-				);
+		const chatWidget = options.chat;
+		const mode = chatWidget.input.currentModeObs.get();
+		const model = chatWidget.input.selectedLanguageModel;
+
+		const toolAndToolsetMap = chatWidget.input.selectedToolsModel.entriesMap.get();
+
+		const output = [];
+		output.push('---');
+		output.push(`description: New prompt created from chat session`);
+		output.push(`mode: ${mode.kind}`);
+		if (mode.kind === ChatModeKind.Agent) {
+			output.push(`tools: ${rewriter.getNewValueString(toolAndToolsetMap)}`);
+		}
+		if (model) {
+			output.push(`model: ${ILanguageModelChatMetadata.asQualifiedName(model.metadata)}`);
+		}
+		output.push('---');
 
-				continue;
-			}
+		const viewModel = chatWidget.viewModel;
+		if (viewModel) {
 
-			const { response } = responseModel;
+			for (const request of viewModel.model.getRequests()) {
+				const { message, response: responseModel } = request;
 
-			const tools = new Set<string>();
-			for (const record of response.value) {
-				if (('toolId' in record === false) || !record.toolId) {
+				if (isSaveToPromptSlashCommand(message)) {
 					continue;
 				}
 
-				const tool = toolsService.getTool(record.toolId);
-				if ((tool === undefined) || (!tool.toolReferenceName)) {
+				if (responseModel === undefined) {
+					logService.warn(`[${logPrefix}]: skipping request '${request.id}' with no response`);
 					continue;
 				}
 
-				tools.add(tool.toolReferenceName);
-			}
-
-			turns.push({
-				request: message.text,
-				response: response.getMarkdown(),
-				tools,
-			});
-		}
+				const { response } = responseModel;
 
-		const promptText = renderPrompt(turns);
-
-		const editor = await editorService.openEditor({
-			resource: undefined,
-			contents: promptText,
-			languageId: PROMPT_LANGUAGE_ID,
-		});
+				output.push(`<user>`);
+				output.push(request.message.text);
+				output.push(`</user>`);
+				output.push();
+				output.push(`<assistant>`);
+				output.push(response.getMarkdown());
+				output.push(`</assistant>`);
+				output.push();
+			}
+			const promptText = output.join('\n');
 
-		assertDefined(
-			editor,
-			'Failed to open untitled editor for the prompt.',
-		);
+			const untitledPath = 'new.prompt.md';
+			const untitledResource = URI.from({ scheme: Schemas.untitled, path: untitledPath });
 
-		editor.focus();
+			const editor = await editorService.openEditor({
+				resource: untitledResource,
+				contents: promptText,
+				languageId: PROMPT_LANGUAGE_ID,
+			});
 
-		return editor;
+			editor?.focus();
+		}
 	}
 }
 
@@ -157,121 +150,6 @@ function isSaveToPromptSlashCommand(message: IParsedChatRequest): boolean {
 	return true;
 }
 
-/**
- * Render the response part of a `request`/`response` turn pair.
- */
-function renderResponse(response: string): string {
-	// if response starts with a code block, add an extra new line
-	// before it, to prevent full blockquote from being be broken
-	const delimiter = (response.startsWith('```'))
-		? '\n>'
-		: ' ';
-
-	// add `>` to the beginning of each line of the response
-	// so it looks like a blockquote citing Copilot
-	const quotedResponse = response.replaceAll('\n', '\n> ');
-
-	return `> Copilot:${delimiter}${quotedResponse}`;
-}
-
-/**
- * Render a single `request`/`response` turn of the chat session.
- */
-function renderTurn(turn: ITurn): string {
-	const { request, response } = turn;
-
-	return `\n${request}\n\n${renderResponse(response)}`;
-}
-
-/**
- * Render the entire chat session as a markdown prompt.
- */
-function renderPrompt(turns: readonly ITurn[]): string {
-	const content: string[] = [];
-	const allTools = new Set<string>();
-
-	// render each turn and collect tool names
-	// that were used in the each turn
-	for (const turn of turns) {
-		content.push(renderTurn(turn));
-
-		// collect all used tools into a set of strings
-		for (const tool of turn.tools) {
-			allTools.add(tool);
-		}
-	}
-
-	const result = [];
-
-	// add prompt header
-	if (allTools.size !== 0) {
-		result.push(renderHeader(allTools));
-	}
-
-	// add chat request/response turns
-	result.push(
-		content.join('\n'),
-	);
-
-	// add trailing empty line
-	result.push('');
-
-	return result.join('\n');
-}
-
-
-/**
- * Render the `tools` metadata inside prompt header.
- */
-function renderTools(tools: Set<string>): string {
-	const toolStrings = [...tools].map((tool) => {
-		return `'${tool}'`;
-	});
-
-	return `tools: [${toolStrings.join(', ')}]`;
-}
-
-/**
- * Render prompt header.
- */
-function renderHeader(tools: Set<string>): string {
-	// skip rendering the header if no tools provided
-	if (tools.size === 0) {
-		return '';
-	}
-
-	return [
-		'---',
-		renderTools(tools),
-		'---',
-	].join('\n');
-}
-
-/**
- * Interface for a single `request`/`response` turn
- * of a chat session.
- */
-interface ITurn {
-	request: string;
-	response: string;
-	tools: Set<string>;
-}
-
-/**
- * Runs the `Save To Prompt` action with provided options. We export this
- * function instead of {@link SAVE_TO_PROMPT_ACTION_ID} directly to
- * encapsulate/enforce the correct options to be passed to the action.
- */
-export function runSaveToPromptAction(
-	options: ISaveToPromptActionOptions,
-	commandService: ICommandService,
-) {
-	return commandService.executeCommand(
-		SAVE_TO_PROMPT_ACTION_ID,
-		options,
-	);
-}
-
 /**
  * Helper to register all the `Save Prompt` actions.
  */