[AI Assistance] fix read file function

Sometimes the files might not load their content. We need to ensure we
call requestContentData to get the content if uiSourceCode is not dirty.

Bug: 408130689
Change-Id: Ic84eb4f4ad787a8e3e7a21cbc7f6abbbfd01299b
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6448693
Auto-Submit: Alex Rudenko <[email protected]>
Commit-Queue: Ergün Erdoğmuş <[email protected]>
Reviewed-by: Ergün Erdoğmuş <[email protected]>

Author: OrKoN

front_end/models/ai_assistance/AgentProject.test.ts

@@ -55,22 +55,22 @@ describeWithEnvironment('AgentProject', () => {
   it('can read files', async () => {
     const {project} = await mockProject();
 
-    assert.deepEqual(project.readFile('index.html'), 'content');
+    assert.deepEqual(await project.readFile('index.html'), 'content');
   });
 
   it('can report processed files', async () => {
     const {project} = await mockProject();
     assert.deepEqual(project.getProcessedFiles(), []);
-    project.readFile('index.html');
+    await project.readFile('index.html');
     assert.deepEqual(project.getProcessedFiles(), ['index.html']);
   });
 
   describe('write file', () => {
     describe('full', () => {
       it('can write files files', async () => {
         const {project} = await mockProject();
-        project.writeFile('index.html', 'updated');
-        assert.deepEqual(project.readFile('index.html'), 'updated');
+        await project.writeFile('index.html', 'updated');
+        assert.deepEqual(await project.readFile('index.html'), 'updated');
       });
     });
 
@@ -86,8 +86,8 @@ diff
 +updated
 \`\`\`\`\``;
 
-        project.writeFile('index.html', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
-        assert.deepEqual(project.readFile('index.html'), 'updated');
+        await project.writeFile('index.html', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
+        assert.deepEqual(await project.readFile('index.html'), 'updated');
       });
 
       it('can write files with multiple changes', async () => {
@@ -115,8 +115,8 @@ diff
 +LineUpdated:4
 \`\`\`\`\``;
 
-        project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
-        assert.deepEqual(project.readFile('index.css'), `LineUpdated:1
+        await project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
+        assert.deepEqual(await project.readFile('index.css'), `LineUpdated:1
 Line:2
 Line:3
 LineUpdated:4
@@ -141,8 +141,8 @@ diff
 +Line:4
 \`\`\`\`\``;
 
-        project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
-        assert.deepEqual(project.readFile('index.css'), `Line:1
+        await project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
+        assert.deepEqual(await project.readFile('index.css'), `Line:1
 Line:4`);
       });
 
@@ -169,8 +169,8 @@ diff
 +LineUpdated:1.5
 \`\`\`\`\``;
 
-        project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
-        assert.deepEqual(project.readFile('index.css'), `LineUpdated:1
+        await project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
+        assert.deepEqual(await project.readFile('index.css'), `LineUpdated:1
 LineUpdated:1.5
 Line:2
 Line:3
@@ -201,8 +201,8 @@ diff
  Line:3
 \`\`\`\`\``;
 
-        project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
-        assert.deepEqual(project.readFile('index.css'), `Line:1
+        await project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
+        assert.deepEqual(await project.readFile('index.css'), `Line:1
 Line:3
 Line:4
 Line:5`);
@@ -225,8 +225,8 @@ diff
 -Line:1
 \`\`\`\`\``;
 
-        project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
-        assert.deepEqual(project.readFile('index.css'), '');
+        await project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
+        assert.deepEqual(await project.readFile('index.css'), '');
       });
 
       it('can write files with first line next to @@', async () => {
@@ -251,8 +251,8 @@ diff
  Line:3
 \`\`\`\`\``;
 
-        project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
-        assert.deepEqual(project.readFile('index.css'), `Line:3
+        await project.writeFile('index.css', unifiedDiff, AiAssistanceModel.ReplaceStrategy.UNIFIED_DIFF);
+        assert.deepEqual(await project.readFile('index.css'), `Line:3
 Line:4
 Line:5`);
       });
@@ -271,12 +271,15 @@ Line:5`);
             maxLinesChanged: 10,
           });
 
-      project.writeFile('index.html', 'updated');
-      expect(() => {
-        project.writeFile('example2.js', 'updated2');
-      }).throws('Too many files changed');
-      assert.deepEqual(project.readFile('index.html'), 'updated');
-      assert.deepEqual(project.readFile('example2.js'), 'content');
+      await project.writeFile('index.html', 'updated');
+      try {
+        await project.writeFile('example2.js', 'updated2');
+        expect.fail('did not throw');
+      } catch (err) {
+        expect(err.message).to.eq('Too many files changed');
+      }
+      assert.deepEqual(await project.readFile('index.html'), 'updated');
+      assert.deepEqual(await project.readFile('example2.js'), 'content');
     });
 
     it('cannot write same file multiple times', async () => {
@@ -285,9 +288,9 @@ Line:5`);
         maxLinesChanged: 10,
       });
 
-      project.writeFile('index.html', 'updated');
-      project.writeFile('index.html', 'updated2');
-      assert.deepEqual(project.readFile('index.html'), 'updated2');
+      await project.writeFile('index.html', 'updated');
+      await project.writeFile('index.html', 'updated2');
+      assert.deepEqual(await project.readFile('index.html'), 'updated2');
     });
 
     it('cannot write more lines than allowed', async () => {
@@ -301,10 +304,13 @@ Line:5`);
             maxLinesChanged: 1,
           });
 
-      expect(() => {
-        project.writeFile('example2.js', 'updated2\nupdated3');
-      }).throws('Too many lines changed');
-      assert.deepEqual(project.readFile('example2.js'), 'content');
+      try {
+        await project.writeFile('example2.js', 'updated2\nupdated3');
+        expect.fail('did not throw');
+      } catch (err) {
+        expect(err.message).to.eq('Too many lines changed');
+      }
+      assert.deepEqual(await project.readFile('example2.js'), 'content');
     });
   });
 });

