Merge branch 'main' into copilot/fix-256710

Author: Tyriar

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

@@ -576,7 +576,7 @@ export function registerChatActions() {
 								const menuActions = getContextMenuActions(actions, 'navigation');
 								ckey.reset();
 
-								const buttons = menuActions.secondary.map(action => ({
+								const buttons = menuActions.primary.map(action => ({
 									id: action.id,
 									tooltip: action.tooltip,
 									iconClass: action.class || ThemeIcon.asClassName(Codicon.symbolClass),

src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolSubPart.ts

@@ -6,6 +6,9 @@
 import * as dom from '../../../../../../base/browser/dom.js';
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { thenIfNotDisposed } from '../../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
 import { MarkdownRenderer } from '../../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
@@ -86,7 +89,12 @@ export class TerminalConfirmationWidgetSubPart extends BaseChatToolInvocationSub
 			}
 		};
 		const langId = this.languageService.getLanguageIdByLanguageName(terminalData.language ?? 'sh') ?? 'shellscript';
-		const model = this.modelService.createModel(terminalData.kind === 'terminal' ? terminalData.command : terminalData.commandLine.toolEdited ?? terminalData.commandLine.original, this.languageService.createById(langId), undefined, true);
+		const model = this.modelService.createModel(
+			terminalData.kind === 'terminal' ? terminalData.command : terminalData.commandLine.toolEdited ?? terminalData.commandLine.original,
+			this.languageService.createById(langId),
+			this._getUniqueCodeBlockUri(),
+			true
+		);
 		const editor = this._register(this.editorPool.get());
 		const renderPromise = editor.object.render({
 			codeBlockIndex: this.codeBlockStartIndex,
@@ -144,4 +152,11 @@ export class TerminalConfirmationWidgetSubPart extends BaseChatToolInvocationSub
 		});
 		this.domNode = confirmWidget.domNode;
 	}
+
+	private _getUniqueCodeBlockUri() {
+		return URI.from({
+			scheme: Schemas.vscodeChatCodeBlock,
+			path: generateUuid(),
+		});
+	}
 }

src/vs/workbench/contrib/terminal/browser/terminalActions.ts

@@ -69,7 +69,7 @@ const category = terminalStrings.actionCategory;
 
 // Some terminal context keys get complicated. Since normalizing and/or context keys can be
 // expensive this is done once per context key and shared.
-const sharedWhenClause = (() => {
+export const sharedWhenClause = (() => {
 	const terminalAvailable = ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated);
 	return {
 		terminalAvailable,

src/vs/workbench/contrib/terminal/terminal.all.ts

@@ -33,3 +33,4 @@ import '../terminalContrib/sendSignal/browser/terminal.sendSignal.contribution.j
 import '../terminalContrib/suggest/browser/terminal.suggest.contribution.js';
 import '../terminalContrib/chat/browser/terminal.initialHint.contribution.js';
 import '../terminalContrib/wslRecommendation/browser/terminal.wslRecommendation.contribution.js';
+import '../terminalContrib/voice/browser/terminal.voice.contribution.js';

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

@@ -186,7 +186,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 
 		const instance = context.chatSessionId ? this._sessionTerminalAssociations.get(context.chatSessionId)?.instance : undefined;
-		let toolEditedCommand: string | undefined = await this._rewriteCommandIfNeeded(context, args, instance, shell);
+		let toolEditedCommand: string | undefined = await this._rewriteCommandIfNeeded(args, instance, shell);
 		if (toolEditedCommand === args.command) {
 			toolEditedCommand = undefined;
 		}
@@ -211,9 +211,30 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 
 		const args = invocation.parameters as IRunInTerminalInputParams;
-		const toolSpecificData = invocation.toolSpecificData as IChatTerminalToolInvocationData | IChatTerminalToolInvocationData2 | undefined;
+
+		// Tool specific data is not provided when the invocation is auto-approved. Re-calculate it
+		// if needed
+		let toolSpecificData = invocation.toolSpecificData as IChatTerminalToolInvocationData | IChatTerminalToolInvocationData2 | undefined;
 		if (toolSpecificData === undefined) {
-			throw new Error('Tool specific data must be provided');
+			const os = await this._osBackend;
+			const shell = await this._terminalProfileResolverService.getDefaultShell({
+				os,
+				remoteAuthority: this._remoteAgentService.getConnection()?.remoteAuthority
+			});
+			const language = os === OperatingSystem.Windows ? 'pwsh' : 'sh';
+			const instance = invocation.context?.sessionId ? this._sessionTerminalAssociations.get(invocation.context!.sessionId)?.instance : undefined;
+			let toolEditedCommand: string | undefined = await this._rewriteCommandIfNeeded(args, instance, shell);
+			if (toolEditedCommand === args.command) {
+				toolEditedCommand = undefined;
+			}
+			toolSpecificData = {
+				kind: 'terminal2',
+				commandLine: {
+					original: args.command,
+					toolEdited: toolEditedCommand
+				},
+				language
+			};
 		}
 
 		this._logService.debug(`RunInTerminalTool: Invoking with options ${JSON.stringify(args)}`);
@@ -397,7 +418,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 	}
 
-	protected async _rewriteCommandIfNeeded(context: IToolInvocationPreparationContext, args: IRunInTerminalInputParams, instance: Pick<ITerminalInstance, 'getCwdResource'> | undefined, shell: string): Promise<string> {
+	protected async _rewriteCommandIfNeeded(args: IRunInTerminalInputParams, instance: Pick<ITerminalInstance, 'getCwdResource'> | undefined, shell: string): Promise<string> {
 		const commandLine = args.command;
 		const os = await this._osBackend;
 
@@ -604,7 +625,7 @@ class BackgroundTerminalExecution extends Disposable {
 		super();
 
 		this._startMarker = this._register(this._xterm.raw.registerMarker());
-		this._instance.runCommand(this._commandLine);
+		this._instance.runCommand(this._commandLine, true);
 	}
 
 	getOutput(): string {