Generate diff markdown for agentic CLI edit-file runs instead of prompting for edit format

- the 'edit files' cli prompt should not have 'output formatting' instructions, instead it should edit files (in the temp directory) by itself and afterwards, the system should scan the temp dir and compile markdown text adhering to our EDIT_FORMAT_INSTRUCTIONS_DIFF
- in 'edit files', agent sometimes output also some text to the user - is it captured an dincluded as plain text on top of the diff markdown?
- when including plain text [Pasted text], strip markdown links
- diff markdown-constructing logic should be extracted to a local util
- as we replace markdown links, wrap resulting text in backticks
- agent sometimes repeat changes to the user, e.g. [Pasted text] - in such case we're only interested in "[Pasted text]"

└── apps
    └── editor
        └── src
            ├── constants
            │   ├── edit-format-instructions.ts
            │   └── instructions.ts
            ├── utils
            │   └── agentic-cli-invocation
            │       ├── agents
            │       │   ├── antigravity.ts
            │       │   ├── claude.ts
            │       │   ├── codex.ts
            │       │   ├── cursor.ts
            │       │   ├── grok.ts
            │       │   ├── index.ts
            │       │   ├── muse.ts
            │       │   └── opencode.ts
            │       ├── index.ts
            │       ├── invoke-agentic-cli.ts
            │       ├── types.ts
            │       └── utils
            │           ├── check-command-exists.ts
            │           ├── format-duration.ts
            │           ├── generate-diff-markdown.ts
            │           └── get-progress-dots.ts
            └── views
                └── prompt
                    └── backend
                        └── message-handlers
                            ├── handle-invoke-agentic-cli.ts
                            └── utils
                                └── build-cli-prompt.ts

Author: robertpiosik

README.md

@@ -170,15 +170,9 @@ Whenever showing a new, updated, renamed, or deleted file, provide a brief expla
 
 [SELECTED FILES]
 
-# Output formatting
-
-[EDIT FORMAT INSTRUCTIONS]
-
 # Requirements
 
