[pull] main from microsoft:main

src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts

@@ -328,7 +328,8 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			//   detection if necessary
 			sed: true,
 			'/^sed\\b.*(-[a-zA-Z]*(e|f)[a-zA-Z]*|--expression|--file)\\b/': false,
-			'/^sed\\b.*(\/e|\/w|;W)/': false,
+			'/^sed\\b.*s\\/.*\\/.*\\/[ew]/': false,
+			'/^sed\\b.*;W/': false,
 
 			// sort
 			// - `-o`: Output redirection can write files (`sort -o /etc/something file`) which are

src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts

@@ -260,6 +260,7 @@ suite('RunInTerminalTool', () => {
 			'rg -i --color=never "TODO" src/',
 			'sed "s/foo/bar/g"',
 			'sed -n "1,10p" file.txt',
+			'sed -n \'45,80p\' /foo/bar/Example.java',
 			'sort file.txt',
 			'tree directory',
 

src/vs/workbench/contrib/terminalContrib/inlineHint/browser/media/terminalInitialHint.css

@@ -8,7 +8,27 @@
 	container-type: inline-size;
 }
 
-@container (max-width: 300px) {
+.monaco-workbench .terminal-initial-hint .terminal-initial-hint-separator {
+	display: none;
+}
+
+.monaco-workbench .terminal-initial-hint .terminal-initial-hint-compact {
+	display: none !important;
+}
+
+@container (max-width: 500px) {
+	.monaco-workbench .terminal-initial-hint .terminal-initial-hint-prose {
+		display: none !important;
+	}
+	.monaco-workbench .terminal-initial-hint .terminal-initial-hint-separator {
+		display: block;
+	}
+	.monaco-workbench .terminal-initial-hint .terminal-initial-hint-compact {
+		display: inline !important;
+	}
+}
+
+@container (max-width: 240px) {
 	.monaco-workbench .terminal-initial-hint > * {
 		display: none !important;
 	}

src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts

@@ -234,6 +234,21 @@ class TerminalInitialHintWidget extends Disposable {
 		}));
 	}
 
+	/**
+	 * Creates wrapped hint elements with click listeners for responsive hint layouts.
+	 * Returns a before link and an after prose span containing a link.
+	 */
+	private _createWrappedHintElements(text: string, keybindingLabel: string, clickHandler: () => void): { before: HTMLAnchorElement; after: HTMLSpanElement } {
+		const [beforeText, afterText] = text.split(keybindingLabel);
+		const before = $('a', undefined, beforeText) as HTMLAnchorElement;
+		this._toDispose.add(dom.addDisposableListener(before, dom.EventType.CLICK, clickHandler));
+		const after = $('span.terminal-initial-hint-prose', undefined) as HTMLSpanElement;
+		const afterLink = $('a', undefined, afterText);
+		this._toDispose.add(dom.addDisposableListener(afterLink, dom.EventType.CLICK, clickHandler));
+		after.appendChild(afterLink);
+		return { before, after };
+	}
+
 	private _getHintInlineChat() {
 		const ariaLabelParts: string[] = [];
 
@@ -282,11 +297,7 @@ class TerminalInitialHintWidget extends Disposable {
 				if (terminalAgents?.length) {
 					const actionPart = localize('emptyHintText', 'Open chat {0}. ', keybindingHintLabel);
 
-					const [before, after] = actionPart.split(keybindingHintLabel).map((fragment) => {
-						const hintPart = $('a', undefined, fragment);
-						this._toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CLICK, handleClick));
-						return hintPart;
-					});
+					const { before, after } = this._createWrappedHintElements(actionPart, keybindingHintLabel, handleClick);
 
 					hintElement.appendChild(before);
 
@@ -299,6 +310,7 @@ class TerminalInitialHintWidget extends Disposable {
 					this._toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CLICK, handleClick));
 
 					hintElement.appendChild(after);
+					hintElement.appendChild($('span.terminal-initial-hint-separator'));
 
 					ariaLabelParts.push(actionPart);
 				}
@@ -327,11 +339,7 @@ class TerminalInitialHintWidget extends Disposable {
 				this._commandService.executeCommand(TerminalSuggestCommandId.TriggerSuggest);
 			};
 
-			const [suggestBefore, suggestAfter] = suggestActionPart.split(suggestKeybindingLabel).map((fragment) => {
-				const hintPart = $('a', undefined, fragment);
-				this._toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CLICK, handleSuggestClick));
-				return hintPart;
-			});
+			const { before: suggestBefore, after: suggestAfter } = this._createWrappedHintElements(suggestActionPart, suggestKeybindingLabel, handleSuggestClick);
 
 			hintElement.appendChild(suggestBefore);
 
@@ -343,6 +351,8 @@ class TerminalInitialHintWidget extends Disposable {
 			this._toDispose.add(dom.addDisposableListener(suggestLabel.element, dom.EventType.CLICK, handleSuggestClick));
 
 			hintElement.appendChild(suggestAfter);
+			// Layout-only separator; visibility and spacing are controlled via CSS (including responsive breakpoints).
+			hintElement.appendChild($('span.terminal-initial-hint-separator'));
 
 			ariaLabelParts.push(suggestActionPart);
 		}
@@ -352,15 +362,30 @@ class TerminalInitialHintWidget extends Disposable {
 			return undefined;
 		}
 
+		// Dismiss hint - normal mode version
 		const typeToDismiss = localize({
 			key: 'hintTextDismiss',
 			comment: [
 				'Preserve double-square brackets and their order',
 			]
-		}, ' Start typing to dismiss or [[don\'t show]] this again.');
+		}, '[[don\'t show]] this again.');
 		const typeToDismissRendered = renderFormattedText(typeToDismiss, { actionHandler: dontShowHintHandler });
-		typeToDismissRendered.classList.add('detail');
+		typeToDismissRendered.classList.add('detail', 'terminal-initial-hint-prose');
+
+		const proseBefore = $('span.terminal-initial-hint-prose', undefined, localize('hintTextDismissProse', " Start typing to dismiss or "));
+		hintElement.appendChild(proseBefore);
 		hintElement.appendChild(typeToDismissRendered);
+
+		// Dismiss hint - compact mode version
+		const typeToDismissCompact = localize({
+			key: 'hintTextDismissCompact',
+			comment: [
+				'Preserve double-square brackets and their order',
+			]
+		}, '[[Don\'t show this again]]');
+		const typeToDismissCompactRendered = renderFormattedText(typeToDismissCompact, { actionHandler: dontShowHintHandler });
+		typeToDismissCompactRendered.classList.add('detail', 'terminal-initial-hint-compact');
+		hintElement.appendChild(typeToDismissCompactRendered);
 		ariaLabelParts.push(localize('hintTextDismissAriaLabel', 'Start typing to dismiss or don\'t show this again.'));
 
 		return { ariaLabel: ariaLabelParts.join(' '), hintHandler, hintElement };