Merge remote-tracking branch 'origin/main' into roblou/chat-agent-hover

Author: roblourens

src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts

@@ -153,7 +153,13 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		}
 
 		this._cursorIndex = -1;
-		this._ghostTextIndex = -1;
+
+		// Remove any ghost text from the input if it exists on execute
+		if (this._ghostTextIndex !== -1) {
+			this._value = this._value.substring(0, this._ghostTextIndex);
+			this._ghostTextIndex = -1;
+		}
+
 		const event = this._createStateObject();
 		if (this._lastUserInput === '\u0003') {
 			this._onDidInterrupt.fire(event);

src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts

@@ -950,7 +950,7 @@ class WindowsPtyHeuristics extends Disposable {
 		}
 
 		// Bash Prompt
-		const bashPrompt = lineText.match(/^(?<prompt>.*\$)/)?.groups?.prompt;
+		const bashPrompt = lineText.match(/^(?<prompt>\$)/)?.groups?.prompt;
 		if (bashPrompt) {
 			const adjustedPrompt = this._adjustPrompt(bashPrompt, lineText, '$');
 			if (adjustedPrompt) {

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

@@ -54,7 +54,7 @@ import { ChatFollowups } from 'vs/workbench/contrib/chat/browser/chatFollowups';
 import { ChatMarkdownDecorationsRenderer } from 'vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
 import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions';
 import { ChatCodeBlockContentProvider, CodeBlockPart, CodeCompareBlockPart, ICodeBlockData, localFileLanguageId, parseLocalFileData } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
-import { ChatAgentLocation, IChatAgentMetadata, IChatAgentNameService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ChatAgentLocation, IChatAgentMetadata, IChatAgentNameService, IChatAgentNameService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatProgressRenderableResponseContent } from 'vs/workbench/contrib/chat/common/chatModel';
 import { chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
@@ -76,6 +76,8 @@ import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateF
 import { ChatAgentHover } from 'vs/workbench/contrib/chat/browser/chatAgentHover';
 import { autorun, constObservable, IObservable } from 'vs/base/common/observable';
 import { isUndefined } from 'vs/base/common/types';
+import { autorun, constObservable, IObservable } from 'vs/base/common/observable';
+import { isUndefined } from 'vs/base/common/types';
 
 const $ = dom.$;