Merge pull request #288358 from microsoft/tyriar/287772_py

Format python commands specially

Author: Tyriar

src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts

@@ -105,8 +105,12 @@ export class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationS
 		const { title, message, disclaimer, terminalCustomActions } = state.confirmationMessages;
 
 		// Use pre-computed confirmation data from runInTerminalTool (cd prefix extraction happens there for localization)
-		const initialContent = terminalData.confirmation?.commandLine ?? (terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
+		// Use presentationOverrides for display if available (e.g., extracted Python code)
+		const initialContent = terminalData.presentationOverrides?.commandLine ?? terminalData.confirmation?.commandLine ?? (terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
 		const cdPrefix = terminalData.confirmation?.cdPrefix ?? '';
+		// When presentationOverrides is set, the editor should be read-only since the displayed content
+		// differs from the actual command (e.g., extracted Python code vs full python -c command)
+		const isReadOnly = !!terminalData.presentationOverrides;
 
 		const autoApproveEnabled = this.configurationService.getValue(TerminalContribSettingId.EnableAutoApprove) === true;
 		const autoApproveWarningAccepted = this.storageService.getBoolean(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, StorageScope.APPLICATION, false);
@@ -143,12 +147,12 @@ export class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationS
 			verticalPadding: 5,
 			editorOptions: {
 				wordWrap: 'on',
-				readOnly: false,
+				readOnly: isReadOnly,
 				tabFocusMode: true,
 				ariaLabel: typeof title === 'string' ? title : title.value
 			}
 		};
-		const languageId = this.languageService.getLanguageIdByLanguageName(terminalData.language ?? 'sh') ?? 'shellscript';
+		const languageId = this.languageService.getLanguageIdByLanguageName(terminalData.presentationOverrides?.language ?? terminalData.language ?? 'sh') ?? 'shellscript';
 		const model = this._register(this.modelService.createModel(
 			initialContent,
 			this.languageService.createById(languageId),

src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts

@@ -283,12 +283,15 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 			getResolvedCommand: () => this._getResolvedCommand()
 		}));
 
