Merge branch 'main' into eli/prompt-tile-style-clean

Author: eli-w-king

src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts

@@ -227,8 +227,8 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		// scroll.
 		this._currentStickyCommand = undefined;
 
-		// No command
-		if (!command) {
+		// No command or clear command
+		if (!command || this._isClearCommand(command)) {
 			this._setVisible(false);
 			return;
 		}
@@ -521,6 +521,20 @@ export class TerminalStickyScrollOverlay extends Disposable {
 			selectionInactiveBackground: undefined
 		};
 	}
+
+	private _isClearCommand(command: ITerminalCommand | ICurrentPartialCommand): boolean {
+		if (!command.command) {
+			return false;
+		}
+		const trimmedCommand = command.command.trim().toLowerCase();
+		const clearCommands = [
+			'clear',
+			'cls',
+			'clear-host',
+		];
+
+		return clearCommands.includes(trimmedCommand);
+	}
 }
 
 function lineStartsWith(line: IBufferLine | undefined, text: string): boolean {