front_end/models/ai_assistance/AgentProject.ts

@@ -62,16 +62,18 @@ export class AgentProject {
    * Provides access to the file content in the working copy
    * of the matching UiSourceCode.
    */
-  readFile(filepath: string): string|undefined {
+  async readFile(filepath: string): Promise<string|undefined> {
     const {map} = this.#indexFiles();
     const uiSourceCode = map.get(filepath);
     if (!uiSourceCode) {
       return;
     }
+    const content =
+        uiSourceCode.isDirty() ? uiSourceCode.workingCopyContentData() : await uiSourceCode.requestContentData();
+
     this.#processedFiles.add(filepath);
-    // TODO: needs additional handling for binary files.
-    const content = uiSourceCode.workingCopyContentData();
-    if (!content.isTextContent) {
+
+    if (TextUtils.ContentData.ContentData.isError(content) || !content.isTextContent) {
       return;
     }
 
@@ -82,13 +84,13 @@ export class AgentProject {
    * This method updates the file content in the working copy of the
    * UiSourceCode identified by the filepath.
    */
-  writeFile(filepath: string, update: string, mode = ReplaceStrategy.FULL_FILE): void {
+  async writeFile(filepath: string, update: string, mode = ReplaceStrategy.FULL_FILE): Promise<void> {
     const {map} = this.#indexFiles();
     const uiSourceCode = map.get(filepath);
     if (!uiSourceCode) {
       throw new Error(`UISourceCode ${filepath} not found`);
     }
-    const currentContent = this.readFile(filepath);
+    const currentContent = await this.readFile(filepath);
     let content: string;
     switch (mode) {
       case ReplaceStrategy.FULL_FILE:
@@ -214,7 +216,6 @@ export class AgentProject {
         break;
       }
 
-      await file.requestContentData();
       debugLog('searching in', filepath, 'for', query);
       const content = file.isDirty() ? file.workingCopyContentData() : await file.requestContentData();
       const results =

front_end/models/ai_assistance/agents/PatchAgent.ts

@@ -163,7 +163,7 @@ export class PatchAgent extends AiAgent<Workspace.Workspace.Project> {
         debugLog('updateFiles', args.files);
         for (const file of args.files) {
           debugLog('updating', file);
-          const content = this.#project.readFile(file);
+          const content = await this.#project.readFile(file);
           if (content === undefined) {
             debugLog(file, 'not found');
             return {
@@ -204,7 +204,7 @@ ${content}
             };
           }
           const updated = response.text;
-          this.#project.writeFile(file, updated, strategy);
+          await this.#project.writeFile(file, updated, strategy);
           debugLog('updated', updated);
         }
         return {