From 6e1ea0e038a4408ee4002b034f0bc5d5b2754aea Mon Sep 17 00:00:00 2001
From: Luke Melia <luke@lukemelia.com>
Date: Mon, 24 Feb 2025 13:54:48 -0500
Subject: [PATCH 1/2] Don't treat non-URL CodeRef modules as URLs

- adds commands field to SkillCard to exercise this
---
 packages/base/code-ref.gts                    | 22 +++--
 packages/base/skill-card.gts                  | 57 ++++++++++++-
 .../realm-indexing-and-querying-test.gts      | 81 +++++++++++++++++++
 3 files changed, 152 insertions(+), 8 deletions(-)

diff --git a/packages/base/code-ref.gts b/packages/base/code-ref.gts
index dd4bc9afee..181c8e91bf 100644
--- a/packages/base/code-ref.gts
+++ b/packages/base/code-ref.gts
@@ -37,9 +37,11 @@ export default class CodeRefField extends FieldDef {
     _visited?: Set<string>,
     opts?: SerializeOpts,
   ) {
+    const moduleIsUrlLike =
+      codeRef.module.startsWith('http') || codeRef.module.startsWith('.');
     return {
       ...codeRef,
-      ...(opts?.maybeRelativeURL && !opts?.useAbsoluteURL
+      ...(opts?.maybeRelativeURL && !opts?.useAbsoluteURL && moduleIsUrlLike
         ? { module: opts.maybeRelativeURL(codeRef.module) }
         : {}),
     };
@@ -70,12 +72,18 @@ function maybeSerializeCodeRef(
   stack: CardDef[] = [],
 ) {
   if (codeRef) {
-    // if a stack is passed in, use the containing card to resolve relative references
-    let moduleHref =
-      stack.length > 0
-        ? new URL(codeRef.module, stack[0][relativeTo]).href
-        : codeRef.module;
-    return `${moduleHref}/${codeRef.name}`;
+    const moduleIsUrlLike =
+      codeRef.module.startsWith('http') || codeRef.module.startsWith('.');
+    if (moduleIsUrlLike) {
+      // if a stack is passed in, use the containing card to resolve relative references
+      let moduleHref =
+        stack.length > 0
+          ? new URL(codeRef.module, stack[0][relativeTo]).href
+          : codeRef.module;
+      return `${moduleHref}/${codeRef.name}`;
+    } else {
+      return `${codeRef.module}/${codeRef.name}`;
+    }
   }
   return undefined;
 }
diff --git a/packages/base/skill-card.gts b/packages/base/skill-card.gts
index 02fced1a4f..a8283bb345 100644
--- a/packages/base/skill-card.gts
+++ b/packages/base/skill-card.gts
@@ -1,11 +1,66 @@
+import {
+  CardDef,
+  Component,
+  FieldDef,
+  field,
+  contains,
+  containsMany,
+} from './card-api';
+import BooleanField from './boolean';
+import CodeRefField from './code-ref';
 import MarkdownField from './markdown';
-import { CardDef, Component, field, contains } from './card-api';
+import StringField from './string';
 import RobotIcon from '@cardstack/boxel-icons/robot';
 
+function djb2_xor(str: string) {
+  let len = str.length;
+  let h = 5381;
+
+  for (let i = 0; i < len; i++) {
+    h = (h * 33) ^ str.charCodeAt(i);
+  }
+  return (h >>> 0).toString(16);
+}
+
+function friendlyModuleName(fullModuleUrl: string) {
+  return fullModuleUrl
+    .split('/')
+    .slice(-1)[0]
+    .replace(/\.gts$/, ' ');
+}
+
+export class CommandField extends FieldDef {
+  static displayName = 'CommandField';
+  @field codeRef = contains(CodeRefField, {
+    description: 'An absolute code reference to the command to be executed',
+  });
+  @field requiresApproval = contains(BooleanField, {
+    description:
+      'If true, this command will require human approval before it is executed in the host.',
+  });
+
+  @field functionName = contains(StringField, {
+    description: 'The name of the function to be executed',
+    computeVia: function (this: CommandField) {
+      if (!this.codeRef?.module || !this.codeRef?.name) {
+        return '';
+      }
+
+      const hashed = djb2_xor(`${this.codeRef.module}#${this.codeRef.name}`);
+      let name =
+        this.codeRef.name === 'default'
+          ? friendlyModuleName(this.codeRef.module)
+          : this.codeRef.name;
+      return `${name}_${hashed.slice(0, 4)}`;
+    },
+  });
+}
+
 export class SkillCard extends CardDef {
   static displayName = 'Skill';
   static icon = RobotIcon;
   @field instructions = contains(MarkdownField);
+  @field commands = containsMany(CommandField);
   static embedded = class Embedded extends Component<typeof this> {
     <template>
       <@fields.title />
diff --git a/packages/host/tests/integration/realm-indexing-and-querying-test.gts b/packages/host/tests/integration/realm-indexing-and-querying-test.gts
index 01c44a53d1..3bff67e705 100644
--- a/packages/host/tests/integration/realm-indexing-and-querying-test.gts
+++ b/packages/host/tests/integration/realm-indexing-and-querying-test.gts
@@ -734,6 +734,27 @@ module(`Integration | realm indexing and querying`, function (hooks) {
             },
           },
         },
+        'people-skill.json': {
+          data: {
+            attributes: {
+              instructions: 'How to win friends and influence people',
+              commands: [
+                {
+                  codeRef: {
+                    module: `@cardstack/boxel-host/commands/switch-submode`,
+                    name: 'default',
+                  },
+                },
+              ],
+            },
+            meta: {
+              adoptsFrom: {
+                module: 'https://cardstack.com/base/skill-card',
+                name: 'SkillCard',
+              },
+            },
+          },
+        },
       },
     });
     let indexer = realm.realmIndexQueryEngine;
