Retrying failed commands and failed command state

Author: lukemelia

packages/host/app/components/matrix/room-message-command.gts

@@ -267,7 +267,7 @@ export default class RoomMessageCommand extends Component<Signature> {
             class='retry-button'
             @size='small'
             @kind='secondary-dark'
-            data-test-ai-bot-retry-button
+            data-test-retry-command-button
           >
             Retry
           </Button>

packages/host/tests/acceptance/commands-test.gts

@@ -61,6 +61,7 @@ import {
 import { setupMockMatrix } from '../helpers/mock-matrix';
 import { setupApplicationTest } from '../helpers/setup';
 import { pauseTest } from '@ember/test-helpers';
+import { suspendGlobalErrorHook } from '../helpers/uncaught-exceptions';
 
 let matrixRoomId = '';
 let maybeBoomShouldBoom = true;
@@ -1139,49 +1140,64 @@ module('Acceptance | Commands tests', function (hooks) {
     );
   });
 
-  test('a command that errors when executing allows retry', async function (assert) {
-    await visitOperatorMode({
-      stacks: [
-        [
+  module('suspending global error hook', (hooks) => {
+    suspendGlobalErrorHook(hooks);
+
+    test('a command that errors when executing allows retry', async function (assert) {
+      await visitOperatorMode({
+        stacks: [
+          [
+            {
+              id: `${testRealmURL}Person/hassan`,
+              format: 'isolated',
+            },
+          ],
+        ],
+      });
+
+      await click('[data-test-maybe-boom-via-ai-assistant]');
+      await waitUntil(() => getRoomIds().length > 0);
+
+      await click('[data-test-open-ai-assistant-room-button]');
+      let roomId = getRoomIds().pop()!;
+      let message = getRoomEvents(roomId).pop()!;
+      let boxelMessageData = JSON.parse(message.content.data);
+      let toolName = boxelMessageData.context.tools[0].function.name;
+      maybeBoomShouldBoom = true;
+      simulateRemoteMessage(roomId, '@aibot:localhost', {
+        body: 'Will it boom?',
+        msgtype: APP_BOXEL_MESSAGE_MSGTYPE,
+        formatted_body: 'Will it boom?',
+        format: 'org.matrix.custom.html',
+        [APP_BOXEL_COMMAND_REQUESTS_KEY]: [
           {
-            id: `${testRealmURL}Person/hassan`,
-            format: 'isolated',
+            id: '8406a6eb-a3d5-494f-a7f3-ae9880115756',
+            name: toolName,
+            arguments: {},
           },
         ],
-      ],
-    });
-
-    await click('[data-test-maybe-boom-via-ai-assistant]');
-    await waitUntil(() => getRoomIds().length > 0);
-
-    await click('[data-test-open-ai-assistant-room-button]');
-    let roomId = getRoomIds().pop()!;
-    let message = getRoomEvents(roomId).pop()!;
-    let boxelMessageData = JSON.parse(message.content.data);
-    let toolName = boxelMessageData.context.tools[0].function.name;
+      });
 
-    simulateRemoteMessage(roomId, '@aibot:localhost', {
-      body: 'Will it boom?',
-      msgtype: APP_BOXEL_MESSAGE_MSGTYPE,
-      formatted_body: 'Will it boom?',
-      format: 'org.matrix.custom.html',
-      [APP_BOXEL_COMMAND_REQUESTS_KEY]: [
-        {
-          id: '8406a6eb-a3d5-494f-a7f3-ae9880115756',
-          name: toolName,
-          arguments: {},
-        },
-      ],
+      await settled();
+      let commandResultEvents = await getRoomEvents(roomId).filter(
+        (event) => event.type === APP_BOXEL_COMMAND_RESULT_EVENT_TYPE,
+      );
+      assert.equal(
+        commandResultEvents.length,
+        0,
+        'No command result event dispatched',
+      );
+      maybeBoomShouldBoom = false;
+      await click('[data-test-retry-command-button]');
+      commandResultEvents = await getRoomEvents(roomId).filter(
+        (event) => event.type === APP_BOXEL_COMMAND_RESULT_EVENT_TYPE,
+      );
+      assert.equal(
+        commandResultEvents.length,
+        1,
+        'No command result event dispatched',
+      );
+      assert.dom('[data-test-apply-state="applied"]').exists();
     });
-
-    await settled();
-    let commandResultEvents = await getRoomEvents(roomId).filter(
-      (event) => event.type === APP_BOXEL_COMMAND_RESULT_EVENT_TYPE,
-    );
-    assert.equal(
-      commandResultEvents.length,
-      0,
-      'No command result event dispatched',
-    );
   });
 });

packages/host/tests/helpers/uncaught-exceptions.ts

@@ -0,0 +1,16 @@
+export function suspendGlobalErrorHook(hooks: NestedHooks) {
+  let tmp: any;
+  let capturedExceptions: any[] = [];
+  hooks.before(() => {
+    tmp = QUnit.onUncaughtException;
+    QUnit.onUncaughtException = (err) => {
+      capturedExceptions.push(err);
+    };
+  });
+
+  hooks.after(() => {
+    QUnit.onUncaughtException = tmp;
+    capturedExceptions = [];
+  });
+  return { capturedExceptions };
+}

packages/host/tests/integration/components/ai-assistant-panel-test.gts

@@ -58,6 +58,7 @@ import {
 import { setupMockMatrix } from '../../helpers/mock-matrix';
 import { renderComponent } from '../../helpers/render-component';
 import { setupRenderingTest } from '../../helpers/setup';
+import { suspendGlobalErrorHook } from '../../helpers/uncaught-exceptions';
 
 module('Integration | ai-assistant-panel', function (hooks) {
   const realmName = 'Operator Mode Workspace';
@@ -1192,18 +1193,8 @@ module('Integration | ai-assistant-panel', function (hooks) {
   });
 
   module('suspending global error hook', (hooks) => {
-    let tmp: any;
-    let uncaughtException: any;
-    hooks.before(() => {
-      tmp = QUnit.onUncaughtException;
-      QUnit.onUncaughtException = (err) => {
-        uncaughtException = err;
-      };
-    });
+    let { capturedExceptions } = suspendGlobalErrorHook(hooks);
 
-    hooks.after(() => {
-      QUnit.onUncaughtException = tmp;
-    });
     test('it can handle an error during room creation', async function (assert) {
       await setCardInOperatorModeState();
       await renderComponent(
@@ -1227,7 +1218,10 @@ module('Integration | ai-assistant-panel', function (hooks) {
       assert.dom('[data-test-room-error]').exists();
       assert.dom('[data-test-room]').doesNotExist();
       assert.dom('[data-test-past-sessions-button]').isDisabled();
-      assert.strictEqual(uncaughtException.message, 'Intentional error thrown');
+      assert.strictEqual(
+        capturedExceptions[0].message,
+        'Intentional error thrown',
+      );
       await percySnapshot(
         'Integration | ai-assistant-panel | it can handle an error during room creation | error state',
       );