-* This is a read-only session.
-* Read all the listed files provided as project-relative paths in full, and nothing else.
-* Formulate response adhering to the output formatting, in plain text.
+Before you proceed with [the task](#task), you must read all files provided as project-relative paths in [files](#files), and nothing else.
 
 # Task
 
@@ -216,7 +210,7 @@ _Multi-purpose: explanations, code reviews, you name it._
 
 # Requirements
 
-Tool calling is disabled with exception to reading files provided as project-relative paths...
+Before you proceed with [the task](#task), you must read all files provided as project-relative paths in [files](#files), and nothing else.
 
 # Task
 

apps/editor/src/constants/instructions.ts

@@ -69,11 +69,11 @@ These files contain the core greeting logic and module exports.`
 export const voice_input_instructions =
   'Respond with a transcription of the following audio recording or text "INAUDIBLE", and nothing else.'
 
-export const cli_requirements = {
+export const cli_edit_ask_requirements = {
   preloaded_files:
-    'Tool calling is disabled with exception to media/web access in [task](#task).',
+    'All files necessary for [the task](#task) are listed in [files](#files).',
   referenced_files_with_some_preloaded:
-    'Tool calling is disabled with exception to reading large files provided as project-relative paths in [files](#files) and media/web access in [task](#task). You must begin by reading large files listed in [files](#files) in full.',
+    'Before you proceed with [the task](#task), you must read all \'large files\' listed as project-relative paths in [files](#files), and nothing else.',
   referenced_files_only:
-    'Tool calling is disabled with exception to reading files provided as project-relative paths in [files](#files) and media/web access in [task](#task). You must begin by reading files listed in [files](#files) in full.'
+    'Before you proceed with [the task](#task), you must read all files provided as project-relative paths in [files](#files), and nothing else.'
 }

apps/editor/src/utils/agentic-cli-invocation/invoke-agentic-cli.ts

@@ -7,6 +7,7 @@ import { t } from '@/i18n'
 import { spawn } from 'child_process'
 import { CLI_AGENTS } from './agents'
 import { Logger } from '@shared/utils/logger'
+import { generate_diff_markdown } from './utils/generate-diff-markdown'
 import { ConfigAgentConfigurationFormat } from '@/utils/cli-configuration-format-converters'
 import { AGENTS } from '@/constants/agents'
 
@@ -300,9 +301,11 @@ export const invoke_agentic_cli = async (params: {
 
     while (true) {
       let selected_root: string | undefined
+      let temp_dir_path: string | undefined
+      const file_mappings = new Map<string, { original: string; dest_rel: string }>()
 
       if (params.panel_prompt_type) {
-        const temp_dir_path = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'cwc-cli-'))
+        temp_dir_path = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'cwc-cli-'))
         const checked_files = params.workspace_provider.get_checked_files()
 
         for (const file_path of checked_files) {
@@ -314,6 +317,8 @@ export const invoke_agentic_cli = async (params: {
 
           await fs.promises.mkdir(path.dirname(dest_path), { recursive: true })
           await fs.promises.copyFile(file_path, dest_path)
+          
+          file_mappings.set(dest_path, { original: file_path, dest_rel: dest_rel.replace(/\\/g, '/') })
         }
 
         selected_root = temp_dir_path
@@ -539,7 +544,7 @@ export const invoke_agentic_cli = async (params: {
                 resolve()
               })
 
-              child.on('close', () => {
+              child.on('close', async () => {
                 if (agent_info.parse_final_output && raw_stream_output.trim()) {
                   try {
                     const parsed = JSON.parse(raw_stream_output.trim())
@@ -550,6 +555,35 @@ export const invoke_agentic_cli = async (params: {
                     // Ignore
                   }
                 }
+
+                if (params.panel_prompt_type == 'edit-files' && temp_dir_path) {
+                  try {
+                    const diff_markdown = await generate_diff_markdown(
+                      temp_dir_path,
+                      file_mappings
+                    )
+                    
+                    const trimmed_output = agent_output
+                      .trim()
+                      .replace(/\[([^\]]+)\]\([^)]+\)/g, '`$1`')
+                      .replace(/```[\s\S]*?```/g, '')
+                      .trim()
+                    const trimmed_diff = diff_markdown.trim()
+                    
+                    if (trimmed_output && trimmed_diff) {
+                      agent_output = trimmed_output + '\n\n' + trimmed_diff
+                    } else {
+                      agent_output = trimmed_diff || trimmed_output
+                    }
+                  } catch (e) {
+                    Logger.error({
+                      function_name: 'invoke_agentic_cli',
+                      message: 'Failed to generate diff',
+                      data: e
+                    })
+                  }
+                }
+
                 Logger.info({
                   function_name: 'invoke_agentic_cli',
                   message: "Agent's response",

apps/editor/src/utils/agentic-cli-invocation/utils/generate-diff-markdown.ts

@@ -0,0 +1,119 @@
+import * as path from 'path'
+import * as fs from 'fs'
+import { promisify } from 'util'
+import { execFile } from 'child_process'
+
+const execFileAsync = promisify(execFile)
+
+async function get_all_files(dir: string): Promise<string[]> {
+  const dirents = await fs.promises.readdir(dir, { withFileTypes: true })
+  const files = await Promise.all(
+    dirents.map(async (dirent) => {
+      const res = path.resolve(dir, dirent.name)
+      return dirent.isDirectory() ? get_all_files(res) : res
+    })
+  )
+  return Array.prototype.concat(...files) as string[]
+}
+
+export const generate_diff_markdown = async (
+  temp_dir_path: string,
+  file_mappings: Map<string, { original: string; dest_rel: string }>
+): Promise<string> => {
+  let diff_markdown = ''
+  const temp_files = await get_all_files(temp_dir_path)
+
+  for (const temp_file of temp_files) {
+    const rel_path = path.relative(temp_dir_path, temp_file)
+    const unix_rel_path = rel_path.replace(/\\/g, '/')
+
+    const temp_file_resolved = path.resolve(temp_file)
+    let mapping = file_mappings.get(temp_file)
+    if (!mapping) {
+      for (const [dest_path, map] of file_mappings.entries()) {
+        if (path.resolve(dest_path) === temp_file_resolved) {
+          mapping = map
+          break
+        }
+      }
+    }
+
+    if (mapping) {
+      const original_content = await fs.promises.readFile(
+        mapping.original,
+        'utf-8'
+      )
+      const new_content = await fs.promises.readFile(temp_file, 'utf-8')
+
+      if (original_content !== new_content) {
+        try {
+          await execFileAsync('git', [
+            'diff',
+            '--no-index',
+            mapping.original,
+            temp_file
+          ])
+        } catch (err: any) {
+          if (err.code === 1 && err.stdout) {
+            const stdout: string = err.stdout
+            const diff_lines = stdout.split('\n')
+            const at_at_index = diff_lines.findIndex((l) =>
+              l.startsWith('@@ ')
+            )
+            if (at_at_index !== -1) {
+              const diff_body = diff_lines.slice(at_at_index).join('\n')
+              diff_markdown +=
+                '\n### Updated file: `' +
+                unix_rel_path +
+                '`\n\n```diff\n--- a/' +
+                unix_rel_path +
+                '\n+++ b/' +
+                unix_rel_path +
+                '\n' +
+                diff_body +
+                (diff_body.endsWith('\n') ? '' : '\n') +
+                '```\n'
+            } else {
+              diff_markdown +=
+                '\n### Updated file: `' +
+                unix_rel_path +
+                '`\n\n```\n' +
+                new_content +
+                (new_content.endsWith('\n') ? '' : '\n') +
+                '```\n'
+            }
+          } else {
+            diff_markdown +=
+              '\n### Updated file: `' +
+              unix_rel_path +
+              '`\n\n```\n' +
+              new_content +
+              (new_content.endsWith('\n') ? '' : '\n') +
+              '```\n'
+          }
+        }
+      }
+    } else {
+      const new_content = await fs.promises.readFile(temp_file, 'utf-8')
+      diff_markdown +=
+        '\n### Created file: `' +
+        unix_rel_path +
+        '`\n\n```\n' +
+        new_content +
+        (new_content.endsWith('\n') ? '' : '\n') +
+        '```\n'
+    }
+  }
+
+  for (const [dest_path, mapping] of file_mappings.entries()) {
+    const normalized_dest = path.resolve(dest_path)
+    const is_kept = temp_files.some(
+      (t) => path.resolve(t) === normalized_dest
+    )
+    if (!is_kept) {
+      diff_markdown += '\n### Deleted file: `' + mapping.dest_rel + '`\n'
+    }
+  }
+
+  return diff_markdown
+}

