host: Add prefixed clientRequestIds to code mode editor requests

packages/host/app/components/ai-assistant/formatted-message.gts

@@ -177,7 +177,11 @@ export default class FormattedMessage extends Component<FormattedMessageSignatur
           });
         patchedCode = patchedCodeResult;
       }
-      await this.cardService.saveSource(new URL(fileUrl), patchedCode);
+      await this.cardService.saveSource(
+        new URL(fileUrl),
+        patchedCode,
+        'bot-patch',
+      );
       codePatchActionsGroupedByFileUrl[fileUrl].forEach((codePatchAction) => {
         codePatchAction.patchCodeTaskState = 'applied';
       });

packages/host/app/components/operator-mode/container.gts

@@ -85,7 +85,7 @@ export default class OperatorModeContainer extends Component<Signature> {
 
   private saveSource = task(async (url: URL, content: string) => {
     await this.withTestWaiters(async () => {
-      await this.cardService.saveSource(url, content);
+      await this.cardService.saveSource(url, content, 'editor');
     });
   });
 

packages/host/app/components/operator-mode/create-file-modal.gts

@@ -674,7 +674,11 @@ export class ${className} extends ${exportName} {
     src.push(`}`);
 
     try {
-      await this.cardService.saveSource(url, src.join('\n').trim());
+      await this.cardService.saveSource(
+        url,
+        src.join('\n').trim(),
+        'create-file',
+      );
       this.currentRequest.newFileDeferred.fulfill(url);
     } catch (e: any) {
       let fieldOrCard = isField ? 'field' : 'card';

packages/host/app/lib/formatted-message/code-patch-action.ts

@@ -45,7 +45,11 @@ export class CodePatchAction {
           codeBlock: this.searchReplaceBlock,
         });
 
-      await this.cardService.saveSource(new URL(this.fileUrl), patchedCode);
+      await this.cardService.saveSource(
+        new URL(this.fileUrl),
+        patchedCode,
+        'bot-patch',
+      );
 
       this.patchCodeTaskState = 'applied';
     } catch (error) {

packages/host/app/resources/file.ts

@@ -22,6 +22,8 @@ import type MessageService from '../services/message-service';
 import type NetworkService from '../services/network';
 
 const log = logger('resource:file');
+const realmEventsLogger = logger('realm:events');
+
 const utf8 = new TextDecoder();
 const encoder = new TextEncoder();
 
@@ -214,8 +216,44 @@ class _FileResource extends Resource<Args> {
       let normalizedURL = this.url.endsWith('.json')
         ? this.url.replace(/\.json$/, '')
         : this.url;
+
       if (invalidations.includes(normalizedURL)) {
-        this.read.perform();
+        realmEventsLogger.trace(
+          `file resource ${normalizedURL} processing invalidation`,
+          event,
+        );
+
+        let clientRequestId = event.clientRequestId;
+        let reloadFile = false;
+
+        if (!clientRequestId) {
+          reloadFile = true;
+          realmEventsLogger.debug(
+            `reloading file resource ${normalizedURL} because realm event has no clientRequestId`,
+          );
+        } else if (clientRequestId.startsWith('editor:')) {
+          if (this.cardService.clientRequestIds.has(clientRequestId)) {
+            realmEventsLogger.debug(
+              `ignoring because request id is contained in known clientRequestIds`,
+              event.clientRequestId,
+            );
+          } else {
+            reloadFile = true;
+            realmEventsLogger.debug(
+              `reloading file resource ${normalizedURL} because request id is ${clientRequestId}, not contained within known clientRequestIds`,
+              Object.keys(this.cardService.clientRequestIds),
+            );
+          }
+        } else if (clientRequestId.startsWith('bot-patch:')) {
+          reloadFile = true;
+          realmEventsLogger.debug(
+            `reloading file resource ${normalizedURL} because request id is ${clientRequestId}`,
+          );
+        }
+
+        if (reloadFile) {
+          this.read.perform();
+        }
       }
     });
   });
