simple terminal tools on surface level of chat (#296870)

* simple terminal tools on surface level of chat

* Set SimpleTerminalCollapsible default true for Insiders, false for Stable (#296911)

* Initial plan

* Set SimpleTerminalCollapsible default true for insiders, false for stable

Co-authored-by: justschen <54879025+justschen@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: justschen <54879025+justschen@users.noreply.github.com>

* make sure it is initialized the right way

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>

Author: justschen

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

@@ -1129,6 +1129,12 @@ configurationRegistry.registerConfiguration({
 			markdownDescription: nls.localize('chat.agent.thinking.terminalTools', "When enabled, terminal tool calls are displayed inside the thinking dropdown with a simplified view."),
 			tags: ['experimental'],
 		},
+		[ChatConfiguration.SimpleTerminalCollapsible]: {
+			type: 'boolean',
+			default: product.quality !== 'stable',
+			markdownDescription: nls.localize('chat.tools.terminal.simpleCollapsible', "When enabled, terminal tool calls are always displayed in a collapsible container with a simplified view."),
+			tags: ['experimental'],
+		},
 		'chat.tools.usagesTool.enabled': {
 			type: 'boolean',
 			default: true,

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

@@ -222,6 +222,7 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 	private readonly _decoration: TerminalCommandDecoration;
 	private _userToggledOutput: boolean = false;
 	private _isInThinkingContainer: boolean = false;
+	private _usesCollapsibleWrapper: boolean = false;
 	private _thinkingCollapsibleWrapper: ChatTerminalThinkingCollapsibleWrapper | undefined;
 
 	private markdownPart: ChatMarkdownContentPart | undefined;
@@ -360,12 +361,14 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 		const progressPart = this._register(_instantiationService.createInstance(ChatProgressSubPart, elements.container, this.getIcon(), terminalData.autoApproveInfo));
 		this._decoration.update();
 
-		// wrap terminal when thinking setting enabled
+		// Keep thinking-container semantics separate from wrapper semantics.
 		const terminalToolsInThinking = this._configurationService.getValue<boolean>(ChatConfiguration.TerminalToolsInThinking);
+		const isSimpleTerminal = this._configurationService.getValue<boolean>(ChatConfiguration.SimpleTerminalCollapsible);
 		const requiresConfirmation = toolInvocation.kind === 'toolInvocation' && IChatToolInvocation.getConfirmationMessages(toolInvocation);
+		this._isInThinkingContainer = terminalToolsInThinking && !requiresConfirmation;
+		this._usesCollapsibleWrapper = this._isInThinkingContainer || isSimpleTerminal;
 
-		if (terminalToolsInThinking && !requiresConfirmation) {
-			this._isInThinkingContainer = true;
+		if (this._usesCollapsibleWrapper) {
 			this.domNode = this._createCollapsibleWrapper(progressPart.domNode, displayCommand, toolInvocation, context);
 		} else {
 			this.domNode = progressPart.domNode;
@@ -520,8 +523,8 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 		if (this._store.isDisposed) {
 			return;
 		}
-		// don't show dropdown when in thinking container
-		if (this._isInThinkingContainer) {
+		// don't show dropdown when rendered with the simplified/collapsible wrapper
+		if (this._usesCollapsibleWrapper) {
 			return;
 		}
 		const resolvedCommand = command ?? this._getResolvedCommand();
@@ -624,7 +627,7 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 				hasRealOutput,
 			}));
 			store.add(autoExpand.onDidRequestExpand(() => {
-				if (this._isInThinkingContainer) {
+				if (this._usesCollapsibleWrapper) {
 					this.expandCollapsibleWrapper();
 				}
 				this._toggleOutput(true);

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

@@ -37,6 +37,7 @@ export enum ChatConfiguration {
 	ThinkingStyle = 'chat.agent.thinkingStyle',
 	ThinkingGenerateTitles = 'chat.agent.thinking.generateTitles',
 	TerminalToolsInThinking = 'chat.agent.thinking.terminalTools',
+	SimpleTerminalCollapsible = 'chat.tools.terminal.simpleCollapsible',
 	ThinkingPhrases = 'chat.agent.thinking.phrases',
 	AutoExpandToolFailures = 'chat.tools.autoExpandFailures',
 	TodosShowWidget = 'chat.tools.todos.showWidget',