apps/editor/src/views/prompt/backend/message-handlers/handle-invoke-agentic-cli.ts

@@ -77,7 +77,6 @@ export const handle_invoke_agentic_cli = async (
     vscode.commands.executeCommand('codeWebChat.applyResponse', {
       response: agent_output,
       raw_instructions: current_instructions,
-      edit_format: prompt_view_provider.edit_format
     })
   }
 }

apps/editor/src/views/prompt/backend/message-handlers/utils/build-cli-prompt.ts

@@ -2,13 +2,7 @@ import * as path from 'path'
 import * as fs from 'fs/promises'
 import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
 import { replace_symbols } from '@/views/prompt/backend/utils/symbols/replace-symbols'
-import { cli_requirements } from '@/constants/instructions'
-import {
-  EDIT_FORMAT_INSTRUCTIONS_DIFF,
-  EDIT_FORMAT_INSTRUCTIONS_SEARCH_REPLACE,
-  EDIT_FORMAT_INSTRUCTIONS_TRUNCATED,
-  EDIT_FORMAT_INSTRUCTIONS_WHOLE
-} from '@/constants/edit-format-instructions'
+import { cli_edit_ask_requirements } from '@/constants/instructions'
 import { LAST_SELECTED_WORKSPACE_IN_AGENTIC_CLI_STATE_KEY } from '@/constants/state-keys'
 
 export const build_cli_prompt = async (params: {
@@ -110,25 +104,13 @@ export const build_cli_prompt = async (params: {
     files_section = `# Files\n\n${file_blocks.join('\n\n')}`
   }
 
-  let output_formatting_section = ''
-  if (prompt_view_provider.cli_prompt_type == 'edit-files') {
-    const edit_format_instructions = {
-      whole: EDIT_FORMAT_INSTRUCTIONS_WHOLE,
-      truncated: EDIT_FORMAT_INSTRUCTIONS_TRUNCATED,
-      'search-replace': EDIT_FORMAT_INSTRUCTIONS_SEARCH_REPLACE,
-      diff: EDIT_FORMAT_INSTRUCTIONS_DIFF
-    }[prompt_view_provider.edit_format]
-
-    if (edit_format_instructions) {
-      output_formatting_section = `# Output formatting\n\n${edit_format_instructions}`
-    }
-  }
+  const output_formatting_section = ''
 
   const requirement = are_all_files_preloaded
-    ? cli_requirements.preloaded_files
+    ? cli_edit_ask_requirements.preloaded_files
     : are_any_files_preloaded
-    ? cli_requirements.referenced_files_with_some_preloaded
-    : cli_requirements.referenced_files_only
+    ? cli_edit_ask_requirements.referenced_files_with_some_preloaded
+    : cli_edit_ask_requirements.referenced_files_only
 
   const requirements_section = `# Requirements\n\n${requirement}`
   const task_section = `# Task\n\n${processed_query}`