Commands on skill cards

packages/ai-bot/helpers.ts

@@ -12,12 +12,14 @@ import type {
   SkillsConfigEvent,
   ActiveLLMEvent,
   CommandResultEvent,
+  CommandDefinitionsEvent,
 } from 'https://cardstack.com/base/matrix-event';
 import { MatrixEvent, type IRoomEvent } from 'matrix-js-sdk';
 import { ChatCompletionMessageToolCall } from 'openai/resources/chat/completions';
 import * as Sentry from '@sentry/node';
 import { logger } from '@cardstack/runtime-common';
 import {
+  APP_BOXEL_COMMAND_DEFINITIONS_MSGTYPE,
   APP_BOXEL_COMMAND_RESULT_EVENT_TYPE,
   APP_BOXEL_COMMAND_RESULT_WITH_OUTPUT_MSGTYPE,
 } from '../runtime-common/matrix-constants';
@@ -86,7 +88,7 @@ export function getPromptParts(
     cardFragments,
   );
   let skills = getEnabledSkills(eventList, cardFragments);
-  let tools = getTools(history, aiBotUserId);
+  let tools = getTools(history, skills, aiBotUserId);
   let toolChoice = getToolChoice(history, aiBotUserId);
   let messages = getModifyPrompt(history, aiBotUserId, tools, skills);
   let model = getModel(eventList);
@@ -322,10 +324,45 @@ export function getRelevantCards(
 
 export function getTools(
   history: DiscreteMatrixEvent[],
+  enabledSkills: LooseCardResource[],
   aiBotUserId: string,
 ): Tool[] {
   // Build map directly from messages
+  let enabledCommandNames = new Set<string>();
   let toolMap = new Map<string, Tool>();
+
+  // Get the list of all names from enabled skills
+  for (let skill of enabledSkills) {
+    if (skill.attributes?.commands) {
+      let { commands } = skill.attributes;
+      for (let command of commands) {
+        enabledCommandNames.add(command.functionName);
+      }
+    }
+  }
+
+  // Iterate over the command definitions, and add any tools that are in
+  // enabled skills to the tool map
+  let commandDefinitionEvents: CommandDefinitionsEvent[] = history.filter(
+    (event) =>
+      event.type === 'm.room.message' &&
+      event.content.msgtype === APP_BOXEL_COMMAND_DEFINITIONS_MSGTYPE,
+  ) as CommandDefinitionsEvent[];
+
+  for (let event of commandDefinitionEvents) {
+    let { content } = event;
+    let { commandDefinitions } = content.data;
+    for (let commandDefinition of commandDefinitions) {
+      if (enabledCommandNames.has(commandDefinition.tool.function.name)) {
+        toolMap.set(
+          commandDefinition.tool.function.name,
+          commandDefinition.tool,
+        );
+      }
+    }
+  }
+
+  // Add in tools from the user's messages
   for (let event of history) {
     if (event.type !== 'm.room.message' || event.sender == aiBotUserId) {
       continue;
@@ -608,7 +645,10 @@ export function isCommandResultEvent(
 export function eventRequiresResponse(event: MatrixEvent) {
   // If it's a message, we should respond unless it's a card fragment
   if (event.getType() === 'm.room.message') {
-    if (event.getContent().msgtype === APP_BOXEL_CARDFRAGMENT_MSGTYPE) {
+    if (
+      event.getContent().msgtype === APP_BOXEL_CARDFRAGMENT_MSGTYPE ||
+      event.getContent().msgtype === APP_BOXEL_COMMAND_DEFINITIONS_MSGTYPE
+    ) {
       return false;
     }
     return true;

packages/ai-bot/tests/prompt-construction-test.ts

@@ -1632,6 +1632,38 @@ test('Tools calls are connected to their results', () => {
   );
 });
 
+test('Tools on enabled skills are available in prompt', () => {
+  const eventList: DiscreteMatrixEvent[] = JSON.parse(
+    readFileSync(
+      path.join(__dirname, 'resources/chats/enabled-skill-with-commands.json'),
+    ),
+  );
+
+  const { tools } = getPromptParts(eventList, '@aibot:localhost');
+  assert.true(tools.length > 0, 'Should have tools available');
+
+  // Verify that the tools array contains the command from the skill
+  const switchSubmodeTool = tools.find(
+    (tool) => tool.function?.name === 'SwitchSubmodeCommand_e82a',
+  );
+  assert.ok(
+    switchSubmodeTool,
+    'Should have SwitchSubmodeCommand function available',
+  );
+});
+
+test('No tools are available if skill is not enabled', () => {
+  const eventList: DiscreteMatrixEvent[] = JSON.parse(
+    readFileSync(
+      path.join(__dirname, 'resources/chats/disabled-skill-with-commands.json'),
+    ),
+  );
+
+  const { tools } = getPromptParts(eventList, '@aibot:localhost');
+  // we should not have any tools available
+  assert.true(tools.length == 0, 'Should not have tools available');
+});
+
 module('set model in prompt', () => {
   test('default active LLM must be equal to `DEFAULT_LLM`', () => {
     const eventList: DiscreteMatrixEvent[] = JSON.parse(