@@ -807,6 +828,66 @@ module(`Integration | realm indexing and querying`, function (hooks) {
         `search entry was an error: ${entry?.error.errorDetail.message}`,
       );
     }
+    entry = await indexer.cardDocument(new URL(`${testRealmURL}people-skill`));
+    if (entry?.type === 'doc') {
+      assert.deepEqual(entry.doc.data, {
+        id: `${testRealmURL}people-skill`,
+        type: 'card',
+        links: {
+          self: `${testRealmURL}people-skill`,
+        },
+        attributes: {
+          commands: [
+            {
+              codeRef: {
+                module: '@cardstack/boxel-host/commands/switch-submode',
+                name: 'default',
+              },
+              functionName: 'switch-submode_dd88',
+              requiresApproval: null,
+            },
+          ],
+          description: null,
+          instructions: 'How to win friends and influence people',
+          thumbnailURL: null,
+          title: null,
+        },
+        meta: {
+          adoptsFrom: {
+            module: 'https://cardstack.com/base/skill-card',
+            name: 'SkillCard',
+          },
+          lastModified: adapter.lastModifiedMap.get(
+            `${testRealmURL}people-skill.json`,
+          ),
+          resourceCreatedAt: adapter.resourceCreatedAtMap.get(
+            `${testRealmURL}people-skill.json`,
+          ),
+          realmInfo: testRealmInfo,
+          realmURL: testRealmURL,
+        },
+      });
+      let instance = await indexer.instance(
+        new URL(`${testRealmURL}people-skill`),
+      );
+      assert.deepEqual(instance?.searchDoc, {
+        _cardType: 'Skill',
+        id: `${testRealmURL}people-skill`,
+        instructions: 'How to win friends and influence people',
+        commands: [
+          {
+            codeRef: `@cardstack/boxel-host/commands/switch-submode/default`,
+            functionName: 'switch-submode_dd88',
+            requiresApproval: false,
+          },
+        ],
+      });
+    } else {
+      assert.ok(
+        false,
+        `search entry was an error: ${entry?.error.errorDetail.message}`,
+      );
+    }
   });
 
   test('can recover from rendering a card that has a template error', async function (assert) {

From 367a262bd5cab471aa96777f5b194628804fcf59 Mon Sep 17 00:00:00 2001
From: Luke Melia <luke@lukemelia.com>
Date: Mon, 24 Feb 2025 18:05:39 -0500
Subject: [PATCH 2/2] Apply code review feedback

---
 packages/base/code-ref.gts   | 18 ++++++++++++------
 packages/base/skill-card.gts | 17 ++++-------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/packages/base/code-ref.gts b/packages/base/code-ref.gts
index 181c8e91bf..d76465558f 100644
--- a/packages/base/code-ref.gts
+++ b/packages/base/code-ref.gts
@@ -16,6 +16,14 @@ import {
 import { ResolvedCodeRef } from '@cardstack/runtime-common';
 import CodeIcon from '@cardstack/boxel-icons/code';
 
+function moduleIsUrlLike(module: string) {
+  return (
+    module.startsWith('http') ||
+    module.startsWith('.') ||
+    module.startsWith('/')
+  );
+}
+
 class BaseView extends Component<typeof CodeRefField> {
   <template>
     <div data-test-ref>
@@ -37,11 +45,11 @@ export default class CodeRefField extends FieldDef {
     _visited?: Set<string>,
     opts?: SerializeOpts,
   ) {
-    const moduleIsUrlLike =
-      codeRef.module.startsWith('http') || codeRef.module.startsWith('.');
     return {
       ...codeRef,
-      ...(opts?.maybeRelativeURL && !opts?.useAbsoluteURL && moduleIsUrlLike
+      ...(opts?.maybeRelativeURL &&
+      !opts?.useAbsoluteURL &&
+      moduleIsUrlLike(codeRef.module)
         ? { module: opts.maybeRelativeURL(codeRef.module) }
         : {}),
     };
@@ -72,9 +80,7 @@ function maybeSerializeCodeRef(
   stack: CardDef[] = [],
 ) {
   if (codeRef) {
-    const moduleIsUrlLike =
-      codeRef.module.startsWith('http') || codeRef.module.startsWith('.');
-    if (moduleIsUrlLike) {
+    if (moduleIsUrlLike(codeRef.module)) {
       // if a stack is passed in, use the containing card to resolve relative references
       let moduleHref =
         stack.length > 0
diff --git a/packages/base/skill-card.gts b/packages/base/skill-card.gts
index a8283bb345..b9e1658dc9 100644
--- a/packages/base/skill-card.gts
+++ b/packages/base/skill-card.gts
@@ -11,22 +11,13 @@ import CodeRefField from './code-ref';
 import MarkdownField from './markdown';
 import StringField from './string';
 import RobotIcon from '@cardstack/boxel-icons/robot';
-
-function djb2_xor(str: string) {
-  let len = str.length;
-  let h = 5381;
-
-  for (let i = 0; i < len; i++) {
-    h = (h * 33) ^ str.charCodeAt(i);
-  }
-  return (h >>> 0).toString(16);
-}
+import { simpleHash } from '@cardstack/runtime-common';
 
 function friendlyModuleName(fullModuleUrl: string) {
   return fullModuleUrl
     .split('/')
-    .slice(-1)[0]
-    .replace(/\.gts$/, ' ');
+    .pop()!
+    .replace(/\.gts$/, '');
 }
 
 export class CommandField extends FieldDef {
@@ -46,7 +37,7 @@ export class CommandField extends FieldDef {
         return '';
       }
 
-      const hashed = djb2_xor(`${this.codeRef.module}#${this.codeRef.name}`);
+      const hashed = simpleHash(`${this.codeRef.module}#${this.codeRef.name}`);
       let name =
         this.codeRef.name === 'default'
           ? friendlyModuleName(this.codeRef.module)