WIP move tool calling to boxel message events and add support for multiple tool calls/commands

Author: lukemelia

packages/ai-bot/tests/responding-test.ts

@@ -58,14 +58,6 @@ class FakeMatrixClient implements MatrixClient {
     this.sentEvents = [];
     this.eventId = 0;
   }
-  sendStateEvent(
-    _roomId: string,
-    _eventType: string,
-    _content: IContent,
-    _stateKey: string,
-  ): Promise<{ event_id: string }> {
-    throw new Error('Method not implemented.');
-  }
 }
 
 function snapshotWithContent(content: string): ChatCompletionSnapshot {
@@ -568,30 +560,13 @@ module('Responding', (hooks) => {
 
   test('Updates message type to command when tool call is in progress', async () => {
     await responder.initialize();
-    await responder.onChunk({
-      id: '0',
-      created: 0,
-      model: 'gpt-3.5-turbo',
-      object: 'chat.completion.chunk',
-      choices: [
-        {
-          delta: {
-            tool_calls: [
-              {
-                index: 0,
-                type: 'function',
-                function: {
-                  name: 'patchCard',
-                  arguments: '',
-                },
-              },
-            ],
-          },
-          index: 0,
-          finish_reason: 'stop',
-        },
-      ],
-    });
+    await responder.onChunk(
+      {} as any,
+      snapshotWithToolCall({
+        name: 'patchCard',
+        arguments: {},
+      }),
+    );
 
     let sentEvents = fakeMatrixClient.getSentEvents();
     assert.equal(
@@ -605,8 +580,8 @@ module('Responding', (hooks) => {
       'Thinking message should be sent first',
     );
     assert.deepEqual(
-      sentEvents[1].content['msgtype'],
-      APP_BOXEL_COMMAND_MSGTYPE,
+      sentEvents[1].content[APP_BOXEL_COMMAND_REQUESTS_KEY].length,
+      1,
       'The message type should reflect that the model is preparing a tool call',
     );
     assert.deepEqual(

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

@@ -78,7 +78,6 @@ interface Signature {
     }) => void;
     errorMessage?: string;
     isPending?: boolean;
-    isCommandMessage?: boolean;
     retryAction?: () => void;
   };
   Blocks: { default: [] };

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

@@ -68,7 +68,6 @@ export default class AiAssistantMessageUsage extends Component {
               @errorMessage={{this.errorMessage}}
               @retryAction={{this.retryAction}}
               @isStreaming={{this.isStreaming}}
-              @isCommandMessage={{this.isCommandMessage}}
             >
               <em>Optional embedded content</em>
             </AiAssistantMessage>
@@ -143,7 +142,6 @@ export default class AiAssistantMessageUsage extends Component {
                 isReady=true
               }}
               @isStreaming={{false}}
-              @isCommandMessage={{false}}
             />
             <AiAssistantMessage
               @formattedMessage={{htmlSafe
@@ -155,7 +153,6 @@ export default class AiAssistantMessageUsage extends Component {
               @datetime={{this.oneMinutesAgo}}
               @isFromAssistant={{true}}
               @isStreaming={{false}}
-              @isCommandMessage={{false}}
             />
           </AiAssistantConversation>
         </div>

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

@@ -11,7 +11,7 @@ import { trackedFunction } from 'ember-resources/util/function';
 
 import { Avatar } from '@cardstack/boxel-ui/components';
 
-import { bool, or } from '@cardstack/boxel-ui/helpers';
+import { bool } from '@cardstack/boxel-ui/helpers';
 
 import { markdownToHtml } from '@cardstack/runtime-common';
 
@@ -27,7 +27,6 @@ import { type CardDef } from 'https://cardstack.com/base/card-api';
 import AiAssistantMessage from '../ai-assistant/message';
 import { aiBotUserId } from '../ai-assistant/panel';
 
-import PreparingRoomMessageCommand from './preparing-room-message-command';
 import RoomMessageCommand from './room-message-command';
 
 interface Signature {
@@ -122,17 +121,8 @@ export default class RoomMessage extends Component<Signature> {
         @isStreaming={{@isStreaming}}
         @retryAction={{@retryAction}}
         @isPending={{@isPending}}
-<<<<<<< HEAD
         data-test-boxel-message-from={{this.message.author.name}}
         data-test-boxel-message-instance-id={{this.message.instanceId}}
-=======
-        @isCommandMessage={{or
-          (bool @message.command)
-          @message.isPreparingCommand
-        }}
-        data-test-boxel-message-from={{@message.author.name}}
-        data-test-boxel-message-instance-id={{@message.instanceId}}
->>>>>>> dd3d939b8 (Show ApplyButton's preparing state when a command is being prepared)
         ...attributes
       >
         {{#each this.message.commands as |command|}}
@@ -145,13 +135,7 @@ export default class RoomMessage extends Component<Signature> {
             @monacoSDK={{@monacoSDK}}
             @isError={{bool this.errorMessage}}
           />
-<<<<<<< HEAD
         {{/each}}
-=======
-        {{else if @message.isPreparingCommand}}
-          <PreparingRoomMessageCommand />
-        {{/if}}
->>>>>>> dd3d939b8 (Show ApplyButton's preparing state when a command is being prepared)
       </AiAssistantMessage>
     {{/if}}
 

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

@@ -2240,10 +2240,15 @@ module('Integration | ai-assistant-panel', function (hooks) {
       isStreamingFinished: false,
     });
     simulateRemoteMessage(roomId, '@aibot:localhost', {
-      msgtype: APP_BOXEL_COMMAND_MSGTYPE,
+      msgtype: APP_BOXEL_MESSAGE_MSGTYPE,
       body: 'Changing first name to Evie',
       formatted_body: 'Changing first name to Evie',
       format: 'org.matrix.custom.html',
+      [APP_BOXEL_COMMAND_REQUESTS_KEY]: [
+        {
+          name: 'patchCard',
+        },
+      ],
       isStreamingFinished: false,
       'm.relates_to': {
         rel_type: 'm.replace',