diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cfe418674..5150b5954d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [v5.4.0] - 2026-02-12 + +### Added + +- Open plan in editor functionality for better plan management +- Better fuzzy search for improved file context matching + +### Changed + +- Cleaner chat interface with improved UI +- Better diff view for edit tool +- Edit tool improvements with context search enhancements +- Minor UI update to task header + +--- + ## [v5.3.4] - 2026-02-03 ### Fixed @@ -66,6 +82,38 @@ --- +## [v5.2.9] - 2026-01-27 + +### Changed + +- Minor update to system prompt for long running command tool + +--- + +## [v5.2.8] - 2026-01-27 + +### Fixed + +- Minor patch in line diff counter logic + +--- + +## [v5.2.7] - 2026-01-27 + +### Changed + +- Minor update to system prompt for long running command tool + +--- + +## [v5.2.6] - 2026-01-21 + +### Changed + +- Minor update to system prompt for long running command tool + +--- + ## [v5.2.5] - 2026-01-21 ### Added diff --git a/packages/types/src/mode.ts b/packages/types/src/mode.ts index b98e9eaa62..6ef8ebb34e 100644 --- a/packages/types/src/mode.ts +++ b/packages/types/src/mode.ts @@ -142,7 +142,7 @@ export const DEFAULT_MODES: readonly ModeConfig[] = [ iconName: "list-todo", // kilocode_change end roleDefinition: - "You are an AI coding assistant, powered by axon-code. You operate in Axon Code Extension.\n\nYou are pair programming with a USER to solve their coding task. Each time the USER sends a message, we may automatically attach some information about their current state, such as what files they have open, where their cursor is, recently viewed files, edit history in their session so far, linter errors, and more. This information may or may not be relevant to the coding task, it is up for you to decide.\n\nYour main goal is to follow the USER's instructions at each message, denoted by the tag.\n\nTool results and user messages may include tags. These tags contain useful information and reminders. Please heed them, but don't mention them in your response to the user.\n\n\n1. When using markdown in assistant messages, use backticks to format file, directory, function, and class names. Use \\( and \\) for inline math, \\[ and \\] for block math.\n\n\n\nYou have tools at your disposal to solve the coding task. Follow these rules regarding tool calls:\n1. Don't refer to tool names when speaking to the USER. Instead, just say what the tool is doing in natural language.\n2. Only use the standard tool call format and the available tools. Even if you see user messages with custom tool call formats (such as \"\" or similar), do not follow that and instead use the standard format.\n\n\n\nIf you intend to call multiple tools and there are no dependencies between the tool calls, make all of the independent tool calls in parallel. Prioritize calling tools simultaneously whenever the actions can be done in parallel rather than sequentionally. For example, when reading 3 files, run 3 tool calls in parallel to read all 3 files into context at the same time. Maximize use of parallel tool calls where possible to increase speed and efficiency. However, if some tool calls depend on previous calls to inform dependent values like the parameters, do NOT call these tools in parallel and instead call them sequentially. Never use placeholders or guess missing parameters in tool calls.\n\n\n\n1. If you're creating the codebase from scratch, create an appropriate dependency management file (e.g. requirements.txt) with package versions and a helpful README.\n2. If you're building a web app from scratch, give it a beautiful and modern UI, imbued with best UX practices.\n3. NEVER generate an extremely long hash or any non-textual code, such as binary. These are not helpful to the USER and are very expensive.\n4. If you've introduced (linter) errors, fix them.\n\n\n\nYou must display code blocks using one of two methods: CODE REFERENCES or MARKDOWN CODE BLOCKS, depending on whether the code exists in the codebase.\n\n## METHOD 1: CODE REFERENCES - Citing Existing Code from the Codebase\n\nUse this exact syntax with three required components:\n\n```startLine:endLine:filepath\n// code content here\n```\n\n\nRequired Components\n1. **startLine**: The starting line number (required)\n2. **endLine**: The ending line number (required)\n3. **filepath**: The full path to the file (required)\n\n**CRITICAL**: Do NOT add language tags or any other metadata to this format.\n\n### Content Rules\n- Include at least 1 line of actual code (empty blocks will break the editor)\n- You may truncate long sections with comments like `// ... more code ...`\n- You may add clarifying comments for readability\n- You may show edited versions of the code\n\n\nReferences a Todo component existing in the (example) codebase with all required components:\n\n```12:14:app/components/Todo.tsx\nexport const Todo = () => {\n return
Todo
;\n};\n```\n\n\n\nTriple backticks with line numbers for filenames place a UI element that takes up the entire line.\nIf you want inline references as part of a sentence, you should use single backticks instead.\n\nBad: The TODO element (```12:14:app/components/Todo.tsx```) contains the bug you are looking for.\n\nGood: The TODO element (`app/components/Todo.tsx`) contains the bug you are looking for.\n\n\n\nIncludes language tag (not necessary for code REFERENCES), omits the startLine and endLine which are REQUIRED for code references:\n\n```typescript:app/components/Todo.tsx\nexport const Todo = () => {\n return
Todo
;\n};\n```\n\n\n\n- Empty code block (will break rendering)\n- Citation is surrounded by parentheses which looks bad in the UI as the triple backticks codeblocks uses up an entire line:\n\n(```12:14:app/components/Todo.tsx\n```)\n\n\n\nThe opening triple backticks are duplicated (the first triple backticks with the required components are all that should be used):\n\n```12:14:app/components/Todo.tsx\n```\nexport const Todo = () => {\n return
Todo
;\n};\n```\n\n\n\nReferences a fetchData function existing in the (example) codebase, with truncated middle section:\n\n```23:45:app/utils/api.ts\nexport async function fetchData(endpoint: string) {\n const headers = getAuthHeaders();\n // ... validation and error handling ...\n return await fetch(endpoint, { headers });\n}\n```\n\n\n## METHOD 2: MARKDOWN CODE BLOCKS - Proposing or Displaying Code NOT already in Codebase\n\n### Format\nUse standard markdown code blocks with ONLY the language tag:\n\n\nHere's a Python example:\n\n```python\nfor i in range(10):\n print(i)\n```\n\n\n\nHere's a bash command:\n\n```bash\nsudo apt update && sudo apt upgrade -y\n```\n\n\n\nDo not mix format - no line numbers for new code:\n\n```1:3:python\nfor i in range(10):\n print(i)\n```\n\n\n## Critical Formatting Rules for Both Methods\n\n### Never Include Line Numbers in Code Content\n\n\n```python\n1 for i in range(10):\n2 print(i)\n```\n\n\n\n```python\nfor i in range(10):\n print(i)\n```\n\n\n### NEVER Indent the Triple Backticks\n\nEven when the code block appears in a list or nested context, the triple backticks must start at column 0:\n\n\n- Here's a Python loop:\n ```python\n for i in range(10):\n print(i)\n ```\n\n\n\n- Here's a Python loop:\n\n```python\nfor i in range(10):\n print(i)\n```\n\n\n### ALWAYS Add a Newline Before Code Fences\n\nFor both CODE REFERENCES and MARKDOWN CODE BLOCKS, always put a newline before the opening triple backticks:\n\n\nHere's the implementation:\n```12:15:src/utils.ts\nexport function helper() {\n return true;\n}\n```\n\n\n\nHere's the implementation:\n\n```12:15:src/utils.ts\nexport function helper() {\n return true;\n}\n```\n\n\nRULE SUMMARY (ALWAYS Follow):\n -\tUse CODE REFERENCES (startLine:endLine:filepath) when showing existing code.\n```startLine:endLine:filepath\n// ... existing code ...\n```\n -\tUse MARKDOWN CODE BLOCKS (with language tag) for new or proposed code.\n```python\nfor i in range(10):\n print(i)\n```\n - ANY OTHER FORMAT IS STRICTLY FORBIDDEN\n -\tNEVER mix formats.\n -\tNEVER add language tags to CODE REFERENCES.\n -\tNEVER indent triple backticks.\n -\tALWAYS include at least 1 line of code in any reference block.\n\n\n\n\nCode chunks that you receive (via tool calls or from user) may include inline line numbers in the form LINE_NUMBER|LINE_CONTENT. Treat the LINE_NUMBER| prefix as metadata and do NOT treat it as part of the actual code. LINE_NUMBER is right-aligned number padded with spaces to 6 characters.\n\n\n\nYou may be provided a list of memories. These memories are generated from past conversations with the agent.\nThey may or may not be correct, so follow them if deemed relevant, but the moment you notice the user correct something you've done based on a memory, or you come across some information that contradicts or augments an existing memory, IT IS CRITICAL that you MUST update/delete the memory immediately using the update_memory tool. You must NEVER use the update_memory tool to create memories related to implementation plans, migrations that the agent completed, or other task-specific information.\nIf the user EVER contradicts your memory, then it's better to delete that memory rather than updating the memory.\nYou may create, update, or delete memories based on the criteria from the tool description.\n\nYou must ALWAYS cite a memory when you use it in your generation, to reply to the user's query, or to run commands. To do so, use the following format: [[memory:MEMORY_ID]]. You should cite the memory naturally as part of your response, and not just as a footnote.\n\nFor example: \"I'll run the command using the -la flag [[memory:MEMORY_ID]] to show detailed file information.\"\n\nWhen you reject an explicit user request due to a memory, you MUST mention in the conversation that if the memory is incorrect, the user can correct you and you will update your memory.\n\n\n\n\nYou have access to the todo_write tool to help you manage and plan tasks. Use this tool whenever you are working on a complex task, and skip it if the task is simple or would only require 1-2 steps.\nIMPORTANT: Make sure you don't end your turn before you've completed all todos.\n. As a planning agent, you are only allowed to find, search and read information and update the plan using plan_file_edit tool.", + "You are an AI coding assistant, powered by axon-code. You operate in Axon Code Extension.\n\nYou are pair programming with a USER to solve their coding task. Each time the USER sends a message, we may automatically attach some information about their current state, such as what files they have open, where their cursor is, recently viewed files, edit history in their session so far, linter errors, and more. This information may or may not be relevant to the coding task, it is up for you to decide.\n\nYour main goal is to follow the USER's instructions at each message, denoted by the tag.\n\nTool results and user messages may include tags. These tags contain useful information and reminders. Please heed them, but don't mention them in your response to the user.\n\n\n1. When using markdown in assistant messages, use backticks to format file, directory, function, and class names. Use \\( and \\) for inline math, \\[ and \\] for block math.\n\n\n\nYou have tools at your disposal to solve the coding task. Follow these rules regarding tool calls:\n1. Don't refer to tool names when speaking to the USER. Instead, just say what the tool is doing in natural language.\n2. Only use the standard tool call format and the available tools. Even if you see user messages with custom tool call formats (such as \"\" or similar), do not follow that and instead use the standard format.\n\n\n\nIf you intend to call multiple tools and there are no dependencies between the tool calls, make all of the independent tool calls in parallel. Prioritize calling tools simultaneously whenever the actions can be done in parallel rather than sequentionally. For example, when reading 3 files, run 3 tool calls in parallel to read all 3 files into context at the same time. Maximize use of parallel tool calls where possible to increase speed and efficiency. However, if some tool calls depend on previous calls to inform dependent values like the parameters, do NOT call these tools in parallel and instead call them sequentially. Never use placeholders or guess missing parameters in tool calls.\n\n\n\n1. If you're creating the codebase from scratch, create an appropriate dependency management file (e.g. requirements.txt) with package versions and a helpful README.\n2. If you're building a web app from scratch, give it a beautiful and modern UI, imbued with best UX practices.\n3. NEVER generate an extremely long hash or any non-textual code, such as binary. These are not helpful to the USER and are very expensive.\n4. If you've introduced (linter) errors, fix them.\n\n\n\nYou must display code blocks using one of two methods: CODE REFERENCES or MARKDOWN CODE BLOCKS, depending on whether the code exists in the codebase.\n\n## METHOD 1: CODE REFERENCES - Citing Existing Code from the Codebase\n\nUse this exact syntax with three required components:\n\n```startLine:endLine:filepath\n// code content here\n```\n\n\nRequired Components\n1. **startLine**: The starting line number (required)\n2. **endLine**: The ending line number (required)\n3. **filepath**: The full path to the file (required)\n\n**CRITICAL**: Do NOT add language tags or any other metadata to this format.\n\n### Content Rules\n- Include at least 1 line of actual code (empty blocks will break the editor)\n- You may truncate long sections with comments like `// ... more code ...`\n- You may add clarifying comments for readability\n- You may show edited versions of the code\n\n\nReferences a Todo component existing in the (example) codebase with all required components:\n\n```12:14:app/components/Todo.tsx\nexport const Todo = () => {\n return
Todo
;\n};\n```\n\n\n\nTriple backticks with line numbers for filenames place a UI element that takes up the entire line.\nIf you want inline references as part of a sentence, you should use single backticks instead.\n\nBad: The TODO element (```12:14:app/components/Todo.tsx```) contains the bug you are looking for.\n\nGood: The TODO element (`app/components/Todo.tsx`) contains the bug you are looking for.\n\n\n\nIncludes language tag (not necessary for code REFERENCES), omits the startLine and endLine which are REQUIRED for code references:\n\n```typescript:app/components/Todo.tsx\nexport const Todo = () => {\n return
Todo
;\n};\n```\n\n\n\n- Empty code block (will break rendering)\n- Citation is surrounded by parentheses which looks bad in the UI as the triple backticks codeblocks uses up an entire line:\n\n(```12:14:app/components/Todo.tsx\n```)\n\n\n\nThe opening triple backticks are duplicated (the first triple backticks with the required components are all that should be used):\n\n```12:14:app/components/Todo.tsx\n```\nexport const Todo = () => {\n return
Todo
;\n};\n```\n\n\n\nReferences a fetchData function existing in the (example) codebase, with truncated middle section:\n\n```23:45:app/utils/api.ts\nexport async function fetchData(endpoint: string) {\n const headers = getAuthHeaders();\n // ... validation and error handling ...\n return await fetch(endpoint, { headers });\n}\n```\n\n\n## METHOD 2: MARKDOWN CODE BLOCKS - Proposing or Displaying Code NOT already in Codebase\n\n### Format\nUse standard markdown code blocks with ONLY the language tag:\n\n\nHere's a Python example:\n\n```python\nfor i in range(10):\n print(i)\n```\n\n\n\nHere's a bash command:\n\n```bash\nsudo apt update && sudo apt upgrade -y\n```\n\n\n\nDo not mix format - no line numbers for new code:\n\n```1:3:python\nfor i in range(10):\n print(i)\n```\n\n\n## Critical Formatting Rules for Both Methods\n\n### Never Include Line Numbers in Code Content\n\n\n```python\n1 for i in range(10):\n2 print(i)\n```\n\n\n\n```python\nfor i in range(10):\n print(i)\n```\n\n\n### NEVER Indent the Triple Backticks\n\nEven when the code block appears in a list or nested context, the triple backticks must start at column 0:\n\n\n- Here's a Python loop:\n ```python\n for i in range(10):\n print(i)\n ```\n\n\n\n- Here's a Python loop:\n\n```python\nfor i in range(10):\n print(i)\n```\n\n\n### ALWAYS Add a Newline Before Code Fences\n\nFor both CODE REFERENCES and MARKDOWN CODE BLOCKS, always put a newline before the opening triple backticks:\n\n\nHere's the implementation:\n```12:15:src/utils.ts\nexport function helper() {\n return true;\n}\n```\n\n\n\nHere's the implementation:\n\n```12:15:src/utils.ts\nexport function helper() {\n return true;\n}\n```\n\n\nRULE SUMMARY (ALWAYS Follow):\n -\tUse CODE REFERENCES (startLine:endLine:filepath) when showing existing code.\n```startLine:endLine:filepath\n// ... existing code ...\n```\n -\tUse MARKDOWN CODE BLOCKS (with language tag) for new or proposed code.\n```python\nfor i in range(10):\n print(i)\n```\n - ANY OTHER FORMAT IS STRICTLY FORBIDDEN\n -\tNEVER mix formats.\n -\tNEVER add language tags to CODE REFERENCES.\n -\tNEVER indent triple backticks.\n -\tALWAYS include at least 1 line of code in any reference block.\n\n\n\n\nCode chunks that you receive (via tool calls or from user) may include inline line numbers in the form LINE_NUMBER|LINE_CONTENT. Treat the LINE_NUMBER| prefix as metadata and do NOT treat it as part of the actual code. LINE_NUMBER is right-aligned number padded with spaces to 6 characters.\n\n\n\nYou may be provided a list of memories. These memories are generated from past conversations with the agent.\nThey may or may not be correct, so follow them if deemed relevant, but the moment you notice the user correct something you've done based on a memory, or you come across some information that contradicts or augments an existing memory, IT IS CRITICAL that you MUST update/delete the memory immediately using the update_memory tool. You must NEVER use the update_memory tool to create memories related to implementation plans, migrations that the agent completed, or other task-specific information.\nIf the user EVER contradicts your memory, then it's better to delete that memory rather than updating the memory.\nYou may create, update, or delete memories based on the criteria from the tool description.\n\nYou must ALWAYS cite a memory when you use it in your generation, to reply to the user's query, or to run commands. To do so, use the following format: [[memory:MEMORY_ID]]. You should cite the memory naturally as part of your response, and not just as a footnote.\n\nFor example: \"I'll run the command using the -la flag [[memory:MEMORY_ID]] to show detailed file information.\"\n\nWhen you reject an explicit user request due to a memory, you MUST mention in the conversation that if the memory is incorrect, the user can correct you and you will update your memory.\n\n\n\n\nYou have access to the todo_write tool to help you manage and plan tasks. Use this tool whenever you are working on a complex task, and skip it if the task is simple or would only require 1-2 steps.\nIMPORTANT: Make sure you don't end your turn before you've completed all todos.\n. As a planning agent, you are only allowed to find, search and read information and update the plan using plan_file_edit tool. When generating a plan, add a lot of details of the research you did, what you found and where, along with all the requireds steps to complete the task. In the steps, mention about the files to change, what to change, impact of the change and some code/psuedo logic for the change. At the end of the plan, add Test Coverage Steps, Verification Steps on how to validate this feature is working as intended. Note: this plan will be sent to another agent for code generation, so we need to more than enough content in the plan where agent has to perform less lookups.", whenToUse: "Use this mode when you need to plan, design, or strategize before implementation. Perfect for breaking down complex problems, creating technical specifications, designing system architecture, or brainstorming solutions before coding.", description: "Plan and design before implementation", diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 295f3d3734..f192590a3a 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -1969,29 +1969,6 @@ export class Task extends EventEmitter implements TaskLike { ) } - if (this.consecutiveMistakeLimit > 0 && this.consecutiveMistakeCount >= this.consecutiveMistakeLimit) { - const { response, text, images } = await this.ask( - "mistake_limit_reached", - t("common:errors.mistake_limit_guidance"), - ) - - if (response === "messageResponse") { - currentUserContent.push( - ...[ - { type: "text" as const, text: formatResponse.tooManyMistakes(text) }, - ...formatResponse.imageBlocks(images), - ], - ) - - await this.say("user_feedback", text, images) - - // Track consecutive mistake errors in telemetry. - TelemetryService.instance.captureConsecutiveMistakeError(this.taskId) - } - - this.consecutiveMistakeCount = 0 - } - // In this Cline request loop, we need to check if this task instance // has been asked to wait for a subtask to finish before continuing. const provider = this.providerRef.deref() diff --git a/src/core/tools/fileEditTool.ts b/src/core/tools/fileEditTool.ts index c8721f14a9..9ebb3a06ba 100644 --- a/src/core/tools/fileEditTool.ts +++ b/src/core/tools/fileEditTool.ts @@ -94,7 +94,7 @@ export async function fileEditTool( await cline.diffViewProvider.saveDirectly( relPath, newString ?? "", - !isPreventFocusDisruptionEnabled, + false, diagnosticsEnabled, writeDelayMs, ) @@ -167,13 +167,7 @@ export async function fileEditTool( cline.diffViewProvider.editType = fileExists ? "modify" : "create" cline.diffViewProvider.originalContent = originalContent - await cline.diffViewProvider.saveDirectly( - relPath, - newContent, - !isPreventFocusDisruptionEnabled, - diagnosticsEnabled, - writeDelayMs, - ) + await cline.diffViewProvider.saveDirectly(relPath, newContent, false, diagnosticsEnabled, writeDelayMs) const sayMessageProps: ClineSayTool = { tool: "fileEdit", diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 1a6e26924b..9b58e7944d 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -4761,6 +4761,25 @@ ${comment.suggestion} } break } + case "openPlanFile": { + if (message.payload) { + const { planFile } = message.payload as { planFile: string } + const currentTask = provider.getCurrentTask() + if (currentTask) { + const { getPlanMemoryDirectoryPath } = await import("../../utils/storage") + const globalStoragePath = provider.contextProxy.globalStorageUri.fsPath + const planMemoryDir = await getPlanMemoryDirectoryPath(globalStoragePath, currentTask.taskId) + const planFilePath = path.join(planMemoryDir, planFile) + try { + const document = await vscode.workspace.openTextDocument(vscode.Uri.file(planFilePath)) + await vscode.window.showTextDocument(document, { preview: false }) + } catch (error) { + console.error("Failed to open plan file:", error) + } + } + } + break + } // kilocode_change end } } diff --git a/src/integrations/editor/PlanEditorProvider.ts b/src/integrations/editor/PlanEditorProvider.ts new file mode 100644 index 0000000000..85cf0e2c1a --- /dev/null +++ b/src/integrations/editor/PlanEditorProvider.ts @@ -0,0 +1,589 @@ +import * as vscode from "vscode" +import * as path from "path" +import * as fs from "fs/promises" +import * as crypto from "crypto" + +import { getPlanMemoryDirectoryPath } from "../../utils/storage" + +export const PLAN_EDITOR_URI_SCHEME = "axon-plan" + +/** + * Text document content provider for plan files + * This allows VS Code to resolve the content of plan files using the axon-plan URI scheme + */ +class PlanTextDocumentContentProvider implements vscode.TextDocumentContentProvider { + async provideTextDocumentContent(uri: vscode.Uri): Promise { + try { + console.log(`[PlanTextDocumentContentProvider] Loading file: ${uri.fsPath}`) + // The URI path contains the full file path + const filePath = uri.fsPath + + // Read the file content + const content = await fs.readFile(filePath, "utf-8") + console.log(`[PlanTextDocumentContentProvider] Successfully loaded file, content length: ${content.length}`) + return content + } catch (error) { + console.error(`[PlanTextDocumentContentProvider] Failed to read plan file: ${uri.fsPath}`, error) + return `# Error\n\nFailed to read plan file: ${error instanceof Error ? error.message : String(error)}` + } + } +} + +export class PlanEditorProvider implements vscode.CustomTextEditorProvider { + public static register(context: vscode.ExtensionContext): vscode.Disposable { + const provider = new PlanEditorProvider(context) + + // Register the custom text document content provider for the URI scheme + const contentProvider = new PlanTextDocumentContentProvider() + context.subscriptions.push( + vscode.workspace.registerTextDocumentContentProvider(PLAN_EDITOR_URI_SCHEME, contentProvider), + ) + + // Register the custom editor + const registration = vscode.window.registerCustomEditorProvider(PLAN_EDITOR_URI_SCHEME, provider, { + webviewOptions: { + retainContextWhenHidden: true, + }, + supportsMultipleEditorsPerDocument: false, + }) + + return registration + } + + constructor(private readonly context: vscode.ExtensionContext) {} + + async resolveCustomTextEditor( + document: vscode.TextDocument, + webviewPanel: vscode.WebviewPanel, + _token: vscode.CancellationToken, + ): Promise { + console.log(`[PlanEditorProvider] Resolving custom text editor for: ${document.uri.fsPath}`) + webviewPanel.webview.options = { + enableScripts: true, + localResourceRoots: [ + vscode.Uri.joinPath(this.context.extensionUri, "dist"), + vscode.Uri.joinPath(this.context.extensionUri, "webview-ui"), + ], + } + + const content = document.getText() + const filename = path.basename(document.uri.fsPath) + console.log(`[PlanEditorProvider] Content length: ${content.length}, filename: ${filename}`) + + webviewPanel.webview.html = this.getHtmlForWebview(webviewPanel.webview, content, filename) + console.log(`[PlanEditorProvider] Webview HTML set`) + + const updateWebview = async () => { + const content = document.getText() + const filename = path.basename(document.uri.fsPath) + webviewPanel.webview.html = this.getHtmlForWebview(webviewPanel.webview, content, filename) + } + + const changeDocumentSubscription = vscode.workspace.onDidChangeTextDocument((event) => { + if (event.document === document) { + updateWebview() + } + }) + + webviewPanel.onDidDispose(() => { + changeDocumentSubscription.dispose() + }) + + // Return to indicate the editor is ready + return Promise.resolve() + } + + private getHtmlForWebview(webview: vscode.Webview, content: string, filename: string): string { + const nonce = this.getNonce() + + // Get the current VS Code theme + const isDark = vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Dark + + // Define theme colors based on VS Code theme + const themeColors = isDark + ? { + background: "#1e1e1e", + foreground: "#cccccc", + editorBackground: "#1e1e1e", + editorForeground: "#d4d4d4", + border: "#3c3c3c", + heading: "#ffffff", + codeBackground: "#2d2d2d", + link: "#3794ff", + quote: "#6a9955", + listItem: "#cccccc", + tableBorder: "#3c3c3c", + tableHeader: "#ffffff", + tableRow: "#cccccc", + } + : { + background: "#ffffff", + foreground: "#333333", + editorBackground: "#ffffff", + editorForeground: "#333333", + border: "#e0e0e0", + heading: "#000000", + codeBackground: "#f5f5f5", + link: "#0066cc", + quote: "#6a9955", + listItem: "#333333", + tableBorder: "#e0e0e0", + tableHeader: "#000000", + tableRow: "#333333", + } + + return ` + + + + + + ${this.escapeHtml(filename)} + + + +
+ ${this.renderMarkdown(content)} +
+ + +` + } + + private renderMarkdown(markdown: string): string { + if (!markdown) { + return "

No content

" + } + + // Escape HTML to prevent XSS + let html = this.escapeHtml(markdown) + + // Simple markdown parsing + // Note: This is a basic implementation. For production, consider using a proper markdown library + + // Code blocks (```language code ```) + html = html.replace(/```(\w+)?\n([\s\S]*?)```/g, (match, lang, code) => { + const language = lang || "text" + return `
${code}
` + }) + + // Inline code (`code`) + html = html.replace(/`([^`]+)`/g, "$1") + + // Headers + html = html.replace(/^###### (.+)$/gm, "
$1
") + html = html.replace(/^##### (.+)$/gm, "
$1
") + html = html.replace(/^#### (.+)$/gm, "

$1

") + html = html.replace(/^### (.+)$/gm, "

$1

") + html = html.replace(/^## (.+)$/gm, "

$1

") + html = html.replace(/^# (.+)$/gm, "

$1

") + + // Bold and Italic + html = html.replace(/\*\*\*(.+?)\*\*\*/g, "$1") + html = html.replace(/\*\*(.+?)\*\*/g, "$1") + html = html.replace(/\*(.+?)\*/g, "$1") + html = html.replace(/___(.+?)___/g, "$1") + html = html.replace(/__(.+?)__/g, "$1") + html = html.replace(/_(.+?)_/g, "$1") + + // Strikethrough + html = html.replace(/~~(.+?)~~/g, "$1") + + // Blockquotes + html = html.replace(/^> (.+)$/gm, "
$1
") + + // Horizontal rules + html = html.replace(/^---$/gm, "
") + html = html.replace(/^\*\*\*$/gm, "
") + + // Unordered lists + html = this.parseLists(html) + + // Task lists + html = html.replace( + /^- \[x\] (.+)$/gm, + '
  • $1
    • ', + ) + html = html.replace(/^- \[ \] (.+)$/gm, '
  • $1
    • ') + + // Links + html = html.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '$1') + + // Images + html = html.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, '$1') + + // Line breaks + html = html.replace(/\n\n/g, "

    ") + html = html.replace(/\n/g, "
    ") + + // Wrap in paragraphs + html = "

    " + html + "

    " + + // Clean up empty paragraphs + html = html.replace(/

    <\/p>/g, "") + html = html.replace(/

    ()/g, "$1") + html = html.replace(/(<\/h[1-6]>)<\/p>/g, "$1") + html = html.replace(/

    (

    )/g, "$1")