@@ -225,6 +263,7 @@ class _FileResource extends Resource<Args> {
       let response = await this.cardService.saveSource(
         new URL(this._url),
         content,
+        'editor',
       );
       if (this.innerState.state === 'not-found') {
         // TODO think about the "unauthorized" scenario

packages/host/app/services/card-service.ts

@@ -100,7 +100,7 @@ export default class CardService extends Service {
           'QUERY');
 
     if (!isReadOperation) {
-      let clientRequestId = uuidv4();
+      let clientRequestId = `instance:${uuidv4()}`;
       this.clientRequestIds.add(clientRequestId);
       headers = { ...headers, 'X-Boxel-Client-Request-Id': clientRequestId };
     }
@@ -156,11 +156,15 @@ export default class CardService extends Service {
     return response.text();
   }
 
-  async saveSource(url: URL, content: string) {
+  async saveSource(url: URL, content: string, type: string) {
+    let clientRequestId = `${type}:${uuidv4()}`;
+    this.clientRequestIds.add(clientRequestId);
+
     let response = await this.network.authedFetch(url, {
       method: 'POST',
       headers: {
         Accept: 'application/vnd.card+source',
+        'X-Boxel-Client-Request-Id': clientRequestId,
       },
       body: content,
     });
@@ -185,7 +189,7 @@ export default class CardService extends Service {
     });
 
     const content = await response.text();
-    await this.saveSource(toUrl, content);
+    await this.saveSource(toUrl, content, 'copy');
     return response;
   }
 

packages/host/app/services/store.ts

@@ -23,10 +23,11 @@ import {
   isCardCollectionDocument,
   Deferred,
   delay,
+  isCardError,
   mergeRelationships,
   realmURL as realmURLSymbol,
   localId as localIdSymbol,
-  isCardError,
+  logger,
   type Store as StoreInterface,
   type Query,
   type PatchData,
@@ -68,6 +69,8 @@ export { CardErrorJSONAPI, CardSaveSubscriber };
 
 let waiter = buildWaiter('store-service');
 
+const realmEventsLogger = logger('realm:events');
+
 export default class StoreService extends Service implements StoreInterface {
   @service declare private realm: RealmService;
   @service declare private loaderService: LoaderService;
@@ -478,24 +481,45 @@ export default class StoreService extends Service implements StoreInterface {
       }
       let instance = this.identityContext.get(invalidation);
       if (instance) {
-        // Do not reload if the event is a result of a request that we made. Otherwise we risk overwriting
-        // the inputs with past values. This can happen if the user makes edits in the time between the auto
-        // save request and the arrival realm event.
-        if (
-          !event.clientRequestId ||
-          !this.cardService.clientRequestIds.has(event.clientRequestId)
-        ) {
-          this.reloadTask.perform(instance);
-        } else {
-          if (this.cardService.clientRequestIds.has(event.clientRequestId)) {
-            console.debug(
-              'ignoring invalidation for card because clientRequestId is ours',
-              event,
+        // Do not reload if the event is a result of an instance-editing request that we made. Otherwise we risk
+        // overwriting the inputs with past values. This can happen if the user makes edits in the time between
+        // the auto save request and the arrival realm event.
+
+        let clientRequestId = event.clientRequestId;
+        let reloadFile = false;
+
+        if (!clientRequestId) {
+          reloadFile = true;
+          realmEventsLogger.debug(
+            `reloading file resource ${invalidation} because event has no clientRequestId`,
+          );
+        } else if (this.cardService.clientRequestIds.has(clientRequestId)) {
+          if (clientRequestId.startsWith('instance:')) {
+            realmEventsLogger.debug(
+              `ignoring invalidation for card ${invalidation} because request id ${clientRequestId} is ours and an instance type`,
+            );
+          } else {
+            reloadFile = true;
+            realmEventsLogger.debug(
+              `reloading file resource ${invalidation} because request id ${clientRequestId} is not instance type`,
             );
           }
+        } else {
+          reloadFile = true;
+          realmEventsLogger.debug(
+            `reloading file resource ${invalidation} because request id ${clientRequestId} is not contained within known clientRequestIds`,
+            Array.from(this.cardService.clientRequestIds.values()),
+          );
+        }
+
+        if (reloadFile) {
+          this.reloadTask.perform(instance);
         }
       } else if (!this.identityContext.get(invalidation)) {
         // load the card using just the ID because we don't have a running card on hand
+        realmEventsLogger.debug(
+          `reloading file resource ${invalidation} because it is not found in the identity context`,
+        );
         this.loadInstanceTask.perform(invalidation);
       }
     }

packages/matrix/tests/live-cards.spec.ts

@@ -196,4 +196,35 @@ test.describe('Live Cards', () => {
 
     await expect(page.locator('[data-test-file="hello.gts"]')).toHaveCount(1);
   });
+
+  test.skip('updating a card in code mode edit updates its source', async ({
+    page,
+  }) => {
+    await clearLocalStorage(page, serverIndexUrl);
+    await login(page, 'user1', 'pass', {
+      url: serverIndexUrl,
+      skipOpeningAssistant: true,
+    });
+    await createRealm(page, realmName);
+
+    await page.goto(
+      `${realmURL}?operatorModeState=${encodeURIComponent(
+        JSON.stringify({
+          stacks: [],
+          codePath: `${realmURL}HelloWorld/47c0fc54-5099-4e9c-ad0d-8a58572d05c0`,
+          fileView: 'browser',
+          submode: 'code',
+        }),
+      )}`,
+    );
+
+    await page.locator('[data-test-format-chooser="edit"]').click();
+    await page
+      .locator('[data-test-field="fullName"] input')
+      .fill('Replacement');
+
+    await expect(
+      page.locator('[data-test-monaco-container-operator-mode]'),
+    ).toContainText('Replacement');
+  });
 });