release: fix non-edit codeblocks in thinking (#298521)

fix non-edit codeblocks in thinking

Author: justschen

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

@@ -50,7 +50,7 @@ import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../..
 import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
 import { IWorkbenchIssueService } from '../../../issue/common/issue.js';
 import { CodiconActionViewItem } from '../../../notebook/browser/view/cellParts/cellActionView.js';
-import { annotateSpecialMarkdownContent, extractSubAgentInvocationIdFromText, hasCodeblockUriTag } from '../../common/widget/annotations.js';
+import { annotateSpecialMarkdownContent, extractSubAgentInvocationIdFromText, hasEditCodeblockUriTag } from '../../common/widget/annotations.js';
 import { checkModeOption } from '../../common/chat.js';
 import { IChatAgentMetadata } from '../../common/participants/chatAgents.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
@@ -1484,7 +1484,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		if (part.kind !== 'markdownContent') {
 			return false;
 		}
-		return hasCodeblockUriTag(part.content.value);
+		return hasEditCodeblockUriTag(part.content.value);
 	}
 
 	private isCodeblockComplete(part: IChatRendererContent, element: ChatTreeItem): boolean {

src/vs/workbench/contrib/chat/common/widget/annotations.ts

@@ -222,6 +222,10 @@ export function hasCodeblockUriTag(text: string): boolean {
 	return text.includes('<vscode_codeblock_uri');
 }
 
+export function hasEditCodeblockUriTag(text: string): boolean {
+	return text.includes('<vscode_codeblock_uri isEdit');
+}
+
 export function extractVulnerabilitiesFromText(text: string): { newText: string; vulnerabilities: IMarkdownVulnerability[] } {
 	const vulnerabilities: IMarkdownVulnerability[] = [];
 	let newText = text;

src/vs/workbench/contrib/chat/test/common/widget/annotations.test.ts

@@ -9,7 +9,7 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { assertSnapshot } from '../../../../../../base/test/common/snapshot.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { IChatMarkdownContent, IChatResponseCodeblockUriPart } from '../../../common/chatService/chatService.js';
-import { annotateSpecialMarkdownContent, extractCodeblockUrisFromText, extractSubAgentInvocationIdFromText, extractVulnerabilitiesFromText, isInsideCodeContext } from '../../../common/widget/annotations.js';
+import { annotateSpecialMarkdownContent, extractCodeblockUrisFromText, extractSubAgentInvocationIdFromText, extractVulnerabilitiesFromText, hasEditCodeblockUriTag, hasCodeblockUriTag, isInsideCodeContext } from '../../../common/widget/annotations.js';
 
 function content(str: string): IChatMarkdownContent {
 	return { kind: 'markdownContent', content: new MarkdownString(str) };
@@ -240,4 +240,54 @@ suite('Annotations', function () {
 			assert.ok(md.content.value.endsWith('index.ts'));
 		});
 	});
+
+	suite('hasEditCodeblockUriTag', () => {
+		test('returns true for edit codeblock URI tags', () => {
+			const editTag = '<vscode_codeblock_uri isEdit>file:///test.ts</vscode_codeblock_uri>';
+			assert.strictEqual(hasEditCodeblockUriTag(editTag), true);
+		});
+
+		test('returns false for non-edit codeblock URI tags', () => {
+			const nonEditTag = '<vscode_codeblock_uri>file:///test.ts</vscode_codeblock_uri>';
+			assert.strictEqual(hasEditCodeblockUriTag(nonEditTag), false);
+		});
+
+		test('returns true for edit codeblock URI tags with subAgentInvocationId', () => {
+			const editTagWithSubAgent = '<vscode_codeblock_uri isEdit subAgentInvocationId="agent-123">file:///test.ts</vscode_codeblock_uri>';
+			assert.strictEqual(hasEditCodeblockUriTag(editTagWithSubAgent), true);
+		});
+
+		test('returns false for non-edit codeblock URI tags with subAgentInvocationId', () => {
+			const nonEditTagWithSubAgent = '<vscode_codeblock_uri subAgentInvocationId="agent-123">file:///test.ts</vscode_codeblock_uri>';
+			assert.strictEqual(hasEditCodeblockUriTag(nonEditTagWithSubAgent), false);
+		});
+
+		test('returns false for text without codeblock URI tags', () => {
+			assert.strictEqual(hasEditCodeblockUriTag('some plain text'), false);
+		});
+
+		test('returns false for text with only partial tag prefix', () => {
+			assert.strictEqual(hasEditCodeblockUriTag('<vscode_codebloc'), false);
+		});
+
+		test('returns true for text containing multiple edit codeblock URI tags', () => {
+			const multipleEditTags = 'some text <vscode_codeblock_uri isEdit>file:///test.ts</vscode_codeblock_uri> more <vscode_codeblock_uri isEdit>file:///other.ts</vscode_codeblock_uri>';
+			assert.strictEqual(hasEditCodeblockUriTag(multipleEditTags), true);
+		});
+
+		test('returns false for text containing only non-edit codeblock URI tags', () => {
+			const multipleNonEditTags = 'some text <vscode_codeblock_uri>file:///test.ts</vscode_codeblock_uri> more <vscode_codeblock_uri>file:///other.ts</vscode_codeblock_uri>';
+			assert.strictEqual(hasEditCodeblockUriTag(multipleNonEditTags), false);
+		});
+
+		test('matches hasCodeblockUriTag for edit tags', () => {
+			const editTag = '<vscode_codeblock_uri isEdit>file:///test.ts</vscode_codeblock_uri>';
+			assert.strictEqual(hasEditCodeblockUriTag(editTag), hasCodeblockUriTag(editTag));
+		});
+
+		test('differs from hasCodeblockUriTag for non-edit tags', () => {
+			const nonEditTag = '<vscode_codeblock_uri>file:///test.ts</vscode_codeblock_uri>';
+			assert.notStrictEqual(hasEditCodeblockUriTag(nonEditTag), hasCodeblockUriTag(nonEditTag));
+		});
+	});
 });