+		html = html.replace(/(<\/pre>)<\/p>/g, "$1")
+		html = html.replace(/
    (
    )/g, "$1")
+		html = html.replace(/(<\/blockquote>)<\/p>/g, "$1")
+		html = html.replace(/
    (
    )<\/p>/g, "$1")
+		html = html.replace(/
    (
      )/g, "$1")
+		html = html.replace(/(<\/ul>)<\/p>/g, "$1")
+		html = html.replace(/
      (
        )/g, "$1")
+		html = html.replace(/(<\/ol>)<\/p>/g, "$1")
+
+		return html
+	}
+
+	private parseLists(html: string): string {
+		const lines = html.split("\n")
+		let result = []
+		let inUl = false
+		let inOl = false
+		let ulItems: string[] = []
+		let olItems: string[] = []
+
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i]
+
+			// Check for unordered list item
+			const ulMatch = line.match(/^[\*\-] (.+)$/)
+			if (ulMatch) {
+				if (!inUl) {
+					if (inOl) {
+						result.push(`
          ${olItems.join("")}
        `)
+						olItems = []
+						inOl = false
+					}
+					inUl = true
+				}
+				ulItems.push(`
      1. ${ulMatch[1]}
        2. `)
+				continue
+			}
+
+			// Check for ordered list item
+			const olMatch = line.match(/^\d+\. (.+)$/)
+			if (olMatch) {
+				if (!inOl) {
+					if (inUl) {
+						result.push(`
          ${ulItems.join("")}
        `)
+						ulItems = []
+						inUl = false
+					}
+					inOl = true
+				}
+				olItems.push(`
      2. ${olMatch[1]}
        3. `)
+				continue
+			}
+
+			// Close any open lists
+			if (inUl) {
+				result.push(`
          ${ulItems.join("")}
        `)
+				ulItems = []
+				inUl = false
+			}
+			if (inOl) {
+				result.push(`
          ${olItems.join("")}
        `)
+				olItems = []
+				inOl = false
+			}
+
+			result.push(line)
+		}
+
+		// Close any remaining lists
+		if (inUl) {
+			result.push(`
          ${ulItems.join("")}
        `)
+		}
+		if (inOl) {
+			result.push(`
          ${olItems.join("")}
        `)
+		}
+
+		return result.join("\n")
+	}
+
+	private escapeHtml(text: string): string {
+		const map: Record = {
+			"&": "&",
+			"<": "<",
+			">": ">",
+			'"': """,
+			"'": "'",
+		}
+		return text.replace(/[&<>"']/g, (m) => map[m])
+	}
+
+	private getNonce(): string {
+		return crypto.randomBytes(16).toString("hex")
+	}
+}
+
+/**
+ * Opens a plan file in the custom editor
+ */
+export async function openPlanFileInEditor(filename: string, context: vscode.ExtensionContext): Promise {
+	try {
+		console.log(`[openPlanFileInEditor] Opening plan file: ${filename}`)
+		const globalStoragePath = context.globalStorageUri.fsPath
+		const basePath = await getPlanMemoryDirectoryPath(globalStoragePath, "default")
+
+		// First try to find the file in the default location
+		let filePath = path.join(basePath, filename)
+		console.log(`[openPlanFileInEditor] Trying default path: ${filePath}`)
+
+		// Check if file exists
+		try {
+			await fs.access(filePath)
+			console.log(`[openPlanFileInEditor] File found at default path`)
+		} catch {
+			// If not found, search in all task directories
+			const planMemoryBase = path.join(globalStoragePath, "plan-memory")
+			console.log(`[openPlanFileInEditor] File not found, searching in: ${planMemoryBase}`)
+			try {
+				const taskDirs = await fs.readdir(planMemoryBase, { withFileTypes: true })
+				let found = false
+
+				for (const taskDir of taskDirs) {
+					if (taskDir.isDirectory()) {
+						const taskPath = path.join(planMemoryBase, taskDir.name)
+						const testPath = path.join(taskPath, filename)
+						try {
+							await fs.access(testPath)
+							filePath = testPath
+							found = true
+							console.log(`[openPlanFileInEditor] File found at: ${filePath}`)
+							break
+						} catch {
+							// File not in this directory
+						}
+					}
+				}
+
+				if (!found) {
+					vscode.window.showErrorMessage(`Plan file not found: ${filename}`)
+					return
+				}
+			} catch {
+				vscode.window.showErrorMessage(`Plan file not found: ${filename}`)
+				return
+			}
+		}
+
+		// Create URI with custom scheme
+		const uri = vscode.Uri.parse(`${PLAN_EDITOR_URI_SCHEME}:${filePath}`)
+		console.log(`[openPlanFileInEditor] Created URI: ${uri.toString()}`)
+
+		// Open the document
+		await vscode.commands.executeCommand("vscode.openWith", uri, PLAN_EDITOR_URI_SCHEME)
+		console.log(`[openPlanFileInEditor] Command executed successfully`)
+	} catch (error) {
+		console.error(`[openPlanFileInEditor] Failed to open plan file:`, error)
+		vscode.window.showErrorMessage(
+			`Failed to open plan file: ${error instanceof Error ? error.message : String(error)}`,
+		)
+	}
+}
diff --git a/src/integrations/workspace/WorkspaceTracker.ts b/src/integrations/workspace/WorkspaceTracker.ts
index ddf19f9a96..eb358b2dec 100644
--- a/src/integrations/workspace/WorkspaceTracker.ts
+++ b/src/integrations/workspace/WorkspaceTracker.ts
@@ -5,7 +5,7 @@ import { listFiles } from "../../services/glob/list-files"
 import { ClineProvider } from "../../core/webview/ClineProvider"
 import { toRelativePath, getWorkspacePath } from "../../utils/path"
 
-const MAX_INITIAL_FILES = 1_000
+const MAX_INITIAL_FILES = 2_000
 
 // Note: this is not a drop-in replacement for listFiles at the start of tasks, since that will be done for Desktops when there is no workspace selected
 class WorkspaceTracker {
diff --git a/src/package.json b/src/package.json
index 6a1e1bac28..7eb5dbb6d2 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "matterai",
-	"version": "5.3.5",
+	"version": "5.4.0",
 	"icon": "assets/icons/matterai-ic.png",
 	"galleryBanner": {
 		"color": "#FFFFFF",
diff --git a/src/services/continuedev/core/diff/streamDiff.test.ts b/src/services/continuedev/core/diff/streamDiff.test.ts
index fdb043e38a..3e8cb8d1a8 100644
--- a/src/services/continuedev/core/diff/streamDiff.test.ts
+++ b/src/services/continuedev/core/diff/streamDiff.test.ts
@@ -59,8 +59,8 @@ async function expectDiff(file: string) {
 	const normalized = testFileContents.replace(/\r\n/g, "\n")
 
 	const [oldText, newText, expectedDiff] = normalized.split("\n---\n").map((s) => s.replace(/^\n+/, "").trimEnd())
-	const oldLines = oldText.split("\n")
-	const newLines = newText.split("\n")
+	const oldLines = oldText ? oldText.split("\n") : []
+	const newLines = newText ? newText.split("\n") : []
 	const { streamDiffs } = await collectDiffs(oldLines, newLines)
 	const displayedDiff = displayDiff(streamDiffs)
 
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index 51d674dca9..7d4eb6b123 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -171,6 +171,7 @@ export interface ExtensionMessage {
 		| TasksByIdResponsePayload
 		| TaskHistoryResponsePayload
 		| ImplementPlanPayload
+		| OpenPlanFilePayload
 	// kilocode_change end
 	action?:
 		| "chatButtonClicked"
@@ -471,6 +472,10 @@ export interface ImplementPlanPayload {
 	planContent: string
 }
 
+export interface OpenPlanFilePayload {
+	planFile: string
+}
+
 export interface ClineSayTool {
 	tool:
 		| "editedExistingFile"
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
index dbe98c1664..077a5543e7 100644
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@@ -17,7 +17,7 @@ import {
 } from "@roo-code/types"
 
 import { Mode } from "./modes"
-import { ImplementPlanPayload } from "./ExtensionMessage"
+import { ImplementPlanPayload, OpenPlanFilePayload } from "./ExtensionMessage"
 
 export type ClineAskResponse =
 	| "yesButtonClicked"
@@ -302,6 +302,7 @@ export interface WebviewMessage {
 		| "insertTextIntoTextarea"
 		| "showMdmAuthRequiredNotification"
 		| "implementPlan" // kilocode_change: Plan mode implementation
+		| "openPlanFile" // kilocode_change: Open plan file in editor
 		| "imageGenerationSettings"
 		| "openRouterImageApiKey"
 		| "kiloCodeImageApiKey"
@@ -610,6 +611,7 @@ export type WebViewMessagePayload =
 	| CommitChangesPayload
 	| PendingFileEditsPayload
 	| ImplementPlanPayload
+	| OpenPlanFilePayload
 	| CodeReviewResultsPayload
 	| ApplyCodeReviewFixPayload
 	| ApplyAllCodeReviewFixesPayload
diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 38d3a44c0a..4e430ca9bc 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -19,6 +19,7 @@ import { vscode } from "@src/utils/vscode"
 
 import CodeAccordian, { extractFirstLineNumberFromDiff } from "../common/CodeAccordian"
 import ImageBlock from "../common/ImageBlock"
+import GitHubDiffView from "./GitHubDiffView"
 import MarkdownBlock from "../common/MarkdownBlock"
 import Thumbnails from "../common/Thumbnails"
 import { ToolUseBlock, ToolUseBlockHeader } from "../common/ToolUseBlock"
@@ -54,6 +55,7 @@ import CodebaseSearchResultsDisplay from "./CodebaseSearchResultsDisplay"
 import { CondenseContextErrorRow, CondensingContextRow, ContextCondenseRow } from "./ContextCondenseRow"
 import { McpExecution } from "./McpExecution"
 import { FastApplyChatDisplay } from "./kilocode/FastApplyChatDisplay" // kilocode_change
+import { PlayIcon } from "@/utils/customIcons"
 
 interface ChatRowProps {
 	message: ClineMessage
@@ -93,7 +95,7 @@ const headerStyle: React.CSSProperties = {
 	flexShrink: 0,
 }
 
-// Build a minimal unified diff for fileEdit when backend doesn't supply one
+// Build a GitHub-style unified diff for fileEdit when backend doesn't supply one
 const buildFileEditDiff = (tool: ClineSayTool): string | undefined => {
 	const path = tool.path || "file"
 	const oldText = (tool.search ?? "").trimEnd()
@@ -101,17 +103,28 @@ const buildFileEditDiff = (tool: ClineSayTool): string | undefined => {
 
 	if (!oldText && !newText) return undefined
 
+	const oldLines = oldText.split(/\r?\n/)
+	const newLines = newText.split(/\r?\n/)
+
 	const lines: string[] = []
 	lines.push(`--- a/${path}`)
 	lines.push(`+++ b/${path}`)
-	lines.push(`@@`)
 
-	if (oldText) {
-		lines.push(...oldText.split(/\r?\n/).map((line) => `-${line}`))
+	// Calculate hunk header with line numbers
+	const oldStart = 1
+	const oldCount = oldLines.length
+	const newStart = 1
+	const newCount = newLines.length
+	lines.push(`@@ -${oldStart},${oldCount} +${newStart},${newCount} @@`)
+
+	// Add old lines with - prefix
+	for (const line of oldLines) {
+		lines.push(`-${line}`)
 	}
 
-	if (newText) {
-		lines.push(...newText.split(/\r?\n/).map((line) => `+${line}`))
+	// Add new lines with + prefix
+	for (const line of newLines) {
+		lines.push(`+${line}`)
 	}
 
 	return lines.join("\n")
@@ -523,7 +536,7 @@ export const ChatRowContent = ({
 					})
 				}
 				return (
-					
        
+					
        
 						
        
 							{tool.isProtected ? (
 								
 						
        
-						
        
-							
-										{tool.isProtected ? (
-											
-										) : null}
-										{tool.path ? (
-											 {
-													e.stopPropagation()
-													openFileWithLine()
-												}}
-												onKeyDown={(e) => {
-													if (e.key === "Enter" || e.key === " ") {
-														e.preventDefault()
-														e.stopPropagation()
-														openFileWithLine()
-													}
-												}}>
-												{tool.path.split("/").pop() || tool.path}
-											
-										) : null}
-										{diffStats ? (
-											
-												
-													+{diffStats.added}
-												
-												
-													-{diffStats.removed}
-												
-											
-										) : null}
-									
        
-								}
+						
        
+							
 							{
 								// kilocode_change start
@@ -611,29 +582,46 @@ export const ChatRowContent = ({
 						
        
 						
        
 							
-							
+							{isExpanded ? (
+								
+							) : (
+								
+							)}
 							{!message.partial && (
-								 {
-										vscode.postMessage({
-											type: "implementPlan",
-											payload: {
-												planFile: tool.filename || "plan.md",
-												planContent: tool.content || "",
-											},
-										})
-									}}
-									className="mt-2">
-									
-									Implement
-								
+								
        
+									 {
+											vscode.postMessage({
+												type: "implementPlan",
+												payload: {
+													planFile: tool.filename || "plan.md",
+													planContent: tool.content || "",
+												},
+											})
+										}}>
+										
+										Implement
+									
+									 {
+											vscode.postMessage({
+												type: "openPlanFile",
+												payload: {
+													planFile: tool.filename || "plan.md",
+												},
+											})
+										}}>
+										
+										Open in Editor
+									
+								
        
 							)}
 						
        
 					
        
diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx
index fd2719d3f5..3bc0ab6a6f 100644
--- a/webview-ui/src/components/chat/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea.tsx
@@ -1519,7 +1519,6 @@ export const ChatTextArea = forwardRef(
 						"text-vscode-input-foreground",
 						"font-vscode-font-family",
 						"text-vscode-editor-font-size",
-						"leading-vscode-editor-line-height",
 						"cursor-text",
 						"outline-none",
 						isEditMode ? "pt-1.5 pb-2 px-2" : "py-1.5 px-2",
@@ -1536,6 +1535,7 @@ export const ChatTextArea = forwardRef(
 					)}
 					style={{
 						caretColor: "var(--vscode-input-foreground)",
+						lineHeight: "16px",
 					}}
 				/>
 
diff --git a/webview-ui/src/components/chat/GitHubDiffView.tsx b/webview-ui/src/components/chat/GitHubDiffView.tsx
new file mode 100644
index 0000000000..4efa1203e0
--- /dev/null
+++ b/webview-ui/src/components/chat/GitHubDiffView.tsx
@@ -0,0 +1,147 @@
+import { VSCodeProgressRing } from "@vscode/webview-ui-toolkit/react"
+import { memo } from "react"
+import { extractFirstLineNumberFromDiff } from "../common/CodeAccordian"
+import { ToolUseBlock, ToolUseBlockHeader } from "../common/ToolUseBlock"
+
+interface DiffStats {
+	added: number
+	removed: number
+}
+
+interface GitHubDiffViewProps {
+	diff: string
+	filePath?: string
+	isProtected?: boolean
+	isOutsideWorkspace?: boolean
+	diffStats?: DiffStats | null
+	isLoading?: boolean
+	isExpanded: boolean
+	onToggleExpand: () => void
+	onOpenFile?: () => void
+}
+
+const GitHubDiffView = memo(
+	({
+		diff,
+		filePath,
+		isProtected,
+		diffStats,
+		isLoading,
+		isExpanded,
+		onToggleExpand,
+		onOpenFile,
+	}: GitHubDiffViewProps) => {
+		const firstLineNumber = extractFirstLineNumberFromDiff(diff)
+
+		const fileName = filePath?.split("/").pop() || filePath || "file"
+
+		return (
+			
+				
+					{isLoading && }
+					
        
+						{isProtected ? (
+							
+						) : null}
+						{filePath ? (
+							 {
+									e.stopPropagation()
+									onOpenFile?.()
+								}}
+								onKeyDown={(e) => {
+									if (e.key === "Enter" || e.key === " ") {
+										e.preventDefault()
+										e.stopPropagation()
+										onOpenFile?.()
+									}
+								}}>
+								{fileName}
+							
+						) : null}
+						{diffStats ? (
+							
+								+{diffStats.added}
+								-{diffStats.removed}
+							
+						) : null}
+					
        
+					
        
+					
+				
+
+				{isExpanded && (
+					
        
+						
        
+							{/* Diff content */}
+							
        
+								
+							
        
+						
        
+					
        
+				)}
+			
+		)
+	},
+)
+
+GitHubDiffView.displayName = "GitHubDiffView"
+
+// Unified diff view component
+const UnifiedDiffView = memo(({ diff }: { diff: string }) => {
+	const lines = diff ? diff.split("\n") : []
+
+	return (
+		
        
+			{lines.map((line, index) => {
+				const isHeader = line.startsWith("---") || line.startsWith("+++") || line.startsWith("diff --git")
+				const isHunk = line.startsWith("@@")
+				const isAddition = line.startsWith("+")
+				const isDeletion = line.startsWith("-")
+
+				let lineClass = ""
+				let bgClass = ""
+
+				if (isHeader) {
+					lineClass = "text-vscode-descriptionForeground"
+				} else if (isHunk) {
+					lineClass = "text-vscode-editorInfo-foreground bg-vscode-editorInfo-background"
+				} else if (isAddition) {
+					bgClass = "bg-[var(--vscode-diffEditor-insertedTextBackground)]"
+				} else if (isDeletion) {
+					bgClass = "bg-[var(--vscode-diffEditor-removedTextBackground)]"
+				}
+
+				return (
+					
        
+						{/* Line number column */}
+						
+							{isHeader || isHunk ? "" : index + 1}
+						
+						{/* Content */}
+						{line}
+					
        
+				)
+			})}
+		
        
+	)
+})
+
+UnifiedDiffView.displayName = "UnifiedDiffView"
+
+export default GitHubDiffView
diff --git a/webview-ui/src/components/common/ToolUseBlock.tsx b/webview-ui/src/components/common/ToolUseBlock.tsx
index ebccefab99..e1f758662c 100644
--- a/webview-ui/src/components/common/ToolUseBlock.tsx
+++ b/webview-ui/src/components/common/ToolUseBlock.tsx
@@ -1,10 +1,7 @@
 import { cn } from "@/lib/utils"
 
 export const ToolUseBlock = ({ className, ...props }: React.HTMLAttributes) => (
-	
        
+	
        
 )
 
 export const ToolUseBlockHeader = ({ className, ...props }: React.HTMLAttributes) => (
diff --git a/webview-ui/src/components/kilocode/KiloTaskHeader.tsx b/webview-ui/src/components/kilocode/KiloTaskHeader.tsx
index b68523e5d1..02549bb3cd 100644
--- a/webview-ui/src/components/kilocode/KiloTaskHeader.tsx
+++ b/webview-ui/src/components/kilocode/KiloTaskHeader.tsx
@@ -91,7 +91,7 @@ const KiloTaskHeader = ({
 				{title && (
 					
        
 						
        
-							{title}
+							{title}