+		// Use presentationOverrides for display if available (e.g., extracted Python code with syntax highlighting)
+		const displayCommand = terminalData.presentationOverrides?.commandLine ?? command;
+		const displayLanguage = terminalData.presentationOverrides?.language ?? terminalData.language;
 		const titlePart = this._register(_instantiationService.createInstance(
 			ChatQueryTitlePart,
 			elements.commandBlock,
 			new MarkdownString([
-				`\`\`\`${terminalData.language}`,
-				`${command.replaceAll('```', '\\`\\`\\`')}`,
+				`\`\`\`${displayLanguage}`,
+				`${displayCommand.replaceAll('```', '\\`\\`\\`')}`,
 				`\`\`\``
 			].join('\n'), { supportThemeIcons: true }),
 			undefined,

src/vs/workbench/contrib/chat/common/chatService/chatService.ts

@@ -387,6 +387,17 @@ export interface IChatTerminalToolInvocationData {
 		/** The cd prefix to prepend back when user edits */
 		cdPrefix?: string;
 	};
+	/**
+	 * Overrides to apply to the presentation of the tool call only, but not actually change the
+	 * command that gets run. For example, python -c "print('hello')" can be presented as just
+	 * the Python code with Python syntax highlighting.
+	 */
+	presentationOverrides?: {
+		/** The command line to display in the UI */
+		commandLine: string;
+		/** The language for syntax highlighting */
+		language: string;
+	};
 	/** Message for model recommending the use of an alternative tool */
 	alternativeRecommendation?: string;
 	language: string;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/commandLinePresenter.ts

@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { OperatingSystem } from '../../../../../../../base/common/platform.js';
+
+export interface ICommandLinePresenter {
+	/**
+	 * Attempts to create a presentation for the given command line.
+	 * Command line presenters allow displaying an extracted/transformed version
+	 * of a command (e.g., Python code from `python -c "..."`) with appropriate
+	 * syntax highlighting, while the actual command remains unchanged.
+	 *
+	 * @returns The presentation result if this presenter handles the command, undefined otherwise.
+	 */
+	present(options: ICommandLinePresenterOptions): ICommandLinePresenterResult | undefined;
+}
+
+export interface ICommandLinePresenterOptions {
+	commandLine: string;
+	shell: string;
+	os: OperatingSystem;
+}
+
+export interface ICommandLinePresenterResult {
+	/**
+	 * The extracted/transformed command to display (e.g., the Python code).
+	 */
+	commandLine: string;
+
+	/**
+	 * The language ID for syntax highlighting (e.g., 'python').
+	 */
+	language: string;
+
+	/**
+	 * A human-readable name for the language (e.g., 'Python') used in UI labels.
+	 */
+	languageDisplayName: string;
+}

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/pythonCommandLinePresenter.ts

@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { OperatingSystem } from '../../../../../../../base/common/platform.js';
+import { isPowerShell } from '../../runInTerminalHelpers.js';
+import type { ICommandLinePresenter, ICommandLinePresenterOptions, ICommandLinePresenterResult } from './commandLinePresenter.js';
+
+/**
+ * Command line presenter for Python inline commands (`python -c "..."`).
+ * Extracts the Python code and sets up Python syntax highlighting.
+ */
+export class PythonCommandLinePresenter implements ICommandLinePresenter {
+	present(options: ICommandLinePresenterOptions): ICommandLinePresenterResult | undefined {
+		const extractedPython = extractPythonCommand(options.commandLine, options.shell, options.os);
+		if (extractedPython) {
+			return {
+				commandLine: extractedPython,
+				language: 'python',
+				languageDisplayName: 'Python',
+			};
+		}
+		return undefined;
+	}
+}
+
+/**
+ * Extracts the Python code from a `python -c "..."` or `python -c '...'` command,
+ * returning the code with properly unescaped quotes.
+ *
+ * @param commandLine The full command line to parse
+ * @param shell The shell path (to determine quote escaping style)
+ * @param os The operating system
+ * @returns The extracted Python code, or undefined if not a python -c command
+ */
+export function extractPythonCommand(commandLine: string, shell: string, os: OperatingSystem): string | undefined {
+	// Match python/python3 -c "..." pattern (double quotes)
+	const doubleQuoteMatch = commandLine.match(/^python(?:3)?\s+-c\s+"(?<python>.+)"$/s);
+	if (doubleQuoteMatch?.groups?.python) {
+		let pythonCode = doubleQuoteMatch.groups.python.trim();
+
+		// Unescape quotes based on shell type
+		if (isPowerShell(shell, os)) {
+			// PowerShell uses backtick-quote (`") to escape quotes inside double-quoted strings
+			pythonCode = pythonCode.replace(/`"/g, '"');
+		} else {
+			// Bash/sh/zsh use backslash-quote (\")
+			pythonCode = pythonCode.replace(/\\"/g, '"');
+		}
+
+		return pythonCode;
+	}
+
+	// Match python/python3 -c '...' pattern (single quotes)
+	// Single quotes in bash/sh/zsh are literal - no escaping inside
+	// Single quotes in PowerShell are also literal
+	const singleQuoteMatch = commandLine.match(/^python(?:3)?\s+-c\s+'(?<python>.+)'$/s);
+	if (singleQuoteMatch?.groups?.python) {
+		return singleQuoteMatch.groups.python.trim();
+	}
+
+	return undefined;
+}

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts

@@ -38,6 +38,8 @@ import { NoneExecuteStrategy } from '../executeStrategy/noneExecuteStrategy.js';
 import { RichExecuteStrategy } from '../executeStrategy/richExecuteStrategy.js';
 import { getOutput } from '../outputHelpers.js';
 import { extractCdPrefix, isFish, isPowerShell, isWindowsPowerShell, isZsh } from '../runInTerminalHelpers.js';
+import type { ICommandLinePresenter } from './commandLinePresenter/commandLinePresenter.js';
+import { PythonCommandLinePresenter } from './commandLinePresenter/pythonCommandLinePresenter.js';
 import { RunInTerminalToolTelemetry } from '../runInTerminalToolTelemetry.js';
 import { ShellIntegrationQuality, ToolTerminalCreator, type IToolTerminal } from '../toolTerminalCreator.js';
 import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../treeSitterCommandParser.js';
@@ -281,6 +283,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 	private readonly _commandLineRewriters: ICommandLineRewriter[];
 	private readonly _commandLineAnalyzers: ICommandLineAnalyzer[];
+	private readonly _commandLinePresenters: ICommandLinePresenter[];
 
 	protected readonly _sessionTerminalAssociations = new ResourceMap<IToolTerminal>();
 
@@ -330,6 +333,9 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			this._register(this._instantiationService.createInstance(CommandLineFileWriteAnalyzer, this._treeSitterCommandParser, (message, args) => this._logService.info(`RunInTerminalTool#CommandLineFileWriteAnalyzer: ${message}`, args))),
 			this._register(this._instantiationService.createInstance(CommandLineAutoApproveAnalyzer, this._treeSitterCommandParser, this._telemetry, (message, args) => this._logService.info(`RunInTerminalTool#CommandLineAutoApproveAnalyzer: ${message}`, args))),
 		];
+		this._commandLinePresenters = [
+			new PythonCommandLinePresenter(),
+		];
 
 		// Clear out warning accepted state if the setting is disabled
 		this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
@@ -523,17 +529,40 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			};
 
 			confirmationTitle = args.isBackground
-				? localize('runInTerminal.background.inDirectory', "Run `{0}` command in `{1}`? (background terminal)", shellType, directoryLabel)
-				: localize('runInTerminal.inDirectory', "Run `{0}` command in `{1}`?", shellType, directoryLabel);
+				? localize('runInTerminal.background.inDirectory', "Run `{0}` command in background within `{1}`?", shellType, directoryLabel)
+				: localize('runInTerminal.inDirectory', "Run `{0}` command within `{1}`?", shellType, directoryLabel);
 		} else {
 			toolSpecificData.confirmation = {
 				commandLine: commandToDisplay,
 			};
 			confirmationTitle = args.isBackground
-				? localize('runInTerminal.background', "Run `{0}` command? (background terminal)", shellType)
+				? localize('runInTerminal.background', "Run `{0}` command in background?", shellType)
 				: localize('runInTerminal', "Run `{0}` command?", shellType);
 		}
 
+		// Check for presentation overrides (e.g., Python -c command extraction)
+		// Use the command after cd prefix extraction if available, since that's what's displayed in the editor
+		const commandForPresenter = extractedCd?.command ?? commandToDisplay;
+		for (const presenter of this._commandLinePresenters) {
+			const presenterResult = presenter.present({ commandLine: commandForPresenter, shell, os });
+			if (presenterResult) {
+				toolSpecificData.presentationOverrides = {
+					commandLine: presenterResult.commandLine,
+					language: presenterResult.language,
+				};
+				if (extractedCd && toolSpecificData.confirmation?.cwdLabel) {
+					confirmationTitle = args.isBackground
+						? localize('runInTerminal.presentationOverride.background.inDirectory', "Run `{0}` command in `{1}` in background within `{2}`?", presenterResult.languageDisplayName, shellType, toolSpecificData.confirmation.cwdLabel)
+						: localize('runInTerminal.presentationOverride.inDirectory', "Run `{0}` command in `{1}` within `{2}`?", presenterResult.languageDisplayName, shellType, toolSpecificData.confirmation.cwdLabel);
+				} else {
+					confirmationTitle = args.isBackground
+						? localize('runInTerminal.presentationOverride.background', "Run `{0}` command in `{1}` in background?", presenterResult.languageDisplayName, shellType)
+						: localize('runInTerminal.presentationOverride', "Run `{0}` command in `{1}`?", presenterResult.languageDisplayName, shellType);
+				}
+				break;
+			}
+		}
+
 		const confirmationMessages = isFinalAutoApproved ? undefined : {
 			title: confirmationTitle,
 			message: new MarkdownString(args.explanation),