Add prompting about edits from users

Author: jahooma

backend/src/main-prompt.ts

@@ -129,22 +129,26 @@ export const mainPrompt = async (
     costMode,
     allMessagesTokens
   )
-  const { addedFiles, readFilesMessage, clearReadFileToolResults } =
-    await getFileVersionUpdates(
-      ws,
-      messagesWithUserMessage,
-      searchSystem,
-      fileContext,
-      null,
-      {
-        skipRequestingFiles: !prompt,
-        clientSessionId,
-        fingerprintId,
-        userInputId: promptId,
-        userId,
-        costMode,
-      }
-    )
+  const {
+    addedFiles,
+    readFilesMessage,
+    clearReadFileToolResults,
+    updatedFilePaths,
+  } = await getFileVersionUpdates(
+    ws,
+    messagesWithUserMessage,
+    searchSystem,
+    fileContext,
+    null,
+    {
+      skipRequestingFiles: !prompt,
+      clientSessionId,
+      fingerprintId,
+      userInputId: promptId,
+      userId,
+      costMode,
+    }
+  )
 
   if (clearReadFileToolResults) {
     for (const message of messagesWithUserMessage) {
@@ -159,10 +163,19 @@ export const mainPrompt = async (
   }
 
   if (addedFiles.length > 0) {
+    const [updatedFiles, newFiles] = partition(addedFiles, (f) =>
+      updatedFilePaths.includes(f.path)
+    )
+    const hasUpdatedFiles = updatedFiles.length > 0
     const readFilesToolResult = {
       id: generateCompactId(),
       name: 'read_files',
-      result: renderReadFilesResult(addedFiles),
+      result:
+        renderReadFilesResult(newFiles) +
+        (hasUpdatedFiles
+          ? `\nThe following files had modifications made by you or the user. Try to accommodate these changes going forward:\n`
+          : '') +
+        renderReadFilesResult(updatedFiles),
     }
     messagesWithUserMessage.push({
       role: 'assistant' as const,
@@ -722,6 +735,7 @@ async function getFileVersionUpdates(
       addedFiles: newFiles,
       existingNewFilePaths,
       nonExistingNewFilePaths,
+      updatedFilePaths: updatedFiles,
       readFilesMessage,
       clearReadFileToolResults: true,
     }
@@ -740,6 +754,7 @@ async function getFileVersionUpdates(
     addedFiles,
     existingNewFilePaths,
     nonExistingNewFilePaths,
+    updatedFilePaths: updatedFiles,
     readFilesMessage,
     clearReadFileToolResults: false,
   }

backend/src/system-prompt/agent-instructions.md

@@ -10,7 +10,15 @@ Use the tools to work toward accomplishing the user request, and do not forget t
 
 # Files
 
-The <files> tag shows files you have previously created or read from previous iterations. Multiple copies of the same file may be included — each represents a distinct version arranged in chronological order. Pay particular attention to the last copy of a file as that one is current.
+The <read_file> tool result shows files you have previously read from <read_files> tool calls.
+
+If you write to a file, or if the user modifies a file, new copies of a file will be included in <read_file> tool results.
+
+Thus, multiple copies of the same file may be included over the course of a conversation. Each represents a distinct version in chronological order.
+
+Important:
+- Pay particular attention to the last copy of a file as that one is current!
+- You are not the only one making changes to files. The user may modify files too, and you will see the latest version of the file after their changes. You must base you future write_file edits off of the latest changes. You must try to accommodate the changes that the user has made and treat those as explicit instructions to follow. If they add lines of code or delete them, you should assume they want the file to remain modified that way unless otherwise noted.
 
 # Subgoals