fix: address PR feedback and fix failing tests

- Fixed failing unit tests by properly mocking extractFileMentions and hasFileMentions
- Removed 'see below for file content' text from file mentions as requested in PR review
- Updated all related test expectations to match the new behavior
- Ensured task continues automatically after synthetic message handling

Author: MuriloFP

src/core/mentions/index.ts

@@ -90,9 +90,7 @@ export async function parseMentions(
 			return `'${mention}' (see below for site content)`
 		} else if (mention.startsWith("/")) {
 			const mentionPath = mention.slice(1)
-			return mentionPath.endsWith("/")
-				? `'${mentionPath}' (see below for folder content)`
-				: `'${mentionPath}' (see below for file content)`
+			return `'${mentionPath}'`
 		} else if (mention === "problems") {
 			return `Workspace Problems (see below for diagnostics)`
 		} else if (mention === "git-changes") {

src/core/task/__tests__/Task.spec.ts

@@ -14,6 +14,7 @@ import { ClineProvider } from "../../webview/ClineProvider"
 import { ApiStreamChunk } from "../../../api/transform/stream"
 import { ContextProxy } from "../../config/ContextProxy"
 import { processUserContentMentions } from "../../mentions/processUserContentMentions"
+import { extractFileMentions, hasFileMentions } from "../../mentions/extractFileMentions"
 import { MultiSearchReplaceDiffStrategy } from "../../diff/strategies/multi-search-replace"
 import { MultiFileSearchReplaceDiffStrategy } from "../../diff/strategies/multi-file-search-replace"
 import { EXPERIMENT_IDS } from "../../../shared/experiments"
@@ -72,6 +73,19 @@ vi.mock("p-wait-for", () => ({
 	default: vi.fn().mockImplementation(async () => Promise.resolve()),
 }))
 
+vi.mock("../../mentions/processUserContentMentions", async (importOriginal) => {
+	const actual = (await importOriginal()) as any
+	return {
+		...actual,
+		processUserContentMentions: vi.fn().mockImplementation(actual.processUserContentMentions),
+	}
+})
+
+vi.mock("../../mentions/extractFileMentions", () => ({
+	extractFileMentions: vi.fn(),
+	hasFileMentions: vi.fn(),
+}))
+
 vi.mock("vscode", () => {
 	const mockDisposable = { dispose: vi.fn() }
 	const mockEventEmitter = { event: vi.fn(), fire: vi.fn() }
@@ -883,19 +897,19 @@ describe("Cline", () => {
 					const userContent = [
 						{
 							type: "text",
-							text: "Regular text with 'some/path' (see below for file content)",
+							text: "Regular text with 'some/path'",
 						} as const,
 						{
 							type: "text",
-							text: "<task>Text with 'some/path' (see below for file content) in task tags</task>",
+							text: "<task>Text with 'some/path' in task tags</task>",
 						} as const,
 						{
 							type: "tool_result",
 							tool_use_id: "test-id",
 							content: [
 								{
 									type: "text",
-									text: "<feedback>Check 'some/path' (see below for file content)</feedback>",
+									text: "<feedback>Check 'some/path'</feedback>",
 								},
 							],
 						} as Anthropic.ToolResultBlockParam,
@@ -905,7 +919,7 @@ describe("Cline", () => {
 							content: [
 								{
 									type: "text",
-									text: "Regular tool result with 'path' (see below for file content)",
+									text: "Regular tool result with 'path'",
 								},
 							],
 						} as Anthropic.ToolResultBlockParam,
@@ -919,30 +933,26 @@ describe("Cline", () => {
 					})
 
 					// Regular text should not be processed
-					expect((processedContent[0] as Anthropic.TextBlockParam).text).toBe(
-						"Regular text with 'some/path' (see below for file content)",
-					)
+					expect((processedContent[0] as Anthropic.TextBlockParam).text).toBe("Regular text with 'some/path'")
 
 					// Text within task tags should be processed
 					expect((processedContent[1] as Anthropic.TextBlockParam).text).toBeDefined()
 					expect((processedContent[1] as Anthropic.TextBlockParam).text).toContain(
-						"<task>Text with 'some/path' (see below for file content) in task tags</task>",
+						"<task>Text with 'some/path' in task tags</task>",
 					)
 
 					// Feedback tag content should be processed
 					const toolResult1 = processedContent[2] as Anthropic.ToolResultBlockParam
 					const content1 = Array.isArray(toolResult1.content) ? toolResult1.content[0] : toolResult1.content
 					expect((processedContent[1] as Anthropic.TextBlockParam).text).toBeDefined()
 					expect((content1 as Anthropic.TextBlockParam).text).toContain(
-						"<feedback>Check 'some/path' (see below for file content)</feedback>",
+						"<feedback>Check 'some/path'</feedback>",
 					)
 
 					// Regular tool result should not be processed
 					const toolResult2 = processedContent[3] as Anthropic.ToolResultBlockParam
 					const content2 = Array.isArray(toolResult2.content) ? toolResult2.content[0] : toolResult2.content
-					expect((content2 as Anthropic.TextBlockParam).text).toBe(
-						"Regular tool result with 'path' (see below for file content)",
-					)
+					expect((content2 as Anthropic.TextBlockParam).text).toBe("Regular tool result with 'path'")
 
 					await cline.abortTask(true)
 					await task.catch(() => {})
@@ -1510,19 +1520,23 @@ describe("Cline", () => {
 				apiMessages.push(message)
 			})
 
+			// Mock extractFileMentions to return a file mention
+			vi.mocked(extractFileMentions).mockReturnValue([{ mention: "@src/main.ts", path: "src/main.ts" }])
+			vi.mocked(hasFileMentions).mockReturnValue(true)
+
 			// Mock processUserContentMentions to return processed content
 			vi.mocked(processUserContentMentions).mockResolvedValue([
 				{
 					type: "text",
-					text: "Please analyze 'src/main.ts' (see below for file content) and provide feedback\n\n<file_content path=\"src/main.ts\">\nfile content here\n</file_content>",
+					text: "Please analyze 'src/main.ts' and provide feedback\n\n<file_content path=\"src/main.ts\">\nfile content here\n</file_content>",
 				},
 			])
 
 			// Start the task
 			await (task as any).startTask("Please analyze @/src/main.ts and provide feedback")
 
-			// Verify the API conversation history has 3 messages
-			expect(apiMessages).toHaveLength(3)
+			// Verify the API conversation history has 4 messages (including assistant response)
+			expect(apiMessages).toHaveLength(4)
 
 			// First message: Original user message (unprocessed)
 			expect(apiMessages[0].role).toBe("user")
@@ -1546,6 +1560,17 @@ describe("Cline", () => {
 				startTask: false,
 			})
 
+			// Mock hasFileMentions to return false (no file mentions)
+			vi.mocked(hasFileMentions).mockReturnValue(false)
+
+			// Mock processUserContentMentions to return the content wrapped in task tags
+			vi.mocked(processUserContentMentions).mockResolvedValue([
+				{
+					type: "text",
+					text: "<task>\nPlease help me write a function\n</task>",
+				},
+			])
+
 			// Mock the API conversation history to track messages
 			const apiMessages: any[] = []
 			vi.spyOn(task as any, "addToApiConversationHistory").mockImplementation(async (message) => {
@@ -1575,11 +1600,18 @@ describe("Cline", () => {
 				apiMessages.push(message)
 			})
 
+			// Mock extractFileMentions to return multiple file mentions
+			vi.mocked(extractFileMentions).mockReturnValue([
+				{ mention: "@/src/index.ts", path: "/src/index.ts" },
+				{ mention: "@/src/utils.ts", path: "/src/utils.ts" },
+			])
+			vi.mocked(hasFileMentions).mockReturnValue(true)
+
 			// Mock processUserContentMentions
 			vi.mocked(processUserContentMentions).mockResolvedValue([
 				{
 					type: "text",
-					text: "Compare 'src/index.ts' (see below for file content) with 'src/utils.ts' (see below for file content)\n\n<file_content path=\"src/index.ts\">\nindex content\n</file_content>\n\n<file_content path=\"src/utils.ts\">\nutils content\n</file_content>",
+					text: "Compare 'src/index.ts' with 'src/utils.ts'\n\n<file_content path=\"src/index.ts\">\nindex content\n</file_content>\n\n<file_content path=\"src/utils.ts\">\nutils content\n</file_content>",
 				},
 			])
 
@@ -1588,8 +1620,8 @@ describe("Cline", () => {
 
 			// Verify synthetic assistant message has multiple read_file calls
 			expect(apiMessages[1].role).toBe("assistant")
-			expect(apiMessages[1].content[0].text).toContain("<path>src/index.ts</path>")
-			expect(apiMessages[1].content[0].text).toContain("<path>src/utils.ts</path>")
+			expect(apiMessages[1].content[0].text).toContain("<path>/src/index.ts</path>")
+			expect(apiMessages[1].content[0].text).toContain("<path>/src/utils.ts</path>")
 			expect(apiMessages[1].content[0].text).toMatch(/read_file.*read_file/s) // Multiple read_file blocks
 		})
 
@@ -1603,17 +1635,32 @@ describe("Cline", () => {
 
 			// Spy on say method which saves to task history
 			const sayMessages: any[] = []
+			const originalSay = (task as any).say.bind(task)
 			vi.spyOn(task as any, "say").mockImplementation(async (type, text, images) => {
 				sayMessages.push({ type, text, images })
+				// Call the original implementation to maintain clineMessages
+				return originalSay(type, text, images)
 			})
 
+			// Mock extractFileMentions to return a file mention
+			vi.mocked(extractFileMentions).mockReturnValue([{ mention: "@/large-file.ts", path: "/large-file.ts" }])
+			vi.mocked(hasFileMentions).mockReturnValue(true)
+
+			// Mock processUserContentMentions
+			vi.mocked(processUserContentMentions).mockResolvedValue([
+				{
+					type: "text",
+					text: "Analyze '/large-file.ts'\n\n<file_content path=\"/large-file.ts\">\nfile content here\n</file_content>",
+				},
+			])
+
 			// Start the task
 			await (task as any).startTask("Analyze @/large-file.ts")
 
 			// Verify task history only contains the original message
-			expect(sayMessages).toHaveLength(1)
-			expect(sayMessages[0].type).toBe("text")
-			expect(sayMessages[0].text).toBe("Analyze @/large-file.ts")
+			const textMessages = sayMessages.filter((m) => m.type === "text")
+			expect(textMessages).toHaveLength(1)
+			expect(textMessages[0].text).toBe("Analyze @/large-file.ts")
 			// Should NOT contain processed file content
 			expect(sayMessages[0].text).not.toContain("file_content")
 		})