Refine agentic CLI prompt requirements and use cached initial file content for more reliable diff generation

- Update `invoke-agentic-cli.ts` to read and store the file contents in `file_mappings` before the CLI runs, and modify `generate_diff_markdown` to diff against these cached contents instead of re-reading the original files from disk.

└── apps
    └── editor
        └── src
            ├── utils
            │   └── agentic-cli-invocation
            │       ├── invoke-agentic-cli.ts
            │       └── utils
            │           └── generate-diff-markdown.ts
            └── views
                └── prompt
                    └── backend
                        └── message-handlers
                            └── handle-invoke-agentic-cli.ts

Author: robertpiosik

apps/editor/src/constants/instructions.ts

@@ -71,10 +71,8 @@ export const voice_input_instructions =
 
 export const cli_edit_ask_requirements = {
   preloaded_files: 'All project files are shown in [files](#files) section.',
-  referenced_files_with_some_preloaded:
-    'Begin by looking at [files](#files) section for unread files (### Unread file: `[PROJECT-RELATIVE PATH]`) and read them one-by-one.',
-  referenced_files_only:
-    'Begin by looking at [files](#files) section for referenced files (### File: `[PROJECT-RELATIVE PATH]`) and read them one-by-one.',
+  read_files:
+    'You must start by looking at [files](#files) section for unread files (### Unread file: `[PROJECT-RELATIVE PATH]`) and read them one-by-one.',
   read_images:
     'If [task](#task) section includes *.png image paths, read them.',
   restrict_tool_calls:

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

@@ -303,7 +303,7 @@ 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 }>()
+      const file_mappings = new Map<string, { original: string; dest_rel: string; initial_content?: string }>()
 
       if (params.panel_prompt_type) {
         temp_dir_path = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'cwc-cli-'))
@@ -319,7 +319,9 @@ 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, '/') })
+          const initial_content = await fs.promises.readFile(file_path, 'utf-8').catch(() => undefined)
+
+          file_mappings.set(dest_path, { original: file_path, dest_rel: dest_rel.replace(/\\/g, '/'), initial_content })
         }
 
         selected_root = temp_dir_path

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

@@ -18,12 +18,16 @@ async function get_all_files(dir: string): Promise<string[]> {
 
 export const generate_diff_markdown = async (
   temp_dir_path: string,
-  file_mappings: Map<string, { original: string; dest_rel: string }>
+  file_mappings: Map<string, { original: string; dest_rel: string; initial_content?: string }>
 ): Promise<string> => {
   let diff_markdown = ''
   const temp_files = await get_all_files(temp_dir_path)
 
   for (const temp_file of temp_files) {
+    if (path.basename(temp_file).startsWith('._orig_')) {
+      continue
+    }
+
     const rel_path = path.relative(temp_dir_path, temp_file)
     const unix_rel_path = rel_path.replace(/\\/g, '/')
 
@@ -39,18 +43,20 @@ export const generate_diff_markdown = async (
     }
 
     if (mapping) {
-      const original_content = await fs.promises.readFile(
-        mapping.original,
-        'utf-8'
-      )
+      const original_content = mapping.initial_content !== undefined
+        ? mapping.initial_content
+        : await fs.promises.readFile(mapping.original, 'utf-8').catch(() => '')
       const new_content = await fs.promises.readFile(temp_file, 'utf-8')
 
       if (original_content !== new_content) {
+        const temp_original = path.join(path.dirname(temp_file), `._orig_${path.basename(temp_file)}`)
+        await fs.promises.writeFile(temp_original, original_content, 'utf-8')
+
         try {
           await execFileAsync('git', [
             'diff',
             '--no-index',
-            mapping.original,
+            temp_original,
             temp_file
           ])
         } catch (err: any) {
@@ -102,6 +108,8 @@ export const generate_diff_markdown = async (
               (new_content.endsWith('\n') ? '' : '\n') +
               '```\n'
           }
+        } finally {
+          await fs.promises.unlink(temp_original).catch(() => {})
         }
       }
     } else {

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

@@ -76,11 +76,9 @@ export const build_cli_prompt = async (params: {
 
   let files_section = ''
   let are_all_files_preloaded = false
-  let are_any_files_preloaded = false
 
   if (total_content_length <= MAX_CLI_PROMPT_TOTAL_INLINED_CHARS) {
     are_all_files_preloaded = true
-    are_any_files_preloaded = files_data.length > 0
     const file_blocks = files_data.map((data) =>
       data.content !== undefined
         ? `### File: \`${data.relative_path}\`\n\n\`\`\`\n${data.content}\n\`\`\``
@@ -103,15 +101,13 @@ export const build_cli_prompt = async (params: {
           file_blocks.push(
             `### File: \`${data.relative_path}\`\n\n\`\`\`\n${data.content}\n\`\`\``
           )
-          are_any_files_preloaded = true
         } else {
           file_blocks.push(`### Unread file: \`${data.relative_path}\``)
         }
       } else {
         file_blocks.push(
           `### File: \`${data.relative_path}\`\n\n\`\`\`\n\n\`\`\``
         )
-        are_any_files_preloaded = true
       }
     }
 
@@ -123,9 +119,7 @@ export const build_cli_prompt = async (params: {
   const requirements_list = [
     are_all_files_preloaded
       ? cli_edit_ask_requirements.preloaded_files
-      : are_any_files_preloaded
-        ? cli_edit_ask_requirements.referenced_files_with_some_preloaded
-        : cli_edit_ask_requirements.referenced_files_only,
+      : cli_edit_ask_requirements.read_files,
     cli_edit_ask_requirements.read_images,
     prompt_view_provider.cli_prompt_type == 'edit-files'
       ? cli_edit_ask_requirements.restrict_tool_calls_with_exceptions