Improve prompt detection heuristics and add comprehensive tests

Co-authored-by: Tyriar <[email protected]>

Author: Copilot

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

@@ -39,6 +39,10 @@ export async function waitForIdle(onData: Event<unknown>, idleDurationMs: number
 /**
  * Detects if the given text content appears to end with a common prompt pattern.
  * This is used as a heuristic to determine if a command has finished executing.
+ * 
+ * The idea is to do basic regex checks after the initial timeout to extend the
+ * timeout if it doesn't look like a common prompt format, giving commands more
+ * time to complete before assuming they're done.
  */
 export function detectsCommonPromptPattern(content: string): boolean {
 	if (!content || content.trim().length === 0) {
@@ -102,6 +106,9 @@ export function detectsCommonPromptPattern(content: string): boolean {
  * Enhanced version of waitForIdle that uses prompt detection heuristics.
  * After the initial timeout, checks if the terminal content looks like a common prompt.
  * If not, extends the timeout to give the command more time to complete.
+ * 
+ * This addresses the need for better heuristics around prompt characters for evaluating
+ * no shell integration command finished state, as requested in the issue.
  */
 export async function waitForIdleWithPromptHeuristics(
 	onData: Event<unknown>,
@@ -118,12 +125,13 @@ export async function waitForIdleWithPromptHeuristics(
 		if (xterm) {
 			// Get the current visible content from the terminal
 			const buffer = xterm.raw.buffer.active;
-			const viewportHeight = xterm.raw.rows;
 			let content = '';
 
-			// Read the last few lines of the terminal to detect prompt patterns
-			const startLine = Math.max(0, buffer.baseY + buffer.cursorY - viewportHeight + 1);
-			const endLine = buffer.baseY + buffer.cursorY + 1;
+			// Read the current line and a few lines above to detect prompt patterns
+			// Focus on the area around the cursor, which is most likely to contain the prompt
+			const currentLine = buffer.baseY + buffer.cursorY;
+			const startLine = Math.max(0, currentLine - 2); // Read up to 2 lines above
+			const endLine = Math.min(buffer.length, currentLine + 1); // Read current line
 
 			for (let i = startLine; i < endLine; i++) {
 				const line = buffer.getLine(i);

src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/executeStrategy.test.ts

@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual } from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { detectsCommonPromptPattern } from '../../browser/executeStrategy/executeStrategy.js';
+
+suite('Execute Strategy - Prompt Detection', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('detectsCommonPromptPattern should detect PowerShell prompts', () => {
+		strictEqual(detectsCommonPromptPattern('PS C:\\>'), true);
+		strictEqual(detectsCommonPromptPattern('PS C:\\Windows\\System32>'), true);
+		strictEqual(detectsCommonPromptPattern('PS C:\\Users\\test> '), true);
+	});
+
+	test('detectsCommonPromptPattern should detect Command Prompt', () => {
+		strictEqual(detectsCommonPromptPattern('C:\\>'), true);
+		strictEqual(detectsCommonPromptPattern('C:\\Windows\\System32>'), true);
+		strictEqual(detectsCommonPromptPattern('D:\\test> '), true);
+	});
+
+	test('detectsCommonPromptPattern should detect Bash prompts', () => {
+		strictEqual(detectsCommonPromptPattern('user@host:~$ '), true);
+		strictEqual(detectsCommonPromptPattern('$ '), true);
+		strictEqual(detectsCommonPromptPattern('[user@host ~]$ '), true);
+	});
+
+	test('detectsCommonPromptPattern should detect root prompts', () => {
+		strictEqual(detectsCommonPromptPattern('root@host:~# '), true);
+		strictEqual(detectsCommonPromptPattern('# '), true);
+		strictEqual(detectsCommonPromptPattern('[root@host ~]# '), true);
+	});
+
+	test('detectsCommonPromptPattern should detect Python REPL', () => {
+		strictEqual(detectsCommonPromptPattern('>>> '), true);
+		strictEqual(detectsCommonPromptPattern('>>>'), true);
+	});
+
+	test('detectsCommonPromptPattern should detect starship prompts', () => {
+		strictEqual(detectsCommonPromptPattern('~ ❯ '), true);
+		strictEqual(detectsCommonPromptPattern('/path/to/project ❯'), true);
+	});
+
+	test('detectsCommonPromptPattern should detect generic prompts', () => {
+		strictEqual(detectsCommonPromptPattern('test> '), true);
+		strictEqual(detectsCommonPromptPattern('someprompt% '), true);
+	});
+
+	test('detectsCommonPromptPattern should handle multiline content', () => {
+		const multilineContent = `command output line 1
+command output line 2
+user@host:~$ `;
+		strictEqual(detectsCommonPromptPattern(multilineContent), true);
+	});
+
+	test('detectsCommonPromptPattern should reject non-prompt content', () => {
+		strictEqual(detectsCommonPromptPattern('just some output'), false);
+		strictEqual(detectsCommonPromptPattern('error: command not found'), false);
+		strictEqual(detectsCommonPromptPattern(''), false);
+		strictEqual(detectsCommonPromptPattern('   '), false);
+	});
+
+	test('detectsCommonPromptPattern should handle edge cases', () => {
+		strictEqual(detectsCommonPromptPattern('output\n\n\n'), false);
+		strictEqual(detectsCommonPromptPattern('\n\n$ \n\n'), true); // prompt with surrounding whitespace
+		strictEqual(detectsCommonPromptPattern('output\nPS C:\\> '), true); // prompt at end after output
+	});
+});